From e10f10aa709736e93cdbfc0e9b9cb0bba78e16df Mon Sep 17 00:00:00 2001 From: Damien Caro Date: Tue, 6 Mar 2018 22:37:33 -0800 Subject: [PATCH 001/320] Added support for vpn client protocol and radius server --- .../resource_arm_virtual_network_gateway.go | 59 ++++++++++++++- ...source_arm_virtual_network_gateway_test.go | 75 +++++++++++++++++++ .../r/virtual_network_gateway.html.markdown | 13 +++- 3 files changed, 145 insertions(+), 2 deletions(-) diff --git a/azurerm/resource_arm_virtual_network_gateway.go b/azurerm/resource_arm_virtual_network_gateway.go index 26d6259181f7..998e94704b3e 100644 --- a/azurerm/resource_arm_virtual_network_gateway.go +++ b/azurerm/resource_arm_virtual_network_gateway.go @@ -137,9 +137,20 @@ func resourceArmVirtualNetworkGateway() *schema.Resource { Type: schema.TypeString, }, }, + "vpn_client_protocol": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, "root_certificate": { Type: schema.TypeSet, - Required: true, + Optional: true, + ConflictsWith: []string{ + "vpn_client_configuration.0.radius_server_address", + "vpn_client_configuration.0.radius_server_secret", + }, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { @@ -157,6 +168,10 @@ func resourceArmVirtualNetworkGateway() *schema.Resource { "revoked_certificate": { Type: schema.TypeSet, Optional: true, + ConflictsWith: []string{ + "vpn_client_configuration.0.radius_server_address", + "vpn_client_configuration.0.radius_server_secret", + }, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { @@ -171,6 +186,28 @@ func resourceArmVirtualNetworkGateway() *schema.Resource { }, Set: hashVirtualNetworkGatewayRevokedCert, }, + "radius_server_address": { + Type: schema.TypeString, + Optional: true, + ConflictsWith: []string{ + "vpn_client_configuration.0.root_certificate", + "vpn_client_configuration.0.revoked_certificate", + }, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "radius_server_secret": { + Type: schema.TypeString, + Optional: true, + ConflictsWith: []string{ + "vpn_client_configuration.0.root_certificate", + "vpn_client_configuration.0.revoked_certificate", + }, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, }, }, }, @@ -491,12 +528,24 @@ func expandArmVirtualNetworkGatewayVpnClientConfig(d *schema.ResourceData) *netw revokedCerts = append(revokedCerts, r) } + confVpnClientProtocol := conf["vpn_client_protocol"].([]interface{}) + vpnClientProtocols := make([]network.VpnClientProtocol, 0, len(confVpnClientProtocol)) + for _, protocol := range confVpnClientProtocol { + vpnClientProtocols = append(vpnClientProtocols, network.VpnClientProtocol(protocol.(string))) + } + + confRadiusServerAddress := conf["radius_server_address"].(string) + confRadiusServerSecret := conf["radius_server_secret"].(string) + return &network.VpnClientConfiguration{ VpnClientAddressPool: &network.AddressSpace{ AddressPrefixes: &addresses, }, VpnClientRootCertificates: &rootCerts, VpnClientRevokedCertificates: &revokedCerts, + VpnClientProtocols: &vpnClientProtocols, + RadiusServerAddress: &confRadiusServerAddress, + RadiusServerSecret: &confRadiusServerSecret, } } @@ -574,6 +623,14 @@ func flattenArmVirtualNetworkGatewayVpnClientConfig(cfg *network.VpnClientConfig } flat["revoked_certificate"] = schema.NewSet(hashVirtualNetworkGatewayRevokedCert, revokedCerts) + vpnClientProtocol := make([]interface{}, 0) + if vpnProtocols := cfg.VpnClientProtocols; vpnProtocols != nil { + for _, vpnProtocol := range *vpnProtocols { + vpnClientProtocol = append(vpnClientProtocol, vpnProtocol) + } + } + flat["vpn_client_protocol"] = vpnClientProtocol + return []interface{}{flat} } diff --git a/azurerm/resource_arm_virtual_network_gateway_test.go b/azurerm/resource_arm_virtual_network_gateway_test.go index 597e6d2d16da..3e58b6cf9551 100644 --- a/azurerm/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/resource_arm_virtual_network_gateway_test.go @@ -48,6 +48,25 @@ func TestAccAzureRMVirtualNetworkGateway_vpnGw1(t *testing.T) { }) } +func TestAccAzureRMVirtualNetworkGateway_vpnClientRadius(t *testing.T) { + ri := acctest.RandInt() + config := testAccAzureRMVirtualNetworkGateway_vpnClient(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualNetworkGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualNetworkGatewayExists("azurerm_virtual_network_gateway.test"), + ), + }, + }, + }) +} + func testCheckAzureRMVirtualNetworkGatewayExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { name, resourceGroup, err := getArmResourceNameAndGroup(s, name) @@ -188,3 +207,59 @@ resource "azurerm_virtual_network_gateway" "test" { } `, rInt, location, rInt, rInt, rInt) } + +func testAccAzureRMVirtualNetworkGateway_vpnClient(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvn-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + address_space = ["10.0.0.0/16"] +} + +resource "azurerm_subnet" "test" { + name = "GatewaySubnet" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_public_ip" "test" { + name = "acctestpip-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + public_ip_address_allocation = "Dynamic" +} + +resource "azurerm_virtual_network_gateway" "test" { + name = "acctestvng-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + type = "Vpn" + vpn_type = "RouteBased" + sku = "VpnGw1" + + ip_configuration { + public_ip_address_id = "${azurerm_public_ip.test.id}" + private_ip_address_allocation = "Dynamic" + subnet_id = "${azurerm_subnet.test.id}" + } + + vpn_client_configuration { + address_space = [ "11.2.0.0/24" ] + + vpn_client_protocol = [ "SSTP", "IkeV2" ] + + radius_server_address = "1.2.3.4" + radius_server_secret = "verysecretsecret" + + } +} +`, rInt, location, rInt, rInt, rInt) +} diff --git a/website/docs/r/virtual_network_gateway.html.markdown b/website/docs/r/virtual_network_gateway.html.markdown index 638ffedc6230..64f8329b6b19 100644 --- a/website/docs/r/virtual_network_gateway.html.markdown +++ b/website/docs/r/virtual_network_gateway.html.markdown @@ -170,12 +170,23 @@ The `vpn_client_configuration` block supports: vpn clients will be taken. You can provide more than one address space, e.g. in CIDR notation. -* `root_certificate` - (Required) One or more `root_certificate` blocks which are +* `vpn_client_protocol` - (Optional) List of the protocols supported by the vpn client. + The supported values are "SSTP" and "IkeV2". + +* `root_certificate` - (Optional) One or more `root_certificate` blocks which are defined below. These root certificates are used to sign the client certificate used by the VPN clients to connect to the gateway. + This setting is incompatible with the use of `radius_server_address` and `radius_server_secret`. * `revoked_certificate` - (Optional) One or more `revoked_certificate` blocks which are defined below. + This setting is incompatible with the use of `radius_server_address` and `radius_server_secret`. + +* `radius_server_address` - (Optional) The address of the Radius server. + This setting is incompatible with the use of `root_certificate` and `revoked_certificate`. + +* `radius_server_secret` - (Optional) The secret used by the Radius server. + This setting is incompatible with the use of `root_certificate` and `revoked_certificate`. The `bgp_settings` block supports: From b2d5a482d05f7eeaafdd466eac1a83eca59208f4 Mon Sep 17 00:00:00 2001 From: Damien Caro Date: Tue, 6 Mar 2018 22:47:36 -0800 Subject: [PATCH 002/320] Added validation of values --- azurerm/resource_arm_virtual_network_gateway.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azurerm/resource_arm_virtual_network_gateway.go b/azurerm/resource_arm_virtual_network_gateway.go index 998e94704b3e..558dd911c30c 100644 --- a/azurerm/resource_arm_virtual_network_gateway.go +++ b/azurerm/resource_arm_virtual_network_gateway.go @@ -140,6 +140,10 @@ func resourceArmVirtualNetworkGateway() *schema.Resource { "vpn_client_protocol": { Type: schema.TypeList, Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + "SSTP", + "IkeV2", + }, false), Elem: &schema.Schema{ Type: schema.TypeString, }, From a324d117fc10a439302528af89ce903e494d99fb Mon Sep 17 00:00:00 2001 From: Damien Caro Date: Tue, 6 Mar 2018 23:21:25 -0800 Subject: [PATCH 003/320] Removed validation function on list --- azurerm/resource_arm_virtual_network_gateway.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/azurerm/resource_arm_virtual_network_gateway.go b/azurerm/resource_arm_virtual_network_gateway.go index 558dd911c30c..998e94704b3e 100644 --- a/azurerm/resource_arm_virtual_network_gateway.go +++ b/azurerm/resource_arm_virtual_network_gateway.go @@ -140,10 +140,6 @@ func resourceArmVirtualNetworkGateway() *schema.Resource { "vpn_client_protocol": { Type: schema.TypeList, Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - "SSTP", - "IkeV2", - }, false), Elem: &schema.Schema{ Type: schema.TypeString, }, From 4fa76c4553e7b6bb9483eeb7f9853cb88dbae0bf Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Tue, 20 Mar 2018 15:55:22 -0400 Subject: [PATCH 004/320] Initial code and unit tests for Storage Account Shared Access Signature support. --- azurerm/resource_arm_storage_account_sas.go | 193 ++++++++++++++++++ .../resource_arm_storage_account_sas_test.go | 87 ++++++++ 2 files changed, 280 insertions(+) create mode 100644 azurerm/resource_arm_storage_account_sas.go create mode 100644 azurerm/resource_arm_storage_account_sas_test.go diff --git a/azurerm/resource_arm_storage_account_sas.go b/azurerm/resource_arm_storage_account_sas.go new file mode 100644 index 000000000000..ff52d1ad5780 --- /dev/null +++ b/azurerm/resource_arm_storage_account_sas.go @@ -0,0 +1,193 @@ +package azurerm + +import "github.com/hashicorp/terraform/helper/schema" + +import ( + "fmt" + "regexp" + "strings" + + "crypto/hmac" + "crypto/sha256" +) + +const ( + connStringAccountKeyKey = "AccountKey" + connStringAccountNameKey = "AccountName" + sasSignedVersion = "2017-07-29" +) + +// This is an ACCOUNT SAS : https://docs.microsoft.com/en-us/rest/api/storageservices/Constructing-an-Account-SAS +// not Service SAS +func resourceArmStorageAccountSharedAccessSignature() *schema.Resource { + return &schema.Resource{ + Create: resourceArmStorageAccountSasCreate, + Read: resourceArmStorageAccountSasRead, + Delete: resourceArmStorageAccountSasDelete, + + Schema: map[string]*schema.Schema{ + "connection_string": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "https_only": { + Type: schema.TypeBool, + Required: true, + ForceNew: true, + }, + + "resource_types": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateArmStorageAccountSasResourceTypes, + }, + + "services": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + // Always in UTC and must be ISO-8601 format + "start": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + // Always in UTC and must be ISO-8601 format + "expiry": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "permissions": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "sas": { + Type: schema.TypeString, + Computed: true, + }, + }, + } + +} + +func resourceArmStorageAccountSasCreate(d *schema.ResourceData, meta interface{}) error { + + connString := d.Get("connection_string").(string) + httpsOnly := d.Get("https_only").(bool) + resourceTypes := d.Get("resource_types").(string) + services := d.Get("services").(string) + start := d.Get("start").(string) + expiry := d.Get("expiry").(string) + permissions := d.Get("permissions").(string) + + // Parse the connection string + kvp, err := parseAzureStorageAccountConnectionString(connString) + if err != nil { + return err + } + + // Create the string to sign with the key... + + // Details on how to do this are here: + // https://docs.microsoft.com/en-us/rest/api/storageservices/Constructing-an-Account-SAS + accountName := kvp[connStringAccountNameKey] + accountKey := kvp[connStringAccountKeyKey] + var signedProtocol = "https,http" + if httpsOnly { + signedProtocol = "https" + } + signedIp := "" + signedVersion := sasSignedVersion + + sasToken := computeAzureStorageAccountSas(accountName, accountKey, permissions, services, resourceTypes, + start, expiry, signedProtocol, signedIp, signedVersion) + + d.Set("sas", sasToken) + + return nil +} + +func resourceArmStorageAccountSasRead(d *schema.ResourceData, meta interface{}) error { + // There really isn't anything to read + // The computed SAS element stores what it needs. + return nil +} + +func resourceArmStorageAccountSasDelete(d *schema.ResourceData, meta interface{}) error { + // Nothing to delete... + return nil +} + +func validateArmStorageAccountSasResourceTypes(v interface{}, k string) (ws []string, es []error) { + input := v.(string) + + if !regexp.MustCompile(`\A([cos]{1,3})\z`).MatchString(input) { + es = append(es, fmt.Errorf("resource Types can only consist of 's', 'c', 'o', and must be between 1 and 3 characters long")) + } + + return +} + +func computeAzureStorageAccountSas(accountName string, + accountKey string, + permissions string, services string, + resourceTypes string, start string, expiry string, + signedProtocol string, signedIp string, signedVersion string) string { + + // UTF-8 by default... + stringToSign := accountName + "\n" + permissions + "\n" + services + "\n" + resourceTypes + "\n" + start + "\n" + + expiry + "\n" + signedIp + "\n" + signedProtocol + "\n" + signedVersion + "\n" + + hasher := hmac.New(sha256.New, []byte(accountKey)) + signature := hasher.Sum([]byte(stringToSign)) + + sasToken := "?sv=" + signedVersion + "&ss=" + services + "&srt=" + resourceTypes + "&sp=" + permissions + + "&st=" + start + "&se=" + expiry + "&spr=" + signedProtocol + + // this is consistent with how the Azure portal builds these. + if len(signedIp) > 0 { + sasToken += "&sip=" + signedIp + } + + sasToken += "&sig=" + string(signature) + + return sasToken +} + +// This connection string was for a real storage account which has been deleted +// so its safe to include here for reference to understand the format. +// DefaultEndpointsProtocol=https;AccountName=azurermtestsa0;AccountKey=2vJrjEyL4re2nxCEg590wJUUC7PiqqrDHjAN5RU304FNUQieiEwS2bfp83O0v28iSfWjvYhkGmjYQAdd9x+6nw==;EndpointSuffix=core.windows.net + +func parseAzureStorageAccountConnectionString(connString string) (kvp map[string]string, err error) { + validKeys := map[string]bool{"DefaultEndpointsProtocol": true, "BlobEndpoint": true, + "AccountName": true, "AccountKey": true, "EndpointSuffix": true} + // The k-v pairs are separated with semi-colons + tokens := strings.Split(connString, ";") + + for _, atoken := range tokens { + // The individual k-v are separated by an equals sign. + kv := strings.SplitN(atoken, "=", 2) + key := kv[0] + val := kv[1] + if _, present := validKeys[key]; !present { + return nil, fmt.Errorf("[ERROR] Unknown Key: %s", key) + } + kvp[key] = val + } + + if _, present := kvp[connStringAccountKeyKey]; !present { + return nil, fmt.Errorf("[ERROR] Storage Account Key not found in connection string: %s", connString) + } + + return kvp, nil +} diff --git a/azurerm/resource_arm_storage_account_sas_test.go b/azurerm/resource_arm_storage_account_sas_test.go new file mode 100644 index 000000000000..9c9ac5363ac0 --- /dev/null +++ b/azurerm/resource_arm_storage_account_sas_test.go @@ -0,0 +1,87 @@ +package azurerm + +import ( + "testing" +) + +func TestValidateArmStorageAccountSasResourceTypes(t *testing.T) { + testCases := []struct { + input string + shouldError bool + }{ + {"s", false}, + {"c", false}, + {"o", false}, + {"sc", false}, + {"cs", false}, + {"os", false}, + {"sco", false}, + {"cso", false}, + {"osc", false}, + {"scos", true}, + {"csoc", true}, + {"oscs", true}, + {"S", true}, + {"C", true}, + {"O", true}, + } + + for _, test := range testCases { + _, es := validateArmStorageAccountSasResourceTypes(test.input, "") + + if test.shouldError && len(es) == 0 { + t.Fatalf("Expected validating resource_types %q to fail", test.input) + } + } +} + +// This connection string was for a real storage account which has been deleted +// so its safe to include here for reference to understand the format. +// DefaultEndpointsProtocol=https;AccountName=azurermtestsa0;AccountKey=2vJrjEyL4re2nxCEg590wJUUC7PiqqrDHjAN5RU304FNUQieiEwS2bfp83O0v28iSfWjvYhkGmjYQAdd9x+6nw==;EndpointSuffix=core.windows.net + +func TestComputeAzureStorageAccountSas(t *testing.T) { + testCases := []struct { + accountName string + accountKey string + permissions string + services string + resourceTypes string + start string + expiry string + signedProtocol string + signedIp string + signedVersion string + knownSasToken string + }{ + { + "azurermtestsa0", + "2vJrjEyL4re2nxCEg590wJUUC7PiqqrDHjAN5RU304FNUQieiEwS2bfp83O0v28iSfWjvYhkGmjYQAdd9x+6nw==", + "rwac", + "b", + "c", + "2018-03-20T04:00:00Z", + "2020-03-20T04:00:00Z", + "https", + "", + "2017-07-29", + "?sv=2017-07-29&ss=b&srt=c&sp=rwac&se=2020-03-20T04:00:00Z&st=2018-03-20T04:00:00Z&spr=https&sig=SQigK%2FnFA4pv0F0oMLqr6DxUWV4vtFqWi6q3Mf7o9nY%3D", + }, + } + + for _, test := range testCases { + computedToken := computeAzureStorageAccountSas(test.accountName, + test.accountKey, + test.permissions, + test.services, + test.resourceTypes, + test.start, + test.expiry, + test.signedProtocol, + test.signedIp, + test.signedVersion) + + if computedToken != test.knownSasToken { + t.Fatalf("Test failed: Expected Azure SAS %s but was %s", test.knownSasToken, computedToken) + } + } +} From 048bb767336e30b725179172623e242b5e473b8f Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Tue, 20 Mar 2018 17:04:03 -0400 Subject: [PATCH 005/320] Unit test for SAS computation which matches the Azure Portal passes. --- azurerm/resource_arm_storage_account_sas.go | 46 ++++++++++++++----- .../resource_arm_storage_account_sas_test.go | 10 ++-- 2 files changed, 41 insertions(+), 15 deletions(-) diff --git a/azurerm/resource_arm_storage_account_sas.go b/azurerm/resource_arm_storage_account_sas.go index ff52d1ad5780..f8e9cd907920 100644 --- a/azurerm/resource_arm_storage_account_sas.go +++ b/azurerm/resource_arm_storage_account_sas.go @@ -3,7 +3,9 @@ package azurerm import "github.com/hashicorp/terraform/helper/schema" import ( + "encoding/base64" "fmt" + "net/url" "regexp" "strings" @@ -109,8 +111,11 @@ func resourceArmStorageAccountSasCreate(d *schema.ResourceData, meta interface{} signedIp := "" signedVersion := sasSignedVersion - sasToken := computeAzureStorageAccountSas(accountName, accountKey, permissions, services, resourceTypes, + sasToken, err := computeAzureStorageAccountSas(accountName, accountKey, permissions, services, resourceTypes, start, expiry, signedProtocol, signedIp, signedVersion) + if err != nil { + return err + } d.Set("sas", sasToken) @@ -142,26 +147,43 @@ func computeAzureStorageAccountSas(accountName string, accountKey string, permissions string, services string, resourceTypes string, start string, expiry string, - signedProtocol string, signedIp string, signedVersion string) string { + signedProtocol string, signedIp string, signedVersion string) (string, error) { // UTF-8 by default... - stringToSign := accountName + "\n" + permissions + "\n" + services + "\n" + resourceTypes + "\n" + start + "\n" + - expiry + "\n" + signedIp + "\n" + signedProtocol + "\n" + signedVersion + "\n" - - hasher := hmac.New(sha256.New, []byte(accountKey)) - signature := hasher.Sum([]byte(stringToSign)) - - sasToken := "?sv=" + signedVersion + "&ss=" + services + "&srt=" + resourceTypes + "&sp=" + permissions + - "&st=" + start + "&se=" + expiry + "&spr=" + signedProtocol + stringToSign := accountName + "\n" + stringToSign += permissions + "\n" + stringToSign += services + "\n" + stringToSign += resourceTypes + "\n" + stringToSign += start + "\n" + stringToSign += expiry + "\n" + stringToSign += signedIp + "\n" + stringToSign += signedProtocol + "\n" + stringToSign += signedVersion + "\n" + + binaryKey, err := base64.StdEncoding.DecodeString(accountKey) + if err != nil { + return "", err + } + hasher := hmac.New(sha256.New, binaryKey) + hasher.Write([]byte(stringToSign)) + signature := hasher.Sum(nil) + + sasToken := "?sv=" + url.QueryEscape(signedVersion) + sasToken += "&ss=" + url.QueryEscape(services) + sasToken += "&srt=" + url.QueryEscape(resourceTypes) + sasToken += "&sp=" + url.QueryEscape(permissions) + sasToken += "&se=" + (expiry) + sasToken += "&st=" + (start) + sasToken += "&spr=" + url.QueryEscape(signedProtocol) // this is consistent with how the Azure portal builds these. if len(signedIp) > 0 { sasToken += "&sip=" + signedIp } - sasToken += "&sig=" + string(signature) + sasToken += "&sig=" + url.QueryEscape(base64.StdEncoding.EncodeToString(signature)) - return sasToken + return sasToken, nil } // This connection string was for a real storage account which has been deleted diff --git a/azurerm/resource_arm_storage_account_sas_test.go b/azurerm/resource_arm_storage_account_sas_test.go index 9c9ac5363ac0..b6cb4c787efa 100644 --- a/azurerm/resource_arm_storage_account_sas_test.go +++ b/azurerm/resource_arm_storage_account_sas_test.go @@ -37,7 +37,7 @@ func TestValidateArmStorageAccountSasResourceTypes(t *testing.T) { // This connection string was for a real storage account which has been deleted // so its safe to include here for reference to understand the format. -// DefaultEndpointsProtocol=https;AccountName=azurermtestsa0;AccountKey=2vJrjEyL4re2nxCEg590wJUUC7PiqqrDHjAN5RU304FNUQieiEwS2bfp83O0v28iSfWjvYhkGmjYQAdd9x+6nw==;EndpointSuffix=core.windows.net +// DefaultEndpointsProtocol=https;AccountName=azurermtestsa0;AccountKey=T0ZQouXBDpWud/PlTRHIJH2+VUK8D+fnedEynb9Mx638IYnsMUe4mv1fFjC7t0NayTfFAQJzPZuV1WHFKOzGdg==;EndpointSuffix=core.windows.net func TestComputeAzureStorageAccountSas(t *testing.T) { testCases := []struct { @@ -55,7 +55,7 @@ func TestComputeAzureStorageAccountSas(t *testing.T) { }{ { "azurermtestsa0", - "2vJrjEyL4re2nxCEg590wJUUC7PiqqrDHjAN5RU304FNUQieiEwS2bfp83O0v28iSfWjvYhkGmjYQAdd9x+6nw==", + "T0ZQouXBDpWud/PlTRHIJH2+VUK8D+fnedEynb9Mx638IYnsMUe4mv1fFjC7t0NayTfFAQJzPZuV1WHFKOzGdg==", "rwac", "b", "c", @@ -69,7 +69,7 @@ func TestComputeAzureStorageAccountSas(t *testing.T) { } for _, test := range testCases { - computedToken := computeAzureStorageAccountSas(test.accountName, + computedToken, err := computeAzureStorageAccountSas(test.accountName, test.accountKey, test.permissions, test.services, @@ -80,6 +80,10 @@ func TestComputeAzureStorageAccountSas(t *testing.T) { test.signedIp, test.signedVersion) + if err != nil { + t.Fatalf("Test Failed: Error computing storage account Sas: %q", err) + } + if computedToken != test.knownSasToken { t.Fatalf("Test failed: Expected Azure SAS %s but was %s", test.knownSasToken, computedToken) } From d9d1dc21c88e2b776b9fed1651e7055f9a749c8b Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Tue, 20 Mar 2018 17:11:01 -0400 Subject: [PATCH 006/320] Unit test for SAS computation which matches the Azure Portal passes - 2 --- azurerm/provider.go | 1 + azurerm/resource_arm_storage_account_sas.go | 15 +++++++++++---- azurerm/resource_arm_storage_account_sas_test.go | 13 +++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/azurerm/provider.go b/azurerm/provider.go index 55bfae9685c9..cb32194ed1b0 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -193,6 +193,7 @@ func Provider() terraform.ResourceProvider { "azurerm_sql_active_directory_administrator": resourceArmSqlAdministrator(), "azurerm_sql_server": resourceArmSqlServer(), "azurerm_storage_account": resourceArmStorageAccount(), + "azurerm_storage_account_sas": resourceArmStorageAccountSharedAccessSignature(), "azurerm_storage_blob": resourceArmStorageBlob(), "azurerm_storage_container": resourceArmStorageContainer(), "azurerm_storage_share": resourceArmStorageShare(), diff --git a/azurerm/resource_arm_storage_account_sas.go b/azurerm/resource_arm_storage_account_sas.go index f8e9cd907920..f35e2ffc1246 100644 --- a/azurerm/resource_arm_storage_account_sas.go +++ b/azurerm/resource_arm_storage_account_sas.go @@ -145,9 +145,14 @@ func validateArmStorageAccountSasResourceTypes(v interface{}, k string) (ws []st func computeAzureStorageAccountSas(accountName string, accountKey string, - permissions string, services string, - resourceTypes string, start string, expiry string, - signedProtocol string, signedIp string, signedVersion string) (string, error) { + permissions string, + services string, + resourceTypes string, + start string, + expiry string, + signedProtocol string, + signedIp string, + signedVersion string) (string, error) { // UTF-8 by default... stringToSign := accountName + "\n" @@ -168,13 +173,15 @@ func computeAzureStorageAccountSas(accountName string, hasher.Write([]byte(stringToSign)) signature := hasher.Sum(nil) + // Trial and error to determine which fields the Azure portal + // URL encodes for a query string and which it does not. sasToken := "?sv=" + url.QueryEscape(signedVersion) sasToken += "&ss=" + url.QueryEscape(services) sasToken += "&srt=" + url.QueryEscape(resourceTypes) sasToken += "&sp=" + url.QueryEscape(permissions) sasToken += "&se=" + (expiry) sasToken += "&st=" + (start) - sasToken += "&spr=" + url.QueryEscape(signedProtocol) + sasToken += "&spr=" + (signedProtocol) // this is consistent with how the Azure portal builds these. if len(signedIp) > 0 { diff --git a/azurerm/resource_arm_storage_account_sas_test.go b/azurerm/resource_arm_storage_account_sas_test.go index b6cb4c787efa..434710ae3353 100644 --- a/azurerm/resource_arm_storage_account_sas_test.go +++ b/azurerm/resource_arm_storage_account_sas_test.go @@ -66,6 +66,19 @@ func TestComputeAzureStorageAccountSas(t *testing.T) { "2017-07-29", "?sv=2017-07-29&ss=b&srt=c&sp=rwac&se=2020-03-20T04:00:00Z&st=2018-03-20T04:00:00Z&spr=https&sig=SQigK%2FnFA4pv0F0oMLqr6DxUWV4vtFqWi6q3Mf7o9nY%3D", }, + { + "azurermtestsa0", + "2vJrjEyL4re2nxCEg590wJUUC7PiqqrDHjAN5RU304FNUQieiEwS2bfp83O0v28iSfWjvYhkGmjYQAdd9x+6nw==", + "rwdlac", + "b", + "sco", + "2018-03-20T04:00:00Z", + "2018-03-28T05:04:25Z", + "https,http", + "", + "2017-07-29", + "?sv=2017-07-29&ss=b&srt=sco&sp=rwdlac&se=2018-03-28T05:04:25Z&st=2018-03-20T04:00:00Z&spr=https,http&sig=OLNwL%2B7gxeDQQaUyNdXcDPK2aCbCMgEkJNjha9te448%3D", + }, } for _, test := range testCases { From d59dfb18eb26a27b93a06dd320d7bf8785b11288 Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Wed, 21 Mar 2018 13:13:12 -0400 Subject: [PATCH 007/320] Move SAS support from a resource to a data source. --- ....go => data_source_storage_account_sas.go} | 202 ++++++++++++++++-- ...> data_source_storage_account_sas_test.go} | 0 azurerm/provider.go | 2 +- 3 files changed, 182 insertions(+), 22 deletions(-) rename azurerm/{resource_arm_storage_account_sas.go => data_source_storage_account_sas.go} (58%) rename azurerm/{resource_arm_storage_account_sas_test.go => data_source_storage_account_sas_test.go} (100%) diff --git a/azurerm/resource_arm_storage_account_sas.go b/azurerm/data_source_storage_account_sas.go similarity index 58% rename from azurerm/resource_arm_storage_account_sas.go rename to azurerm/data_source_storage_account_sas.go index f35e2ffc1246..b0339a42c168 100644 --- a/azurerm/resource_arm_storage_account_sas.go +++ b/azurerm/data_source_storage_account_sas.go @@ -21,11 +21,9 @@ const ( // This is an ACCOUNT SAS : https://docs.microsoft.com/en-us/rest/api/storageservices/Constructing-an-Account-SAS // not Service SAS -func resourceArmStorageAccountSharedAccessSignature() *schema.Resource { +func dataSourceArmStorageAccountSharedAccessSignature() *schema.Resource { return &schema.Resource{ - Create: resourceArmStorageAccountSasCreate, - Read: resourceArmStorageAccountSasRead, - Delete: resourceArmStorageAccountSasDelete, + Read: dataSourceArmStorageAccountSasRead, Schema: map[string]*schema.Schema{ "connection_string": { @@ -41,16 +39,58 @@ func resourceArmStorageAccountSharedAccessSignature() *schema.Resource { }, "resource_types": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validateArmStorageAccountSasResourceTypes, + Type: schema.TypeList, + Required: true, + ForceNew: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "service": { + Type: schema.TypeBool, + Required: true, + }, + + "container": { + Type: schema.TypeBool, + Required: true, + }, + + "object": { + Type: schema.TypeBool, + Required: true, + }, + }, + }, }, "services": { - Type: schema.TypeString, + Type: schema.TypeList, Required: true, ForceNew: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "blob": { + Type: schema.TypeBool, + Required: true, + }, + + "queue": { + Type: schema.TypeBool, + Required: true, + }, + + "table": { + Type: schema.TypeBool, + Required: true, + }, + + "file": { + Type: schema.TypeBool, + Required: true, + }, + }, + }, }, // Always in UTC and must be ISO-8601 format @@ -68,9 +108,53 @@ func resourceArmStorageAccountSharedAccessSignature() *schema.Resource { }, "permissions": { - Type: schema.TypeString, + Type: schema.TypeList, Required: true, ForceNew: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "read": { + Type: schema.TypeBool, + Required: true, + }, + + "write": { + Type: schema.TypeBool, + Required: true, + }, + + "delete": { + Type: schema.TypeBool, + Required: true, + }, + + "list": { + Type: schema.TypeBool, + Required: true, + }, + + "add": { + Type: schema.TypeBool, + Required: true, + }, + + "create": { + Type: schema.TypeBool, + Required: true, + }, + + "update": { + Type: schema.TypeBool, + Required: true, + }, + + "process": { + Type: schema.TypeBool, + Required: true, + }, + }, + }, }, "sas": { @@ -82,15 +166,24 @@ func resourceArmStorageAccountSharedAccessSignature() *schema.Resource { } -func resourceArmStorageAccountSasCreate(d *schema.ResourceData, meta interface{}) error { +func dataSourceArmStorageAccountSasRead(d *schema.ResourceData, meta interface{}) error { connString := d.Get("connection_string").(string) httpsOnly := d.Get("https_only").(bool) - resourceTypes := d.Get("resource_types").(string) - services := d.Get("services").(string) + resourceTypesIface := d.Get("resource_types").([]interface{}) + servicesIface := d.Get("services").([]interface{}) start := d.Get("start").(string) expiry := d.Get("expiry").(string) - permissions := d.Get("permissions").(string) + permissionsIface := d.Get("permissions").([]interface{}) + + resourceTypes := buildResourceTypesString(resourceTypesIface[0].(map[string]interface{})) + services := buildServicesString(servicesIface[0].(map[string]interface{})) + permissions := buildPermissionsString(permissionsIface[0].(map[string]interface{})) + + _, svcErr := validateArmStorageAccountSasResourceTypes(services, "") + if svcErr != nil { + return svcErr[0] + } // Parse the connection string kvp, err := parseAzureStorageAccountConnectionString(connString) @@ -122,15 +215,82 @@ func resourceArmStorageAccountSasCreate(d *schema.ResourceData, meta interface{} return nil } -func resourceArmStorageAccountSasRead(d *schema.ResourceData, meta interface{}) error { - // There really isn't anything to read - // The computed SAS element stores what it needs. - return nil +func buildPermissionsString(perms map[string]interface{}) string { + retVal := "" + + if val := perms["read"].(bool); val { + retVal += "r" + } + + if val := perms["write"].(bool); val { + retVal += "w" + } + + if val := perms["delete"].(bool); val { + retVal += "d" + } + + if val := perms["list"].(bool); val { + retVal += "l" + } + + if val := perms["add"].(bool); val { + retVal += "a" + } + + if val := perms["create"].(bool); val { + retVal += "c" + } + + if val := perms["update"].(bool); val { + retVal += "u" + } + + if val := perms["process"].(bool); val { + retVal += "p" + } + + return retVal } -func resourceArmStorageAccountSasDelete(d *schema.ResourceData, meta interface{}) error { - // Nothing to delete... - return nil +func buildServicesString(services map[string]interface{}) string { + retVal := "" + + if val := services["blob"].(bool); val { + retVal += "b" + } + + if val := services["queue"].(bool); val { + retVal += "q" + } + + if val := services["table"].(bool); val { + retVal += "t" + } + + if val := services["file"].(bool); val { + retVal += "f" + } + + return retVal +} + +func buildResourceTypesString(resTypes map[string]interface{}) string { + retVal := "" + + if val := resTypes["service"].(bool); val { + retVal += "s" + } + + if val := resTypes["container"].(bool); val { + retVal += "c" + } + + if val := resTypes["object"].(bool); val { + retVal += "o" + } + + return retVal } func validateArmStorageAccountSasResourceTypes(v interface{}, k string) (ws []string, es []error) { diff --git a/azurerm/resource_arm_storage_account_sas_test.go b/azurerm/data_source_storage_account_sas_test.go similarity index 100% rename from azurerm/resource_arm_storage_account_sas_test.go rename to azurerm/data_source_storage_account_sas_test.go diff --git a/azurerm/provider.go b/azurerm/provider.go index cb32194ed1b0..4fb9f7df2a81 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -97,6 +97,7 @@ func Provider() terraform.ResourceProvider { "azurerm_scheduler_job_collection": dataSourceArmSchedulerJobCollection(), "azurerm_snapshot": dataSourceArmSnapshot(), "azurerm_storage_account": dataSourceArmStorageAccount(), + "azurerm_storage_account_sas": dataSourceArmStorageAccountSharedAccessSignature(), "azurerm_subnet": dataSourceArmSubnet(), "azurerm_subscription": dataSourceArmSubscription(), "azurerm_subscriptions": dataSourceArmSubscriptions(), @@ -193,7 +194,6 @@ func Provider() terraform.ResourceProvider { "azurerm_sql_active_directory_administrator": resourceArmSqlAdministrator(), "azurerm_sql_server": resourceArmSqlServer(), "azurerm_storage_account": resourceArmStorageAccount(), - "azurerm_storage_account_sas": resourceArmStorageAccountSharedAccessSignature(), "azurerm_storage_blob": resourceArmStorageBlob(), "azurerm_storage_container": resourceArmStorageContainer(), "azurerm_storage_share": resourceArmStorageShare(), From 109629b7bafc174fbcd9a040d79fca64fe59ff1e Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Wed, 21 Mar 2018 15:52:52 -0400 Subject: [PATCH 008/320] Add unit tests for the string building functions. --- azurerm/data_source_storage_account_sas.go | 30 ++--- .../data_source_storage_account_sas_test.go | 119 ++++++++++++++++++ 2 files changed, 134 insertions(+), 15 deletions(-) diff --git a/azurerm/data_source_storage_account_sas.go b/azurerm/data_source_storage_account_sas.go index b0339a42c168..7d7096a6aff8 100644 --- a/azurerm/data_source_storage_account_sas.go +++ b/azurerm/data_source_storage_account_sas.go @@ -218,35 +218,35 @@ func dataSourceArmStorageAccountSasRead(d *schema.ResourceData, meta interface{} func buildPermissionsString(perms map[string]interface{}) string { retVal := "" - if val := perms["read"].(bool); val { + if val, pres := perms["read"].(bool); pres && val { retVal += "r" } - if val := perms["write"].(bool); val { + if val, pres := perms["write"].(bool); pres && val { retVal += "w" } - if val := perms["delete"].(bool); val { + if val, pres := perms["delete"].(bool); pres && val { retVal += "d" } - if val := perms["list"].(bool); val { + if val, pres := perms["list"].(bool); pres && val { retVal += "l" } - if val := perms["add"].(bool); val { + if val, pres := perms["add"].(bool); pres && val { retVal += "a" } - if val := perms["create"].(bool); val { + if val, pres := perms["create"].(bool); pres && val { retVal += "c" } - if val := perms["update"].(bool); val { + if val, pres := perms["update"].(bool); pres && val { retVal += "u" } - if val := perms["process"].(bool); val { + if val, pres := perms["process"].(bool); pres && val { retVal += "p" } @@ -256,19 +256,19 @@ func buildPermissionsString(perms map[string]interface{}) string { func buildServicesString(services map[string]interface{}) string { retVal := "" - if val := services["blob"].(bool); val { + if val, pres := services["blob"].(bool); pres && val { retVal += "b" } - if val := services["queue"].(bool); val { + if val, pres := services["queue"].(bool); pres && val { retVal += "q" } - if val := services["table"].(bool); val { + if val, pres := services["table"].(bool); pres && val { retVal += "t" } - if val := services["file"].(bool); val { + if val, pres := services["file"].(bool); pres && val { retVal += "f" } @@ -278,15 +278,15 @@ func buildServicesString(services map[string]interface{}) string { func buildResourceTypesString(resTypes map[string]interface{}) string { retVal := "" - if val := resTypes["service"].(bool); val { + if val, pres := resTypes["service"].(bool); pres && val { retVal += "s" } - if val := resTypes["container"].(bool); val { + if val, pres := resTypes["container"].(bool); pres && val { retVal += "c" } - if val := resTypes["object"].(bool); val { + if val, pres := resTypes["object"].(bool); pres && val { retVal += "o" } diff --git a/azurerm/data_source_storage_account_sas_test.go b/azurerm/data_source_storage_account_sas_test.go index 434710ae3353..b2be388745f4 100644 --- a/azurerm/data_source_storage_account_sas_test.go +++ b/azurerm/data_source_storage_account_sas_test.go @@ -1,9 +1,128 @@ package azurerm import ( + "fmt" "testing" ) +func TestDataSourceArmStorageAccountSasRead(t *testing.T) { + +} + +func testAccDataSourceAzureRMStorageAccountSas_basic(rInt int, rString string, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestsa-%d" + location = "%s" +} + +resource "azurerm_storage_account" "test" { + name = "acctestsads%s" + resource_group_name = "${azurerm_resource_group.test.name}" + + location = "${azurerm_resource_group.test.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + tags { + environment = "production" + } +} + +data "azurerm_storage_account_sas" "test" { + connection_string = "${azurerm_storage_account.test.primary_connection_string}" + https_only = true + resource_types { + service = true + container = false + object = false + } + services { + blob = true + queue = false + table = false + file = false + } + start = "" + expirty = "" + permissions { + read = true + write = true + delete = false + list = false + add = true + create = true + update = false + process = false + } +} +`, rInt, location, rString) +} + +func TestBuildResourceTypesString(t *testing.T) { + testCases := []struct { + input map[string]interface{} + expected string + }{ + {map[string]interface{}{"service": true}, "s"}, + {map[string]interface{}{"container": true}, "c"}, + {map[string]interface{}{"object": true}, "o"}, + {map[string]interface{}{"service": true, "container": true, "object": true}, "sco"}, + } + + for _, test := range testCases { + result := buildResourceTypesString(test.input) + if test.expected != result { + t.Fatalf("Failed to build resource type string: expected: %s, result: %s", test.expected, result) + } + } +} + +func TestBuildServicesString(t *testing.T) { + testCases := []struct { + input map[string]interface{} + expected string + }{ + {map[string]interface{}{"blob": true}, "b"}, + {map[string]interface{}{"queue": true}, "q"}, + {map[string]interface{}{"table": true}, "t"}, + {map[string]interface{}{"file": true}, "f"}, + {map[string]interface{}{"blob": true, "queue": true, "table": true, "file": true}, "bqtf"}, + } + + for _, test := range testCases { + result := buildServicesString(test.input) + if test.expected != result { + t.Fatalf("Failed to build resource type string: expected: %s, result: %s", test.expected, result) + } + } + +} + +func TestBuildPermissionsString(t *testing.T) { + testCases := []struct { + input map[string]interface{} + expected string + }{ + {map[string]interface{}{"read": true}, "r"}, + {map[string]interface{}{"write": true}, "w"}, + {map[string]interface{}{"delete": true}, "d"}, + {map[string]interface{}{"list": true}, "l"}, + {map[string]interface{}{"add": true}, "a"}, + {map[string]interface{}{"create": true}, "c"}, + {map[string]interface{}{"update": true}, "u"}, + {map[string]interface{}{"process": true}, "p"}, + {map[string]interface{}{"read": true, "write": true, "add": true, "create": true}, "rwac"}, + } + + for _, test := range testCases { + result := buildPermissionsString(test.input) + if test.expected != result { + t.Fatalf("Failed to build resource type string: expected: %s, result: %s", test.expected, result) + } + } +} + func TestValidateArmStorageAccountSasResourceTypes(t *testing.T) { testCases := []struct { input string From 27e8d5a7848e68b298610b0b0dcc5675d4141aaa Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Wed, 21 Mar 2018 15:53:38 -0400 Subject: [PATCH 009/320] Fix warnings on unused func params. --- azurerm/data_source_storage_account_sas.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/data_source_storage_account_sas.go b/azurerm/data_source_storage_account_sas.go index 7d7096a6aff8..5a496c665a8e 100644 --- a/azurerm/data_source_storage_account_sas.go +++ b/azurerm/data_source_storage_account_sas.go @@ -166,7 +166,7 @@ func dataSourceArmStorageAccountSharedAccessSignature() *schema.Resource { } -func dataSourceArmStorageAccountSasRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceArmStorageAccountSasRead(d *schema.ResourceData, _ interface{}) error { connString := d.Get("connection_string").(string) httpsOnly := d.Get("https_only").(bool) @@ -293,7 +293,7 @@ func buildResourceTypesString(resTypes map[string]interface{}) string { return retVal } -func validateArmStorageAccountSasResourceTypes(v interface{}, k string) (ws []string, es []error) { +func validateArmStorageAccountSasResourceTypes(v interface{}, _ string) (ws []string, es []error) { input := v.(string) if !regexp.MustCompile(`\A([cos]{1,3})\z`).MatchString(input) { From c19295dce3925a76414784d168e393d7f8f07cba Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Wed, 21 Mar 2018 17:08:30 -0400 Subject: [PATCH 010/320] Add unit test for the connection string parse. --- azurerm/data_source_storage_account_sas.go | 8 ++-- .../data_source_storage_account_sas_test.go | 37 +++++++++++++++++-- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/azurerm/data_source_storage_account_sas.go b/azurerm/data_source_storage_account_sas.go index 5a496c665a8e..fd2378d00cdc 100644 --- a/azurerm/data_source_storage_account_sas.go +++ b/azurerm/data_source_storage_account_sas.go @@ -180,7 +180,7 @@ func dataSourceArmStorageAccountSasRead(d *schema.ResourceData, _ interface{}) e services := buildServicesString(servicesIface[0].(map[string]interface{})) permissions := buildPermissionsString(permissionsIface[0].(map[string]interface{})) - _, svcErr := validateArmStorageAccountSasResourceTypes(services, "") + _, svcErr := validateArmStorageAccountSasResourceTypes(resourceTypes, "") if svcErr != nil { return svcErr[0] } @@ -297,7 +297,7 @@ func validateArmStorageAccountSasResourceTypes(v interface{}, _ string) (ws []st input := v.(string) if !regexp.MustCompile(`\A([cos]{1,3})\z`).MatchString(input) { - es = append(es, fmt.Errorf("resource Types can only consist of 's', 'c', 'o', and must be between 1 and 3 characters long")) + es = append(es, fmt.Errorf("resource types can only consist of 's', 'c', 'o', and must be between 1 and 3 characters long: found: %s", input)) } return @@ -357,12 +357,14 @@ func computeAzureStorageAccountSas(accountName string, // so its safe to include here for reference to understand the format. // DefaultEndpointsProtocol=https;AccountName=azurermtestsa0;AccountKey=2vJrjEyL4re2nxCEg590wJUUC7PiqqrDHjAN5RU304FNUQieiEwS2bfp83O0v28iSfWjvYhkGmjYQAdd9x+6nw==;EndpointSuffix=core.windows.net -func parseAzureStorageAccountConnectionString(connString string) (kvp map[string]string, err error) { +func parseAzureStorageAccountConnectionString(connString string) (map[string]string, error) { validKeys := map[string]bool{"DefaultEndpointsProtocol": true, "BlobEndpoint": true, "AccountName": true, "AccountKey": true, "EndpointSuffix": true} // The k-v pairs are separated with semi-colons tokens := strings.Split(connString, ";") + kvp := make(map[string]string) + for _, atoken := range tokens { // The individual k-v are separated by an equals sign. kv := strings.SplitN(atoken, "=", 2) diff --git a/azurerm/data_source_storage_account_sas_test.go b/azurerm/data_source_storage_account_sas_test.go index b2be388745f4..2ef914cbfc42 100644 --- a/azurerm/data_source_storage_account_sas_test.go +++ b/azurerm/data_source_storage_account_sas_test.go @@ -10,6 +10,8 @@ func TestDataSourceArmStorageAccountSasRead(t *testing.T) { } func testAccDataSourceAzureRMStorageAccountSas_basic(rInt int, rString string, location string) string { + startDate := "" + endDate := "" return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestsa-%d" @@ -43,8 +45,8 @@ data "azurerm_storage_account_sas" "test" { table = false file = false } - start = "" - expirty = "" + start = "%s" + expiry = "%s" permissions { read = true write = true @@ -56,7 +58,36 @@ data "azurerm_storage_account_sas" "test" { process = false } } -`, rInt, location, rString) +`, rInt, location, rString, startDate, endDate) +} + +func TestParseAzureStorageAccountConnectionString(t *testing.T) { + testCases := []struct { + input string + expectedAccountName string + expectedAccountKey string + }{ + { + "DefaultEndpointsProtocol=https;AccountName=azurermtestsa0;AccountKey=2vJrjEyL4re2nxCEg590wJUUC7PiqqrDHjAN5RU304FNUQieiEwS2bfp83O0v28iSfWjvYhkGmjYQAdd9x+6nw==;EndpointSuffix=core.windows.net", + "azurermtestsa0", + "2vJrjEyL4re2nxCEg590wJUUC7PiqqrDHjAN5RU304FNUQieiEwS2bfp83O0v28iSfWjvYhkGmjYQAdd9x+6nw==", + }, + } + + for _, test := range testCases { + result, err := parseAzureStorageAccountConnectionString(test.input) + if err != nil { + t.Fatalf("Failed to parse resource type string: %s, %q", test.input, result) + } else { + if val, pres := result[connStringAccountKeyKey]; !pres || val != test.expectedAccountKey { + t.Fatalf("Failed to parse Account Key: Expected: %s, Found: %s", test.expectedAccountKey, val) + } + if val, pres := result[connStringAccountNameKey]; !pres || val != test.expectedAccountName { + t.Fatalf("Failed to parse Account Name: Expected: %s, Found: %s", test.expectedAccountName, val) + } + } + } + } func TestBuildResourceTypesString(t *testing.T) { From a1f12ee04f31ef4a319a7861cb61d6b1bd577540 Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Wed, 21 Mar 2018 17:32:18 -0400 Subject: [PATCH 011/320] Make sure to set the id of the data source element. --- azurerm/data_source_storage_account_sas.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/azurerm/data_source_storage_account_sas.go b/azurerm/data_source_storage_account_sas.go index fd2378d00cdc..863d701612e1 100644 --- a/azurerm/data_source_storage_account_sas.go +++ b/azurerm/data_source_storage_account_sas.go @@ -11,6 +11,7 @@ import ( "crypto/hmac" "crypto/sha256" + "encoding/hex" ) const ( @@ -27,9 +28,10 @@ func dataSourceArmStorageAccountSharedAccessSignature() *schema.Resource { Schema: map[string]*schema.Schema{ "connection_string": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, + Sensitive: true, }, "https_only": { @@ -158,8 +160,9 @@ func dataSourceArmStorageAccountSharedAccessSignature() *schema.Resource { }, "sas": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, }, } @@ -211,6 +214,8 @@ func dataSourceArmStorageAccountSasRead(d *schema.ResourceData, _ interface{}) e } d.Set("sas", sasToken) + tokenHash := sha256.Sum256([]byte(sasToken)) + d.SetId(hex.EncodeToString(tokenHash[:])) return nil } From 66c8acae7bce93339b2338f678e184b0fb7569e3 Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Thu, 22 Mar 2018 10:56:16 -0400 Subject: [PATCH 012/320] Make https_only an optional/defaulted field. --- azurerm/data_source_storage_account_sas.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azurerm/data_source_storage_account_sas.go b/azurerm/data_source_storage_account_sas.go index 863d701612e1..3bbc839018d0 100644 --- a/azurerm/data_source_storage_account_sas.go +++ b/azurerm/data_source_storage_account_sas.go @@ -36,7 +36,8 @@ func dataSourceArmStorageAccountSharedAccessSignature() *schema.Resource { "https_only": { Type: schema.TypeBool, - Required: true, + Optional: true, + Default: true, ForceNew: true, }, From d16f5df59032d7f1c4476e28895047859ca657dc Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Thu, 22 Mar 2018 10:56:47 -0400 Subject: [PATCH 013/320] Add documentation for data source `azurerm_storage_account_sas`. --- website/azurerm.erb | 4 + .../docs/d/storage_account_sas.html.markdown | 87 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 website/docs/d/storage_account_sas.html.markdown diff --git a/website/azurerm.erb b/website/azurerm.erb index 009d3583e01f..76bf6da89c66 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -103,6 +103,10 @@ azurerm_storage_account + > + azurerm_storage_account_sas + + > azurerm_subnet diff --git a/website/docs/d/storage_account_sas.html.markdown b/website/docs/d/storage_account_sas.html.markdown new file mode 100644 index 000000000000..8fda6bdff206 --- /dev/null +++ b/website/docs/d/storage_account_sas.html.markdown @@ -0,0 +1,87 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_storage_account_sas" +sidebar_current: "docs-azurerm-datasource-storage-account-sas" +description: |- + Create a Shared Access Signature (SAS) for an Azure Storage Account. + +--- + +# Data Source: azurerm_storage_account_sas + +Use this data source to create a Shared Access Signature (SAS) for an Azure Storage Account. + +Shared access signatures allow fine-grained, ephemeral access control to various aspects of an Azure Storage Account. + +Note that this is an [Account SAS](https://docs.microsoft.com/en-us/rest/api/storageservices/constructing-an-account-sas) +and *not* a [Service SAS](https://docs.microsoft.com/en-us/rest/api/storageservices/constructing-a-service-sas). + +## Example Usage + +```hcl +resource "azurerm_resource_group" "testrg" { + name = "resourceGroupName" + location = "westus" +} + +resource "azurerm_storage_account" "testsa" { + name = "storageaccountname" + resource_group_name = "${azurerm_resource_group.testrg.name}" + location = "westus" + account_tier = "Standard" + account_replication_type = "GRS" + + tags { + environment = "staging" + } +} + +data "azurerm_storage_account_sas" "test" { + connection_string = "${azurerm_storage_account.testsa.primary_connection_string}" + https_only = true + resource_types { + service = true + container = false + object = false + } + services { + blob = true + queue = false + table = false + file = false + } + start = "2018-03-21" + expiry = "2020-03-21" + permissions { + read = true + write = true + delete = false + list = false + add = true + create = true + update = false + process = false + } +} + +output "sas_url_query_string" { + value = "${data.azurerm_storage_account_sas.sas}" +} +``` + +## Argument Reference + +* `connection_string` - (Required) The connection string for the storage account to which this SAS applies. Typically directly from the `primary_connection_string` attribute of a terraform created `azurerm_storage_account` resource. +* `https_only` - (Optional) Only permit `https` access. If `false`, both `http` and `https` are permitted. (Default `true`) +* `resouce_types` - (Required) A set of true/false flags which define the storage account resource types that are granted access by this SAS. +* `services` - (Required) A set of true/false flags which define the storage account services that are granted access by this SAS. +* `start` - (Required) The starting time and date of validity of this SAS. Must be a valid ISO-8601 format time/date string. +* `expiry` - (Required) The expiration time and date of this SAS. Must be a valid ISO-8601 format time/date string. +* `permissions` - (Required) A set of true/false flags which define the granted permissions. + +Refer to the [SAS creation reference from Azure](https://docs.microsoft.com/en-us/rest/api/storageservices/constructing-an-account-sas) +for additional details on the fields above. + +## Attributes Reference + +* `sas` - (Computed) The computed Account Shared Access Signature (SAS). From 608808360f262f3620c9f7e5debf212a42961723 Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Thu, 22 Mar 2018 14:16:37 -0400 Subject: [PATCH 014/320] WIP: Add acceptance test. --- .../data_source_storage_account_sas_test.go | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/azurerm/data_source_storage_account_sas_test.go b/azurerm/data_source_storage_account_sas_test.go index 2ef914cbfc42..09550215b963 100644 --- a/azurerm/data_source_storage_account_sas_test.go +++ b/azurerm/data_source_storage_account_sas_test.go @@ -2,16 +2,39 @@ package azurerm import ( "fmt" + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" "testing" + "time" ) -func TestDataSourceArmStorageAccountSasRead(t *testing.T) { +func TestAccDataSourceArmStorageAccountSasRead(t *testing.T) { + dataSourceName := "data.azurerm_storage_account_sas.test" + rInt := acctest.RandInt() + rString := acctest.RandString(4) + location := testLocation() + utcNow := time.Now().UTC() + startDate := utcNow.Format(time.RFC3339) + endDate := utcNow.Add(time.Hour * 24).Format(time.RFC3339) + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMStorageAccountSas_basic(rInt, rString, location, startDate, endDate), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "https_only", "true"), + resource.TestCheckResourceAttr(dataSourceName, "start", startDate), + resource.TestCheckResourceAttr(dataSourceName, "expiry", endDate), + resource.TestCheckResourceAttrSet(dataSourceName, "sas"), + ), + }, + }, + }) } -func testAccDataSourceAzureRMStorageAccountSas_basic(rInt int, rString string, location string) string { - startDate := "" - endDate := "" +func testAccDataSourceAzureRMStorageAccountSas_basic(rInt int, rString string, location string, startDate string, endDate string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestsa-%d" From e2b4cf291d6dabef0ec3914b1eb65ac2283241f3 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 19 Apr 2018 05:05:08 -0700 Subject: [PATCH 015/320] New Resource/Data Source: `azurerm_recovery_services_vault` (#995) * Added new resource azurerm_recovery_services_vault and data source azurerm_recovery_services_vault * updating to include the latest sdk * Duplicating the checks for consistency * Making govendor happy * Data Source: name should be ForceNew --- azurerm/config.go | 11 + .../data_source_recovery_services_vault.go | 69 + ...ata_source_recovery_services_vault_test.go | 44 + azurerm/provider.go | 2 + .../resource_arm_recovery_services_vault.go | 149 +++ ...source_arm_recovery_services_vault_test.go | 114 ++ examples/recoveryservice-vault/main.tf | 12 + examples/recoveryservice-vault/outputs.tf | 4 + examples/recoveryservice-vault/variables.tf | 11 + .../2016-06-01/recoveryservices/client.go | 51 + .../2016-06-01/recoveryservices/models.go | 1190 +++++++++++++++++ .../2016-06-01/recoveryservices/operations.go | 126 ++ .../recoveryservices/registeredidentities.go | 107 ++ .../recoveryservices/replicationusages.go | 107 ++ .../2016-06-01/recoveryservices/usages.go | 107 ++ .../recoveryservices/vaultcertificates.go | 111 ++ .../recoveryservices/vaultextendedinfo.go | 245 ++++ .../2016-06-01/recoveryservices/vaults.go | 494 +++++++ .../2016-06-01/recoveryservices/version.go | 30 + vendor/vendor.json | 10 +- website/azurerm.erb | 13 + .../docs/d/recovery_services_vault.markdown | 40 + .../docs/r/recovery_services_vault.markdown | 57 + 23 files changed, 3103 insertions(+), 1 deletion(-) create mode 100644 azurerm/data_source_recovery_services_vault.go create mode 100644 azurerm/data_source_recovery_services_vault_test.go create mode 100644 azurerm/resource_arm_recovery_services_vault.go create mode 100644 azurerm/resource_arm_recovery_services_vault_test.go create mode 100644 examples/recoveryservice-vault/main.tf create mode 100644 examples/recoveryservice-vault/outputs.tf create mode 100644 examples/recoveryservice-vault/variables.tf create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/client.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/models.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/operations.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/registeredidentities.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/replicationusages.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/usages.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultcertificates.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultextendedinfo.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaults.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/version.go create mode 100644 website/docs/d/recovery_services_vault.markdown create mode 100644 website/docs/r/recovery_services_vault.markdown diff --git a/azurerm/config.go b/azurerm/config.go index 488cd7ecf9dc..2249cbaf9658 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -32,6 +32,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights" "github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement" "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql" + "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices" "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/locks" @@ -166,6 +167,9 @@ type ArmClient struct { vnetPeeringsClient network.VirtualNetworkPeeringsClient watcherClient network.WatchersClient + // Recovery Services + recoveryServicesVaultsClient recoveryservices.VaultsClient + // Resources managementLocksClient locks.ManagementLocksClient deploymentsClient resources.DeploymentsClient @@ -373,6 +377,7 @@ func getArmClient(c *authentication.Config) (*ArmClient, error) { client.registerMonitorClients(endpoint, c.SubscriptionID, auth, sender) client.registerNetworkingClients(endpoint, c.SubscriptionID, auth, sender) client.registerOperationalInsightsClients(endpoint, c.SubscriptionID, auth, sender) + client.registerRecoveryServiceClients(endpoint, c.SubscriptionID, auth) client.registerRedisClients(endpoint, c.SubscriptionID, auth, sender) client.registerResourcesClients(endpoint, c.SubscriptionID, auth) client.registerSearchClients(endpoint, c.SubscriptionID, auth) @@ -786,6 +791,12 @@ func (c *ArmClient) registerOperationalInsightsClients(endpoint, subscriptionId c.solutionsClient = solutionsClient } +func (c *ArmClient) registerRecoveryServiceClients(endpoint, subscriptionId string, auth autorest.Authorizer) { + vaultsClient := recoveryservices.NewVaultsClientWithBaseURI(endpoint, subscriptionId) + c.configureClient(&vaultsClient.Client, auth) + c.recoveryServicesVaultsClient = vaultsClient +} + func (c *ArmClient) registerRedisClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) { redisClient := redis.NewClientWithBaseURI(endpoint, subscriptionId) c.configureClient(&redisClient.Client, auth) diff --git a/azurerm/data_source_recovery_services_vault.go b/azurerm/data_source_recovery_services_vault.go new file mode 100644 index 000000000000..203dbf4286a7 --- /dev/null +++ b/azurerm/data_source_recovery_services_vault.go @@ -0,0 +1,69 @@ +package azurerm + +import ( + "fmt" + "log" + + "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmRecoveryServicesVault() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmRecoveryServicesVaultRead, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "location": locationForDataSourceSchema(), + + "resource_group_name": resourceGroupNameForDataSourceSchema(), + + "tags": tagsForDataSourceSchema(), + + "sku": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} + +func dataSourceArmRecoveryServicesVaultRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).recoveryServicesVaultsClient + ctx := meta.(*ArmClient).StopContext + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + log.Printf("[DEBUG] Reading Recovery Service Vault %q (resource group %q)", name, resourceGroup) + + vault, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(vault.Response) { + d.SetId("") + return nil + } + + return fmt.Errorf("Error making Read request on Recovery Service Vault %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.SetId(*vault.ID) + d.Set("name", vault.Name) + d.Set("location", azureRMNormalizeLocation(*vault.Location)) + d.Set("resource_group_name", resourceGroup) + + if sku := vault.Sku; sku != nil { + d.Set("sku", string(sku.Name)) + } + + flattenAndSetTags(d, vault.Tags) + return nil +} diff --git a/azurerm/data_source_recovery_services_vault_test.go b/azurerm/data_source_recovery_services_vault_test.go new file mode 100644 index 000000000000..d654c5e16d58 --- /dev/null +++ b/azurerm/data_source_recovery_services_vault_test.go @@ -0,0 +1,44 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices" + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccDataSourceAzureRMRecoveryServicesVault_basic(t *testing.T) { + dataSourceName := "data.azurerm_recovery_services_vault.test" + ri := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceRecoveryServicesVault_basic(ri, testLocation()), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMRecoveryServicesVaultExists(dataSourceName), + resource.TestCheckResourceAttrSet(dataSourceName, "name"), + resource.TestCheckResourceAttrSet(dataSourceName, "location"), + resource.TestCheckResourceAttrSet(dataSourceName, "resource_group_name"), + resource.TestCheckResourceAttr(dataSourceName, "tags.%", "0"), + resource.TestCheckResourceAttr(dataSourceName, "sku", string(recoveryservices.Standard)), + ), + }, + }, + }) +} + +func testAccDataSourceRecoveryServicesVault_basic(rInt int, location string) string { + return fmt.Sprintf(` +%s + +data "azurerm_recovery_services_vault" "test" { + name = "${azurerm_recovery_services_vault.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, testAccAzureRMRecoveryServicesVault_basic(rInt, location)) +} diff --git a/azurerm/provider.go b/azurerm/provider.go index 4439a2ce415c..ac2afb83958b 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -93,6 +93,7 @@ func Provider() terraform.ResourceProvider { "azurerm_platform_image": dataSourceArmPlatformImage(), "azurerm_public_ip": dataSourceArmPublicIP(), "azurerm_public_ips": dataSourceArmPublicIPs(), + "azurerm_recovery_services_vault": dataSourceArmRecoveryServicesVault(), "azurerm_resource_group": dataSourceArmResourceGroup(), "azurerm_role_definition": dataSourceArmRoleDefinition(), "azurerm_scheduler_job_collection": dataSourceArmSchedulerJobCollection(), @@ -179,6 +180,7 @@ func Provider() terraform.ResourceProvider { "azurerm_postgresql_firewall_rule": resourceArmPostgreSQLFirewallRule(), "azurerm_postgresql_server": resourceArmPostgreSQLServer(), "azurerm_public_ip": resourceArmPublicIp(), + "azurerm_recovery_services_vault": resourceArmRecoveryServicesVault(), "azurerm_redis_cache": resourceArmRedisCache(), "azurerm_redis_firewall_rule": resourceArmRedisFirewallRule(), "azurerm_resource_group": resourceArmResourceGroup(), diff --git a/azurerm/resource_arm_recovery_services_vault.go b/azurerm/resource_arm_recovery_services_vault.go new file mode 100644 index 000000000000..bdc1860ead3e --- /dev/null +++ b/azurerm/resource_arm_recovery_services_vault.go @@ -0,0 +1,149 @@ +package azurerm + +import ( + "fmt" + "log" + "regexp" + + "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices" + + "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmRecoveryServicesVault() *schema.Resource { + return &schema.Resource{ + Create: resourceArmRecoveryServicesVaultCreateUpdate, + Read: resourceArmRecoveryServicesVaultRead, + Update: resourceArmRecoveryServicesVaultCreateUpdate, + Delete: resourceArmRecoveryServicesVaultDelete, + + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringMatch( + regexp.MustCompile("^[a-zA-Z][-a-zA-Z0-9]{1,49}$"), + "Recovery Service Vault name must be 2 - 50 characters long, start with a letter, contain only letters, numbers and hyphens.", + ), + }, + + "location": locationSchema(), + + "resource_group_name": resourceGroupNameSchema(), + + "tags": tagsSchema(), + + "sku": { + Type: schema.TypeString, + Required: true, + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ValidateFunc: validation.StringInSlice([]string{ + string(recoveryservices.RS0), + string(recoveryservices.Standard), + }, true), + }, + }, + } +} + +func resourceArmRecoveryServicesVaultCreateUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).recoveryServicesVaultsClient + ctx := meta.(*ArmClient).StopContext + + name := d.Get("name").(string) + location := d.Get("location").(string) + resourceGroup := d.Get("resource_group_name").(string) + tags := d.Get("tags").(map[string]interface{}) + + log.Printf("[DEBUG] Creating/updating Recovery Service Vault %q (resource group %q)", name, resourceGroup) + + //build vault struct + vault := recoveryservices.Vault{ + Location: utils.String(location), + Tags: expandTags(tags), + Sku: &recoveryservices.Sku{ + Name: recoveryservices.SkuName(d.Get("sku").(string)), + }, + Properties: &recoveryservices.VaultProperties{}, + } + + //create recovery services vault + vault, err := client.CreateOrUpdate(ctx, resourceGroup, name, vault) + if err != nil { + return fmt.Errorf("Error creating/updating Recovery Service Vault %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.SetId(*vault.ID) + + return resourceArmRecoveryServicesVaultRead(d, meta) +} + +func resourceArmRecoveryServicesVaultRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).recoveryServicesVaultsClient + ctx := meta.(*ArmClient).StopContext + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + + name := id.Path["vaults"] + resourceGroup := id.ResourceGroup + + log.Printf("[DEBUG] Reading Recovery Service Vault %q (resource group %q)", name, resourceGroup) + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + + return fmt.Errorf("Error making Read request on Recovery Service Vault %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.Set("name", resp.Name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azureRMNormalizeLocation(*location)) + } + + if sku := resp.Sku; sku != nil { + d.Set("sku", string(sku.Name)) + } + + flattenAndSetTags(d, resp.Tags) + + return nil +} + +func resourceArmRecoveryServicesVaultDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).recoveryServicesVaultsClient + ctx := meta.(*ArmClient).StopContext + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + + name := id.Path["vaults"] + resourceGroup := id.ResourceGroup + + log.Printf("[DEBUG] Deleting Recovery Service Vault %q (resource group %q)", name, resourceGroup) + + resp, err := client.Delete(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(resp) { + return fmt.Errorf("Error issuing delete request for Recovery Service Vault %q (Resource Group %q): %+v", name, resourceGroup, err) + } + } + + return nil +} diff --git a/azurerm/resource_arm_recovery_services_vault_test.go b/azurerm/resource_arm_recovery_services_vault_test.go new file mode 100644 index 000000000000..7af1affe15d1 --- /dev/null +++ b/azurerm/resource_arm_recovery_services_vault_test.go @@ -0,0 +1,114 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func TestAccAzureRMRecoveryServicesVault_basic(t *testing.T) { + ri := acctest.RandInt() + + resourceName := "azurerm_recovery_services_vault.test" + config := testAccAzureRMRecoveryServicesVault_basic(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRecoveryServicesVaultDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMRecoveryServicesVaultExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "name"), + resource.TestCheckResourceAttrSet(resourceName, "location"), + resource.TestCheckResourceAttrSet(resourceName, "resource_group_name"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttr(resourceName, "sku", string(recoveryservices.Standard)), + ), + }, + }, + }) +} + +func testCheckAzureRMRecoveryServicesVaultDestroy(s *terraform.State) error { + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_recovery_services_vault" { + continue + } + + name := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + client := testAccProvider.Meta().(*ArmClient).recoveryServicesVaultsClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + resp, err := client.Get(ctx, resourceGroup, name) + + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return nil + } + + return err + } + + return fmt.Errorf("Recovery Services Vault still exists:\n%#v", resp) + } + + return nil +} + +func testCheckAzureRMRecoveryServicesVaultExists(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %q", name) + } + + name := rs.Primary.Attributes["name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for Recovery Services Vault: %q", name) + } + + client := testAccProvider.Meta().(*ArmClient).recoveryServicesVaultsClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + resp, err := client.Get(ctx, resourceGroup, name) + + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Recovery Services Vault %q (resource group: %q) was not found: %+v", name, resourceGroup, err) + } + + return fmt.Errorf("Bad: Get on recoveryServicesVaultsClient: %+v", err) + } + + return nil + } +} + +func testAccAzureRMRecoveryServicesVault_basic(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_recovery_services_vault" "test" { + name = "acctest-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "Standard" +} + +`, rInt, location, rInt) +} diff --git a/examples/recoveryservice-vault/main.tf b/examples/recoveryservice-vault/main.tf new file mode 100644 index 000000000000..b54ef863e64e --- /dev/null +++ b/examples/recoveryservice-vault/main.tf @@ -0,0 +1,12 @@ + +resource "azurerm_resource_group" "rg" { + name = "${var.resource_group_name}" + location = "${var.resource_group_location}" +} + +resource "azurerm_recovery_services_vault" "vault" { + name = "example-recovery-vault" + location = "${azurerm_resource_group.rg.location}" + resource_group_name = "${azurerm_resource_group.rg.name}" + sku = "Standard" +} diff --git a/examples/recoveryservice-vault/outputs.tf b/examples/recoveryservice-vault/outputs.tf new file mode 100644 index 000000000000..1e18aee70d71 --- /dev/null +++ b/examples/recoveryservice-vault/outputs.tf @@ -0,0 +1,4 @@ + +output "vault-id" { + value = "${azurerm_recovery_services_vault.vault.id}" +} \ No newline at end of file diff --git a/examples/recoveryservice-vault/variables.tf b/examples/recoveryservice-vault/variables.tf new file mode 100644 index 000000000000..bbec5d88f6b5 --- /dev/null +++ b/examples/recoveryservice-vault/variables.tf @@ -0,0 +1,11 @@ +variable "resource_group_name" { + type = "string" + description = "Name of the azure resource group." + default = "tfex-recovery_vault" +} + +variable "resource_group_location" { + type = "string" + description = "Location of the azure resource group." + default = "westus" +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/client.go new file mode 100644 index 000000000000..221b1dd05edb --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/client.go @@ -0,0 +1,51 @@ +// Package recoveryservices implements the Azure ARM Recoveryservices service API version 2016-06-01. +// +// Recovery Services Client +package recoveryservices + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" +) + +const ( + // DefaultBaseURI is the default URI used for the service Recoveryservices + DefaultBaseURI = "https://management.azure.com" +) + +// BaseClient is the base client for Recoveryservices. +type BaseClient struct { + autorest.Client + BaseURI string + SubscriptionID string +} + +// New creates an instance of the BaseClient client. +func New(subscriptionID string) BaseClient { + return NewWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewWithBaseURI creates an instance of the BaseClient client. +func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { + return BaseClient{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + BaseURI: baseURI, + SubscriptionID: subscriptionID, + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/models.go new file mode 100644 index 000000000000..f9bb1290b62e --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/models.go @@ -0,0 +1,1190 @@ +package recoveryservices + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "encoding/json" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/date" + "github.com/Azure/go-autorest/autorest/to" + "net/http" +) + +// AuthType enumerates the values for auth type. +type AuthType string + +const ( + // AAD ... + AAD AuthType = "AAD" + // AccessControlService ... + AccessControlService AuthType = "AccessControlService" + // ACS ... + ACS AuthType = "ACS" + // AzureActiveDirectory ... + AzureActiveDirectory AuthType = "AzureActiveDirectory" + // Invalid ... + Invalid AuthType = "Invalid" +) + +// PossibleAuthTypeValues returns an array of possible values for the AuthType const type. +func PossibleAuthTypeValues() []AuthType { + return []AuthType{AAD, AccessControlService, ACS, AzureActiveDirectory, Invalid} +} + +// AuthTypeBasicResourceCertificateDetails enumerates the values for auth type basic resource certificate +// details. +type AuthTypeBasicResourceCertificateDetails string + +const ( + // AuthTypeAccessControlService ... + AuthTypeAccessControlService AuthTypeBasicResourceCertificateDetails = "AccessControlService" + // AuthTypeAzureActiveDirectory ... + AuthTypeAzureActiveDirectory AuthTypeBasicResourceCertificateDetails = "AzureActiveDirectory" + // AuthTypeResourceCertificateDetails ... + AuthTypeResourceCertificateDetails AuthTypeBasicResourceCertificateDetails = "ResourceCertificateDetails" +) + +// PossibleAuthTypeBasicResourceCertificateDetailsValues returns an array of possible values for the AuthTypeBasicResourceCertificateDetails const type. +func PossibleAuthTypeBasicResourceCertificateDetailsValues() []AuthTypeBasicResourceCertificateDetails { + return []AuthTypeBasicResourceCertificateDetails{AuthTypeAccessControlService, AuthTypeAzureActiveDirectory, AuthTypeResourceCertificateDetails} +} + +// SkuName enumerates the values for sku name. +type SkuName string + +const ( + // RS0 ... + RS0 SkuName = "RS0" + // Standard ... + Standard SkuName = "Standard" +) + +// PossibleSkuNameValues returns an array of possible values for the SkuName const type. +func PossibleSkuNameValues() []SkuName { + return []SkuName{RS0, Standard} +} + +// TriggerType enumerates the values for trigger type. +type TriggerType string + +const ( + // ForcedUpgrade ... + ForcedUpgrade TriggerType = "ForcedUpgrade" + // UserTriggered ... + UserTriggered TriggerType = "UserTriggered" +) + +// PossibleTriggerTypeValues returns an array of possible values for the TriggerType const type. +func PossibleTriggerTypeValues() []TriggerType { + return []TriggerType{ForcedUpgrade, UserTriggered} +} + +// UsagesUnit enumerates the values for usages unit. +type UsagesUnit string + +const ( + // Bytes ... + Bytes UsagesUnit = "Bytes" + // BytesPerSecond ... + BytesPerSecond UsagesUnit = "BytesPerSecond" + // Count ... + Count UsagesUnit = "Count" + // CountPerSecond ... + CountPerSecond UsagesUnit = "CountPerSecond" + // Percent ... + Percent UsagesUnit = "Percent" + // Seconds ... + Seconds UsagesUnit = "Seconds" +) + +// PossibleUsagesUnitValues returns an array of possible values for the UsagesUnit const type. +func PossibleUsagesUnitValues() []UsagesUnit { + return []UsagesUnit{Bytes, BytesPerSecond, Count, CountPerSecond, Percent, Seconds} +} + +// VaultUpgradeState enumerates the values for vault upgrade state. +type VaultUpgradeState string + +const ( + // Failed ... + Failed VaultUpgradeState = "Failed" + // InProgress ... + InProgress VaultUpgradeState = "InProgress" + // Unknown ... + Unknown VaultUpgradeState = "Unknown" + // Upgraded ... + Upgraded VaultUpgradeState = "Upgraded" +) + +// PossibleVaultUpgradeStateValues returns an array of possible values for the VaultUpgradeState const type. +func PossibleVaultUpgradeStateValues() []VaultUpgradeState { + return []VaultUpgradeState{Failed, InProgress, Unknown, Upgraded} +} + +// CertificateRequest details of the certificate to be uploaded to the vault. +type CertificateRequest struct { + Properties *RawCertificateData `json:"properties,omitempty"` +} + +// ClientDiscoveryDisplay localized display information of an operation. +type ClientDiscoveryDisplay struct { + // Provider - Name of the provider for display purposes + Provider *string `json:"provider,omitempty"` + // Resource - ResourceType for which this Operation can be performed. + Resource *string `json:"resource,omitempty"` + // Operation - Operations Name itself. + Operation *string `json:"operation,omitempty"` + // Description - Description of the operation having details of what operation is about. + Description *string `json:"description,omitempty"` +} + +// ClientDiscoveryForLogSpecification class to represent shoebox log specification in json client discovery. +type ClientDiscoveryForLogSpecification struct { + // Name - Name of the log. + Name *string `json:"name,omitempty"` + // DisplayName - Localized display name + DisplayName *string `json:"displayName,omitempty"` + // BlobDuration - Blobs created in customer storage account per hour + BlobDuration *string `json:"blobDuration,omitempty"` +} + +// ClientDiscoveryForProperties class to represent shoebox properties in json client discovery. +type ClientDiscoveryForProperties struct { + // ServiceSpecification - Operation properties. + ServiceSpecification *ClientDiscoveryForServiceSpecification `json:"serviceSpecification,omitempty"` +} + +// ClientDiscoveryForServiceSpecification class to represent shoebox service specification in json client +// discovery. +type ClientDiscoveryForServiceSpecification struct { + // LogSpecifications - List of log specifications of this operation. + LogSpecifications *[]ClientDiscoveryForLogSpecification `json:"logSpecifications,omitempty"` +} + +// ClientDiscoveryResponse operations List response which contains list of available APIs. +type ClientDiscoveryResponse struct { + autorest.Response `json:"-"` + // Value - List of available operationss. + Value *[]ClientDiscoveryValueForSingleAPI `json:"value,omitempty"` + // NextLink - Link to the next chunk of the response + NextLink *string `json:"nextLink,omitempty"` +} + +// ClientDiscoveryResponseIterator provides access to a complete listing of ClientDiscoveryValueForSingleAPI +// values. +type ClientDiscoveryResponseIterator struct { + i int + page ClientDiscoveryResponsePage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *ClientDiscoveryResponseIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter ClientDiscoveryResponseIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter ClientDiscoveryResponseIterator) Response() ClientDiscoveryResponse { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter ClientDiscoveryResponseIterator) Value() ClientDiscoveryValueForSingleAPI { + if !iter.page.NotDone() { + return ClientDiscoveryValueForSingleAPI{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (cdr ClientDiscoveryResponse) IsEmpty() bool { + return cdr.Value == nil || len(*cdr.Value) == 0 +} + +// clientDiscoveryResponsePreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (cdr ClientDiscoveryResponse) clientDiscoveryResponsePreparer() (*http.Request, error) { + if cdr.NextLink == nil || len(to.String(cdr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(cdr.NextLink))) +} + +// ClientDiscoveryResponsePage contains a page of ClientDiscoveryValueForSingleAPI values. +type ClientDiscoveryResponsePage struct { + fn func(ClientDiscoveryResponse) (ClientDiscoveryResponse, error) + cdr ClientDiscoveryResponse +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *ClientDiscoveryResponsePage) Next() error { + next, err := page.fn(page.cdr) + if err != nil { + return err + } + page.cdr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page ClientDiscoveryResponsePage) NotDone() bool { + return !page.cdr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page ClientDiscoveryResponsePage) Response() ClientDiscoveryResponse { + return page.cdr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page ClientDiscoveryResponsePage) Values() []ClientDiscoveryValueForSingleAPI { + if page.cdr.IsEmpty() { + return nil + } + return *page.cdr.Value +} + +// ClientDiscoveryValueForSingleAPI available operation details. +type ClientDiscoveryValueForSingleAPI struct { + // Name - Name of the Operation. + Name *string `json:"name,omitempty"` + // Display - Contains the localized display information for this particular operation + Display *ClientDiscoveryDisplay `json:"display,omitempty"` + // Origin - The intended executor of the operation;governs the display of the operation in the RBAC UX and the audit logs UX + Origin *string `json:"origin,omitempty"` + // Properties - ShoeBox properties for the given operation. + Properties *ClientDiscoveryForProperties `json:"properties,omitempty"` +} + +// JobsSummary summary of the replication job data for this vault. +type JobsSummary struct { + // FailedJobs - Count of failed jobs. + FailedJobs *int32 `json:"failedJobs,omitempty"` + // SuspendedJobs - Count of suspended jobs. + SuspendedJobs *int32 `json:"suspendedJobs,omitempty"` + // InProgressJobs - Count of in-progress jobs. + InProgressJobs *int32 `json:"inProgressJobs,omitempty"` +} + +// MonitoringSummary summary of the replication monitoring data for this vault. +type MonitoringSummary struct { + // UnHealthyVMCount - Count of unhealthy VMs. + UnHealthyVMCount *int32 `json:"unHealthyVmCount,omitempty"` + // UnHealthyProviderCount - Count of unhealthy replication providers. + UnHealthyProviderCount *int32 `json:"unHealthyProviderCount,omitempty"` + // EventsCount - Count of all critical warnings. + EventsCount *int32 `json:"eventsCount,omitempty"` + // DeprecatedProviderCount - Count of all deprecated recovery service providers. + DeprecatedProviderCount *int32 `json:"deprecatedProviderCount,omitempty"` + // SupportedProviderCount - Count of all the supported recovery service providers. + SupportedProviderCount *int32 `json:"supportedProviderCount,omitempty"` + // UnsupportedProviderCount - Count of all the unsupported recovery service providers. + UnsupportedProviderCount *int32 `json:"unsupportedProviderCount,omitempty"` +} + +// NameInfo the name of usage. +type NameInfo struct { + // Value - Value of usage. + Value *string `json:"value,omitempty"` + // LocalizedValue - Localized value of usage. + LocalizedValue *string `json:"localizedValue,omitempty"` +} + +// PatchTrackedResource tracked resource with location. +type PatchTrackedResource struct { + // Location - Resource location. + Location *string `json:"location,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // ID - Resource Id represents the complete path to the resource. + ID *string `json:"id,omitempty"` + // Name - Resource name associated with the resource. + Name *string `json:"name,omitempty"` + // Type - Resource type represents the complete path of the form Namespace/ResourceType/ResourceType/... + Type *string `json:"type,omitempty"` + // ETag - Optional ETag. + ETag *string `json:"eTag,omitempty"` +} + +// MarshalJSON is the custom marshaler for PatchTrackedResource. +func (ptr PatchTrackedResource) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ptr.Location != nil { + objectMap["location"] = ptr.Location + } + if ptr.Tags != nil { + objectMap["tags"] = ptr.Tags + } + if ptr.ID != nil { + objectMap["id"] = ptr.ID + } + if ptr.Name != nil { + objectMap["name"] = ptr.Name + } + if ptr.Type != nil { + objectMap["type"] = ptr.Type + } + if ptr.ETag != nil { + objectMap["eTag"] = ptr.ETag + } + return json.Marshal(objectMap) +} + +// PatchVault patch Resource information, as returned by the resource provider. +type PatchVault struct { + Properties *VaultProperties `json:"properties,omitempty"` + Sku *Sku `json:"sku,omitempty"` + // Location - Resource location. + Location *string `json:"location,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // ID - Resource Id represents the complete path to the resource. + ID *string `json:"id,omitempty"` + // Name - Resource name associated with the resource. + Name *string `json:"name,omitempty"` + // Type - Resource type represents the complete path of the form Namespace/ResourceType/ResourceType/... + Type *string `json:"type,omitempty"` + // ETag - Optional ETag. + ETag *string `json:"eTag,omitempty"` +} + +// MarshalJSON is the custom marshaler for PatchVault. +func (pv PatchVault) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if pv.Properties != nil { + objectMap["properties"] = pv.Properties + } + if pv.Sku != nil { + objectMap["sku"] = pv.Sku + } + if pv.Location != nil { + objectMap["location"] = pv.Location + } + if pv.Tags != nil { + objectMap["tags"] = pv.Tags + } + if pv.ID != nil { + objectMap["id"] = pv.ID + } + if pv.Name != nil { + objectMap["name"] = pv.Name + } + if pv.Type != nil { + objectMap["type"] = pv.Type + } + if pv.ETag != nil { + objectMap["eTag"] = pv.ETag + } + return json.Marshal(objectMap) +} + +// RawCertificateData raw certificate data. +type RawCertificateData struct { + // AuthType - Specifies the authentication type. Possible values include: 'Invalid', 'ACS', 'AAD', 'AccessControlService', 'AzureActiveDirectory' + AuthType AuthType `json:"authType,omitempty"` + // Certificate - The base64 encoded certificate raw data string + Certificate *[]byte `json:"certificate,omitempty"` +} + +// ReplicationUsage replication usages of a vault. +type ReplicationUsage struct { + // MonitoringSummary - Summary of the replication monitoring data for this vault. + MonitoringSummary *MonitoringSummary `json:"monitoringSummary,omitempty"` + // JobsSummary - Summary of the replication jobs data for this vault. + JobsSummary *JobsSummary `json:"jobsSummary,omitempty"` + // ProtectedItemCount - Number of replication protected items for this vault. + ProtectedItemCount *int32 `json:"protectedItemCount,omitempty"` + // RecoveryPlanCount - Number of replication recovery plans for this vault. + RecoveryPlanCount *int32 `json:"recoveryPlanCount,omitempty"` + // RegisteredServersCount - Number of servers registered to this vault. + RegisteredServersCount *int32 `json:"registeredServersCount,omitempty"` + // RecoveryServicesProviderAuthType - The authentication type of recovery service providers in the vault. + RecoveryServicesProviderAuthType *int32 `json:"recoveryServicesProviderAuthType,omitempty"` +} + +// ReplicationUsageList replication usages for vault. +type ReplicationUsageList struct { + autorest.Response `json:"-"` + // Value - The list of replication usages for the given vault. + Value *[]ReplicationUsage `json:"value,omitempty"` +} + +// Resource ARM Resource. +type Resource struct { + // ID - Resource Id represents the complete path to the resource. + ID *string `json:"id,omitempty"` + // Name - Resource name associated with the resource. + Name *string `json:"name,omitempty"` + // Type - Resource type represents the complete path of the form Namespace/ResourceType/ResourceType/... + Type *string `json:"type,omitempty"` + // ETag - Optional ETag. + ETag *string `json:"eTag,omitempty"` +} + +// ResourceCertificateAndAadDetails certificate details representing the Vault credentials for AAD. +type ResourceCertificateAndAadDetails struct { + // AadAuthority - AAD tenant authority. + AadAuthority *string `json:"aadAuthority,omitempty"` + // AadTenantID - AAD tenant Id. + AadTenantID *string `json:"aadTenantId,omitempty"` + // ServicePrincipalClientID - AAD service principal clientId. + ServicePrincipalClientID *string `json:"servicePrincipalClientId,omitempty"` + // ServicePrincipalObjectID - AAD service principal ObjectId. + ServicePrincipalObjectID *string `json:"servicePrincipalObjectId,omitempty"` + // AzureManagementEndpointAudience - Azure Management Endpoint Audience. + AzureManagementEndpointAudience *string `json:"azureManagementEndpointAudience,omitempty"` + // Certificate - The base64 encoded certificate raw data string. + Certificate *[]byte `json:"certificate,omitempty"` + // FriendlyName - Certificate friendlyname. + FriendlyName *string `json:"friendlyName,omitempty"` + // Issuer - Certificate issuer. + Issuer *string `json:"issuer,omitempty"` + // ResourceID - Resource ID of the vault. + ResourceID *int64 `json:"resourceId,omitempty"` + // Subject - Certificate Subject Name. + Subject *string `json:"subject,omitempty"` + // Thumbprint - Certificate thumbprint. + Thumbprint *string `json:"thumbprint,omitempty"` + // ValidFrom - Certificate Validity start Date time. + ValidFrom *date.Time `json:"validFrom,omitempty"` + // ValidTo - Certificate Validity End Date time. + ValidTo *date.Time `json:"validTo,omitempty"` + // AuthType - Possible values include: 'AuthTypeResourceCertificateDetails', 'AuthTypeAzureActiveDirectory', 'AuthTypeAccessControlService' + AuthType AuthTypeBasicResourceCertificateDetails `json:"authType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ResourceCertificateAndAadDetails. +func (rcaad ResourceCertificateAndAadDetails) MarshalJSON() ([]byte, error) { + rcaad.AuthType = AuthTypeAzureActiveDirectory + objectMap := make(map[string]interface{}) + if rcaad.AadAuthority != nil { + objectMap["aadAuthority"] = rcaad.AadAuthority + } + if rcaad.AadTenantID != nil { + objectMap["aadTenantId"] = rcaad.AadTenantID + } + if rcaad.ServicePrincipalClientID != nil { + objectMap["servicePrincipalClientId"] = rcaad.ServicePrincipalClientID + } + if rcaad.ServicePrincipalObjectID != nil { + objectMap["servicePrincipalObjectId"] = rcaad.ServicePrincipalObjectID + } + if rcaad.AzureManagementEndpointAudience != nil { + objectMap["azureManagementEndpointAudience"] = rcaad.AzureManagementEndpointAudience + } + if rcaad.Certificate != nil { + objectMap["certificate"] = rcaad.Certificate + } + if rcaad.FriendlyName != nil { + objectMap["friendlyName"] = rcaad.FriendlyName + } + if rcaad.Issuer != nil { + objectMap["issuer"] = rcaad.Issuer + } + if rcaad.ResourceID != nil { + objectMap["resourceId"] = rcaad.ResourceID + } + if rcaad.Subject != nil { + objectMap["subject"] = rcaad.Subject + } + if rcaad.Thumbprint != nil { + objectMap["thumbprint"] = rcaad.Thumbprint + } + if rcaad.ValidFrom != nil { + objectMap["validFrom"] = rcaad.ValidFrom + } + if rcaad.ValidTo != nil { + objectMap["validTo"] = rcaad.ValidTo + } + if rcaad.AuthType != "" { + objectMap["authType"] = rcaad.AuthType + } + return json.Marshal(objectMap) +} + +// AsResourceCertificateAndAadDetails is the BasicResourceCertificateDetails implementation for ResourceCertificateAndAadDetails. +func (rcaad ResourceCertificateAndAadDetails) AsResourceCertificateAndAadDetails() (*ResourceCertificateAndAadDetails, bool) { + return &rcaad, true +} + +// AsResourceCertificateAndAcsDetails is the BasicResourceCertificateDetails implementation for ResourceCertificateAndAadDetails. +func (rcaad ResourceCertificateAndAadDetails) AsResourceCertificateAndAcsDetails() (*ResourceCertificateAndAcsDetails, bool) { + return nil, false +} + +// AsResourceCertificateDetails is the BasicResourceCertificateDetails implementation for ResourceCertificateAndAadDetails. +func (rcaad ResourceCertificateAndAadDetails) AsResourceCertificateDetails() (*ResourceCertificateDetails, bool) { + return nil, false +} + +// AsBasicResourceCertificateDetails is the BasicResourceCertificateDetails implementation for ResourceCertificateAndAadDetails. +func (rcaad ResourceCertificateAndAadDetails) AsBasicResourceCertificateDetails() (BasicResourceCertificateDetails, bool) { + return &rcaad, true +} + +// ResourceCertificateAndAcsDetails certificate details representing the Vault credentials for ACS. +type ResourceCertificateAndAcsDetails struct { + // GlobalAcsNamespace - ACS namespace name - tenant for our service. + GlobalAcsNamespace *string `json:"globalAcsNamespace,omitempty"` + // GlobalAcsHostName - Acs mgmt host name to connect to. + GlobalAcsHostName *string `json:"globalAcsHostName,omitempty"` + // GlobalAcsRPRealm - Global ACS namespace RP realm. + GlobalAcsRPRealm *string `json:"globalAcsRPRealm,omitempty"` + // Certificate - The base64 encoded certificate raw data string. + Certificate *[]byte `json:"certificate,omitempty"` + // FriendlyName - Certificate friendlyname. + FriendlyName *string `json:"friendlyName,omitempty"` + // Issuer - Certificate issuer. + Issuer *string `json:"issuer,omitempty"` + // ResourceID - Resource ID of the vault. + ResourceID *int64 `json:"resourceId,omitempty"` + // Subject - Certificate Subject Name. + Subject *string `json:"subject,omitempty"` + // Thumbprint - Certificate thumbprint. + Thumbprint *string `json:"thumbprint,omitempty"` + // ValidFrom - Certificate Validity start Date time. + ValidFrom *date.Time `json:"validFrom,omitempty"` + // ValidTo - Certificate Validity End Date time. + ValidTo *date.Time `json:"validTo,omitempty"` + // AuthType - Possible values include: 'AuthTypeResourceCertificateDetails', 'AuthTypeAzureActiveDirectory', 'AuthTypeAccessControlService' + AuthType AuthTypeBasicResourceCertificateDetails `json:"authType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ResourceCertificateAndAcsDetails. +func (rcaad ResourceCertificateAndAcsDetails) MarshalJSON() ([]byte, error) { + rcaad.AuthType = AuthTypeAccessControlService + objectMap := make(map[string]interface{}) + if rcaad.GlobalAcsNamespace != nil { + objectMap["globalAcsNamespace"] = rcaad.GlobalAcsNamespace + } + if rcaad.GlobalAcsHostName != nil { + objectMap["globalAcsHostName"] = rcaad.GlobalAcsHostName + } + if rcaad.GlobalAcsRPRealm != nil { + objectMap["globalAcsRPRealm"] = rcaad.GlobalAcsRPRealm + } + if rcaad.Certificate != nil { + objectMap["certificate"] = rcaad.Certificate + } + if rcaad.FriendlyName != nil { + objectMap["friendlyName"] = rcaad.FriendlyName + } + if rcaad.Issuer != nil { + objectMap["issuer"] = rcaad.Issuer + } + if rcaad.ResourceID != nil { + objectMap["resourceId"] = rcaad.ResourceID + } + if rcaad.Subject != nil { + objectMap["subject"] = rcaad.Subject + } + if rcaad.Thumbprint != nil { + objectMap["thumbprint"] = rcaad.Thumbprint + } + if rcaad.ValidFrom != nil { + objectMap["validFrom"] = rcaad.ValidFrom + } + if rcaad.ValidTo != nil { + objectMap["validTo"] = rcaad.ValidTo + } + if rcaad.AuthType != "" { + objectMap["authType"] = rcaad.AuthType + } + return json.Marshal(objectMap) +} + +// AsResourceCertificateAndAadDetails is the BasicResourceCertificateDetails implementation for ResourceCertificateAndAcsDetails. +func (rcaad ResourceCertificateAndAcsDetails) AsResourceCertificateAndAadDetails() (*ResourceCertificateAndAadDetails, bool) { + return nil, false +} + +// AsResourceCertificateAndAcsDetails is the BasicResourceCertificateDetails implementation for ResourceCertificateAndAcsDetails. +func (rcaad ResourceCertificateAndAcsDetails) AsResourceCertificateAndAcsDetails() (*ResourceCertificateAndAcsDetails, bool) { + return &rcaad, true +} + +// AsResourceCertificateDetails is the BasicResourceCertificateDetails implementation for ResourceCertificateAndAcsDetails. +func (rcaad ResourceCertificateAndAcsDetails) AsResourceCertificateDetails() (*ResourceCertificateDetails, bool) { + return nil, false +} + +// AsBasicResourceCertificateDetails is the BasicResourceCertificateDetails implementation for ResourceCertificateAndAcsDetails. +func (rcaad ResourceCertificateAndAcsDetails) AsBasicResourceCertificateDetails() (BasicResourceCertificateDetails, bool) { + return &rcaad, true +} + +// BasicResourceCertificateDetails certificate details representing the Vault credentials. +type BasicResourceCertificateDetails interface { + AsResourceCertificateAndAadDetails() (*ResourceCertificateAndAadDetails, bool) + AsResourceCertificateAndAcsDetails() (*ResourceCertificateAndAcsDetails, bool) + AsResourceCertificateDetails() (*ResourceCertificateDetails, bool) +} + +// ResourceCertificateDetails certificate details representing the Vault credentials. +type ResourceCertificateDetails struct { + // Certificate - The base64 encoded certificate raw data string. + Certificate *[]byte `json:"certificate,omitempty"` + // FriendlyName - Certificate friendlyname. + FriendlyName *string `json:"friendlyName,omitempty"` + // Issuer - Certificate issuer. + Issuer *string `json:"issuer,omitempty"` + // ResourceID - Resource ID of the vault. + ResourceID *int64 `json:"resourceId,omitempty"` + // Subject - Certificate Subject Name. + Subject *string `json:"subject,omitempty"` + // Thumbprint - Certificate thumbprint. + Thumbprint *string `json:"thumbprint,omitempty"` + // ValidFrom - Certificate Validity start Date time. + ValidFrom *date.Time `json:"validFrom,omitempty"` + // ValidTo - Certificate Validity End Date time. + ValidTo *date.Time `json:"validTo,omitempty"` + // AuthType - Possible values include: 'AuthTypeResourceCertificateDetails', 'AuthTypeAzureActiveDirectory', 'AuthTypeAccessControlService' + AuthType AuthTypeBasicResourceCertificateDetails `json:"authType,omitempty"` +} + +func unmarshalBasicResourceCertificateDetails(body []byte) (BasicResourceCertificateDetails, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["authType"] { + case string(AuthTypeAzureActiveDirectory): + var rcaad ResourceCertificateAndAadDetails + err := json.Unmarshal(body, &rcaad) + return rcaad, err + case string(AuthTypeAccessControlService): + var rcaad ResourceCertificateAndAcsDetails + err := json.Unmarshal(body, &rcaad) + return rcaad, err + default: + var rcd ResourceCertificateDetails + err := json.Unmarshal(body, &rcd) + return rcd, err + } +} +func unmarshalBasicResourceCertificateDetailsArray(body []byte) ([]BasicResourceCertificateDetails, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + rcdArray := make([]BasicResourceCertificateDetails, len(rawMessages)) + + for index, rawMessage := range rawMessages { + rcd, err := unmarshalBasicResourceCertificateDetails(*rawMessage) + if err != nil { + return nil, err + } + rcdArray[index] = rcd + } + return rcdArray, nil +} + +// MarshalJSON is the custom marshaler for ResourceCertificateDetails. +func (rcd ResourceCertificateDetails) MarshalJSON() ([]byte, error) { + rcd.AuthType = AuthTypeResourceCertificateDetails + objectMap := make(map[string]interface{}) + if rcd.Certificate != nil { + objectMap["certificate"] = rcd.Certificate + } + if rcd.FriendlyName != nil { + objectMap["friendlyName"] = rcd.FriendlyName + } + if rcd.Issuer != nil { + objectMap["issuer"] = rcd.Issuer + } + if rcd.ResourceID != nil { + objectMap["resourceId"] = rcd.ResourceID + } + if rcd.Subject != nil { + objectMap["subject"] = rcd.Subject + } + if rcd.Thumbprint != nil { + objectMap["thumbprint"] = rcd.Thumbprint + } + if rcd.ValidFrom != nil { + objectMap["validFrom"] = rcd.ValidFrom + } + if rcd.ValidTo != nil { + objectMap["validTo"] = rcd.ValidTo + } + if rcd.AuthType != "" { + objectMap["authType"] = rcd.AuthType + } + return json.Marshal(objectMap) +} + +// AsResourceCertificateAndAadDetails is the BasicResourceCertificateDetails implementation for ResourceCertificateDetails. +func (rcd ResourceCertificateDetails) AsResourceCertificateAndAadDetails() (*ResourceCertificateAndAadDetails, bool) { + return nil, false +} + +// AsResourceCertificateAndAcsDetails is the BasicResourceCertificateDetails implementation for ResourceCertificateDetails. +func (rcd ResourceCertificateDetails) AsResourceCertificateAndAcsDetails() (*ResourceCertificateAndAcsDetails, bool) { + return nil, false +} + +// AsResourceCertificateDetails is the BasicResourceCertificateDetails implementation for ResourceCertificateDetails. +func (rcd ResourceCertificateDetails) AsResourceCertificateDetails() (*ResourceCertificateDetails, bool) { + return &rcd, true +} + +// AsBasicResourceCertificateDetails is the BasicResourceCertificateDetails implementation for ResourceCertificateDetails. +func (rcd ResourceCertificateDetails) AsBasicResourceCertificateDetails() (BasicResourceCertificateDetails, bool) { + return &rcd, true +} + +// Sku identifies the unique system identifier for each Azure resource. +type Sku struct { + // Name - The Sku name. Possible values include: 'Standard', 'RS0' + Name SkuName `json:"name,omitempty"` +} + +// TrackedResource tracked resource with location. +type TrackedResource struct { + // Location - Resource location. + Location *string `json:"location,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // ID - Resource Id represents the complete path to the resource. + ID *string `json:"id,omitempty"` + // Name - Resource name associated with the resource. + Name *string `json:"name,omitempty"` + // Type - Resource type represents the complete path of the form Namespace/ResourceType/ResourceType/... + Type *string `json:"type,omitempty"` + // ETag - Optional ETag. + ETag *string `json:"eTag,omitempty"` +} + +// MarshalJSON is the custom marshaler for TrackedResource. +func (tr TrackedResource) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if tr.Location != nil { + objectMap["location"] = tr.Location + } + if tr.Tags != nil { + objectMap["tags"] = tr.Tags + } + if tr.ID != nil { + objectMap["id"] = tr.ID + } + if tr.Name != nil { + objectMap["name"] = tr.Name + } + if tr.Type != nil { + objectMap["type"] = tr.Type + } + if tr.ETag != nil { + objectMap["eTag"] = tr.ETag + } + return json.Marshal(objectMap) +} + +// UpgradeDetails details for upgrading vault. +type UpgradeDetails struct { + // OperationID - ID of the vault upgrade operation. + OperationID *string `json:"operationId,omitempty"` + // StartTimeUtc - UTC time at which the upgrade operation has started. + StartTimeUtc *date.Time `json:"startTimeUtc,omitempty"` + // LastUpdatedTimeUtc - UTC time at which the upgrade operation status was last updated. + LastUpdatedTimeUtc *date.Time `json:"lastUpdatedTimeUtc,omitempty"` + // EndTimeUtc - UTC time at which the upgrade operation has ended. + EndTimeUtc *date.Time `json:"endTimeUtc,omitempty"` + // Status - Status of the vault upgrade operation. Possible values include: 'Unknown', 'InProgress', 'Upgraded', 'Failed' + Status VaultUpgradeState `json:"status,omitempty"` + // Message - Message to the user containing information about the upgrade operation. + Message *string `json:"message,omitempty"` + // TriggerType - The way the vault upgradation was triggered. Possible values include: 'UserTriggered', 'ForcedUpgrade' + TriggerType TriggerType `json:"triggerType,omitempty"` + // UpgradedResourceID - Resource ID of the upgraded vault. + UpgradedResourceID *string `json:"upgradedResourceId,omitempty"` + // PreviousResourceID - Resource ID of the vault before the upgrade. + PreviousResourceID *string `json:"previousResourceId,omitempty"` +} + +// Vault resource information, as returned by the resource provider. +type Vault struct { + autorest.Response `json:"-"` + Properties *VaultProperties `json:"properties,omitempty"` + Sku *Sku `json:"sku,omitempty"` + // Location - Resource location. + Location *string `json:"location,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // ID - Resource Id represents the complete path to the resource. + ID *string `json:"id,omitempty"` + // Name - Resource name associated with the resource. + Name *string `json:"name,omitempty"` + // Type - Resource type represents the complete path of the form Namespace/ResourceType/ResourceType/... + Type *string `json:"type,omitempty"` + // ETag - Optional ETag. + ETag *string `json:"eTag,omitempty"` +} + +// MarshalJSON is the custom marshaler for Vault. +func (vVar Vault) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if vVar.Properties != nil { + objectMap["properties"] = vVar.Properties + } + if vVar.Sku != nil { + objectMap["sku"] = vVar.Sku + } + if vVar.Location != nil { + objectMap["location"] = vVar.Location + } + if vVar.Tags != nil { + objectMap["tags"] = vVar.Tags + } + if vVar.ID != nil { + objectMap["id"] = vVar.ID + } + if vVar.Name != nil { + objectMap["name"] = vVar.Name + } + if vVar.Type != nil { + objectMap["type"] = vVar.Type + } + if vVar.ETag != nil { + objectMap["eTag"] = vVar.ETag + } + return json.Marshal(objectMap) +} + +// VaultCertificateResponse certificate corresponding to a vault that can be used by clients to register themselves +// with the vault. +type VaultCertificateResponse struct { + autorest.Response `json:"-"` + // Name - Resource name associated with the resource. + Name *string `json:"name,omitempty"` + // Type - Resource type represents the complete path of the form Namespace/ResourceType/ResourceType/... + Type *string `json:"type,omitempty"` + // ID - Resource Id represents the complete path to the resource. + ID *string `json:"id,omitempty"` + Properties BasicResourceCertificateDetails `json:"properties,omitempty"` +} + +// UnmarshalJSON is the custom unmarshaler for VaultCertificateResponse struct. +func (vcr *VaultCertificateResponse) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + vcr.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + vcr.Type = &typeVar + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + vcr.ID = &ID + } + case "properties": + if v != nil { + properties, err := unmarshalBasicResourceCertificateDetails(*v) + if err != nil { + return err + } + vcr.Properties = properties + } + } + } + + return nil +} + +// VaultExtendedInfo vault extended information. +type VaultExtendedInfo struct { + // IntegrityKey - Integrity key. + IntegrityKey *string `json:"integrityKey,omitempty"` + // EncryptionKey - Encryption key. + EncryptionKey *string `json:"encryptionKey,omitempty"` + // EncryptionKeyThumbprint - Encryption key thumbprint. + EncryptionKeyThumbprint *string `json:"encryptionKeyThumbprint,omitempty"` + // Algorithm - Algorithm for Vault ExtendedInfo + Algorithm *string `json:"algorithm,omitempty"` +} + +// VaultExtendedInfoResource vault extended information. +type VaultExtendedInfoResource struct { + autorest.Response `json:"-"` + *VaultExtendedInfo `json:"properties,omitempty"` + // ID - Resource Id represents the complete path to the resource. + ID *string `json:"id,omitempty"` + // Name - Resource name associated with the resource. + Name *string `json:"name,omitempty"` + // Type - Resource type represents the complete path of the form Namespace/ResourceType/ResourceType/... + Type *string `json:"type,omitempty"` + // ETag - Optional ETag. + ETag *string `json:"eTag,omitempty"` +} + +// MarshalJSON is the custom marshaler for VaultExtendedInfoResource. +func (veir VaultExtendedInfoResource) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if veir.VaultExtendedInfo != nil { + objectMap["properties"] = veir.VaultExtendedInfo + } + if veir.ID != nil { + objectMap["id"] = veir.ID + } + if veir.Name != nil { + objectMap["name"] = veir.Name + } + if veir.Type != nil { + objectMap["type"] = veir.Type + } + if veir.ETag != nil { + objectMap["eTag"] = veir.ETag + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for VaultExtendedInfoResource struct. +func (veir *VaultExtendedInfoResource) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var vaultExtendedInfo VaultExtendedInfo + err = json.Unmarshal(*v, &vaultExtendedInfo) + if err != nil { + return err + } + veir.VaultExtendedInfo = &vaultExtendedInfo + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + veir.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + veir.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + veir.Type = &typeVar + } + case "eTag": + if v != nil { + var eTag string + err = json.Unmarshal(*v, &eTag) + if err != nil { + return err + } + veir.ETag = &eTag + } + } + } + + return nil +} + +// VaultList the response model for a list of Vaults. +type VaultList struct { + autorest.Response `json:"-"` + Value *[]Vault `json:"value,omitempty"` + NextLink *string `json:"nextLink,omitempty"` +} + +// VaultListIterator provides access to a complete listing of Vault values. +type VaultListIterator struct { + i int + page VaultListPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *VaultListIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter VaultListIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter VaultListIterator) Response() VaultList { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter VaultListIterator) Value() Vault { + if !iter.page.NotDone() { + return Vault{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (vl VaultList) IsEmpty() bool { + return vl.Value == nil || len(*vl.Value) == 0 +} + +// vaultListPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (vl VaultList) vaultListPreparer() (*http.Request, error) { + if vl.NextLink == nil || len(to.String(vl.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(vl.NextLink))) +} + +// VaultListPage contains a page of Vault values. +type VaultListPage struct { + fn func(VaultList) (VaultList, error) + vl VaultList +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *VaultListPage) Next() error { + next, err := page.fn(page.vl) + if err != nil { + return err + } + page.vl = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page VaultListPage) NotDone() bool { + return !page.vl.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page VaultListPage) Response() VaultList { + return page.vl +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page VaultListPage) Values() []Vault { + if page.vl.IsEmpty() { + return nil + } + return *page.vl.Value +} + +// VaultProperties properties of the vault. +type VaultProperties struct { + // ProvisioningState - Provisioning State. + ProvisioningState *string `json:"provisioningState,omitempty"` + UpgradeDetails *UpgradeDetails `json:"upgradeDetails,omitempty"` +} + +// VaultUsage usages of a vault. +type VaultUsage struct { + // Unit - Unit of the usage. Possible values include: 'Count', 'Bytes', 'Seconds', 'Percent', 'CountPerSecond', 'BytesPerSecond' + Unit UsagesUnit `json:"unit,omitempty"` + // QuotaPeriod - Quota period of usage. + QuotaPeriod *string `json:"quotaPeriod,omitempty"` + // NextResetTime - Next reset time of usage. + NextResetTime *date.Time `json:"nextResetTime,omitempty"` + // CurrentValue - Current value of usage. + CurrentValue *int64 `json:"currentValue,omitempty"` + // Limit - Limit of usage. + Limit *int64 `json:"limit,omitempty"` + // Name - Name of usage. + Name *NameInfo `json:"name,omitempty"` +} + +// VaultUsageList usage for vault. +type VaultUsageList struct { + autorest.Response `json:"-"` + // Value - The list of usages for the given vault. + Value *[]VaultUsage `json:"value,omitempty"` +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/operations.go new file mode 100644 index 000000000000..33cc200f0112 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/operations.go @@ -0,0 +1,126 @@ +package recoveryservices + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// OperationsClient is the recovery Services Client +type OperationsClient struct { + BaseClient +} + +// NewOperationsClient creates an instance of the OperationsClient client. +func NewOperationsClient(subscriptionID string) OperationsClient { + return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. +func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { + return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// List returns the list of available operations. +func (client OperationsClient) List(ctx context.Context) (result ClientDiscoveryResponsePage, err error) { + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.OperationsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.cdr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "recoveryservices.OperationsClient", "List", resp, "Failure sending request") + return + } + + result.cdr, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.OperationsClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPath("/providers/Microsoft.RecoveryServices/operations"), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client OperationsClient) ListResponder(resp *http.Response) (result ClientDiscoveryResponse, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client OperationsClient) listNextResults(lastResults ClientDiscoveryResponse) (result ClientDiscoveryResponse, err error) { + req, err := lastResults.clientDiscoveryResponsePreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "recoveryservices.OperationsClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "recoveryservices.OperationsClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.OperationsClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client OperationsClient) ListComplete(ctx context.Context) (result ClientDiscoveryResponseIterator, err error) { + result.page, err = client.List(ctx) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/registeredidentities.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/registeredidentities.go new file mode 100644 index 000000000000..fbcb373245b1 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/registeredidentities.go @@ -0,0 +1,107 @@ +package recoveryservices + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// RegisteredIdentitiesClient is the recovery Services Client +type RegisteredIdentitiesClient struct { + BaseClient +} + +// NewRegisteredIdentitiesClient creates an instance of the RegisteredIdentitiesClient client. +func NewRegisteredIdentitiesClient(subscriptionID string) RegisteredIdentitiesClient { + return NewRegisteredIdentitiesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewRegisteredIdentitiesClientWithBaseURI creates an instance of the RegisteredIdentitiesClient client. +func NewRegisteredIdentitiesClientWithBaseURI(baseURI string, subscriptionID string) RegisteredIdentitiesClient { + return RegisteredIdentitiesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// Delete unregisters the given container from your Recovery Services vault. +// +// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is +// the name of the recovery services vault. identityName is name of the protection container to unregister. +func (client RegisteredIdentitiesClient) Delete(ctx context.Context, resourceGroupName string, vaultName string, identityName string) (result autorest.Response, err error) { + req, err := client.DeletePreparer(ctx, resourceGroupName, vaultName, identityName) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.RegisteredIdentitiesClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "recoveryservices.RegisteredIdentitiesClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.RegisteredIdentitiesClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client RegisteredIdentitiesClient) DeletePreparer(ctx context.Context, resourceGroupName string, vaultName string, identityName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "identityName": autorest.Encode("path", identityName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "vaultName": autorest.Encode("path", vaultName), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/registeredIdentities/{identityName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client RegisteredIdentitiesClient) DeleteSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client RegisteredIdentitiesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/replicationusages.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/replicationusages.go new file mode 100644 index 000000000000..49a1080905de --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/replicationusages.go @@ -0,0 +1,107 @@ +package recoveryservices + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// ReplicationUsagesClient is the recovery Services Client +type ReplicationUsagesClient struct { + BaseClient +} + +// NewReplicationUsagesClient creates an instance of the ReplicationUsagesClient client. +func NewReplicationUsagesClient(subscriptionID string) ReplicationUsagesClient { + return NewReplicationUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewReplicationUsagesClientWithBaseURI creates an instance of the ReplicationUsagesClient client. +func NewReplicationUsagesClientWithBaseURI(baseURI string, subscriptionID string) ReplicationUsagesClient { + return ReplicationUsagesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// List fetches the replication usages of the vault. +// +// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is +// the name of the recovery services vault. +func (client ReplicationUsagesClient) List(ctx context.Context, resourceGroupName string, vaultName string) (result ReplicationUsageList, err error) { + req, err := client.ListPreparer(ctx, resourceGroupName, vaultName) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.ReplicationUsagesClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "recoveryservices.ReplicationUsagesClient", "List", resp, "Failure sending request") + return + } + + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.ReplicationUsagesClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client ReplicationUsagesClient) ListPreparer(ctx context.Context, resourceGroupName string, vaultName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "vaultName": autorest.Encode("path", vaultName), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/replicationUsages", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client ReplicationUsagesClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client ReplicationUsagesClient) ListResponder(resp *http.Response) (result ReplicationUsageList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/usages.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/usages.go new file mode 100644 index 000000000000..ab0ffa61edbc --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/usages.go @@ -0,0 +1,107 @@ +package recoveryservices + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// UsagesClient is the recovery Services Client +type UsagesClient struct { + BaseClient +} + +// NewUsagesClient creates an instance of the UsagesClient client. +func NewUsagesClient(subscriptionID string) UsagesClient { + return NewUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewUsagesClientWithBaseURI creates an instance of the UsagesClient client. +func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient { + return UsagesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// ListByVaults fetches the usages of the vault. +// +// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is +// the name of the recovery services vault. +func (client UsagesClient) ListByVaults(ctx context.Context, resourceGroupName string, vaultName string) (result VaultUsageList, err error) { + req, err := client.ListByVaultsPreparer(ctx, resourceGroupName, vaultName) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.UsagesClient", "ListByVaults", nil, "Failure preparing request") + return + } + + resp, err := client.ListByVaultsSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "recoveryservices.UsagesClient", "ListByVaults", resp, "Failure sending request") + return + } + + result, err = client.ListByVaultsResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.UsagesClient", "ListByVaults", resp, "Failure responding to request") + } + + return +} + +// ListByVaultsPreparer prepares the ListByVaults request. +func (client UsagesClient) ListByVaultsPreparer(ctx context.Context, resourceGroupName string, vaultName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "vaultName": autorest.Encode("path", vaultName), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/usages", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByVaultsSender sends the ListByVaults request. The method will close the +// http.Response Body if it receives an error. +func (client UsagesClient) ListByVaultsSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByVaultsResponder handles the response to the ListByVaults request. The method always +// closes the http.Response Body. +func (client UsagesClient) ListByVaultsResponder(resp *http.Response) (result VaultUsageList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultcertificates.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultcertificates.go new file mode 100644 index 000000000000..7e738045842a --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultcertificates.go @@ -0,0 +1,111 @@ +package recoveryservices + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// VaultCertificatesClient is the recovery Services Client +type VaultCertificatesClient struct { + BaseClient +} + +// NewVaultCertificatesClient creates an instance of the VaultCertificatesClient client. +func NewVaultCertificatesClient(subscriptionID string) VaultCertificatesClient { + return NewVaultCertificatesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewVaultCertificatesClientWithBaseURI creates an instance of the VaultCertificatesClient client. +func NewVaultCertificatesClientWithBaseURI(baseURI string, subscriptionID string) VaultCertificatesClient { + return VaultCertificatesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// Create uploads a certificate for a resource. +// +// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is +// the name of the recovery services vault. certificateName is certificate friendly name. certificateRequest is +// input parameters for uploading the vault certificate. +func (client VaultCertificatesClient) Create(ctx context.Context, resourceGroupName string, vaultName string, certificateName string, certificateRequest CertificateRequest) (result VaultCertificateResponse, err error) { + req, err := client.CreatePreparer(ctx, resourceGroupName, vaultName, certificateName, certificateRequest) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultCertificatesClient", "Create", nil, "Failure preparing request") + return + } + + resp, err := client.CreateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "recoveryservices.VaultCertificatesClient", "Create", resp, "Failure sending request") + return + } + + result, err = client.CreateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultCertificatesClient", "Create", resp, "Failure responding to request") + } + + return +} + +// CreatePreparer prepares the Create request. +func (client VaultCertificatesClient) CreatePreparer(ctx context.Context, resourceGroupName string, vaultName string, certificateName string, certificateRequest CertificateRequest) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "certificateName": autorest.Encode("path", certificateName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "vaultName": autorest.Encode("path", vaultName), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/certificates/{certificateName}", pathParameters), + autorest.WithJSON(certificateRequest), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateSender sends the Create request. The method will close the +// http.Response Body if it receives an error. +func (client VaultCertificatesClient) CreateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CreateResponder handles the response to the Create request. The method always +// closes the http.Response Body. +func (client VaultCertificatesClient) CreateResponder(resp *http.Response) (result VaultCertificateResponse, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultextendedinfo.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultextendedinfo.go new file mode 100644 index 000000000000..3ae2a6dbd95e --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultextendedinfo.go @@ -0,0 +1,245 @@ +package recoveryservices + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// VaultExtendedInfoClient is the recovery Services Client +type VaultExtendedInfoClient struct { + BaseClient +} + +// NewVaultExtendedInfoClient creates an instance of the VaultExtendedInfoClient client. +func NewVaultExtendedInfoClient(subscriptionID string) VaultExtendedInfoClient { + return NewVaultExtendedInfoClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewVaultExtendedInfoClientWithBaseURI creates an instance of the VaultExtendedInfoClient client. +func NewVaultExtendedInfoClientWithBaseURI(baseURI string, subscriptionID string) VaultExtendedInfoClient { + return VaultExtendedInfoClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate create vault extended info. +// +// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is +// the name of the recovery services vault. resourceResourceExtendedInfoDetails is details of ResourceExtendedInfo +func (client VaultExtendedInfoClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, vaultName string, resourceResourceExtendedInfoDetails VaultExtendedInfoResource) (result VaultExtendedInfoResource, err error) { + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, vaultName, resourceResourceExtendedInfoDetails) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultExtendedInfoClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "recoveryservices.VaultExtendedInfoClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultExtendedInfoClient", "CreateOrUpdate", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client VaultExtendedInfoClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, vaultName string, resourceResourceExtendedInfoDetails VaultExtendedInfoResource) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "vaultName": autorest.Encode("path", vaultName), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/extendedInformation/vaultExtendedInfo", pathParameters), + autorest.WithJSON(resourceResourceExtendedInfoDetails), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client VaultExtendedInfoClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client VaultExtendedInfoClient) CreateOrUpdateResponder(resp *http.Response) (result VaultExtendedInfoResource, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Get get the vault extended info. +// +// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is +// the name of the recovery services vault. +func (client VaultExtendedInfoClient) Get(ctx context.Context, resourceGroupName string, vaultName string) (result VaultExtendedInfoResource, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, vaultName) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultExtendedInfoClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "recoveryservices.VaultExtendedInfoClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultExtendedInfoClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client VaultExtendedInfoClient) GetPreparer(ctx context.Context, resourceGroupName string, vaultName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "vaultName": autorest.Encode("path", vaultName), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/extendedInformation/vaultExtendedInfo", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client VaultExtendedInfoClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client VaultExtendedInfoClient) GetResponder(resp *http.Response) (result VaultExtendedInfoResource, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Update update vault extended info. +// +// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is +// the name of the recovery services vault. resourceResourceExtendedInfoDetails is details of ResourceExtendedInfo +func (client VaultExtendedInfoClient) Update(ctx context.Context, resourceGroupName string, vaultName string, resourceResourceExtendedInfoDetails VaultExtendedInfoResource) (result VaultExtendedInfoResource, err error) { + req, err := client.UpdatePreparer(ctx, resourceGroupName, vaultName, resourceResourceExtendedInfoDetails) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultExtendedInfoClient", "Update", nil, "Failure preparing request") + return + } + + resp, err := client.UpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "recoveryservices.VaultExtendedInfoClient", "Update", resp, "Failure sending request") + return + } + + result, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultExtendedInfoClient", "Update", resp, "Failure responding to request") + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client VaultExtendedInfoClient) UpdatePreparer(ctx context.Context, resourceGroupName string, vaultName string, resourceResourceExtendedInfoDetails VaultExtendedInfoResource) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "vaultName": autorest.Encode("path", vaultName), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/extendedInformation/vaultExtendedInfo", pathParameters), + autorest.WithJSON(resourceResourceExtendedInfoDetails), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client VaultExtendedInfoClient) UpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client VaultExtendedInfoClient) UpdateResponder(resp *http.Response) (result VaultExtendedInfoResource, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaults.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaults.go new file mode 100644 index 000000000000..472d5877692b --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaults.go @@ -0,0 +1,494 @@ +package recoveryservices + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// VaultsClient is the recovery Services Client +type VaultsClient struct { + BaseClient +} + +// NewVaultsClient creates an instance of the VaultsClient client. +func NewVaultsClient(subscriptionID string) VaultsClient { + return NewVaultsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewVaultsClientWithBaseURI creates an instance of the VaultsClient client. +func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsClient { + return VaultsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate creates or updates a Recovery Services vault. +// +// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is +// the name of the recovery services vault. vault is recovery Services Vault to be created. +func (client VaultsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, vaultName string, vault Vault) (result Vault, err error) { + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, vaultName, vault) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "CreateOrUpdate", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client VaultsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, vaultName string, vault Vault) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "vaultName": autorest.Encode("path", vaultName), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}", pathParameters), + autorest.WithJSON(vault), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client VaultsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client VaultsClient) CreateOrUpdateResponder(resp *http.Response) (result Vault, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes a vault. +// +// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is +// the name of the recovery services vault. +func (client VaultsClient) Delete(ctx context.Context, resourceGroupName string, vaultName string) (result autorest.Response, err error) { + req, err := client.DeletePreparer(ctx, resourceGroupName, vaultName) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client VaultsClient) DeletePreparer(ctx context.Context, resourceGroupName string, vaultName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "vaultName": autorest.Encode("path", vaultName), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client VaultsClient) DeleteSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client VaultsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get get the Vault details. +// +// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is +// the name of the recovery services vault. +func (client VaultsClient) Get(ctx context.Context, resourceGroupName string, vaultName string) (result Vault, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, vaultName) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client VaultsClient) GetPreparer(ctx context.Context, resourceGroupName string, vaultName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "vaultName": autorest.Encode("path", vaultName), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client VaultsClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client VaultsClient) GetResponder(resp *http.Response) (result Vault, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListByResourceGroup retrieve a list of Vaults. +// +// resourceGroupName is the name of the resource group where the recovery services vault is present. +func (client VaultsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result VaultListPage, err error) { + result.fn = client.listByResourceGroupNextResults + req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "ListByResourceGroup", nil, "Failure preparing request") + return + } + + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.vl.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "ListByResourceGroup", resp, "Failure sending request") + return + } + + result.vl, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "ListByResourceGroup", resp, "Failure responding to request") + } + + return +} + +// ListByResourceGroupPreparer prepares the ListByResourceGroup request. +func (client VaultsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the +// http.Response Body if it receives an error. +func (client VaultsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always +// closes the http.Response Body. +func (client VaultsClient) ListByResourceGroupResponder(resp *http.Response) (result VaultList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByResourceGroupNextResults retrieves the next set of results, if any. +func (client VaultsClient) listByResourceGroupNextResults(lastResults VaultList) (result VaultList, err error) { + req, err := lastResults.vaultListPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "listByResourceGroupNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. +func (client VaultsClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result VaultListIterator, err error) { + result.page, err = client.ListByResourceGroup(ctx, resourceGroupName) + return +} + +// ListBySubscriptionID fetches all the resources of the specified type in the subscription. +func (client VaultsClient) ListBySubscriptionID(ctx context.Context) (result VaultListPage, err error) { + result.fn = client.listBySubscriptionIDNextResults + req, err := client.ListBySubscriptionIDPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "ListBySubscriptionID", nil, "Failure preparing request") + return + } + + resp, err := client.ListBySubscriptionIDSender(req) + if err != nil { + result.vl.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "ListBySubscriptionID", resp, "Failure sending request") + return + } + + result.vl, err = client.ListBySubscriptionIDResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "ListBySubscriptionID", resp, "Failure responding to request") + } + + return +} + +// ListBySubscriptionIDPreparer prepares the ListBySubscriptionID request. +func (client VaultsClient) ListBySubscriptionIDPreparer(ctx context.Context) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.RecoveryServices/vaults", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListBySubscriptionIDSender sends the ListBySubscriptionID request. The method will close the +// http.Response Body if it receives an error. +func (client VaultsClient) ListBySubscriptionIDSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListBySubscriptionIDResponder handles the response to the ListBySubscriptionID request. The method always +// closes the http.Response Body. +func (client VaultsClient) ListBySubscriptionIDResponder(resp *http.Response) (result VaultList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listBySubscriptionIDNextResults retrieves the next set of results, if any. +func (client VaultsClient) listBySubscriptionIDNextResults(lastResults VaultList) (result VaultList, err error) { + req, err := lastResults.vaultListPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "listBySubscriptionIDNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListBySubscriptionIDSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "listBySubscriptionIDNextResults", resp, "Failure sending next results request") + } + result, err = client.ListBySubscriptionIDResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "listBySubscriptionIDNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListBySubscriptionIDComplete enumerates all values, automatically crossing page boundaries as required. +func (client VaultsClient) ListBySubscriptionIDComplete(ctx context.Context) (result VaultListIterator, err error) { + result.page, err = client.ListBySubscriptionID(ctx) + return +} + +// Update updates the vault. +// +// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is +// the name of the recovery services vault. vault is recovery Services Vault to be created. +func (client VaultsClient) Update(ctx context.Context, resourceGroupName string, vaultName string, vault PatchVault) (result Vault, err error) { + req, err := client.UpdatePreparer(ctx, resourceGroupName, vaultName, vault) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "Update", nil, "Failure preparing request") + return + } + + resp, err := client.UpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "Update", resp, "Failure sending request") + return + } + + result, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "recoveryservices.VaultsClient", "Update", resp, "Failure responding to request") + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client VaultsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, vaultName string, vault PatchVault) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "vaultName": autorest.Encode("path", vaultName), + } + + const APIVersion = "2016-06-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}", pathParameters), + autorest.WithJSON(vault), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client VaultsClient) UpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client VaultsClient) UpdateResponder(resp *http.Response) (result Vault, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/version.go new file mode 100644 index 000000000000..a286fe2bb94a --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/version.go @@ -0,0 +1,30 @@ +package recoveryservices + +import "github.com/Azure/azure-sdk-for-go/version" + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +// UserAgent returns the UserAgent string to use when sending http.Requests. +func UserAgent() string { + return "Azure-SDK-For-Go/" + version.Number + " recoveryservices/2016-06-01" +} + +// Version returns the semantic version (see http://semver.org) of the client. +func Version() string { + return version.Number +} diff --git a/vendor/vendor.json b/vendor/vendor.json index 38efbdd91b88..5d916e972bfd 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -178,10 +178,18 @@ "version": "v15.1.0", "versionExact": "v15.1.0" }, + { + "checksumSHA1": "MIhAkAYROlF0bQN4AT4WZWkBQtY=", + "path": "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices", + "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", + "revisionTime": "2018-04-09T17:42:04Z", + "version": "v15.1.0", + "versionExact": "v15.1.0" + }, { "checksumSHA1": "JNSBPrbVww7i2tKS02XHTRU9f6A=", "path": "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis", - "revision": "068ec4d616be5b2175509bf1fb3e4c8ea160d5c8", + "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", "revisionTime": "2018-04-09T17:42:04Z", "version": "v15.1.0", "versionExact": "v15.1.0" diff --git a/website/azurerm.erb b/website/azurerm.erb index de65afceec70..a97dd24179b0 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -91,6 +91,10 @@ azurerm_public_ips + > + azurerm_recovery_services_vault + + > azurerm_resource_group @@ -647,6 +651,15 @@ + > + Recovery Services + + + > Redis Resources
    diff --git a/website/docs/d/recovery_services_vault.markdown b/website/docs/d/recovery_services_vault.markdown new file mode 100644 index 000000000000..3a29a6824ccb --- /dev/null +++ b/website/docs/d/recovery_services_vault.markdown @@ -0,0 +1,40 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_recovery_services_vault" +sidebar_current: "docs-azurerm-datasource-recovery-services-vault" +description: |- + Get information about the specified Recovery Services Vault. +--- + +# azurerm_recovery_services_vault + +Use this data source to access the properties of an Recovery Services Vault. + +## Example Usage + +```hcl +data "azurerm_recovery_services_vault" "vault" { + name = "tfex-recovery_vault" + resource_group_name = "tfex-resource_group" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the Recovery Services Vault. + +* `resource_group_name` - (Required) The name of the resource group in which the Recovery Services Vault resides. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the Recovery Services Vault. + +* `location` - The Azure location where the resource resides. + +* `tags` - A mapping of tags assigned to the resource. + +* `sku` - The vault's current SKU. diff --git a/website/docs/r/recovery_services_vault.markdown b/website/docs/r/recovery_services_vault.markdown new file mode 100644 index 000000000000..0b5b66e80d65 --- /dev/null +++ b/website/docs/r/recovery_services_vault.markdown @@ -0,0 +1,57 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_recovery_services_vault" +sidebar_current: "docs-azurerm-resource-recovery-services-vault" +description: |- + Create an Recovery Services Vault. +--- + +# azurerm_recovery_services_vault + +Create an Recovery Services Vault. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "rg" { + name = "tfex-recovery_vault" + location = "West US" +} + +resource "azurerm_recovery_services_vault" "vault" { + name = "example_recovery_vault" + location = "${azurerm_resource_group.rg.location}" + resource_group_name = "${azurerm_resource_group.rg.name}" + sku = "standard" +} + +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the Recovery Services Vault. Changing this forces a new resource to be created. + +* `resource_group_name` - (Required) The name of the resource group in which to create the Recovery Services Vault. Changing this forces a new resource to be created. + +* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. + +* `tags` - (Optional) A mapping of tags to assign to the resource. + +* `sku` - (Required) Sets the vault's SKU. Possible values include: `Standard`, `RS0`. + + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the Recovery Services Vault. + +## Import + +Recovery Services Vaults can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_recovery_services_vault.vault1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.RecoveryServices/vaults/vault1 +``` From 503fc498db0c49856450b9fd78279a5bfd9628af Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 19 Apr 2018 14:07:30 +0200 Subject: [PATCH 016/320] Updating to include #995 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 270270bf46c4..44f6a6fbcc2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ UPGRADE NOTES: * `azurerm_cosmosdb_account` - the field `failover_policy` has been deprecated in favour of `geo_locations` to better match Azure. +FEATURES: + +* **New Data Source:** `azurerm_recovery_services_vault` [GH-995] +* **New Resource:** `azurerm_recovery_services_vault` [GH-995] + IMPROVEMENTS: * `azurerm_cosmosdb_account` - support for `enable_automatic_failover` [GH-1055] From ebba5afa170ac83e4dd385a4d241306636fd5488 Mon Sep 17 00:00:00 2001 From: Su Shi <1684739+metacpp@users.noreply.github.com> Date: Fri, 20 Apr 2018 08:47:36 -0700 Subject: [PATCH 017/320] Filter out from properties of tags object. (#1107) * Filter out from properties of tags object. * Limit the filtering for $type to rule resource only and add validation logic to avoid $type from end user as tag name. * Update acceptance tests to validate the $type in attributes. * Add more non-exist check for metric alert rule. * Update the validation logic for test cases. * Move filtering logic into seprated utility function for future reuse. * Update the comment for filterTags function. * Remove the validation of $type in common function. * add test case for filterTag function. * Refactoring tags to match the others ``` $ acctests azurerm TestValidateMetricAlertRuleTags === RUN TestValidateMetricAlertRuleTags --- PASS: TestValidateMetricAlertRuleTags (0.00s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 0.025s ``` --- azurerm/import_arm_metric_alertrule_test.go | 8 +++ azurerm/resource_arm_metric_alertrule.go | 29 +++++++++- azurerm/resource_arm_metric_alertrule_test.go | 57 +++++++++++++++++++ azurerm/tags.go | 38 ++++++++++--- azurerm/tags_test.go | 19 +++++++ 5 files changed, 141 insertions(+), 10 deletions(-) diff --git a/azurerm/import_arm_metric_alertrule_test.go b/azurerm/import_arm_metric_alertrule_test.go index 61fa6fa29e3d..deafc44276f4 100644 --- a/azurerm/import_arm_metric_alertrule_test.go +++ b/azurerm/import_arm_metric_alertrule_test.go @@ -20,11 +20,19 @@ func TestAccAzureRMMetricAlertRule_importVirtualMachineCpu(t *testing.T) { Steps: []resource.TestStep{ { Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMetricAlertRuleExists(resourceName), + resource.TestCheckNoResourceAttr(resourceName, "tags.$type"), + ), }, { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMetricAlertRuleExists(resourceName), + resource.TestCheckNoResourceAttr(resourceName, "tags.$type"), + ), }, }, }) diff --git a/azurerm/resource_arm_metric_alertrule.go b/azurerm/resource_arm_metric_alertrule.go index d4eb1b7b67b9..a8d0150fa6c8 100644 --- a/azurerm/resource_arm_metric_alertrule.go +++ b/azurerm/resource_arm_metric_alertrule.go @@ -4,6 +4,8 @@ import ( "fmt" "log" + "strings" + "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" @@ -138,7 +140,12 @@ func resourceArmMetricAlertRule() *schema.Resource { }, }, - "tags": tagsSchema(), + "tags": { + Type: schema.TypeMap, + Optional: true, + Computed: true, + ValidateFunc: validateMetricAlertRuleTags, + }, }, } } @@ -276,7 +283,10 @@ func resourceArmMetricAlertRuleRead(d *schema.ResourceData, meta interface{}) er d.Set("webhook_action", webhook_actions) } - flattenAndSetTags(d, resp.Tags) + // Return a new tag map filtered by the specified tag names. + tagMap := filterTags(resp.Tags, "$type") + + flattenAndSetTags(d, tagMap) return nil } @@ -411,3 +421,18 @@ func resourceGroupAndAlertRuleNameFromId(alertRuleId string) (string, string, er return resourceGroup, name, nil } + +func validateMetricAlertRuleTags(v interface{}, f string) (ws []string, es []error) { + // Normal validation required by any AzureRM resource. + ws, es = validateAzureRMTags(v, f) + + tagsMap := v.(map[string]interface{}) + + for k := range tagsMap { + if strings.EqualFold(k, "$type") { + es = append(es, fmt.Errorf("the %q is not allowed as tag name", k)) + } + } + + return ws, es +} diff --git a/azurerm/resource_arm_metric_alertrule_test.go b/azurerm/resource_arm_metric_alertrule_test.go index d9fef0c28c21..c4e0a2254b21 100644 --- a/azurerm/resource_arm_metric_alertrule_test.go +++ b/azurerm/resource_arm_metric_alertrule_test.go @@ -11,6 +11,60 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) +func TestValidateMetricAlertRuleTags(t *testing.T) { + cases := []struct { + Name string + Value map[string]interface{} + ErrCount int + }{ + { + Name: "Single Valid", + Value: map[string]interface{}{ + "hello": "world", + }, + ErrCount: 0, + }, + { + Name: "Single Invalid", + Value: map[string]interface{}{ + "$Type": "hello/world", + }, + ErrCount: 1, + }, + { + Name: "Single Invalid lowercase", + Value: map[string]interface{}{ + "$type": "hello/world", + }, + ErrCount: 1, + }, + { + Name: "Multiple Valid", + Value: map[string]interface{}{ + "hello": "world", + "foo": "bar", + }, + ErrCount: 0, + }, + { + Name: "Multiple Invalid", + Value: map[string]interface{}{ + "hello": "world", + "$type": "Microsoft.Foo/Bar", + }, + ErrCount: 1, + }, + } + + for _, tc := range cases { + _, errors := validateMetricAlertRuleTags(tc.Value, "azurerm_metric_alert_rule") + + if len(errors) != tc.ErrCount { + t.Fatalf("Expected %q to return %d errors but returned %d", tc.Name, tc.ErrCount, len(errors)) + } + } +} + func TestAccAzureRMMetricAlertRule_virtualMachineCpu(t *testing.T) { resourceName := "azurerm_metric_alertrule.test" ri := acctest.RandInt() @@ -27,6 +81,7 @@ func TestAccAzureRMMetricAlertRule_virtualMachineCpu(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMMetricAlertRuleExists(resourceName), resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckNoResourceAttr(resourceName, "tags.$type"), ), }, { @@ -34,6 +89,7 @@ func TestAccAzureRMMetricAlertRule_virtualMachineCpu(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMMetricAlertRuleExists(resourceName), resource.TestCheckResourceAttr(resourceName, "enabled", "false"), + resource.TestCheckNoResourceAttr(resourceName, "tags.$type"), ), }, }, @@ -54,6 +110,7 @@ func TestAccAzureRMMetricAlertRule_sqlDatabaseStorage(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMMetricAlertRuleExists(resourceName), + resource.TestCheckNoResourceAttr(resourceName, "tags.$type"), ), }, }, diff --git a/azurerm/tags.go b/azurerm/tags.go index fdc6c6a0ed13..cbb70069b84d 100644 --- a/azurerm/tags.go +++ b/azurerm/tags.go @@ -3,6 +3,7 @@ package azurerm import ( "errors" "fmt" + "strings" "github.com/hashicorp/terraform/helper/schema" ) @@ -44,7 +45,7 @@ func tagValueToString(v interface{}) (string, error) { } } -func validateAzureRMTags(v interface{}, k string) (ws []string, es []error) { +func validateAzureRMTags(v interface{}, f string) (ws []string, es []error) { tagsMap := v.(map[string]interface{}) if len(tagsMap) > 15 { @@ -64,7 +65,7 @@ func validateAzureRMTags(v interface{}, k string) (ws []string, es []error) { } } - return + return ws, es } func expandTags(tagsMap map[string]interface{}) map[string]*string { @@ -79,15 +80,36 @@ func expandTags(tagsMap map[string]interface{}) map[string]*string { return output } -func flattenAndSetTags(d *schema.ResourceData, tagsMap map[string]*string) { - if tagsMap == nil { - d.Set("tags", make(map[string]interface{})) - return +func filterTags(tagsMap map[string]*string, tagNames ...string) map[string]*string { + if len(tagNames) == 0 { + return tagsMap } - output := make(map[string]interface{}, len(tagsMap)) + // Build the filter dictionary from passed tag names. + filterDict := make(map[string]bool) + for _, name := range tagNames { + if len(name) > 0 { + filterDict[strings.ToLower(name)] = true + } + } - for i, v := range tagsMap { + // Filter out tag if it exists(case insensitive) in the dictionary. + tagsRet := make(map[string]*string) + for k, v := range tagsMap { + if !filterDict[strings.ToLower(k)] { + tagsRet[k] = v + } + } + + return tagsRet +} + +func flattenAndSetTags(d *schema.ResourceData, tagMap map[string]*string) { + + // If tagsMap is nil, len(tagsMap) will be 0. + output := make(map[string]interface{}, len(tagMap)) + + for i, v := range tagMap { output[i] = *v } diff --git a/azurerm/tags_test.go b/azurerm/tags_test.go index 606f056b0758..bf95c29c5d6e 100644 --- a/azurerm/tags_test.go +++ b/azurerm/tags_test.go @@ -94,3 +94,22 @@ func TestExpandARMTags(t *testing.T) { } } } + +func TestFilterARMTags(t *testing.T) { + testData := make(map[string]*string) + valueData := [3]string{"value1", "value2", "value3"} + + testData["key1"] = &valueData[0] + testData["key2"] = &valueData[1] + testData["key3"] = &valueData[2] + + filtered := filterTags(testData, "key1", "key3", "") + + if len(filtered) != 1 { + t.Fatalf("Expected 1 result in filtered tag map, got %d", len(filtered)) + } + + if filtered["key2"] != &valueData[1] { + t.Fatalf("Expected %v in filtered tag map, got %v", valueData[1], *filtered["key2"]) + } +} From 23e5915cb5237c819de8ef4879b91c5c994c8e75 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 20 Apr 2018 17:48:14 +0200 Subject: [PATCH 018/320] Updating to include #1107 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44f6a6fbcc2b..a04f8040fa67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ IMPROVEMENTS: * `azurerm_cosmosdb_account` - support for the `ConsistentPrefix` consistncy level [GH-1055] * `azurerm_cosmosdb_account` - `prefixes` can now be configured for locations [GH-1055] * `azurerm_key_vault` - adding cert permissions for `Purge` and `Recover` [GH-1132] +* `azurerm_metric_alertrule` - filtering out tags prefixed with `$type` [GH-1107] * `azurerm_virtual_machine` - make the `vm_size` property case insensitive [GH-1131] BUG FIXES: From 014cd6c24d891e361015a3ed1a349df242e24d70 Mon Sep 17 00:00:00 2001 From: Jon Povey Date: Fri, 20 Apr 2018 17:20:42 +0100 Subject: [PATCH 019/320] New Resource: `azurerm_servicebus_rule` (#1124) * Add AzureRM Servicebus rule module, corresponding tests and documentation * Minor fixes to the servicebus rule * Explicitly define the service bus rule in each test * Set correlation_filter to conflict with sql_filter to prevent both from being set at the same time * Raise an error when creating a correlation_filter with no properties set in correlation block * Always return the correlation_filter but only include properties if set * Rename service_bus_rule to service_bus_subscription_rule to relfect azure portal and dependency on service_bus_subscription * Update documentation for service bus subscription rule * Service bus subscription rule: Add validation to rule name, cannot be more than 50 chars * Fixing the descriptions for the name fields --- azurerm/config.go | 13 +- azurerm/provider.go | 1 + ...source_arm_servicebus_subscription_rule.go | 376 ++++++++++++++++++ ...e_arm_servicebus_subscription_rule_test.go | 369 +++++++++++++++++ website/azurerm.erb | 6 +- ...servicebus_subscription_rule.html.markdown | 181 +++++++++ 6 files changed, 941 insertions(+), 5 deletions(-) create mode 100644 azurerm/resource_arm_servicebus_subscription_rule.go create mode 100644 azurerm/resource_arm_servicebus_subscription_rule_test.go create mode 100644 website/docs/r/servicebus_subscription_rule.html.markdown diff --git a/azurerm/config.go b/azurerm/config.go index 2249cbaf9658..06c646de77c9 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -182,10 +182,11 @@ type ArmClient struct { searchServicesClient search.ServicesClient // ServiceBus - serviceBusQueuesClient servicebus.QueuesClient - serviceBusNamespacesClient servicebus.NamespacesClient - serviceBusTopicsClient servicebus.TopicsClient - serviceBusSubscriptionsClient servicebus.SubscriptionsClient + serviceBusQueuesClient servicebus.QueuesClient + serviceBusNamespacesClient servicebus.NamespacesClient + serviceBusTopicsClient servicebus.TopicsClient + serviceBusSubscriptionsClient servicebus.SubscriptionsClient + serviceBusSubscriptionRulesClient servicebus.RulesClient //Scheduler schedulerJobCollectionsClient scheduler.JobCollectionsClient @@ -859,6 +860,10 @@ func (c *ArmClient) registerServiceBusClients(endpoint, subscriptionId string, a subscriptionsClient := servicebus.NewSubscriptionsClientWithBaseURI(endpoint, subscriptionId) c.configureClient(&subscriptionsClient.Client, auth) c.serviceBusSubscriptionsClient = subscriptionsClient + + subscriptionRulesClient := servicebus.NewRulesClientWithBaseURI(endpoint, subscriptionId) + c.configureClient(&subscriptionRulesClient.Client, auth) + c.serviceBusSubscriptionRulesClient = subscriptionRulesClient } func (c *ArmClient) registerSchedulerClients(endpoint, subscriptionId string, auth autorest.Authorizer) { diff --git a/azurerm/provider.go b/azurerm/provider.go index ac2afb83958b..13388cb2e9a4 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -192,6 +192,7 @@ func Provider() terraform.ResourceProvider { "azurerm_servicebus_namespace": resourceArmServiceBusNamespace(), "azurerm_servicebus_queue": resourceArmServiceBusQueue(), "azurerm_servicebus_subscription": resourceArmServiceBusSubscription(), + "azurerm_servicebus_subscription_rule": resourceArmServiceBusSubscriptionRule(), "azurerm_servicebus_topic": resourceArmServiceBusTopic(), "azurerm_servicebus_topic_authorization_rule": resourceArmServiceBusTopicAuthorizationRule(), "azurerm_snapshot": resourceArmSnapshot(), diff --git a/azurerm/resource_arm_servicebus_subscription_rule.go b/azurerm/resource_arm_servicebus_subscription_rule.go new file mode 100644 index 000000000000..fa3218f392bb --- /dev/null +++ b/azurerm/resource_arm_servicebus_subscription_rule.go @@ -0,0 +1,376 @@ +package azurerm + +import ( + "fmt" + "log" + + "github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus" + "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmServiceBusSubscriptionRule() *schema.Resource { + return &schema.Resource{ + Create: resourceArmServiceBusSubscriptionRuleCreate, + Read: resourceArmServiceBusSubscriptionRuleRead, + Update: resourceArmServiceBusSubscriptionRuleCreate, + Delete: resourceArmServiceBusSubscriptionRuleDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 50), + }, + + "namespace_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "topic_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "subscription_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "filter_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + string(servicebus.FilterTypeSQLFilter), + string(servicebus.FilterTypeCorrelationFilter), + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + + "resource_group_name": resourceGroupNameSchema(), + + "sql_filter": { + Type: schema.TypeString, + Optional: true, + }, + + "correlation_filter": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + ConflictsWith: []string{"sql_filter"}, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "correlation_id": { + Type: schema.TypeString, + Optional: true, + }, + "message_id": { + Type: schema.TypeString, + Optional: true, + }, + "to": { + Type: schema.TypeString, + Optional: true, + }, + "reply_to": { + Type: schema.TypeString, + Optional: true, + }, + "label": { + Type: schema.TypeString, + Optional: true, + }, + "session_id": { + Type: schema.TypeString, + Optional: true, + }, + "reply_to_session_id": { + Type: schema.TypeString, + Optional: true, + }, + "content_type": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + + "action": { + Type: schema.TypeString, + Optional: true, + }, + }, + } +} + +func resourceArmServiceBusSubscriptionRuleCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).serviceBusSubscriptionRulesClient + ctx := meta.(*ArmClient).StopContext + log.Printf("[INFO] preparing arguments for Azure ARM Service Bus Subscription Rule creation.") + + name := d.Get("name").(string) + topicName := d.Get("topic_name").(string) + subscriptionName := d.Get("subscription_name").(string) + namespaceName := d.Get("namespace_name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + rule, err := buildAzureRmServiceBusSubscriptionRule(name, d) + if err != nil { + return err + } + + err = validateArmServiceBusSubscriptionRule(name, rule) + if err != nil { + return err + } + + _, err = client.CreateOrUpdate(ctx, resourceGroup, namespaceName, topicName, subscriptionName, name, rule) + if err != nil { + return err + } + + read, err := client.Get(ctx, resourceGroup, namespaceName, topicName, subscriptionName, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Cannot read Service Bus Subscription Rule %s (resource group %s) ID", name, resourceGroup) + } + + d.SetId(*read.ID) + + return resourceArmServiceBusSubscriptionRuleRead(d, meta) +} + +func resourceArmServiceBusSubscriptionRuleRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).serviceBusSubscriptionRulesClient + ctx := meta.(*ArmClient).StopContext + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + + resourceGroup := id.ResourceGroup + namespaceName := id.Path["namespaces"] + topicName := id.Path["topics"] + subscriptionName := id.Path["subscriptions"] + name := id.Path["rules"] + + resp, err := client.Get(ctx, resourceGroup, namespaceName, topicName, subscriptionName, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + return fmt.Errorf("Error making Read request on Azure Service Bus Subscription Rule %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.Set("name", resp.Name) + d.Set("resource_group_name", resourceGroup) + d.Set("namespace_name", namespaceName) + d.Set("topic_name", topicName) + d.Set("subscription_name", subscriptionName) + + if properties := resp.Ruleproperties; properties != nil { + d.Set("filter_type", properties.FilterType) + + if properties.Action != nil { + d.Set("action", properties.Action.SQLExpression) + } + + if properties.SQLFilter != nil { + d.Set("sql_filter", properties.SQLFilter.SQLExpression) + } + + if err := d.Set("correlation_filter", flattenAzureRmServiceBusCorrelationFilter(properties.CorrelationFilter)); err != nil { + return fmt.Errorf("Error setting `correlation_filter` on Azure Service Bus Subscription Rule (%q): %+v", name, err) + } + } + + return nil +} + +func resourceArmServiceBusSubscriptionRuleDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).serviceBusSubscriptionRulesClient + ctx := meta.(*ArmClient).StopContext + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + namespaceName := id.Path["namespaces"] + topicName := id.Path["topics"] + subscriptionName := id.Path["subscriptions"] + name := id.Path["rules"] + + _, err = client.Delete(ctx, resourceGroup, namespaceName, topicName, subscriptionName, name) + + return err +} + +func buildAzureRmServiceBusSubscriptionRule(name string, d *schema.ResourceData) (rule servicebus.Rule, err error) { + correlationfilter, err := getAzureRmServiceBusCorrelationFilter(name, d) + if err != nil { + return + } + + filterType := d.Get("filter_type").(string) + rule = servicebus.Rule{ + Ruleproperties: &servicebus.Ruleproperties{ + FilterType: servicebus.FilterType(filterType), + Action: getAzureRmServiceBusAction(d), + SQLFilter: getAzureRmServiceBusSQLFilter(d), + CorrelationFilter: correlationfilter, + }, + } + + return +} + +func getAzureRmServiceBusAction(d *schema.ResourceData) *servicebus.Action { + if action := d.Get("action").(string); action != "" { + serviceBusAction := servicebus.Action{ + SQLExpression: &action, + } + return &serviceBusAction + } + return nil +} + +func getAzureRmServiceBusSQLFilter(d *schema.ResourceData) *servicebus.SQLFilter { + if sqlFilter := d.Get("sql_filter").(string); sqlFilter != "" { + serviceBusSQLFilter := servicebus.SQLFilter{ + SQLExpression: &sqlFilter, + } + return &serviceBusSQLFilter + } + return nil +} + +func getAzureRmServiceBusCorrelationFilter(name string, d *schema.ResourceData) (*servicebus.CorrelationFilter, error) { + if config := d.Get("correlation_filter").([]interface{}); len(config) > 0 { + + if config[0] == nil { + err := fmt.Errorf("Cannot create Service Bus Subscription Rule (%s). At least one property must be set in the `correlation_filter` block", name) + return nil, err + } + + filter := config[0].(map[string]interface{}) + correlationFilter := servicebus.CorrelationFilter{} + + if correlationID := filter["correlation_id"].(string); correlationID != "" { + correlationFilter.CorrelationID = &correlationID + } + + if messageID := filter["message_id"].(string); messageID != "" { + correlationFilter.MessageID = &messageID + } + + if to := filter["to"].(string); to != "" { + correlationFilter.To = &to + } + + if replyTo := filter["reply_to"].(string); replyTo != "" { + correlationFilter.ReplyTo = &replyTo + } + + if label := filter["label"].(string); label != "" { + correlationFilter.Label = &label + } + + if sessionID := filter["session_id"].(string); sessionID != "" { + correlationFilter.SessionID = &sessionID + } + + if replyToSessionID := filter["reply_to_session_id"].(string); replyToSessionID != "" { + correlationFilter.ReplyToSessionID = &replyToSessionID + } + + if contentType := filter["content_type"].(string); contentType != "" { + correlationFilter.ContentType = &contentType + } + + return &correlationFilter, nil + } + + return nil, nil +} + +func flattenAzureRmServiceBusCorrelationFilter(f *servicebus.CorrelationFilter) []interface{} { + filters := make([]interface{}, 0, 1) + if f == nil { + return filters + } + + filter := make(map[string]interface{}) + + if f.CorrelationID != nil { + filter["correlation_id"] = *f.CorrelationID + } + + if f.MessageID != nil { + filter["message_id"] = *f.MessageID + } + + if f.To != nil { + filter["to"] = *f.To + } + + if f.ReplyTo != nil { + filter["reply_to"] = *f.ReplyTo + } + + if f.Label != nil { + filter["label"] = *f.Label + } + + if f.SessionID != nil { + filter["session_id"] = *f.SessionID + } + + if f.ReplyToSessionID != nil { + filter["reply_to_session_id"] = *f.ReplyToSessionID + } + + if f.ContentType != nil { + filter["content_type"] = *f.ContentType + } + + filters = append(filters, filter) + return filters +} + +func validateArmServiceBusSubscriptionRule(name string, rule servicebus.Rule) error { + if rule.Ruleproperties.FilterType == servicebus.FilterTypeSQLFilter { + if rule.Ruleproperties.SQLFilter == nil { + return fmt.Errorf("Cannot create Service Bus Subscription Rule (%s). 'sql_filter' must be specified when 'filter_type' is set to 'SqlFilter'", name) + } + if rule.Ruleproperties.CorrelationFilter != nil { + return fmt.Errorf("Service Bus Subscription Rule (%s) does not support `correlation_filter` when 'filter_type' is set to 'SqlFilter'", name) + } + } + + if rule.Ruleproperties.FilterType == servicebus.FilterTypeCorrelationFilter { + if rule.Ruleproperties.CorrelationFilter == nil { + return fmt.Errorf("Cannot create Service Bus Subscription Rule (%s). 'correlation_filter' must be specified when 'filter_type' is set to 'CorrelationFilter'", name) + } + if rule.Ruleproperties.SQLFilter != nil { + return fmt.Errorf("Service Bus Subscription Rule (%s) does not support `sql_filter` when 'filter_type' is set to 'CorrelationFilter'", name) + } + } + + return nil +} diff --git a/azurerm/resource_arm_servicebus_subscription_rule_test.go b/azurerm/resource_arm_servicebus_subscription_rule_test.go new file mode 100644 index 000000000000..f39c0e75b98c --- /dev/null +++ b/azurerm/resource_arm_servicebus_subscription_rule_test.go @@ -0,0 +1,369 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func TestAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(t *testing.T) { + ri := acctest.RandInt() + config := testAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMServiceBusTopicDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMServiceBusSubscriptionRuleExists(), + ), + }, + }, + }) +} + +func TestAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter(t *testing.T) { + ri := acctest.RandInt() + config := testAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMServiceBusTopicDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMServiceBusSubscriptionRuleExists(), + ), + }, + }, + }) +} + +func TestAccAzureRMServiceBusSubscriptionRule_sqlFilterWithAction(t *testing.T) { + ri := acctest.RandInt() + config := testAccAzureRMServiceBusSubscriptionRule_sqlFilterWithAction(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMServiceBusTopicDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMServiceBusSubscriptionRuleExists(), + ), + }, + }, + }) +} + +func TestAccAzureRMServiceBusSubscriptionRule_correlationFilterWithAction(t *testing.T) { + ri := acctest.RandInt() + config := testAccAzureRMServiceBusSubscriptionRule_correlationFilterWithAction(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMServiceBusTopicDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMServiceBusSubscriptionRuleExists(), + ), + }, + }, + }) +} + +func TestAccAzureRMServiceBusSubscriptionRule_sqlFilterUpdated(t *testing.T) { + ri := acctest.RandInt() + location := testLocation() + config := testAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(ri, location) + updatedConfig := testAccAzureRMServiceBusSubscriptionRule_basicSqlFilterUpdated(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMServiceBusTopicDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMServiceBusSubscriptionRuleExists(), + resource.TestCheckResourceAttr(resourceName, "sql_filter", "2=2"), + ), + }, + { + Config: updatedConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMServiceBusSubscriptionRuleExists(), + resource.TestCheckResourceAttr(resourceName, "sql_filter", "3=3"), + ), + }, + }, + }) +} + +func TestAccAzureRMServiceBusSubscriptionRule_correlationFilterUpdated(t *testing.T) { + ri := acctest.RandInt() + location := testLocation() + config := testAccAzureRMServiceBusSubscriptionRule_correlationFilter(ri, location) + updatedConfig := testAccAzureRMServiceBusSubscriptionRule_correlationFilterUpdated(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMServiceBusTopicDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMServiceBusSubscriptionRuleExists(), + resource.TestCheckResourceAttr(resourceName, "correlation_filter.0.message_id", "test_message_id"), + resource.TestCheckResourceAttr(resourceName, "correlation_filter.0.reply_to", ""), + ), + }, + { + Config: updatedConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMServiceBusSubscriptionRuleExists(), + resource.TestCheckResourceAttr(resourceName, "correlation_filter.0.message_id", "test_message_id_updated"), + resource.TestCheckResourceAttr(resourceName, "correlation_filter.0.reply_to", "test_reply_to_added"), + ), + }, + }, + }) +} + +func TestAccAzureRMServiceBusSubscriptionRule_updateSqlFilterToCorrelationFilter(t *testing.T) { + ri := acctest.RandInt() + location := testLocation() + config := testAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(ri, location) + updatedConfig := testAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMServiceBusTopicDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMServiceBusSubscriptionRuleExists(), + ), + }, + { + Config: updatedConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMServiceBusSubscriptionRuleExists(), + ), + }, + }, + }) +} + +func testCheckAzureRMServiceBusSubscriptionRuleExists() resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + ruleName := rs.Primary.Attributes["name"] + subscriptionName := rs.Primary.Attributes["subscription_name"] + topicName := rs.Primary.Attributes["topic_name"] + namespaceName := rs.Primary.Attributes["namespace_name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for Subscription Rule: %q", ruleName) + } + + client := testAccProvider.Meta().(*ArmClient).serviceBusSubscriptionRulesClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + resp, err := client.Get(ctx, resourceGroup, namespaceName, topicName, subscriptionName, ruleName) + if err != nil { + return fmt.Errorf("Bad: Get on serviceBusRulesClient: %+v", err) + } + + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: Subscription Rule %q (resource group: %q) does not exist", ruleName, resourceGroup) + } + + return nil + } +} + +func testAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(rInt int, location string) string { + sqlFilter := ` + resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + filter_type = "SqlFilter" + sql_filter = "2=2" + } + ` + + return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(sqlFilter, rInt)) +} + +func testAccAzureRMServiceBusSubscriptionRule_basicSqlFilterUpdated(rInt int, location string) string { + sqlFilter := ` + resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + filter_type = "SqlFilter" + sql_filter = "3=3" + } + ` + return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(sqlFilter, rInt)) +} + +func testAccAzureRMServiceBusSubscriptionRule_sqlFilterWithAction(rInt int, location string) string { + sqlFilter := ` + resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + filter_type = "SqlFilter" + sql_filter = "2=2" + action = "SET Test='true'" + } + ` + return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(sqlFilter, rInt)) +} + +func testAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter(rInt int, location string) string { + correlationFilter := ` + resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + filter_type = "CorrelationFilter" + + correlation_filter = { + correlation_id = "test_correlation_id" + message_id = "test_message_id" + to = "test_to" + reply_to = "test_reply_to" + label = "test_label" + session_id = "test_session_id" + reply_to_session_id = "test_reply_to_session_id" + content_type = "test_content_type" + } + } + ` + return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(correlationFilter, rInt)) +} + +func testAccAzureRMServiceBusSubscriptionRule_correlationFilter(rInt int, location string) string { + correlationFilter := ` + resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + filter_type = "CorrelationFilter" + + correlation_filter = { + correlation_id = "test_correlation_id" + message_id = "test_message_id" + } + } + ` + return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(correlationFilter, rInt)) +} + +func testAccAzureRMServiceBusSubscriptionRule_correlationFilterUpdated(rInt int, location string) string { + correlationFilter := ` + resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + filter_type = "CorrelationFilter" + + correlation_filter = { + correlation_id = "test_correlation_id" + message_id = "test_message_id_updated" + reply_to = "test_reply_to_added" + } + } + ` + return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(correlationFilter, rInt)) +} + +func testAccAzureRMServiceBusSubscriptionRule_correlationFilterWithAction(rInt int, location string) string { + correlationFilter := ` + resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + action = "SET Test='true'" + filter_type = "CorrelationFilter" + + correlation_filter = { + correlation_id = "test_correlation_id" + message_id = "test_message_id" + } + } + ` + return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(correlationFilter, rInt)) +} + +const resourceName = "azurerm_servicebus_subscription_rule.test" + +const testAccAzureRMServiceBusSubscriptionRule_tfTemplate = ` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_servicebus_namespace" "test" { + name = "acctestservicebusnamespace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "standard" +} + +resource "azurerm_servicebus_topic" "test" { + name = "acctestservicebustopic-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_servicebus_subscription" "test" { + name = "acctestservicebussubscription-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + max_delivery_count = 10 +} + +%s +` diff --git a/website/azurerm.erb b/website/azurerm.erb index a97dd24179b0..f52739eeb4cf 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -511,12 +511,16 @@ > azurerm_servicebus_queue - + > azurerm_servicebus_subscription + > + azurerm_servicebus_subscription_rule + + > azurerm_servicebus_topic diff --git a/website/docs/r/servicebus_subscription_rule.html.markdown b/website/docs/r/servicebus_subscription_rule.html.markdown new file mode 100644 index 000000000000..c3f6627912be --- /dev/null +++ b/website/docs/r/servicebus_subscription_rule.html.markdown @@ -0,0 +1,181 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_servicebus_subscription_rule" +sidebar_current: "docs-azurerm-resource-servicebus-subscription-rule" +description: |- + Create a ServiceBus Subscription Rule. +--- + +# azurerm_servicebus_subscription_rule + +Create a ServiceBus Subscription Rule. + +## Example Usage (SQL Filter) + +```hcl +variable "location" { + description = "Azure datacenter to deploy to." + default = "West US" +} + +variable "servicebus_name" { + description = "Input your unique Azure service bus name" +} + +resource "azurerm_resource_group" "test" { + name = "terraform-servicebus" + location = "${var.location}" +} + +resource "azurerm_servicebus_namespace" "test" { + name = "${var.servicebus_name}" + location = "${var.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "standard" + + tags { + source = "terraform" + } +} + +resource "azurerm_servicebus_topic" "test" { + name = "testTopic" + resource_group_name = "${azurerm_resource_group.test.name}" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + + enable_partitioning = true +} + +resource "azurerm_servicebus_subscription" "test" { + name = "testSubscription" + resource_group_name = "${azurerm_resource_group.test.name}" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + max_delivery_count = 1 +} + +resource "azurerm_servicebus_subscription_rule" "test" { + name = "testSubscriptionRule" + resource_group_name = "${azurerm_resource_group.test.name}" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + filter_type = "SqlFilter" + sql_filter = "color = 'red'" +} +``` + +## Example Usage (Correlation Filter) + +```hcl +variable "location" { + description = "Azure datacenter to deploy to." + default = "West US" +} + +variable "servicebus_name" { + description = "Input your unique Azure service bus name" +} + +resource "azurerm_resource_group" "test" { + name = "terraform-servicebus" + location = "${var.location}" +} + +resource "azurerm_servicebus_namespace" "test" { + name = "${var.servicebus_name}" + location = "${var.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "standard" + + tags { + source = "terraform" + } +} + +resource "azurerm_servicebus_topic" "test" { + name = "testTopic" + resource_group_name = "${azurerm_resource_group.test.name}" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + + enable_partitioning = true +} + +resource "azurerm_servicebus_subscription" "test" { + name = "testSubscription" + resource_group_name = "${azurerm_resource_group.test.name}" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + max_delivery_count = 1 +} + +resource "azurerm_servicebus_subscription_rule" "test" { + name = "testSubscriptionRule" + resource_group_name = "${azurerm_resource_group.test.name}" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + filter_type = "CorrelationFilter" + correlation_filter = { + correlation_id = "high" + label = "red" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the ServiceBus Subscription Rule. Changing this forces a new resource to be created. + +* `namespace_name` - (Required) The name of the ServiceBus Namespace in which the ServiceBus Topic exists. Changing this forces a new resource to be created. + +* `topic_name` - (Required) The name of the ServiceBus Topic in which the ServiceBus Subscription exists. Changing this forces a new resource to be created. + +* `subscription_name` - (Required) The name of the ServiceBus Subscription in which this Rule should be created. Changing this forces a new resource to be created. + +* `resource_group_name` - (Required) The name of the resource group in the ServiceBus Namespace exists. Changing this forces a new resource to be created. + +* `filter_type` - (Required) Type of filter to be applied to a BrokeredMessage. Possible values are `SqlFilter` and `CorrelationFilter`. + +* `sql_filter` - (Optional) Represents a filter written in SQL language-based syntax that to be evaluated against a BrokeredMessage. Required when `filter_type` is set to `SqlFilter`. + +* `correlation_filter` - (Optional) A `correlation_filter` block as documented below to be evaluated against a BrokeredMessage. Required when `filter_type` is set to `CorrelationFilter`. + +* `action` - (Optional) Represents set of actions written in SQL language-based syntax that is performed against a BrokeredMessage. + +`correlation_filter` supports the following: + +* `content_type` - (Optional) Content type of the message. + +* `correlation_id` - (Optional) Identifier of the correlation. + +* `label` - (Optional) Application specific label. + +* `message_id` - (Optional) Identifier of the message. + +* `reply_to` - (Optional) Address of the queue to reply to. + +* `reply_to_session_id` - (Optional) Session identifier to reply to. + +* `session_id` - (Optional) Session identifier. + +* `to` - (Optional) Address to send to. + +~> **NOTE:** When creating a subscription rule of type `CorrelationFilter` at least one property must be set in the `correlation_filter` block. + + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ServiceBus Subscription Rule ID. + +## Import + +Service Bus Subscription Rule can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_servicebus_subscription.test /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/microsoft.servicebus/namespaces/sbns1/topics/sntopic1/subscriptions/sbsub1/rules/sbrule1 +``` From 1b508d4b0f7577b71a25568a5efc23c1deb0f6b9 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 20 Apr 2018 18:21:41 +0200 Subject: [PATCH 020/320] Updating to include #1124 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a04f8040fa67..2ce75979ec50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ FEATURES: * **New Data Source:** `azurerm_recovery_services_vault` [GH-995] * **New Resource:** `azurerm_recovery_services_vault` [GH-995] +* **New Resource:** `azurerm_servicebus_rule` [GH-1124] IMPROVEMENTS: From bcbf6fb893d98379a3bf837880a53258d36bc444 Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Fri, 20 Apr 2018 13:22:11 -0400 Subject: [PATCH 021/320] Incorporate fixes from first gh review feedback. - Set force new behavior. --- azurerm/data_source_storage_account_sas.go | 15 +++++++++++++++ website/docs/d/storage_account_sas.html.markdown | 10 +++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/azurerm/data_source_storage_account_sas.go b/azurerm/data_source_storage_account_sas.go index 3bbc839018d0..82fb3e7b5f59 100644 --- a/azurerm/data_source_storage_account_sas.go +++ b/azurerm/data_source_storage_account_sas.go @@ -51,16 +51,19 @@ func dataSourceArmStorageAccountSharedAccessSignature() *schema.Resource { "service": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, "container": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, "object": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, }, }, @@ -76,21 +79,25 @@ func dataSourceArmStorageAccountSharedAccessSignature() *schema.Resource { "blob": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, "queue": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, "table": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, "file": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, }, }, @@ -120,41 +127,49 @@ func dataSourceArmStorageAccountSharedAccessSignature() *schema.Resource { "read": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, "write": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, "delete": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, "list": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, "add": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, "create": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, "update": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, "process": { Type: schema.TypeBool, Required: true, + ForceNew: true, }, }, }, diff --git a/website/docs/d/storage_account_sas.html.markdown b/website/docs/d/storage_account_sas.html.markdown index 8fda6bdff206..51ed5b5291a5 100644 --- a/website/docs/d/storage_account_sas.html.markdown +++ b/website/docs/d/storage_account_sas.html.markdown @@ -72,16 +72,16 @@ output "sas_url_query_string" { ## Argument Reference * `connection_string` - (Required) The connection string for the storage account to which this SAS applies. Typically directly from the `primary_connection_string` attribute of a terraform created `azurerm_storage_account` resource. -* `https_only` - (Optional) Only permit `https` access. If `false`, both `http` and `https` are permitted. (Default `true`) -* `resouce_types` - (Required) A set of true/false flags which define the storage account resource types that are granted access by this SAS. -* `services` - (Required) A set of true/false flags which define the storage account services that are granted access by this SAS. +* `https_only` - (Optional) Only permit `https` access. If `false`, both `http` and `https` are permitted. Defaults to `true`. +* `resouce_types` - (Required) A set of `true`/`false` flags which define the storage account resource types that are granted access by this SAS. +* `services` - (Required) A set of `true`/`false` flags which define the storage account services that are granted access by this SAS. * `start` - (Required) The starting time and date of validity of this SAS. Must be a valid ISO-8601 format time/date string. * `expiry` - (Required) The expiration time and date of this SAS. Must be a valid ISO-8601 format time/date string. -* `permissions` - (Required) A set of true/false flags which define the granted permissions. +* `permissions` - (Required) A set of `true`/`false` flags which define the granted permissions. Refer to the [SAS creation reference from Azure](https://docs.microsoft.com/en-us/rest/api/storageservices/constructing-an-account-sas) for additional details on the fields above. ## Attributes Reference -* `sas` - (Computed) The computed Account Shared Access Signature (SAS). +* `sas` - The computed Account Shared Access Signature (SAS). From 4cc13813b6e27ad765c3ad22bcfbf7cfada6b513 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Mon, 23 Apr 2018 04:18:26 -0700 Subject: [PATCH 022/320] Use disk API to load managed disk info when VM is stopped. (#1100) * Use disk API to load managed disk info when VM is stopped. * Abstract the storage revise procedures according to the comments. * Add more status codes to check for deallocation. * Update managed disk information when flattening. * Add test case for disk info of a deallocated virtual machine * Fixing comments identified in the PR: ``` $ acctests azurerm TestAccAzureRMVirtualMachine_hasDiskInfoWhenStopped === RUN TestAccAzureRMVirtualMachine_hasDiskInfoWhenStopped --- PASS: TestAccAzureRMVirtualMachine_hasDiskInfoWhenStopped (729.95s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 729.986s ``` --- azurerm/resource_arm_virtual_machine.go | 66 ++++++++- ..._arm_virtual_machine_managed_disks_test.go | 132 ++++++++++++++++++ 2 files changed, 191 insertions(+), 7 deletions(-) diff --git a/azurerm/resource_arm_virtual_machine.go b/azurerm/resource_arm_virtual_machine.go index 8c2272fd0025..42f9a0881bdf 100644 --- a/azurerm/resource_arm_virtual_machine.go +++ b/azurerm/resource_arm_virtual_machine.go @@ -633,7 +633,6 @@ func resourceArmVirtualMachineRead(d *schema.ResourceData, meta interface{}) err name := id.Path["virtualMachines"] resp, err := vmClient.Get(ctx, resGroup, name, "") - if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") @@ -669,12 +668,26 @@ func resourceArmVirtualMachineRead(d *schema.ResourceData, meta interface{}) err } } - if err := d.Set("storage_os_disk", flattenAzureRmVirtualMachineOsDisk(resp.VirtualMachineProperties.StorageProfile.OsDisk)); err != nil { - return fmt.Errorf("[DEBUG] Error setting Virtual Machine Storage OS Disk error: %#v", err) + if osDisk := resp.VirtualMachineProperties.StorageProfile.OsDisk; osDisk != nil { + diskInfo, err := resourceArmVirtualMachineGetManagedDiskInfo(osDisk.ManagedDisk, meta) + if err != nil { + return fmt.Errorf("[DEBUG] Error getting managed OS disk detailed information: %#v", err) + } + if err := d.Set("storage_os_disk", flattenAzureRmVirtualMachineOsDisk(osDisk, diskInfo)); err != nil { + return fmt.Errorf("[DEBUG] Error setting Virtual Machine Storage OS Disk error: %#v", err) + } } - if resp.VirtualMachineProperties.StorageProfile.DataDisks != nil { - if err := d.Set("storage_data_disk", flattenAzureRmVirtualMachineDataDisk(resp.VirtualMachineProperties.StorageProfile.DataDisks)); err != nil { + if dataDisks := resp.VirtualMachineProperties.StorageProfile.DataDisks; dataDisks != nil { + disksInfo := make([]*compute.Disk, len(*dataDisks)) + for i, dataDisk := range *dataDisks { + diskInfo, err := resourceArmVirtualMachineGetManagedDiskInfo(dataDisk.ManagedDisk, meta) + if err != nil { + return fmt.Errorf("[DEBUG] Error getting managed data disk detailed information: %#v", err) + } + disksInfo[i] = diskInfo + } + if err := d.Set("storage_data_disk", flattenAzureRmVirtualMachineDataDisk(dataDisks, disksInfo)); err != nil { return fmt.Errorf("[DEBUG] Error setting Virtual Machine Storage Data Disks error: %#v", err) } } @@ -958,7 +971,7 @@ func flattenAzureRmVirtualMachineOsProfileSecrets(secrets *[]compute.VaultSecret return result } -func flattenAzureRmVirtualMachineDataDisk(disks *[]compute.DataDisk) interface{} { +func flattenAzureRmVirtualMachineDataDisk(disks *[]compute.DataDisk, disksInfo []*compute.Disk) interface{} { result := make([]interface{}, len(*disks)) for i, disk := range *disks { l := make(map[string]interface{}) @@ -977,6 +990,8 @@ func flattenAzureRmVirtualMachineDataDisk(disks *[]compute.DataDisk) interface{} } l["lun"] = *disk.Lun + flattenAzureRmVirtualMachineReviseDiskInfo(l, disksInfo[i]) + result[i] = l } return result @@ -1065,7 +1080,7 @@ func flattenAzureRmVirtualMachineOsProfileLinuxConfiguration(config *compute.Lin return []interface{}{result} } -func flattenAzureRmVirtualMachineOsDisk(disk *compute.OSDisk) []interface{} { +func flattenAzureRmVirtualMachineOsDisk(disk *compute.OSDisk, diskInfo *compute.Disk) []interface{} { result := make(map[string]interface{}) result["name"] = *disk.Name if disk.Vhd != nil { @@ -1084,9 +1099,22 @@ func flattenAzureRmVirtualMachineOsDisk(disk *compute.OSDisk) []interface{} { } result["os_type"] = string(disk.OsType) + flattenAzureRmVirtualMachineReviseDiskInfo(result, diskInfo) + return []interface{}{result} } +func flattenAzureRmVirtualMachineReviseDiskInfo(result map[string]interface{}, diskInfo *compute.Disk) { + if diskInfo != nil { + if diskInfo.Sku != nil { + result["managed_disk_type"] = string(diskInfo.Sku.Name) + } + if diskInfo.DiskProperties != nil && diskInfo.DiskProperties.DiskSizeGB != nil { + result["disk_size_gb"] = *diskInfo.DiskProperties.DiskSizeGB + } + } +} + func expandAzureRmVirtualMachinePlan(d *schema.ResourceData) (*compute.Plan, error) { planConfigs := d.Get("plan").([]interface{}) @@ -1599,3 +1627,27 @@ func resourceArmVirtualMachineStorageImageReferenceHash(v interface{}) int { } return hashcode.String(buf.String()) } + +func resourceArmVirtualMachineGetManagedDiskInfo(disk *compute.ManagedDiskParameters, meta interface{}) (*compute.Disk, error) { + client := meta.(*ArmClient).diskClient + ctx := meta.(*ArmClient).StopContext + + if disk == nil || disk.ID == nil { + return nil, nil + } + + diskId := *disk.ID + id, err := parseAzureResourceID(diskId) + if err != nil { + return nil, fmt.Errorf("Error parsing Disk ID %q: %+v", diskId, err) + } + + resourceGroup := id.ResourceGroup + name := id.Path["disks"] + diskResp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return nil, fmt.Errorf("Error retrieving Disk %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + return &diskResp, nil +} diff --git a/azurerm/resource_arm_virtual_machine_managed_disks_test.go b/azurerm/resource_arm_virtual_machine_managed_disks_test.go index 13f6065b3004..25416804d469 100644 --- a/azurerm/resource_arm_virtual_machine_managed_disks_test.go +++ b/azurerm/resource_arm_virtual_machine_managed_disks_test.go @@ -380,6 +380,63 @@ func TestAccAzureRMVirtualMachine_winRMCerts(t *testing.T) { }) } +func TestAccAzureRMVirtualMachine_hasDiskInfoWhenStopped(t *testing.T) { + var vm compute.VirtualMachine + resourceName := "azurerm_virtual_machine.test" + rInt := acctest.RandInt() + config := testAccAzureRMVirtualMachine_hasDiskInfoWhenStopped(rInt, testLocation()) + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualMachineDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualMachineExists(resourceName, &vm), + resource.TestCheckResourceAttr(resourceName, "storage_os_disk.0.managed_disk_type", "Standard_LRS"), + resource.TestCheckResourceAttr(resourceName, "storage_data_disk.0.disk_size_gb", "64"), + ), + }, + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAndStopAzureRMVirtualMachine(&vm), + resource.TestCheckResourceAttr(resourceName, "storage_os_disk.0.managed_disk_type", "Standard_LRS"), + resource.TestCheckResourceAttr(resourceName, "storage_data_disk.0.disk_size_gb", "64"), + ), + }, + }, + }) +} + +func testCheckAndStopAzureRMVirtualMachine(vm *compute.VirtualMachine) resource.TestCheckFunc { + return func(s *terraform.State) error { + vmID, err := parseAzureResourceID(*vm.ID) + if err != nil { + return fmt.Errorf("Unable to parse virtual machine ID %s, %+v", *vm.ID, err) + } + + name := vmID.Path["virtualMachines"] + resourceGroup := vmID.ResourceGroup + + client := testAccProvider.Meta().(*ArmClient).vmClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + future, err := client.Deallocate(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("Failed stopping virtual machine %q: %+v", resourceGroup, err) + } + + err = future.WaitForCompletion(ctx, client.Client) + if err != nil { + return fmt.Errorf("Failed long polling for the stop of virtual machine %q: %+v", resourceGroup, err) + } + + return nil + } +} + func testAccAzureRMVirtualMachine_winRMCerts(rString string, location string) string { return fmt.Sprintf(` variable "prefix" { @@ -1976,3 +2033,78 @@ resource "azurerm_virtual_machine" "test" { } `, rInt, location, rInt, rInt, rInt, rInt, rInt) } + +func testAccAzureRMVirtualMachine_hasDiskInfoWhenStopped(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctest-rg-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvn-%d" + address_space = ["10.0.0.0/16"] + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_subnet" "test" { + name = "internal" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + ip_configuration { + name = "testconfiguration" + subnet_id = "${azurerm_subnet.test.id}" + private_ip_address_allocation = "dynamic" + } +} + +resource "azurerm_virtual_machine" "test" { + name = "acctestvm-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + network_interface_ids = ["${azurerm_network_interface.test.id}"] + vm_size = "Standard_DS1_v2" + + storage_image_reference { + publisher = "Canonical" + offer = "UbuntuServer" + sku = "16.04-LTS" + version = "latest" + } + + storage_os_disk { + name = "acctest-osdisk-%d" + caching = "ReadWrite" + create_option = "FromImage" + managed_disk_type = "Standard_LRS" + } + + storage_data_disk { + name = "acctest-datadisk-%d" + caching = "ReadWrite" + create_option = "Empty" + lun = 0 + disk_size_gb = 64 + } + + os_profile { + computer_name = "acctest-machine-%d" + admin_username = "testadmin" + admin_password = "Password1234!" + } + + os_profile_linux_config { + disable_password_authentication = false + } +} +`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt) +} From a15d68e808295fb31d5e238a0e57c635e770e065 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 23 Apr 2018 13:18:55 +0200 Subject: [PATCH 023/320] Updating to include #1100 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ce75979ec50..023dd57eae91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ IMPROVEMENTS: * `azurerm_cosmosdb_account` - `prefixes` can now be configured for locations [GH-1055] * `azurerm_key_vault` - adding cert permissions for `Purge` and `Recover` [GH-1132] * `azurerm_metric_alertrule` - filtering out tags prefixed with `$type` [GH-1107] +* `azurerm_virtual_machine` - loading managed disk information from Azure when the machine is stopped [GH-1100] * `azurerm_virtual_machine` - make the `vm_size` property case insensitive [GH-1131] BUG FIXES: From 0eace1138e5f0b8c53070bce027157df4fdab254 Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Mon, 23 Apr 2018 08:45:54 -0400 Subject: [PATCH 024/320] Fix tabs vs spaces in the hcl string literal. --- azurerm/data_source_storage_account_sas_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/azurerm/data_source_storage_account_sas_test.go b/azurerm/data_source_storage_account_sas_test.go index 09550215b963..55c2355c107c 100644 --- a/azurerm/data_source_storage_account_sas_test.go +++ b/azurerm/data_source_storage_account_sas_test.go @@ -66,19 +66,19 @@ data "azurerm_storage_account_sas" "test" { blob = true queue = false table = false - file = false + file = false } start = "%s" expiry = "%s" permissions { - read = true - write = true - delete = false + read = true + write = true + delete = false list = false add = true - create = true - update = false - process = false + create = true + update = false + process = false } } `, rInt, location, rString, startDate, endDate) From c58548de08da3e125f1eec404ed4350ae2434442 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 23 Apr 2018 16:31:48 +0200 Subject: [PATCH 025/320] App Service / Function Apps: support for updating (#1125) * Enabling updates for App Services, which breaks the following test: ``` $ acctests azurerm TestAccAzureRMAppService_tagsUpdate === RUN TestAccAzureRMAppService_tagsUpdate --- FAIL: TestAccAzureRMAppService_tagsUpdate (109.41s) testing.go:513: Step 1 error: Check failed: Check 2/4 error: azurerm_app_service.test: Attribute 'tags.%' expected "2", got "1" FAIL exit status 1 FAIL github.com/terraform-providers/terraform-provider-azurerm/azurerm 109.444s ``` * Updating the app service properties on an update ``` $ acctests azurerm TestAccAzureRMAppService_tagsUpdate === RUN TestAccAzureRMAppService_tagsUpdate --- PASS: TestAccAzureRMAppService_tagsUpdate (144.13s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 144.156s ``` * Added a test to handle updating function apps * Ensuring we update function apps * Updating the docs to remove the newly non-forcenew fields * Ensuring we always update the app_settings ``` $ acctests azurerm TestAccAzureRMFunctionApp_siteConfigMulti === RUN TestAccAzureRMFunctionApp_siteConfigMulti --- PASS: TestAccAzureRMFunctionApp_siteConfigMulti (225.65s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 225.693s ``` --- azurerm/resource_arm_app_service.go | 40 +++++++++---- azurerm/resource_arm_function_app.go | 66 +++++++++++++-------- azurerm/resource_arm_function_app_test.go | 72 +++++++++++++++++++++++ website/docs/r/app_service.html.markdown | 6 +- website/docs/r/function_app.html.markdown | 8 +-- 5 files changed, 150 insertions(+), 42 deletions(-) diff --git a/azurerm/resource_arm_app_service.go b/azurerm/resource_arm_app_service.go index aa64de2cfda4..9974f20172e5 100644 --- a/azurerm/resource_arm_app_service.go +++ b/azurerm/resource_arm_app_service.go @@ -185,20 +185,12 @@ func resourceArmAppService() *schema.Resource { Type: schema.TypeBool, Optional: true, Default: false, - - // TODO: (tombuildsstuff) support Update once the API is fixed: - // https://github.com/Azure/azure-rest-api-specs/issues/1697 - ForceNew: true, }, "enabled": { Type: schema.TypeBool, Optional: true, Default: true, - - // TODO: (tombuildsstuff) support Update once the API is fixed: - // https://github.com/Azure/azure-rest-api-specs/issues/1697 - ForceNew: true, }, "app_settings": { @@ -243,9 +235,7 @@ func resourceArmAppService() *schema.Resource { }, }, - // TODO: (tombuildsstuff) support Update once the API is fixed: - // https://github.com/Azure/azure-rest-api-specs/issues/1697 - "tags": tagsForceNewSchema(), + "tags": tagsSchema(), "site_credential": { Type: schema.TypeList, @@ -376,6 +366,34 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error resGroup := id.ResourceGroup name := id.Path["sites"] + location := azureRMNormalizeLocation(d.Get("location").(string)) + appServicePlanId := d.Get("app_service_plan_id").(string) + enabled := d.Get("enabled").(bool) + httpsOnly := d.Get("https_only").(bool) + tags := d.Get("tags").(map[string]interface{}) + + siteConfig := expandAppServiceSiteConfig(d) + siteEnvelope := web.Site{ + Location: &location, + Tags: expandTags(tags), + SiteProperties: &web.SiteProperties{ + ServerFarmID: utils.String(appServicePlanId), + Enabled: utils.Bool(enabled), + HTTPSOnly: utils.Bool(httpsOnly), + SiteConfig: &siteConfig, + }, + } + + future, err := client.CreateOrUpdate(ctx, resGroup, name, siteEnvelope) + if err != nil { + return err + } + + err = future.WaitForCompletion(ctx, client.Client) + if err != nil { + return err + } + if d.HasChange("site_config") { // update the main configuration siteConfig := expandAppServiceSiteConfig(d) diff --git a/azurerm/resource_arm_function_app.go b/azurerm/resource_arm_function_app.go index 6d280a227db7..41e0c609cf3a 100644 --- a/azurerm/resource_arm_function_app.go +++ b/azurerm/resource_arm_function_app.go @@ -44,10 +44,6 @@ func resourceArmFunctionApp() *schema.Resource { Type: schema.TypeBool, Optional: true, Default: true, - - // TODO: (tombuildsstuff) support Update once the API is fixed: - // https://github.com/Azure/azure-rest-api-specs/issues/1697 - ForceNew: true, }, "version": { @@ -108,9 +104,7 @@ func resourceArmFunctionApp() *schema.Resource { }, }, - // TODO: (tombuildsstuff) support Update once the API is fixed: - // https://github.com/Azure/azure-rest-api-specs/issues/1697 - "tags": tagsForceNewSchema(), + "tags": tagsSchema(), "default_hostname": { Type: schema.TypeString, @@ -126,20 +120,12 @@ func resourceArmFunctionApp() *schema.Resource { Type: schema.TypeBool, Optional: true, Computed: true, - - // TODO: (tombuildsstuff) support Update once the API is fixed: - // https://github.com/Azure/azure-rest-api-specs/issues/1697 - ForceNew: true, }, "https_only": { Type: schema.TypeBool, Optional: true, Default: false, - - // TODO: (tombuildsstuff) support Update once the API is fixed: - // https://github.com/Azure/azure-rest-api-specs/issues/1697 - ForceNew: true, }, "site_config": { @@ -252,16 +238,48 @@ func resourceArmFunctionAppUpdate(d *schema.ResourceData, meta interface{}) erro resGroup := id.ResourceGroup name := id.Path["sites"] - if d.HasChange("app_settings") || d.HasChange("version") { - appSettings := expandFunctionAppAppSettings(d) - settings := web.StringDictionary{ - Properties: appSettings, - } + location := azureRMNormalizeLocation(d.Get("location").(string)) + kind := "functionapp" + appServicePlanID := d.Get("app_service_plan_id").(string) + enabled := d.Get("enabled").(bool) + clientAffinityEnabled := d.Get("client_affinity_enabled").(bool) + httpsOnly := d.Get("https_only").(bool) + tags := d.Get("tags").(map[string]interface{}) + basicAppSettings := getBasicFunctionAppAppSettings(d) + siteConfig := expandFunctionAppSiteConfig(d) + siteConfig.AppSettings = &basicAppSettings - _, err := client.UpdateApplicationSettings(ctx, resGroup, name, settings) - if err != nil { - return fmt.Errorf("Error updating Application Settings for Function App %q: %+v", name, err) - } + siteEnvelope := web.Site{ + Kind: &kind, + Location: &location, + Tags: expandTags(tags), + SiteProperties: &web.SiteProperties{ + ServerFarmID: utils.String(appServicePlanID), + Enabled: utils.Bool(enabled), + ClientAffinityEnabled: utils.Bool(clientAffinityEnabled), + HTTPSOnly: utils.Bool(httpsOnly), + SiteConfig: &siteConfig, + }, + } + + future, err := client.CreateOrUpdate(ctx, resGroup, name, siteEnvelope) + if err != nil { + return err + } + + err = future.WaitForCompletion(ctx, client.Client) + if err != nil { + return err + } + + appSettings := expandFunctionAppAppSettings(d) + settings := web.StringDictionary{ + Properties: appSettings, + } + + _, err = client.UpdateApplicationSettings(ctx, resGroup, name, settings) + if err != nil { + return fmt.Errorf("Error updating Application Settings for Function App %q: %+v", name, err) } if d.HasChange("site_config") { diff --git a/azurerm/resource_arm_function_app_test.go b/azurerm/resource_arm_function_app_test.go index f35f35d7f84e..b81f71fb371c 100644 --- a/azurerm/resource_arm_function_app_test.go +++ b/azurerm/resource_arm_function_app_test.go @@ -56,6 +56,39 @@ func TestAccAzureRMFunctionApp_tags(t *testing.T) { }) } +func TestAccAzureRMFunctionApp_tagsUpdate(t *testing.T) { + resourceName := "azurerm_function_app.test" + ri := acctest.RandInt() + rs := strings.ToLower(acctest.RandString(11)) + config := testAccAzureRMFunctionApp_tags(ri, rs, testLocation()) + updatedConfig := testAccAzureRMFunctionApp_tagsUpdated(ri, rs, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMFunctionAppDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMFunctionAppExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.environment", "production"), + ), + }, + { + Config: updatedConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMFunctionAppExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.environment", "production"), + resource.TestCheckResourceAttr(resourceName, "tags.hello", "Berlin"), + ), + }, + }, + }) +} + func TestAccAzureRMFunctionApp_appSettings(t *testing.T) { resourceName := "azurerm_function_app.test" ri := acctest.RandInt() @@ -428,6 +461,45 @@ resource "azurerm_function_app" "test" { `, rInt, location, storage) } +func testAccAzureRMFunctionApp_tagsUpdated(rInt int, storage string, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%[1]d" + location = "%[2]s" +} + +resource "azurerm_storage_account" "test" { + name = "acctestsa%[3]s" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + account_tier = "Standard" + account_replication_type = "LRS" +} + +resource "azurerm_app_service_plan" "test" { + name = "acctestASP-%[1]d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku { + tier = "Standard" + size = "S1" + } +} + +resource "azurerm_function_app" "test" { + name = "acctest-%[1]d-func" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_plan_id = "${azurerm_app_service_plan.test.id}" + storage_connection_string = "${azurerm_storage_account.test.primary_connection_string}" + tags { + environment = "production" + hello = "Berlin" + } +} +`, rInt, location, storage) +} + func testAccAzureRMFunctionApp_version(rInt int, storage string, location string, version string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/website/docs/r/app_service.html.markdown b/website/docs/r/app_service.html.markdown index 7d27dc467325..85b50930675d 100644 --- a/website/docs/r/app_service.html.markdown +++ b/website/docs/r/app_service.html.markdown @@ -121,15 +121,15 @@ The following arguments are supported: * `connection_string` - (Optional) An `connection_string` block as defined below. -* `client_affinity_enabled` - (Optional) Should the App Service send session affinity cookies, which route client requests in the same session to the same instance? Changing this forces a new resource to be created. +* `client_affinity_enabled` - (Optional) Should the App Service send session affinity cookies, which route client requests in the same session to the same instance? * `enabled` - (Optional) Is the App Service Enabled? Changing this forces a new resource to be created. -* `https_only` - (Optional) Can the App Service only be accessed via HTTPS? Defaults to `false`. Changing this forces a new resource to be created. +* `https_only` - (Optional) Can the App Service only be accessed via HTTPS? Defaults to `false`. * `site_config` - (Optional) A `site_config` object as defined below. -* `tags` - (Optional) A mapping of tags to assign to the resource. Changing this forces a new resource to be created. +* `tags` - (Optional) A mapping of tags to assign to the resource. --- diff --git a/website/docs/r/function_app.html.markdown b/website/docs/r/function_app.html.markdown index 1e056ab1be4b..a6f8011726f7 100644 --- a/website/docs/r/function_app.html.markdown +++ b/website/docs/r/function_app.html.markdown @@ -101,17 +101,17 @@ The following arguments are supported: * `connection_string` - (Optional) An `connection_string` block as defined below. -* `client_affinity_enabled` - (Optional) Should the Function App send session affinity cookies, which route client requests in the same session to the same instance? Changing this forces a new resource to be created. +* `client_affinity_enabled` - (Optional) Should the Function App send session affinity cookies, which route client requests in the same session to the same instance? -* `enabled` - (Optional) Is the Function App enabled? Changing this forces a new resource to be created. +* `enabled` - (Optional) Is the Function App enabled? -* `https_only` - (Optional) Can the Function App only be accessed via HTTPS? Defaults to `false`. Changing this forces a new resource to be created. +* `https_only` - (Optional) Can the Function App only be accessed via HTTPS? Defaults to `false`. * `version` - (Optional) The runtime version associated with the Function App. Possible values are `~1` and `beta`. Defaults to `~1`. * `site_config` - (Optional) A `site_config` object as defined below. -* `tags` - (Optional) A mapping of tags to assign to the resource. Changing this forces a new resource to be created. +* `tags` - (Optional) A mapping of tags to assign to the resource. --- From 58ef4597f3c5eb3ae06a58772efab054d930ee6e Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 23 Apr 2018 16:32:26 +0200 Subject: [PATCH 026/320] Updating to include #1125 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 023dd57eae91..1fa99a65c259 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,9 +12,11 @@ FEATURES: IMPROVEMENTS: +* `azurerm_app_service` - support for updating in-place [GH-1125] * `azurerm_cosmosdb_account` - support for `enable_automatic_failover` [GH-1055] * `azurerm_cosmosdb_account` - support for the `ConsistentPrefix` consistncy level [GH-1055] * `azurerm_cosmosdb_account` - `prefixes` can now be configured for locations [GH-1055] +* `azurerm_function_app` - support for updating in-place [GH-1125] * `azurerm_key_vault` - adding cert permissions for `Purge` and `Recover` [GH-1132] * `azurerm_metric_alertrule` - filtering out tags prefixed with `$type` [GH-1107] * `azurerm_virtual_machine` - loading managed disk information from Azure when the machine is stopped [GH-1100] From 5739143e27f3f0452ff383a1c127146aa523b9c3 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 23 Apr 2018 18:20:53 +0200 Subject: [PATCH 027/320] Refactoring ServiceBus Subscription Rule (#1150) * r/servicebus_subscription_rule: refactoring the resource to make it consistent ``` $ acctests azurerm TestAccAzureRMServiceBusSubscriptionRule_ === RUN TestAccAzureRMServiceBusSubscriptionRule_basicSqlFilter --- PASS: TestAccAzureRMServiceBusSubscriptionRule_basicSqlFilter (224.01s) === RUN TestAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter --- PASS: TestAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter (223.85s) === RUN TestAccAzureRMServiceBusSubscriptionRule_sqlFilterWithAction --- PASS: TestAccAzureRMServiceBusSubscriptionRule_sqlFilterWithAction (214.22s) === RUN TestAccAzureRMServiceBusSubscriptionRule_correlationFilterWithAction --- PASS: TestAccAzureRMServiceBusSubscriptionRule_correlationFilterWithAction (217.09s) === RUN TestAccAzureRMServiceBusSubscriptionRule_sqlFilterUpdated --- PASS: TestAccAzureRMServiceBusSubscriptionRule_sqlFilterUpdated (266.25s) === RUN TestAccAzureRMServiceBusSubscriptionRule_correlationFilterUpdated --- PASS: TestAccAzureRMServiceBusSubscriptionRule_correlationFilterUpdated (236.97s) === RUN TestAccAzureRMServiceBusSubscriptionRule_updateSqlFilterToCorrelationFilter --- PASS: TestAccAzureRMServiceBusSubscriptionRule_updateSqlFilterToCorrelationFilter (238.99s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 1621.416s ``` * Refactoring the tests to match the convention ``` $ acctests azurerm TestAccAzureRMServiceBusSubscriptionRule_ === RUN TestAccAzureRMServiceBusSubscriptionRule_basicSqlFilter --- PASS: TestAccAzureRMServiceBusSubscriptionRule_basicSqlFilter (222.44s) === RUN TestAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter --- PASS: TestAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter (174.29s) === RUN TestAccAzureRMServiceBusSubscriptionRule_sqlFilterWithAction --- PASS: TestAccAzureRMServiceBusSubscriptionRule_sqlFilterWithAction (218.93s) === RUN TestAccAzureRMServiceBusSubscriptionRule_correlationFilterWithAction --- PASS: TestAccAzureRMServiceBusSubscriptionRule_correlationFilterWithAction (222.21s) === RUN TestAccAzureRMServiceBusSubscriptionRule_sqlFilterUpdated --- PASS: TestAccAzureRMServiceBusSubscriptionRule_sqlFilterUpdated (233.07s) === RUN TestAccAzureRMServiceBusSubscriptionRule_correlationFilterUpdated --- PASS: TestAccAzureRMServiceBusSubscriptionRule_correlationFilterUpdated (246.19s) === RUN TestAccAzureRMServiceBusSubscriptionRule_updateSqlFilterToCorrelationFilter --- PASS: TestAccAzureRMServiceBusSubscriptionRule_updateSqlFilterToCorrelationFilter (255.79s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 1572.953s ``` * Updating the error to include the name of the field --- ...source_arm_servicebus_subscription_rule.go | 209 ++++++-------- ...e_arm_servicebus_subscription_rule_test.go | 270 ++++++++++-------- 2 files changed, 230 insertions(+), 249 deletions(-) diff --git a/azurerm/resource_arm_servicebus_subscription_rule.go b/azurerm/resource_arm_servicebus_subscription_rule.go index fa3218f392bb..84a99b68aea8 100644 --- a/azurerm/resource_arm_servicebus_subscription_rule.go +++ b/azurerm/resource_arm_servicebus_subscription_rule.go @@ -7,14 +7,15 @@ import ( "github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmServiceBusSubscriptionRule() *schema.Resource { return &schema.Resource{ - Create: resourceArmServiceBusSubscriptionRuleCreate, + Create: resourceArmServiceBusSubscriptionRuleCreateUpdate, Read: resourceArmServiceBusSubscriptionRuleRead, - Update: resourceArmServiceBusSubscriptionRuleCreate, + Update: resourceArmServiceBusSubscriptionRuleCreateUpdate, Delete: resourceArmServiceBusSubscriptionRuleDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -28,6 +29,8 @@ func resourceArmServiceBusSubscriptionRule() *schema.Resource { ValidateFunc: validation.StringLenBetween(1, 50), }, + "resource_group_name": resourceGroupNameSchema(), + "namespace_name": { Type: schema.TypeString, Required: true, @@ -56,7 +59,10 @@ func resourceArmServiceBusSubscriptionRule() *schema.Resource { DiffSuppressFunc: ignoreCaseDiffSuppressFunc, }, - "resource_group_name": resourceGroupNameSchema(), + "action": { + Type: schema.TypeString, + Optional: true, + }, "sql_filter": { Type: schema.TypeString, @@ -105,37 +111,50 @@ func resourceArmServiceBusSubscriptionRule() *schema.Resource { }, }, }, - - "action": { - Type: schema.TypeString, - Optional: true, - }, }, } } -func resourceArmServiceBusSubscriptionRuleCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmServiceBusSubscriptionRuleCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).serviceBusSubscriptionRulesClient ctx := meta.(*ArmClient).StopContext - log.Printf("[INFO] preparing arguments for Azure ARM Service Bus Subscription Rule creation.") + log.Printf("[INFO] preparing arguments for Azure Service Bus Subscription Rule creation.") name := d.Get("name").(string) topicName := d.Get("topic_name").(string) subscriptionName := d.Get("subscription_name").(string) namespaceName := d.Get("namespace_name").(string) resourceGroup := d.Get("resource_group_name").(string) + filterType := d.Get("filter_type").(string) + rule := servicebus.Rule{ + Ruleproperties: &servicebus.Ruleproperties{ + FilterType: servicebus.FilterType(filterType), + }, + } - rule, err := buildAzureRmServiceBusSubscriptionRule(name, d) - if err != nil { - return err + if action := d.Get("action").(string); action != "" { + rule.Ruleproperties.Action = &servicebus.Action{ + SQLExpression: &action, + } } - err = validateArmServiceBusSubscriptionRule(name, rule) - if err != nil { - return err + if rule.Ruleproperties.FilterType == servicebus.FilterTypeCorrelationFilter { + correlationFilter, err := expandAzureRmServiceBusCorrelationFilter(d) + if err != nil { + return fmt.Errorf("Cannot create Service Bus Subscription Rule %q: %+v", name, err) + } + + rule.Ruleproperties.CorrelationFilter = correlationFilter } - _, err = client.CreateOrUpdate(ctx, resourceGroup, namespaceName, topicName, subscriptionName, name, rule) + if rule.Ruleproperties.FilterType == servicebus.FilterTypeSQLFilter { + sqlFilter := d.Get("sql_filter").(string) + rule.Ruleproperties.SQLFilter = &servicebus.SQLFilter{ + SQLExpression: &sqlFilter, + } + } + + _, err := client.CreateOrUpdate(ctx, resourceGroup, namespaceName, topicName, subscriptionName, name, rule) if err != nil { return err } @@ -216,141 +235,91 @@ func resourceArmServiceBusSubscriptionRuleDelete(d *schema.ResourceData, meta in subscriptionName := id.Path["subscriptions"] name := id.Path["rules"] - _, err = client.Delete(ctx, resourceGroup, namespaceName, topicName, subscriptionName, name) - - return err -} - -func buildAzureRmServiceBusSubscriptionRule(name string, d *schema.ResourceData) (rule servicebus.Rule, err error) { - correlationfilter, err := getAzureRmServiceBusCorrelationFilter(name, d) + resp, err := client.Delete(ctx, resourceGroup, namespaceName, topicName, subscriptionName, name) if err != nil { - return - } - - filterType := d.Get("filter_type").(string) - rule = servicebus.Rule{ - Ruleproperties: &servicebus.Ruleproperties{ - FilterType: servicebus.FilterType(filterType), - Action: getAzureRmServiceBusAction(d), - SQLFilter: getAzureRmServiceBusSQLFilter(d), - CorrelationFilter: correlationfilter, - }, - } - - return -} - -func getAzureRmServiceBusAction(d *schema.ResourceData) *servicebus.Action { - if action := d.Get("action").(string); action != "" { - serviceBusAction := servicebus.Action{ - SQLExpression: &action, + if !response.WasNotFound(resp.Response) { + return fmt.Errorf("Error deleting ServiceBus Subscription Rule %q: %+v", name, err) } - return &serviceBusAction } - return nil -} -func getAzureRmServiceBusSQLFilter(d *schema.ResourceData) *servicebus.SQLFilter { - if sqlFilter := d.Get("sql_filter").(string); sqlFilter != "" { - serviceBusSQLFilter := servicebus.SQLFilter{ - SQLExpression: &sqlFilter, - } - return &serviceBusSQLFilter - } return nil } -func getAzureRmServiceBusCorrelationFilter(name string, d *schema.ResourceData) (*servicebus.CorrelationFilter, error) { - if config := d.Get("correlation_filter").([]interface{}); len(config) > 0 { - - if config[0] == nil { - err := fmt.Errorf("Cannot create Service Bus Subscription Rule (%s). At least one property must be set in the `correlation_filter` block", name) - return nil, err - } - - filter := config[0].(map[string]interface{}) - correlationFilter := servicebus.CorrelationFilter{} - - if correlationID := filter["correlation_id"].(string); correlationID != "" { - correlationFilter.CorrelationID = &correlationID - } - - if messageID := filter["message_id"].(string); messageID != "" { - correlationFilter.MessageID = &messageID - } - - if to := filter["to"].(string); to != "" { - correlationFilter.To = &to - } - - if replyTo := filter["reply_to"].(string); replyTo != "" { - correlationFilter.ReplyTo = &replyTo - } - - if label := filter["label"].(string); label != "" { - correlationFilter.Label = &label - } +func expandAzureRmServiceBusCorrelationFilter(d *schema.ResourceData) (*servicebus.CorrelationFilter, error) { + configs := d.Get("correlation_filter").([]interface{}) + if len(configs) == 0 { + return nil, fmt.Errorf("`correlation_filter` is required when `filter_type` is set to `CorrelationFilter`") + } - if sessionID := filter["session_id"].(string); sessionID != "" { - correlationFilter.SessionID = &sessionID - } + config := configs[0].(map[string]interface{}) - if replyToSessionID := filter["reply_to_session_id"].(string); replyToSessionID != "" { - correlationFilter.ReplyToSessionID = &replyToSessionID - } + contentType := config["content_type"].(string) + correlationID := config["correlation_id"].(string) + label := config["label"].(string) + messageID := config["message_id"].(string) + replyTo := config["reply_to"].(string) + replyToSessionID := config["reply_to_session_id"].(string) + sessionID := config["session_id"].(string) + to := config["to"].(string) - if contentType := filter["content_type"].(string); contentType != "" { - correlationFilter.ContentType = &contentType - } + if contentType == "" && correlationID == "" && label == "" && messageID == "" && replyTo == "" && replyToSessionID == "" && sessionID == "" && to == "" { + return nil, fmt.Errorf("At least one property must be set in the `correlation_filter` block") + } - return &correlationFilter, nil + correlationFilter := servicebus.CorrelationFilter{ + CorrelationID: utils.String(correlationID), + MessageID: utils.String(messageID), + To: utils.String(to), + ReplyTo: utils.String(replyTo), + Label: utils.String(label), + SessionID: utils.String(sessionID), + ReplyToSessionID: utils.String(replyToSessionID), + ContentType: utils.String(contentType), } - return nil, nil + return &correlationFilter, nil } -func flattenAzureRmServiceBusCorrelationFilter(f *servicebus.CorrelationFilter) []interface{} { - filters := make([]interface{}, 0, 1) - if f == nil { - return filters +func flattenAzureRmServiceBusCorrelationFilter(input *servicebus.CorrelationFilter) []interface{} { + if input == nil { + return []interface{}{} } filter := make(map[string]interface{}) - if f.CorrelationID != nil { - filter["correlation_id"] = *f.CorrelationID + if input.CorrelationID != nil { + filter["correlation_id"] = *input.CorrelationID } - if f.MessageID != nil { - filter["message_id"] = *f.MessageID + if input.MessageID != nil { + filter["message_id"] = *input.MessageID } - if f.To != nil { - filter["to"] = *f.To + if input.To != nil { + filter["to"] = *input.To } - if f.ReplyTo != nil { - filter["reply_to"] = *f.ReplyTo + if input.ReplyTo != nil { + filter["reply_to"] = *input.ReplyTo } - if f.Label != nil { - filter["label"] = *f.Label + if input.Label != nil { + filter["label"] = *input.Label } - if f.SessionID != nil { - filter["session_id"] = *f.SessionID + if input.SessionID != nil { + filter["session_id"] = *input.SessionID } - if f.ReplyToSessionID != nil { - filter["reply_to_session_id"] = *f.ReplyToSessionID + if input.ReplyToSessionID != nil { + filter["reply_to_session_id"] = *input.ReplyToSessionID } - if f.ContentType != nil { - filter["content_type"] = *f.ContentType + if input.ContentType != nil { + filter["content_type"] = *input.ContentType } - filters = append(filters, filter) - return filters + return []interface{}{filter} } func validateArmServiceBusSubscriptionRule(name string, rule servicebus.Rule) error { @@ -358,18 +327,12 @@ func validateArmServiceBusSubscriptionRule(name string, rule servicebus.Rule) er if rule.Ruleproperties.SQLFilter == nil { return fmt.Errorf("Cannot create Service Bus Subscription Rule (%s). 'sql_filter' must be specified when 'filter_type' is set to 'SqlFilter'", name) } - if rule.Ruleproperties.CorrelationFilter != nil { - return fmt.Errorf("Service Bus Subscription Rule (%s) does not support `correlation_filter` when 'filter_type' is set to 'SqlFilter'", name) - } } if rule.Ruleproperties.FilterType == servicebus.FilterTypeCorrelationFilter { if rule.Ruleproperties.CorrelationFilter == nil { return fmt.Errorf("Cannot create Service Bus Subscription Rule (%s). 'correlation_filter' must be specified when 'filter_type' is set to 'CorrelationFilter'", name) } - if rule.Ruleproperties.SQLFilter != nil { - return fmt.Errorf("Service Bus Subscription Rule (%s) does not support `sql_filter` when 'filter_type' is set to 'CorrelationFilter'", name) - } } return nil diff --git a/azurerm/resource_arm_servicebus_subscription_rule_test.go b/azurerm/resource_arm_servicebus_subscription_rule_test.go index f39c0e75b98c..e2cde6556602 100644 --- a/azurerm/resource_arm_servicebus_subscription_rule_test.go +++ b/azurerm/resource_arm_servicebus_subscription_rule_test.go @@ -11,6 +11,7 @@ import ( ) func TestAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(t *testing.T) { + resourceName := "azurerm_servicebus_subscription_rule.test" ri := acctest.RandInt() config := testAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(ri, testLocation()) @@ -22,7 +23,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMServiceBusSubscriptionRuleExists(), + testCheckAzureRMServiceBusSubscriptionRuleExists(resourceName), ), }, }, @@ -30,6 +31,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(t *testing.T) { } func TestAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter(t *testing.T) { + resourceName := "azurerm_servicebus_subscription_rule.test" ri := acctest.RandInt() config := testAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter(ri, testLocation()) @@ -41,7 +43,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter(t *testing. { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMServiceBusSubscriptionRuleExists(), + testCheckAzureRMServiceBusSubscriptionRuleExists(resourceName), ), }, }, @@ -49,6 +51,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter(t *testing. } func TestAccAzureRMServiceBusSubscriptionRule_sqlFilterWithAction(t *testing.T) { + resourceName := "azurerm_servicebus_subscription_rule.test" ri := acctest.RandInt() config := testAccAzureRMServiceBusSubscriptionRule_sqlFilterWithAction(ri, testLocation()) @@ -60,7 +63,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_sqlFilterWithAction(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMServiceBusSubscriptionRuleExists(), + testCheckAzureRMServiceBusSubscriptionRuleExists(resourceName), ), }, }, @@ -68,6 +71,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_sqlFilterWithAction(t *testing.T) } func TestAccAzureRMServiceBusSubscriptionRule_correlationFilterWithAction(t *testing.T) { + resourceName := "azurerm_servicebus_subscription_rule.test" ri := acctest.RandInt() config := testAccAzureRMServiceBusSubscriptionRule_correlationFilterWithAction(ri, testLocation()) @@ -79,7 +83,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_correlationFilterWithAction(t *tes { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMServiceBusSubscriptionRuleExists(), + testCheckAzureRMServiceBusSubscriptionRuleExists(resourceName), ), }, }, @@ -87,6 +91,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_correlationFilterWithAction(t *tes } func TestAccAzureRMServiceBusSubscriptionRule_sqlFilterUpdated(t *testing.T) { + resourceName := "azurerm_servicebus_subscription_rule.test" ri := acctest.RandInt() location := testLocation() config := testAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(ri, location) @@ -100,14 +105,14 @@ func TestAccAzureRMServiceBusSubscriptionRule_sqlFilterUpdated(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMServiceBusSubscriptionRuleExists(), + testCheckAzureRMServiceBusSubscriptionRuleExists(resourceName), resource.TestCheckResourceAttr(resourceName, "sql_filter", "2=2"), ), }, { Config: updatedConfig, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMServiceBusSubscriptionRuleExists(), + testCheckAzureRMServiceBusSubscriptionRuleExists(resourceName), resource.TestCheckResourceAttr(resourceName, "sql_filter", "3=3"), ), }, @@ -116,6 +121,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_sqlFilterUpdated(t *testing.T) { } func TestAccAzureRMServiceBusSubscriptionRule_correlationFilterUpdated(t *testing.T) { + resourceName := "azurerm_servicebus_subscription_rule.test" ri := acctest.RandInt() location := testLocation() config := testAccAzureRMServiceBusSubscriptionRule_correlationFilter(ri, location) @@ -129,7 +135,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_correlationFilterUpdated(t *testin { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMServiceBusSubscriptionRuleExists(), + testCheckAzureRMServiceBusSubscriptionRuleExists(resourceName), resource.TestCheckResourceAttr(resourceName, "correlation_filter.0.message_id", "test_message_id"), resource.TestCheckResourceAttr(resourceName, "correlation_filter.0.reply_to", ""), ), @@ -137,7 +143,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_correlationFilterUpdated(t *testin { Config: updatedConfig, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMServiceBusSubscriptionRuleExists(), + testCheckAzureRMServiceBusSubscriptionRuleExists(resourceName), resource.TestCheckResourceAttr(resourceName, "correlation_filter.0.message_id", "test_message_id_updated"), resource.TestCheckResourceAttr(resourceName, "correlation_filter.0.reply_to", "test_reply_to_added"), ), @@ -147,6 +153,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_correlationFilterUpdated(t *testin } func TestAccAzureRMServiceBusSubscriptionRule_updateSqlFilterToCorrelationFilter(t *testing.T) { + resourceName := "azurerm_servicebus_subscription_rule.test" ri := acctest.RandInt() location := testLocation() config := testAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(ri, location) @@ -160,20 +167,20 @@ func TestAccAzureRMServiceBusSubscriptionRule_updateSqlFilterToCorrelationFilter { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMServiceBusSubscriptionRuleExists(), + testCheckAzureRMServiceBusSubscriptionRuleExists(resourceName), ), }, { Config: updatedConfig, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMServiceBusSubscriptionRuleExists(), + testCheckAzureRMServiceBusSubscriptionRuleExists(resourceName), ), }, }, }) } -func testCheckAzureRMServiceBusSubscriptionRuleExists() resource.TestCheckFunc { +func testCheckAzureRMServiceBusSubscriptionRuleExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] if !ok { @@ -206,139 +213,151 @@ func testCheckAzureRMServiceBusSubscriptionRuleExists() resource.TestCheckFunc { } func testAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(rInt int, location string) string { - sqlFilter := ` - resource "azurerm_servicebus_subscription_rule" "test" { - name = "acctestservicebusrule-%d" - namespace_name = "${azurerm_servicebus_namespace.test.name}" - topic_name = "${azurerm_servicebus_topic.test.name}" - subscription_name = "${azurerm_servicebus_subscription.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - filter_type = "SqlFilter" - sql_filter = "2=2" - } - ` + template := testAccAzureRMServiceBusSubscriptionRule_template(rInt, location) + return fmt.Sprintf(` +%s - return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(sqlFilter, rInt)) +resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + filter_type = "SqlFilter" + sql_filter = "2=2" +} +`, template, rInt) } func testAccAzureRMServiceBusSubscriptionRule_basicSqlFilterUpdated(rInt int, location string) string { - sqlFilter := ` - resource "azurerm_servicebus_subscription_rule" "test" { - name = "acctestservicebusrule-%d" - namespace_name = "${azurerm_servicebus_namespace.test.name}" - topic_name = "${azurerm_servicebus_topic.test.name}" - subscription_name = "${azurerm_servicebus_subscription.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - filter_type = "SqlFilter" - sql_filter = "3=3" - } - ` - return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(sqlFilter, rInt)) + template := testAccAzureRMServiceBusSubscriptionRule_template(rInt, location) + return fmt.Sprintf(` +%s + +resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + filter_type = "SqlFilter" + sql_filter = "3=3" +} +`, template, rInt) } func testAccAzureRMServiceBusSubscriptionRule_sqlFilterWithAction(rInt int, location string) string { - sqlFilter := ` - resource "azurerm_servicebus_subscription_rule" "test" { - name = "acctestservicebusrule-%d" - namespace_name = "${azurerm_servicebus_namespace.test.name}" - topic_name = "${azurerm_servicebus_topic.test.name}" - subscription_name = "${azurerm_servicebus_subscription.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - filter_type = "SqlFilter" - sql_filter = "2=2" - action = "SET Test='true'" - } - ` - return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(sqlFilter, rInt)) + template := testAccAzureRMServiceBusSubscriptionRule_template(rInt, location) + return fmt.Sprintf(` +%s + +resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + filter_type = "SqlFilter" + sql_filter = "2=2" + action = "SET Test='true'" +} +`, template, rInt) } func testAccAzureRMServiceBusSubscriptionRule_basicCorrelationFilter(rInt int, location string) string { - correlationFilter := ` - resource "azurerm_servicebus_subscription_rule" "test" { - name = "acctestservicebusrule-%d" - namespace_name = "${azurerm_servicebus_namespace.test.name}" - topic_name = "${azurerm_servicebus_topic.test.name}" - subscription_name = "${azurerm_servicebus_subscription.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - filter_type = "CorrelationFilter" - - correlation_filter = { - correlation_id = "test_correlation_id" - message_id = "test_message_id" - to = "test_to" - reply_to = "test_reply_to" - label = "test_label" - session_id = "test_session_id" - reply_to_session_id = "test_reply_to_session_id" - content_type = "test_content_type" - } - } - ` - return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(correlationFilter, rInt)) + template := testAccAzureRMServiceBusSubscriptionRule_template(rInt, location) + return fmt.Sprintf(` +%s + +resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + filter_type = "CorrelationFilter" + + correlation_filter = { + correlation_id = "test_correlation_id" + message_id = "test_message_id" + to = "test_to" + reply_to = "test_reply_to" + label = "test_label" + session_id = "test_session_id" + reply_to_session_id = "test_reply_to_session_id" + content_type = "test_content_type" + } +} +`, template, rInt) } func testAccAzureRMServiceBusSubscriptionRule_correlationFilter(rInt int, location string) string { - correlationFilter := ` - resource "azurerm_servicebus_subscription_rule" "test" { - name = "acctestservicebusrule-%d" - namespace_name = "${azurerm_servicebus_namespace.test.name}" - topic_name = "${azurerm_servicebus_topic.test.name}" - subscription_name = "${azurerm_servicebus_subscription.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - filter_type = "CorrelationFilter" - - correlation_filter = { - correlation_id = "test_correlation_id" - message_id = "test_message_id" - } - } - ` - return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(correlationFilter, rInt)) + template := testAccAzureRMServiceBusSubscriptionRule_template(rInt, location) + return fmt.Sprintf(` +%s + +resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + filter_type = "CorrelationFilter" + + correlation_filter = { + correlation_id = "test_correlation_id" + message_id = "test_message_id" + } +} +`, template, rInt) } func testAccAzureRMServiceBusSubscriptionRule_correlationFilterUpdated(rInt int, location string) string { - correlationFilter := ` - resource "azurerm_servicebus_subscription_rule" "test" { - name = "acctestservicebusrule-%d" - namespace_name = "${azurerm_servicebus_namespace.test.name}" - topic_name = "${azurerm_servicebus_topic.test.name}" - subscription_name = "${azurerm_servicebus_subscription.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - filter_type = "CorrelationFilter" - - correlation_filter = { - correlation_id = "test_correlation_id" - message_id = "test_message_id_updated" - reply_to = "test_reply_to_added" - } - } - ` - return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(correlationFilter, rInt)) + template := testAccAzureRMServiceBusSubscriptionRule_template(rInt, location) + return fmt.Sprintf(` +%s + +resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + filter_type = "CorrelationFilter" + + correlation_filter = { + correlation_id = "test_correlation_id" + message_id = "test_message_id_updated" + reply_to = "test_reply_to_added" + } +} +`, template, rInt) } func testAccAzureRMServiceBusSubscriptionRule_correlationFilterWithAction(rInt int, location string) string { - correlationFilter := ` - resource "azurerm_servicebus_subscription_rule" "test" { - name = "acctestservicebusrule-%d" - namespace_name = "${azurerm_servicebus_namespace.test.name}" - topic_name = "${azurerm_servicebus_topic.test.name}" - subscription_name = "${azurerm_servicebus_subscription.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - action = "SET Test='true'" - filter_type = "CorrelationFilter" - - correlation_filter = { - correlation_id = "test_correlation_id" - message_id = "test_message_id" - } - } - ` - return fmt.Sprintf(testAccAzureRMServiceBusSubscriptionRule_tfTemplate, rInt, location, rInt, rInt, rInt, fmt.Sprintf(correlationFilter, rInt)) -} + template := testAccAzureRMServiceBusSubscriptionRule_template(rInt, location) + return fmt.Sprintf(` +%s -const resourceName = "azurerm_servicebus_subscription_rule.test" +resource "azurerm_servicebus_subscription_rule" "test" { + name = "acctestservicebusrule-%d" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + topic_name = "${azurerm_servicebus_topic.test.name}" + subscription_name = "${azurerm_servicebus_subscription.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + action = "SET Test='true'" + filter_type = "CorrelationFilter" + + correlation_filter = { + correlation_id = "test_correlation_id" + message_id = "test_message_id" + } +} +`, template, rInt) +} -const testAccAzureRMServiceBusSubscriptionRule_tfTemplate = ` +func testAccAzureRMServiceBusSubscriptionRule_template(rInt int, location string) string { + return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -364,6 +383,5 @@ resource "azurerm_servicebus_subscription" "test" { resource_group_name = "${azurerm_resource_group.test.name}" max_delivery_count = 10 } - -%s -` +`, rInt, location, rInt, rInt, rInt) +} From 712772288a6f4da358978d0251908e029df6ed03 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 24 Apr 2018 16:56:22 +0200 Subject: [PATCH 028/320] `azurerm_key_vault`: waiting for 10 successful dns locators before returning as created (#1081) * `r/key_vault`: waiting for 10 successful dns locators before returning as created * Removing crashes where fields are set to nil Fixes #1005 --- azurerm/resource_arm_key_vault.go | 99 ++++++++++++++++++++----------- 1 file changed, 64 insertions(+), 35 deletions(-) diff --git a/azurerm/resource_arm_key_vault.go b/azurerm/resource_arm_key_vault.go index 978a687575b3..7c19b75542e2 100644 --- a/azurerm/resource_arm_key_vault.go +++ b/azurerm/resource_arm_key_vault.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - uuid "github.com/satori/go.uuid" + "github.com/satori/go.uuid" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -232,9 +232,18 @@ func resourceArmKeyVaultCreate(d *schema.ResourceData, meta interface{}) error { if d.IsNewResource() { if props := read.Properties; props != nil { if vault := props.VaultURI; vault != nil { - err := resource.Retry(120*time.Second, checkKeyVaultDNSIsAvailable(*vault)) - if err != nil { - return err + log.Printf("[DEBUG] Waiting for Key Vault %q (Resource Group %q) to become available", name, resGroup) + stateConf := &resource.StateChangeConf{ + Pending: []string{"pending"}, + Target: []string{"available"}, + Refresh: keyVaultRefreshFunc(*vault), + Timeout: 30 * time.Minute, + PollInterval: 10 * time.Second, + ContinuousTargetOccurence: 5, + } + + if _, err := stateConf.WaitForState(); err != nil { + return fmt.Errorf("Error waiting for Key Vault %q (Resource Group %q) to become available: %s", name, resGroup, err) } } } @@ -315,21 +324,24 @@ func expandKeyVaultAccessPolicies(d *schema.ResourceData) *[]keyvault.AccessPoli policyRaw := policySet.(map[string]interface{}) certificatePermissionsRaw := policyRaw["certificate_permissions"].([]interface{}) - certificatePermissions := []keyvault.CertificatePermissions{} - for _, permission := range certificatePermissionsRaw { - certificatePermissions = append(certificatePermissions, keyvault.CertificatePermissions(permission.(string))) + certificatePermissions := make([]keyvault.CertificatePermissions, 0) + for _, v := range certificatePermissionsRaw { + permission := keyvault.CertificatePermissions(v.(string)) + certificatePermissions = append(certificatePermissions, permission) } keyPermissionsRaw := policyRaw["key_permissions"].([]interface{}) - keyPermissions := []keyvault.KeyPermissions{} - for _, permission := range keyPermissionsRaw { - keyPermissions = append(keyPermissions, keyvault.KeyPermissions(permission.(string))) + keyPermissions := make([]keyvault.KeyPermissions, 0) + for _, v := range keyPermissionsRaw { + permission := keyvault.KeyPermissions(v.(string)) + keyPermissions = append(keyPermissions, permission) } secretPermissionsRaw := policyRaw["secret_permissions"].([]interface{}) - secretPermissions := []keyvault.SecretPermissions{} - for _, permission := range secretPermissionsRaw { - secretPermissions = append(secretPermissions, keyvault.SecretPermissions(permission.(string))) + secretPermissions := make([]keyvault.SecretPermissions, 0) + for _, v := range secretPermissionsRaw { + permission := keyvault.SecretPermissions(v.(string)) + secretPermissions = append(secretPermissions, permission) } policy := keyvault.AccessPolicyEntry{ @@ -367,34 +379,46 @@ func flattenKeyVaultSku(sku *keyvault.Sku) []interface{} { func flattenKeyVaultAccessPolicies(policies *[]keyvault.AccessPolicyEntry) []interface{} { result := make([]interface{}, 0, len(*policies)) + if policies == nil { + return result + } + for _, policy := range *policies { policyRaw := make(map[string]interface{}) - keyPermissionsRaw := make([]interface{}, 0, len(*policy.Permissions.Keys)) - for _, keyPermission := range *policy.Permissions.Keys { - keyPermissionsRaw = append(keyPermissionsRaw, string(keyPermission)) - } + keyPermissionsRaw := make([]interface{}, 0) + secretPermissionsRaw := make([]interface{}, 0) + certificatePermissionsRaw := make([]interface{}, 0) - secretPermissionsRaw := make([]interface{}, 0, len(*policy.Permissions.Secrets)) - for _, secretPermission := range *policy.Permissions.Secrets { - secretPermissionsRaw = append(secretPermissionsRaw, string(secretPermission)) + if permissions := policy.Permissions; permissions != nil { + if keys := permissions.Keys; keys != nil { + for _, keyPermission := range *keys { + keyPermissionsRaw = append(keyPermissionsRaw, string(keyPermission)) + } + } + if secrets := permissions.Secrets; secrets != nil { + for _, secretPermission := range *secrets { + secretPermissionsRaw = append(secretPermissionsRaw, string(secretPermission)) + } + } + + if certificates := permissions.Certificates; certificates != nil { + for _, certificatePermission := range *certificates { + certificatePermissionsRaw = append(certificatePermissionsRaw, string(certificatePermission)) + } + } } policyRaw["tenant_id"] = policy.TenantID.String() - policyRaw["object_id"] = *policy.ObjectID + if policy.ObjectID != nil { + policyRaw["object_id"] = *policy.ObjectID + } if policy.ApplicationID != nil { policyRaw["application_id"] = policy.ApplicationID.String() } policyRaw["key_permissions"] = keyPermissionsRaw policyRaw["secret_permissions"] = secretPermissionsRaw - - if policy.Permissions.Certificates != nil { - certificatePermissionsRaw := make([]interface{}, 0, len(*policy.Permissions.Certificates)) - for _, certificatePermission := range *policy.Permissions.Certificates { - certificatePermissionsRaw = append(certificatePermissionsRaw, string(certificatePermission)) - } - policyRaw["certificate_permissions"] = certificatePermissionsRaw - } + policyRaw["certificate_permissions"] = certificatePermissionsRaw result = append(result, policyRaw) } @@ -411,19 +435,24 @@ func validateKeyVaultName(v interface{}, k string) (ws []string, errors []error) return } -func checkKeyVaultDNSIsAvailable(vaultUri string) func() *resource.RetryError { - return func() *resource.RetryError { +func keyVaultRefreshFunc(vaultUri string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + log.Printf("[DEBUG] Checking to see if KeyVault %q is available..", vaultUri) uri, err := url.Parse(vaultUri) if err != nil { - return resource.NonRetryableError(err) + return nil, "error", fmt.Errorf("Error parsing URI %q: %s", vaultUri, err) } - conn, err := net.Dial("tcp", fmt.Sprintf("%s:443", uri.Host)) + hostAndPort := fmt.Sprintf("%s:443", uri.Host) + conn, err := net.Dial("tcp", hostAndPort) if err != nil { - return resource.RetryableError(err) + log.Printf("[DEBUG] Didn't find KeyVault at %q", hostAndPort) + return nil, "pending", fmt.Errorf("Error connecting to %q: %s", hostAndPort, err) } _ = conn.Close() - return nil + + log.Printf("[DEBUG] Found KeyVault at %q", hostAndPort) + return "available", "available", nil } } From 85ca751ced6e95916d3d77e2334ca781348a242e Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 24 Apr 2018 16:56:46 +0200 Subject: [PATCH 029/320] Updating to include #1081 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fa99a65c259..877d99272d0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ IMPROVEMENTS: * `azurerm_cosmosdb_account` - `prefixes` can now be configured for locations [GH-1055] * `azurerm_function_app` - support for updating in-place [GH-1125] * `azurerm_key_vault` - adding cert permissions for `Purge` and `Recover` [GH-1132] +* `azurerm_key_vault` - polling to ensure the Key Vault is resolvable via DNS [GH-1081] * `azurerm_metric_alertrule` - filtering out tags prefixed with `$type` [GH-1107] * `azurerm_virtual_machine` - loading managed disk information from Azure when the machine is stopped [GH-1100] * `azurerm_virtual_machine` - make the `vm_size` property case insensitive [GH-1131] From 37ad400e4d49027785e431c78dc6b4d6ba7da8ad Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 24 Apr 2018 17:04:14 +0200 Subject: [PATCH 030/320] Adding in a reference for the older "App" App Service Plans (#1156) --- azurerm/resource_arm_app_service_plan.go | 3 +++ website/docs/r/app_service_plan.html.markdown | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_app_service_plan.go b/azurerm/resource_arm_app_service_plan.go index a3609a7f6686..da0247c72d3a 100644 --- a/azurerm/resource_arm_app_service_plan.go +++ b/azurerm/resource_arm_app_service_plan.go @@ -39,6 +39,9 @@ func resourceArmAppServicePlan() *schema.Resource { Default: "Windows", ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ + // @tombuildsstuff: I believe `app` is the older representation of `Windows` + // thus we need to support it to be able to import resources without recreating them. + "App", "FunctionApp", "Linux", "Windows", diff --git a/website/docs/r/app_service_plan.html.markdown b/website/docs/r/app_service_plan.html.markdown index 2402cdb7f574..f122baa1c8a3 100644 --- a/website/docs/r/app_service_plan.html.markdown +++ b/website/docs/r/app_service_plan.html.markdown @@ -83,7 +83,7 @@ The following arguments are supported: * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `kind` - (Optional) The kind of the App Service Plan to create. Possible values are `Windows`, `Linux` and `FunctionApp` (for a Consumption Plan). Defaults to `Windows`. Changing this forces a new resource to be created. +* `kind` - (Optional) The kind of the App Service Plan to create. Possible values are `Windows` (also available as `App`), `Linux` and `FunctionApp` (for a Consumption Plan). Defaults to `Windows`. Changing this forces a new resource to be created. ~> **NOTE:** When creating a `Linux` App Service Plan, the `reserved` field must be set to `true`. From 4084cb68a0749b722eacaf2858e0d33461ebd229 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 24 Apr 2018 17:04:45 +0200 Subject: [PATCH 031/320] Updating to include #1156 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 877d99272d0a..7ac8b39eddcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ FEATURES: IMPROVEMENTS: * `azurerm_app_service` - support for updating in-place [GH-1125] +* `azurerm_app_service_plan` - support for `kind` being `app` [GH-1156] * `azurerm_cosmosdb_account` - support for `enable_automatic_failover` [GH-1055] * `azurerm_cosmosdb_account` - support for the `ConsistentPrefix` consistncy level [GH-1055] * `azurerm_cosmosdb_account` - `prefixes` can now be configured for locations [GH-1055] From 7f993c99b34dc4685509c81d45908b28fc2f003e Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 24 Apr 2018 21:50:47 +0200 Subject: [PATCH 032/320] r/kubernetes_cluster: Only setting the `VnetSubnetID` when it's != "" (#1158) Fixes: ``` ------- Stdout: ------- === RUN TestAccAzureRMKubernetesCluster_basic --- FAIL: TestAccAzureRMKubernetesCluster_basic (55.13s) testing.go:513: Step 0 error: Error applying: 1 error(s) occurred: * azurerm_kubernetes_cluster.test: 1 error(s) occurred: * azurerm_kubernetes_cluster.test: containerservice.ManagedClustersClient#CreateOrUpdate: Failure sending request: StatusCode=400 -- Original Error: Code="LinkedInvalidPropertyId" Message="Property id '' at path 'properties.agentPoolProfiles[0].vnetSubnetID' is invalid. Expect fully qualified resource Id that start with '/subscriptions/{subscriptionId}' or '/providers/{resourceProviderNamespace}/'." FAIL ``` Passing test: ``` $ acctests azurerm TestAccAzureRMKubernetesCluster_basic === RUN TestAccAzureRMKubernetesCluster_basic --- PASS: TestAccAzureRMKubernetesCluster_basic (1713.63s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 1713.661s ``` --- azurerm/resource_arm_kubernetes_cluster.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/azurerm/resource_arm_kubernetes_cluster.go b/azurerm/resource_arm_kubernetes_cluster.go index 72df1ea3cbb5..f149168c9ebf 100644 --- a/azurerm/resource_arm_kubernetes_cluster.go +++ b/azurerm/resource_arm_kubernetes_cluster.go @@ -441,20 +441,23 @@ func expandAzureRmKubernetesClusterAgentProfiles(d *schema.ResourceData) []conta dnsPrefix := config["dns_prefix"].(string) vmSize := config["vm_size"].(string) osDiskSizeGB := int32(config["os_disk_size_gb"].(int)) - vnetSubnetID := config["vnet_subnet_id"].(string) osType := config["os_type"].(string) profile := containerservice.AgentPoolProfile{ - Name: &name, - Count: &count, + Name: utils.String(name), + Count: utils.Int32(count), VMSize: containerservice.VMSizeTypes(vmSize), - DNSPrefix: &dnsPrefix, - OsDiskSizeGB: &osDiskSizeGB, + DNSPrefix: utils.String(dnsPrefix), + OsDiskSizeGB: utils.Int32(osDiskSizeGB), StorageProfile: containerservice.ManagedDisks, - VnetSubnetID: &vnetSubnetID, OsType: containerservice.OSType(osType), } + vnetSubnetID := config["vnet_subnet_id"].(string) + if vnetSubnetID != "" { + profile.VnetSubnetID = utils.String(vnetSubnetID) + } + profiles = append(profiles, profile) return profiles From b2dddebdcff81f7e9cc8aca058759b21b17aa5de Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 24 Apr 2018 21:51:14 +0200 Subject: [PATCH 033/320] Updating to include #1158 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ac8b39eddcf..7c4ccbd4e1fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ IMPROVEMENTS: * `azurerm_function_app` - support for updating in-place [GH-1125] * `azurerm_key_vault` - adding cert permissions for `Purge` and `Recover` [GH-1132] * `azurerm_key_vault` - polling to ensure the Key Vault is resolvable via DNS [GH-1081] +* `azurerm_kubernetes_cluster` - only setting the Subnet ID when it's not an empty string [GH-1158] * `azurerm_metric_alertrule` - filtering out tags prefixed with `$type` [GH-1107] * `azurerm_virtual_machine` - loading managed disk information from Azure when the machine is stopped [GH-1100] * `azurerm_virtual_machine` - make the `vm_size` property case insensitive [GH-1131] From 245dce8e4ba3f30e644d53071c991e8c552dac22 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 25 Apr 2018 01:46:56 -0700 Subject: [PATCH 034/320] small documentation fix for azurerm_container_group: dns_label_name -> dns_name_label (#1162) --- website/docs/r/container_group.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/container_group.html.markdown b/website/docs/r/container_group.html.markdown index 77760911e9e2..ed844d63f11c 100644 --- a/website/docs/r/container_group.html.markdown +++ b/website/docs/r/container_group.html.markdown @@ -41,7 +41,7 @@ resource "azurerm_container_group" "aci-helloworld" { location = "${azurerm_resource_group.aci-rg.location}" resource_group_name = "${azurerm_resource_group.aci-rg.name}" ip_address_type = "public" - dns_label_name = "aci-label" + dns_name_label = "aci-label" os_type = "linux" container { @@ -93,7 +93,7 @@ The following arguments are supported: * `ip_address_type` - (Optional) Specifies the ip address type of the container. `Public` is the only acceptable value at this time. Changing this forces a new resource to be created. -* `dns_label_name` - (Optional) The DNS label/name for the container groups IP. +* `dns_name_label` - (Optional) The DNS label/name for the container groups IP. * `os_type` - (Required) The OS for the container group. Allowed values are `Linux` and `Windows`. Changing this forces a new resource to be created. From b90e5970fcd83f61cb3c688e41fd914fc6d4b561 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Wed, 25 Apr 2018 12:30:23 +0200 Subject: [PATCH 035/320] r/keyvault: adding a 30s delay + increasing the required counts (#1164) ``` $ acctests azurerm TestAccAzureRMKeyVaultSecret_importComplete === RUN TestAccAzureRMKeyVaultSecret_importComplete go --ver--- PASS: TestAccAzureRMKeyVaultSecret_importComplete (166.51s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 166.533s ``` --- azurerm/resource_arm_key_vault.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_key_vault.go b/azurerm/resource_arm_key_vault.go index 7c19b75542e2..7691ee6abd52 100644 --- a/azurerm/resource_arm_key_vault.go +++ b/azurerm/resource_arm_key_vault.go @@ -238,8 +238,9 @@ func resourceArmKeyVaultCreate(d *schema.ResourceData, meta interface{}) error { Target: []string{"available"}, Refresh: keyVaultRefreshFunc(*vault), Timeout: 30 * time.Minute, + Delay: 30 * time.Second, PollInterval: 10 * time.Second, - ContinuousTargetOccurence: 5, + ContinuousTargetOccurence: 10, } if _, err := stateConf.WaitForState(); err != nil { From 7ceba23c2c288f0eac0beb5542c4375a6b2744bd Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Wed, 25 Apr 2018 12:30:53 +0200 Subject: [PATCH 036/320] Updating to include #1164 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c4ccbd4e1fa..a9d78021f1ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ IMPROVEMENTS: * `azurerm_cosmosdb_account` - `prefixes` can now be configured for locations [GH-1055] * `azurerm_function_app` - support for updating in-place [GH-1125] * `azurerm_key_vault` - adding cert permissions for `Purge` and `Recover` [GH-1132] -* `azurerm_key_vault` - polling to ensure the Key Vault is resolvable via DNS [GH-1081] +* `azurerm_key_vault` - polling to ensure the Key Vault is resolvable via DNS [GH-1081] [GH-1164] * `azurerm_kubernetes_cluster` - only setting the Subnet ID when it's not an empty string [GH-1158] * `azurerm_metric_alertrule` - filtering out tags prefixed with `$type` [GH-1107] * `azurerm_virtual_machine` - loading managed disk information from Azure when the machine is stopped [GH-1100] From ad135618492282ff699ae747da965d04d525d4a4 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Wed, 25 Apr 2018 12:31:57 +0200 Subject: [PATCH 037/320] Fixing the resource name for `arm_servicebus_subscription_rule` --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9d78021f1ba..1316cbe9beb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ FEATURES: * **New Data Source:** `azurerm_recovery_services_vault` [GH-995] * **New Resource:** `azurerm_recovery_services_vault` [GH-995] -* **New Resource:** `azurerm_servicebus_rule` [GH-1124] +* **New Resource:** `arm_servicebus_subscription_rule` [GH-1124] IMPROVEMENTS: From 587c815d3b050020fb00f70af41fff67de3b6d50 Mon Sep 17 00:00:00 2001 From: Joni Collinge Date: Thu, 26 Apr 2018 02:14:45 -0700 Subject: [PATCH 038/320] Add support for outputting kube config credentials from AKS (#953) * Add kubeconfig to aks resource output * Added kube config to output variables * Updated docs * Fixed naming in docs * Rebased onto origin master * Refactored out kubernetes helper * Made kubeconfig embedded structs private * Loaded test configs from testdata directory * Added additional unit tests * Checking the outputs are set * Added raw kube config as output * Changes required for sdkv15 * Parsing the Kube Config as a raw string, since it's decoded via string(bytes) * Ensuring the Kubernetes Config is set & tested --- azurerm/helpers/kubernetes/kube_config.go | 74 + .../helpers/kubernetes/kube_config_test.go | 189 ++ .../testdata/cluster_with_no_server.yml | 9 + .../kubernetes/testdata/no_cluster.yml | 7 + .../helpers/kubernetes/testdata/no_user.yml | 7 + .../kubernetes/testdata/user_with_cert.yml | 19 + .../testdata/user_with_cert_token.yml | 22 + .../kubernetes/testdata/user_with_no_auth.yml | 9 + .../testdata/user_with_partial_auth.yml | 20 + .../kubernetes/testdata/user_with_token.yml | 10 + azurerm/resource_arm_kubernetes_cluster.go | 88 + .../resource_arm_kubernetes_cluster_test.go | 9 +- examples/kubernetes-cluster/outputs.tf | 31 +- vendor/gopkg.in/yaml.v2/LICENSE | 201 ++ vendor/gopkg.in/yaml.v2/LICENSE.libyaml | 31 + vendor/gopkg.in/yaml.v2/NOTICE | 13 + vendor/gopkg.in/yaml.v2/README.md | 135 + vendor/gopkg.in/yaml.v2/apic.go | 739 +++++ vendor/gopkg.in/yaml.v2/decode.go | 764 +++++ vendor/gopkg.in/yaml.v2/emitterc.go | 1685 ++++++++++ vendor/gopkg.in/yaml.v2/encode.go | 358 +++ vendor/gopkg.in/yaml.v2/go.mod | 5 + vendor/gopkg.in/yaml.v2/parserc.go | 1095 +++++++ vendor/gopkg.in/yaml.v2/readerc.go | 394 +++ vendor/gopkg.in/yaml.v2/resolve.go | 245 ++ vendor/gopkg.in/yaml.v2/scannerc.go | 2702 +++++++++++++++++ vendor/gopkg.in/yaml.v2/sorter.go | 104 + vendor/gopkg.in/yaml.v2/writerc.go | 26 + vendor/gopkg.in/yaml.v2/yaml.go | 466 +++ vendor/gopkg.in/yaml.v2/yamlh.go | 738 +++++ vendor/gopkg.in/yaml.v2/yamlprivateh.go | 173 ++ vendor/vendor.json | 6 + .../docs/r/kubernetes_cluster.html.markdown | 40 + 33 files changed, 10411 insertions(+), 3 deletions(-) create mode 100644 azurerm/helpers/kubernetes/kube_config.go create mode 100644 azurerm/helpers/kubernetes/kube_config_test.go create mode 100644 azurerm/helpers/kubernetes/testdata/cluster_with_no_server.yml create mode 100644 azurerm/helpers/kubernetes/testdata/no_cluster.yml create mode 100644 azurerm/helpers/kubernetes/testdata/no_user.yml create mode 100644 azurerm/helpers/kubernetes/testdata/user_with_cert.yml create mode 100644 azurerm/helpers/kubernetes/testdata/user_with_cert_token.yml create mode 100644 azurerm/helpers/kubernetes/testdata/user_with_no_auth.yml create mode 100644 azurerm/helpers/kubernetes/testdata/user_with_partial_auth.yml create mode 100644 azurerm/helpers/kubernetes/testdata/user_with_token.yml create mode 100644 vendor/gopkg.in/yaml.v2/LICENSE create mode 100644 vendor/gopkg.in/yaml.v2/LICENSE.libyaml create mode 100644 vendor/gopkg.in/yaml.v2/NOTICE create mode 100644 vendor/gopkg.in/yaml.v2/README.md create mode 100644 vendor/gopkg.in/yaml.v2/apic.go create mode 100644 vendor/gopkg.in/yaml.v2/decode.go create mode 100644 vendor/gopkg.in/yaml.v2/emitterc.go create mode 100644 vendor/gopkg.in/yaml.v2/encode.go create mode 100644 vendor/gopkg.in/yaml.v2/go.mod create mode 100644 vendor/gopkg.in/yaml.v2/parserc.go create mode 100644 vendor/gopkg.in/yaml.v2/readerc.go create mode 100644 vendor/gopkg.in/yaml.v2/resolve.go create mode 100644 vendor/gopkg.in/yaml.v2/scannerc.go create mode 100644 vendor/gopkg.in/yaml.v2/sorter.go create mode 100644 vendor/gopkg.in/yaml.v2/writerc.go create mode 100644 vendor/gopkg.in/yaml.v2/yaml.go create mode 100644 vendor/gopkg.in/yaml.v2/yamlh.go create mode 100644 vendor/gopkg.in/yaml.v2/yamlprivateh.go diff --git a/azurerm/helpers/kubernetes/kube_config.go b/azurerm/helpers/kubernetes/kube_config.go new file mode 100644 index 000000000000..0ff13d2c594b --- /dev/null +++ b/azurerm/helpers/kubernetes/kube_config.go @@ -0,0 +1,74 @@ +package kubernetes + +import ( + "fmt" + + yaml "gopkg.in/yaml.v2" +) + +type clusterItem struct { + Name string `yaml:"name"` + Cluster cluster `yaml:"cluster"` +} + +type cluster struct { + ClusterAuthorityData string `yaml:"certificate-authority-data"` + Server string `yaml:"server"` +} + +type userItem struct { + Name string `yaml:"name"` + User user `yaml:"user"` +} + +type user struct { + ClientCertificteData string `yaml:"client-certificate-data"` + Token string `yaml:"token"` + ClientKeyData string `yaml:"client-key-data"` +} + +type contextItem struct { + Name string `yaml:"name"` + Context context `yaml:"context"` +} + +type context struct { + Cluster string `yaml:"cluster"` + User string `yaml:"user"` + Namespace string `yaml:"namespace,omitempty"` +} + +type KubeConfig struct { + APIVersion string `yaml:"apiVersion"` + Clusters []clusterItem `yaml:"clusters"` + Users []userItem `yaml:"users"` + Contexts []contextItem `yaml:"contexts,omitempty"` + CurrentContext string `yaml:"current-context,omitempty"` + Kind string `yaml:"kind,omitempty"` + Preferences map[string]interface{} `yaml:"preferences,omitempty"` +} + +func ParseKubeConfig(config string) (*KubeConfig, error) { + if config == "" { + return nil, fmt.Errorf("Cannot parse empty config") + } + + var kubeConfig KubeConfig + err := yaml.Unmarshal([]byte(config), &kubeConfig) + if err != nil { + return nil, fmt.Errorf("Failed to unmarshal YAML config with error %+v", err) + } + if len(kubeConfig.Clusters) <= 0 || len(kubeConfig.Users) <= 0 { + return nil, fmt.Errorf("Config %+v contains no valid clusters or users", kubeConfig) + } + user := kubeConfig.Users[0].User + if user.Token == "" && (user.ClientCertificteData == "" || user.ClientKeyData == "") { + return nil, fmt.Errorf("Config requires either token or certificate auth for user %+v", user) + } + cluster := kubeConfig.Clusters[0].Cluster + if cluster.Server == "" { + return nil, fmt.Errorf("Config has invalid or non existent server for cluster %+v", cluster) + } + + return &kubeConfig, nil +} diff --git a/azurerm/helpers/kubernetes/kube_config_test.go b/azurerm/helpers/kubernetes/kube_config_test.go new file mode 100644 index 000000000000..42024fc0cd4a --- /dev/null +++ b/azurerm/helpers/kubernetes/kube_config_test.go @@ -0,0 +1,189 @@ +package kubernetes + +import ( + "fmt" + "io/ioutil" + "path/filepath" + "reflect" + "testing" +) + +func TestParseKubeConfig(t *testing.T) { + testCases := []struct { + sourceFile string + expected KubeConfig + checkFunc func(expected KubeConfig, config string) (bool, error) + }{ + { + "user_with_token.yml", + KubeConfig{ + APIVersion: "v1", + Clusters: []clusterItem{ + { + Name: "test-cluster", + Cluster: cluster{ + Server: "https://testcluster.net:8080", + }, + }, + }, + Users: []userItem{ + { + Name: "test-user", + User: user{ + Token: "test-token", + }, + }, + }, + Kind: "Config", + }, + isValidConfig, + }, + { + "user_with_cert.yml", + KubeConfig{ + APIVersion: "v1", + Clusters: []clusterItem{ + { + Name: "test-cluster", + Cluster: cluster{ + ClusterAuthorityData: "test-cluster-authority-data", + Server: "https://testcluster.org:443", + }, + }, + }, + Users: []userItem{ + { + Name: "test-user", + User: user{ + ClientCertificteData: "test-client-certificate-data", + ClientKeyData: "test-client-key-data", + }, + }, + }, + Contexts: []contextItem{ + { + Name: "test-cluster", + Context: context{ + Cluster: "test-cluster", + User: "test-user", + Namespace: "test-namespace", + }, + }, + }, + CurrentContext: "test-cluster", + Kind: "Config", + Preferences: nil, + }, + isValidConfig, + }, + { + "user_with_cert_token.yml", + KubeConfig{ + APIVersion: "v1", + Clusters: []clusterItem{ + { + Name: "test-cluster", + Cluster: cluster{ + ClusterAuthorityData: "test-cluster-authority-data", + Server: "https://testcluster.org:443", + }, + }, + }, + Users: []userItem{ + { + Name: "test-user", + User: user{ + ClientCertificteData: "test-client-certificate-data", + ClientKeyData: "test-client-key-data", + Token: "test-token", + }, + }, + }, + Contexts: []contextItem{ + { + Name: "test-cluster", + Context: context{ + Cluster: "test-cluster", + User: "test-user", + Namespace: "test-namespace", + }, + }, + }, + CurrentContext: "test-cluster", + Kind: "Config", + Preferences: map[string]interface{}{ + "colors": true, + }, + }, + isValidConfig, + }, + { + "user_with_no_auth.yml", + KubeConfig{}, + isInvalidConfig, + }, + { + "no_cluster.yml", + KubeConfig{}, + isInvalidConfig, + }, + { + "no_user.yml", + KubeConfig{}, + isInvalidConfig, + }, + { + "user_with_partial_auth.yml", + KubeConfig{}, + isInvalidConfig, + }, + { + "cluster_with_no_server.yml", + KubeConfig{}, + isInvalidConfig, + }, + } + + for i, test := range testCases { + encodedConfig := LoadConfig(test.sourceFile) + if len(encodedConfig) <= 0 { + t.Fatalf("Test case [%d]: Failed to read config from file '%+v' \n", + i, test.sourceFile) + } + if success, err := test.checkFunc(test.expected, encodedConfig); !success { + t.Fatalf("Test case [%d]: Failed, config '%+v' with error: '%+v'", + i, test.sourceFile, err) + } + } +} + +func isValidConfig(expected KubeConfig, encodedConfig string) (bool, error) { + result, err := ParseKubeConfig(encodedConfig) + if err != nil { + return false, err + } + + if !reflect.DeepEqual(expected, *result) { + return false, fmt.Errorf("expected '%+v but got '%+v' with encoded config '%+v'", + expected, *result, encodedConfig) + } + return true, nil +} + +func isInvalidConfig(expected KubeConfig, encodedConfig string) (bool, error) { + _, err := ParseKubeConfig(encodedConfig) + if err == nil { + return false, fmt.Errorf("expected test to throw error but didn't") + } + return true, nil +} + +func LoadConfig(fileName string) string { + filePath := filepath.Join("testdata", fileName) + bytes, err := ioutil.ReadFile(filePath) + if err != nil { + return "" + } + + return string(bytes) +} diff --git a/azurerm/helpers/kubernetes/testdata/cluster_with_no_server.yml b/azurerm/helpers/kubernetes/testdata/cluster_with_no_server.yml new file mode 100644 index 000000000000..cf97231f7663 --- /dev/null +++ b/azurerm/helpers/kubernetes/testdata/cluster_with_no_server.yml @@ -0,0 +1,9 @@ +apiVersion: v1 +clusters: +- cluster: + name: test-cluster +users: +- name: test-user + user: + token: test-token +kind: Config \ No newline at end of file diff --git a/azurerm/helpers/kubernetes/testdata/no_cluster.yml b/azurerm/helpers/kubernetes/testdata/no_cluster.yml new file mode 100644 index 000000000000..93d1ce91261f --- /dev/null +++ b/azurerm/helpers/kubernetes/testdata/no_cluster.yml @@ -0,0 +1,7 @@ +apiVersion: v1 +clusters: +users: +- name: test-user + user: + token: test-token +kind: Config \ No newline at end of file diff --git a/azurerm/helpers/kubernetes/testdata/no_user.yml b/azurerm/helpers/kubernetes/testdata/no_user.yml new file mode 100644 index 000000000000..a8fb799088ac --- /dev/null +++ b/azurerm/helpers/kubernetes/testdata/no_user.yml @@ -0,0 +1,7 @@ +apiVersion: v1 +clusters: +- cluster: + certificate-authority-data: test-cluster-authority-data + server: https://testcluster.org:443 + name: test-cluster +users: \ No newline at end of file diff --git a/azurerm/helpers/kubernetes/testdata/user_with_cert.yml b/azurerm/helpers/kubernetes/testdata/user_with_cert.yml new file mode 100644 index 000000000000..e540899cc99d --- /dev/null +++ b/azurerm/helpers/kubernetes/testdata/user_with_cert.yml @@ -0,0 +1,19 @@ +apiVersion: v1 +clusters: +- cluster: + certificate-authority-data: test-cluster-authority-data + server: https://testcluster.org:443 + name: test-cluster +contexts: +- context: + cluster: test-cluster + user: test-user + namespace: test-namespace + name: test-cluster +current-context: test-cluster +users: +- name: test-user + user: + client-certificate-data: test-client-certificate-data + client-key-data: test-client-key-data +kind: Config \ No newline at end of file diff --git a/azurerm/helpers/kubernetes/testdata/user_with_cert_token.yml b/azurerm/helpers/kubernetes/testdata/user_with_cert_token.yml new file mode 100644 index 000000000000..214d3ca85c7f --- /dev/null +++ b/azurerm/helpers/kubernetes/testdata/user_with_cert_token.yml @@ -0,0 +1,22 @@ +apiVersion: v1 +clusters: +- cluster: + certificate-authority-data: test-cluster-authority-data + server: https://testcluster.org:443 + name: test-cluster +contexts: +- context: + cluster: test-cluster + user: test-user + namespace: test-namespace + name: test-cluster +current-context: test-cluster +users: +- name: test-user + user: + client-certificate-data: test-client-certificate-data + client-key-data: test-client-key-data + token: test-token +kind: Config +preferences: + colors: true \ No newline at end of file diff --git a/azurerm/helpers/kubernetes/testdata/user_with_no_auth.yml b/azurerm/helpers/kubernetes/testdata/user_with_no_auth.yml new file mode 100644 index 000000000000..fd04b03cf59e --- /dev/null +++ b/azurerm/helpers/kubernetes/testdata/user_with_no_auth.yml @@ -0,0 +1,9 @@ +apiVersion: v1 +clusters: +- cluster: + certificate-authority-data: test-cluster-authority-data + server: https://testcluster.org:443 + name: test-cluster +users: +- name: test-user + user: \ No newline at end of file diff --git a/azurerm/helpers/kubernetes/testdata/user_with_partial_auth.yml b/azurerm/helpers/kubernetes/testdata/user_with_partial_auth.yml new file mode 100644 index 000000000000..8f30266ca2e9 --- /dev/null +++ b/azurerm/helpers/kubernetes/testdata/user_with_partial_auth.yml @@ -0,0 +1,20 @@ +apiVersion: v1 +clusters: +- cluster: + certificate-authority-data: test-cluster-authority-data + server: https://testcluster.org:443 + name: test-cluster +contexts: +- context: + cluster: test-cluster + user: test-user + namespace: test-namespace + name: test-cluster +current-context: test-cluster +users: +- name: test-user + user: + client-certificate-data: test-client-certificate-data +kind: Config +preferences: + colors: true \ No newline at end of file diff --git a/azurerm/helpers/kubernetes/testdata/user_with_token.yml b/azurerm/helpers/kubernetes/testdata/user_with_token.yml new file mode 100644 index 000000000000..e92b2bac75cc --- /dev/null +++ b/azurerm/helpers/kubernetes/testdata/user_with_token.yml @@ -0,0 +1,10 @@ +apiVersion: v1 +clusters: +- cluster: + server: https://testcluster.net:8080 + name: test-cluster +users: +- name: test-user + user: + token: test-token +kind: Config \ No newline at end of file diff --git a/azurerm/resource_arm_kubernetes_cluster.go b/azurerm/resource_arm_kubernetes_cluster.go index f149168c9ebf..be96c7932f5c 100644 --- a/azurerm/resource_arm_kubernetes_cluster.go +++ b/azurerm/resource_arm_kubernetes_cluster.go @@ -9,6 +9,7 @@ import ( "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/kubernetes" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -50,6 +51,45 @@ func resourceArmKubernetesCluster() *schema.Resource { Computed: true, }, + "kube_config": { + Type: schema.TypeList, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "host": { + Type: schema.TypeString, + Computed: true, + }, + "username": { + Type: schema.TypeString, + Computed: true, + }, + "password": { + Type: schema.TypeString, + Computed: true, + }, + "client_certificate": { + Type: schema.TypeString, + Computed: true, + }, + "client_key": { + Type: schema.TypeString, + Computed: true, + }, + "cluster_ca_certificate": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + + "kube_config_raw": { + Type: schema.TypeString, + Computed: true, + }, + "linux_profile": { Type: schema.TypeList, Required: true, @@ -273,6 +313,18 @@ func resourceArmKubernetesClusterRead(d *schema.ResourceData, meta interface{}) d.Set("service_principal", servicePrincipal) } + profile, err := kubernetesClustersClient.GetAccessProfiles(ctx, resGroup, name, "clusterUser") + if err != nil { + return fmt.Errorf("Error getting access profile while making Read request on AKS Managed Cluster %q (resource group %q): %+v", name, resGroup, err) + } + + kubeConfigRaw, kubeConfig := flattenAzureRmKubernetesClusterAccessProfile(&profile) + d.Set("kube_config_raw", kubeConfigRaw) + + if err := d.Set("kube_config", kubeConfig); err != nil { + return fmt.Errorf("Error setting `kube_config`: %+v", err) + } + flattenAndSetTags(d, resp.Tags) return nil @@ -383,6 +435,42 @@ func flattenAzureRmKubernetesClusterServicePrincipalProfile(profile *containerse return servicePrincipalProfiles } +func flattenAzureRmKubernetesClusterAccessProfile(profile *containerservice.ManagedClusterAccessProfile) (*string, []interface{}) { + if profile != nil { + if accessProfile := profile.AccessProfile; accessProfile != nil { + if kubeConfigRaw := accessProfile.KubeConfig; kubeConfigRaw != nil { + rawConfig := string(*kubeConfigRaw) + + kubeConfig, err := kubernetes.ParseKubeConfig(rawConfig) + if err != nil { + return utils.String(rawConfig), []interface{}{} + } + + flattenedKubeConfig := flattenKubeConfig(*kubeConfig) + return utils.String(rawConfig), flattenedKubeConfig + } + } + } + return nil, []interface{}{} +} + +func flattenKubeConfig(config kubernetes.KubeConfig) []interface{} { + values := make(map[string]interface{}) + + cluster := config.Clusters[0].Cluster + user := config.Users[0].User + name := config.Users[0].Name + + values["host"] = cluster.Server + values["username"] = name + values["password"] = user.Token + values["client_certificate"] = user.ClientCertificteData + values["client_key"] = user.ClientKeyData + values["cluster_ca_certificate"] = cluster.ClusterAuthorityData + + return []interface{}{values} +} + func expandAzureRmKubernetesClusterLinuxProfile(d *schema.ResourceData) containerservice.LinuxProfile { profiles := d.Get("linux_profile").([]interface{}) config := profiles[0].(map[string]interface{}) diff --git a/azurerm/resource_arm_kubernetes_cluster_test.go b/azurerm/resource_arm_kubernetes_cluster_test.go index 59697b2b9eaf..061caeb6d9c1 100644 --- a/azurerm/resource_arm_kubernetes_cluster_test.go +++ b/azurerm/resource_arm_kubernetes_cluster_test.go @@ -12,6 +12,7 @@ import ( ) func TestAccAzureRMKubernetesCluster_basic(t *testing.T) { + resourceName := "azurerm_kubernetes_cluster.test" ri := acctest.RandInt() clientId := os.Getenv("ARM_CLIENT_ID") clientSecret := os.Getenv("ARM_CLIENT_SECRET") @@ -25,7 +26,13 @@ func TestAccAzureRMKubernetesCluster_basic(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMKubernetesClusterExists("azurerm_kubernetes_cluster.test"), + testCheckAzureRMKubernetesClusterExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "kube_config.0.client_key"), + resource.TestCheckResourceAttrSet(resourceName, "kube_config.0.client_certificate"), + resource.TestCheckResourceAttrSet(resourceName, "kube_config.0.cluster_ca_certificate"), + resource.TestCheckResourceAttrSet(resourceName, "kube_config.0.host"), + resource.TestCheckResourceAttrSet(resourceName, "kube_config.0.username"), + resource.TestCheckResourceAttrSet(resourceName, "kube_config.0.password"), ), }, }, diff --git a/examples/kubernetes-cluster/outputs.tf b/examples/kubernetes-cluster/outputs.tf index eb206a8c2ba2..346ccf3c4714 100644 --- a/examples/kubernetes-cluster/outputs.tf +++ b/examples/kubernetes-cluster/outputs.tf @@ -1,4 +1,31 @@ - output "id" { - value = "${azurerm_kubernetes_cluster.aks_container.id}" + value = "${azurerm_kubernetes_cluster.aks_container.id}" +} + +output "kube_config" { + value = "${azurerm_kubernetes_cluster.aks_container.kube_config_raw}" +} + +output "client_key" { + value = "${azurerm_kubernetes_cluster.aks_container.kube_config.0.client_key}" +} + +output "client_certificate" { + value = "${azurerm_kubernetes_cluster.aks_container.kube_config.0.client_certificate}" +} + +output "cluster_ca_certificate" { + value = "${azurerm_kubernetes_cluster.aks_container.kube_config.0.cluster_ca_certificate}" +} + +output "host" { + value = "${azurerm_kubernetes_cluster.aks_container.kube_config.0.host}" +} + +output "username" { + value = "${azurerm_kubernetes_cluster.aks_container.kube_config.0.username}" +} + +output "password" { + value = "${azurerm_kubernetes_cluster.aks_container.kube_config.0.password}" } diff --git a/vendor/gopkg.in/yaml.v2/LICENSE b/vendor/gopkg.in/yaml.v2/LICENSE new file mode 100644 index 000000000000..8dada3edaf50 --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/gopkg.in/yaml.v2/LICENSE.libyaml b/vendor/gopkg.in/yaml.v2/LICENSE.libyaml new file mode 100644 index 000000000000..8da58fbf6f84 --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/LICENSE.libyaml @@ -0,0 +1,31 @@ +The following files were ported to Go from C files of libyaml, and thus +are still covered by their original copyright and license: + + apic.go + emitterc.go + parserc.go + readerc.go + scannerc.go + writerc.go + yamlh.go + yamlprivateh.go + +Copyright (c) 2006 Kirill Simonov + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/gopkg.in/yaml.v2/NOTICE b/vendor/gopkg.in/yaml.v2/NOTICE new file mode 100644 index 000000000000..866d74a7ad79 --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/NOTICE @@ -0,0 +1,13 @@ +Copyright 2011-2016 Canonical Ltd. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/vendor/gopkg.in/yaml.v2/README.md b/vendor/gopkg.in/yaml.v2/README.md new file mode 100644 index 000000000000..2ed3314c7393 --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/README.md @@ -0,0 +1,135 @@ +# YAML support for the Go language + +Introduction +------------ + +The yaml package enables Go programs to comfortably encode and decode YAML +values. It was developed within [Canonical](https://www.canonical.com) as +part of the [juju](https://juju.ubuntu.com) project, and is based on a +pure Go port of the well-known [libyaml](http://pyyaml.org/wiki/LibYAML) +C library to parse and generate YAML data quickly and reliably. + +Compatibility +------------- + +The yaml package supports most of YAML 1.1 and 1.2, including support for +anchors, tags, map merging, etc. Multi-document unmarshalling is not yet +implemented, and base-60 floats from YAML 1.1 are purposefully not +supported since they're a poor design and are gone in YAML 1.2. + +Installation and usage +---------------------- + +The import path for the package is *gopkg.in/yaml.v2*. + +To install it, run: + + go get gopkg.in/yaml.v2 + +API documentation +----------------- + +If opened in a browser, the import path itself leads to the API documentation: + + * [https://gopkg.in/yaml.v2](https://gopkg.in/yaml.v2) + +API stability +------------- + +The package API for yaml v2 will remain stable as described in [gopkg.in](https://gopkg.in). + + +License +------- + +The yaml package is licensed under the Apache License 2.0. Please see the LICENSE file for details. + + +Example +------- + +Some more examples can be found in the "examples" folder. + +```Go +package main + +import ( + "fmt" + "log" + + "gopkg.in/yaml.v2" +) + +var data = ` +a: Easy! +b: + c: 2 + d: [3, 4] +` + +// Note: struct fields must be public in order for unmarshal to +// correctly populate the data. +type T struct { + A string + B struct { + RenamedC int `yaml:"c"` + D []int `yaml:",flow"` + } +} + +func main() { + t := T{} + + err := yaml.Unmarshal([]byte(data), &t) + if err != nil { + log.Fatalf("error: %v", err) + } + fmt.Printf("--- t:\n%v\n\n", t) + + d, err := yaml.Marshal(&t) + if err != nil { + log.Fatalf("error: %v", err) + } + fmt.Printf("--- t dump:\n%s\n\n", string(d)) + + m := make(map[interface{}]interface{}) + + err = yaml.Unmarshal([]byte(data), &m) + if err != nil { + log.Fatalf("error: %v", err) + } + fmt.Printf("--- m:\n%v\n\n", m) + + d, err = yaml.Marshal(&m) + if err != nil { + log.Fatalf("error: %v", err) + } + fmt.Printf("--- m dump:\n%s\n\n", string(d)) +} +``` + +This example will generate the following output: + +``` +--- t: +{Easy! {2 [3 4]}} + +--- t dump: +a: Easy! +b: + c: 2 + d: [3, 4] + + +--- m: +map[a:Easy! b:map[c:2 d:[3 4]]] + +--- m dump: +a: Easy! +b: + c: 2 + d: + - 3 + - 4 +``` + diff --git a/vendor/gopkg.in/yaml.v2/apic.go b/vendor/gopkg.in/yaml.v2/apic.go new file mode 100644 index 000000000000..3e24a0d7d27b --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/apic.go @@ -0,0 +1,739 @@ +package yaml + +import ( + "io" +) + +func yaml_insert_token(parser *yaml_parser_t, pos int, token *yaml_token_t) { + //fmt.Println("yaml_insert_token", "pos:", pos, "typ:", token.typ, "head:", parser.tokens_head, "len:", len(parser.tokens)) + + // Check if we can move the queue at the beginning of the buffer. + if parser.tokens_head > 0 && len(parser.tokens) == cap(parser.tokens) { + if parser.tokens_head != len(parser.tokens) { + copy(parser.tokens, parser.tokens[parser.tokens_head:]) + } + parser.tokens = parser.tokens[:len(parser.tokens)-parser.tokens_head] + parser.tokens_head = 0 + } + parser.tokens = append(parser.tokens, *token) + if pos < 0 { + return + } + copy(parser.tokens[parser.tokens_head+pos+1:], parser.tokens[parser.tokens_head+pos:]) + parser.tokens[parser.tokens_head+pos] = *token +} + +// Create a new parser object. +func yaml_parser_initialize(parser *yaml_parser_t) bool { + *parser = yaml_parser_t{ + raw_buffer: make([]byte, 0, input_raw_buffer_size), + buffer: make([]byte, 0, input_buffer_size), + } + return true +} + +// Destroy a parser object. +func yaml_parser_delete(parser *yaml_parser_t) { + *parser = yaml_parser_t{} +} + +// String read handler. +func yaml_string_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) { + if parser.input_pos == len(parser.input) { + return 0, io.EOF + } + n = copy(buffer, parser.input[parser.input_pos:]) + parser.input_pos += n + return n, nil +} + +// Reader read handler. +func yaml_reader_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) { + return parser.input_reader.Read(buffer) +} + +// Set a string input. +func yaml_parser_set_input_string(parser *yaml_parser_t, input []byte) { + if parser.read_handler != nil { + panic("must set the input source only once") + } + parser.read_handler = yaml_string_read_handler + parser.input = input + parser.input_pos = 0 +} + +// Set a file input. +func yaml_parser_set_input_reader(parser *yaml_parser_t, r io.Reader) { + if parser.read_handler != nil { + panic("must set the input source only once") + } + parser.read_handler = yaml_reader_read_handler + parser.input_reader = r +} + +// Set the source encoding. +func yaml_parser_set_encoding(parser *yaml_parser_t, encoding yaml_encoding_t) { + if parser.encoding != yaml_ANY_ENCODING { + panic("must set the encoding only once") + } + parser.encoding = encoding +} + +// Create a new emitter object. +func yaml_emitter_initialize(emitter *yaml_emitter_t) { + *emitter = yaml_emitter_t{ + buffer: make([]byte, output_buffer_size), + raw_buffer: make([]byte, 0, output_raw_buffer_size), + states: make([]yaml_emitter_state_t, 0, initial_stack_size), + events: make([]yaml_event_t, 0, initial_queue_size), + } +} + +// Destroy an emitter object. +func yaml_emitter_delete(emitter *yaml_emitter_t) { + *emitter = yaml_emitter_t{} +} + +// String write handler. +func yaml_string_write_handler(emitter *yaml_emitter_t, buffer []byte) error { + *emitter.output_buffer = append(*emitter.output_buffer, buffer...) + return nil +} + +// yaml_writer_write_handler uses emitter.output_writer to write the +// emitted text. +func yaml_writer_write_handler(emitter *yaml_emitter_t, buffer []byte) error { + _, err := emitter.output_writer.Write(buffer) + return err +} + +// Set a string output. +func yaml_emitter_set_output_string(emitter *yaml_emitter_t, output_buffer *[]byte) { + if emitter.write_handler != nil { + panic("must set the output target only once") + } + emitter.write_handler = yaml_string_write_handler + emitter.output_buffer = output_buffer +} + +// Set a file output. +func yaml_emitter_set_output_writer(emitter *yaml_emitter_t, w io.Writer) { + if emitter.write_handler != nil { + panic("must set the output target only once") + } + emitter.write_handler = yaml_writer_write_handler + emitter.output_writer = w +} + +// Set the output encoding. +func yaml_emitter_set_encoding(emitter *yaml_emitter_t, encoding yaml_encoding_t) { + if emitter.encoding != yaml_ANY_ENCODING { + panic("must set the output encoding only once") + } + emitter.encoding = encoding +} + +// Set the canonical output style. +func yaml_emitter_set_canonical(emitter *yaml_emitter_t, canonical bool) { + emitter.canonical = canonical +} + +//// Set the indentation increment. +func yaml_emitter_set_indent(emitter *yaml_emitter_t, indent int) { + if indent < 2 || indent > 9 { + indent = 2 + } + emitter.best_indent = indent +} + +// Set the preferred line width. +func yaml_emitter_set_width(emitter *yaml_emitter_t, width int) { + if width < 0 { + width = -1 + } + emitter.best_width = width +} + +// Set if unescaped non-ASCII characters are allowed. +func yaml_emitter_set_unicode(emitter *yaml_emitter_t, unicode bool) { + emitter.unicode = unicode +} + +// Set the preferred line break character. +func yaml_emitter_set_break(emitter *yaml_emitter_t, line_break yaml_break_t) { + emitter.line_break = line_break +} + +///* +// * Destroy a token object. +// */ +// +//YAML_DECLARE(void) +//yaml_token_delete(yaml_token_t *token) +//{ +// assert(token); // Non-NULL token object expected. +// +// switch (token.type) +// { +// case YAML_TAG_DIRECTIVE_TOKEN: +// yaml_free(token.data.tag_directive.handle); +// yaml_free(token.data.tag_directive.prefix); +// break; +// +// case YAML_ALIAS_TOKEN: +// yaml_free(token.data.alias.value); +// break; +// +// case YAML_ANCHOR_TOKEN: +// yaml_free(token.data.anchor.value); +// break; +// +// case YAML_TAG_TOKEN: +// yaml_free(token.data.tag.handle); +// yaml_free(token.data.tag.suffix); +// break; +// +// case YAML_SCALAR_TOKEN: +// yaml_free(token.data.scalar.value); +// break; +// +// default: +// break; +// } +// +// memset(token, 0, sizeof(yaml_token_t)); +//} +// +///* +// * Check if a string is a valid UTF-8 sequence. +// * +// * Check 'reader.c' for more details on UTF-8 encoding. +// */ +// +//static int +//yaml_check_utf8(yaml_char_t *start, size_t length) +//{ +// yaml_char_t *end = start+length; +// yaml_char_t *pointer = start; +// +// while (pointer < end) { +// unsigned char octet; +// unsigned int width; +// unsigned int value; +// size_t k; +// +// octet = pointer[0]; +// width = (octet & 0x80) == 0x00 ? 1 : +// (octet & 0xE0) == 0xC0 ? 2 : +// (octet & 0xF0) == 0xE0 ? 3 : +// (octet & 0xF8) == 0xF0 ? 4 : 0; +// value = (octet & 0x80) == 0x00 ? octet & 0x7F : +// (octet & 0xE0) == 0xC0 ? octet & 0x1F : +// (octet & 0xF0) == 0xE0 ? octet & 0x0F : +// (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0; +// if (!width) return 0; +// if (pointer+width > end) return 0; +// for (k = 1; k < width; k ++) { +// octet = pointer[k]; +// if ((octet & 0xC0) != 0x80) return 0; +// value = (value << 6) + (octet & 0x3F); +// } +// if (!((width == 1) || +// (width == 2 && value >= 0x80) || +// (width == 3 && value >= 0x800) || +// (width == 4 && value >= 0x10000))) return 0; +// +// pointer += width; +// } +// +// return 1; +//} +// + +// Create STREAM-START. +func yaml_stream_start_event_initialize(event *yaml_event_t, encoding yaml_encoding_t) { + *event = yaml_event_t{ + typ: yaml_STREAM_START_EVENT, + encoding: encoding, + } +} + +// Create STREAM-END. +func yaml_stream_end_event_initialize(event *yaml_event_t) { + *event = yaml_event_t{ + typ: yaml_STREAM_END_EVENT, + } +} + +// Create DOCUMENT-START. +func yaml_document_start_event_initialize( + event *yaml_event_t, + version_directive *yaml_version_directive_t, + tag_directives []yaml_tag_directive_t, + implicit bool, +) { + *event = yaml_event_t{ + typ: yaml_DOCUMENT_START_EVENT, + version_directive: version_directive, + tag_directives: tag_directives, + implicit: implicit, + } +} + +// Create DOCUMENT-END. +func yaml_document_end_event_initialize(event *yaml_event_t, implicit bool) { + *event = yaml_event_t{ + typ: yaml_DOCUMENT_END_EVENT, + implicit: implicit, + } +} + +///* +// * Create ALIAS. +// */ +// +//YAML_DECLARE(int) +//yaml_alias_event_initialize(event *yaml_event_t, anchor *yaml_char_t) +//{ +// mark yaml_mark_t = { 0, 0, 0 } +// anchor_copy *yaml_char_t = NULL +// +// assert(event) // Non-NULL event object is expected. +// assert(anchor) // Non-NULL anchor is expected. +// +// if (!yaml_check_utf8(anchor, strlen((char *)anchor))) return 0 +// +// anchor_copy = yaml_strdup(anchor) +// if (!anchor_copy) +// return 0 +// +// ALIAS_EVENT_INIT(*event, anchor_copy, mark, mark) +// +// return 1 +//} + +// Create SCALAR. +func yaml_scalar_event_initialize(event *yaml_event_t, anchor, tag, value []byte, plain_implicit, quoted_implicit bool, style yaml_scalar_style_t) bool { + *event = yaml_event_t{ + typ: yaml_SCALAR_EVENT, + anchor: anchor, + tag: tag, + value: value, + implicit: plain_implicit, + quoted_implicit: quoted_implicit, + style: yaml_style_t(style), + } + return true +} + +// Create SEQUENCE-START. +func yaml_sequence_start_event_initialize(event *yaml_event_t, anchor, tag []byte, implicit bool, style yaml_sequence_style_t) bool { + *event = yaml_event_t{ + typ: yaml_SEQUENCE_START_EVENT, + anchor: anchor, + tag: tag, + implicit: implicit, + style: yaml_style_t(style), + } + return true +} + +// Create SEQUENCE-END. +func yaml_sequence_end_event_initialize(event *yaml_event_t) bool { + *event = yaml_event_t{ + typ: yaml_SEQUENCE_END_EVENT, + } + return true +} + +// Create MAPPING-START. +func yaml_mapping_start_event_initialize(event *yaml_event_t, anchor, tag []byte, implicit bool, style yaml_mapping_style_t) { + *event = yaml_event_t{ + typ: yaml_MAPPING_START_EVENT, + anchor: anchor, + tag: tag, + implicit: implicit, + style: yaml_style_t(style), + } +} + +// Create MAPPING-END. +func yaml_mapping_end_event_initialize(event *yaml_event_t) { + *event = yaml_event_t{ + typ: yaml_MAPPING_END_EVENT, + } +} + +// Destroy an event object. +func yaml_event_delete(event *yaml_event_t) { + *event = yaml_event_t{} +} + +///* +// * Create a document object. +// */ +// +//YAML_DECLARE(int) +//yaml_document_initialize(document *yaml_document_t, +// version_directive *yaml_version_directive_t, +// tag_directives_start *yaml_tag_directive_t, +// tag_directives_end *yaml_tag_directive_t, +// start_implicit int, end_implicit int) +//{ +// struct { +// error yaml_error_type_t +// } context +// struct { +// start *yaml_node_t +// end *yaml_node_t +// top *yaml_node_t +// } nodes = { NULL, NULL, NULL } +// version_directive_copy *yaml_version_directive_t = NULL +// struct { +// start *yaml_tag_directive_t +// end *yaml_tag_directive_t +// top *yaml_tag_directive_t +// } tag_directives_copy = { NULL, NULL, NULL } +// value yaml_tag_directive_t = { NULL, NULL } +// mark yaml_mark_t = { 0, 0, 0 } +// +// assert(document) // Non-NULL document object is expected. +// assert((tag_directives_start && tag_directives_end) || +// (tag_directives_start == tag_directives_end)) +// // Valid tag directives are expected. +// +// if (!STACK_INIT(&context, nodes, INITIAL_STACK_SIZE)) goto error +// +// if (version_directive) { +// version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t)) +// if (!version_directive_copy) goto error +// version_directive_copy.major = version_directive.major +// version_directive_copy.minor = version_directive.minor +// } +// +// if (tag_directives_start != tag_directives_end) { +// tag_directive *yaml_tag_directive_t +// if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE)) +// goto error +// for (tag_directive = tag_directives_start +// tag_directive != tag_directives_end; tag_directive ++) { +// assert(tag_directive.handle) +// assert(tag_directive.prefix) +// if (!yaml_check_utf8(tag_directive.handle, +// strlen((char *)tag_directive.handle))) +// goto error +// if (!yaml_check_utf8(tag_directive.prefix, +// strlen((char *)tag_directive.prefix))) +// goto error +// value.handle = yaml_strdup(tag_directive.handle) +// value.prefix = yaml_strdup(tag_directive.prefix) +// if (!value.handle || !value.prefix) goto error +// if (!PUSH(&context, tag_directives_copy, value)) +// goto error +// value.handle = NULL +// value.prefix = NULL +// } +// } +// +// DOCUMENT_INIT(*document, nodes.start, nodes.end, version_directive_copy, +// tag_directives_copy.start, tag_directives_copy.top, +// start_implicit, end_implicit, mark, mark) +// +// return 1 +// +//error: +// STACK_DEL(&context, nodes) +// yaml_free(version_directive_copy) +// while (!STACK_EMPTY(&context, tag_directives_copy)) { +// value yaml_tag_directive_t = POP(&context, tag_directives_copy) +// yaml_free(value.handle) +// yaml_free(value.prefix) +// } +// STACK_DEL(&context, tag_directives_copy) +// yaml_free(value.handle) +// yaml_free(value.prefix) +// +// return 0 +//} +// +///* +// * Destroy a document object. +// */ +// +//YAML_DECLARE(void) +//yaml_document_delete(document *yaml_document_t) +//{ +// struct { +// error yaml_error_type_t +// } context +// tag_directive *yaml_tag_directive_t +// +// context.error = YAML_NO_ERROR // Eliminate a compliler warning. +// +// assert(document) // Non-NULL document object is expected. +// +// while (!STACK_EMPTY(&context, document.nodes)) { +// node yaml_node_t = POP(&context, document.nodes) +// yaml_free(node.tag) +// switch (node.type) { +// case YAML_SCALAR_NODE: +// yaml_free(node.data.scalar.value) +// break +// case YAML_SEQUENCE_NODE: +// STACK_DEL(&context, node.data.sequence.items) +// break +// case YAML_MAPPING_NODE: +// STACK_DEL(&context, node.data.mapping.pairs) +// break +// default: +// assert(0) // Should not happen. +// } +// } +// STACK_DEL(&context, document.nodes) +// +// yaml_free(document.version_directive) +// for (tag_directive = document.tag_directives.start +// tag_directive != document.tag_directives.end +// tag_directive++) { +// yaml_free(tag_directive.handle) +// yaml_free(tag_directive.prefix) +// } +// yaml_free(document.tag_directives.start) +// +// memset(document, 0, sizeof(yaml_document_t)) +//} +// +///** +// * Get a document node. +// */ +// +//YAML_DECLARE(yaml_node_t *) +//yaml_document_get_node(document *yaml_document_t, index int) +//{ +// assert(document) // Non-NULL document object is expected. +// +// if (index > 0 && document.nodes.start + index <= document.nodes.top) { +// return document.nodes.start + index - 1 +// } +// return NULL +//} +// +///** +// * Get the root object. +// */ +// +//YAML_DECLARE(yaml_node_t *) +//yaml_document_get_root_node(document *yaml_document_t) +//{ +// assert(document) // Non-NULL document object is expected. +// +// if (document.nodes.top != document.nodes.start) { +// return document.nodes.start +// } +// return NULL +//} +// +///* +// * Add a scalar node to a document. +// */ +// +//YAML_DECLARE(int) +//yaml_document_add_scalar(document *yaml_document_t, +// tag *yaml_char_t, value *yaml_char_t, length int, +// style yaml_scalar_style_t) +//{ +// struct { +// error yaml_error_type_t +// } context +// mark yaml_mark_t = { 0, 0, 0 } +// tag_copy *yaml_char_t = NULL +// value_copy *yaml_char_t = NULL +// node yaml_node_t +// +// assert(document) // Non-NULL document object is expected. +// assert(value) // Non-NULL value is expected. +// +// if (!tag) { +// tag = (yaml_char_t *)YAML_DEFAULT_SCALAR_TAG +// } +// +// if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error +// tag_copy = yaml_strdup(tag) +// if (!tag_copy) goto error +// +// if (length < 0) { +// length = strlen((char *)value) +// } +// +// if (!yaml_check_utf8(value, length)) goto error +// value_copy = yaml_malloc(length+1) +// if (!value_copy) goto error +// memcpy(value_copy, value, length) +// value_copy[length] = '\0' +// +// SCALAR_NODE_INIT(node, tag_copy, value_copy, length, style, mark, mark) +// if (!PUSH(&context, document.nodes, node)) goto error +// +// return document.nodes.top - document.nodes.start +// +//error: +// yaml_free(tag_copy) +// yaml_free(value_copy) +// +// return 0 +//} +// +///* +// * Add a sequence node to a document. +// */ +// +//YAML_DECLARE(int) +//yaml_document_add_sequence(document *yaml_document_t, +// tag *yaml_char_t, style yaml_sequence_style_t) +//{ +// struct { +// error yaml_error_type_t +// } context +// mark yaml_mark_t = { 0, 0, 0 } +// tag_copy *yaml_char_t = NULL +// struct { +// start *yaml_node_item_t +// end *yaml_node_item_t +// top *yaml_node_item_t +// } items = { NULL, NULL, NULL } +// node yaml_node_t +// +// assert(document) // Non-NULL document object is expected. +// +// if (!tag) { +// tag = (yaml_char_t *)YAML_DEFAULT_SEQUENCE_TAG +// } +// +// if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error +// tag_copy = yaml_strdup(tag) +// if (!tag_copy) goto error +// +// if (!STACK_INIT(&context, items, INITIAL_STACK_SIZE)) goto error +// +// SEQUENCE_NODE_INIT(node, tag_copy, items.start, items.end, +// style, mark, mark) +// if (!PUSH(&context, document.nodes, node)) goto error +// +// return document.nodes.top - document.nodes.start +// +//error: +// STACK_DEL(&context, items) +// yaml_free(tag_copy) +// +// return 0 +//} +// +///* +// * Add a mapping node to a document. +// */ +// +//YAML_DECLARE(int) +//yaml_document_add_mapping(document *yaml_document_t, +// tag *yaml_char_t, style yaml_mapping_style_t) +//{ +// struct { +// error yaml_error_type_t +// } context +// mark yaml_mark_t = { 0, 0, 0 } +// tag_copy *yaml_char_t = NULL +// struct { +// start *yaml_node_pair_t +// end *yaml_node_pair_t +// top *yaml_node_pair_t +// } pairs = { NULL, NULL, NULL } +// node yaml_node_t +// +// assert(document) // Non-NULL document object is expected. +// +// if (!tag) { +// tag = (yaml_char_t *)YAML_DEFAULT_MAPPING_TAG +// } +// +// if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error +// tag_copy = yaml_strdup(tag) +// if (!tag_copy) goto error +// +// if (!STACK_INIT(&context, pairs, INITIAL_STACK_SIZE)) goto error +// +// MAPPING_NODE_INIT(node, tag_copy, pairs.start, pairs.end, +// style, mark, mark) +// if (!PUSH(&context, document.nodes, node)) goto error +// +// return document.nodes.top - document.nodes.start +// +//error: +// STACK_DEL(&context, pairs) +// yaml_free(tag_copy) +// +// return 0 +//} +// +///* +// * Append an item to a sequence node. +// */ +// +//YAML_DECLARE(int) +//yaml_document_append_sequence_item(document *yaml_document_t, +// sequence int, item int) +//{ +// struct { +// error yaml_error_type_t +// } context +// +// assert(document) // Non-NULL document is required. +// assert(sequence > 0 +// && document.nodes.start + sequence <= document.nodes.top) +// // Valid sequence id is required. +// assert(document.nodes.start[sequence-1].type == YAML_SEQUENCE_NODE) +// // A sequence node is required. +// assert(item > 0 && document.nodes.start + item <= document.nodes.top) +// // Valid item id is required. +// +// if (!PUSH(&context, +// document.nodes.start[sequence-1].data.sequence.items, item)) +// return 0 +// +// return 1 +//} +// +///* +// * Append a pair of a key and a value to a mapping node. +// */ +// +//YAML_DECLARE(int) +//yaml_document_append_mapping_pair(document *yaml_document_t, +// mapping int, key int, value int) +//{ +// struct { +// error yaml_error_type_t +// } context +// +// pair yaml_node_pair_t +// +// assert(document) // Non-NULL document is required. +// assert(mapping > 0 +// && document.nodes.start + mapping <= document.nodes.top) +// // Valid mapping id is required. +// assert(document.nodes.start[mapping-1].type == YAML_MAPPING_NODE) +// // A mapping node is required. +// assert(key > 0 && document.nodes.start + key <= document.nodes.top) +// // Valid key id is required. +// assert(value > 0 && document.nodes.start + value <= document.nodes.top) +// // Valid value id is required. +// +// pair.key = key +// pair.value = value +// +// if (!PUSH(&context, +// document.nodes.start[mapping-1].data.mapping.pairs, pair)) +// return 0 +// +// return 1 +//} +// +// diff --git a/vendor/gopkg.in/yaml.v2/decode.go b/vendor/gopkg.in/yaml.v2/decode.go new file mode 100644 index 000000000000..c8eac1642870 --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/decode.go @@ -0,0 +1,764 @@ +package yaml + +import ( + "encoding" + "encoding/base64" + "fmt" + "io" + "math" + "reflect" + "strconv" + "time" +) + +const ( + documentNode = 1 << iota + mappingNode + sequenceNode + scalarNode + aliasNode +) + +type node struct { + kind int + line, column int + tag string + // For an alias node, alias holds the resolved alias. + alias *node + value string + implicit bool + children []*node + anchors map[string]*node +} + +// ---------------------------------------------------------------------------- +// Parser, produces a node tree out of a libyaml event stream. + +type parser struct { + parser yaml_parser_t + event yaml_event_t + doc *node + doneInit bool +} + +func newParser(b []byte) *parser { + p := parser{} + if !yaml_parser_initialize(&p.parser) { + panic("failed to initialize YAML emitter") + } + if len(b) == 0 { + b = []byte{'\n'} + } + yaml_parser_set_input_string(&p.parser, b) + return &p +} + +func newParserFromReader(r io.Reader) *parser { + p := parser{} + if !yaml_parser_initialize(&p.parser) { + panic("failed to initialize YAML emitter") + } + yaml_parser_set_input_reader(&p.parser, r) + return &p +} + +func (p *parser) init() { + if p.doneInit { + return + } + p.expect(yaml_STREAM_START_EVENT) + p.doneInit = true +} + +func (p *parser) destroy() { + if p.event.typ != yaml_NO_EVENT { + yaml_event_delete(&p.event) + } + yaml_parser_delete(&p.parser) +} + +// expect consumes an event from the event stream and +// checks that it's of the expected type. +func (p *parser) expect(e yaml_event_type_t) { + if p.event.typ == yaml_NO_EVENT { + if !yaml_parser_parse(&p.parser, &p.event) { + p.fail() + } + } + if p.event.typ == yaml_STREAM_END_EVENT { + failf("attempted to go past the end of stream; corrupted value?") + } + if p.event.typ != e { + p.parser.problem = fmt.Sprintf("expected %s event but got %s", e, p.event.typ) + p.fail() + } + yaml_event_delete(&p.event) + p.event.typ = yaml_NO_EVENT +} + +// peek peeks at the next event in the event stream, +// puts the results into p.event and returns the event type. +func (p *parser) peek() yaml_event_type_t { + if p.event.typ != yaml_NO_EVENT { + return p.event.typ + } + if !yaml_parser_parse(&p.parser, &p.event) { + p.fail() + } + return p.event.typ +} + +func (p *parser) fail() { + var where string + var line int + if p.parser.problem_mark.line != 0 { + line = p.parser.problem_mark.line + } else if p.parser.context_mark.line != 0 { + line = p.parser.context_mark.line + } + if line != 0 { + where = "line " + strconv.Itoa(line) + ": " + } + var msg string + if len(p.parser.problem) > 0 { + msg = p.parser.problem + } else { + msg = "unknown problem parsing YAML content" + } + failf("%s%s", where, msg) +} + +func (p *parser) anchor(n *node, anchor []byte) { + if anchor != nil { + p.doc.anchors[string(anchor)] = n + } +} + +func (p *parser) parse() *node { + p.init() + switch p.peek() { + case yaml_SCALAR_EVENT: + return p.scalar() + case yaml_ALIAS_EVENT: + return p.alias() + case yaml_MAPPING_START_EVENT: + return p.mapping() + case yaml_SEQUENCE_START_EVENT: + return p.sequence() + case yaml_DOCUMENT_START_EVENT: + return p.document() + case yaml_STREAM_END_EVENT: + // Happens when attempting to decode an empty buffer. + return nil + default: + panic("attempted to parse unknown event: " + p.event.typ.String()) + } +} + +func (p *parser) node(kind int) *node { + return &node{ + kind: kind, + line: p.event.start_mark.line, + column: p.event.start_mark.column, + } +} + +func (p *parser) document() *node { + n := p.node(documentNode) + n.anchors = make(map[string]*node) + p.doc = n + p.expect(yaml_DOCUMENT_START_EVENT) + n.children = append(n.children, p.parse()) + p.expect(yaml_DOCUMENT_END_EVENT) + return n +} + +func (p *parser) alias() *node { + n := p.node(aliasNode) + n.value = string(p.event.anchor) + n.alias = p.doc.anchors[n.value] + if n.alias == nil { + failf("unknown anchor '%s' referenced", n.value) + } + p.expect(yaml_ALIAS_EVENT) + return n +} + +func (p *parser) scalar() *node { + n := p.node(scalarNode) + n.value = string(p.event.value) + n.tag = string(p.event.tag) + n.implicit = p.event.implicit + p.anchor(n, p.event.anchor) + p.expect(yaml_SCALAR_EVENT) + return n +} + +func (p *parser) sequence() *node { + n := p.node(sequenceNode) + p.anchor(n, p.event.anchor) + p.expect(yaml_SEQUENCE_START_EVENT) + for p.peek() != yaml_SEQUENCE_END_EVENT { + n.children = append(n.children, p.parse()) + } + p.expect(yaml_SEQUENCE_END_EVENT) + return n +} + +func (p *parser) mapping() *node { + n := p.node(mappingNode) + p.anchor(n, p.event.anchor) + p.expect(yaml_MAPPING_START_EVENT) + for p.peek() != yaml_MAPPING_END_EVENT { + n.children = append(n.children, p.parse(), p.parse()) + } + p.expect(yaml_MAPPING_END_EVENT) + return n +} + +// ---------------------------------------------------------------------------- +// Decoder, unmarshals a node into a provided value. + +type decoder struct { + doc *node + aliases map[*node]bool + mapType reflect.Type + terrors []string + strict bool +} + +var ( + mapItemType = reflect.TypeOf(MapItem{}) + durationType = reflect.TypeOf(time.Duration(0)) + defaultMapType = reflect.TypeOf(map[interface{}]interface{}{}) + ifaceType = defaultMapType.Elem() + timeType = reflect.TypeOf(time.Time{}) + ptrTimeType = reflect.TypeOf(&time.Time{}) +) + +func newDecoder(strict bool) *decoder { + d := &decoder{mapType: defaultMapType, strict: strict} + d.aliases = make(map[*node]bool) + return d +} + +func (d *decoder) terror(n *node, tag string, out reflect.Value) { + if n.tag != "" { + tag = n.tag + } + value := n.value + if tag != yaml_SEQ_TAG && tag != yaml_MAP_TAG { + if len(value) > 10 { + value = " `" + value[:7] + "...`" + } else { + value = " `" + value + "`" + } + } + d.terrors = append(d.terrors, fmt.Sprintf("line %d: cannot unmarshal %s%s into %s", n.line+1, shortTag(tag), value, out.Type())) +} + +func (d *decoder) callUnmarshaler(n *node, u Unmarshaler) (good bool) { + terrlen := len(d.terrors) + err := u.UnmarshalYAML(func(v interface{}) (err error) { + defer handleErr(&err) + d.unmarshal(n, reflect.ValueOf(v)) + if len(d.terrors) > terrlen { + issues := d.terrors[terrlen:] + d.terrors = d.terrors[:terrlen] + return &TypeError{issues} + } + return nil + }) + if e, ok := err.(*TypeError); ok { + d.terrors = append(d.terrors, e.Errors...) + return false + } + if err != nil { + fail(err) + } + return true +} + +// d.prepare initializes and dereferences pointers and calls UnmarshalYAML +// if a value is found to implement it. +// It returns the initialized and dereferenced out value, whether +// unmarshalling was already done by UnmarshalYAML, and if so whether +// its types unmarshalled appropriately. +// +// If n holds a null value, prepare returns before doing anything. +func (d *decoder) prepare(n *node, out reflect.Value) (newout reflect.Value, unmarshaled, good bool) { + if n.tag == yaml_NULL_TAG || n.kind == scalarNode && n.tag == "" && (n.value == "null" || n.value == "~" || n.value == "" && n.implicit) { + return out, false, false + } + again := true + for again { + again = false + if out.Kind() == reflect.Ptr { + if out.IsNil() { + out.Set(reflect.New(out.Type().Elem())) + } + out = out.Elem() + again = true + } + if out.CanAddr() { + if u, ok := out.Addr().Interface().(Unmarshaler); ok { + good = d.callUnmarshaler(n, u) + return out, true, good + } + } + } + return out, false, false +} + +func (d *decoder) unmarshal(n *node, out reflect.Value) (good bool) { + switch n.kind { + case documentNode: + return d.document(n, out) + case aliasNode: + return d.alias(n, out) + } + out, unmarshaled, good := d.prepare(n, out) + if unmarshaled { + return good + } + switch n.kind { + case scalarNode: + good = d.scalar(n, out) + case mappingNode: + good = d.mapping(n, out) + case sequenceNode: + good = d.sequence(n, out) + default: + panic("internal error: unknown node kind: " + strconv.Itoa(n.kind)) + } + return good +} + +func (d *decoder) document(n *node, out reflect.Value) (good bool) { + if len(n.children) == 1 { + d.doc = n + d.unmarshal(n.children[0], out) + return true + } + return false +} + +func (d *decoder) alias(n *node, out reflect.Value) (good bool) { + if d.aliases[n] { + // TODO this could actually be allowed in some circumstances. + failf("anchor '%s' value contains itself", n.value) + } + d.aliases[n] = true + good = d.unmarshal(n.alias, out) + delete(d.aliases, n) + return good +} + +var zeroValue reflect.Value + +func resetMap(out reflect.Value) { + for _, k := range out.MapKeys() { + out.SetMapIndex(k, zeroValue) + } +} + +func (d *decoder) scalar(n *node, out reflect.Value) bool { + var tag string + var resolved interface{} + if n.tag == "" && !n.implicit { + tag = yaml_STR_TAG + resolved = n.value + } else { + tag, resolved = resolve(n.tag, n.value) + if tag == yaml_BINARY_TAG { + data, err := base64.StdEncoding.DecodeString(resolved.(string)) + if err != nil { + failf("!!binary value contains invalid base64 data") + } + resolved = string(data) + } + } + if resolved == nil { + if out.Kind() == reflect.Map && !out.CanAddr() { + resetMap(out) + } else { + out.Set(reflect.Zero(out.Type())) + } + return true + } + if resolvedv := reflect.ValueOf(resolved); out.Type() == resolvedv.Type() { + // We've resolved to exactly the type we want, so use that. + out.Set(resolvedv) + return true + } + // Perhaps we can use the value as a TextUnmarshaler to + // set its value. + if out.CanAddr() { + u, ok := out.Addr().Interface().(encoding.TextUnmarshaler) + if ok { + var text []byte + if tag == yaml_BINARY_TAG { + text = []byte(resolved.(string)) + } else { + // We let any value be unmarshaled into TextUnmarshaler. + // That might be more lax than we'd like, but the + // TextUnmarshaler itself should bowl out any dubious values. + text = []byte(n.value) + } + err := u.UnmarshalText(text) + if err != nil { + fail(err) + } + return true + } + } + switch out.Kind() { + case reflect.String: + if tag == yaml_BINARY_TAG { + out.SetString(resolved.(string)) + return true + } + if resolved != nil { + out.SetString(n.value) + return true + } + case reflect.Interface: + if resolved == nil { + out.Set(reflect.Zero(out.Type())) + } else if tag == yaml_TIMESTAMP_TAG { + // It looks like a timestamp but for backward compatibility + // reasons we set it as a string, so that code that unmarshals + // timestamp-like values into interface{} will continue to + // see a string and not a time.Time. + out.Set(reflect.ValueOf(n.value)) + } else { + out.Set(reflect.ValueOf(resolved)) + } + return true + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + switch resolved := resolved.(type) { + case int: + if !out.OverflowInt(int64(resolved)) { + out.SetInt(int64(resolved)) + return true + } + case int64: + if !out.OverflowInt(resolved) { + out.SetInt(resolved) + return true + } + case uint64: + if resolved <= math.MaxInt64 && !out.OverflowInt(int64(resolved)) { + out.SetInt(int64(resolved)) + return true + } + case float64: + if resolved <= math.MaxInt64 && !out.OverflowInt(int64(resolved)) { + out.SetInt(int64(resolved)) + return true + } + case string: + if out.Type() == durationType { + d, err := time.ParseDuration(resolved) + if err == nil { + out.SetInt(int64(d)) + return true + } + } + } + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: + switch resolved := resolved.(type) { + case int: + if resolved >= 0 && !out.OverflowUint(uint64(resolved)) { + out.SetUint(uint64(resolved)) + return true + } + case int64: + if resolved >= 0 && !out.OverflowUint(uint64(resolved)) { + out.SetUint(uint64(resolved)) + return true + } + case uint64: + if !out.OverflowUint(uint64(resolved)) { + out.SetUint(uint64(resolved)) + return true + } + case float64: + if resolved <= math.MaxUint64 && !out.OverflowUint(uint64(resolved)) { + out.SetUint(uint64(resolved)) + return true + } + } + case reflect.Bool: + switch resolved := resolved.(type) { + case bool: + out.SetBool(resolved) + return true + } + case reflect.Float32, reflect.Float64: + switch resolved := resolved.(type) { + case int: + out.SetFloat(float64(resolved)) + return true + case int64: + out.SetFloat(float64(resolved)) + return true + case uint64: + out.SetFloat(float64(resolved)) + return true + case float64: + out.SetFloat(resolved) + return true + } + case reflect.Struct: + if resolvedv := reflect.ValueOf(resolved); out.Type() == resolvedv.Type() { + out.Set(resolvedv) + return true + } + case reflect.Ptr: + if out.Type().Elem() == reflect.TypeOf(resolved) { + // TODO DOes this make sense? When is out a Ptr except when decoding a nil value? + elem := reflect.New(out.Type().Elem()) + elem.Elem().Set(reflect.ValueOf(resolved)) + out.Set(elem) + return true + } + } + d.terror(n, tag, out) + return false +} + +func settableValueOf(i interface{}) reflect.Value { + v := reflect.ValueOf(i) + sv := reflect.New(v.Type()).Elem() + sv.Set(v) + return sv +} + +func (d *decoder) sequence(n *node, out reflect.Value) (good bool) { + l := len(n.children) + + var iface reflect.Value + switch out.Kind() { + case reflect.Slice: + out.Set(reflect.MakeSlice(out.Type(), l, l)) + case reflect.Interface: + // No type hints. Will have to use a generic sequence. + iface = out + out = settableValueOf(make([]interface{}, l)) + default: + d.terror(n, yaml_SEQ_TAG, out) + return false + } + et := out.Type().Elem() + + j := 0 + for i := 0; i < l; i++ { + e := reflect.New(et).Elem() + if ok := d.unmarshal(n.children[i], e); ok { + out.Index(j).Set(e) + j++ + } + } + out.Set(out.Slice(0, j)) + if iface.IsValid() { + iface.Set(out) + } + return true +} + +func (d *decoder) mapping(n *node, out reflect.Value) (good bool) { + switch out.Kind() { + case reflect.Struct: + return d.mappingStruct(n, out) + case reflect.Slice: + return d.mappingSlice(n, out) + case reflect.Map: + // okay + case reflect.Interface: + if d.mapType.Kind() == reflect.Map { + iface := out + out = reflect.MakeMap(d.mapType) + iface.Set(out) + } else { + slicev := reflect.New(d.mapType).Elem() + if !d.mappingSlice(n, slicev) { + return false + } + out.Set(slicev) + return true + } + default: + d.terror(n, yaml_MAP_TAG, out) + return false + } + outt := out.Type() + kt := outt.Key() + et := outt.Elem() + + mapType := d.mapType + if outt.Key() == ifaceType && outt.Elem() == ifaceType { + d.mapType = outt + } + + if out.IsNil() { + out.Set(reflect.MakeMap(outt)) + } + l := len(n.children) + for i := 0; i < l; i += 2 { + if isMerge(n.children[i]) { + d.merge(n.children[i+1], out) + continue + } + k := reflect.New(kt).Elem() + if d.unmarshal(n.children[i], k) { + kkind := k.Kind() + if kkind == reflect.Interface { + kkind = k.Elem().Kind() + } + if kkind == reflect.Map || kkind == reflect.Slice { + failf("invalid map key: %#v", k.Interface()) + } + e := reflect.New(et).Elem() + if d.unmarshal(n.children[i+1], e) { + d.setMapIndex(n.children[i+1], out, k, e) + } + } + } + d.mapType = mapType + return true +} + +func (d *decoder) setMapIndex(n *node, out, k, v reflect.Value) { + if d.strict && out.MapIndex(k) != zeroValue { + d.terrors = append(d.terrors, fmt.Sprintf("line %d: key %#v already set in map", n.line+1, k.Interface())) + return + } + out.SetMapIndex(k, v) +} + +func (d *decoder) mappingSlice(n *node, out reflect.Value) (good bool) { + outt := out.Type() + if outt.Elem() != mapItemType { + d.terror(n, yaml_MAP_TAG, out) + return false + } + + mapType := d.mapType + d.mapType = outt + + var slice []MapItem + var l = len(n.children) + for i := 0; i < l; i += 2 { + if isMerge(n.children[i]) { + d.merge(n.children[i+1], out) + continue + } + item := MapItem{} + k := reflect.ValueOf(&item.Key).Elem() + if d.unmarshal(n.children[i], k) { + v := reflect.ValueOf(&item.Value).Elem() + if d.unmarshal(n.children[i+1], v) { + slice = append(slice, item) + } + } + } + out.Set(reflect.ValueOf(slice)) + d.mapType = mapType + return true +} + +func (d *decoder) mappingStruct(n *node, out reflect.Value) (good bool) { + sinfo, err := getStructInfo(out.Type()) + if err != nil { + panic(err) + } + name := settableValueOf("") + l := len(n.children) + + var inlineMap reflect.Value + var elemType reflect.Type + if sinfo.InlineMap != -1 { + inlineMap = out.Field(sinfo.InlineMap) + inlineMap.Set(reflect.New(inlineMap.Type()).Elem()) + elemType = inlineMap.Type().Elem() + } + + var doneFields []bool + if d.strict { + doneFields = make([]bool, len(sinfo.FieldsList)) + } + for i := 0; i < l; i += 2 { + ni := n.children[i] + if isMerge(ni) { + d.merge(n.children[i+1], out) + continue + } + if !d.unmarshal(ni, name) { + continue + } + if info, ok := sinfo.FieldsMap[name.String()]; ok { + if d.strict { + if doneFields[info.Id] { + d.terrors = append(d.terrors, fmt.Sprintf("line %d: field %s already set in type %s", ni.line+1, name.String(), out.Type())) + continue + } + doneFields[info.Id] = true + } + var field reflect.Value + if info.Inline == nil { + field = out.Field(info.Num) + } else { + field = out.FieldByIndex(info.Inline) + } + d.unmarshal(n.children[i+1], field) + } else if sinfo.InlineMap != -1 { + if inlineMap.IsNil() { + inlineMap.Set(reflect.MakeMap(inlineMap.Type())) + } + value := reflect.New(elemType).Elem() + d.unmarshal(n.children[i+1], value) + d.setMapIndex(n.children[i+1], inlineMap, name, value) + } else if d.strict { + d.terrors = append(d.terrors, fmt.Sprintf("line %d: field %s not found in type %s", ni.line+1, name.String(), out.Type())) + } + } + return true +} + +func failWantMap() { + failf("map merge requires map or sequence of maps as the value") +} + +func (d *decoder) merge(n *node, out reflect.Value) { + switch n.kind { + case mappingNode: + d.unmarshal(n, out) + case aliasNode: + an, ok := d.doc.anchors[n.value] + if ok && an.kind != mappingNode { + failWantMap() + } + d.unmarshal(n, out) + case sequenceNode: + // Step backwards as earlier nodes take precedence. + for i := len(n.children) - 1; i >= 0; i-- { + ni := n.children[i] + if ni.kind == aliasNode { + an, ok := d.doc.anchors[ni.value] + if ok && an.kind != mappingNode { + failWantMap() + } + } else if ni.kind != mappingNode { + failWantMap() + } + d.unmarshal(ni, out) + } + default: + failWantMap() + } +} + +func isMerge(n *node) bool { + return n.kind == scalarNode && n.value == "<<" && (n.implicit == true || n.tag == yaml_MERGE_TAG) +} diff --git a/vendor/gopkg.in/yaml.v2/emitterc.go b/vendor/gopkg.in/yaml.v2/emitterc.go new file mode 100644 index 000000000000..cf0db118ac9a --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/emitterc.go @@ -0,0 +1,1685 @@ +package yaml + +import ( + "bytes" + "fmt" +) + +// Flush the buffer if needed. +func flush(emitter *yaml_emitter_t) bool { + if emitter.buffer_pos+5 >= len(emitter.buffer) { + return yaml_emitter_flush(emitter) + } + return true +} + +// Put a character to the output buffer. +func put(emitter *yaml_emitter_t, value byte) bool { + if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) { + return false + } + emitter.buffer[emitter.buffer_pos] = value + emitter.buffer_pos++ + emitter.column++ + return true +} + +// Put a line break to the output buffer. +func put_break(emitter *yaml_emitter_t) bool { + if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) { + return false + } + switch emitter.line_break { + case yaml_CR_BREAK: + emitter.buffer[emitter.buffer_pos] = '\r' + emitter.buffer_pos += 1 + case yaml_LN_BREAK: + emitter.buffer[emitter.buffer_pos] = '\n' + emitter.buffer_pos += 1 + case yaml_CRLN_BREAK: + emitter.buffer[emitter.buffer_pos+0] = '\r' + emitter.buffer[emitter.buffer_pos+1] = '\n' + emitter.buffer_pos += 2 + default: + panic("unknown line break setting") + } + emitter.column = 0 + emitter.line++ + return true +} + +// Copy a character from a string into buffer. +func write(emitter *yaml_emitter_t, s []byte, i *int) bool { + if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) { + return false + } + p := emitter.buffer_pos + w := width(s[*i]) + switch w { + case 4: + emitter.buffer[p+3] = s[*i+3] + fallthrough + case 3: + emitter.buffer[p+2] = s[*i+2] + fallthrough + case 2: + emitter.buffer[p+1] = s[*i+1] + fallthrough + case 1: + emitter.buffer[p+0] = s[*i+0] + default: + panic("unknown character width") + } + emitter.column++ + emitter.buffer_pos += w + *i += w + return true +} + +// Write a whole string into buffer. +func write_all(emitter *yaml_emitter_t, s []byte) bool { + for i := 0; i < len(s); { + if !write(emitter, s, &i) { + return false + } + } + return true +} + +// Copy a line break character from a string into buffer. +func write_break(emitter *yaml_emitter_t, s []byte, i *int) bool { + if s[*i] == '\n' { + if !put_break(emitter) { + return false + } + *i++ + } else { + if !write(emitter, s, i) { + return false + } + emitter.column = 0 + emitter.line++ + } + return true +} + +// Set an emitter error and return false. +func yaml_emitter_set_emitter_error(emitter *yaml_emitter_t, problem string) bool { + emitter.error = yaml_EMITTER_ERROR + emitter.problem = problem + return false +} + +// Emit an event. +func yaml_emitter_emit(emitter *yaml_emitter_t, event *yaml_event_t) bool { + emitter.events = append(emitter.events, *event) + for !yaml_emitter_need_more_events(emitter) { + event := &emitter.events[emitter.events_head] + if !yaml_emitter_analyze_event(emitter, event) { + return false + } + if !yaml_emitter_state_machine(emitter, event) { + return false + } + yaml_event_delete(event) + emitter.events_head++ + } + return true +} + +// Check if we need to accumulate more events before emitting. +// +// We accumulate extra +// - 1 event for DOCUMENT-START +// - 2 events for SEQUENCE-START +// - 3 events for MAPPING-START +// +func yaml_emitter_need_more_events(emitter *yaml_emitter_t) bool { + if emitter.events_head == len(emitter.events) { + return true + } + var accumulate int + switch emitter.events[emitter.events_head].typ { + case yaml_DOCUMENT_START_EVENT: + accumulate = 1 + break + case yaml_SEQUENCE_START_EVENT: + accumulate = 2 + break + case yaml_MAPPING_START_EVENT: + accumulate = 3 + break + default: + return false + } + if len(emitter.events)-emitter.events_head > accumulate { + return false + } + var level int + for i := emitter.events_head; i < len(emitter.events); i++ { + switch emitter.events[i].typ { + case yaml_STREAM_START_EVENT, yaml_DOCUMENT_START_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT: + level++ + case yaml_STREAM_END_EVENT, yaml_DOCUMENT_END_EVENT, yaml_SEQUENCE_END_EVENT, yaml_MAPPING_END_EVENT: + level-- + } + if level == 0 { + return false + } + } + return true +} + +// Append a directive to the directives stack. +func yaml_emitter_append_tag_directive(emitter *yaml_emitter_t, value *yaml_tag_directive_t, allow_duplicates bool) bool { + for i := 0; i < len(emitter.tag_directives); i++ { + if bytes.Equal(value.handle, emitter.tag_directives[i].handle) { + if allow_duplicates { + return true + } + return yaml_emitter_set_emitter_error(emitter, "duplicate %TAG directive") + } + } + + // [Go] Do we actually need to copy this given garbage collection + // and the lack of deallocating destructors? + tag_copy := yaml_tag_directive_t{ + handle: make([]byte, len(value.handle)), + prefix: make([]byte, len(value.prefix)), + } + copy(tag_copy.handle, value.handle) + copy(tag_copy.prefix, value.prefix) + emitter.tag_directives = append(emitter.tag_directives, tag_copy) + return true +} + +// Increase the indentation level. +func yaml_emitter_increase_indent(emitter *yaml_emitter_t, flow, indentless bool) bool { + emitter.indents = append(emitter.indents, emitter.indent) + if emitter.indent < 0 { + if flow { + emitter.indent = emitter.best_indent + } else { + emitter.indent = 0 + } + } else if !indentless { + emitter.indent += emitter.best_indent + } + return true +} + +// State dispatcher. +func yaml_emitter_state_machine(emitter *yaml_emitter_t, event *yaml_event_t) bool { + switch emitter.state { + default: + case yaml_EMIT_STREAM_START_STATE: + return yaml_emitter_emit_stream_start(emitter, event) + + case yaml_EMIT_FIRST_DOCUMENT_START_STATE: + return yaml_emitter_emit_document_start(emitter, event, true) + + case yaml_EMIT_DOCUMENT_START_STATE: + return yaml_emitter_emit_document_start(emitter, event, false) + + case yaml_EMIT_DOCUMENT_CONTENT_STATE: + return yaml_emitter_emit_document_content(emitter, event) + + case yaml_EMIT_DOCUMENT_END_STATE: + return yaml_emitter_emit_document_end(emitter, event) + + case yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE: + return yaml_emitter_emit_flow_sequence_item(emitter, event, true) + + case yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE: + return yaml_emitter_emit_flow_sequence_item(emitter, event, false) + + case yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE: + return yaml_emitter_emit_flow_mapping_key(emitter, event, true) + + case yaml_EMIT_FLOW_MAPPING_KEY_STATE: + return yaml_emitter_emit_flow_mapping_key(emitter, event, false) + + case yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE: + return yaml_emitter_emit_flow_mapping_value(emitter, event, true) + + case yaml_EMIT_FLOW_MAPPING_VALUE_STATE: + return yaml_emitter_emit_flow_mapping_value(emitter, event, false) + + case yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE: + return yaml_emitter_emit_block_sequence_item(emitter, event, true) + + case yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE: + return yaml_emitter_emit_block_sequence_item(emitter, event, false) + + case yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE: + return yaml_emitter_emit_block_mapping_key(emitter, event, true) + + case yaml_EMIT_BLOCK_MAPPING_KEY_STATE: + return yaml_emitter_emit_block_mapping_key(emitter, event, false) + + case yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE: + return yaml_emitter_emit_block_mapping_value(emitter, event, true) + + case yaml_EMIT_BLOCK_MAPPING_VALUE_STATE: + return yaml_emitter_emit_block_mapping_value(emitter, event, false) + + case yaml_EMIT_END_STATE: + return yaml_emitter_set_emitter_error(emitter, "expected nothing after STREAM-END") + } + panic("invalid emitter state") +} + +// Expect STREAM-START. +func yaml_emitter_emit_stream_start(emitter *yaml_emitter_t, event *yaml_event_t) bool { + if event.typ != yaml_STREAM_START_EVENT { + return yaml_emitter_set_emitter_error(emitter, "expected STREAM-START") + } + if emitter.encoding == yaml_ANY_ENCODING { + emitter.encoding = event.encoding + if emitter.encoding == yaml_ANY_ENCODING { + emitter.encoding = yaml_UTF8_ENCODING + } + } + if emitter.best_indent < 2 || emitter.best_indent > 9 { + emitter.best_indent = 2 + } + if emitter.best_width >= 0 && emitter.best_width <= emitter.best_indent*2 { + emitter.best_width = 80 + } + if emitter.best_width < 0 { + emitter.best_width = 1<<31 - 1 + } + if emitter.line_break == yaml_ANY_BREAK { + emitter.line_break = yaml_LN_BREAK + } + + emitter.indent = -1 + emitter.line = 0 + emitter.column = 0 + emitter.whitespace = true + emitter.indention = true + + if emitter.encoding != yaml_UTF8_ENCODING { + if !yaml_emitter_write_bom(emitter) { + return false + } + } + emitter.state = yaml_EMIT_FIRST_DOCUMENT_START_STATE + return true +} + +// Expect DOCUMENT-START or STREAM-END. +func yaml_emitter_emit_document_start(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool { + + if event.typ == yaml_DOCUMENT_START_EVENT { + + if event.version_directive != nil { + if !yaml_emitter_analyze_version_directive(emitter, event.version_directive) { + return false + } + } + + for i := 0; i < len(event.tag_directives); i++ { + tag_directive := &event.tag_directives[i] + if !yaml_emitter_analyze_tag_directive(emitter, tag_directive) { + return false + } + if !yaml_emitter_append_tag_directive(emitter, tag_directive, false) { + return false + } + } + + for i := 0; i < len(default_tag_directives); i++ { + tag_directive := &default_tag_directives[i] + if !yaml_emitter_append_tag_directive(emitter, tag_directive, true) { + return false + } + } + + implicit := event.implicit + if !first || emitter.canonical { + implicit = false + } + + if emitter.open_ended && (event.version_directive != nil || len(event.tag_directives) > 0) { + if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) { + return false + } + if !yaml_emitter_write_indent(emitter) { + return false + } + } + + if event.version_directive != nil { + implicit = false + if !yaml_emitter_write_indicator(emitter, []byte("%YAML"), true, false, false) { + return false + } + if !yaml_emitter_write_indicator(emitter, []byte("1.1"), true, false, false) { + return false + } + if !yaml_emitter_write_indent(emitter) { + return false + } + } + + if len(event.tag_directives) > 0 { + implicit = false + for i := 0; i < len(event.tag_directives); i++ { + tag_directive := &event.tag_directives[i] + if !yaml_emitter_write_indicator(emitter, []byte("%TAG"), true, false, false) { + return false + } + if !yaml_emitter_write_tag_handle(emitter, tag_directive.handle) { + return false + } + if !yaml_emitter_write_tag_content(emitter, tag_directive.prefix, true) { + return false + } + if !yaml_emitter_write_indent(emitter) { + return false + } + } + } + + if yaml_emitter_check_empty_document(emitter) { + implicit = false + } + if !implicit { + if !yaml_emitter_write_indent(emitter) { + return false + } + if !yaml_emitter_write_indicator(emitter, []byte("---"), true, false, false) { + return false + } + if emitter.canonical { + if !yaml_emitter_write_indent(emitter) { + return false + } + } + } + + emitter.state = yaml_EMIT_DOCUMENT_CONTENT_STATE + return true + } + + if event.typ == yaml_STREAM_END_EVENT { + if emitter.open_ended { + if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) { + return false + } + if !yaml_emitter_write_indent(emitter) { + return false + } + } + if !yaml_emitter_flush(emitter) { + return false + } + emitter.state = yaml_EMIT_END_STATE + return true + } + + return yaml_emitter_set_emitter_error(emitter, "expected DOCUMENT-START or STREAM-END") +} + +// Expect the root node. +func yaml_emitter_emit_document_content(emitter *yaml_emitter_t, event *yaml_event_t) bool { + emitter.states = append(emitter.states, yaml_EMIT_DOCUMENT_END_STATE) + return yaml_emitter_emit_node(emitter, event, true, false, false, false) +} + +// Expect DOCUMENT-END. +func yaml_emitter_emit_document_end(emitter *yaml_emitter_t, event *yaml_event_t) bool { + if event.typ != yaml_DOCUMENT_END_EVENT { + return yaml_emitter_set_emitter_error(emitter, "expected DOCUMENT-END") + } + if !yaml_emitter_write_indent(emitter) { + return false + } + if !event.implicit { + // [Go] Allocate the slice elsewhere. + if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) { + return false + } + if !yaml_emitter_write_indent(emitter) { + return false + } + } + if !yaml_emitter_flush(emitter) { + return false + } + emitter.state = yaml_EMIT_DOCUMENT_START_STATE + emitter.tag_directives = emitter.tag_directives[:0] + return true +} + +// Expect a flow item node. +func yaml_emitter_emit_flow_sequence_item(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool { + if first { + if !yaml_emitter_write_indicator(emitter, []byte{'['}, true, true, false) { + return false + } + if !yaml_emitter_increase_indent(emitter, true, false) { + return false + } + emitter.flow_level++ + } + + if event.typ == yaml_SEQUENCE_END_EVENT { + emitter.flow_level-- + emitter.indent = emitter.indents[len(emitter.indents)-1] + emitter.indents = emitter.indents[:len(emitter.indents)-1] + if emitter.canonical && !first { + if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) { + return false + } + if !yaml_emitter_write_indent(emitter) { + return false + } + } + if !yaml_emitter_write_indicator(emitter, []byte{']'}, false, false, false) { + return false + } + emitter.state = emitter.states[len(emitter.states)-1] + emitter.states = emitter.states[:len(emitter.states)-1] + + return true + } + + if !first { + if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) { + return false + } + } + + if emitter.canonical || emitter.column > emitter.best_width { + if !yaml_emitter_write_indent(emitter) { + return false + } + } + emitter.states = append(emitter.states, yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE) + return yaml_emitter_emit_node(emitter, event, false, true, false, false) +} + +// Expect a flow key node. +func yaml_emitter_emit_flow_mapping_key(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool { + if first { + if !yaml_emitter_write_indicator(emitter, []byte{'{'}, true, true, false) { + return false + } + if !yaml_emitter_increase_indent(emitter, true, false) { + return false + } + emitter.flow_level++ + } + + if event.typ == yaml_MAPPING_END_EVENT { + emitter.flow_level-- + emitter.indent = emitter.indents[len(emitter.indents)-1] + emitter.indents = emitter.indents[:len(emitter.indents)-1] + if emitter.canonical && !first { + if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) { + return false + } + if !yaml_emitter_write_indent(emitter) { + return false + } + } + if !yaml_emitter_write_indicator(emitter, []byte{'}'}, false, false, false) { + return false + } + emitter.state = emitter.states[len(emitter.states)-1] + emitter.states = emitter.states[:len(emitter.states)-1] + return true + } + + if !first { + if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) { + return false + } + } + if emitter.canonical || emitter.column > emitter.best_width { + if !yaml_emitter_write_indent(emitter) { + return false + } + } + + if !emitter.canonical && yaml_emitter_check_simple_key(emitter) { + emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE) + return yaml_emitter_emit_node(emitter, event, false, false, true, true) + } + if !yaml_emitter_write_indicator(emitter, []byte{'?'}, true, false, false) { + return false + } + emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_VALUE_STATE) + return yaml_emitter_emit_node(emitter, event, false, false, true, false) +} + +// Expect a flow value node. +func yaml_emitter_emit_flow_mapping_value(emitter *yaml_emitter_t, event *yaml_event_t, simple bool) bool { + if simple { + if !yaml_emitter_write_indicator(emitter, []byte{':'}, false, false, false) { + return false + } + } else { + if emitter.canonical || emitter.column > emitter.best_width { + if !yaml_emitter_write_indent(emitter) { + return false + } + } + if !yaml_emitter_write_indicator(emitter, []byte{':'}, true, false, false) { + return false + } + } + emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_KEY_STATE) + return yaml_emitter_emit_node(emitter, event, false, false, true, false) +} + +// Expect a block item node. +func yaml_emitter_emit_block_sequence_item(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool { + if first { + if !yaml_emitter_increase_indent(emitter, false, emitter.mapping_context && !emitter.indention) { + return false + } + } + if event.typ == yaml_SEQUENCE_END_EVENT { + emitter.indent = emitter.indents[len(emitter.indents)-1] + emitter.indents = emitter.indents[:len(emitter.indents)-1] + emitter.state = emitter.states[len(emitter.states)-1] + emitter.states = emitter.states[:len(emitter.states)-1] + return true + } + if !yaml_emitter_write_indent(emitter) { + return false + } + if !yaml_emitter_write_indicator(emitter, []byte{'-'}, true, false, true) { + return false + } + emitter.states = append(emitter.states, yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE) + return yaml_emitter_emit_node(emitter, event, false, true, false, false) +} + +// Expect a block key node. +func yaml_emitter_emit_block_mapping_key(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool { + if first { + if !yaml_emitter_increase_indent(emitter, false, false) { + return false + } + } + if event.typ == yaml_MAPPING_END_EVENT { + emitter.indent = emitter.indents[len(emitter.indents)-1] + emitter.indents = emitter.indents[:len(emitter.indents)-1] + emitter.state = emitter.states[len(emitter.states)-1] + emitter.states = emitter.states[:len(emitter.states)-1] + return true + } + if !yaml_emitter_write_indent(emitter) { + return false + } + if yaml_emitter_check_simple_key(emitter) { + emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE) + return yaml_emitter_emit_node(emitter, event, false, false, true, true) + } + if !yaml_emitter_write_indicator(emitter, []byte{'?'}, true, false, true) { + return false + } + emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_VALUE_STATE) + return yaml_emitter_emit_node(emitter, event, false, false, true, false) +} + +// Expect a block value node. +func yaml_emitter_emit_block_mapping_value(emitter *yaml_emitter_t, event *yaml_event_t, simple bool) bool { + if simple { + if !yaml_emitter_write_indicator(emitter, []byte{':'}, false, false, false) { + return false + } + } else { + if !yaml_emitter_write_indent(emitter) { + return false + } + if !yaml_emitter_write_indicator(emitter, []byte{':'}, true, false, true) { + return false + } + } + emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_KEY_STATE) + return yaml_emitter_emit_node(emitter, event, false, false, true, false) +} + +// Expect a node. +func yaml_emitter_emit_node(emitter *yaml_emitter_t, event *yaml_event_t, + root bool, sequence bool, mapping bool, simple_key bool) bool { + + emitter.root_context = root + emitter.sequence_context = sequence + emitter.mapping_context = mapping + emitter.simple_key_context = simple_key + + switch event.typ { + case yaml_ALIAS_EVENT: + return yaml_emitter_emit_alias(emitter, event) + case yaml_SCALAR_EVENT: + return yaml_emitter_emit_scalar(emitter, event) + case yaml_SEQUENCE_START_EVENT: + return yaml_emitter_emit_sequence_start(emitter, event) + case yaml_MAPPING_START_EVENT: + return yaml_emitter_emit_mapping_start(emitter, event) + default: + return yaml_emitter_set_emitter_error(emitter, + fmt.Sprintf("expected SCALAR, SEQUENCE-START, MAPPING-START, or ALIAS, but got %v", event.typ)) + } +} + +// Expect ALIAS. +func yaml_emitter_emit_alias(emitter *yaml_emitter_t, event *yaml_event_t) bool { + if !yaml_emitter_process_anchor(emitter) { + return false + } + emitter.state = emitter.states[len(emitter.states)-1] + emitter.states = emitter.states[:len(emitter.states)-1] + return true +} + +// Expect SCALAR. +func yaml_emitter_emit_scalar(emitter *yaml_emitter_t, event *yaml_event_t) bool { + if !yaml_emitter_select_scalar_style(emitter, event) { + return false + } + if !yaml_emitter_process_anchor(emitter) { + return false + } + if !yaml_emitter_process_tag(emitter) { + return false + } + if !yaml_emitter_increase_indent(emitter, true, false) { + return false + } + if !yaml_emitter_process_scalar(emitter) { + return false + } + emitter.indent = emitter.indents[len(emitter.indents)-1] + emitter.indents = emitter.indents[:len(emitter.indents)-1] + emitter.state = emitter.states[len(emitter.states)-1] + emitter.states = emitter.states[:len(emitter.states)-1] + return true +} + +// Expect SEQUENCE-START. +func yaml_emitter_emit_sequence_start(emitter *yaml_emitter_t, event *yaml_event_t) bool { + if !yaml_emitter_process_anchor(emitter) { + return false + } + if !yaml_emitter_process_tag(emitter) { + return false + } + if emitter.flow_level > 0 || emitter.canonical || event.sequence_style() == yaml_FLOW_SEQUENCE_STYLE || + yaml_emitter_check_empty_sequence(emitter) { + emitter.state = yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE + } else { + emitter.state = yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE + } + return true +} + +// Expect MAPPING-START. +func yaml_emitter_emit_mapping_start(emitter *yaml_emitter_t, event *yaml_event_t) bool { + if !yaml_emitter_process_anchor(emitter) { + return false + } + if !yaml_emitter_process_tag(emitter) { + return false + } + if emitter.flow_level > 0 || emitter.canonical || event.mapping_style() == yaml_FLOW_MAPPING_STYLE || + yaml_emitter_check_empty_mapping(emitter) { + emitter.state = yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE + } else { + emitter.state = yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE + } + return true +} + +// Check if the document content is an empty scalar. +func yaml_emitter_check_empty_document(emitter *yaml_emitter_t) bool { + return false // [Go] Huh? +} + +// Check if the next events represent an empty sequence. +func yaml_emitter_check_empty_sequence(emitter *yaml_emitter_t) bool { + if len(emitter.events)-emitter.events_head < 2 { + return false + } + return emitter.events[emitter.events_head].typ == yaml_SEQUENCE_START_EVENT && + emitter.events[emitter.events_head+1].typ == yaml_SEQUENCE_END_EVENT +} + +// Check if the next events represent an empty mapping. +func yaml_emitter_check_empty_mapping(emitter *yaml_emitter_t) bool { + if len(emitter.events)-emitter.events_head < 2 { + return false + } + return emitter.events[emitter.events_head].typ == yaml_MAPPING_START_EVENT && + emitter.events[emitter.events_head+1].typ == yaml_MAPPING_END_EVENT +} + +// Check if the next node can be expressed as a simple key. +func yaml_emitter_check_simple_key(emitter *yaml_emitter_t) bool { + length := 0 + switch emitter.events[emitter.events_head].typ { + case yaml_ALIAS_EVENT: + length += len(emitter.anchor_data.anchor) + case yaml_SCALAR_EVENT: + if emitter.scalar_data.multiline { + return false + } + length += len(emitter.anchor_data.anchor) + + len(emitter.tag_data.handle) + + len(emitter.tag_data.suffix) + + len(emitter.scalar_data.value) + case yaml_SEQUENCE_START_EVENT: + if !yaml_emitter_check_empty_sequence(emitter) { + return false + } + length += len(emitter.anchor_data.anchor) + + len(emitter.tag_data.handle) + + len(emitter.tag_data.suffix) + case yaml_MAPPING_START_EVENT: + if !yaml_emitter_check_empty_mapping(emitter) { + return false + } + length += len(emitter.anchor_data.anchor) + + len(emitter.tag_data.handle) + + len(emitter.tag_data.suffix) + default: + return false + } + return length <= 128 +} + +// Determine an acceptable scalar style. +func yaml_emitter_select_scalar_style(emitter *yaml_emitter_t, event *yaml_event_t) bool { + + no_tag := len(emitter.tag_data.handle) == 0 && len(emitter.tag_data.suffix) == 0 + if no_tag && !event.implicit && !event.quoted_implicit { + return yaml_emitter_set_emitter_error(emitter, "neither tag nor implicit flags are specified") + } + + style := event.scalar_style() + if style == yaml_ANY_SCALAR_STYLE { + style = yaml_PLAIN_SCALAR_STYLE + } + if emitter.canonical { + style = yaml_DOUBLE_QUOTED_SCALAR_STYLE + } + if emitter.simple_key_context && emitter.scalar_data.multiline { + style = yaml_DOUBLE_QUOTED_SCALAR_STYLE + } + + if style == yaml_PLAIN_SCALAR_STYLE { + if emitter.flow_level > 0 && !emitter.scalar_data.flow_plain_allowed || + emitter.flow_level == 0 && !emitter.scalar_data.block_plain_allowed { + style = yaml_SINGLE_QUOTED_SCALAR_STYLE + } + if len(emitter.scalar_data.value) == 0 && (emitter.flow_level > 0 || emitter.simple_key_context) { + style = yaml_SINGLE_QUOTED_SCALAR_STYLE + } + if no_tag && !event.implicit { + style = yaml_SINGLE_QUOTED_SCALAR_STYLE + } + } + if style == yaml_SINGLE_QUOTED_SCALAR_STYLE { + if !emitter.scalar_data.single_quoted_allowed { + style = yaml_DOUBLE_QUOTED_SCALAR_STYLE + } + } + if style == yaml_LITERAL_SCALAR_STYLE || style == yaml_FOLDED_SCALAR_STYLE { + if !emitter.scalar_data.block_allowed || emitter.flow_level > 0 || emitter.simple_key_context { + style = yaml_DOUBLE_QUOTED_SCALAR_STYLE + } + } + + if no_tag && !event.quoted_implicit && style != yaml_PLAIN_SCALAR_STYLE { + emitter.tag_data.handle = []byte{'!'} + } + emitter.scalar_data.style = style + return true +} + +// Write an achor. +func yaml_emitter_process_anchor(emitter *yaml_emitter_t) bool { + if emitter.anchor_data.anchor == nil { + return true + } + c := []byte{'&'} + if emitter.anchor_data.alias { + c[0] = '*' + } + if !yaml_emitter_write_indicator(emitter, c, true, false, false) { + return false + } + return yaml_emitter_write_anchor(emitter, emitter.anchor_data.anchor) +} + +// Write a tag. +func yaml_emitter_process_tag(emitter *yaml_emitter_t) bool { + if len(emitter.tag_data.handle) == 0 && len(emitter.tag_data.suffix) == 0 { + return true + } + if len(emitter.tag_data.handle) > 0 { + if !yaml_emitter_write_tag_handle(emitter, emitter.tag_data.handle) { + return false + } + if len(emitter.tag_data.suffix) > 0 { + if !yaml_emitter_write_tag_content(emitter, emitter.tag_data.suffix, false) { + return false + } + } + } else { + // [Go] Allocate these slices elsewhere. + if !yaml_emitter_write_indicator(emitter, []byte("!<"), true, false, false) { + return false + } + if !yaml_emitter_write_tag_content(emitter, emitter.tag_data.suffix, false) { + return false + } + if !yaml_emitter_write_indicator(emitter, []byte{'>'}, false, false, false) { + return false + } + } + return true +} + +// Write a scalar. +func yaml_emitter_process_scalar(emitter *yaml_emitter_t) bool { + switch emitter.scalar_data.style { + case yaml_PLAIN_SCALAR_STYLE: + return yaml_emitter_write_plain_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context) + + case yaml_SINGLE_QUOTED_SCALAR_STYLE: + return yaml_emitter_write_single_quoted_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context) + + case yaml_DOUBLE_QUOTED_SCALAR_STYLE: + return yaml_emitter_write_double_quoted_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context) + + case yaml_LITERAL_SCALAR_STYLE: + return yaml_emitter_write_literal_scalar(emitter, emitter.scalar_data.value) + + case yaml_FOLDED_SCALAR_STYLE: + return yaml_emitter_write_folded_scalar(emitter, emitter.scalar_data.value) + } + panic("unknown scalar style") +} + +// Check if a %YAML directive is valid. +func yaml_emitter_analyze_version_directive(emitter *yaml_emitter_t, version_directive *yaml_version_directive_t) bool { + if version_directive.major != 1 || version_directive.minor != 1 { + return yaml_emitter_set_emitter_error(emitter, "incompatible %YAML directive") + } + return true +} + +// Check if a %TAG directive is valid. +func yaml_emitter_analyze_tag_directive(emitter *yaml_emitter_t, tag_directive *yaml_tag_directive_t) bool { + handle := tag_directive.handle + prefix := tag_directive.prefix + if len(handle) == 0 { + return yaml_emitter_set_emitter_error(emitter, "tag handle must not be empty") + } + if handle[0] != '!' { + return yaml_emitter_set_emitter_error(emitter, "tag handle must start with '!'") + } + if handle[len(handle)-1] != '!' { + return yaml_emitter_set_emitter_error(emitter, "tag handle must end with '!'") + } + for i := 1; i < len(handle)-1; i += width(handle[i]) { + if !is_alpha(handle, i) { + return yaml_emitter_set_emitter_error(emitter, "tag handle must contain alphanumerical characters only") + } + } + if len(prefix) == 0 { + return yaml_emitter_set_emitter_error(emitter, "tag prefix must not be empty") + } + return true +} + +// Check if an anchor is valid. +func yaml_emitter_analyze_anchor(emitter *yaml_emitter_t, anchor []byte, alias bool) bool { + if len(anchor) == 0 { + problem := "anchor value must not be empty" + if alias { + problem = "alias value must not be empty" + } + return yaml_emitter_set_emitter_error(emitter, problem) + } + for i := 0; i < len(anchor); i += width(anchor[i]) { + if !is_alpha(anchor, i) { + problem := "anchor value must contain alphanumerical characters only" + if alias { + problem = "alias value must contain alphanumerical characters only" + } + return yaml_emitter_set_emitter_error(emitter, problem) + } + } + emitter.anchor_data.anchor = anchor + emitter.anchor_data.alias = alias + return true +} + +// Check if a tag is valid. +func yaml_emitter_analyze_tag(emitter *yaml_emitter_t, tag []byte) bool { + if len(tag) == 0 { + return yaml_emitter_set_emitter_error(emitter, "tag value must not be empty") + } + for i := 0; i < len(emitter.tag_directives); i++ { + tag_directive := &emitter.tag_directives[i] + if bytes.HasPrefix(tag, tag_directive.prefix) { + emitter.tag_data.handle = tag_directive.handle + emitter.tag_data.suffix = tag[len(tag_directive.prefix):] + return true + } + } + emitter.tag_data.suffix = tag + return true +} + +// Check if a scalar is valid. +func yaml_emitter_analyze_scalar(emitter *yaml_emitter_t, value []byte) bool { + var ( + block_indicators = false + flow_indicators = false + line_breaks = false + special_characters = false + + leading_space = false + leading_break = false + trailing_space = false + trailing_break = false + break_space = false + space_break = false + + preceded_by_whitespace = false + followed_by_whitespace = false + previous_space = false + previous_break = false + ) + + emitter.scalar_data.value = value + + if len(value) == 0 { + emitter.scalar_data.multiline = false + emitter.scalar_data.flow_plain_allowed = false + emitter.scalar_data.block_plain_allowed = true + emitter.scalar_data.single_quoted_allowed = true + emitter.scalar_data.block_allowed = false + return true + } + + if len(value) >= 3 && ((value[0] == '-' && value[1] == '-' && value[2] == '-') || (value[0] == '.' && value[1] == '.' && value[2] == '.')) { + block_indicators = true + flow_indicators = true + } + + preceded_by_whitespace = true + for i, w := 0, 0; i < len(value); i += w { + w = width(value[i]) + followed_by_whitespace = i+w >= len(value) || is_blank(value, i+w) + + if i == 0 { + switch value[i] { + case '#', ',', '[', ']', '{', '}', '&', '*', '!', '|', '>', '\'', '"', '%', '@', '`': + flow_indicators = true + block_indicators = true + case '?', ':': + flow_indicators = true + if followed_by_whitespace { + block_indicators = true + } + case '-': + if followed_by_whitespace { + flow_indicators = true + block_indicators = true + } + } + } else { + switch value[i] { + case ',', '?', '[', ']', '{', '}': + flow_indicators = true + case ':': + flow_indicators = true + if followed_by_whitespace { + block_indicators = true + } + case '#': + if preceded_by_whitespace { + flow_indicators = true + block_indicators = true + } + } + } + + if !is_printable(value, i) || !is_ascii(value, i) && !emitter.unicode { + special_characters = true + } + if is_space(value, i) { + if i == 0 { + leading_space = true + } + if i+width(value[i]) == len(value) { + trailing_space = true + } + if previous_break { + break_space = true + } + previous_space = true + previous_break = false + } else if is_break(value, i) { + line_breaks = true + if i == 0 { + leading_break = true + } + if i+width(value[i]) == len(value) { + trailing_break = true + } + if previous_space { + space_break = true + } + previous_space = false + previous_break = true + } else { + previous_space = false + previous_break = false + } + + // [Go]: Why 'z'? Couldn't be the end of the string as that's the loop condition. + preceded_by_whitespace = is_blankz(value, i) + } + + emitter.scalar_data.multiline = line_breaks + emitter.scalar_data.flow_plain_allowed = true + emitter.scalar_data.block_plain_allowed = true + emitter.scalar_data.single_quoted_allowed = true + emitter.scalar_data.block_allowed = true + + if leading_space || leading_break || trailing_space || trailing_break { + emitter.scalar_data.flow_plain_allowed = false + emitter.scalar_data.block_plain_allowed = false + } + if trailing_space { + emitter.scalar_data.block_allowed = false + } + if break_space { + emitter.scalar_data.flow_plain_allowed = false + emitter.scalar_data.block_plain_allowed = false + emitter.scalar_data.single_quoted_allowed = false + } + if space_break || special_characters { + emitter.scalar_data.flow_plain_allowed = false + emitter.scalar_data.block_plain_allowed = false + emitter.scalar_data.single_quoted_allowed = false + emitter.scalar_data.block_allowed = false + } + if line_breaks { + emitter.scalar_data.flow_plain_allowed = false + emitter.scalar_data.block_plain_allowed = false + } + if flow_indicators { + emitter.scalar_data.flow_plain_allowed = false + } + if block_indicators { + emitter.scalar_data.block_plain_allowed = false + } + return true +} + +// Check if the event data is valid. +func yaml_emitter_analyze_event(emitter *yaml_emitter_t, event *yaml_event_t) bool { + + emitter.anchor_data.anchor = nil + emitter.tag_data.handle = nil + emitter.tag_data.suffix = nil + emitter.scalar_data.value = nil + + switch event.typ { + case yaml_ALIAS_EVENT: + if !yaml_emitter_analyze_anchor(emitter, event.anchor, true) { + return false + } + + case yaml_SCALAR_EVENT: + if len(event.anchor) > 0 { + if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) { + return false + } + } + if len(event.tag) > 0 && (emitter.canonical || (!event.implicit && !event.quoted_implicit)) { + if !yaml_emitter_analyze_tag(emitter, event.tag) { + return false + } + } + if !yaml_emitter_analyze_scalar(emitter, event.value) { + return false + } + + case yaml_SEQUENCE_START_EVENT: + if len(event.anchor) > 0 { + if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) { + return false + } + } + if len(event.tag) > 0 && (emitter.canonical || !event.implicit) { + if !yaml_emitter_analyze_tag(emitter, event.tag) { + return false + } + } + + case yaml_MAPPING_START_EVENT: + if len(event.anchor) > 0 { + if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) { + return false + } + } + if len(event.tag) > 0 && (emitter.canonical || !event.implicit) { + if !yaml_emitter_analyze_tag(emitter, event.tag) { + return false + } + } + } + return true +} + +// Write the BOM character. +func yaml_emitter_write_bom(emitter *yaml_emitter_t) bool { + if !flush(emitter) { + return false + } + pos := emitter.buffer_pos + emitter.buffer[pos+0] = '\xEF' + emitter.buffer[pos+1] = '\xBB' + emitter.buffer[pos+2] = '\xBF' + emitter.buffer_pos += 3 + return true +} + +func yaml_emitter_write_indent(emitter *yaml_emitter_t) bool { + indent := emitter.indent + if indent < 0 { + indent = 0 + } + if !emitter.indention || emitter.column > indent || (emitter.column == indent && !emitter.whitespace) { + if !put_break(emitter) { + return false + } + } + for emitter.column < indent { + if !put(emitter, ' ') { + return false + } + } + emitter.whitespace = true + emitter.indention = true + return true +} + +func yaml_emitter_write_indicator(emitter *yaml_emitter_t, indicator []byte, need_whitespace, is_whitespace, is_indention bool) bool { + if need_whitespace && !emitter.whitespace { + if !put(emitter, ' ') { + return false + } + } + if !write_all(emitter, indicator) { + return false + } + emitter.whitespace = is_whitespace + emitter.indention = (emitter.indention && is_indention) + emitter.open_ended = false + return true +} + +func yaml_emitter_write_anchor(emitter *yaml_emitter_t, value []byte) bool { + if !write_all(emitter, value) { + return false + } + emitter.whitespace = false + emitter.indention = false + return true +} + +func yaml_emitter_write_tag_handle(emitter *yaml_emitter_t, value []byte) bool { + if !emitter.whitespace { + if !put(emitter, ' ') { + return false + } + } + if !write_all(emitter, value) { + return false + } + emitter.whitespace = false + emitter.indention = false + return true +} + +func yaml_emitter_write_tag_content(emitter *yaml_emitter_t, value []byte, need_whitespace bool) bool { + if need_whitespace && !emitter.whitespace { + if !put(emitter, ' ') { + return false + } + } + for i := 0; i < len(value); { + var must_write bool + switch value[i] { + case ';', '/', '?', ':', '@', '&', '=', '+', '$', ',', '_', '.', '~', '*', '\'', '(', ')', '[', ']': + must_write = true + default: + must_write = is_alpha(value, i) + } + if must_write { + if !write(emitter, value, &i) { + return false + } + } else { + w := width(value[i]) + for k := 0; k < w; k++ { + octet := value[i] + i++ + if !put(emitter, '%') { + return false + } + + c := octet >> 4 + if c < 10 { + c += '0' + } else { + c += 'A' - 10 + } + if !put(emitter, c) { + return false + } + + c = octet & 0x0f + if c < 10 { + c += '0' + } else { + c += 'A' - 10 + } + if !put(emitter, c) { + return false + } + } + } + } + emitter.whitespace = false + emitter.indention = false + return true +} + +func yaml_emitter_write_plain_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool { + if !emitter.whitespace { + if !put(emitter, ' ') { + return false + } + } + + spaces := false + breaks := false + for i := 0; i < len(value); { + if is_space(value, i) { + if allow_breaks && !spaces && emitter.column > emitter.best_width && !is_space(value, i+1) { + if !yaml_emitter_write_indent(emitter) { + return false + } + i += width(value[i]) + } else { + if !write(emitter, value, &i) { + return false + } + } + spaces = true + } else if is_break(value, i) { + if !breaks && value[i] == '\n' { + if !put_break(emitter) { + return false + } + } + if !write_break(emitter, value, &i) { + return false + } + emitter.indention = true + breaks = true + } else { + if breaks { + if !yaml_emitter_write_indent(emitter) { + return false + } + } + if !write(emitter, value, &i) { + return false + } + emitter.indention = false + spaces = false + breaks = false + } + } + + emitter.whitespace = false + emitter.indention = false + if emitter.root_context { + emitter.open_ended = true + } + + return true +} + +func yaml_emitter_write_single_quoted_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool { + + if !yaml_emitter_write_indicator(emitter, []byte{'\''}, true, false, false) { + return false + } + + spaces := false + breaks := false + for i := 0; i < len(value); { + if is_space(value, i) { + if allow_breaks && !spaces && emitter.column > emitter.best_width && i > 0 && i < len(value)-1 && !is_space(value, i+1) { + if !yaml_emitter_write_indent(emitter) { + return false + } + i += width(value[i]) + } else { + if !write(emitter, value, &i) { + return false + } + } + spaces = true + } else if is_break(value, i) { + if !breaks && value[i] == '\n' { + if !put_break(emitter) { + return false + } + } + if !write_break(emitter, value, &i) { + return false + } + emitter.indention = true + breaks = true + } else { + if breaks { + if !yaml_emitter_write_indent(emitter) { + return false + } + } + if value[i] == '\'' { + if !put(emitter, '\'') { + return false + } + } + if !write(emitter, value, &i) { + return false + } + emitter.indention = false + spaces = false + breaks = false + } + } + if !yaml_emitter_write_indicator(emitter, []byte{'\''}, false, false, false) { + return false + } + emitter.whitespace = false + emitter.indention = false + return true +} + +func yaml_emitter_write_double_quoted_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool { + spaces := false + if !yaml_emitter_write_indicator(emitter, []byte{'"'}, true, false, false) { + return false + } + + for i := 0; i < len(value); { + if !is_printable(value, i) || (!emitter.unicode && !is_ascii(value, i)) || + is_bom(value, i) || is_break(value, i) || + value[i] == '"' || value[i] == '\\' { + + octet := value[i] + + var w int + var v rune + switch { + case octet&0x80 == 0x00: + w, v = 1, rune(octet&0x7F) + case octet&0xE0 == 0xC0: + w, v = 2, rune(octet&0x1F) + case octet&0xF0 == 0xE0: + w, v = 3, rune(octet&0x0F) + case octet&0xF8 == 0xF0: + w, v = 4, rune(octet&0x07) + } + for k := 1; k < w; k++ { + octet = value[i+k] + v = (v << 6) + (rune(octet) & 0x3F) + } + i += w + + if !put(emitter, '\\') { + return false + } + + var ok bool + switch v { + case 0x00: + ok = put(emitter, '0') + case 0x07: + ok = put(emitter, 'a') + case 0x08: + ok = put(emitter, 'b') + case 0x09: + ok = put(emitter, 't') + case 0x0A: + ok = put(emitter, 'n') + case 0x0b: + ok = put(emitter, 'v') + case 0x0c: + ok = put(emitter, 'f') + case 0x0d: + ok = put(emitter, 'r') + case 0x1b: + ok = put(emitter, 'e') + case 0x22: + ok = put(emitter, '"') + case 0x5c: + ok = put(emitter, '\\') + case 0x85: + ok = put(emitter, 'N') + case 0xA0: + ok = put(emitter, '_') + case 0x2028: + ok = put(emitter, 'L') + case 0x2029: + ok = put(emitter, 'P') + default: + if v <= 0xFF { + ok = put(emitter, 'x') + w = 2 + } else if v <= 0xFFFF { + ok = put(emitter, 'u') + w = 4 + } else { + ok = put(emitter, 'U') + w = 8 + } + for k := (w - 1) * 4; ok && k >= 0; k -= 4 { + digit := byte((v >> uint(k)) & 0x0F) + if digit < 10 { + ok = put(emitter, digit+'0') + } else { + ok = put(emitter, digit+'A'-10) + } + } + } + if !ok { + return false + } + spaces = false + } else if is_space(value, i) { + if allow_breaks && !spaces && emitter.column > emitter.best_width && i > 0 && i < len(value)-1 { + if !yaml_emitter_write_indent(emitter) { + return false + } + if is_space(value, i+1) { + if !put(emitter, '\\') { + return false + } + } + i += width(value[i]) + } else if !write(emitter, value, &i) { + return false + } + spaces = true + } else { + if !write(emitter, value, &i) { + return false + } + spaces = false + } + } + if !yaml_emitter_write_indicator(emitter, []byte{'"'}, false, false, false) { + return false + } + emitter.whitespace = false + emitter.indention = false + return true +} + +func yaml_emitter_write_block_scalar_hints(emitter *yaml_emitter_t, value []byte) bool { + if is_space(value, 0) || is_break(value, 0) { + indent_hint := []byte{'0' + byte(emitter.best_indent)} + if !yaml_emitter_write_indicator(emitter, indent_hint, false, false, false) { + return false + } + } + + emitter.open_ended = false + + var chomp_hint [1]byte + if len(value) == 0 { + chomp_hint[0] = '-' + } else { + i := len(value) - 1 + for value[i]&0xC0 == 0x80 { + i-- + } + if !is_break(value, i) { + chomp_hint[0] = '-' + } else if i == 0 { + chomp_hint[0] = '+' + emitter.open_ended = true + } else { + i-- + for value[i]&0xC0 == 0x80 { + i-- + } + if is_break(value, i) { + chomp_hint[0] = '+' + emitter.open_ended = true + } + } + } + if chomp_hint[0] != 0 { + if !yaml_emitter_write_indicator(emitter, chomp_hint[:], false, false, false) { + return false + } + } + return true +} + +func yaml_emitter_write_literal_scalar(emitter *yaml_emitter_t, value []byte) bool { + if !yaml_emitter_write_indicator(emitter, []byte{'|'}, true, false, false) { + return false + } + if !yaml_emitter_write_block_scalar_hints(emitter, value) { + return false + } + if !put_break(emitter) { + return false + } + emitter.indention = true + emitter.whitespace = true + breaks := true + for i := 0; i < len(value); { + if is_break(value, i) { + if !write_break(emitter, value, &i) { + return false + } + emitter.indention = true + breaks = true + } else { + if breaks { + if !yaml_emitter_write_indent(emitter) { + return false + } + } + if !write(emitter, value, &i) { + return false + } + emitter.indention = false + breaks = false + } + } + + return true +} + +func yaml_emitter_write_folded_scalar(emitter *yaml_emitter_t, value []byte) bool { + if !yaml_emitter_write_indicator(emitter, []byte{'>'}, true, false, false) { + return false + } + if !yaml_emitter_write_block_scalar_hints(emitter, value) { + return false + } + + if !put_break(emitter) { + return false + } + emitter.indention = true + emitter.whitespace = true + + breaks := true + leading_spaces := true + for i := 0; i < len(value); { + if is_break(value, i) { + if !breaks && !leading_spaces && value[i] == '\n' { + k := 0 + for is_break(value, k) { + k += width(value[k]) + } + if !is_blankz(value, k) { + if !put_break(emitter) { + return false + } + } + } + if !write_break(emitter, value, &i) { + return false + } + emitter.indention = true + breaks = true + } else { + if breaks { + if !yaml_emitter_write_indent(emitter) { + return false + } + leading_spaces = is_blank(value, i) + } + if !breaks && is_space(value, i) && !is_space(value, i+1) && emitter.column > emitter.best_width { + if !yaml_emitter_write_indent(emitter) { + return false + } + i += width(value[i]) + } else { + if !write(emitter, value, &i) { + return false + } + } + emitter.indention = false + breaks = false + } + } + return true +} diff --git a/vendor/gopkg.in/yaml.v2/encode.go b/vendor/gopkg.in/yaml.v2/encode.go new file mode 100644 index 000000000000..1e730eff6a82 --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/encode.go @@ -0,0 +1,358 @@ +package yaml + +import ( + "encoding" + "fmt" + "io" + "reflect" + "regexp" + "sort" + "strconv" + "strings" + "time" + "unicode/utf8" +) + +type encoder struct { + emitter yaml_emitter_t + event yaml_event_t + out []byte + flow bool + // doneInit holds whether the initial stream_start_event has been + // emitted. + doneInit bool +} + +func newEncoder() *encoder { + e := &encoder{} + yaml_emitter_initialize(&e.emitter) + yaml_emitter_set_output_string(&e.emitter, &e.out) + yaml_emitter_set_unicode(&e.emitter, true) + return e +} + +func newEncoderWithWriter(w io.Writer) *encoder { + e := &encoder{} + yaml_emitter_initialize(&e.emitter) + yaml_emitter_set_output_writer(&e.emitter, w) + yaml_emitter_set_unicode(&e.emitter, true) + return e +} + +func (e *encoder) init() { + if e.doneInit { + return + } + yaml_stream_start_event_initialize(&e.event, yaml_UTF8_ENCODING) + e.emit() + e.doneInit = true +} + +func (e *encoder) finish() { + e.emitter.open_ended = false + yaml_stream_end_event_initialize(&e.event) + e.emit() +} + +func (e *encoder) destroy() { + yaml_emitter_delete(&e.emitter) +} + +func (e *encoder) emit() { + // This will internally delete the e.event value. + e.must(yaml_emitter_emit(&e.emitter, &e.event)) +} + +func (e *encoder) must(ok bool) { + if !ok { + msg := e.emitter.problem + if msg == "" { + msg = "unknown problem generating YAML content" + } + failf("%s", msg) + } +} + +func (e *encoder) marshalDoc(tag string, in reflect.Value) { + e.init() + yaml_document_start_event_initialize(&e.event, nil, nil, true) + e.emit() + e.marshal(tag, in) + yaml_document_end_event_initialize(&e.event, true) + e.emit() +} + +func (e *encoder) marshal(tag string, in reflect.Value) { + if !in.IsValid() || in.Kind() == reflect.Ptr && in.IsNil() { + e.nilv() + return + } + iface := in.Interface() + switch m := iface.(type) { + case time.Time, *time.Time: + // Although time.Time implements TextMarshaler, + // we don't want to treat it as a string for YAML + // purposes because YAML has special support for + // timestamps. + case Marshaler: + v, err := m.MarshalYAML() + if err != nil { + fail(err) + } + if v == nil { + e.nilv() + return + } + in = reflect.ValueOf(v) + case encoding.TextMarshaler: + text, err := m.MarshalText() + if err != nil { + fail(err) + } + in = reflect.ValueOf(string(text)) + case nil: + e.nilv() + return + } + switch in.Kind() { + case reflect.Interface: + e.marshal(tag, in.Elem()) + case reflect.Map: + e.mapv(tag, in) + case reflect.Ptr: + if in.Type() == ptrTimeType { + e.timev(tag, in.Elem()) + } else { + e.marshal(tag, in.Elem()) + } + case reflect.Struct: + if in.Type() == timeType { + e.timev(tag, in) + } else { + e.structv(tag, in) + } + case reflect.Slice: + if in.Type().Elem() == mapItemType { + e.itemsv(tag, in) + } else { + e.slicev(tag, in) + } + case reflect.String: + e.stringv(tag, in) + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + if in.Type() == durationType { + e.stringv(tag, reflect.ValueOf(iface.(time.Duration).String())) + } else { + e.intv(tag, in) + } + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: + e.uintv(tag, in) + case reflect.Float32, reflect.Float64: + e.floatv(tag, in) + case reflect.Bool: + e.boolv(tag, in) + default: + panic("cannot marshal type: " + in.Type().String()) + } +} + +func (e *encoder) mapv(tag string, in reflect.Value) { + e.mappingv(tag, func() { + keys := keyList(in.MapKeys()) + sort.Sort(keys) + for _, k := range keys { + e.marshal("", k) + e.marshal("", in.MapIndex(k)) + } + }) +} + +func (e *encoder) itemsv(tag string, in reflect.Value) { + e.mappingv(tag, func() { + slice := in.Convert(reflect.TypeOf([]MapItem{})).Interface().([]MapItem) + for _, item := range slice { + e.marshal("", reflect.ValueOf(item.Key)) + e.marshal("", reflect.ValueOf(item.Value)) + } + }) +} + +func (e *encoder) structv(tag string, in reflect.Value) { + sinfo, err := getStructInfo(in.Type()) + if err != nil { + panic(err) + } + e.mappingv(tag, func() { + for _, info := range sinfo.FieldsList { + var value reflect.Value + if info.Inline == nil { + value = in.Field(info.Num) + } else { + value = in.FieldByIndex(info.Inline) + } + if info.OmitEmpty && isZero(value) { + continue + } + e.marshal("", reflect.ValueOf(info.Key)) + e.flow = info.Flow + e.marshal("", value) + } + if sinfo.InlineMap >= 0 { + m := in.Field(sinfo.InlineMap) + if m.Len() > 0 { + e.flow = false + keys := keyList(m.MapKeys()) + sort.Sort(keys) + for _, k := range keys { + if _, found := sinfo.FieldsMap[k.String()]; found { + panic(fmt.Sprintf("Can't have key %q in inlined map; conflicts with struct field", k.String())) + } + e.marshal("", k) + e.flow = false + e.marshal("", m.MapIndex(k)) + } + } + } + }) +} + +func (e *encoder) mappingv(tag string, f func()) { + implicit := tag == "" + style := yaml_BLOCK_MAPPING_STYLE + if e.flow { + e.flow = false + style = yaml_FLOW_MAPPING_STYLE + } + yaml_mapping_start_event_initialize(&e.event, nil, []byte(tag), implicit, style) + e.emit() + f() + yaml_mapping_end_event_initialize(&e.event) + e.emit() +} + +func (e *encoder) slicev(tag string, in reflect.Value) { + implicit := tag == "" + style := yaml_BLOCK_SEQUENCE_STYLE + if e.flow { + e.flow = false + style = yaml_FLOW_SEQUENCE_STYLE + } + e.must(yaml_sequence_start_event_initialize(&e.event, nil, []byte(tag), implicit, style)) + e.emit() + n := in.Len() + for i := 0; i < n; i++ { + e.marshal("", in.Index(i)) + } + e.must(yaml_sequence_end_event_initialize(&e.event)) + e.emit() +} + +// isBase60 returns whether s is in base 60 notation as defined in YAML 1.1. +// +// The base 60 float notation in YAML 1.1 is a terrible idea and is unsupported +// in YAML 1.2 and by this package, but these should be marshalled quoted for +// the time being for compatibility with other parsers. +func isBase60Float(s string) (result bool) { + // Fast path. + if s == "" { + return false + } + c := s[0] + if !(c == '+' || c == '-' || c >= '0' && c <= '9') || strings.IndexByte(s, ':') < 0 { + return false + } + // Do the full match. + return base60float.MatchString(s) +} + +// From http://yaml.org/type/float.html, except the regular expression there +// is bogus. In practice parsers do not enforce the "\.[0-9_]*" suffix. +var base60float = regexp.MustCompile(`^[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+(?:\.[0-9_]*)?$`) + +func (e *encoder) stringv(tag string, in reflect.Value) { + var style yaml_scalar_style_t + s := in.String() + canUsePlain := true + switch { + case !utf8.ValidString(s): + if tag == yaml_BINARY_TAG { + failf("explicitly tagged !!binary data must be base64-encoded") + } + if tag != "" { + failf("cannot marshal invalid UTF-8 data as %s", shortTag(tag)) + } + // It can't be encoded directly as YAML so use a binary tag + // and encode it as base64. + tag = yaml_BINARY_TAG + s = encodeBase64(s) + case tag == "": + // Check to see if it would resolve to a specific + // tag when encoded unquoted. If it doesn't, + // there's no need to quote it. + rtag, _ := resolve("", s) + canUsePlain = rtag == yaml_STR_TAG && !isBase60Float(s) + } + // Note: it's possible for user code to emit invalid YAML + // if they explicitly specify a tag and a string containing + // text that's incompatible with that tag. + switch { + case strings.Contains(s, "\n"): + style = yaml_LITERAL_SCALAR_STYLE + case canUsePlain: + style = yaml_PLAIN_SCALAR_STYLE + default: + style = yaml_DOUBLE_QUOTED_SCALAR_STYLE + } + e.emitScalar(s, "", tag, style) +} + +func (e *encoder) boolv(tag string, in reflect.Value) { + var s string + if in.Bool() { + s = "true" + } else { + s = "false" + } + e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE) +} + +func (e *encoder) intv(tag string, in reflect.Value) { + s := strconv.FormatInt(in.Int(), 10) + e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE) +} + +func (e *encoder) uintv(tag string, in reflect.Value) { + s := strconv.FormatUint(in.Uint(), 10) + e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE) +} + +func (e *encoder) timev(tag string, in reflect.Value) { + t := in.Interface().(time.Time) + if tag == "" { + tag = yaml_TIMESTAMP_TAG + } + e.emitScalar(t.Format(time.RFC3339Nano), "", tag, yaml_PLAIN_SCALAR_STYLE) +} + +func (e *encoder) floatv(tag string, in reflect.Value) { + s := strconv.FormatFloat(in.Float(), 'g', -1, 64) + switch s { + case "+Inf": + s = ".inf" + case "-Inf": + s = "-.inf" + case "NaN": + s = ".nan" + } + e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE) +} + +func (e *encoder) nilv() { + e.emitScalar("null", "", "", yaml_PLAIN_SCALAR_STYLE) +} + +func (e *encoder) emitScalar(value, anchor, tag string, style yaml_scalar_style_t) { + implicit := tag == "" + e.must(yaml_scalar_event_initialize(&e.event, []byte(anchor), []byte(tag), []byte(value), implicit, implicit, style)) + e.emit() +} diff --git a/vendor/gopkg.in/yaml.v2/go.mod b/vendor/gopkg.in/yaml.v2/go.mod new file mode 100644 index 000000000000..1934e8769450 --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/go.mod @@ -0,0 +1,5 @@ +module "gopkg.in/yaml.v2" + +require ( + "gopkg.in/check.v1" v0.0.0-20161208181325-20d25e280405 +) diff --git a/vendor/gopkg.in/yaml.v2/parserc.go b/vendor/gopkg.in/yaml.v2/parserc.go new file mode 100644 index 000000000000..81d05dfe573f --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/parserc.go @@ -0,0 +1,1095 @@ +package yaml + +import ( + "bytes" +) + +// The parser implements the following grammar: +// +// stream ::= STREAM-START implicit_document? explicit_document* STREAM-END +// implicit_document ::= block_node DOCUMENT-END* +// explicit_document ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END* +// block_node_or_indentless_sequence ::= +// ALIAS +// | properties (block_content | indentless_block_sequence)? +// | block_content +// | indentless_block_sequence +// block_node ::= ALIAS +// | properties block_content? +// | block_content +// flow_node ::= ALIAS +// | properties flow_content? +// | flow_content +// properties ::= TAG ANCHOR? | ANCHOR TAG? +// block_content ::= block_collection | flow_collection | SCALAR +// flow_content ::= flow_collection | SCALAR +// block_collection ::= block_sequence | block_mapping +// flow_collection ::= flow_sequence | flow_mapping +// block_sequence ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END +// indentless_sequence ::= (BLOCK-ENTRY block_node?)+ +// block_mapping ::= BLOCK-MAPPING_START +// ((KEY block_node_or_indentless_sequence?)? +// (VALUE block_node_or_indentless_sequence?)?)* +// BLOCK-END +// flow_sequence ::= FLOW-SEQUENCE-START +// (flow_sequence_entry FLOW-ENTRY)* +// flow_sequence_entry? +// FLOW-SEQUENCE-END +// flow_sequence_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)? +// flow_mapping ::= FLOW-MAPPING-START +// (flow_mapping_entry FLOW-ENTRY)* +// flow_mapping_entry? +// FLOW-MAPPING-END +// flow_mapping_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)? + +// Peek the next token in the token queue. +func peek_token(parser *yaml_parser_t) *yaml_token_t { + if parser.token_available || yaml_parser_fetch_more_tokens(parser) { + return &parser.tokens[parser.tokens_head] + } + return nil +} + +// Remove the next token from the queue (must be called after peek_token). +func skip_token(parser *yaml_parser_t) { + parser.token_available = false + parser.tokens_parsed++ + parser.stream_end_produced = parser.tokens[parser.tokens_head].typ == yaml_STREAM_END_TOKEN + parser.tokens_head++ +} + +// Get the next event. +func yaml_parser_parse(parser *yaml_parser_t, event *yaml_event_t) bool { + // Erase the event object. + *event = yaml_event_t{} + + // No events after the end of the stream or error. + if parser.stream_end_produced || parser.error != yaml_NO_ERROR || parser.state == yaml_PARSE_END_STATE { + return true + } + + // Generate the next event. + return yaml_parser_state_machine(parser, event) +} + +// Set parser error. +func yaml_parser_set_parser_error(parser *yaml_parser_t, problem string, problem_mark yaml_mark_t) bool { + parser.error = yaml_PARSER_ERROR + parser.problem = problem + parser.problem_mark = problem_mark + return false +} + +func yaml_parser_set_parser_error_context(parser *yaml_parser_t, context string, context_mark yaml_mark_t, problem string, problem_mark yaml_mark_t) bool { + parser.error = yaml_PARSER_ERROR + parser.context = context + parser.context_mark = context_mark + parser.problem = problem + parser.problem_mark = problem_mark + return false +} + +// State dispatcher. +func yaml_parser_state_machine(parser *yaml_parser_t, event *yaml_event_t) bool { + //trace("yaml_parser_state_machine", "state:", parser.state.String()) + + switch parser.state { + case yaml_PARSE_STREAM_START_STATE: + return yaml_parser_parse_stream_start(parser, event) + + case yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE: + return yaml_parser_parse_document_start(parser, event, true) + + case yaml_PARSE_DOCUMENT_START_STATE: + return yaml_parser_parse_document_start(parser, event, false) + + case yaml_PARSE_DOCUMENT_CONTENT_STATE: + return yaml_parser_parse_document_content(parser, event) + + case yaml_PARSE_DOCUMENT_END_STATE: + return yaml_parser_parse_document_end(parser, event) + + case yaml_PARSE_BLOCK_NODE_STATE: + return yaml_parser_parse_node(parser, event, true, false) + + case yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE: + return yaml_parser_parse_node(parser, event, true, true) + + case yaml_PARSE_FLOW_NODE_STATE: + return yaml_parser_parse_node(parser, event, false, false) + + case yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE: + return yaml_parser_parse_block_sequence_entry(parser, event, true) + + case yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE: + return yaml_parser_parse_block_sequence_entry(parser, event, false) + + case yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE: + return yaml_parser_parse_indentless_sequence_entry(parser, event) + + case yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE: + return yaml_parser_parse_block_mapping_key(parser, event, true) + + case yaml_PARSE_BLOCK_MAPPING_KEY_STATE: + return yaml_parser_parse_block_mapping_key(parser, event, false) + + case yaml_PARSE_BLOCK_MAPPING_VALUE_STATE: + return yaml_parser_parse_block_mapping_value(parser, event) + + case yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE: + return yaml_parser_parse_flow_sequence_entry(parser, event, true) + + case yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE: + return yaml_parser_parse_flow_sequence_entry(parser, event, false) + + case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE: + return yaml_parser_parse_flow_sequence_entry_mapping_key(parser, event) + + case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE: + return yaml_parser_parse_flow_sequence_entry_mapping_value(parser, event) + + case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE: + return yaml_parser_parse_flow_sequence_entry_mapping_end(parser, event) + + case yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE: + return yaml_parser_parse_flow_mapping_key(parser, event, true) + + case yaml_PARSE_FLOW_MAPPING_KEY_STATE: + return yaml_parser_parse_flow_mapping_key(parser, event, false) + + case yaml_PARSE_FLOW_MAPPING_VALUE_STATE: + return yaml_parser_parse_flow_mapping_value(parser, event, false) + + case yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE: + return yaml_parser_parse_flow_mapping_value(parser, event, true) + + default: + panic("invalid parser state") + } +} + +// Parse the production: +// stream ::= STREAM-START implicit_document? explicit_document* STREAM-END +// ************ +func yaml_parser_parse_stream_start(parser *yaml_parser_t, event *yaml_event_t) bool { + token := peek_token(parser) + if token == nil { + return false + } + if token.typ != yaml_STREAM_START_TOKEN { + return yaml_parser_set_parser_error(parser, "did not find expected ", token.start_mark) + } + parser.state = yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE + *event = yaml_event_t{ + typ: yaml_STREAM_START_EVENT, + start_mark: token.start_mark, + end_mark: token.end_mark, + encoding: token.encoding, + } + skip_token(parser) + return true +} + +// Parse the productions: +// implicit_document ::= block_node DOCUMENT-END* +// * +// explicit_document ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END* +// ************************* +func yaml_parser_parse_document_start(parser *yaml_parser_t, event *yaml_event_t, implicit bool) bool { + + token := peek_token(parser) + if token == nil { + return false + } + + // Parse extra document end indicators. + if !implicit { + for token.typ == yaml_DOCUMENT_END_TOKEN { + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + } + } + + if implicit && token.typ != yaml_VERSION_DIRECTIVE_TOKEN && + token.typ != yaml_TAG_DIRECTIVE_TOKEN && + token.typ != yaml_DOCUMENT_START_TOKEN && + token.typ != yaml_STREAM_END_TOKEN { + // Parse an implicit document. + if !yaml_parser_process_directives(parser, nil, nil) { + return false + } + parser.states = append(parser.states, yaml_PARSE_DOCUMENT_END_STATE) + parser.state = yaml_PARSE_BLOCK_NODE_STATE + + *event = yaml_event_t{ + typ: yaml_DOCUMENT_START_EVENT, + start_mark: token.start_mark, + end_mark: token.end_mark, + } + + } else if token.typ != yaml_STREAM_END_TOKEN { + // Parse an explicit document. + var version_directive *yaml_version_directive_t + var tag_directives []yaml_tag_directive_t + start_mark := token.start_mark + if !yaml_parser_process_directives(parser, &version_directive, &tag_directives) { + return false + } + token = peek_token(parser) + if token == nil { + return false + } + if token.typ != yaml_DOCUMENT_START_TOKEN { + yaml_parser_set_parser_error(parser, + "did not find expected ", token.start_mark) + return false + } + parser.states = append(parser.states, yaml_PARSE_DOCUMENT_END_STATE) + parser.state = yaml_PARSE_DOCUMENT_CONTENT_STATE + end_mark := token.end_mark + + *event = yaml_event_t{ + typ: yaml_DOCUMENT_START_EVENT, + start_mark: start_mark, + end_mark: end_mark, + version_directive: version_directive, + tag_directives: tag_directives, + implicit: false, + } + skip_token(parser) + + } else { + // Parse the stream end. + parser.state = yaml_PARSE_END_STATE + *event = yaml_event_t{ + typ: yaml_STREAM_END_EVENT, + start_mark: token.start_mark, + end_mark: token.end_mark, + } + skip_token(parser) + } + + return true +} + +// Parse the productions: +// explicit_document ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END* +// *********** +// +func yaml_parser_parse_document_content(parser *yaml_parser_t, event *yaml_event_t) bool { + token := peek_token(parser) + if token == nil { + return false + } + if token.typ == yaml_VERSION_DIRECTIVE_TOKEN || + token.typ == yaml_TAG_DIRECTIVE_TOKEN || + token.typ == yaml_DOCUMENT_START_TOKEN || + token.typ == yaml_DOCUMENT_END_TOKEN || + token.typ == yaml_STREAM_END_TOKEN { + parser.state = parser.states[len(parser.states)-1] + parser.states = parser.states[:len(parser.states)-1] + return yaml_parser_process_empty_scalar(parser, event, + token.start_mark) + } + return yaml_parser_parse_node(parser, event, true, false) +} + +// Parse the productions: +// implicit_document ::= block_node DOCUMENT-END* +// ************* +// explicit_document ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END* +// +func yaml_parser_parse_document_end(parser *yaml_parser_t, event *yaml_event_t) bool { + token := peek_token(parser) + if token == nil { + return false + } + + start_mark := token.start_mark + end_mark := token.start_mark + + implicit := true + if token.typ == yaml_DOCUMENT_END_TOKEN { + end_mark = token.end_mark + skip_token(parser) + implicit = false + } + + parser.tag_directives = parser.tag_directives[:0] + + parser.state = yaml_PARSE_DOCUMENT_START_STATE + *event = yaml_event_t{ + typ: yaml_DOCUMENT_END_EVENT, + start_mark: start_mark, + end_mark: end_mark, + implicit: implicit, + } + return true +} + +// Parse the productions: +// block_node_or_indentless_sequence ::= +// ALIAS +// ***** +// | properties (block_content | indentless_block_sequence)? +// ********** * +// | block_content | indentless_block_sequence +// * +// block_node ::= ALIAS +// ***** +// | properties block_content? +// ********** * +// | block_content +// * +// flow_node ::= ALIAS +// ***** +// | properties flow_content? +// ********** * +// | flow_content +// * +// properties ::= TAG ANCHOR? | ANCHOR TAG? +// ************************* +// block_content ::= block_collection | flow_collection | SCALAR +// ****** +// flow_content ::= flow_collection | SCALAR +// ****** +func yaml_parser_parse_node(parser *yaml_parser_t, event *yaml_event_t, block, indentless_sequence bool) bool { + //defer trace("yaml_parser_parse_node", "block:", block, "indentless_sequence:", indentless_sequence)() + + token := peek_token(parser) + if token == nil { + return false + } + + if token.typ == yaml_ALIAS_TOKEN { + parser.state = parser.states[len(parser.states)-1] + parser.states = parser.states[:len(parser.states)-1] + *event = yaml_event_t{ + typ: yaml_ALIAS_EVENT, + start_mark: token.start_mark, + end_mark: token.end_mark, + anchor: token.value, + } + skip_token(parser) + return true + } + + start_mark := token.start_mark + end_mark := token.start_mark + + var tag_token bool + var tag_handle, tag_suffix, anchor []byte + var tag_mark yaml_mark_t + if token.typ == yaml_ANCHOR_TOKEN { + anchor = token.value + start_mark = token.start_mark + end_mark = token.end_mark + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + if token.typ == yaml_TAG_TOKEN { + tag_token = true + tag_handle = token.value + tag_suffix = token.suffix + tag_mark = token.start_mark + end_mark = token.end_mark + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + } + } else if token.typ == yaml_TAG_TOKEN { + tag_token = true + tag_handle = token.value + tag_suffix = token.suffix + start_mark = token.start_mark + tag_mark = token.start_mark + end_mark = token.end_mark + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + if token.typ == yaml_ANCHOR_TOKEN { + anchor = token.value + end_mark = token.end_mark + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + } + } + + var tag []byte + if tag_token { + if len(tag_handle) == 0 { + tag = tag_suffix + tag_suffix = nil + } else { + for i := range parser.tag_directives { + if bytes.Equal(parser.tag_directives[i].handle, tag_handle) { + tag = append([]byte(nil), parser.tag_directives[i].prefix...) + tag = append(tag, tag_suffix...) + break + } + } + if len(tag) == 0 { + yaml_parser_set_parser_error_context(parser, + "while parsing a node", start_mark, + "found undefined tag handle", tag_mark) + return false + } + } + } + + implicit := len(tag) == 0 + if indentless_sequence && token.typ == yaml_BLOCK_ENTRY_TOKEN { + end_mark = token.end_mark + parser.state = yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE + *event = yaml_event_t{ + typ: yaml_SEQUENCE_START_EVENT, + start_mark: start_mark, + end_mark: end_mark, + anchor: anchor, + tag: tag, + implicit: implicit, + style: yaml_style_t(yaml_BLOCK_SEQUENCE_STYLE), + } + return true + } + if token.typ == yaml_SCALAR_TOKEN { + var plain_implicit, quoted_implicit bool + end_mark = token.end_mark + if (len(tag) == 0 && token.style == yaml_PLAIN_SCALAR_STYLE) || (len(tag) == 1 && tag[0] == '!') { + plain_implicit = true + } else if len(tag) == 0 { + quoted_implicit = true + } + parser.state = parser.states[len(parser.states)-1] + parser.states = parser.states[:len(parser.states)-1] + + *event = yaml_event_t{ + typ: yaml_SCALAR_EVENT, + start_mark: start_mark, + end_mark: end_mark, + anchor: anchor, + tag: tag, + value: token.value, + implicit: plain_implicit, + quoted_implicit: quoted_implicit, + style: yaml_style_t(token.style), + } + skip_token(parser) + return true + } + if token.typ == yaml_FLOW_SEQUENCE_START_TOKEN { + // [Go] Some of the events below can be merged as they differ only on style. + end_mark = token.end_mark + parser.state = yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE + *event = yaml_event_t{ + typ: yaml_SEQUENCE_START_EVENT, + start_mark: start_mark, + end_mark: end_mark, + anchor: anchor, + tag: tag, + implicit: implicit, + style: yaml_style_t(yaml_FLOW_SEQUENCE_STYLE), + } + return true + } + if token.typ == yaml_FLOW_MAPPING_START_TOKEN { + end_mark = token.end_mark + parser.state = yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE + *event = yaml_event_t{ + typ: yaml_MAPPING_START_EVENT, + start_mark: start_mark, + end_mark: end_mark, + anchor: anchor, + tag: tag, + implicit: implicit, + style: yaml_style_t(yaml_FLOW_MAPPING_STYLE), + } + return true + } + if block && token.typ == yaml_BLOCK_SEQUENCE_START_TOKEN { + end_mark = token.end_mark + parser.state = yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE + *event = yaml_event_t{ + typ: yaml_SEQUENCE_START_EVENT, + start_mark: start_mark, + end_mark: end_mark, + anchor: anchor, + tag: tag, + implicit: implicit, + style: yaml_style_t(yaml_BLOCK_SEQUENCE_STYLE), + } + return true + } + if block && token.typ == yaml_BLOCK_MAPPING_START_TOKEN { + end_mark = token.end_mark + parser.state = yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE + *event = yaml_event_t{ + typ: yaml_MAPPING_START_EVENT, + start_mark: start_mark, + end_mark: end_mark, + anchor: anchor, + tag: tag, + implicit: implicit, + style: yaml_style_t(yaml_BLOCK_MAPPING_STYLE), + } + return true + } + if len(anchor) > 0 || len(tag) > 0 { + parser.state = parser.states[len(parser.states)-1] + parser.states = parser.states[:len(parser.states)-1] + + *event = yaml_event_t{ + typ: yaml_SCALAR_EVENT, + start_mark: start_mark, + end_mark: end_mark, + anchor: anchor, + tag: tag, + implicit: implicit, + quoted_implicit: false, + style: yaml_style_t(yaml_PLAIN_SCALAR_STYLE), + } + return true + } + + context := "while parsing a flow node" + if block { + context = "while parsing a block node" + } + yaml_parser_set_parser_error_context(parser, context, start_mark, + "did not find expected node content", token.start_mark) + return false +} + +// Parse the productions: +// block_sequence ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END +// ******************** *********** * ********* +// +func yaml_parser_parse_block_sequence_entry(parser *yaml_parser_t, event *yaml_event_t, first bool) bool { + if first { + token := peek_token(parser) + parser.marks = append(parser.marks, token.start_mark) + skip_token(parser) + } + + token := peek_token(parser) + if token == nil { + return false + } + + if token.typ == yaml_BLOCK_ENTRY_TOKEN { + mark := token.end_mark + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + if token.typ != yaml_BLOCK_ENTRY_TOKEN && token.typ != yaml_BLOCK_END_TOKEN { + parser.states = append(parser.states, yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE) + return yaml_parser_parse_node(parser, event, true, false) + } else { + parser.state = yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE + return yaml_parser_process_empty_scalar(parser, event, mark) + } + } + if token.typ == yaml_BLOCK_END_TOKEN { + parser.state = parser.states[len(parser.states)-1] + parser.states = parser.states[:len(parser.states)-1] + parser.marks = parser.marks[:len(parser.marks)-1] + + *event = yaml_event_t{ + typ: yaml_SEQUENCE_END_EVENT, + start_mark: token.start_mark, + end_mark: token.end_mark, + } + + skip_token(parser) + return true + } + + context_mark := parser.marks[len(parser.marks)-1] + parser.marks = parser.marks[:len(parser.marks)-1] + return yaml_parser_set_parser_error_context(parser, + "while parsing a block collection", context_mark, + "did not find expected '-' indicator", token.start_mark) +} + +// Parse the productions: +// indentless_sequence ::= (BLOCK-ENTRY block_node?)+ +// *********** * +func yaml_parser_parse_indentless_sequence_entry(parser *yaml_parser_t, event *yaml_event_t) bool { + token := peek_token(parser) + if token == nil { + return false + } + + if token.typ == yaml_BLOCK_ENTRY_TOKEN { + mark := token.end_mark + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + if token.typ != yaml_BLOCK_ENTRY_TOKEN && + token.typ != yaml_KEY_TOKEN && + token.typ != yaml_VALUE_TOKEN && + token.typ != yaml_BLOCK_END_TOKEN { + parser.states = append(parser.states, yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE) + return yaml_parser_parse_node(parser, event, true, false) + } + parser.state = yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE + return yaml_parser_process_empty_scalar(parser, event, mark) + } + parser.state = parser.states[len(parser.states)-1] + parser.states = parser.states[:len(parser.states)-1] + + *event = yaml_event_t{ + typ: yaml_SEQUENCE_END_EVENT, + start_mark: token.start_mark, + end_mark: token.start_mark, // [Go] Shouldn't this be token.end_mark? + } + return true +} + +// Parse the productions: +// block_mapping ::= BLOCK-MAPPING_START +// ******************* +// ((KEY block_node_or_indentless_sequence?)? +// *** * +// (VALUE block_node_or_indentless_sequence?)?)* +// +// BLOCK-END +// ********* +// +func yaml_parser_parse_block_mapping_key(parser *yaml_parser_t, event *yaml_event_t, first bool) bool { + if first { + token := peek_token(parser) + parser.marks = append(parser.marks, token.start_mark) + skip_token(parser) + } + + token := peek_token(parser) + if token == nil { + return false + } + + if token.typ == yaml_KEY_TOKEN { + mark := token.end_mark + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + if token.typ != yaml_KEY_TOKEN && + token.typ != yaml_VALUE_TOKEN && + token.typ != yaml_BLOCK_END_TOKEN { + parser.states = append(parser.states, yaml_PARSE_BLOCK_MAPPING_VALUE_STATE) + return yaml_parser_parse_node(parser, event, true, true) + } else { + parser.state = yaml_PARSE_BLOCK_MAPPING_VALUE_STATE + return yaml_parser_process_empty_scalar(parser, event, mark) + } + } else if token.typ == yaml_BLOCK_END_TOKEN { + parser.state = parser.states[len(parser.states)-1] + parser.states = parser.states[:len(parser.states)-1] + parser.marks = parser.marks[:len(parser.marks)-1] + *event = yaml_event_t{ + typ: yaml_MAPPING_END_EVENT, + start_mark: token.start_mark, + end_mark: token.end_mark, + } + skip_token(parser) + return true + } + + context_mark := parser.marks[len(parser.marks)-1] + parser.marks = parser.marks[:len(parser.marks)-1] + return yaml_parser_set_parser_error_context(parser, + "while parsing a block mapping", context_mark, + "did not find expected key", token.start_mark) +} + +// Parse the productions: +// block_mapping ::= BLOCK-MAPPING_START +// +// ((KEY block_node_or_indentless_sequence?)? +// +// (VALUE block_node_or_indentless_sequence?)?)* +// ***** * +// BLOCK-END +// +// +func yaml_parser_parse_block_mapping_value(parser *yaml_parser_t, event *yaml_event_t) bool { + token := peek_token(parser) + if token == nil { + return false + } + if token.typ == yaml_VALUE_TOKEN { + mark := token.end_mark + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + if token.typ != yaml_KEY_TOKEN && + token.typ != yaml_VALUE_TOKEN && + token.typ != yaml_BLOCK_END_TOKEN { + parser.states = append(parser.states, yaml_PARSE_BLOCK_MAPPING_KEY_STATE) + return yaml_parser_parse_node(parser, event, true, true) + } + parser.state = yaml_PARSE_BLOCK_MAPPING_KEY_STATE + return yaml_parser_process_empty_scalar(parser, event, mark) + } + parser.state = yaml_PARSE_BLOCK_MAPPING_KEY_STATE + return yaml_parser_process_empty_scalar(parser, event, token.start_mark) +} + +// Parse the productions: +// flow_sequence ::= FLOW-SEQUENCE-START +// ******************* +// (flow_sequence_entry FLOW-ENTRY)* +// * ********** +// flow_sequence_entry? +// * +// FLOW-SEQUENCE-END +// ***************** +// flow_sequence_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)? +// * +// +func yaml_parser_parse_flow_sequence_entry(parser *yaml_parser_t, event *yaml_event_t, first bool) bool { + if first { + token := peek_token(parser) + parser.marks = append(parser.marks, token.start_mark) + skip_token(parser) + } + token := peek_token(parser) + if token == nil { + return false + } + if token.typ != yaml_FLOW_SEQUENCE_END_TOKEN { + if !first { + if token.typ == yaml_FLOW_ENTRY_TOKEN { + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + } else { + context_mark := parser.marks[len(parser.marks)-1] + parser.marks = parser.marks[:len(parser.marks)-1] + return yaml_parser_set_parser_error_context(parser, + "while parsing a flow sequence", context_mark, + "did not find expected ',' or ']'", token.start_mark) + } + } + + if token.typ == yaml_KEY_TOKEN { + parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE + *event = yaml_event_t{ + typ: yaml_MAPPING_START_EVENT, + start_mark: token.start_mark, + end_mark: token.end_mark, + implicit: true, + style: yaml_style_t(yaml_FLOW_MAPPING_STYLE), + } + skip_token(parser) + return true + } else if token.typ != yaml_FLOW_SEQUENCE_END_TOKEN { + parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE) + return yaml_parser_parse_node(parser, event, false, false) + } + } + + parser.state = parser.states[len(parser.states)-1] + parser.states = parser.states[:len(parser.states)-1] + parser.marks = parser.marks[:len(parser.marks)-1] + + *event = yaml_event_t{ + typ: yaml_SEQUENCE_END_EVENT, + start_mark: token.start_mark, + end_mark: token.end_mark, + } + + skip_token(parser) + return true +} + +// +// Parse the productions: +// flow_sequence_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)? +// *** * +// +func yaml_parser_parse_flow_sequence_entry_mapping_key(parser *yaml_parser_t, event *yaml_event_t) bool { + token := peek_token(parser) + if token == nil { + return false + } + if token.typ != yaml_VALUE_TOKEN && + token.typ != yaml_FLOW_ENTRY_TOKEN && + token.typ != yaml_FLOW_SEQUENCE_END_TOKEN { + parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE) + return yaml_parser_parse_node(parser, event, false, false) + } + mark := token.end_mark + skip_token(parser) + parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE + return yaml_parser_process_empty_scalar(parser, event, mark) +} + +// Parse the productions: +// flow_sequence_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)? +// ***** * +// +func yaml_parser_parse_flow_sequence_entry_mapping_value(parser *yaml_parser_t, event *yaml_event_t) bool { + token := peek_token(parser) + if token == nil { + return false + } + if token.typ == yaml_VALUE_TOKEN { + skip_token(parser) + token := peek_token(parser) + if token == nil { + return false + } + if token.typ != yaml_FLOW_ENTRY_TOKEN && token.typ != yaml_FLOW_SEQUENCE_END_TOKEN { + parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE) + return yaml_parser_parse_node(parser, event, false, false) + } + } + parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE + return yaml_parser_process_empty_scalar(parser, event, token.start_mark) +} + +// Parse the productions: +// flow_sequence_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)? +// * +// +func yaml_parser_parse_flow_sequence_entry_mapping_end(parser *yaml_parser_t, event *yaml_event_t) bool { + token := peek_token(parser) + if token == nil { + return false + } + parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE + *event = yaml_event_t{ + typ: yaml_MAPPING_END_EVENT, + start_mark: token.start_mark, + end_mark: token.start_mark, // [Go] Shouldn't this be end_mark? + } + return true +} + +// Parse the productions: +// flow_mapping ::= FLOW-MAPPING-START +// ****************** +// (flow_mapping_entry FLOW-ENTRY)* +// * ********** +// flow_mapping_entry? +// ****************** +// FLOW-MAPPING-END +// **************** +// flow_mapping_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)? +// * *** * +// +func yaml_parser_parse_flow_mapping_key(parser *yaml_parser_t, event *yaml_event_t, first bool) bool { + if first { + token := peek_token(parser) + parser.marks = append(parser.marks, token.start_mark) + skip_token(parser) + } + + token := peek_token(parser) + if token == nil { + return false + } + + if token.typ != yaml_FLOW_MAPPING_END_TOKEN { + if !first { + if token.typ == yaml_FLOW_ENTRY_TOKEN { + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + } else { + context_mark := parser.marks[len(parser.marks)-1] + parser.marks = parser.marks[:len(parser.marks)-1] + return yaml_parser_set_parser_error_context(parser, + "while parsing a flow mapping", context_mark, + "did not find expected ',' or '}'", token.start_mark) + } + } + + if token.typ == yaml_KEY_TOKEN { + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + if token.typ != yaml_VALUE_TOKEN && + token.typ != yaml_FLOW_ENTRY_TOKEN && + token.typ != yaml_FLOW_MAPPING_END_TOKEN { + parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_VALUE_STATE) + return yaml_parser_parse_node(parser, event, false, false) + } else { + parser.state = yaml_PARSE_FLOW_MAPPING_VALUE_STATE + return yaml_parser_process_empty_scalar(parser, event, token.start_mark) + } + } else if token.typ != yaml_FLOW_MAPPING_END_TOKEN { + parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE) + return yaml_parser_parse_node(parser, event, false, false) + } + } + + parser.state = parser.states[len(parser.states)-1] + parser.states = parser.states[:len(parser.states)-1] + parser.marks = parser.marks[:len(parser.marks)-1] + *event = yaml_event_t{ + typ: yaml_MAPPING_END_EVENT, + start_mark: token.start_mark, + end_mark: token.end_mark, + } + skip_token(parser) + return true +} + +// Parse the productions: +// flow_mapping_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)? +// * ***** * +// +func yaml_parser_parse_flow_mapping_value(parser *yaml_parser_t, event *yaml_event_t, empty bool) bool { + token := peek_token(parser) + if token == nil { + return false + } + if empty { + parser.state = yaml_PARSE_FLOW_MAPPING_KEY_STATE + return yaml_parser_process_empty_scalar(parser, event, token.start_mark) + } + if token.typ == yaml_VALUE_TOKEN { + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + if token.typ != yaml_FLOW_ENTRY_TOKEN && token.typ != yaml_FLOW_MAPPING_END_TOKEN { + parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_KEY_STATE) + return yaml_parser_parse_node(parser, event, false, false) + } + } + parser.state = yaml_PARSE_FLOW_MAPPING_KEY_STATE + return yaml_parser_process_empty_scalar(parser, event, token.start_mark) +} + +// Generate an empty scalar event. +func yaml_parser_process_empty_scalar(parser *yaml_parser_t, event *yaml_event_t, mark yaml_mark_t) bool { + *event = yaml_event_t{ + typ: yaml_SCALAR_EVENT, + start_mark: mark, + end_mark: mark, + value: nil, // Empty + implicit: true, + style: yaml_style_t(yaml_PLAIN_SCALAR_STYLE), + } + return true +} + +var default_tag_directives = []yaml_tag_directive_t{ + {[]byte("!"), []byte("!")}, + {[]byte("!!"), []byte("tag:yaml.org,2002:")}, +} + +// Parse directives. +func yaml_parser_process_directives(parser *yaml_parser_t, + version_directive_ref **yaml_version_directive_t, + tag_directives_ref *[]yaml_tag_directive_t) bool { + + var version_directive *yaml_version_directive_t + var tag_directives []yaml_tag_directive_t + + token := peek_token(parser) + if token == nil { + return false + } + + for token.typ == yaml_VERSION_DIRECTIVE_TOKEN || token.typ == yaml_TAG_DIRECTIVE_TOKEN { + if token.typ == yaml_VERSION_DIRECTIVE_TOKEN { + if version_directive != nil { + yaml_parser_set_parser_error(parser, + "found duplicate %YAML directive", token.start_mark) + return false + } + if token.major != 1 || token.minor != 1 { + yaml_parser_set_parser_error(parser, + "found incompatible YAML document", token.start_mark) + return false + } + version_directive = &yaml_version_directive_t{ + major: token.major, + minor: token.minor, + } + } else if token.typ == yaml_TAG_DIRECTIVE_TOKEN { + value := yaml_tag_directive_t{ + handle: token.value, + prefix: token.prefix, + } + if !yaml_parser_append_tag_directive(parser, value, false, token.start_mark) { + return false + } + tag_directives = append(tag_directives, value) + } + + skip_token(parser) + token = peek_token(parser) + if token == nil { + return false + } + } + + for i := range default_tag_directives { + if !yaml_parser_append_tag_directive(parser, default_tag_directives[i], true, token.start_mark) { + return false + } + } + + if version_directive_ref != nil { + *version_directive_ref = version_directive + } + if tag_directives_ref != nil { + *tag_directives_ref = tag_directives + } + return true +} + +// Append a tag directive to the directives stack. +func yaml_parser_append_tag_directive(parser *yaml_parser_t, value yaml_tag_directive_t, allow_duplicates bool, mark yaml_mark_t) bool { + for i := range parser.tag_directives { + if bytes.Equal(value.handle, parser.tag_directives[i].handle) { + if allow_duplicates { + return true + } + return yaml_parser_set_parser_error(parser, "found duplicate %TAG directive", mark) + } + } + + // [Go] I suspect the copy is unnecessary. This was likely done + // because there was no way to track ownership of the data. + value_copy := yaml_tag_directive_t{ + handle: make([]byte, len(value.handle)), + prefix: make([]byte, len(value.prefix)), + } + copy(value_copy.handle, value.handle) + copy(value_copy.prefix, value.prefix) + parser.tag_directives = append(parser.tag_directives, value_copy) + return true +} diff --git a/vendor/gopkg.in/yaml.v2/readerc.go b/vendor/gopkg.in/yaml.v2/readerc.go new file mode 100644 index 000000000000..f450791717bf --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/readerc.go @@ -0,0 +1,394 @@ +package yaml + +import ( + "io" +) + +// Set the reader error and return 0. +func yaml_parser_set_reader_error(parser *yaml_parser_t, problem string, offset int, value int) bool { + parser.error = yaml_READER_ERROR + parser.problem = problem + parser.problem_offset = offset + parser.problem_value = value + return false +} + +// Byte order marks. +const ( + bom_UTF8 = "\xef\xbb\xbf" + bom_UTF16LE = "\xff\xfe" + bom_UTF16BE = "\xfe\xff" +) + +// Determine the input stream encoding by checking the BOM symbol. If no BOM is +// found, the UTF-8 encoding is assumed. Return 1 on success, 0 on failure. +func yaml_parser_determine_encoding(parser *yaml_parser_t) bool { + // Ensure that we had enough bytes in the raw buffer. + for !parser.eof && len(parser.raw_buffer)-parser.raw_buffer_pos < 3 { + if !yaml_parser_update_raw_buffer(parser) { + return false + } + } + + // Determine the encoding. + buf := parser.raw_buffer + pos := parser.raw_buffer_pos + avail := len(buf) - pos + if avail >= 2 && buf[pos] == bom_UTF16LE[0] && buf[pos+1] == bom_UTF16LE[1] { + parser.encoding = yaml_UTF16LE_ENCODING + parser.raw_buffer_pos += 2 + parser.offset += 2 + } else if avail >= 2 && buf[pos] == bom_UTF16BE[0] && buf[pos+1] == bom_UTF16BE[1] { + parser.encoding = yaml_UTF16BE_ENCODING + parser.raw_buffer_pos += 2 + parser.offset += 2 + } else if avail >= 3 && buf[pos] == bom_UTF8[0] && buf[pos+1] == bom_UTF8[1] && buf[pos+2] == bom_UTF8[2] { + parser.encoding = yaml_UTF8_ENCODING + parser.raw_buffer_pos += 3 + parser.offset += 3 + } else { + parser.encoding = yaml_UTF8_ENCODING + } + return true +} + +// Update the raw buffer. +func yaml_parser_update_raw_buffer(parser *yaml_parser_t) bool { + size_read := 0 + + // Return if the raw buffer is full. + if parser.raw_buffer_pos == 0 && len(parser.raw_buffer) == cap(parser.raw_buffer) { + return true + } + + // Return on EOF. + if parser.eof { + return true + } + + // Move the remaining bytes in the raw buffer to the beginning. + if parser.raw_buffer_pos > 0 && parser.raw_buffer_pos < len(parser.raw_buffer) { + copy(parser.raw_buffer, parser.raw_buffer[parser.raw_buffer_pos:]) + } + parser.raw_buffer = parser.raw_buffer[:len(parser.raw_buffer)-parser.raw_buffer_pos] + parser.raw_buffer_pos = 0 + + // Call the read handler to fill the buffer. + size_read, err := parser.read_handler(parser, parser.raw_buffer[len(parser.raw_buffer):cap(parser.raw_buffer)]) + parser.raw_buffer = parser.raw_buffer[:len(parser.raw_buffer)+size_read] + if err == io.EOF { + parser.eof = true + } else if err != nil { + return yaml_parser_set_reader_error(parser, "input error: "+err.Error(), parser.offset, -1) + } + return true +} + +// Ensure that the buffer contains at least `length` characters. +// Return true on success, false on failure. +// +// The length is supposed to be significantly less that the buffer size. +func yaml_parser_update_buffer(parser *yaml_parser_t, length int) bool { + if parser.read_handler == nil { + panic("read handler must be set") + } + + // If the EOF flag is set and the raw buffer is empty, do nothing. + if parser.eof && parser.raw_buffer_pos == len(parser.raw_buffer) { + return true + } + + // Return if the buffer contains enough characters. + if parser.unread >= length { + return true + } + + // Determine the input encoding if it is not known yet. + if parser.encoding == yaml_ANY_ENCODING { + if !yaml_parser_determine_encoding(parser) { + return false + } + } + + // Move the unread characters to the beginning of the buffer. + buffer_len := len(parser.buffer) + if parser.buffer_pos > 0 && parser.buffer_pos < buffer_len { + copy(parser.buffer, parser.buffer[parser.buffer_pos:]) + buffer_len -= parser.buffer_pos + parser.buffer_pos = 0 + } else if parser.buffer_pos == buffer_len { + buffer_len = 0 + parser.buffer_pos = 0 + } + + // Open the whole buffer for writing, and cut it before returning. + parser.buffer = parser.buffer[:cap(parser.buffer)] + + // Fill the buffer until it has enough characters. + first := true + for parser.unread < length { + + // Fill the raw buffer if necessary. + if !first || parser.raw_buffer_pos == len(parser.raw_buffer) { + if !yaml_parser_update_raw_buffer(parser) { + parser.buffer = parser.buffer[:buffer_len] + return false + } + } + first = false + + // Decode the raw buffer. + inner: + for parser.raw_buffer_pos != len(parser.raw_buffer) { + var value rune + var width int + + raw_unread := len(parser.raw_buffer) - parser.raw_buffer_pos + + // Decode the next character. + switch parser.encoding { + case yaml_UTF8_ENCODING: + // Decode a UTF-8 character. Check RFC 3629 + // (http://www.ietf.org/rfc/rfc3629.txt) for more details. + // + // The following table (taken from the RFC) is used for + // decoding. + // + // Char. number range | UTF-8 octet sequence + // (hexadecimal) | (binary) + // --------------------+------------------------------------ + // 0000 0000-0000 007F | 0xxxxxxx + // 0000 0080-0000 07FF | 110xxxxx 10xxxxxx + // 0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx + // 0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx + // + // Additionally, the characters in the range 0xD800-0xDFFF + // are prohibited as they are reserved for use with UTF-16 + // surrogate pairs. + + // Determine the length of the UTF-8 sequence. + octet := parser.raw_buffer[parser.raw_buffer_pos] + switch { + case octet&0x80 == 0x00: + width = 1 + case octet&0xE0 == 0xC0: + width = 2 + case octet&0xF0 == 0xE0: + width = 3 + case octet&0xF8 == 0xF0: + width = 4 + default: + // The leading octet is invalid. + return yaml_parser_set_reader_error(parser, + "invalid leading UTF-8 octet", + parser.offset, int(octet)) + } + + // Check if the raw buffer contains an incomplete character. + if width > raw_unread { + if parser.eof { + return yaml_parser_set_reader_error(parser, + "incomplete UTF-8 octet sequence", + parser.offset, -1) + } + break inner + } + + // Decode the leading octet. + switch { + case octet&0x80 == 0x00: + value = rune(octet & 0x7F) + case octet&0xE0 == 0xC0: + value = rune(octet & 0x1F) + case octet&0xF0 == 0xE0: + value = rune(octet & 0x0F) + case octet&0xF8 == 0xF0: + value = rune(octet & 0x07) + default: + value = 0 + } + + // Check and decode the trailing octets. + for k := 1; k < width; k++ { + octet = parser.raw_buffer[parser.raw_buffer_pos+k] + + // Check if the octet is valid. + if (octet & 0xC0) != 0x80 { + return yaml_parser_set_reader_error(parser, + "invalid trailing UTF-8 octet", + parser.offset+k, int(octet)) + } + + // Decode the octet. + value = (value << 6) + rune(octet&0x3F) + } + + // Check the length of the sequence against the value. + switch { + case width == 1: + case width == 2 && value >= 0x80: + case width == 3 && value >= 0x800: + case width == 4 && value >= 0x10000: + default: + return yaml_parser_set_reader_error(parser, + "invalid length of a UTF-8 sequence", + parser.offset, -1) + } + + // Check the range of the value. + if value >= 0xD800 && value <= 0xDFFF || value > 0x10FFFF { + return yaml_parser_set_reader_error(parser, + "invalid Unicode character", + parser.offset, int(value)) + } + + case yaml_UTF16LE_ENCODING, yaml_UTF16BE_ENCODING: + var low, high int + if parser.encoding == yaml_UTF16LE_ENCODING { + low, high = 0, 1 + } else { + low, high = 1, 0 + } + + // The UTF-16 encoding is not as simple as one might + // naively think. Check RFC 2781 + // (http://www.ietf.org/rfc/rfc2781.txt). + // + // Normally, two subsequent bytes describe a Unicode + // character. However a special technique (called a + // surrogate pair) is used for specifying character + // values larger than 0xFFFF. + // + // A surrogate pair consists of two pseudo-characters: + // high surrogate area (0xD800-0xDBFF) + // low surrogate area (0xDC00-0xDFFF) + // + // The following formulas are used for decoding + // and encoding characters using surrogate pairs: + // + // U = U' + 0x10000 (0x01 00 00 <= U <= 0x10 FF FF) + // U' = yyyyyyyyyyxxxxxxxxxx (0 <= U' <= 0x0F FF FF) + // W1 = 110110yyyyyyyyyy + // W2 = 110111xxxxxxxxxx + // + // where U is the character value, W1 is the high surrogate + // area, W2 is the low surrogate area. + + // Check for incomplete UTF-16 character. + if raw_unread < 2 { + if parser.eof { + return yaml_parser_set_reader_error(parser, + "incomplete UTF-16 character", + parser.offset, -1) + } + break inner + } + + // Get the character. + value = rune(parser.raw_buffer[parser.raw_buffer_pos+low]) + + (rune(parser.raw_buffer[parser.raw_buffer_pos+high]) << 8) + + // Check for unexpected low surrogate area. + if value&0xFC00 == 0xDC00 { + return yaml_parser_set_reader_error(parser, + "unexpected low surrogate area", + parser.offset, int(value)) + } + + // Check for a high surrogate area. + if value&0xFC00 == 0xD800 { + width = 4 + + // Check for incomplete surrogate pair. + if raw_unread < 4 { + if parser.eof { + return yaml_parser_set_reader_error(parser, + "incomplete UTF-16 surrogate pair", + parser.offset, -1) + } + break inner + } + + // Get the next character. + value2 := rune(parser.raw_buffer[parser.raw_buffer_pos+low+2]) + + (rune(parser.raw_buffer[parser.raw_buffer_pos+high+2]) << 8) + + // Check for a low surrogate area. + if value2&0xFC00 != 0xDC00 { + return yaml_parser_set_reader_error(parser, + "expected low surrogate area", + parser.offset+2, int(value2)) + } + + // Generate the value of the surrogate pair. + value = 0x10000 + ((value & 0x3FF) << 10) + (value2 & 0x3FF) + } else { + width = 2 + } + + default: + panic("impossible") + } + + // Check if the character is in the allowed range: + // #x9 | #xA | #xD | [#x20-#x7E] (8 bit) + // | #x85 | [#xA0-#xD7FF] | [#xE000-#xFFFD] (16 bit) + // | [#x10000-#x10FFFF] (32 bit) + switch { + case value == 0x09: + case value == 0x0A: + case value == 0x0D: + case value >= 0x20 && value <= 0x7E: + case value == 0x85: + case value >= 0xA0 && value <= 0xD7FF: + case value >= 0xE000 && value <= 0xFFFD: + case value >= 0x10000 && value <= 0x10FFFF: + default: + return yaml_parser_set_reader_error(parser, + "control characters are not allowed", + parser.offset, int(value)) + } + + // Move the raw pointers. + parser.raw_buffer_pos += width + parser.offset += width + + // Finally put the character into the buffer. + if value <= 0x7F { + // 0000 0000-0000 007F . 0xxxxxxx + parser.buffer[buffer_len+0] = byte(value) + buffer_len += 1 + } else if value <= 0x7FF { + // 0000 0080-0000 07FF . 110xxxxx 10xxxxxx + parser.buffer[buffer_len+0] = byte(0xC0 + (value >> 6)) + parser.buffer[buffer_len+1] = byte(0x80 + (value & 0x3F)) + buffer_len += 2 + } else if value <= 0xFFFF { + // 0000 0800-0000 FFFF . 1110xxxx 10xxxxxx 10xxxxxx + parser.buffer[buffer_len+0] = byte(0xE0 + (value >> 12)) + parser.buffer[buffer_len+1] = byte(0x80 + ((value >> 6) & 0x3F)) + parser.buffer[buffer_len+2] = byte(0x80 + (value & 0x3F)) + buffer_len += 3 + } else { + // 0001 0000-0010 FFFF . 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx + parser.buffer[buffer_len+0] = byte(0xF0 + (value >> 18)) + parser.buffer[buffer_len+1] = byte(0x80 + ((value >> 12) & 0x3F)) + parser.buffer[buffer_len+2] = byte(0x80 + ((value >> 6) & 0x3F)) + parser.buffer[buffer_len+3] = byte(0x80 + (value & 0x3F)) + buffer_len += 4 + } + + parser.unread++ + } + + // On EOF, put NUL into the buffer and return. + if parser.eof { + parser.buffer[buffer_len] = 0 + buffer_len++ + parser.unread++ + break + } + } + parser.buffer = parser.buffer[:buffer_len] + return true +} diff --git a/vendor/gopkg.in/yaml.v2/resolve.go b/vendor/gopkg.in/yaml.v2/resolve.go new file mode 100644 index 000000000000..ea90bd5e0dea --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/resolve.go @@ -0,0 +1,245 @@ +package yaml + +import ( + "encoding/base64" + "math" + "regexp" + "strconv" + "strings" + "time" +) + +type resolveMapItem struct { + value interface{} + tag string +} + +var resolveTable = make([]byte, 256) +var resolveMap = make(map[string]resolveMapItem) + +func init() { + t := resolveTable + t[int('+')] = 'S' // Sign + t[int('-')] = 'S' + for _, c := range "0123456789" { + t[int(c)] = 'D' // Digit + } + for _, c := range "yYnNtTfFoO~" { + t[int(c)] = 'M' // In map + } + t[int('.')] = '.' // Float (potentially in map) + + var resolveMapList = []struct { + v interface{} + tag string + l []string + }{ + {true, yaml_BOOL_TAG, []string{"y", "Y", "yes", "Yes", "YES"}}, + {true, yaml_BOOL_TAG, []string{"true", "True", "TRUE"}}, + {true, yaml_BOOL_TAG, []string{"on", "On", "ON"}}, + {false, yaml_BOOL_TAG, []string{"n", "N", "no", "No", "NO"}}, + {false, yaml_BOOL_TAG, []string{"false", "False", "FALSE"}}, + {false, yaml_BOOL_TAG, []string{"off", "Off", "OFF"}}, + {nil, yaml_NULL_TAG, []string{"", "~", "null", "Null", "NULL"}}, + {math.NaN(), yaml_FLOAT_TAG, []string{".nan", ".NaN", ".NAN"}}, + {math.Inf(+1), yaml_FLOAT_TAG, []string{".inf", ".Inf", ".INF"}}, + {math.Inf(+1), yaml_FLOAT_TAG, []string{"+.inf", "+.Inf", "+.INF"}}, + {math.Inf(-1), yaml_FLOAT_TAG, []string{"-.inf", "-.Inf", "-.INF"}}, + {"<<", yaml_MERGE_TAG, []string{"<<"}}, + } + + m := resolveMap + for _, item := range resolveMapList { + for _, s := range item.l { + m[s] = resolveMapItem{item.v, item.tag} + } + } +} + +const longTagPrefix = "tag:yaml.org,2002:" + +func shortTag(tag string) string { + // TODO This can easily be made faster and produce less garbage. + if strings.HasPrefix(tag, longTagPrefix) { + return "!!" + tag[len(longTagPrefix):] + } + return tag +} + +func longTag(tag string) string { + if strings.HasPrefix(tag, "!!") { + return longTagPrefix + tag[2:] + } + return tag +} + +func resolvableTag(tag string) bool { + switch tag { + case "", yaml_STR_TAG, yaml_BOOL_TAG, yaml_INT_TAG, yaml_FLOAT_TAG, yaml_NULL_TAG, yaml_TIMESTAMP_TAG: + return true + } + return false +} + +var yamlStyleFloat = regexp.MustCompile(`^[-+]?[0-9]*\.?[0-9]+([eE][-+][0-9]+)?$`) + +func resolve(tag string, in string) (rtag string, out interface{}) { + if !resolvableTag(tag) { + return tag, in + } + + defer func() { + switch tag { + case "", rtag, yaml_STR_TAG, yaml_BINARY_TAG: + return + } + failf("cannot decode %s `%s` as a %s", shortTag(rtag), in, shortTag(tag)) + }() + + // Any data is accepted as a !!str or !!binary. + // Otherwise, the prefix is enough of a hint about what it might be. + hint := byte('N') + if in != "" { + hint = resolveTable[in[0]] + } + if hint != 0 && tag != yaml_STR_TAG && tag != yaml_BINARY_TAG { + // Handle things we can lookup in a map. + if item, ok := resolveMap[in]; ok { + return item.tag, item.value + } + + // Base 60 floats are a bad idea, were dropped in YAML 1.2, and + // are purposefully unsupported here. They're still quoted on + // the way out for compatibility with other parser, though. + + switch hint { + case 'M': + // We've already checked the map above. + + case '.': + // Not in the map, so maybe a normal float. + floatv, err := strconv.ParseFloat(in, 64) + if err == nil { + return yaml_FLOAT_TAG, floatv + } + + case 'D', 'S': + // Int, float, or timestamp. + // Only try values as a timestamp if the value is unquoted or there's an explicit + // !!timestamp tag. + if tag == "" || tag == yaml_TIMESTAMP_TAG { + t, ok := parseTimestamp(in) + if ok { + return yaml_TIMESTAMP_TAG, t + } + } + + plain := strings.Replace(in, "_", "", -1) + intv, err := strconv.ParseInt(plain, 0, 64) + if err == nil { + if intv == int64(int(intv)) { + return yaml_INT_TAG, int(intv) + } else { + return yaml_INT_TAG, intv + } + } + uintv, err := strconv.ParseUint(plain, 0, 64) + if err == nil { + return yaml_INT_TAG, uintv + } + if yamlStyleFloat.MatchString(plain) { + floatv, err := strconv.ParseFloat(plain, 64) + if err == nil { + return yaml_FLOAT_TAG, floatv + } + } + if strings.HasPrefix(plain, "0b") { + intv, err := strconv.ParseInt(plain[2:], 2, 64) + if err == nil { + if intv == int64(int(intv)) { + return yaml_INT_TAG, int(intv) + } else { + return yaml_INT_TAG, intv + } + } + uintv, err := strconv.ParseUint(plain[2:], 2, 64) + if err == nil { + return yaml_INT_TAG, uintv + } + } else if strings.HasPrefix(plain, "-0b") { + intv, err := strconv.ParseInt(plain[3:], 2, 64) + if err == nil { + if intv == int64(int(intv)) { + return yaml_INT_TAG, -int(intv) + } else { + return yaml_INT_TAG, -intv + } + } + } + default: + panic("resolveTable item not yet handled: " + string(rune(hint)) + " (with " + in + ")") + } + } + return yaml_STR_TAG, in +} + +// encodeBase64 encodes s as base64 that is broken up into multiple lines +// as appropriate for the resulting length. +func encodeBase64(s string) string { + const lineLen = 70 + encLen := base64.StdEncoding.EncodedLen(len(s)) + lines := encLen/lineLen + 1 + buf := make([]byte, encLen*2+lines) + in := buf[0:encLen] + out := buf[encLen:] + base64.StdEncoding.Encode(in, []byte(s)) + k := 0 + for i := 0; i < len(in); i += lineLen { + j := i + lineLen + if j > len(in) { + j = len(in) + } + k += copy(out[k:], in[i:j]) + if lines > 1 { + out[k] = '\n' + k++ + } + } + return string(out[:k]) +} + +// This is a subset of the formats allowed by the regular expression +// defined at http://yaml.org/type/timestamp.html. +var allowedTimestampFormats = []string{ + "2006-1-2T15:4:5Z07:00", + "2006-1-2t15:4:5Z07:00", // RFC3339 with lower-case "t". + "2006-1-2 15:4:5", // space separated with no time zone + "2006-1-2", // date only + // Notable exception: time.Parse cannot handle: "2001-12-14 21:59:43.10 -5" + // from the set of examples. +} + +// parseTimestamp parses s as a timestamp string and +// returns the timestamp and reports whether it succeeded. +// Timestamp formats are defined at http://yaml.org/type/timestamp.html +func parseTimestamp(s string) (time.Time, bool) { + // TODO write code to check all the formats supported by + // http://yaml.org/type/timestamp.html instead of using time.Parse. + + // Quick check: all date formats start with YYYY-. + i := 0 + for ; i < len(s); i++ { + if c := s[i]; c < '0' || c > '9' { + break + } + } + if i != 4 || i == len(s) || s[i] != '-' { + return time.Time{}, false + } + for _, format := range allowedTimestampFormats { + if t, err := time.Parse(format, s); err == nil { + return t, true + } + } + return time.Time{}, false +} diff --git a/vendor/gopkg.in/yaml.v2/scannerc.go b/vendor/gopkg.in/yaml.v2/scannerc.go new file mode 100644 index 000000000000..492a9845dacc --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/scannerc.go @@ -0,0 +1,2702 @@ +package yaml + +import ( + "bytes" + "fmt" +) + +// Introduction +// ************ +// +// The following notes assume that you are familiar with the YAML specification +// (http://yaml.org/spec/1.2/spec.html). We mostly follow it, although in +// some cases we are less restrictive that it requires. +// +// The process of transforming a YAML stream into a sequence of events is +// divided on two steps: Scanning and Parsing. +// +// The Scanner transforms the input stream into a sequence of tokens, while the +// parser transform the sequence of tokens produced by the Scanner into a +// sequence of parsing events. +// +// The Scanner is rather clever and complicated. The Parser, on the contrary, +// is a straightforward implementation of a recursive-descendant parser (or, +// LL(1) parser, as it is usually called). +// +// Actually there are two issues of Scanning that might be called "clever", the +// rest is quite straightforward. The issues are "block collection start" and +// "simple keys". Both issues are explained below in details. +// +// Here the Scanning step is explained and implemented. We start with the list +// of all the tokens produced by the Scanner together with short descriptions. +// +// Now, tokens: +// +// STREAM-START(encoding) # The stream start. +// STREAM-END # The stream end. +// VERSION-DIRECTIVE(major,minor) # The '%YAML' directive. +// TAG-DIRECTIVE(handle,prefix) # The '%TAG' directive. +// DOCUMENT-START # '---' +// DOCUMENT-END # '...' +// BLOCK-SEQUENCE-START # Indentation increase denoting a block +// BLOCK-MAPPING-START # sequence or a block mapping. +// BLOCK-END # Indentation decrease. +// FLOW-SEQUENCE-START # '[' +// FLOW-SEQUENCE-END # ']' +// BLOCK-SEQUENCE-START # '{' +// BLOCK-SEQUENCE-END # '}' +// BLOCK-ENTRY # '-' +// FLOW-ENTRY # ',' +// KEY # '?' or nothing (simple keys). +// VALUE # ':' +// ALIAS(anchor) # '*anchor' +// ANCHOR(anchor) # '&anchor' +// TAG(handle,suffix) # '!handle!suffix' +// SCALAR(value,style) # A scalar. +// +// The following two tokens are "virtual" tokens denoting the beginning and the +// end of the stream: +// +// STREAM-START(encoding) +// STREAM-END +// +// We pass the information about the input stream encoding with the +// STREAM-START token. +// +// The next two tokens are responsible for tags: +// +// VERSION-DIRECTIVE(major,minor) +// TAG-DIRECTIVE(handle,prefix) +// +// Example: +// +// %YAML 1.1 +// %TAG ! !foo +// %TAG !yaml! tag:yaml.org,2002: +// --- +// +// The correspoding sequence of tokens: +// +// STREAM-START(utf-8) +// VERSION-DIRECTIVE(1,1) +// TAG-DIRECTIVE("!","!foo") +// TAG-DIRECTIVE("!yaml","tag:yaml.org,2002:") +// DOCUMENT-START +// STREAM-END +// +// Note that the VERSION-DIRECTIVE and TAG-DIRECTIVE tokens occupy a whole +// line. +// +// The document start and end indicators are represented by: +// +// DOCUMENT-START +// DOCUMENT-END +// +// Note that if a YAML stream contains an implicit document (without '---' +// and '...' indicators), no DOCUMENT-START and DOCUMENT-END tokens will be +// produced. +// +// In the following examples, we present whole documents together with the +// produced tokens. +// +// 1. An implicit document: +// +// 'a scalar' +// +// Tokens: +// +// STREAM-START(utf-8) +// SCALAR("a scalar",single-quoted) +// STREAM-END +// +// 2. An explicit document: +// +// --- +// 'a scalar' +// ... +// +// Tokens: +// +// STREAM-START(utf-8) +// DOCUMENT-START +// SCALAR("a scalar",single-quoted) +// DOCUMENT-END +// STREAM-END +// +// 3. Several documents in a stream: +// +// 'a scalar' +// --- +// 'another scalar' +// --- +// 'yet another scalar' +// +// Tokens: +// +// STREAM-START(utf-8) +// SCALAR("a scalar",single-quoted) +// DOCUMENT-START +// SCALAR("another scalar",single-quoted) +// DOCUMENT-START +// SCALAR("yet another scalar",single-quoted) +// STREAM-END +// +// We have already introduced the SCALAR token above. The following tokens are +// used to describe aliases, anchors, tag, and scalars: +// +// ALIAS(anchor) +// ANCHOR(anchor) +// TAG(handle,suffix) +// SCALAR(value,style) +// +// The following series of examples illustrate the usage of these tokens: +// +// 1. A recursive sequence: +// +// &A [ *A ] +// +// Tokens: +// +// STREAM-START(utf-8) +// ANCHOR("A") +// FLOW-SEQUENCE-START +// ALIAS("A") +// FLOW-SEQUENCE-END +// STREAM-END +// +// 2. A tagged scalar: +// +// !!float "3.14" # A good approximation. +// +// Tokens: +// +// STREAM-START(utf-8) +// TAG("!!","float") +// SCALAR("3.14",double-quoted) +// STREAM-END +// +// 3. Various scalar styles: +// +// --- # Implicit empty plain scalars do not produce tokens. +// --- a plain scalar +// --- 'a single-quoted scalar' +// --- "a double-quoted scalar" +// --- |- +// a literal scalar +// --- >- +// a folded +// scalar +// +// Tokens: +// +// STREAM-START(utf-8) +// DOCUMENT-START +// DOCUMENT-START +// SCALAR("a plain scalar",plain) +// DOCUMENT-START +// SCALAR("a single-quoted scalar",single-quoted) +// DOCUMENT-START +// SCALAR("a double-quoted scalar",double-quoted) +// DOCUMENT-START +// SCALAR("a literal scalar",literal) +// DOCUMENT-START +// SCALAR("a folded scalar",folded) +// STREAM-END +// +// Now it's time to review collection-related tokens. We will start with +// flow collections: +// +// FLOW-SEQUENCE-START +// FLOW-SEQUENCE-END +// FLOW-MAPPING-START +// FLOW-MAPPING-END +// FLOW-ENTRY +// KEY +// VALUE +// +// The tokens FLOW-SEQUENCE-START, FLOW-SEQUENCE-END, FLOW-MAPPING-START, and +// FLOW-MAPPING-END represent the indicators '[', ']', '{', and '}' +// correspondingly. FLOW-ENTRY represent the ',' indicator. Finally the +// indicators '?' and ':', which are used for denoting mapping keys and values, +// are represented by the KEY and VALUE tokens. +// +// The following examples show flow collections: +// +// 1. A flow sequence: +// +// [item 1, item 2, item 3] +// +// Tokens: +// +// STREAM-START(utf-8) +// FLOW-SEQUENCE-START +// SCALAR("item 1",plain) +// FLOW-ENTRY +// SCALAR("item 2",plain) +// FLOW-ENTRY +// SCALAR("item 3",plain) +// FLOW-SEQUENCE-END +// STREAM-END +// +// 2. A flow mapping: +// +// { +// a simple key: a value, # Note that the KEY token is produced. +// ? a complex key: another value, +// } +// +// Tokens: +// +// STREAM-START(utf-8) +// FLOW-MAPPING-START +// KEY +// SCALAR("a simple key",plain) +// VALUE +// SCALAR("a value",plain) +// FLOW-ENTRY +// KEY +// SCALAR("a complex key",plain) +// VALUE +// SCALAR("another value",plain) +// FLOW-ENTRY +// FLOW-MAPPING-END +// STREAM-END +// +// A simple key is a key which is not denoted by the '?' indicator. Note that +// the Scanner still produce the KEY token whenever it encounters a simple key. +// +// For scanning block collections, the following tokens are used (note that we +// repeat KEY and VALUE here): +// +// BLOCK-SEQUENCE-START +// BLOCK-MAPPING-START +// BLOCK-END +// BLOCK-ENTRY +// KEY +// VALUE +// +// The tokens BLOCK-SEQUENCE-START and BLOCK-MAPPING-START denote indentation +// increase that precedes a block collection (cf. the INDENT token in Python). +// The token BLOCK-END denote indentation decrease that ends a block collection +// (cf. the DEDENT token in Python). However YAML has some syntax pecularities +// that makes detections of these tokens more complex. +// +// The tokens BLOCK-ENTRY, KEY, and VALUE are used to represent the indicators +// '-', '?', and ':' correspondingly. +// +// The following examples show how the tokens BLOCK-SEQUENCE-START, +// BLOCK-MAPPING-START, and BLOCK-END are emitted by the Scanner: +// +// 1. Block sequences: +// +// - item 1 +// - item 2 +// - +// - item 3.1 +// - item 3.2 +// - +// key 1: value 1 +// key 2: value 2 +// +// Tokens: +// +// STREAM-START(utf-8) +// BLOCK-SEQUENCE-START +// BLOCK-ENTRY +// SCALAR("item 1",plain) +// BLOCK-ENTRY +// SCALAR("item 2",plain) +// BLOCK-ENTRY +// BLOCK-SEQUENCE-START +// BLOCK-ENTRY +// SCALAR("item 3.1",plain) +// BLOCK-ENTRY +// SCALAR("item 3.2",plain) +// BLOCK-END +// BLOCK-ENTRY +// BLOCK-MAPPING-START +// KEY +// SCALAR("key 1",plain) +// VALUE +// SCALAR("value 1",plain) +// KEY +// SCALAR("key 2",plain) +// VALUE +// SCALAR("value 2",plain) +// BLOCK-END +// BLOCK-END +// STREAM-END +// +// 2. Block mappings: +// +// a simple key: a value # The KEY token is produced here. +// ? a complex key +// : another value +// a mapping: +// key 1: value 1 +// key 2: value 2 +// a sequence: +// - item 1 +// - item 2 +// +// Tokens: +// +// STREAM-START(utf-8) +// BLOCK-MAPPING-START +// KEY +// SCALAR("a simple key",plain) +// VALUE +// SCALAR("a value",plain) +// KEY +// SCALAR("a complex key",plain) +// VALUE +// SCALAR("another value",plain) +// KEY +// SCALAR("a mapping",plain) +// BLOCK-MAPPING-START +// KEY +// SCALAR("key 1",plain) +// VALUE +// SCALAR("value 1",plain) +// KEY +// SCALAR("key 2",plain) +// VALUE +// SCALAR("value 2",plain) +// BLOCK-END +// KEY +// SCALAR("a sequence",plain) +// VALUE +// BLOCK-SEQUENCE-START +// BLOCK-ENTRY +// SCALAR("item 1",plain) +// BLOCK-ENTRY +// SCALAR("item 2",plain) +// BLOCK-END +// BLOCK-END +// STREAM-END +// +// YAML does not always require to start a new block collection from a new +// line. If the current line contains only '-', '?', and ':' indicators, a new +// block collection may start at the current line. The following examples +// illustrate this case: +// +// 1. Collections in a sequence: +// +// - - item 1 +// - item 2 +// - key 1: value 1 +// key 2: value 2 +// - ? complex key +// : complex value +// +// Tokens: +// +// STREAM-START(utf-8) +// BLOCK-SEQUENCE-START +// BLOCK-ENTRY +// BLOCK-SEQUENCE-START +// BLOCK-ENTRY +// SCALAR("item 1",plain) +// BLOCK-ENTRY +// SCALAR("item 2",plain) +// BLOCK-END +// BLOCK-ENTRY +// BLOCK-MAPPING-START +// KEY +// SCALAR("key 1",plain) +// VALUE +// SCALAR("value 1",plain) +// KEY +// SCALAR("key 2",plain) +// VALUE +// SCALAR("value 2",plain) +// BLOCK-END +// BLOCK-ENTRY +// BLOCK-MAPPING-START +// KEY +// SCALAR("complex key") +// VALUE +// SCALAR("complex value") +// BLOCK-END +// BLOCK-END +// STREAM-END +// +// 2. Collections in a mapping: +// +// ? a sequence +// : - item 1 +// - item 2 +// ? a mapping +// : key 1: value 1 +// key 2: value 2 +// +// Tokens: +// +// STREAM-START(utf-8) +// BLOCK-MAPPING-START +// KEY +// SCALAR("a sequence",plain) +// VALUE +// BLOCK-SEQUENCE-START +// BLOCK-ENTRY +// SCALAR("item 1",plain) +// BLOCK-ENTRY +// SCALAR("item 2",plain) +// BLOCK-END +// KEY +// SCALAR("a mapping",plain) +// VALUE +// BLOCK-MAPPING-START +// KEY +// SCALAR("key 1",plain) +// VALUE +// SCALAR("value 1",plain) +// KEY +// SCALAR("key 2",plain) +// VALUE +// SCALAR("value 2",plain) +// BLOCK-END +// BLOCK-END +// STREAM-END +// +// YAML also permits non-indented sequences if they are included into a block +// mapping. In this case, the token BLOCK-SEQUENCE-START is not produced: +// +// key: +// - item 1 # BLOCK-SEQUENCE-START is NOT produced here. +// - item 2 +// +// Tokens: +// +// STREAM-START(utf-8) +// BLOCK-MAPPING-START +// KEY +// SCALAR("key",plain) +// VALUE +// BLOCK-ENTRY +// SCALAR("item 1",plain) +// BLOCK-ENTRY +// SCALAR("item 2",plain) +// BLOCK-END +// + +// Ensure that the buffer contains the required number of characters. +// Return true on success, false on failure (reader error or memory error). +func cache(parser *yaml_parser_t, length int) bool { + // [Go] This was inlined: !cache(A, B) -> unread < B && !update(A, B) + return parser.unread >= length || yaml_parser_update_buffer(parser, length) +} + +// Advance the buffer pointer. +func skip(parser *yaml_parser_t) { + parser.mark.index++ + parser.mark.column++ + parser.unread-- + parser.buffer_pos += width(parser.buffer[parser.buffer_pos]) +} + +func skip_line(parser *yaml_parser_t) { + if is_crlf(parser.buffer, parser.buffer_pos) { + parser.mark.index += 2 + parser.mark.column = 0 + parser.mark.line++ + parser.unread -= 2 + parser.buffer_pos += 2 + } else if is_break(parser.buffer, parser.buffer_pos) { + parser.mark.index++ + parser.mark.column = 0 + parser.mark.line++ + parser.unread-- + parser.buffer_pos += width(parser.buffer[parser.buffer_pos]) + } +} + +// Copy a character to a string buffer and advance pointers. +func read(parser *yaml_parser_t, s []byte) []byte { + w := width(parser.buffer[parser.buffer_pos]) + if w == 0 { + panic("invalid character sequence") + } + if len(s) == 0 { + s = make([]byte, 0, 32) + } + if w == 1 && len(s)+w <= cap(s) { + s = s[:len(s)+1] + s[len(s)-1] = parser.buffer[parser.buffer_pos] + parser.buffer_pos++ + } else { + s = append(s, parser.buffer[parser.buffer_pos:parser.buffer_pos+w]...) + parser.buffer_pos += w + } + parser.mark.index++ + parser.mark.column++ + parser.unread-- + return s +} + +// Copy a line break character to a string buffer and advance pointers. +func read_line(parser *yaml_parser_t, s []byte) []byte { + buf := parser.buffer + pos := parser.buffer_pos + switch { + case buf[pos] == '\r' && buf[pos+1] == '\n': + // CR LF . LF + s = append(s, '\n') + parser.buffer_pos += 2 + parser.mark.index++ + parser.unread-- + case buf[pos] == '\r' || buf[pos] == '\n': + // CR|LF . LF + s = append(s, '\n') + parser.buffer_pos += 1 + case buf[pos] == '\xC2' && buf[pos+1] == '\x85': + // NEL . LF + s = append(s, '\n') + parser.buffer_pos += 2 + case buf[pos] == '\xE2' && buf[pos+1] == '\x80' && (buf[pos+2] == '\xA8' || buf[pos+2] == '\xA9'): + // LS|PS . LS|PS + s = append(s, buf[parser.buffer_pos:pos+3]...) + parser.buffer_pos += 3 + default: + return s + } + parser.mark.index++ + parser.mark.column = 0 + parser.mark.line++ + parser.unread-- + return s +} + +// Get the next token. +func yaml_parser_scan(parser *yaml_parser_t, token *yaml_token_t) bool { + // Erase the token object. + *token = yaml_token_t{} // [Go] Is this necessary? + + // No tokens after STREAM-END or error. + if parser.stream_end_produced || parser.error != yaml_NO_ERROR { + return true + } + + // Ensure that the tokens queue contains enough tokens. + if !parser.token_available { + if !yaml_parser_fetch_more_tokens(parser) { + return false + } + } + + // Fetch the next token from the queue. + *token = parser.tokens[parser.tokens_head] + parser.tokens_head++ + parser.tokens_parsed++ + parser.token_available = false + + if token.typ == yaml_STREAM_END_TOKEN { + parser.stream_end_produced = true + } + return true +} + +// Set the scanner error and return false. +func yaml_parser_set_scanner_error(parser *yaml_parser_t, context string, context_mark yaml_mark_t, problem string) bool { + parser.error = yaml_SCANNER_ERROR + parser.context = context + parser.context_mark = context_mark + parser.problem = problem + parser.problem_mark = parser.mark + return false +} + +func yaml_parser_set_scanner_tag_error(parser *yaml_parser_t, directive bool, context_mark yaml_mark_t, problem string) bool { + context := "while parsing a tag" + if directive { + context = "while parsing a %TAG directive" + } + return yaml_parser_set_scanner_error(parser, context, context_mark, problem) +} + +func trace(args ...interface{}) func() { + pargs := append([]interface{}{"+++"}, args...) + fmt.Println(pargs...) + pargs = append([]interface{}{"---"}, args...) + return func() { fmt.Println(pargs...) } +} + +// Ensure that the tokens queue contains at least one token which can be +// returned to the Parser. +func yaml_parser_fetch_more_tokens(parser *yaml_parser_t) bool { + // While we need more tokens to fetch, do it. + for { + // Check if we really need to fetch more tokens. + need_more_tokens := false + + if parser.tokens_head == len(parser.tokens) { + // Queue is empty. + need_more_tokens = true + } else { + // Check if any potential simple key may occupy the head position. + if !yaml_parser_stale_simple_keys(parser) { + return false + } + + for i := range parser.simple_keys { + simple_key := &parser.simple_keys[i] + if simple_key.possible && simple_key.token_number == parser.tokens_parsed { + need_more_tokens = true + break + } + } + } + + // We are finished. + if !need_more_tokens { + break + } + // Fetch the next token. + if !yaml_parser_fetch_next_token(parser) { + return false + } + } + + parser.token_available = true + return true +} + +// The dispatcher for token fetchers. +func yaml_parser_fetch_next_token(parser *yaml_parser_t) bool { + // Ensure that the buffer is initialized. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + + // Check if we just started scanning. Fetch STREAM-START then. + if !parser.stream_start_produced { + return yaml_parser_fetch_stream_start(parser) + } + + // Eat whitespaces and comments until we reach the next token. + if !yaml_parser_scan_to_next_token(parser) { + return false + } + + // Remove obsolete potential simple keys. + if !yaml_parser_stale_simple_keys(parser) { + return false + } + + // Check the indentation level against the current column. + if !yaml_parser_unroll_indent(parser, parser.mark.column) { + return false + } + + // Ensure that the buffer contains at least 4 characters. 4 is the length + // of the longest indicators ('--- ' and '... '). + if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) { + return false + } + + // Is it the end of the stream? + if is_z(parser.buffer, parser.buffer_pos) { + return yaml_parser_fetch_stream_end(parser) + } + + // Is it a directive? + if parser.mark.column == 0 && parser.buffer[parser.buffer_pos] == '%' { + return yaml_parser_fetch_directive(parser) + } + + buf := parser.buffer + pos := parser.buffer_pos + + // Is it the document start indicator? + if parser.mark.column == 0 && buf[pos] == '-' && buf[pos+1] == '-' && buf[pos+2] == '-' && is_blankz(buf, pos+3) { + return yaml_parser_fetch_document_indicator(parser, yaml_DOCUMENT_START_TOKEN) + } + + // Is it the document end indicator? + if parser.mark.column == 0 && buf[pos] == '.' && buf[pos+1] == '.' && buf[pos+2] == '.' && is_blankz(buf, pos+3) { + return yaml_parser_fetch_document_indicator(parser, yaml_DOCUMENT_END_TOKEN) + } + + // Is it the flow sequence start indicator? + if buf[pos] == '[' { + return yaml_parser_fetch_flow_collection_start(parser, yaml_FLOW_SEQUENCE_START_TOKEN) + } + + // Is it the flow mapping start indicator? + if parser.buffer[parser.buffer_pos] == '{' { + return yaml_parser_fetch_flow_collection_start(parser, yaml_FLOW_MAPPING_START_TOKEN) + } + + // Is it the flow sequence end indicator? + if parser.buffer[parser.buffer_pos] == ']' { + return yaml_parser_fetch_flow_collection_end(parser, + yaml_FLOW_SEQUENCE_END_TOKEN) + } + + // Is it the flow mapping end indicator? + if parser.buffer[parser.buffer_pos] == '}' { + return yaml_parser_fetch_flow_collection_end(parser, + yaml_FLOW_MAPPING_END_TOKEN) + } + + // Is it the flow entry indicator? + if parser.buffer[parser.buffer_pos] == ',' { + return yaml_parser_fetch_flow_entry(parser) + } + + // Is it the block entry indicator? + if parser.buffer[parser.buffer_pos] == '-' && is_blankz(parser.buffer, parser.buffer_pos+1) { + return yaml_parser_fetch_block_entry(parser) + } + + // Is it the key indicator? + if parser.buffer[parser.buffer_pos] == '?' && (parser.flow_level > 0 || is_blankz(parser.buffer, parser.buffer_pos+1)) { + return yaml_parser_fetch_key(parser) + } + + // Is it the value indicator? + if parser.buffer[parser.buffer_pos] == ':' && (parser.flow_level > 0 || is_blankz(parser.buffer, parser.buffer_pos+1)) { + return yaml_parser_fetch_value(parser) + } + + // Is it an alias? + if parser.buffer[parser.buffer_pos] == '*' { + return yaml_parser_fetch_anchor(parser, yaml_ALIAS_TOKEN) + } + + // Is it an anchor? + if parser.buffer[parser.buffer_pos] == '&' { + return yaml_parser_fetch_anchor(parser, yaml_ANCHOR_TOKEN) + } + + // Is it a tag? + if parser.buffer[parser.buffer_pos] == '!' { + return yaml_parser_fetch_tag(parser) + } + + // Is it a literal scalar? + if parser.buffer[parser.buffer_pos] == '|' && parser.flow_level == 0 { + return yaml_parser_fetch_block_scalar(parser, true) + } + + // Is it a folded scalar? + if parser.buffer[parser.buffer_pos] == '>' && parser.flow_level == 0 { + return yaml_parser_fetch_block_scalar(parser, false) + } + + // Is it a single-quoted scalar? + if parser.buffer[parser.buffer_pos] == '\'' { + return yaml_parser_fetch_flow_scalar(parser, true) + } + + // Is it a double-quoted scalar? + if parser.buffer[parser.buffer_pos] == '"' { + return yaml_parser_fetch_flow_scalar(parser, false) + } + + // Is it a plain scalar? + // + // A plain scalar may start with any non-blank characters except + // + // '-', '?', ':', ',', '[', ']', '{', '}', + // '#', '&', '*', '!', '|', '>', '\'', '\"', + // '%', '@', '`'. + // + // In the block context (and, for the '-' indicator, in the flow context + // too), it may also start with the characters + // + // '-', '?', ':' + // + // if it is followed by a non-space character. + // + // The last rule is more restrictive than the specification requires. + // [Go] Make this logic more reasonable. + //switch parser.buffer[parser.buffer_pos] { + //case '-', '?', ':', ',', '?', '-', ',', ':', ']', '[', '}', '{', '&', '#', '!', '*', '>', '|', '"', '\'', '@', '%', '-', '`': + //} + if !(is_blankz(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == '-' || + parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == ':' || + parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == '[' || + parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '{' || + parser.buffer[parser.buffer_pos] == '}' || parser.buffer[parser.buffer_pos] == '#' || + parser.buffer[parser.buffer_pos] == '&' || parser.buffer[parser.buffer_pos] == '*' || + parser.buffer[parser.buffer_pos] == '!' || parser.buffer[parser.buffer_pos] == '|' || + parser.buffer[parser.buffer_pos] == '>' || parser.buffer[parser.buffer_pos] == '\'' || + parser.buffer[parser.buffer_pos] == '"' || parser.buffer[parser.buffer_pos] == '%' || + parser.buffer[parser.buffer_pos] == '@' || parser.buffer[parser.buffer_pos] == '`') || + (parser.buffer[parser.buffer_pos] == '-' && !is_blank(parser.buffer, parser.buffer_pos+1)) || + (parser.flow_level == 0 && + (parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == ':') && + !is_blankz(parser.buffer, parser.buffer_pos+1)) { + return yaml_parser_fetch_plain_scalar(parser) + } + + // If we don't determine the token type so far, it is an error. + return yaml_parser_set_scanner_error(parser, + "while scanning for the next token", parser.mark, + "found character that cannot start any token") +} + +// Check the list of potential simple keys and remove the positions that +// cannot contain simple keys anymore. +func yaml_parser_stale_simple_keys(parser *yaml_parser_t) bool { + // Check for a potential simple key for each flow level. + for i := range parser.simple_keys { + simple_key := &parser.simple_keys[i] + + // The specification requires that a simple key + // + // - is limited to a single line, + // - is shorter than 1024 characters. + if simple_key.possible && (simple_key.mark.line < parser.mark.line || simple_key.mark.index+1024 < parser.mark.index) { + + // Check if the potential simple key to be removed is required. + if simple_key.required { + return yaml_parser_set_scanner_error(parser, + "while scanning a simple key", simple_key.mark, + "could not find expected ':'") + } + simple_key.possible = false + } + } + return true +} + +// Check if a simple key may start at the current position and add it if +// needed. +func yaml_parser_save_simple_key(parser *yaml_parser_t) bool { + // A simple key is required at the current position if the scanner is in + // the block context and the current column coincides with the indentation + // level. + + required := parser.flow_level == 0 && parser.indent == parser.mark.column + + // A simple key is required only when it is the first token in the current + // line. Therefore it is always allowed. But we add a check anyway. + if required && !parser.simple_key_allowed { + panic("should not happen") + } + + // + // If the current position may start a simple key, save it. + // + if parser.simple_key_allowed { + simple_key := yaml_simple_key_t{ + possible: true, + required: required, + token_number: parser.tokens_parsed + (len(parser.tokens) - parser.tokens_head), + } + simple_key.mark = parser.mark + + if !yaml_parser_remove_simple_key(parser) { + return false + } + parser.simple_keys[len(parser.simple_keys)-1] = simple_key + } + return true +} + +// Remove a potential simple key at the current flow level. +func yaml_parser_remove_simple_key(parser *yaml_parser_t) bool { + i := len(parser.simple_keys) - 1 + if parser.simple_keys[i].possible { + // If the key is required, it is an error. + if parser.simple_keys[i].required { + return yaml_parser_set_scanner_error(parser, + "while scanning a simple key", parser.simple_keys[i].mark, + "could not find expected ':'") + } + } + // Remove the key from the stack. + parser.simple_keys[i].possible = false + return true +} + +// Increase the flow level and resize the simple key list if needed. +func yaml_parser_increase_flow_level(parser *yaml_parser_t) bool { + // Reset the simple key on the next level. + parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{}) + + // Increase the flow level. + parser.flow_level++ + return true +} + +// Decrease the flow level. +func yaml_parser_decrease_flow_level(parser *yaml_parser_t) bool { + if parser.flow_level > 0 { + parser.flow_level-- + parser.simple_keys = parser.simple_keys[:len(parser.simple_keys)-1] + } + return true +} + +// Push the current indentation level to the stack and set the new level +// the current column is greater than the indentation level. In this case, +// append or insert the specified token into the token queue. +func yaml_parser_roll_indent(parser *yaml_parser_t, column, number int, typ yaml_token_type_t, mark yaml_mark_t) bool { + // In the flow context, do nothing. + if parser.flow_level > 0 { + return true + } + + if parser.indent < column { + // Push the current indentation level to the stack and set the new + // indentation level. + parser.indents = append(parser.indents, parser.indent) + parser.indent = column + + // Create a token and insert it into the queue. + token := yaml_token_t{ + typ: typ, + start_mark: mark, + end_mark: mark, + } + if number > -1 { + number -= parser.tokens_parsed + } + yaml_insert_token(parser, number, &token) + } + return true +} + +// Pop indentation levels from the indents stack until the current level +// becomes less or equal to the column. For each indentation level, append +// the BLOCK-END token. +func yaml_parser_unroll_indent(parser *yaml_parser_t, column int) bool { + // In the flow context, do nothing. + if parser.flow_level > 0 { + return true + } + + // Loop through the indentation levels in the stack. + for parser.indent > column { + // Create a token and append it to the queue. + token := yaml_token_t{ + typ: yaml_BLOCK_END_TOKEN, + start_mark: parser.mark, + end_mark: parser.mark, + } + yaml_insert_token(parser, -1, &token) + + // Pop the indentation level. + parser.indent = parser.indents[len(parser.indents)-1] + parser.indents = parser.indents[:len(parser.indents)-1] + } + return true +} + +// Initialize the scanner and produce the STREAM-START token. +func yaml_parser_fetch_stream_start(parser *yaml_parser_t) bool { + + // Set the initial indentation. + parser.indent = -1 + + // Initialize the simple key stack. + parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{}) + + // A simple key is allowed at the beginning of the stream. + parser.simple_key_allowed = true + + // We have started. + parser.stream_start_produced = true + + // Create the STREAM-START token and append it to the queue. + token := yaml_token_t{ + typ: yaml_STREAM_START_TOKEN, + start_mark: parser.mark, + end_mark: parser.mark, + encoding: parser.encoding, + } + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the STREAM-END token and shut down the scanner. +func yaml_parser_fetch_stream_end(parser *yaml_parser_t) bool { + + // Force new line. + if parser.mark.column != 0 { + parser.mark.column = 0 + parser.mark.line++ + } + + // Reset the indentation level. + if !yaml_parser_unroll_indent(parser, -1) { + return false + } + + // Reset simple keys. + if !yaml_parser_remove_simple_key(parser) { + return false + } + + parser.simple_key_allowed = false + + // Create the STREAM-END token and append it to the queue. + token := yaml_token_t{ + typ: yaml_STREAM_END_TOKEN, + start_mark: parser.mark, + end_mark: parser.mark, + } + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce a VERSION-DIRECTIVE or TAG-DIRECTIVE token. +func yaml_parser_fetch_directive(parser *yaml_parser_t) bool { + // Reset the indentation level. + if !yaml_parser_unroll_indent(parser, -1) { + return false + } + + // Reset simple keys. + if !yaml_parser_remove_simple_key(parser) { + return false + } + + parser.simple_key_allowed = false + + // Create the YAML-DIRECTIVE or TAG-DIRECTIVE token. + token := yaml_token_t{} + if !yaml_parser_scan_directive(parser, &token) { + return false + } + // Append the token to the queue. + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the DOCUMENT-START or DOCUMENT-END token. +func yaml_parser_fetch_document_indicator(parser *yaml_parser_t, typ yaml_token_type_t) bool { + // Reset the indentation level. + if !yaml_parser_unroll_indent(parser, -1) { + return false + } + + // Reset simple keys. + if !yaml_parser_remove_simple_key(parser) { + return false + } + + parser.simple_key_allowed = false + + // Consume the token. + start_mark := parser.mark + + skip(parser) + skip(parser) + skip(parser) + + end_mark := parser.mark + + // Create the DOCUMENT-START or DOCUMENT-END token. + token := yaml_token_t{ + typ: typ, + start_mark: start_mark, + end_mark: end_mark, + } + // Append the token to the queue. + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the FLOW-SEQUENCE-START or FLOW-MAPPING-START token. +func yaml_parser_fetch_flow_collection_start(parser *yaml_parser_t, typ yaml_token_type_t) bool { + // The indicators '[' and '{' may start a simple key. + if !yaml_parser_save_simple_key(parser) { + return false + } + + // Increase the flow level. + if !yaml_parser_increase_flow_level(parser) { + return false + } + + // A simple key may follow the indicators '[' and '{'. + parser.simple_key_allowed = true + + // Consume the token. + start_mark := parser.mark + skip(parser) + end_mark := parser.mark + + // Create the FLOW-SEQUENCE-START of FLOW-MAPPING-START token. + token := yaml_token_t{ + typ: typ, + start_mark: start_mark, + end_mark: end_mark, + } + // Append the token to the queue. + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the FLOW-SEQUENCE-END or FLOW-MAPPING-END token. +func yaml_parser_fetch_flow_collection_end(parser *yaml_parser_t, typ yaml_token_type_t) bool { + // Reset any potential simple key on the current flow level. + if !yaml_parser_remove_simple_key(parser) { + return false + } + + // Decrease the flow level. + if !yaml_parser_decrease_flow_level(parser) { + return false + } + + // No simple keys after the indicators ']' and '}'. + parser.simple_key_allowed = false + + // Consume the token. + + start_mark := parser.mark + skip(parser) + end_mark := parser.mark + + // Create the FLOW-SEQUENCE-END of FLOW-MAPPING-END token. + token := yaml_token_t{ + typ: typ, + start_mark: start_mark, + end_mark: end_mark, + } + // Append the token to the queue. + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the FLOW-ENTRY token. +func yaml_parser_fetch_flow_entry(parser *yaml_parser_t) bool { + // Reset any potential simple keys on the current flow level. + if !yaml_parser_remove_simple_key(parser) { + return false + } + + // Simple keys are allowed after ','. + parser.simple_key_allowed = true + + // Consume the token. + start_mark := parser.mark + skip(parser) + end_mark := parser.mark + + // Create the FLOW-ENTRY token and append it to the queue. + token := yaml_token_t{ + typ: yaml_FLOW_ENTRY_TOKEN, + start_mark: start_mark, + end_mark: end_mark, + } + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the BLOCK-ENTRY token. +func yaml_parser_fetch_block_entry(parser *yaml_parser_t) bool { + // Check if the scanner is in the block context. + if parser.flow_level == 0 { + // Check if we are allowed to start a new entry. + if !parser.simple_key_allowed { + return yaml_parser_set_scanner_error(parser, "", parser.mark, + "block sequence entries are not allowed in this context") + } + // Add the BLOCK-SEQUENCE-START token if needed. + if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_SEQUENCE_START_TOKEN, parser.mark) { + return false + } + } else { + // It is an error for the '-' indicator to occur in the flow context, + // but we let the Parser detect and report about it because the Parser + // is able to point to the context. + } + + // Reset any potential simple keys on the current flow level. + if !yaml_parser_remove_simple_key(parser) { + return false + } + + // Simple keys are allowed after '-'. + parser.simple_key_allowed = true + + // Consume the token. + start_mark := parser.mark + skip(parser) + end_mark := parser.mark + + // Create the BLOCK-ENTRY token and append it to the queue. + token := yaml_token_t{ + typ: yaml_BLOCK_ENTRY_TOKEN, + start_mark: start_mark, + end_mark: end_mark, + } + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the KEY token. +func yaml_parser_fetch_key(parser *yaml_parser_t) bool { + + // In the block context, additional checks are required. + if parser.flow_level == 0 { + // Check if we are allowed to start a new key (not nessesary simple). + if !parser.simple_key_allowed { + return yaml_parser_set_scanner_error(parser, "", parser.mark, + "mapping keys are not allowed in this context") + } + // Add the BLOCK-MAPPING-START token if needed. + if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_MAPPING_START_TOKEN, parser.mark) { + return false + } + } + + // Reset any potential simple keys on the current flow level. + if !yaml_parser_remove_simple_key(parser) { + return false + } + + // Simple keys are allowed after '?' in the block context. + parser.simple_key_allowed = parser.flow_level == 0 + + // Consume the token. + start_mark := parser.mark + skip(parser) + end_mark := parser.mark + + // Create the KEY token and append it to the queue. + token := yaml_token_t{ + typ: yaml_KEY_TOKEN, + start_mark: start_mark, + end_mark: end_mark, + } + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the VALUE token. +func yaml_parser_fetch_value(parser *yaml_parser_t) bool { + + simple_key := &parser.simple_keys[len(parser.simple_keys)-1] + + // Have we found a simple key? + if simple_key.possible { + // Create the KEY token and insert it into the queue. + token := yaml_token_t{ + typ: yaml_KEY_TOKEN, + start_mark: simple_key.mark, + end_mark: simple_key.mark, + } + yaml_insert_token(parser, simple_key.token_number-parser.tokens_parsed, &token) + + // In the block context, we may need to add the BLOCK-MAPPING-START token. + if !yaml_parser_roll_indent(parser, simple_key.mark.column, + simple_key.token_number, + yaml_BLOCK_MAPPING_START_TOKEN, simple_key.mark) { + return false + } + + // Remove the simple key. + simple_key.possible = false + + // A simple key cannot follow another simple key. + parser.simple_key_allowed = false + + } else { + // The ':' indicator follows a complex key. + + // In the block context, extra checks are required. + if parser.flow_level == 0 { + + // Check if we are allowed to start a complex value. + if !parser.simple_key_allowed { + return yaml_parser_set_scanner_error(parser, "", parser.mark, + "mapping values are not allowed in this context") + } + + // Add the BLOCK-MAPPING-START token if needed. + if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_MAPPING_START_TOKEN, parser.mark) { + return false + } + } + + // Simple keys after ':' are allowed in the block context. + parser.simple_key_allowed = parser.flow_level == 0 + } + + // Consume the token. + start_mark := parser.mark + skip(parser) + end_mark := parser.mark + + // Create the VALUE token and append it to the queue. + token := yaml_token_t{ + typ: yaml_VALUE_TOKEN, + start_mark: start_mark, + end_mark: end_mark, + } + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the ALIAS or ANCHOR token. +func yaml_parser_fetch_anchor(parser *yaml_parser_t, typ yaml_token_type_t) bool { + // An anchor or an alias could be a simple key. + if !yaml_parser_save_simple_key(parser) { + return false + } + + // A simple key cannot follow an anchor or an alias. + parser.simple_key_allowed = false + + // Create the ALIAS or ANCHOR token and append it to the queue. + var token yaml_token_t + if !yaml_parser_scan_anchor(parser, &token, typ) { + return false + } + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the TAG token. +func yaml_parser_fetch_tag(parser *yaml_parser_t) bool { + // A tag could be a simple key. + if !yaml_parser_save_simple_key(parser) { + return false + } + + // A simple key cannot follow a tag. + parser.simple_key_allowed = false + + // Create the TAG token and append it to the queue. + var token yaml_token_t + if !yaml_parser_scan_tag(parser, &token) { + return false + } + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the SCALAR(...,literal) or SCALAR(...,folded) tokens. +func yaml_parser_fetch_block_scalar(parser *yaml_parser_t, literal bool) bool { + // Remove any potential simple keys. + if !yaml_parser_remove_simple_key(parser) { + return false + } + + // A simple key may follow a block scalar. + parser.simple_key_allowed = true + + // Create the SCALAR token and append it to the queue. + var token yaml_token_t + if !yaml_parser_scan_block_scalar(parser, &token, literal) { + return false + } + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the SCALAR(...,single-quoted) or SCALAR(...,double-quoted) tokens. +func yaml_parser_fetch_flow_scalar(parser *yaml_parser_t, single bool) bool { + // A plain scalar could be a simple key. + if !yaml_parser_save_simple_key(parser) { + return false + } + + // A simple key cannot follow a flow scalar. + parser.simple_key_allowed = false + + // Create the SCALAR token and append it to the queue. + var token yaml_token_t + if !yaml_parser_scan_flow_scalar(parser, &token, single) { + return false + } + yaml_insert_token(parser, -1, &token) + return true +} + +// Produce the SCALAR(...,plain) token. +func yaml_parser_fetch_plain_scalar(parser *yaml_parser_t) bool { + // A plain scalar could be a simple key. + if !yaml_parser_save_simple_key(parser) { + return false + } + + // A simple key cannot follow a flow scalar. + parser.simple_key_allowed = false + + // Create the SCALAR token and append it to the queue. + var token yaml_token_t + if !yaml_parser_scan_plain_scalar(parser, &token) { + return false + } + yaml_insert_token(parser, -1, &token) + return true +} + +// Eat whitespaces and comments until the next token is found. +func yaml_parser_scan_to_next_token(parser *yaml_parser_t) bool { + + // Until the next token is not found. + for { + // Allow the BOM mark to start a line. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + if parser.mark.column == 0 && is_bom(parser.buffer, parser.buffer_pos) { + skip(parser) + } + + // Eat whitespaces. + // Tabs are allowed: + // - in the flow context + // - in the block context, but not at the beginning of the line or + // after '-', '?', or ':' (complex value). + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + + for parser.buffer[parser.buffer_pos] == ' ' || ((parser.flow_level > 0 || !parser.simple_key_allowed) && parser.buffer[parser.buffer_pos] == '\t') { + skip(parser) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + + // Eat a comment until a line break. + if parser.buffer[parser.buffer_pos] == '#' { + for !is_breakz(parser.buffer, parser.buffer_pos) { + skip(parser) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + } + + // If it is a line break, eat it. + if is_break(parser.buffer, parser.buffer_pos) { + if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) { + return false + } + skip_line(parser) + + // In the block context, a new line may start a simple key. + if parser.flow_level == 0 { + parser.simple_key_allowed = true + } + } else { + break // We have found a token. + } + } + + return true +} + +// Scan a YAML-DIRECTIVE or TAG-DIRECTIVE token. +// +// Scope: +// %YAML 1.1 # a comment \n +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +// %TAG !yaml! tag:yaml.org,2002: \n +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +// +func yaml_parser_scan_directive(parser *yaml_parser_t, token *yaml_token_t) bool { + // Eat '%'. + start_mark := parser.mark + skip(parser) + + // Scan the directive name. + var name []byte + if !yaml_parser_scan_directive_name(parser, start_mark, &name) { + return false + } + + // Is it a YAML directive? + if bytes.Equal(name, []byte("YAML")) { + // Scan the VERSION directive value. + var major, minor int8 + if !yaml_parser_scan_version_directive_value(parser, start_mark, &major, &minor) { + return false + } + end_mark := parser.mark + + // Create a VERSION-DIRECTIVE token. + *token = yaml_token_t{ + typ: yaml_VERSION_DIRECTIVE_TOKEN, + start_mark: start_mark, + end_mark: end_mark, + major: major, + minor: minor, + } + + // Is it a TAG directive? + } else if bytes.Equal(name, []byte("TAG")) { + // Scan the TAG directive value. + var handle, prefix []byte + if !yaml_parser_scan_tag_directive_value(parser, start_mark, &handle, &prefix) { + return false + } + end_mark := parser.mark + + // Create a TAG-DIRECTIVE token. + *token = yaml_token_t{ + typ: yaml_TAG_DIRECTIVE_TOKEN, + start_mark: start_mark, + end_mark: end_mark, + value: handle, + prefix: prefix, + } + + // Unknown directive. + } else { + yaml_parser_set_scanner_error(parser, "while scanning a directive", + start_mark, "found unknown directive name") + return false + } + + // Eat the rest of the line including any comments. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + + for is_blank(parser.buffer, parser.buffer_pos) { + skip(parser) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + + if parser.buffer[parser.buffer_pos] == '#' { + for !is_breakz(parser.buffer, parser.buffer_pos) { + skip(parser) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + } + + // Check if we are at the end of the line. + if !is_breakz(parser.buffer, parser.buffer_pos) { + yaml_parser_set_scanner_error(parser, "while scanning a directive", + start_mark, "did not find expected comment or line break") + return false + } + + // Eat a line break. + if is_break(parser.buffer, parser.buffer_pos) { + if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) { + return false + } + skip_line(parser) + } + + return true +} + +// Scan the directive name. +// +// Scope: +// %YAML 1.1 # a comment \n +// ^^^^ +// %TAG !yaml! tag:yaml.org,2002: \n +// ^^^ +// +func yaml_parser_scan_directive_name(parser *yaml_parser_t, start_mark yaml_mark_t, name *[]byte) bool { + // Consume the directive name. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + + var s []byte + for is_alpha(parser.buffer, parser.buffer_pos) { + s = read(parser, s) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + + // Check if the name is empty. + if len(s) == 0 { + yaml_parser_set_scanner_error(parser, "while scanning a directive", + start_mark, "could not find expected directive name") + return false + } + + // Check for an blank character after the name. + if !is_blankz(parser.buffer, parser.buffer_pos) { + yaml_parser_set_scanner_error(parser, "while scanning a directive", + start_mark, "found unexpected non-alphabetical character") + return false + } + *name = s + return true +} + +// Scan the value of VERSION-DIRECTIVE. +// +// Scope: +// %YAML 1.1 # a comment \n +// ^^^^^^ +func yaml_parser_scan_version_directive_value(parser *yaml_parser_t, start_mark yaml_mark_t, major, minor *int8) bool { + // Eat whitespaces. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + for is_blank(parser.buffer, parser.buffer_pos) { + skip(parser) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + + // Consume the major version number. + if !yaml_parser_scan_version_directive_number(parser, start_mark, major) { + return false + } + + // Eat '.'. + if parser.buffer[parser.buffer_pos] != '.' { + return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive", + start_mark, "did not find expected digit or '.' character") + } + + skip(parser) + + // Consume the minor version number. + if !yaml_parser_scan_version_directive_number(parser, start_mark, minor) { + return false + } + return true +} + +const max_number_length = 2 + +// Scan the version number of VERSION-DIRECTIVE. +// +// Scope: +// %YAML 1.1 # a comment \n +// ^ +// %YAML 1.1 # a comment \n +// ^ +func yaml_parser_scan_version_directive_number(parser *yaml_parser_t, start_mark yaml_mark_t, number *int8) bool { + + // Repeat while the next character is digit. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + var value, length int8 + for is_digit(parser.buffer, parser.buffer_pos) { + // Check if the number is too long. + length++ + if length > max_number_length { + return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive", + start_mark, "found extremely long version number") + } + value = value*10 + int8(as_digit(parser.buffer, parser.buffer_pos)) + skip(parser) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + + // Check if the number was present. + if length == 0 { + return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive", + start_mark, "did not find expected version number") + } + *number = value + return true +} + +// Scan the value of a TAG-DIRECTIVE token. +// +// Scope: +// %TAG !yaml! tag:yaml.org,2002: \n +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +// +func yaml_parser_scan_tag_directive_value(parser *yaml_parser_t, start_mark yaml_mark_t, handle, prefix *[]byte) bool { + var handle_value, prefix_value []byte + + // Eat whitespaces. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + + for is_blank(parser.buffer, parser.buffer_pos) { + skip(parser) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + + // Scan a handle. + if !yaml_parser_scan_tag_handle(parser, true, start_mark, &handle_value) { + return false + } + + // Expect a whitespace. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + if !is_blank(parser.buffer, parser.buffer_pos) { + yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive", + start_mark, "did not find expected whitespace") + return false + } + + // Eat whitespaces. + for is_blank(parser.buffer, parser.buffer_pos) { + skip(parser) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + + // Scan a prefix. + if !yaml_parser_scan_tag_uri(parser, true, nil, start_mark, &prefix_value) { + return false + } + + // Expect a whitespace or line break. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + if !is_blankz(parser.buffer, parser.buffer_pos) { + yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive", + start_mark, "did not find expected whitespace or line break") + return false + } + + *handle = handle_value + *prefix = prefix_value + return true +} + +func yaml_parser_scan_anchor(parser *yaml_parser_t, token *yaml_token_t, typ yaml_token_type_t) bool { + var s []byte + + // Eat the indicator character. + start_mark := parser.mark + skip(parser) + + // Consume the value. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + + for is_alpha(parser.buffer, parser.buffer_pos) { + s = read(parser, s) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + + end_mark := parser.mark + + /* + * Check if length of the anchor is greater than 0 and it is followed by + * a whitespace character or one of the indicators: + * + * '?', ':', ',', ']', '}', '%', '@', '`'. + */ + + if len(s) == 0 || + !(is_blankz(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == '?' || + parser.buffer[parser.buffer_pos] == ':' || parser.buffer[parser.buffer_pos] == ',' || + parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '}' || + parser.buffer[parser.buffer_pos] == '%' || parser.buffer[parser.buffer_pos] == '@' || + parser.buffer[parser.buffer_pos] == '`') { + context := "while scanning an alias" + if typ == yaml_ANCHOR_TOKEN { + context = "while scanning an anchor" + } + yaml_parser_set_scanner_error(parser, context, start_mark, + "did not find expected alphabetic or numeric character") + return false + } + + // Create a token. + *token = yaml_token_t{ + typ: typ, + start_mark: start_mark, + end_mark: end_mark, + value: s, + } + + return true +} + +/* + * Scan a TAG token. + */ + +func yaml_parser_scan_tag(parser *yaml_parser_t, token *yaml_token_t) bool { + var handle, suffix []byte + + start_mark := parser.mark + + // Check if the tag is in the canonical form. + if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) { + return false + } + + if parser.buffer[parser.buffer_pos+1] == '<' { + // Keep the handle as '' + + // Eat '!<' + skip(parser) + skip(parser) + + // Consume the tag value. + if !yaml_parser_scan_tag_uri(parser, false, nil, start_mark, &suffix) { + return false + } + + // Check for '>' and eat it. + if parser.buffer[parser.buffer_pos] != '>' { + yaml_parser_set_scanner_error(parser, "while scanning a tag", + start_mark, "did not find the expected '>'") + return false + } + + skip(parser) + } else { + // The tag has either the '!suffix' or the '!handle!suffix' form. + + // First, try to scan a handle. + if !yaml_parser_scan_tag_handle(parser, false, start_mark, &handle) { + return false + } + + // Check if it is, indeed, handle. + if handle[0] == '!' && len(handle) > 1 && handle[len(handle)-1] == '!' { + // Scan the suffix now. + if !yaml_parser_scan_tag_uri(parser, false, nil, start_mark, &suffix) { + return false + } + } else { + // It wasn't a handle after all. Scan the rest of the tag. + if !yaml_parser_scan_tag_uri(parser, false, handle, start_mark, &suffix) { + return false + } + + // Set the handle to '!'. + handle = []byte{'!'} + + // A special case: the '!' tag. Set the handle to '' and the + // suffix to '!'. + if len(suffix) == 0 { + handle, suffix = suffix, handle + } + } + } + + // Check the character which ends the tag. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + if !is_blankz(parser.buffer, parser.buffer_pos) { + yaml_parser_set_scanner_error(parser, "while scanning a tag", + start_mark, "did not find expected whitespace or line break") + return false + } + + end_mark := parser.mark + + // Create a token. + *token = yaml_token_t{ + typ: yaml_TAG_TOKEN, + start_mark: start_mark, + end_mark: end_mark, + value: handle, + suffix: suffix, + } + return true +} + +// Scan a tag handle. +func yaml_parser_scan_tag_handle(parser *yaml_parser_t, directive bool, start_mark yaml_mark_t, handle *[]byte) bool { + // Check the initial '!' character. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + if parser.buffer[parser.buffer_pos] != '!' { + yaml_parser_set_scanner_tag_error(parser, directive, + start_mark, "did not find expected '!'") + return false + } + + var s []byte + + // Copy the '!' character. + s = read(parser, s) + + // Copy all subsequent alphabetical and numerical characters. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + for is_alpha(parser.buffer, parser.buffer_pos) { + s = read(parser, s) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + + // Check if the trailing character is '!' and copy it. + if parser.buffer[parser.buffer_pos] == '!' { + s = read(parser, s) + } else { + // It's either the '!' tag or not really a tag handle. If it's a %TAG + // directive, it's an error. If it's a tag token, it must be a part of URI. + if directive && string(s) != "!" { + yaml_parser_set_scanner_tag_error(parser, directive, + start_mark, "did not find expected '!'") + return false + } + } + + *handle = s + return true +} + +// Scan a tag. +func yaml_parser_scan_tag_uri(parser *yaml_parser_t, directive bool, head []byte, start_mark yaml_mark_t, uri *[]byte) bool { + //size_t length = head ? strlen((char *)head) : 0 + var s []byte + hasTag := len(head) > 0 + + // Copy the head if needed. + // + // Note that we don't copy the leading '!' character. + if len(head) > 1 { + s = append(s, head[1:]...) + } + + // Scan the tag. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + + // The set of characters that may appear in URI is as follows: + // + // '0'-'9', 'A'-'Z', 'a'-'z', '_', '-', ';', '/', '?', ':', '@', '&', + // '=', '+', '$', ',', '.', '!', '~', '*', '\'', '(', ')', '[', ']', + // '%'. + // [Go] Convert this into more reasonable logic. + for is_alpha(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == ';' || + parser.buffer[parser.buffer_pos] == '/' || parser.buffer[parser.buffer_pos] == '?' || + parser.buffer[parser.buffer_pos] == ':' || parser.buffer[parser.buffer_pos] == '@' || + parser.buffer[parser.buffer_pos] == '&' || parser.buffer[parser.buffer_pos] == '=' || + parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '$' || + parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == '.' || + parser.buffer[parser.buffer_pos] == '!' || parser.buffer[parser.buffer_pos] == '~' || + parser.buffer[parser.buffer_pos] == '*' || parser.buffer[parser.buffer_pos] == '\'' || + parser.buffer[parser.buffer_pos] == '(' || parser.buffer[parser.buffer_pos] == ')' || + parser.buffer[parser.buffer_pos] == '[' || parser.buffer[parser.buffer_pos] == ']' || + parser.buffer[parser.buffer_pos] == '%' { + // Check if it is a URI-escape sequence. + if parser.buffer[parser.buffer_pos] == '%' { + if !yaml_parser_scan_uri_escapes(parser, directive, start_mark, &s) { + return false + } + } else { + s = read(parser, s) + } + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + hasTag = true + } + + if !hasTag { + yaml_parser_set_scanner_tag_error(parser, directive, + start_mark, "did not find expected tag URI") + return false + } + *uri = s + return true +} + +// Decode an URI-escape sequence corresponding to a single UTF-8 character. +func yaml_parser_scan_uri_escapes(parser *yaml_parser_t, directive bool, start_mark yaml_mark_t, s *[]byte) bool { + + // Decode the required number of characters. + w := 1024 + for w > 0 { + // Check for a URI-escaped octet. + if parser.unread < 3 && !yaml_parser_update_buffer(parser, 3) { + return false + } + + if !(parser.buffer[parser.buffer_pos] == '%' && + is_hex(parser.buffer, parser.buffer_pos+1) && + is_hex(parser.buffer, parser.buffer_pos+2)) { + return yaml_parser_set_scanner_tag_error(parser, directive, + start_mark, "did not find URI escaped octet") + } + + // Get the octet. + octet := byte((as_hex(parser.buffer, parser.buffer_pos+1) << 4) + as_hex(parser.buffer, parser.buffer_pos+2)) + + // If it is the leading octet, determine the length of the UTF-8 sequence. + if w == 1024 { + w = width(octet) + if w == 0 { + return yaml_parser_set_scanner_tag_error(parser, directive, + start_mark, "found an incorrect leading UTF-8 octet") + } + } else { + // Check if the trailing octet is correct. + if octet&0xC0 != 0x80 { + return yaml_parser_set_scanner_tag_error(parser, directive, + start_mark, "found an incorrect trailing UTF-8 octet") + } + } + + // Copy the octet and move the pointers. + *s = append(*s, octet) + skip(parser) + skip(parser) + skip(parser) + w-- + } + return true +} + +// Scan a block scalar. +func yaml_parser_scan_block_scalar(parser *yaml_parser_t, token *yaml_token_t, literal bool) bool { + // Eat the indicator '|' or '>'. + start_mark := parser.mark + skip(parser) + + // Scan the additional block scalar indicators. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + + // Check for a chomping indicator. + var chomping, increment int + if parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '-' { + // Set the chomping method and eat the indicator. + if parser.buffer[parser.buffer_pos] == '+' { + chomping = +1 + } else { + chomping = -1 + } + skip(parser) + + // Check for an indentation indicator. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + if is_digit(parser.buffer, parser.buffer_pos) { + // Check that the indentation is greater than 0. + if parser.buffer[parser.buffer_pos] == '0' { + yaml_parser_set_scanner_error(parser, "while scanning a block scalar", + start_mark, "found an indentation indicator equal to 0") + return false + } + + // Get the indentation level and eat the indicator. + increment = as_digit(parser.buffer, parser.buffer_pos) + skip(parser) + } + + } else if is_digit(parser.buffer, parser.buffer_pos) { + // Do the same as above, but in the opposite order. + + if parser.buffer[parser.buffer_pos] == '0' { + yaml_parser_set_scanner_error(parser, "while scanning a block scalar", + start_mark, "found an indentation indicator equal to 0") + return false + } + increment = as_digit(parser.buffer, parser.buffer_pos) + skip(parser) + + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + if parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '-' { + if parser.buffer[parser.buffer_pos] == '+' { + chomping = +1 + } else { + chomping = -1 + } + skip(parser) + } + } + + // Eat whitespaces and comments to the end of the line. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + for is_blank(parser.buffer, parser.buffer_pos) { + skip(parser) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + if parser.buffer[parser.buffer_pos] == '#' { + for !is_breakz(parser.buffer, parser.buffer_pos) { + skip(parser) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + } + + // Check if we are at the end of the line. + if !is_breakz(parser.buffer, parser.buffer_pos) { + yaml_parser_set_scanner_error(parser, "while scanning a block scalar", + start_mark, "did not find expected comment or line break") + return false + } + + // Eat a line break. + if is_break(parser.buffer, parser.buffer_pos) { + if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) { + return false + } + skip_line(parser) + } + + end_mark := parser.mark + + // Set the indentation level if it was specified. + var indent int + if increment > 0 { + if parser.indent >= 0 { + indent = parser.indent + increment + } else { + indent = increment + } + } + + // Scan the leading line breaks and determine the indentation level if needed. + var s, leading_break, trailing_breaks []byte + if !yaml_parser_scan_block_scalar_breaks(parser, &indent, &trailing_breaks, start_mark, &end_mark) { + return false + } + + // Scan the block scalar content. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + var leading_blank, trailing_blank bool + for parser.mark.column == indent && !is_z(parser.buffer, parser.buffer_pos) { + // We are at the beginning of a non-empty line. + + // Is it a trailing whitespace? + trailing_blank = is_blank(parser.buffer, parser.buffer_pos) + + // Check if we need to fold the leading line break. + if !literal && !leading_blank && !trailing_blank && len(leading_break) > 0 && leading_break[0] == '\n' { + // Do we need to join the lines by space? + if len(trailing_breaks) == 0 { + s = append(s, ' ') + } + } else { + s = append(s, leading_break...) + } + leading_break = leading_break[:0] + + // Append the remaining line breaks. + s = append(s, trailing_breaks...) + trailing_breaks = trailing_breaks[:0] + + // Is it a leading whitespace? + leading_blank = is_blank(parser.buffer, parser.buffer_pos) + + // Consume the current line. + for !is_breakz(parser.buffer, parser.buffer_pos) { + s = read(parser, s) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + + // Consume the line break. + if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) { + return false + } + + leading_break = read_line(parser, leading_break) + + // Eat the following indentation spaces and line breaks. + if !yaml_parser_scan_block_scalar_breaks(parser, &indent, &trailing_breaks, start_mark, &end_mark) { + return false + } + } + + // Chomp the tail. + if chomping != -1 { + s = append(s, leading_break...) + } + if chomping == 1 { + s = append(s, trailing_breaks...) + } + + // Create a token. + *token = yaml_token_t{ + typ: yaml_SCALAR_TOKEN, + start_mark: start_mark, + end_mark: end_mark, + value: s, + style: yaml_LITERAL_SCALAR_STYLE, + } + if !literal { + token.style = yaml_FOLDED_SCALAR_STYLE + } + return true +} + +// Scan indentation spaces and line breaks for a block scalar. Determine the +// indentation level if needed. +func yaml_parser_scan_block_scalar_breaks(parser *yaml_parser_t, indent *int, breaks *[]byte, start_mark yaml_mark_t, end_mark *yaml_mark_t) bool { + *end_mark = parser.mark + + // Eat the indentation spaces and line breaks. + max_indent := 0 + for { + // Eat the indentation spaces. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + for (*indent == 0 || parser.mark.column < *indent) && is_space(parser.buffer, parser.buffer_pos) { + skip(parser) + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + if parser.mark.column > max_indent { + max_indent = parser.mark.column + } + + // Check for a tab character messing the indentation. + if (*indent == 0 || parser.mark.column < *indent) && is_tab(parser.buffer, parser.buffer_pos) { + return yaml_parser_set_scanner_error(parser, "while scanning a block scalar", + start_mark, "found a tab character where an indentation space is expected") + } + + // Have we found a non-empty line? + if !is_break(parser.buffer, parser.buffer_pos) { + break + } + + // Consume the line break. + if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) { + return false + } + // [Go] Should really be returning breaks instead. + *breaks = read_line(parser, *breaks) + *end_mark = parser.mark + } + + // Determine the indentation level if needed. + if *indent == 0 { + *indent = max_indent + if *indent < parser.indent+1 { + *indent = parser.indent + 1 + } + if *indent < 1 { + *indent = 1 + } + } + return true +} + +// Scan a quoted scalar. +func yaml_parser_scan_flow_scalar(parser *yaml_parser_t, token *yaml_token_t, single bool) bool { + // Eat the left quote. + start_mark := parser.mark + skip(parser) + + // Consume the content of the quoted scalar. + var s, leading_break, trailing_breaks, whitespaces []byte + for { + // Check that there are no document indicators at the beginning of the line. + if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) { + return false + } + + if parser.mark.column == 0 && + ((parser.buffer[parser.buffer_pos+0] == '-' && + parser.buffer[parser.buffer_pos+1] == '-' && + parser.buffer[parser.buffer_pos+2] == '-') || + (parser.buffer[parser.buffer_pos+0] == '.' && + parser.buffer[parser.buffer_pos+1] == '.' && + parser.buffer[parser.buffer_pos+2] == '.')) && + is_blankz(parser.buffer, parser.buffer_pos+3) { + yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar", + start_mark, "found unexpected document indicator") + return false + } + + // Check for EOF. + if is_z(parser.buffer, parser.buffer_pos) { + yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar", + start_mark, "found unexpected end of stream") + return false + } + + // Consume non-blank characters. + leading_blanks := false + for !is_blankz(parser.buffer, parser.buffer_pos) { + if single && parser.buffer[parser.buffer_pos] == '\'' && parser.buffer[parser.buffer_pos+1] == '\'' { + // Is is an escaped single quote. + s = append(s, '\'') + skip(parser) + skip(parser) + + } else if single && parser.buffer[parser.buffer_pos] == '\'' { + // It is a right single quote. + break + } else if !single && parser.buffer[parser.buffer_pos] == '"' { + // It is a right double quote. + break + + } else if !single && parser.buffer[parser.buffer_pos] == '\\' && is_break(parser.buffer, parser.buffer_pos+1) { + // It is an escaped line break. + if parser.unread < 3 && !yaml_parser_update_buffer(parser, 3) { + return false + } + skip(parser) + skip_line(parser) + leading_blanks = true + break + + } else if !single && parser.buffer[parser.buffer_pos] == '\\' { + // It is an escape sequence. + code_length := 0 + + // Check the escape character. + switch parser.buffer[parser.buffer_pos+1] { + case '0': + s = append(s, 0) + case 'a': + s = append(s, '\x07') + case 'b': + s = append(s, '\x08') + case 't', '\t': + s = append(s, '\x09') + case 'n': + s = append(s, '\x0A') + case 'v': + s = append(s, '\x0B') + case 'f': + s = append(s, '\x0C') + case 'r': + s = append(s, '\x0D') + case 'e': + s = append(s, '\x1B') + case ' ': + s = append(s, '\x20') + case '"': + s = append(s, '"') + case '\'': + s = append(s, '\'') + case '\\': + s = append(s, '\\') + case 'N': // NEL (#x85) + s = append(s, '\xC2') + s = append(s, '\x85') + case '_': // #xA0 + s = append(s, '\xC2') + s = append(s, '\xA0') + case 'L': // LS (#x2028) + s = append(s, '\xE2') + s = append(s, '\x80') + s = append(s, '\xA8') + case 'P': // PS (#x2029) + s = append(s, '\xE2') + s = append(s, '\x80') + s = append(s, '\xA9') + case 'x': + code_length = 2 + case 'u': + code_length = 4 + case 'U': + code_length = 8 + default: + yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar", + start_mark, "found unknown escape character") + return false + } + + skip(parser) + skip(parser) + + // Consume an arbitrary escape code. + if code_length > 0 { + var value int + + // Scan the character value. + if parser.unread < code_length && !yaml_parser_update_buffer(parser, code_length) { + return false + } + for k := 0; k < code_length; k++ { + if !is_hex(parser.buffer, parser.buffer_pos+k) { + yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar", + start_mark, "did not find expected hexdecimal number") + return false + } + value = (value << 4) + as_hex(parser.buffer, parser.buffer_pos+k) + } + + // Check the value and write the character. + if (value >= 0xD800 && value <= 0xDFFF) || value > 0x10FFFF { + yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar", + start_mark, "found invalid Unicode character escape code") + return false + } + if value <= 0x7F { + s = append(s, byte(value)) + } else if value <= 0x7FF { + s = append(s, byte(0xC0+(value>>6))) + s = append(s, byte(0x80+(value&0x3F))) + } else if value <= 0xFFFF { + s = append(s, byte(0xE0+(value>>12))) + s = append(s, byte(0x80+((value>>6)&0x3F))) + s = append(s, byte(0x80+(value&0x3F))) + } else { + s = append(s, byte(0xF0+(value>>18))) + s = append(s, byte(0x80+((value>>12)&0x3F))) + s = append(s, byte(0x80+((value>>6)&0x3F))) + s = append(s, byte(0x80+(value&0x3F))) + } + + // Advance the pointer. + for k := 0; k < code_length; k++ { + skip(parser) + } + } + } else { + // It is a non-escaped non-blank character. + s = read(parser, s) + } + if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) { + return false + } + } + + // Check if we are at the end of the scalar. + if single { + if parser.buffer[parser.buffer_pos] == '\'' { + break + } + } else { + if parser.buffer[parser.buffer_pos] == '"' { + break + } + } + + // Consume blank characters. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + + for is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos) { + if is_blank(parser.buffer, parser.buffer_pos) { + // Consume a space or a tab character. + if !leading_blanks { + whitespaces = read(parser, whitespaces) + } else { + skip(parser) + } + } else { + if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) { + return false + } + + // Check if it is a first line break. + if !leading_blanks { + whitespaces = whitespaces[:0] + leading_break = read_line(parser, leading_break) + leading_blanks = true + } else { + trailing_breaks = read_line(parser, trailing_breaks) + } + } + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + + // Join the whitespaces or fold line breaks. + if leading_blanks { + // Do we need to fold line breaks? + if len(leading_break) > 0 && leading_break[0] == '\n' { + if len(trailing_breaks) == 0 { + s = append(s, ' ') + } else { + s = append(s, trailing_breaks...) + } + } else { + s = append(s, leading_break...) + s = append(s, trailing_breaks...) + } + trailing_breaks = trailing_breaks[:0] + leading_break = leading_break[:0] + } else { + s = append(s, whitespaces...) + whitespaces = whitespaces[:0] + } + } + + // Eat the right quote. + skip(parser) + end_mark := parser.mark + + // Create a token. + *token = yaml_token_t{ + typ: yaml_SCALAR_TOKEN, + start_mark: start_mark, + end_mark: end_mark, + value: s, + style: yaml_SINGLE_QUOTED_SCALAR_STYLE, + } + if !single { + token.style = yaml_DOUBLE_QUOTED_SCALAR_STYLE + } + return true +} + +// Scan a plain scalar. +func yaml_parser_scan_plain_scalar(parser *yaml_parser_t, token *yaml_token_t) bool { + + var s, leading_break, trailing_breaks, whitespaces []byte + var leading_blanks bool + var indent = parser.indent + 1 + + start_mark := parser.mark + end_mark := parser.mark + + // Consume the content of the plain scalar. + for { + // Check for a document indicator. + if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) { + return false + } + if parser.mark.column == 0 && + ((parser.buffer[parser.buffer_pos+0] == '-' && + parser.buffer[parser.buffer_pos+1] == '-' && + parser.buffer[parser.buffer_pos+2] == '-') || + (parser.buffer[parser.buffer_pos+0] == '.' && + parser.buffer[parser.buffer_pos+1] == '.' && + parser.buffer[parser.buffer_pos+2] == '.')) && + is_blankz(parser.buffer, parser.buffer_pos+3) { + break + } + + // Check for a comment. + if parser.buffer[parser.buffer_pos] == '#' { + break + } + + // Consume non-blank characters. + for !is_blankz(parser.buffer, parser.buffer_pos) { + + // Check for indicators that may end a plain scalar. + if (parser.buffer[parser.buffer_pos] == ':' && is_blankz(parser.buffer, parser.buffer_pos+1)) || + (parser.flow_level > 0 && + (parser.buffer[parser.buffer_pos] == ',' || + parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == '[' || + parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '{' || + parser.buffer[parser.buffer_pos] == '}')) { + break + } + + // Check if we need to join whitespaces and breaks. + if leading_blanks || len(whitespaces) > 0 { + if leading_blanks { + // Do we need to fold line breaks? + if leading_break[0] == '\n' { + if len(trailing_breaks) == 0 { + s = append(s, ' ') + } else { + s = append(s, trailing_breaks...) + } + } else { + s = append(s, leading_break...) + s = append(s, trailing_breaks...) + } + trailing_breaks = trailing_breaks[:0] + leading_break = leading_break[:0] + leading_blanks = false + } else { + s = append(s, whitespaces...) + whitespaces = whitespaces[:0] + } + } + + // Copy the character. + s = read(parser, s) + + end_mark = parser.mark + if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) { + return false + } + } + + // Is it the end? + if !(is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos)) { + break + } + + // Consume blank characters. + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + + for is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos) { + if is_blank(parser.buffer, parser.buffer_pos) { + + // Check for tab character that abuse indentation. + if leading_blanks && parser.mark.column < indent && is_tab(parser.buffer, parser.buffer_pos) { + yaml_parser_set_scanner_error(parser, "while scanning a plain scalar", + start_mark, "found a tab character that violate indentation") + return false + } + + // Consume a space or a tab character. + if !leading_blanks { + whitespaces = read(parser, whitespaces) + } else { + skip(parser) + } + } else { + if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) { + return false + } + + // Check if it is a first line break. + if !leading_blanks { + whitespaces = whitespaces[:0] + leading_break = read_line(parser, leading_break) + leading_blanks = true + } else { + trailing_breaks = read_line(parser, trailing_breaks) + } + } + if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) { + return false + } + } + + // Check indentation level. + if parser.flow_level == 0 && parser.mark.column < indent { + break + } + } + + // Create a token. + *token = yaml_token_t{ + typ: yaml_SCALAR_TOKEN, + start_mark: start_mark, + end_mark: end_mark, + value: s, + style: yaml_PLAIN_SCALAR_STYLE, + } + + // Note that we change the 'simple_key_allowed' flag. + if leading_blanks { + parser.simple_key_allowed = true + } + return true +} diff --git a/vendor/gopkg.in/yaml.v2/sorter.go b/vendor/gopkg.in/yaml.v2/sorter.go new file mode 100644 index 000000000000..5958822f9c6b --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/sorter.go @@ -0,0 +1,104 @@ +package yaml + +import ( + "reflect" + "unicode" +) + +type keyList []reflect.Value + +func (l keyList) Len() int { return len(l) } +func (l keyList) Swap(i, j int) { l[i], l[j] = l[j], l[i] } +func (l keyList) Less(i, j int) bool { + a := l[i] + b := l[j] + ak := a.Kind() + bk := b.Kind() + for (ak == reflect.Interface || ak == reflect.Ptr) && !a.IsNil() { + a = a.Elem() + ak = a.Kind() + } + for (bk == reflect.Interface || bk == reflect.Ptr) && !b.IsNil() { + b = b.Elem() + bk = b.Kind() + } + af, aok := keyFloat(a) + bf, bok := keyFloat(b) + if aok && bok { + if af != bf { + return af < bf + } + if ak != bk { + return ak < bk + } + return numLess(a, b) + } + if ak != reflect.String || bk != reflect.String { + return ak < bk + } + ar, br := []rune(a.String()), []rune(b.String()) + for i := 0; i < len(ar) && i < len(br); i++ { + if ar[i] == br[i] { + continue + } + al := unicode.IsLetter(ar[i]) + bl := unicode.IsLetter(br[i]) + if al && bl { + return ar[i] < br[i] + } + if al || bl { + return bl + } + var ai, bi int + var an, bn int64 + for ai = i; ai < len(ar) && unicode.IsDigit(ar[ai]); ai++ { + an = an*10 + int64(ar[ai]-'0') + } + for bi = i; bi < len(br) && unicode.IsDigit(br[bi]); bi++ { + bn = bn*10 + int64(br[bi]-'0') + } + if an != bn { + return an < bn + } + if ai != bi { + return ai < bi + } + return ar[i] < br[i] + } + return len(ar) < len(br) +} + +// keyFloat returns a float value for v if it is a number/bool +// and whether it is a number/bool or not. +func keyFloat(v reflect.Value) (f float64, ok bool) { + switch v.Kind() { + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + return float64(v.Int()), true + case reflect.Float32, reflect.Float64: + return v.Float(), true + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: + return float64(v.Uint()), true + case reflect.Bool: + if v.Bool() { + return 1, true + } + return 0, true + } + return 0, false +} + +// numLess returns whether a < b. +// a and b must necessarily have the same kind. +func numLess(a, b reflect.Value) bool { + switch a.Kind() { + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + return a.Int() < b.Int() + case reflect.Float32, reflect.Float64: + return a.Float() < b.Float() + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: + return a.Uint() < b.Uint() + case reflect.Bool: + return !a.Bool() && b.Bool() + } + panic("not a number") +} diff --git a/vendor/gopkg.in/yaml.v2/writerc.go b/vendor/gopkg.in/yaml.v2/writerc.go new file mode 100644 index 000000000000..a2dde608cb7a --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/writerc.go @@ -0,0 +1,26 @@ +package yaml + +// Set the writer error and return false. +func yaml_emitter_set_writer_error(emitter *yaml_emitter_t, problem string) bool { + emitter.error = yaml_WRITER_ERROR + emitter.problem = problem + return false +} + +// Flush the output buffer. +func yaml_emitter_flush(emitter *yaml_emitter_t) bool { + if emitter.write_handler == nil { + panic("write handler not set") + } + + // Check if the buffer is empty. + if emitter.buffer_pos == 0 { + return true + } + + if err := emitter.write_handler(emitter, emitter.buffer[:emitter.buffer_pos]); err != nil { + return yaml_emitter_set_writer_error(emitter, "write error: "+err.Error()) + } + emitter.buffer_pos = 0 + return true +} diff --git a/vendor/gopkg.in/yaml.v2/yaml.go b/vendor/gopkg.in/yaml.v2/yaml.go new file mode 100644 index 000000000000..483aae58781c --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/yaml.go @@ -0,0 +1,466 @@ +// Package yaml implements YAML support for the Go language. +// +// Source code and other details for the project are available at GitHub: +// +// https://github.com/go-yaml/yaml +// +package yaml + +import ( + "errors" + "fmt" + "io" + "reflect" + "strings" + "sync" +) + +// MapSlice encodes and decodes as a YAML map. +// The order of keys is preserved when encoding and decoding. +type MapSlice []MapItem + +// MapItem is an item in a MapSlice. +type MapItem struct { + Key, Value interface{} +} + +// The Unmarshaler interface may be implemented by types to customize their +// behavior when being unmarshaled from a YAML document. The UnmarshalYAML +// method receives a function that may be called to unmarshal the original +// YAML value into a field or variable. It is safe to call the unmarshal +// function parameter more than once if necessary. +type Unmarshaler interface { + UnmarshalYAML(unmarshal func(interface{}) error) error +} + +// The Marshaler interface may be implemented by types to customize their +// behavior when being marshaled into a YAML document. The returned value +// is marshaled in place of the original value implementing Marshaler. +// +// If an error is returned by MarshalYAML, the marshaling procedure stops +// and returns with the provided error. +type Marshaler interface { + MarshalYAML() (interface{}, error) +} + +// Unmarshal decodes the first document found within the in byte slice +// and assigns decoded values into the out value. +// +// Maps and pointers (to a struct, string, int, etc) are accepted as out +// values. If an internal pointer within a struct is not initialized, +// the yaml package will initialize it if necessary for unmarshalling +// the provided data. The out parameter must not be nil. +// +// The type of the decoded values should be compatible with the respective +// values in out. If one or more values cannot be decoded due to a type +// mismatches, decoding continues partially until the end of the YAML +// content, and a *yaml.TypeError is returned with details for all +// missed values. +// +// Struct fields are only unmarshalled if they are exported (have an +// upper case first letter), and are unmarshalled using the field name +// lowercased as the default key. Custom keys may be defined via the +// "yaml" name in the field tag: the content preceding the first comma +// is used as the key, and the following comma-separated options are +// used to tweak the marshalling process (see Marshal). +// Conflicting names result in a runtime error. +// +// For example: +// +// type T struct { +// F int `yaml:"a,omitempty"` +// B int +// } +// var t T +// yaml.Unmarshal([]byte("a: 1\nb: 2"), &t) +// +// See the documentation of Marshal for the format of tags and a list of +// supported tag options. +// +func Unmarshal(in []byte, out interface{}) (err error) { + return unmarshal(in, out, false) +} + +// UnmarshalStrict is like Unmarshal except that any fields that are found +// in the data that do not have corresponding struct members, or mapping +// keys that are duplicates, will result in +// an error. +func UnmarshalStrict(in []byte, out interface{}) (err error) { + return unmarshal(in, out, true) +} + +// A Decorder reads and decodes YAML values from an input stream. +type Decoder struct { + strict bool + parser *parser +} + +// NewDecoder returns a new decoder that reads from r. +// +// The decoder introduces its own buffering and may read +// data from r beyond the YAML values requested. +func NewDecoder(r io.Reader) *Decoder { + return &Decoder{ + parser: newParserFromReader(r), + } +} + +// SetStrict sets whether strict decoding behaviour is enabled when +// decoding items in the data (see UnmarshalStrict). By default, decoding is not strict. +func (dec *Decoder) SetStrict(strict bool) { + dec.strict = strict +} + +// Decode reads the next YAML-encoded value from its input +// and stores it in the value pointed to by v. +// +// See the documentation for Unmarshal for details about the +// conversion of YAML into a Go value. +func (dec *Decoder) Decode(v interface{}) (err error) { + d := newDecoder(dec.strict) + defer handleErr(&err) + node := dec.parser.parse() + if node == nil { + return io.EOF + } + out := reflect.ValueOf(v) + if out.Kind() == reflect.Ptr && !out.IsNil() { + out = out.Elem() + } + d.unmarshal(node, out) + if len(d.terrors) > 0 { + return &TypeError{d.terrors} + } + return nil +} + +func unmarshal(in []byte, out interface{}, strict bool) (err error) { + defer handleErr(&err) + d := newDecoder(strict) + p := newParser(in) + defer p.destroy() + node := p.parse() + if node != nil { + v := reflect.ValueOf(out) + if v.Kind() == reflect.Ptr && !v.IsNil() { + v = v.Elem() + } + d.unmarshal(node, v) + } + if len(d.terrors) > 0 { + return &TypeError{d.terrors} + } + return nil +} + +// Marshal serializes the value provided into a YAML document. The structure +// of the generated document will reflect the structure of the value itself. +// Maps and pointers (to struct, string, int, etc) are accepted as the in value. +// +// Struct fields are only unmarshalled if they are exported (have an upper case +// first letter), and are unmarshalled using the field name lowercased as the +// default key. Custom keys may be defined via the "yaml" name in the field +// tag: the content preceding the first comma is used as the key, and the +// following comma-separated options are used to tweak the marshalling process. +// Conflicting names result in a runtime error. +// +// The field tag format accepted is: +// +// `(...) yaml:"[][,[,]]" (...)` +// +// The following flags are currently supported: +// +// omitempty Only include the field if it's not set to the zero +// value for the type or to empty slices or maps. +// Zero valued structs will be omitted if all their public +// fields are zero, unless they implement an IsZero +// method (see the IsZeroer interface type), in which +// case the field will be included if that method returns true. +// +// flow Marshal using a flow style (useful for structs, +// sequences and maps). +// +// inline Inline the field, which must be a struct or a map, +// causing all of its fields or keys to be processed as if +// they were part of the outer struct. For maps, keys must +// not conflict with the yaml keys of other struct fields. +// +// In addition, if the key is "-", the field is ignored. +// +// For example: +// +// type T struct { +// F int `yaml:"a,omitempty"` +// B int +// } +// yaml.Marshal(&T{B: 2}) // Returns "b: 2\n" +// yaml.Marshal(&T{F: 1}} // Returns "a: 1\nb: 0\n" +// +func Marshal(in interface{}) (out []byte, err error) { + defer handleErr(&err) + e := newEncoder() + defer e.destroy() + e.marshalDoc("", reflect.ValueOf(in)) + e.finish() + out = e.out + return +} + +// An Encoder writes YAML values to an output stream. +type Encoder struct { + encoder *encoder +} + +// NewEncoder returns a new encoder that writes to w. +// The Encoder should be closed after use to flush all data +// to w. +func NewEncoder(w io.Writer) *Encoder { + return &Encoder{ + encoder: newEncoderWithWriter(w), + } +} + +// Encode writes the YAML encoding of v to the stream. +// If multiple items are encoded to the stream, the +// second and subsequent document will be preceded +// with a "---" document separator, but the first will not. +// +// See the documentation for Marshal for details about the conversion of Go +// values to YAML. +func (e *Encoder) Encode(v interface{}) (err error) { + defer handleErr(&err) + e.encoder.marshalDoc("", reflect.ValueOf(v)) + return nil +} + +// Close closes the encoder by writing any remaining data. +// It does not write a stream terminating string "...". +func (e *Encoder) Close() (err error) { + defer handleErr(&err) + e.encoder.finish() + return nil +} + +func handleErr(err *error) { + if v := recover(); v != nil { + if e, ok := v.(yamlError); ok { + *err = e.err + } else { + panic(v) + } + } +} + +type yamlError struct { + err error +} + +func fail(err error) { + panic(yamlError{err}) +} + +func failf(format string, args ...interface{}) { + panic(yamlError{fmt.Errorf("yaml: "+format, args...)}) +} + +// A TypeError is returned by Unmarshal when one or more fields in +// the YAML document cannot be properly decoded into the requested +// types. When this error is returned, the value is still +// unmarshaled partially. +type TypeError struct { + Errors []string +} + +func (e *TypeError) Error() string { + return fmt.Sprintf("yaml: unmarshal errors:\n %s", strings.Join(e.Errors, "\n ")) +} + +// -------------------------------------------------------------------------- +// Maintain a mapping of keys to structure field indexes + +// The code in this section was copied from mgo/bson. + +// structInfo holds details for the serialization of fields of +// a given struct. +type structInfo struct { + FieldsMap map[string]fieldInfo + FieldsList []fieldInfo + + // InlineMap is the number of the field in the struct that + // contains an ,inline map, or -1 if there's none. + InlineMap int +} + +type fieldInfo struct { + Key string + Num int + OmitEmpty bool + Flow bool + // Id holds the unique field identifier, so we can cheaply + // check for field duplicates without maintaining an extra map. + Id int + + // Inline holds the field index if the field is part of an inlined struct. + Inline []int +} + +var structMap = make(map[reflect.Type]*structInfo) +var fieldMapMutex sync.RWMutex + +func getStructInfo(st reflect.Type) (*structInfo, error) { + fieldMapMutex.RLock() + sinfo, found := structMap[st] + fieldMapMutex.RUnlock() + if found { + return sinfo, nil + } + + n := st.NumField() + fieldsMap := make(map[string]fieldInfo) + fieldsList := make([]fieldInfo, 0, n) + inlineMap := -1 + for i := 0; i != n; i++ { + field := st.Field(i) + if field.PkgPath != "" && !field.Anonymous { + continue // Private field + } + + info := fieldInfo{Num: i} + + tag := field.Tag.Get("yaml") + if tag == "" && strings.Index(string(field.Tag), ":") < 0 { + tag = string(field.Tag) + } + if tag == "-" { + continue + } + + inline := false + fields := strings.Split(tag, ",") + if len(fields) > 1 { + for _, flag := range fields[1:] { + switch flag { + case "omitempty": + info.OmitEmpty = true + case "flow": + info.Flow = true + case "inline": + inline = true + default: + return nil, errors.New(fmt.Sprintf("Unsupported flag %q in tag %q of type %s", flag, tag, st)) + } + } + tag = fields[0] + } + + if inline { + switch field.Type.Kind() { + case reflect.Map: + if inlineMap >= 0 { + return nil, errors.New("Multiple ,inline maps in struct " + st.String()) + } + if field.Type.Key() != reflect.TypeOf("") { + return nil, errors.New("Option ,inline needs a map with string keys in struct " + st.String()) + } + inlineMap = info.Num + case reflect.Struct: + sinfo, err := getStructInfo(field.Type) + if err != nil { + return nil, err + } + for _, finfo := range sinfo.FieldsList { + if _, found := fieldsMap[finfo.Key]; found { + msg := "Duplicated key '" + finfo.Key + "' in struct " + st.String() + return nil, errors.New(msg) + } + if finfo.Inline == nil { + finfo.Inline = []int{i, finfo.Num} + } else { + finfo.Inline = append([]int{i}, finfo.Inline...) + } + finfo.Id = len(fieldsList) + fieldsMap[finfo.Key] = finfo + fieldsList = append(fieldsList, finfo) + } + default: + //return nil, errors.New("Option ,inline needs a struct value or map field") + return nil, errors.New("Option ,inline needs a struct value field") + } + continue + } + + if tag != "" { + info.Key = tag + } else { + info.Key = strings.ToLower(field.Name) + } + + if _, found = fieldsMap[info.Key]; found { + msg := "Duplicated key '" + info.Key + "' in struct " + st.String() + return nil, errors.New(msg) + } + + info.Id = len(fieldsList) + fieldsList = append(fieldsList, info) + fieldsMap[info.Key] = info + } + + sinfo = &structInfo{ + FieldsMap: fieldsMap, + FieldsList: fieldsList, + InlineMap: inlineMap, + } + + fieldMapMutex.Lock() + structMap[st] = sinfo + fieldMapMutex.Unlock() + return sinfo, nil +} + +// IsZeroer is used to check whether an object is zero to +// determine whether it should be omitted when marshaling +// with the omitempty flag. One notable implementation +// is time.Time. +type IsZeroer interface { + IsZero() bool +} + +func isZero(v reflect.Value) bool { + kind := v.Kind() + if z, ok := v.Interface().(IsZeroer); ok { + if (kind == reflect.Ptr || kind == reflect.Interface) && v.IsNil() { + return true + } + return z.IsZero() + } + switch kind { + case reflect.String: + return len(v.String()) == 0 + case reflect.Interface, reflect.Ptr: + return v.IsNil() + case reflect.Slice: + return v.Len() == 0 + case reflect.Map: + return v.Len() == 0 + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + return v.Int() == 0 + case reflect.Float32, reflect.Float64: + return v.Float() == 0 + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: + return v.Uint() == 0 + case reflect.Bool: + return !v.Bool() + case reflect.Struct: + vt := v.Type() + for i := v.NumField() - 1; i >= 0; i-- { + if vt.Field(i).PkgPath != "" { + continue // Private field + } + if !isZero(v.Field(i)) { + return false + } + } + return true + } + return false +} diff --git a/vendor/gopkg.in/yaml.v2/yamlh.go b/vendor/gopkg.in/yaml.v2/yamlh.go new file mode 100644 index 000000000000..e25cee563be8 --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/yamlh.go @@ -0,0 +1,738 @@ +package yaml + +import ( + "fmt" + "io" +) + +// The version directive data. +type yaml_version_directive_t struct { + major int8 // The major version number. + minor int8 // The minor version number. +} + +// The tag directive data. +type yaml_tag_directive_t struct { + handle []byte // The tag handle. + prefix []byte // The tag prefix. +} + +type yaml_encoding_t int + +// The stream encoding. +const ( + // Let the parser choose the encoding. + yaml_ANY_ENCODING yaml_encoding_t = iota + + yaml_UTF8_ENCODING // The default UTF-8 encoding. + yaml_UTF16LE_ENCODING // The UTF-16-LE encoding with BOM. + yaml_UTF16BE_ENCODING // The UTF-16-BE encoding with BOM. +) + +type yaml_break_t int + +// Line break types. +const ( + // Let the parser choose the break type. + yaml_ANY_BREAK yaml_break_t = iota + + yaml_CR_BREAK // Use CR for line breaks (Mac style). + yaml_LN_BREAK // Use LN for line breaks (Unix style). + yaml_CRLN_BREAK // Use CR LN for line breaks (DOS style). +) + +type yaml_error_type_t int + +// Many bad things could happen with the parser and emitter. +const ( + // No error is produced. + yaml_NO_ERROR yaml_error_type_t = iota + + yaml_MEMORY_ERROR // Cannot allocate or reallocate a block of memory. + yaml_READER_ERROR // Cannot read or decode the input stream. + yaml_SCANNER_ERROR // Cannot scan the input stream. + yaml_PARSER_ERROR // Cannot parse the input stream. + yaml_COMPOSER_ERROR // Cannot compose a YAML document. + yaml_WRITER_ERROR // Cannot write to the output stream. + yaml_EMITTER_ERROR // Cannot emit a YAML stream. +) + +// The pointer position. +type yaml_mark_t struct { + index int // The position index. + line int // The position line. + column int // The position column. +} + +// Node Styles + +type yaml_style_t int8 + +type yaml_scalar_style_t yaml_style_t + +// Scalar styles. +const ( + // Let the emitter choose the style. + yaml_ANY_SCALAR_STYLE yaml_scalar_style_t = iota + + yaml_PLAIN_SCALAR_STYLE // The plain scalar style. + yaml_SINGLE_QUOTED_SCALAR_STYLE // The single-quoted scalar style. + yaml_DOUBLE_QUOTED_SCALAR_STYLE // The double-quoted scalar style. + yaml_LITERAL_SCALAR_STYLE // The literal scalar style. + yaml_FOLDED_SCALAR_STYLE // The folded scalar style. +) + +type yaml_sequence_style_t yaml_style_t + +// Sequence styles. +const ( + // Let the emitter choose the style. + yaml_ANY_SEQUENCE_STYLE yaml_sequence_style_t = iota + + yaml_BLOCK_SEQUENCE_STYLE // The block sequence style. + yaml_FLOW_SEQUENCE_STYLE // The flow sequence style. +) + +type yaml_mapping_style_t yaml_style_t + +// Mapping styles. +const ( + // Let the emitter choose the style. + yaml_ANY_MAPPING_STYLE yaml_mapping_style_t = iota + + yaml_BLOCK_MAPPING_STYLE // The block mapping style. + yaml_FLOW_MAPPING_STYLE // The flow mapping style. +) + +// Tokens + +type yaml_token_type_t int + +// Token types. +const ( + // An empty token. + yaml_NO_TOKEN yaml_token_type_t = iota + + yaml_STREAM_START_TOKEN // A STREAM-START token. + yaml_STREAM_END_TOKEN // A STREAM-END token. + + yaml_VERSION_DIRECTIVE_TOKEN // A VERSION-DIRECTIVE token. + yaml_TAG_DIRECTIVE_TOKEN // A TAG-DIRECTIVE token. + yaml_DOCUMENT_START_TOKEN // A DOCUMENT-START token. + yaml_DOCUMENT_END_TOKEN // A DOCUMENT-END token. + + yaml_BLOCK_SEQUENCE_START_TOKEN // A BLOCK-SEQUENCE-START token. + yaml_BLOCK_MAPPING_START_TOKEN // A BLOCK-SEQUENCE-END token. + yaml_BLOCK_END_TOKEN // A BLOCK-END token. + + yaml_FLOW_SEQUENCE_START_TOKEN // A FLOW-SEQUENCE-START token. + yaml_FLOW_SEQUENCE_END_TOKEN // A FLOW-SEQUENCE-END token. + yaml_FLOW_MAPPING_START_TOKEN // A FLOW-MAPPING-START token. + yaml_FLOW_MAPPING_END_TOKEN // A FLOW-MAPPING-END token. + + yaml_BLOCK_ENTRY_TOKEN // A BLOCK-ENTRY token. + yaml_FLOW_ENTRY_TOKEN // A FLOW-ENTRY token. + yaml_KEY_TOKEN // A KEY token. + yaml_VALUE_TOKEN // A VALUE token. + + yaml_ALIAS_TOKEN // An ALIAS token. + yaml_ANCHOR_TOKEN // An ANCHOR token. + yaml_TAG_TOKEN // A TAG token. + yaml_SCALAR_TOKEN // A SCALAR token. +) + +func (tt yaml_token_type_t) String() string { + switch tt { + case yaml_NO_TOKEN: + return "yaml_NO_TOKEN" + case yaml_STREAM_START_TOKEN: + return "yaml_STREAM_START_TOKEN" + case yaml_STREAM_END_TOKEN: + return "yaml_STREAM_END_TOKEN" + case yaml_VERSION_DIRECTIVE_TOKEN: + return "yaml_VERSION_DIRECTIVE_TOKEN" + case yaml_TAG_DIRECTIVE_TOKEN: + return "yaml_TAG_DIRECTIVE_TOKEN" + case yaml_DOCUMENT_START_TOKEN: + return "yaml_DOCUMENT_START_TOKEN" + case yaml_DOCUMENT_END_TOKEN: + return "yaml_DOCUMENT_END_TOKEN" + case yaml_BLOCK_SEQUENCE_START_TOKEN: + return "yaml_BLOCK_SEQUENCE_START_TOKEN" + case yaml_BLOCK_MAPPING_START_TOKEN: + return "yaml_BLOCK_MAPPING_START_TOKEN" + case yaml_BLOCK_END_TOKEN: + return "yaml_BLOCK_END_TOKEN" + case yaml_FLOW_SEQUENCE_START_TOKEN: + return "yaml_FLOW_SEQUENCE_START_TOKEN" + case yaml_FLOW_SEQUENCE_END_TOKEN: + return "yaml_FLOW_SEQUENCE_END_TOKEN" + case yaml_FLOW_MAPPING_START_TOKEN: + return "yaml_FLOW_MAPPING_START_TOKEN" + case yaml_FLOW_MAPPING_END_TOKEN: + return "yaml_FLOW_MAPPING_END_TOKEN" + case yaml_BLOCK_ENTRY_TOKEN: + return "yaml_BLOCK_ENTRY_TOKEN" + case yaml_FLOW_ENTRY_TOKEN: + return "yaml_FLOW_ENTRY_TOKEN" + case yaml_KEY_TOKEN: + return "yaml_KEY_TOKEN" + case yaml_VALUE_TOKEN: + return "yaml_VALUE_TOKEN" + case yaml_ALIAS_TOKEN: + return "yaml_ALIAS_TOKEN" + case yaml_ANCHOR_TOKEN: + return "yaml_ANCHOR_TOKEN" + case yaml_TAG_TOKEN: + return "yaml_TAG_TOKEN" + case yaml_SCALAR_TOKEN: + return "yaml_SCALAR_TOKEN" + } + return "" +} + +// The token structure. +type yaml_token_t struct { + // The token type. + typ yaml_token_type_t + + // The start/end of the token. + start_mark, end_mark yaml_mark_t + + // The stream encoding (for yaml_STREAM_START_TOKEN). + encoding yaml_encoding_t + + // The alias/anchor/scalar value or tag/tag directive handle + // (for yaml_ALIAS_TOKEN, yaml_ANCHOR_TOKEN, yaml_SCALAR_TOKEN, yaml_TAG_TOKEN, yaml_TAG_DIRECTIVE_TOKEN). + value []byte + + // The tag suffix (for yaml_TAG_TOKEN). + suffix []byte + + // The tag directive prefix (for yaml_TAG_DIRECTIVE_TOKEN). + prefix []byte + + // The scalar style (for yaml_SCALAR_TOKEN). + style yaml_scalar_style_t + + // The version directive major/minor (for yaml_VERSION_DIRECTIVE_TOKEN). + major, minor int8 +} + +// Events + +type yaml_event_type_t int8 + +// Event types. +const ( + // An empty event. + yaml_NO_EVENT yaml_event_type_t = iota + + yaml_STREAM_START_EVENT // A STREAM-START event. + yaml_STREAM_END_EVENT // A STREAM-END event. + yaml_DOCUMENT_START_EVENT // A DOCUMENT-START event. + yaml_DOCUMENT_END_EVENT // A DOCUMENT-END event. + yaml_ALIAS_EVENT // An ALIAS event. + yaml_SCALAR_EVENT // A SCALAR event. + yaml_SEQUENCE_START_EVENT // A SEQUENCE-START event. + yaml_SEQUENCE_END_EVENT // A SEQUENCE-END event. + yaml_MAPPING_START_EVENT // A MAPPING-START event. + yaml_MAPPING_END_EVENT // A MAPPING-END event. +) + +var eventStrings = []string{ + yaml_NO_EVENT: "none", + yaml_STREAM_START_EVENT: "stream start", + yaml_STREAM_END_EVENT: "stream end", + yaml_DOCUMENT_START_EVENT: "document start", + yaml_DOCUMENT_END_EVENT: "document end", + yaml_ALIAS_EVENT: "alias", + yaml_SCALAR_EVENT: "scalar", + yaml_SEQUENCE_START_EVENT: "sequence start", + yaml_SEQUENCE_END_EVENT: "sequence end", + yaml_MAPPING_START_EVENT: "mapping start", + yaml_MAPPING_END_EVENT: "mapping end", +} + +func (e yaml_event_type_t) String() string { + if e < 0 || int(e) >= len(eventStrings) { + return fmt.Sprintf("unknown event %d", e) + } + return eventStrings[e] +} + +// The event structure. +type yaml_event_t struct { + + // The event type. + typ yaml_event_type_t + + // The start and end of the event. + start_mark, end_mark yaml_mark_t + + // The document encoding (for yaml_STREAM_START_EVENT). + encoding yaml_encoding_t + + // The version directive (for yaml_DOCUMENT_START_EVENT). + version_directive *yaml_version_directive_t + + // The list of tag directives (for yaml_DOCUMENT_START_EVENT). + tag_directives []yaml_tag_directive_t + + // The anchor (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT, yaml_ALIAS_EVENT). + anchor []byte + + // The tag (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT). + tag []byte + + // The scalar value (for yaml_SCALAR_EVENT). + value []byte + + // Is the document start/end indicator implicit, or the tag optional? + // (for yaml_DOCUMENT_START_EVENT, yaml_DOCUMENT_END_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT, yaml_SCALAR_EVENT). + implicit bool + + // Is the tag optional for any non-plain style? (for yaml_SCALAR_EVENT). + quoted_implicit bool + + // The style (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT). + style yaml_style_t +} + +func (e *yaml_event_t) scalar_style() yaml_scalar_style_t { return yaml_scalar_style_t(e.style) } +func (e *yaml_event_t) sequence_style() yaml_sequence_style_t { return yaml_sequence_style_t(e.style) } +func (e *yaml_event_t) mapping_style() yaml_mapping_style_t { return yaml_mapping_style_t(e.style) } + +// Nodes + +const ( + yaml_NULL_TAG = "tag:yaml.org,2002:null" // The tag !!null with the only possible value: null. + yaml_BOOL_TAG = "tag:yaml.org,2002:bool" // The tag !!bool with the values: true and false. + yaml_STR_TAG = "tag:yaml.org,2002:str" // The tag !!str for string values. + yaml_INT_TAG = "tag:yaml.org,2002:int" // The tag !!int for integer values. + yaml_FLOAT_TAG = "tag:yaml.org,2002:float" // The tag !!float for float values. + yaml_TIMESTAMP_TAG = "tag:yaml.org,2002:timestamp" // The tag !!timestamp for date and time values. + + yaml_SEQ_TAG = "tag:yaml.org,2002:seq" // The tag !!seq is used to denote sequences. + yaml_MAP_TAG = "tag:yaml.org,2002:map" // The tag !!map is used to denote mapping. + + // Not in original libyaml. + yaml_BINARY_TAG = "tag:yaml.org,2002:binary" + yaml_MERGE_TAG = "tag:yaml.org,2002:merge" + + yaml_DEFAULT_SCALAR_TAG = yaml_STR_TAG // The default scalar tag is !!str. + yaml_DEFAULT_SEQUENCE_TAG = yaml_SEQ_TAG // The default sequence tag is !!seq. + yaml_DEFAULT_MAPPING_TAG = yaml_MAP_TAG // The default mapping tag is !!map. +) + +type yaml_node_type_t int + +// Node types. +const ( + // An empty node. + yaml_NO_NODE yaml_node_type_t = iota + + yaml_SCALAR_NODE // A scalar node. + yaml_SEQUENCE_NODE // A sequence node. + yaml_MAPPING_NODE // A mapping node. +) + +// An element of a sequence node. +type yaml_node_item_t int + +// An element of a mapping node. +type yaml_node_pair_t struct { + key int // The key of the element. + value int // The value of the element. +} + +// The node structure. +type yaml_node_t struct { + typ yaml_node_type_t // The node type. + tag []byte // The node tag. + + // The node data. + + // The scalar parameters (for yaml_SCALAR_NODE). + scalar struct { + value []byte // The scalar value. + length int // The length of the scalar value. + style yaml_scalar_style_t // The scalar style. + } + + // The sequence parameters (for YAML_SEQUENCE_NODE). + sequence struct { + items_data []yaml_node_item_t // The stack of sequence items. + style yaml_sequence_style_t // The sequence style. + } + + // The mapping parameters (for yaml_MAPPING_NODE). + mapping struct { + pairs_data []yaml_node_pair_t // The stack of mapping pairs (key, value). + pairs_start *yaml_node_pair_t // The beginning of the stack. + pairs_end *yaml_node_pair_t // The end of the stack. + pairs_top *yaml_node_pair_t // The top of the stack. + style yaml_mapping_style_t // The mapping style. + } + + start_mark yaml_mark_t // The beginning of the node. + end_mark yaml_mark_t // The end of the node. + +} + +// The document structure. +type yaml_document_t struct { + + // The document nodes. + nodes []yaml_node_t + + // The version directive. + version_directive *yaml_version_directive_t + + // The list of tag directives. + tag_directives_data []yaml_tag_directive_t + tag_directives_start int // The beginning of the tag directives list. + tag_directives_end int // The end of the tag directives list. + + start_implicit int // Is the document start indicator implicit? + end_implicit int // Is the document end indicator implicit? + + // The start/end of the document. + start_mark, end_mark yaml_mark_t +} + +// The prototype of a read handler. +// +// The read handler is called when the parser needs to read more bytes from the +// source. The handler should write not more than size bytes to the buffer. +// The number of written bytes should be set to the size_read variable. +// +// [in,out] data A pointer to an application data specified by +// yaml_parser_set_input(). +// [out] buffer The buffer to write the data from the source. +// [in] size The size of the buffer. +// [out] size_read The actual number of bytes read from the source. +// +// On success, the handler should return 1. If the handler failed, +// the returned value should be 0. On EOF, the handler should set the +// size_read to 0 and return 1. +type yaml_read_handler_t func(parser *yaml_parser_t, buffer []byte) (n int, err error) + +// This structure holds information about a potential simple key. +type yaml_simple_key_t struct { + possible bool // Is a simple key possible? + required bool // Is a simple key required? + token_number int // The number of the token. + mark yaml_mark_t // The position mark. +} + +// The states of the parser. +type yaml_parser_state_t int + +const ( + yaml_PARSE_STREAM_START_STATE yaml_parser_state_t = iota + + yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE // Expect the beginning of an implicit document. + yaml_PARSE_DOCUMENT_START_STATE // Expect DOCUMENT-START. + yaml_PARSE_DOCUMENT_CONTENT_STATE // Expect the content of a document. + yaml_PARSE_DOCUMENT_END_STATE // Expect DOCUMENT-END. + yaml_PARSE_BLOCK_NODE_STATE // Expect a block node. + yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE // Expect a block node or indentless sequence. + yaml_PARSE_FLOW_NODE_STATE // Expect a flow node. + yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE // Expect the first entry of a block sequence. + yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE // Expect an entry of a block sequence. + yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE // Expect an entry of an indentless sequence. + yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE // Expect the first key of a block mapping. + yaml_PARSE_BLOCK_MAPPING_KEY_STATE // Expect a block mapping key. + yaml_PARSE_BLOCK_MAPPING_VALUE_STATE // Expect a block mapping value. + yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE // Expect the first entry of a flow sequence. + yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE // Expect an entry of a flow sequence. + yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE // Expect a key of an ordered mapping. + yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE // Expect a value of an ordered mapping. + yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE // Expect the and of an ordered mapping entry. + yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE // Expect the first key of a flow mapping. + yaml_PARSE_FLOW_MAPPING_KEY_STATE // Expect a key of a flow mapping. + yaml_PARSE_FLOW_MAPPING_VALUE_STATE // Expect a value of a flow mapping. + yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE // Expect an empty value of a flow mapping. + yaml_PARSE_END_STATE // Expect nothing. +) + +func (ps yaml_parser_state_t) String() string { + switch ps { + case yaml_PARSE_STREAM_START_STATE: + return "yaml_PARSE_STREAM_START_STATE" + case yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE: + return "yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE" + case yaml_PARSE_DOCUMENT_START_STATE: + return "yaml_PARSE_DOCUMENT_START_STATE" + case yaml_PARSE_DOCUMENT_CONTENT_STATE: + return "yaml_PARSE_DOCUMENT_CONTENT_STATE" + case yaml_PARSE_DOCUMENT_END_STATE: + return "yaml_PARSE_DOCUMENT_END_STATE" + case yaml_PARSE_BLOCK_NODE_STATE: + return "yaml_PARSE_BLOCK_NODE_STATE" + case yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE: + return "yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE" + case yaml_PARSE_FLOW_NODE_STATE: + return "yaml_PARSE_FLOW_NODE_STATE" + case yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE: + return "yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE" + case yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE: + return "yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE" + case yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE: + return "yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE" + case yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE: + return "yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE" + case yaml_PARSE_BLOCK_MAPPING_KEY_STATE: + return "yaml_PARSE_BLOCK_MAPPING_KEY_STATE" + case yaml_PARSE_BLOCK_MAPPING_VALUE_STATE: + return "yaml_PARSE_BLOCK_MAPPING_VALUE_STATE" + case yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE: + return "yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE" + case yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE: + return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE" + case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE: + return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE" + case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE: + return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE" + case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE: + return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE" + case yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE: + return "yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE" + case yaml_PARSE_FLOW_MAPPING_KEY_STATE: + return "yaml_PARSE_FLOW_MAPPING_KEY_STATE" + case yaml_PARSE_FLOW_MAPPING_VALUE_STATE: + return "yaml_PARSE_FLOW_MAPPING_VALUE_STATE" + case yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE: + return "yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE" + case yaml_PARSE_END_STATE: + return "yaml_PARSE_END_STATE" + } + return "" +} + +// This structure holds aliases data. +type yaml_alias_data_t struct { + anchor []byte // The anchor. + index int // The node id. + mark yaml_mark_t // The anchor mark. +} + +// The parser structure. +// +// All members are internal. Manage the structure using the +// yaml_parser_ family of functions. +type yaml_parser_t struct { + + // Error handling + + error yaml_error_type_t // Error type. + + problem string // Error description. + + // The byte about which the problem occurred. + problem_offset int + problem_value int + problem_mark yaml_mark_t + + // The error context. + context string + context_mark yaml_mark_t + + // Reader stuff + + read_handler yaml_read_handler_t // Read handler. + + input_reader io.Reader // File input data. + input []byte // String input data. + input_pos int + + eof bool // EOF flag + + buffer []byte // The working buffer. + buffer_pos int // The current position of the buffer. + + unread int // The number of unread characters in the buffer. + + raw_buffer []byte // The raw buffer. + raw_buffer_pos int // The current position of the buffer. + + encoding yaml_encoding_t // The input encoding. + + offset int // The offset of the current position (in bytes). + mark yaml_mark_t // The mark of the current position. + + // Scanner stuff + + stream_start_produced bool // Have we started to scan the input stream? + stream_end_produced bool // Have we reached the end of the input stream? + + flow_level int // The number of unclosed '[' and '{' indicators. + + tokens []yaml_token_t // The tokens queue. + tokens_head int // The head of the tokens queue. + tokens_parsed int // The number of tokens fetched from the queue. + token_available bool // Does the tokens queue contain a token ready for dequeueing. + + indent int // The current indentation level. + indents []int // The indentation levels stack. + + simple_key_allowed bool // May a simple key occur at the current position? + simple_keys []yaml_simple_key_t // The stack of simple keys. + + // Parser stuff + + state yaml_parser_state_t // The current parser state. + states []yaml_parser_state_t // The parser states stack. + marks []yaml_mark_t // The stack of marks. + tag_directives []yaml_tag_directive_t // The list of TAG directives. + + // Dumper stuff + + aliases []yaml_alias_data_t // The alias data. + + document *yaml_document_t // The currently parsed document. +} + +// Emitter Definitions + +// The prototype of a write handler. +// +// The write handler is called when the emitter needs to flush the accumulated +// characters to the output. The handler should write @a size bytes of the +// @a buffer to the output. +// +// @param[in,out] data A pointer to an application data specified by +// yaml_emitter_set_output(). +// @param[in] buffer The buffer with bytes to be written. +// @param[in] size The size of the buffer. +// +// @returns On success, the handler should return @c 1. If the handler failed, +// the returned value should be @c 0. +// +type yaml_write_handler_t func(emitter *yaml_emitter_t, buffer []byte) error + +type yaml_emitter_state_t int + +// The emitter states. +const ( + // Expect STREAM-START. + yaml_EMIT_STREAM_START_STATE yaml_emitter_state_t = iota + + yaml_EMIT_FIRST_DOCUMENT_START_STATE // Expect the first DOCUMENT-START or STREAM-END. + yaml_EMIT_DOCUMENT_START_STATE // Expect DOCUMENT-START or STREAM-END. + yaml_EMIT_DOCUMENT_CONTENT_STATE // Expect the content of a document. + yaml_EMIT_DOCUMENT_END_STATE // Expect DOCUMENT-END. + yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE // Expect the first item of a flow sequence. + yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE // Expect an item of a flow sequence. + yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE // Expect the first key of a flow mapping. + yaml_EMIT_FLOW_MAPPING_KEY_STATE // Expect a key of a flow mapping. + yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE // Expect a value for a simple key of a flow mapping. + yaml_EMIT_FLOW_MAPPING_VALUE_STATE // Expect a value of a flow mapping. + yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE // Expect the first item of a block sequence. + yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE // Expect an item of a block sequence. + yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE // Expect the first key of a block mapping. + yaml_EMIT_BLOCK_MAPPING_KEY_STATE // Expect the key of a block mapping. + yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE // Expect a value for a simple key of a block mapping. + yaml_EMIT_BLOCK_MAPPING_VALUE_STATE // Expect a value of a block mapping. + yaml_EMIT_END_STATE // Expect nothing. +) + +// The emitter structure. +// +// All members are internal. Manage the structure using the @c yaml_emitter_ +// family of functions. +type yaml_emitter_t struct { + + // Error handling + + error yaml_error_type_t // Error type. + problem string // Error description. + + // Writer stuff + + write_handler yaml_write_handler_t // Write handler. + + output_buffer *[]byte // String output data. + output_writer io.Writer // File output data. + + buffer []byte // The working buffer. + buffer_pos int // The current position of the buffer. + + raw_buffer []byte // The raw buffer. + raw_buffer_pos int // The current position of the buffer. + + encoding yaml_encoding_t // The stream encoding. + + // Emitter stuff + + canonical bool // If the output is in the canonical style? + best_indent int // The number of indentation spaces. + best_width int // The preferred width of the output lines. + unicode bool // Allow unescaped non-ASCII characters? + line_break yaml_break_t // The preferred line break. + + state yaml_emitter_state_t // The current emitter state. + states []yaml_emitter_state_t // The stack of states. + + events []yaml_event_t // The event queue. + events_head int // The head of the event queue. + + indents []int // The stack of indentation levels. + + tag_directives []yaml_tag_directive_t // The list of tag directives. + + indent int // The current indentation level. + + flow_level int // The current flow level. + + root_context bool // Is it the document root context? + sequence_context bool // Is it a sequence context? + mapping_context bool // Is it a mapping context? + simple_key_context bool // Is it a simple mapping key context? + + line int // The current line. + column int // The current column. + whitespace bool // If the last character was a whitespace? + indention bool // If the last character was an indentation character (' ', '-', '?', ':')? + open_ended bool // If an explicit document end is required? + + // Anchor analysis. + anchor_data struct { + anchor []byte // The anchor value. + alias bool // Is it an alias? + } + + // Tag analysis. + tag_data struct { + handle []byte // The tag handle. + suffix []byte // The tag suffix. + } + + // Scalar analysis. + scalar_data struct { + value []byte // The scalar value. + multiline bool // Does the scalar contain line breaks? + flow_plain_allowed bool // Can the scalar be expessed in the flow plain style? + block_plain_allowed bool // Can the scalar be expressed in the block plain style? + single_quoted_allowed bool // Can the scalar be expressed in the single quoted style? + block_allowed bool // Can the scalar be expressed in the literal or folded styles? + style yaml_scalar_style_t // The output style. + } + + // Dumper stuff + + opened bool // If the stream was already opened? + closed bool // If the stream was already closed? + + // The information associated with the document nodes. + anchors *struct { + references int // The number of references. + anchor int // The anchor id. + serialized bool // If the node has been emitted? + } + + last_anchor_id int // The last assigned anchor id. + + document *yaml_document_t // The currently emitted document. +} diff --git a/vendor/gopkg.in/yaml.v2/yamlprivateh.go b/vendor/gopkg.in/yaml.v2/yamlprivateh.go new file mode 100644 index 000000000000..8110ce3c37a6 --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/yamlprivateh.go @@ -0,0 +1,173 @@ +package yaml + +const ( + // The size of the input raw buffer. + input_raw_buffer_size = 512 + + // The size of the input buffer. + // It should be possible to decode the whole raw buffer. + input_buffer_size = input_raw_buffer_size * 3 + + // The size of the output buffer. + output_buffer_size = 128 + + // The size of the output raw buffer. + // It should be possible to encode the whole output buffer. + output_raw_buffer_size = (output_buffer_size*2 + 2) + + // The size of other stacks and queues. + initial_stack_size = 16 + initial_queue_size = 16 + initial_string_size = 16 +) + +// Check if the character at the specified position is an alphabetical +// character, a digit, '_', or '-'. +func is_alpha(b []byte, i int) bool { + return b[i] >= '0' && b[i] <= '9' || b[i] >= 'A' && b[i] <= 'Z' || b[i] >= 'a' && b[i] <= 'z' || b[i] == '_' || b[i] == '-' +} + +// Check if the character at the specified position is a digit. +func is_digit(b []byte, i int) bool { + return b[i] >= '0' && b[i] <= '9' +} + +// Get the value of a digit. +func as_digit(b []byte, i int) int { + return int(b[i]) - '0' +} + +// Check if the character at the specified position is a hex-digit. +func is_hex(b []byte, i int) bool { + return b[i] >= '0' && b[i] <= '9' || b[i] >= 'A' && b[i] <= 'F' || b[i] >= 'a' && b[i] <= 'f' +} + +// Get the value of a hex-digit. +func as_hex(b []byte, i int) int { + bi := b[i] + if bi >= 'A' && bi <= 'F' { + return int(bi) - 'A' + 10 + } + if bi >= 'a' && bi <= 'f' { + return int(bi) - 'a' + 10 + } + return int(bi) - '0' +} + +// Check if the character is ASCII. +func is_ascii(b []byte, i int) bool { + return b[i] <= 0x7F +} + +// Check if the character at the start of the buffer can be printed unescaped. +func is_printable(b []byte, i int) bool { + return ((b[i] == 0x0A) || // . == #x0A + (b[i] >= 0x20 && b[i] <= 0x7E) || // #x20 <= . <= #x7E + (b[i] == 0xC2 && b[i+1] >= 0xA0) || // #0xA0 <= . <= #xD7FF + (b[i] > 0xC2 && b[i] < 0xED) || + (b[i] == 0xED && b[i+1] < 0xA0) || + (b[i] == 0xEE) || + (b[i] == 0xEF && // #xE000 <= . <= #xFFFD + !(b[i+1] == 0xBB && b[i+2] == 0xBF) && // && . != #xFEFF + !(b[i+1] == 0xBF && (b[i+2] == 0xBE || b[i+2] == 0xBF)))) +} + +// Check if the character at the specified position is NUL. +func is_z(b []byte, i int) bool { + return b[i] == 0x00 +} + +// Check if the beginning of the buffer is a BOM. +func is_bom(b []byte, i int) bool { + return b[0] == 0xEF && b[1] == 0xBB && b[2] == 0xBF +} + +// Check if the character at the specified position is space. +func is_space(b []byte, i int) bool { + return b[i] == ' ' +} + +// Check if the character at the specified position is tab. +func is_tab(b []byte, i int) bool { + return b[i] == '\t' +} + +// Check if the character at the specified position is blank (space or tab). +func is_blank(b []byte, i int) bool { + //return is_space(b, i) || is_tab(b, i) + return b[i] == ' ' || b[i] == '\t' +} + +// Check if the character at the specified position is a line break. +func is_break(b []byte, i int) bool { + return (b[i] == '\r' || // CR (#xD) + b[i] == '\n' || // LF (#xA) + b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85) + b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028) + b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9) // PS (#x2029) +} + +func is_crlf(b []byte, i int) bool { + return b[i] == '\r' && b[i+1] == '\n' +} + +// Check if the character is a line break or NUL. +func is_breakz(b []byte, i int) bool { + //return is_break(b, i) || is_z(b, i) + return ( // is_break: + b[i] == '\r' || // CR (#xD) + b[i] == '\n' || // LF (#xA) + b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85) + b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028) + b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029) + // is_z: + b[i] == 0) +} + +// Check if the character is a line break, space, or NUL. +func is_spacez(b []byte, i int) bool { + //return is_space(b, i) || is_breakz(b, i) + return ( // is_space: + b[i] == ' ' || + // is_breakz: + b[i] == '\r' || // CR (#xD) + b[i] == '\n' || // LF (#xA) + b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85) + b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028) + b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029) + b[i] == 0) +} + +// Check if the character is a line break, space, tab, or NUL. +func is_blankz(b []byte, i int) bool { + //return is_blank(b, i) || is_breakz(b, i) + return ( // is_blank: + b[i] == ' ' || b[i] == '\t' || + // is_breakz: + b[i] == '\r' || // CR (#xD) + b[i] == '\n' || // LF (#xA) + b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85) + b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028) + b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029) + b[i] == 0) +} + +// Determine the width of the character. +func width(b byte) int { + // Don't replace these by a switch without first + // confirming that it is being inlined. + if b&0x80 == 0x00 { + return 1 + } + if b&0xE0 == 0xC0 { + return 2 + } + if b&0xF0 == 0xE0 { + return 3 + } + if b&0xF8 == 0xF0 { + return 4 + } + return 0 + +} diff --git a/vendor/vendor.json b/vendor/vendor.json index 5d916e972bfd..9f966fb81730 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1532,6 +1532,12 @@ "revision": "7657092a1303cc5a6fa3fee988d57c665683a4da", "revisionTime": "2017-08-09T21:16:03Z" }, + { + "checksumSHA1": "AnKBN2Q4AWaSNb0JyINBQbnpxGM=", + "path": "gopkg.in/yaml.v2", + "revision": "7f97868eec74b32b0982dd158a51a446d1da7eb5", + "revisionTime": "2018-02-23T19:12:37Z" + }, { "checksumSHA1": "wICWAGQfZcHD2y0dHesz9R2YSiw=", "path": "k8s.io/kubernetes/pkg/apimachinery", diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown index 0f547deef103..a48c46f7903a 100644 --- a/website/docs/r/kubernetes_cluster.html.markdown +++ b/website/docs/r/kubernetes_cluster.html.markdown @@ -53,6 +53,30 @@ resource "azurerm_kubernetes_cluster" "test" { Environment = "Production" } } + +output "id" { + value = "${azurerm_kubernetes_cluster.test.id}" +} + +output "kube_config" { + value = "${azurerm_kubernetes_cluster.test.kube_config_raw}" +} + +output "client_key" { + value = "${azurerm_kubernetes_cluster.test.kube_config.0.client_key}" +} + +output "client_certificate" { + value = "${azurerm_kubernetes_cluster.test.kube_config.0.client_certificate}" +} + +output "cluster_ca_certificate" { + value = "${azurerm_kubernetes_cluster.test.kube_config.0.cluster_ca_certificate}" +} + +output "host" { + value = "${azurerm_kubernetes_cluster.test.kube_config.0.host}" +} ``` ## Argument Reference @@ -108,6 +132,22 @@ The following attributes are exported: * `fqdn` - The FQDN of the Azure Kubernetes Managed Cluster. +* `kube_config_raw` - Base64 encoded Kubernetes configuration + +* `kube_config` - Kubernetes configuration, sub-attributes defined below: + + * `client_key` - Base64 encoded private key used by clients to authenticate to the Kubernetes cluster. + + * `client_certificate` - Base64 encoded public certificate used by clients to authenticate to the Kubernetes cluster. + + * `cluster_ca_certificate` - Base64 encoded public CA certificate used as the root of trust for the Kubernetes cluster. + + * `host` - The Kubernetes cluster server host. + + * `username` - A username used to authenticate to the Kubernetes cluster. + + * `password` - A password or token used to authenticate to the Kubernetes cluster. + ## Import Kubernetes Managed Clusters can be imported using the `resource id`, e.g. From a8ac78d3463129a1dd39a7a244d14df3f0fbdf36 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 26 Apr 2018 11:15:58 +0200 Subject: [PATCH 039/320] Updating to include #953 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1316cbe9beb8..0afbb2ec0647 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ IMPROVEMENTS: * `azurerm_key_vault` - adding cert permissions for `Purge` and `Recover` [GH-1132] * `azurerm_key_vault` - polling to ensure the Key Vault is resolvable via DNS [GH-1081] [GH-1164] * `azurerm_kubernetes_cluster` - only setting the Subnet ID when it's not an empty string [GH-1158] +* `azurerm_kubernetes_cluster` - exposing the clusters credentials as `kube_config` [GH-953] * `azurerm_metric_alertrule` - filtering out tags prefixed with `$type` [GH-1107] * `azurerm_virtual_machine` - loading managed disk information from Azure when the machine is stopped [GH-1100] * `azurerm_virtual_machine` - make the `vm_size` property case insensitive [GH-1131] From 077a104695eb46aa43b77b627abdd1cdbb200689 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Thu, 26 Apr 2018 09:22:56 +0000 Subject: [PATCH 040/320] v1.4.0 --- CHANGELOG.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0afbb2ec0647..ef4f3ebe9552 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.4.0 (Unreleased) +## 1.4.0 (April 26, 2018) UPGRADE NOTES: @@ -6,29 +6,29 @@ UPGRADE NOTES: FEATURES: -* **New Data Source:** `azurerm_recovery_services_vault` [GH-995] -* **New Resource:** `azurerm_recovery_services_vault` [GH-995] -* **New Resource:** `arm_servicebus_subscription_rule` [GH-1124] +* **New Data Source:** `azurerm_recovery_services_vault` ([#995](https://github.com/terraform-providers/terraform-provider-azurerm/issues/995)) +* **New Resource:** `azurerm_recovery_services_vault` ([#995](https://github.com/terraform-providers/terraform-provider-azurerm/issues/995)) +* **New Resource:** `arm_servicebus_subscription_rule` ([#1124](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1124)) IMPROVEMENTS: -* `azurerm_app_service` - support for updating in-place [GH-1125] -* `azurerm_app_service_plan` - support for `kind` being `app` [GH-1156] -* `azurerm_cosmosdb_account` - support for `enable_automatic_failover` [GH-1055] -* `azurerm_cosmosdb_account` - support for the `ConsistentPrefix` consistncy level [GH-1055] -* `azurerm_cosmosdb_account` - `prefixes` can now be configured for locations [GH-1055] -* `azurerm_function_app` - support for updating in-place [GH-1125] -* `azurerm_key_vault` - adding cert permissions for `Purge` and `Recover` [GH-1132] -* `azurerm_key_vault` - polling to ensure the Key Vault is resolvable via DNS [GH-1081] [GH-1164] -* `azurerm_kubernetes_cluster` - only setting the Subnet ID when it's not an empty string [GH-1158] -* `azurerm_kubernetes_cluster` - exposing the clusters credentials as `kube_config` [GH-953] -* `azurerm_metric_alertrule` - filtering out tags prefixed with `$type` [GH-1107] -* `azurerm_virtual_machine` - loading managed disk information from Azure when the machine is stopped [GH-1100] -* `azurerm_virtual_machine` - make the `vm_size` property case insensitive [GH-1131] +* `azurerm_app_service` - support for updating in-place ([#1125](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1125)) +* `azurerm_app_service_plan` - support for `kind` being `app` ([#1156](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1156)) +* `azurerm_cosmosdb_account` - support for `enable_automatic_failover` ([#1055](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1055)) +* `azurerm_cosmosdb_account` - support for the `ConsistentPrefix` consistncy level ([#1055](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1055)) +* `azurerm_cosmosdb_account` - `prefixes` can now be configured for locations ([#1055](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1055)) +* `azurerm_function_app` - support for updating in-place ([#1125](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1125)) +* `azurerm_key_vault` - adding cert permissions for `Purge` and `Recover` ([#1132](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1132)) +* `azurerm_key_vault` - polling to ensure the Key Vault is resolvable via DNS ([#1081](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1081)] [[#1164](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1164)) +* `azurerm_kubernetes_cluster` - only setting the Subnet ID when it's not an empty string ([#1158](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1158)) +* `azurerm_kubernetes_cluster` - exposing the clusters credentials as `kube_config` ([#953](https://github.com/terraform-providers/terraform-provider-azurerm/issues/953)) +* `azurerm_metric_alertrule` - filtering out tags prefixed with `$type` ([#1107](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1107)) +* `azurerm_virtual_machine` - loading managed disk information from Azure when the machine is stopped ([#1100](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1100)) +* `azurerm_virtual_machine` - make the `vm_size` property case insensitive ([#1131](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1131)) BUG FIXES: -* `azurerm_cosmosdb_account` - locations can now be modified in-place (without requiring multiple apply's) [GH-1055] +* `azurerm_cosmosdb_account` - locations can now be modified in-place (without requiring multiple apply's) ([#1055](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1055)) ## 1.3.3 (April 17, 2018) From 8456a5bca31aae9eaeef7185245626dcfa66a105 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Thu, 26 Apr 2018 09:28:15 +0000 Subject: [PATCH 041/320] Cleanup after v1.4.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef4f3ebe9552..9f28bf299f6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 1.5.0 (Unreleased) ## 1.4.0 (April 26, 2018) UPGRADE NOTES: From 238b05c4f98c408fcc8e852f42982d6d27d3427f Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Fri, 27 Apr 2018 16:55:48 +0100 Subject: [PATCH 042/320] make: Add website + website-test targets --- .travis.yml | 4 +++- GNUmakefile | 20 ++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17c49a964424..ea5dc713269d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ dist: trusty -sudo: false +sudo: required +services: +- docker language: go go: - 1.9 diff --git a/GNUmakefile b/GNUmakefile index 20581cad41e5..2be12161a8eb 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,5 +1,7 @@ TEST?=$$(go list ./... |grep -v 'vendor') GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor) +WEBSITE_REPO=github.com/hashicorp/terraform-website +PKG_NAME=azurerm default: build @@ -38,10 +40,24 @@ vendor-status: test-compile: @if [ "$(TEST)" = "./..." ]; then \ echo "ERROR: Set TEST to a specific package. For example,"; \ - echo " make test-compile TEST=./aws"; \ + echo " make test-compile TEST=./$(PKG_NAME)"; \ exit 1; \ fi go test -c $(TEST) $(TESTARGS) -.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile +website: +ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) + echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..." + git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO) +endif + @$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME) + +website-test: +ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) + echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..." + git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO) +endif + @$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME) + +.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile website website-test From d2d10f6332355f90d5b350d20bfb50d5ed930c3b Mon Sep 17 00:00:00 2001 From: Genevieve LEsperance Date: Fri, 27 Apr 2018 15:38:26 -0700 Subject: [PATCH 043/320] Retrieve dns zone data source with name only. - Use resource group name if provided, otherwise, use findZone. - findZone will get the resource groups in your subscription and then check the zones in each resource group till it finds the first with a matching dns zone name. - Could not use the zones client ListComplete api call because a Zone does not have any properties related to the Resource Group it is a part of. We have to loop over the list of resource groups and then their zones so that we can have both the zone and the resource group name to return and set on the data source. Fixes #1178. --- azurerm/data_source_dns_zone.go | 58 ++++++++++++++++++++++++---- azurerm/data_source_dns_zone_test.go | 47 ++++++++++++++++++++-- 2 files changed, 94 insertions(+), 11 deletions(-) diff --git a/azurerm/data_source_dns_zone.go b/azurerm/data_source_dns_zone.go index af251eed1462..62894af446f7 100644 --- a/azurerm/data_source_dns_zone.go +++ b/azurerm/data_source_dns_zone.go @@ -1,8 +1,11 @@ package azurerm import ( + "context" "fmt" + "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns" + "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -17,7 +20,11 @@ func dataSourceArmDnsZone() *schema.Resource { Required: true, }, - "resource_group_name": resourceGroupNameForDataSourceSchema(), + "resource_group_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "number_of_record_sets": { Type: schema.TypeString, @@ -48,13 +55,26 @@ func dataSourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + var ( + resp dns.Zone + err error + ) + if resourceGroup != "" { + resp, err = client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + return fmt.Errorf("Error reading DNS Zone %q (Resource Group %q): %+v", name, resourceGroup, err) + } + } else { + rgClient := meta.(*ArmClient).resourceGroupsClient + + resp, resourceGroup, err = findZone(client, rgClient, ctx, name) + if err != nil { + return err } - return fmt.Errorf("Error reading DNS Zone %q (Resource Group %q): %+v", name, resourceGroup, err) } d.SetId(*resp.ID) @@ -80,3 +100,27 @@ func dataSourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { return nil } + +func findZone(client dns.ZonesClient, rgClient resources.GroupsClient, ctx context.Context, name string) (dns.Zone, string, error) { + groups, err := rgClient.List(ctx, "", nil) + if err != nil { + return dns.Zone{}, "", fmt.Errorf("Error listing Resource Groups: %+v", err) + } + + for _, g := range groups.Values() { + resourceGroup := *g.Name + + zones, err := client.ListByResourceGroup(ctx, resourceGroup, nil) + if err != nil { + return dns.Zone{}, "", fmt.Errorf("Error listing DNS Zones (Resource Group: %s): %+v", resourceGroup, err) + } + + for _, z := range zones.Values() { + if *z.Name == name { + return z, resourceGroup, nil + } + } + } + + return dns.Zone{}, "", fmt.Errorf("Error finding DNS Zone %s without Resource Group Name: %+v", name, err) +} diff --git a/azurerm/data_source_dns_zone_test.go b/azurerm/data_source_dns_zone_test.go index e62696a79e00..012c1c4ead9a 100644 --- a/azurerm/data_source_dns_zone_test.go +++ b/azurerm/data_source_dns_zone_test.go @@ -47,15 +47,36 @@ func TestAccDataSourceAzureRMDNSZone_tags(t *testing.T) { }) } +func TestAccDataSourceAzureRMDNSZone_withoutResourceGroupName(t *testing.T) { + dataSourceName := "data.azurerm_dns_zone.test" + rInt := acctest.RandInt() + location := testLocation() + resourceGroupName := fmt.Sprintf("acctestRG-%d", rInt) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMDnsZoneDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceDNSZone_onlyName(rInt, location, resourceGroupName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "resource_group_name", resourceGroupName), + ), + }, + }, + }) +} + func testAccDataSourceDNSZone_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG_%d" location = "%s" } resource "azurerm_dns_zone" "test" { - name = "acctestzone%d.com" + name = "acctestzone%d.com" resource_group_name = "${azurerm_resource_group.test.name}" } @@ -69,12 +90,12 @@ data "azurerm_dns_zone" "test" { func testAccDataSourceDNSZone_tags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG_%d" location = "%s" } resource "azurerm_dns_zone" "test" { - name = "acctestzone%d.com" + name = "acctestzone%d.com" resource_group_name = "${azurerm_resource_group.test.name}" tags { hello = "world" @@ -87,3 +108,21 @@ data "azurerm_dns_zone" "test" { } `, rInt, location, rInt) } + +func testAccDataSourceDNSZone_onlyName(rInt int, location, resourceGroupName string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "%s" + location = "%s" +} + +resource "azurerm_dns_zone" "test" { + name = "acctestzone%d.com" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +data "azurerm_dns_zone" "test" { + name = "${azurerm_dns_zone.test.name}" +} +`, resourceGroupName, location, rInt) +} From df82daf24088f8c60efceaf286b1835cb1a9cc04 Mon Sep 17 00:00:00 2001 From: Genevieve LEsperance Date: Fri, 27 Apr 2018 15:40:50 -0700 Subject: [PATCH 044/320] DNS Zone data source acceptance tests check the resource has been destroyed. --- azurerm/data_source_dns_zone_test.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/azurerm/data_source_dns_zone_test.go b/azurerm/data_source_dns_zone_test.go index 012c1c4ead9a..fc3a63db741c 100644 --- a/azurerm/data_source_dns_zone_test.go +++ b/azurerm/data_source_dns_zone_test.go @@ -14,8 +14,9 @@ func TestAccDataSourceAzureRMDNSZone_basic(t *testing.T) { location := testLocation() resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMDnsZoneDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceDNSZone_basic(rInt, location), @@ -33,8 +34,9 @@ func TestAccDataSourceAzureRMDNSZone_tags(t *testing.T) { location := testLocation() resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMDnsZoneDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceDNSZone_tags(rInt, location), From afcff6a21a229c3c922f8f51ce29f54bd4069b9f Mon Sep 17 00:00:00 2001 From: Genevieve LEsperance Date: Fri, 27 Apr 2018 15:41:11 -0700 Subject: [PATCH 045/320] Update dns zone data source docs to indicate alternative way of retrieving the dns zone (given just a name and no rg name). --- website/docs/d/dns_zone.html.markdown | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/docs/d/dns_zone.html.markdown b/website/docs/d/dns_zone.html.markdown index f029e83173fd..02f097d3b1ca 100644 --- a/website/docs/d/dns_zone.html.markdown +++ b/website/docs/d/dns_zone.html.markdown @@ -27,7 +27,9 @@ output "dns_zone_id" { ## Argument Reference * `name` - (Required) The name of the DNS Zone. -* `resource_group_name` - (Required) The Name of the Resource Group where the DNS Zone exists. +* `resource_group_name` - (Optional) The Name of the Resource Group where the DNS Zone exists. +If the Name of the Resource Group is not provided, the first DNS Zone from the list of DNS Zones +in your subscription that matches `name` will be returned. ## Attributes Reference From 2a33b8550d7172bb9fca4197e3697e021847ea35 Mon Sep 17 00:00:00 2001 From: Genevieve LEsperance Date: Fri, 27 Apr 2018 15:53:23 -0700 Subject: [PATCH 046/320] If the dns zone is not found, the data source read does not fail. - Instead, it sets the id of the data source to an empty string and returns. --- azurerm/data_source_dns_zone.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/azurerm/data_source_dns_zone.go b/azurerm/data_source_dns_zone.go index 62894af446f7..0af27c0dcaa9 100644 --- a/azurerm/data_source_dns_zone.go +++ b/azurerm/data_source_dns_zone.go @@ -3,6 +3,7 @@ package azurerm import ( "context" "fmt" + "reflect" "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources" @@ -75,6 +76,11 @@ func dataSourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { if err != nil { return err } + + if reflect.DeepEqual(resp, dns.Zone{}) { + d.SetId("") + return nil + } } d.SetId(*resp.ID) @@ -122,5 +128,5 @@ func findZone(client dns.ZonesClient, rgClient resources.GroupsClient, ctx conte } } - return dns.Zone{}, "", fmt.Errorf("Error finding DNS Zone %s without Resource Group Name: %+v", name, err) + return dns.Zone{}, "", nil } From 8556a24177f83c014e216cb003dc7654fe601767 Mon Sep 17 00:00:00 2001 From: cori Date: Sat, 28 Apr 2018 10:09:35 -0500 Subject: [PATCH 047/320] update backend_http_settings.authentication_certificate documentation to reflect current state of the element. Fixes #1181. --- website/docs/r/application_gateway.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/application_gateway.html.markdown b/website/docs/r/application_gateway.html.markdown index cdb317b900b8..67c2f021bef6 100644 --- a/website/docs/r/application_gateway.html.markdown +++ b/website/docs/r/application_gateway.html.markdown @@ -216,7 +216,7 @@ The `backend_http_settings` block supports: * `probe_name` - (Optional) Reference to URL probe. -* `authentication_certificate` - TODO - this doesn't seem to belong here +* `authentication_certificate` - (Optional) - A list of maps of `authentication_certificate` references for the `backend_http_setting` to use. Each map consists of a `name` (required) and an `id` (calculated). The `http_listener` block supports: From 8fe7ab53ba96d7b6ab55f19d9689843b35598dcf Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Mon, 30 Apr 2018 10:39:23 +0100 Subject: [PATCH 048/320] Add website-test target to Travis (#1184) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ea5dc713269d..6800df79144c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ script: - make test - make vendor-status - make vet +- make website-test branches: only: From 6fe21ef7163986addd7a0271069c55ba0335a29b Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 1 May 2018 00:23:57 -0700 Subject: [PATCH 049/320] Update application_gateway.html.markdown minor updates to word choice and formatting --- website/docs/r/application_gateway.html.markdown | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/website/docs/r/application_gateway.html.markdown b/website/docs/r/application_gateway.html.markdown index 67c2f021bef6..86410247fd49 100644 --- a/website/docs/r/application_gateway.html.markdown +++ b/website/docs/r/application_gateway.html.markdown @@ -216,7 +216,10 @@ The `backend_http_settings` block supports: * `probe_name` - (Optional) Reference to URL probe. -* `authentication_certificate` - (Optional) - A list of maps of `authentication_certificate` references for the `backend_http_setting` to use. Each map consists of a `name` (required) and an `id` (calculated). +* `authentication_certificate` - (Optional) - A list of `authentication_certificate` references for the `backend_http_setting` to use. Each element consists of: + + * `name` (Required) + * `id` (Calculated) The `http_listener` block supports: From 7316075895cbbd2838aa357fde400c07e54a1db4 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 1 May 2018 12:28:04 +0100 Subject: [PATCH 050/320] Bumping the Azure Provider go use Go v1.10 (#1163) --- .travis.yml | 2 +- README.md | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6800df79144c..7d3bdf2ed24b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ services: - docker language: go go: -- 1.9 +- "1.10.x" install: # This script is used by the Travis build to install a cookie for diff --git a/README.md b/README.md index 47d8fd09f415..5d0d5a68877a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ General Requirements ------------ - [Terraform](https://www.terraform.io/downloads.html) 0.10.x -- [Go](https://golang.org/doc/install) 1.9 (to build the provider plugin) +- [Go](https://golang.org/doc/install) 1.10 (to build the provider plugin) Windows Specific Requirements ----------------------------- @@ -43,24 +43,28 @@ Using the provider ``` # Configure the Microsoft Azure Provider provider "azurerm" { - subscription_id = "..." - client_id = "..." - client_secret = "..." - tenant_id = "..." + # NOTE: Environment Variables can also be used for Service Principal authentication + # Terraform also supports authenticating via the Azure CLI too. + # see here for more info: http://terraform.io/docs/providers/azurerm/index.html + + # subscription_id = "..." + # client_id = "..." + # client_secret = "..." + # tenant_id = "..." } # Create a resource group -resource "azurerm_resource_group" "production" { - name = "production" +resource "azurerm_resource_group" "main" { + name = "production-resources" location = "West US" } # Create a virtual network in the web_servers resource group resource "azurerm_virtual_network" "network" { - name = "productionNetwork" + name = "production-network" + resource_group_name = "${azurerm_resource_group.main.name}" + location = "${azurerm_resource_group.main.location}" address_space = ["10.0.0.0/16"] - location = "West US" - resource_group_name = "${azurerm_resource_group.production.name}" subnet { name = "subnet1" From adce0ea4f256c83fe3a96f2a2de0f55b301a964f Mon Sep 17 00:00:00 2001 From: Piotr Gospodarek Date: Tue, 1 May 2018 15:01:09 +0100 Subject: [PATCH 051/320] Update loadbalancer.html.markdown (#1187) Removed the note about availability of Standard SKU for LB, as it's now in GA as described in docs https://docs.microsoft.com/en-us/azure/load-balancer/load-balancer-standard-overview --- website/docs/r/loadbalancer.html.markdown | 2 -- 1 file changed, 2 deletions(-) diff --git a/website/docs/r/loadbalancer.html.markdown b/website/docs/r/loadbalancer.html.markdown index 0bdca7d19b88..6cec31b2d9e5 100644 --- a/website/docs/r/loadbalancer.html.markdown +++ b/website/docs/r/loadbalancer.html.markdown @@ -47,8 +47,6 @@ The following arguments are supported: * `frontend_ip_configuration` - (Optional) A frontend ip configuration block as documented below. * `sku` - (Optional) The SKU of the Azure Load Balancer. Accepted values are `Basic` and `Standard`. Defaults to `Basic`. --> **Note:** The `Standard` SKU is currently in Public Preview on an opt-in basis. [More information, including how you can register for the Preview, and which regions `Standard` SKU's are available in are available here](https://docs.microsoft.com/en-us/azure/load-balancer/load-balancer-standard-overview) - * `tags` - (Optional) A mapping of tags to assign to the resource. `frontend_ip_configuration` supports the following: From 4caf62bae7af73df2b71344d98ab98a52f43460a Mon Sep 17 00:00:00 2001 From: Andrey Viktorov <538401+sabbox@users.noreply.github.com> Date: Tue, 1 May 2018 17:45:48 +0300 Subject: [PATCH 052/320] `azurerm_app_service` - support for MSI (#1130) * Add MSI support for App service * Fix formatting * Clean up debug log * Handle client error * Add MSI documentation * Refactoring the separate method calls into the update block * Updating the documentation for consistency purposes * Fixing a bug where we returned incorrectly --- azurerm/resource_arm_app_service.go | 86 ++++++++++++++++++++++ azurerm/resource_arm_app_service_test.go | 92 ++++++++++++++++++++++++ website/docs/r/app_service.html.markdown | 41 ++++++++--- 3 files changed, 210 insertions(+), 9 deletions(-) diff --git a/azurerm/resource_arm_app_service.go b/azurerm/resource_arm_app_service.go index 9974f20172e5..a79646a8b10a 100644 --- a/azurerm/resource_arm_app_service.go +++ b/azurerm/resource_arm_app_service.go @@ -29,6 +29,33 @@ func resourceArmAppService() *schema.Resource { ValidateFunc: validateAppServiceName, }, + "identity": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "type": { + Type: schema.TypeString, + Required: true, + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ValidateFunc: validation.StringInSlice([]string{ + "SystemAssigned", + }, true), + }, + "principal_id": { + Type: schema.TypeString, + Computed: true, + }, + "tenant_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "resource_group_name": resourceGroupNameSchema(), "location": locationSchema(), @@ -326,6 +353,11 @@ func resourceArmAppServiceCreate(d *schema.ResourceData, meta interface{}) error }, } + if _, ok := d.GetOk("identity"); ok { + appServiceIdentity := expandAzureRmAppServiceIdentity(d) + siteEnvelope.Identity = appServiceIdentity + } + if v, ok := d.GetOkExists("client_affinity_enabled"); ok { enabled := v.(bool) siteEnvelope.SiteProperties.ClientAffinityEnabled = utils.Bool(enabled) @@ -449,6 +481,28 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error } } + if d.HasChange("identity") { + site, err := client.Get(ctx, resGroup, name) + if err != nil { + return fmt.Errorf("Error getting configuration for App Service %q: %+v", name, err) + } + + appServiceIdentity := expandAzureRmAppServiceIdentity(d) + site.Identity = appServiceIdentity + + future, err := client.CreateOrUpdate(ctx, resGroup, name, site) + + if err != nil { + return fmt.Errorf("Error updating Managed Service Identity for App Service %q: %+v", name, err) + } + + err = future.WaitForCompletion(ctx, client.Client) + + if err != nil { + return fmt.Errorf("Error updating Managed Service Identity for App Service %q: %+v", name, err) + } + } + return resourceArmAppServiceRead(d, meta) } @@ -546,6 +600,11 @@ func resourceArmAppServiceRead(d *schema.ResourceData, meta interface{}) error { flattenAndSetTags(d, resp.Tags) + identity := flattenAzureRmAppServiceMachineIdentity(resp.Identity) + if err := d.Set("identity", identity); err != nil { + return err + } + return nil } @@ -802,6 +861,33 @@ func flattenAppServiceAppSettings(input map[string]*string) map[string]string { return output } +func expandAzureRmAppServiceIdentity(d *schema.ResourceData) *web.ManagedServiceIdentity { + identities := d.Get("identity").([]interface{}) + identity := identities[0].(map[string]interface{}) + identityType := identity["type"].(string) + return &web.ManagedServiceIdentity{ + Type: web.ManagedServiceIdentityType(identityType), + } +} + +func flattenAzureRmAppServiceMachineIdentity(identity *web.ManagedServiceIdentity) []interface{} { + if identity == nil { + return make([]interface{}, 0) + } + + result := make(map[string]interface{}) + result["type"] = string(identity.Type) + + if identity.PrincipalID != nil { + result["principal_id"] = *identity.PrincipalID + } + if identity.TenantID != nil { + result["tenant_id"] = *identity.TenantID + } + + return []interface{}{result} +} + func validateAppServiceName(v interface{}, k string) (ws []string, es []error) { value := v.(string) diff --git a/azurerm/resource_arm_app_service_test.go b/azurerm/resource_arm_app_service_test.go index 8c5fce4d1169..51b180d7d5b6 100644 --- a/azurerm/resource_arm_app_service_test.go +++ b/azurerm/resource_arm_app_service_test.go @@ -2,6 +2,7 @@ package azurerm import ( "fmt" + "regexp" "testing" "github.com/hashicorp/terraform/helper/acctest" @@ -236,6 +237,67 @@ func TestAccAzureRMAppService_clientAffinityDisabled(t *testing.T) { }) } +func TestAccAzureRMAppService_enableManageServiceIdentity(t *testing.T) { + + resourceName := "azurerm_app_service.test" + ri := acctest.RandInt() + config := testAccAzureRMAppService_mangedServiceIdentity(ri, testLocation()) + + uuidMatch := regexp.MustCompile("^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[8|9|aA|bB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "identity.0.type", "SystemAssigned"), + resource.TestMatchResourceAttr(resourceName, "identity.0.principal_id", uuidMatch), + resource.TestMatchResourceAttr(resourceName, "identity.0.tenant_id", uuidMatch), + ), + }, + }, + }) +} + +func TestAccAzureRMAppService_updateResourceByEnablingManageServiceIdentity(t *testing.T) { + + resourceName := "azurerm_app_service.test" + ri := acctest.RandInt() + + basicResourceNoManagedIdentity := testAccAzureRMAppService_basic(ri, testLocation()) + managedIdentityEnabled := testAccAzureRMAppService_mangedServiceIdentity(ri, testLocation()) + + uuidMatch := regexp.MustCompile("^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[8|9|aA|bB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, + Steps: []resource.TestStep{ + { + Config: basicResourceNoManagedIdentity, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "identity.#", "0"), + ), + }, + { + Config: managedIdentityEnabled, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "identity.0.type", "SystemAssigned"), + resource.TestMatchResourceAttr(resourceName, "identity.0.principal_id", uuidMatch), + resource.TestMatchResourceAttr(resourceName, "identity.0.tenant_id", uuidMatch), + ), + }, + }, + }) +} + func TestAccAzureRMAppService_clientAffinityUpdate(t *testing.T) { resourceName := "azurerm_app_service.test" ri := acctest.RandInt() @@ -976,6 +1038,36 @@ resource "azurerm_app_service" "test" { `, rInt, location, rInt, rInt, clientAffinity) } +func testAccAzureRMAppService_mangedServiceIdentity(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_app_service_plan" "test" { + name = "acctestASP-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + tier = "Standard" + size = "S1" + } +} + +resource "azurerm_app_service" "test" { + name = "acctestAS-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_plan_id = "${azurerm_app_service_plan.test.id}" + identity = { + type = "SystemAssigned" + } +} +`, rInt, location, rInt, rInt) +} + func testAccAzureRMAppService_connectionStrings(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/website/docs/r/app_service.html.markdown b/website/docs/r/app_service.html.markdown index 85b50930675d..4767393bd696 100644 --- a/website/docs/r/app_service.html.markdown +++ b/website/docs/r/app_service.html.markdown @@ -131,6 +131,8 @@ The following arguments are supported: * `tags` - (Optional) A mapping of tags to assign to the resource. +* `identity` - (Optional) A Managed Service Identity block as defined below. + --- `connection_string` supports the following: @@ -141,6 +143,14 @@ The following arguments are supported: --- +`identity` supports the following: + +* `type` - (Required) Specifies the identity type of the App Service. At this time the only allowed value is `SystemAssigned`. + +~> The assigned `principal_id` and `tenant_id` can be retrieved after the App Service has been created. More details are available below. + +--- + `site_config` supports the following: * `always_on` - (Optional) Should the app be loaded at all times? Defaults to `false`. @@ -167,7 +177,6 @@ The following arguments are supported: * `websockets_enabled` - (Optional) Should WebSockets be enabled? - ~> **NOTE:** Additional Source Control types will be added in the future, once support for them has been added in the Azure SDK for Go. ## Attributes Reference @@ -180,21 +189,35 @@ The following attributes are exported: * `outbound_ip_addresses` - A comma separated list of outbound IP addresses - such as `52.23.25.3,52.143.43.12` -* `source_control` - (Optional) The default local Git source control information if deployment option is set to `LocalGit`. +* `source_control` - A `source_control` block as defined below, which contains the Source Control information when `scm_type` is set to `LocalGit`. + +* `site_credential` - A `site_credential` block as defined below, which contains the site-level credentials used to publish to this App Service. -* `site_credential` - (Optional) The site-level credential used to publish files to Azure Web App. +* `identity` - An `identity` block as defined below, which contains the Managed Service Identity information for this App Service. --- -`source_control` supports the following: +`identity` exports the following: -* `repo_url` - URL of the Git repository for this App Service. -* `branch` - Branch name of the Git repository for this App Service. +* `principal_id` - The Principal ID for the Service Principal associated with the Managed Service Identity of this App Service. -`site_credential` supports the following: +* `tenant_id` - The Tenant ID for the Service Principal associated with the Managed Service Identity of this App Service. -* `username` - If your site is named 'MySite', the user name will be '$MySite'. -* `password` - Some long random string. +--- + +`site_credential` exports the following: + +* `username` - The username which can be used to publish to this App Service +* `password` - The password associated with the username, which can be used to publish to this App Service. + +~> **NOTE:** both `username` and `password` for the `site_credential` block are only exported when `scm_type` is set to `LocalGit` + +--- + +`source_control` exports the following: + +* `repo_url` - URL of the Git repository for this App Service. +* `branch` - Branch name of the Git repository for this App Service. ## Import From 85ba0e1c6004d98ee4ec4b662b4ff7f5cabfbdc2 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 1 May 2018 15:46:36 +0100 Subject: [PATCH 053/320] Updating to include #1130 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f28bf299f6c..3fedd06e96b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## 1.5.0 (Unreleased) + +FEATURES: + +* `azurerm_app_service` - support for Managed Service Identity [GH-1130] + ## 1.4.0 (April 26, 2018) UPGRADE NOTES: From 44320852607563bd1fc359adf2ab38b00d250751 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Wed, 2 May 2018 08:16:03 +0100 Subject: [PATCH 054/320] `azurerm_app_service` - adding support for HTTP2 (#1188) * `azurerm_app_service` - adding support for HTTP2 ``` $ acctests azurerm TestAccAzureRMAppService_http2Enabled === RUN TestAccAzureRMAppService_http2Enabled --- PASS: TestAccAzureRMAppService_http2Enabled (98.54s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 98.568s ``` * Moving the http2_enabled property to the right place * Adding `http2_enabled` to the data source --- azurerm/data_source_app_service.go | 6 +++ azurerm/data_source_app_service_test.go | 31 ++++++++++++++ azurerm/resource_arm_app_service.go | 14 +++++++ azurerm/resource_arm_app_service_test.go | 52 ++++++++++++++++++++++++ website/docs/d/app_service.html.markdown | 2 + website/docs/r/app_service.html.markdown | 2 +- 6 files changed, 106 insertions(+), 1 deletion(-) diff --git a/azurerm/data_source_app_service.go b/azurerm/data_source_app_service.go index 3073fa993fe5..4121cbe2113d 100644 --- a/azurerm/data_source_app_service.go +++ b/azurerm/data_source_app_service.go @@ -50,6 +50,12 @@ func dataSourceArmAppService() *schema.Resource { Computed: true, }, + "http2_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "java_version": { Type: schema.TypeString, Computed: true, diff --git a/azurerm/data_source_app_service_test.go b/azurerm/data_source_app_service_test.go index fe5fb97606f6..cc5e10e5cbbb 100644 --- a/azurerm/data_source_app_service_test.go +++ b/azurerm/data_source_app_service_test.go @@ -126,6 +126,25 @@ func TestAccDataSourceAzureRMAppService_connectionString(t *testing.T) { }) } +func TestAccDataSourceAzureRMAppService_http2Enabled(t *testing.T) { + dataSourceName := "data.azurerm_app_service.test" + rInt := acctest.RandInt() + location := testLocation() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAppService_http2Enabled(rInt, location), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "site_config.0.http2_enabled", "true"), + ), + }, + }, + }) +} + func testAccDataSourceAppService_basic(rInt int, location string) string { config := testAccAzureRMAppService_basic(rInt, location) return fmt.Sprintf(` @@ -197,3 +216,15 @@ data "azurerm_app_service" "test" { } `, config) } + +func testAccDataSourceAppService_http2Enabled(rInt int, location string) string { + config := testAccAzureRMAppService_http2Enabled(rInt, location) + return fmt.Sprintf(` +%s + +data "azurerm_app_service" "test" { + name = "${azurerm_app_service.test.name}" + resource_group_name = "${azurerm_app_service.test.resource_group_name}" +} +`, config) +} diff --git a/azurerm/resource_arm_app_service.go b/azurerm/resource_arm_app_service.go index a79646a8b10a..7c5af8ef2682 100644 --- a/azurerm/resource_arm_app_service.go +++ b/azurerm/resource_arm_app_service.go @@ -97,6 +97,12 @@ func resourceArmAppService() *schema.Resource { DiffSuppressFunc: ignoreCaseDiffSuppressFunc, }, + "http2_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "java_version": { Type: schema.TypeString, Optional: true, @@ -674,6 +680,10 @@ func expandAppServiceSiteConfig(d *schema.ResourceData) web.SiteConfig { siteConfig.JavaContainerVersion = utils.String(v.(string)) } + if v, ok := config["http2_enabled"]; ok { + siteConfig.HTTP20Enabled = utils.Bool(v.(bool)) + } + if v, ok := config["local_mysql_enabled"]; ok { siteConfig.LocalMySQLEnabled = utils.Bool(v.(bool)) } @@ -755,6 +765,10 @@ func flattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} { result["local_mysql_enabled"] = *input.LocalMySQLEnabled } + if input.HTTP20Enabled != nil { + result["http2_enabled"] = *input.HTTP20Enabled + } + result["managed_pipeline_mode"] = string(input.ManagedPipelineMode) if input.PhpVersion != nil { diff --git a/azurerm/resource_arm_app_service_test.go b/azurerm/resource_arm_app_service_test.go index 51b180d7d5b6..f46c4e0f933b 100644 --- a/azurerm/resource_arm_app_service_test.go +++ b/azurerm/resource_arm_app_service_test.go @@ -132,6 +132,27 @@ func TestAccAzureRMAppService_32Bit(t *testing.T) { }) } +func TestAccAzureRMAppService_http2Enabled(t *testing.T) { + resourceName := "azurerm_app_service.test" + ri := acctest.RandInt() + config := testAccAzureRMAppService_http2Enabled(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "site_config.0.http2_enabled", "true"), + ), + }, + }, + }) +} + func TestAccAzureRMAppService_alwaysOn(t *testing.T) { resourceName := "azurerm_app_service.test" ri := acctest.RandInt() @@ -971,6 +992,37 @@ resource "azurerm_app_service" "test" { `, rInt, location, rInt, rInt) } +func testAccAzureRMAppService_http2Enabled(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_app_service_plan" "test" { + name = "acctestASP-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + tier = "Standard" + size = "S1" + } +} + +resource "azurerm_app_service" "test" { + name = "acctestAS-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_plan_id = "${azurerm_app_service_plan.test.id}" + + site_config { + http2_enabled = true + } +} +`, rInt, location, rInt, rInt) +} + func testAccAzureRMAppService_appSettings(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/website/docs/d/app_service.html.markdown b/website/docs/d/app_service.html.markdown index fa4a54efc9c2..7927b08508dd 100644 --- a/website/docs/d/app_service.html.markdown +++ b/website/docs/d/app_service.html.markdown @@ -71,6 +71,8 @@ output "app_service_id" { * `dotnet_framework_version` - The version of the .net framework's CLR used in this App Service. +* `http2_enabled` - Is HTTP2 Enabled on this App Service? + * `java_version` - The version of Java in use. * `java_container` - The Java Container in use. diff --git a/website/docs/r/app_service.html.markdown b/website/docs/r/app_service.html.markdown index 4767393bd696..3fcfb8ace2be 100644 --- a/website/docs/r/app_service.html.markdown +++ b/website/docs/r/app_service.html.markdown @@ -156,7 +156,7 @@ The following arguments are supported: * `always_on` - (Optional) Should the app be loaded at all times? Defaults to `false`. * `default_documents` - (Optional) The ordering of default documents to load, if an address isn't specified. * `dotnet_framework_version` - (Optional) The version of the .net framework's CLR used in this App Service. Possible values are `v2.0` (which will use the latest version of the .net framework for the .net CLR v2 - currently `.net 3.5`) and `v4.0` (which corresponds to the latest version of the .net CLR v4 - which at the time of writing is `.net 4.7.1`). [For more information on which .net CLR version to use based on the .net framework you're targetting - please see this table](https://en.wikipedia.org/wiki/.NET_Framework_version_history#Overview). Defaults to `v4.0`. - +* `http2_enabled` - (Optional) Is HTTP2 Enabled on this App Service? Defaults to `false`. * `java_version` - (Optional) The version of Java to use. If specified `java_container` and `java_container_version` must also be specified. Possible values are `1.7` and `1.8`. * `java_container` - (Optional) The Java Container to use. If specified `java_version` and `java_container_version` must also be specified. Possible values are `JETTY` and `TOMCAT`. * `java_container_version` - (Optional) The version of the Java Container to use. If specified `java_version` and `java_container` must also be specified. From 65aa4f36e2d40b195465c12240d222642f2981bb Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Wed, 2 May 2018 08:16:48 +0100 Subject: [PATCH 055/320] Updating to include #1188 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fedd06e96b2..0ba4edab99bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ ## 1.5.0 (Unreleased) -FEATURES: +IMPROVEMENTS: +* `azurerm_app_service` - support for HTTP2 [GH-1188] * `azurerm_app_service` - support for Managed Service Identity [GH-1130] ## 1.4.0 (April 26, 2018) From cf62668ae55dcbde69a3d0519759cde862b94110 Mon Sep 17 00:00:00 2001 From: Taylor Thomas Date: Thu, 3 May 2018 00:07:38 -0700 Subject: [PATCH 056/320] feat(cosmosdb): Adds connection_strings attribute to cosmos_db_account Adds connection_strings attribute to cosmos_db_account with documentation. Also adds in some missing error handling in the same function I modified for the feature. --- azurerm/resource_arm_cosmos_db_account.go | 36 ++++++++++++++----- .../resource_arm_cosmos_db_account_test.go | 1 + website/docs/r/cosmosdb_account.html.markdown | 3 ++ 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/azurerm/resource_arm_cosmos_db_account.go b/azurerm/resource_arm_cosmos_db_account.go index b4c0e1bed192..0257c9d391de 100644 --- a/azurerm/resource_arm_cosmos_db_account.go +++ b/azurerm/resource_arm_cosmos_db_account.go @@ -227,6 +227,14 @@ func resourceArmCosmosDBAccount() *schema.Resource { Type: schema.TypeString, Computed: true, }, + + "connection_strings": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, }, } } @@ -490,19 +498,31 @@ func resourceArmCosmosDBAccountRead(d *schema.ResourceData, meta interface{}) er keys, err := client.ListKeys(ctx, resourceGroup, name) if err != nil { - log.Printf("[ERROR] Unable to List Write keys for CosmosDB Account %s: %s", name, err) - } else { - d.Set("primary_master_key", keys.PrimaryMasterKey) - d.Set("secondary_master_key", keys.SecondaryMasterKey) + return fmt.Errorf("[ERROR] Unable to List Write keys for CosmosDB Account %s: %s", name, err) } + d.Set("primary_master_key", keys.PrimaryMasterKey) + d.Set("secondary_master_key", keys.SecondaryMasterKey) readonlyKeys, err := client.ListReadOnlyKeys(ctx, resourceGroup, name) if err != nil { - log.Printf("[ERROR] Unable to List read-only keys for CosmosDB Account %s: %s", name, err) - } else { - d.Set("primary_readonly_master_key", readonlyKeys.PrimaryReadonlyMasterKey) - d.Set("secondary_readonly_master_key", readonlyKeys.SecondaryReadonlyMasterKey) + return fmt.Errorf("[ERROR] Unable to List read-only keys for CosmosDB Account %s: %s", name, err) + } + d.Set("primary_readonly_master_key", readonlyKeys.PrimaryReadonlyMasterKey) + d.Set("secondary_readonly_master_key", readonlyKeys.SecondaryReadonlyMasterKey) + + connStringResp, err := client.ListConnectionStrings(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("[ERROR] Unable to List connection strings for CosmosDB Account %s: %s", name, err) + } + var connStrings []string + if connStringResp.ConnectionStrings != nil { + connStrings = make([]string, len(*connStringResp.ConnectionStrings)) + for i, v := range *connStringResp.ConnectionStrings { + connStrings[i] = *v.ConnectionString + } + } + d.Set("connection_strings", connStrings) return nil } diff --git a/azurerm/resource_arm_cosmos_db_account_test.go b/azurerm/resource_arm_cosmos_db_account_test.go index af543dfba05a..904df9dc7c0d 100644 --- a/azurerm/resource_arm_cosmos_db_account_test.go +++ b/azurerm/resource_arm_cosmos_db_account_test.go @@ -215,6 +215,7 @@ func TestAccAzureRMCosmosDBAccount_mongoDB(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( checkAccAzureRMCosmosDBAccount_basic(resourceName, testLocation(), string(documentdb.BoundedStaleness), 1), resource.TestCheckResourceAttr(resourceName, "kind", "MongoDB"), + resource.TestCheckResourceAttr(resourceName, "connection_strings.#", "1"), ), }, }, diff --git a/website/docs/r/cosmosdb_account.html.markdown b/website/docs/r/cosmosdb_account.html.markdown index 1fd8e3f44b9a..24688254ffc5 100644 --- a/website/docs/r/cosmosdb_account.html.markdown +++ b/website/docs/r/cosmosdb_account.html.markdown @@ -111,6 +111,9 @@ The following attributes are exported: * `secondary_readonly_master_key` - The Secondary read-only master key for the CosmosDB Account. +* `connection_strings` - A list of connection strings available for this CosmosDB + account. If the kind is `GlobalDocumentDB`, this will be empty. + ## Import From a7a40509e32e93e2531923e7d63a3ff87180b459 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Fri, 4 May 2018 11:22:15 +0100 Subject: [PATCH 057/320] adding adls client and account resources --- azurerm/config.go | 11 + azurerm/data_source_data_lake_store.go | 64 ++++++ azurerm/data_source_data_lake_store_test.go | 96 +++++++++ azurerm/import_arm_data_lake_store_test.go | 54 +++++ azurerm/resource_arm_cdn_profile_test.go | 2 +- azurerm/resource_arm_data_lake_store.go | 184 +++++++++++++++++ azurerm/resource_arm_data_lake_store_test.go | 204 +++++++++++++++++++ 7 files changed, 614 insertions(+), 1 deletion(-) create mode 100644 azurerm/data_source_data_lake_store.go create mode 100644 azurerm/data_source_data_lake_store_test.go create mode 100644 azurerm/import_arm_data_lake_store_test.go create mode 100644 azurerm/resource_arm_data_lake_store.go create mode 100644 azurerm/resource_arm_data_lake_store_test.go diff --git a/azurerm/config.go b/azurerm/config.go index 06c646de77c9..8b73059373a0 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -20,6 +20,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice" "github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb" "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns" + "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account" "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid" "github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub" "github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac" @@ -137,6 +138,9 @@ type ArmClient struct { sqlServerAzureADAdministratorsClient sql.ServerAzureADAdministratorsClient sqlVirtualNetworkRulesClient sql.VirtualNetworkRulesClient + // Data Lake Store + dataLakeStoreAccount account.AccountsClient + // KeyVault keyVaultClient keyvault.VaultsClient keyVaultManagementClient keyVault.BaseClient @@ -372,6 +376,7 @@ func getArmClient(c *authentication.Config) (*ArmClient, error) { client.registerDatabases(endpoint, c.SubscriptionID, auth, sender) client.registerDeviceClients(endpoint, c.SubscriptionID, auth, sender) client.registerDNSClients(endpoint, c.SubscriptionID, auth, sender) + client.registerDataLakeStoreAccountClients(endpoint, c.SubscriptionID, auth, sender) client.registerEventGridClients(endpoint, c.SubscriptionID, auth, sender) client.registerEventHubClients(endpoint, c.SubscriptionID, auth, sender) client.registerKeyVaultClients(endpoint, c.SubscriptionID, auth, keyVaultAuth, sender) @@ -644,6 +649,12 @@ func (c *ArmClient) registerDNSClients(endpoint, subscriptionId string, auth aut c.zonesClient = zo } +func (c *ArmClient) registerDataLakeStoreAccountClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) { + dataLakeStoreAccountClient := accounts.NewAccountsClientWithBaseURI(endpoint, subscriptionId) + c.configureClient(&dataLakeStoreAccountClient.Client, auth) + c.dataLakeStoreAccountClient = dataLakeStoreAccountClient +} + func (c *ArmClient) registerEventGridClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) { egtc := eventgrid.NewTopicsClientWithBaseURI(endpoint, subscriptionId) setUserAgent(&egtc.Client) diff --git a/azurerm/data_source_data_lake_store.go b/azurerm/data_source_data_lake_store.go new file mode 100644 index 000000000000..2b8f48640e9b --- /dev/null +++ b/azurerm/data_source_data_lake_store.go @@ -0,0 +1,64 @@ +package azurerm + +import ( + "fmt" + + "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmDataLakeStoreAccount() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmDateLakeStoreAccountRead, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + + "resource_group_name": resourceGroupNameForDataSourceSchema(), + + "location": locationForDataSourceSchema(), + + "tier": { + Type: schema.TypeString, + Optional: true, + Default: false + }, + + "tags": tagsForDataSourceSchema(), + }, + } +} + +func dataSourceArmDateLakeStoreAccountRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).dataLakeStoreAccountClient + ctx := meta.(*ArmClient).StopContext + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + return fmt.Errorf("Error making Read request on Azure Data Lake %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.SetId(*resp.ID) + + d.Set("name", name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azureRMNormalizeLocation(*location)) + } + d.Set("tier", string(resp.Type)) + + + flattenAndSetTags(d, resp.Tags) + + return nil +} diff --git a/azurerm/data_source_data_lake_store_test.go b/azurerm/data_source_data_lake_store_test.go new file mode 100644 index 000000000000..21b68e28eaeb --- /dev/null +++ b/azurerm/data_source_data_lake_store_test.go @@ -0,0 +1,96 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccDataSourceAzureRMDataLakeStore_payasyougo(t *testing.T) { + dataSourceName := "data.azurerm_data_lake_store.test" + rInt := acctest.RandInt() + location := testLocation() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceDataLakeStore_payasyougo(rInt, location), + Check: resource.ComposeTestCheckFunc( + resource.testCheckAzureRMDataLakeStoreExists(dataSourceName), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMDataLakeStore_monthlycommitment(t *testing.T) { + dataSourceName := "data.azurerm_data_lake_store.test" + rInt := acctest.RandInt() + location := testLocation() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceDataLakeStore_monthlycommitment(rInt, location), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "tier", "Commitment_1TB"), + resource.TestCheckResourceAttr(dataSourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(dataSourceName, "tags.hello", "world") + ), + }, + }, + }) +} + +func testAccDataSourceDataLakeStore_payasyougo(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG_%d" + location = "%s" +} + +resource "azurerm_data_lake_store" "test" { + name = "acctestdatalakestore%d" + location = "%s" + resource_group_name = "${azurerm_resource_group.test.name}" + tags { + hello = "world" + } +} + +data "azurerm_data_lake_store" "test" { + name = "${azurerm_data_lake_store.test.name}" + resource_group_name = "${azurerm_data_lake_store.test.resource_group_name}" +} +`, rInt, location, rInt) +} + +func testAccDataSourceDataLakeStore_monthlycommitment(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG_%d" + location = "%s" +} + +resource "azurerm_data_lake_store" "test" { + name = "acctestdatalakestore%d" + location = "%s" + tier = "Commitment_1TB" + resource_group_name = "${azurerm_resource_group.test.name}" + tags { + hello = "world" + } +} + +data "azurerm_data_lake_store" "test" { + name = "${azurerm_data_lake_store.test.name}" + resource_group_name = "${azurerm_data_lake_store.test.resource_group_name}" +} +`, rInt, location, rInt) +} diff --git a/azurerm/import_arm_data_lake_store_test.go b/azurerm/import_arm_data_lake_store_test.go new file mode 100644 index 000000000000..f70057bd58a3 --- /dev/null +++ b/azurerm/import_arm_data_lake_store_test.go @@ -0,0 +1,54 @@ +package azurerm + +import ( + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccAzureRMDataLakeStore_importPayAsYouGo(t *testing.T) { + resourceName := "azurerm_data_lake_store.test" + + ri := acctest.RandInt() + config := testAccAzureRMDataLakeStore_payasyougo(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMDataLakeStoreDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMDataLakeStore_importPayAsYouGoWithTags(t *testing.T) { + resourceName := "azurerm_data_lake_store.test" + + ri := acctest.RandInt() + config := testAccAzureDataLakeStore_withTags(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMDataLakeStoreDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} diff --git a/azurerm/resource_arm_cdn_profile_test.go b/azurerm/resource_arm_cdn_profile_test.go index c8e30c42f028..9bf1f8a2446a 100644 --- a/azurerm/resource_arm_cdn_profile_test.go +++ b/azurerm/resource_arm_cdn_profile_test.go @@ -12,7 +12,7 @@ import ( ) func init() { - resource.AddTestSweepers("azurerm_cdn_profile", &resource.Sweeper{ + resource.AddTestSweepers("azurerm_data_lake_store", &resource.Sweeper{ Name: "azurerm_cdn_profile", F: testSweepCDNProfiles, }) diff --git a/azurerm/resource_arm_data_lake_store.go b/azurerm/resource_arm_data_lake_store.go new file mode 100644 index 000000000000..ee5843f867c9 --- /dev/null +++ b/azurerm/resource_arm_data_lake_store.go @@ -0,0 +1,184 @@ +package azurerm + +import ( + "fmt" + "log" + + "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account" + "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmDateLakeStore() *schema.Resource { + return &schema.Resource{ + Create: resourceArmDateLakeStoreCreate, + Read: resourceArmDateLakeStoreRead, + Update: resourceArmDateLakeStoreUpdate, + Delete: resourceArmDateLakeStoreDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "location": locationSchema(), + + "resource_group_name": resourceGroupNameSchema(), + + "tier": { + Type: schema.TypeString, + Required: false, + ForceNew: false, + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + + "tags": tagsSchema(), + }, + } +} + +func resourceArmDateLakeStoreCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).dataLakeStoreAccountClient + ctx := meta.(*ArmClient).StopContext + + log.Printf("[INFO] preparing arguments for Azure ARM Date Lake Store creation.") + + name := d.Get("name").(string) + location := azureRMNormalizeLocation(d.Get("location").(string)) + resGroup := d.Get("resource_group_name").(string) + tier := d.Get("tier").(string) + tags := d.Get("tags").(map[string]interface{}) + + dateLakeStore := accounts.CreateDataLakeStoreAccountParameters{ + Location: &location, + Tags: expandTags(tags), + CreateDataLakeStoreAccountProperties: &accounts.CreateDataLakeStoreAccountProperties{ + NewTier: tier, + }, + } + + future, err := client.Create(ctx, resGroup, name, dateLakeStore) + if err != nil { + return err + } + + err = future.WaitForCompletion(ctx, client.Client) + if err != nil { + return err + } + + read, err := client.Get(ctx, resGroup, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Cannot read Data Lake Store %s (resource group %s) ID", name, resGroup) + } + + d.SetId(*read.ID) + + return resourceArmDateLakeStoreRead(d, meta) +} + +func resourceArmDateLakeStoreUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).dataLakeStoreAccountClient + ctx := meta.(*ArmClient).StopContext + + if !d.HasChange("tags") { + return nil + } + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + newTags := d.Get("tags").(map[string]interface{}) + newTier := d.Get("tier").(string) + + props := accounts.UpdateDataLakeStoreAccountParameters{ + Tags: expandTags(newTags), + UpdateDataLakeStoreAccountProperties: &accounts.UpdateDataLakeStoreAccountProperties{ + NewTier: newTier, + } + } + + future, err := client.Update(ctx, resourceGroup, name, props) + if err != nil { + return fmt.Errorf("Error issuing update request for Data Lake Store %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + err = future.WaitForCompletion(ctx, client.Client) + if err != nil { + return fmt.Errorf("Error waiting for the update of Data Lake Store %q (Resource Group %q) to commplete: %+v", name, resourceGroup, err) + } + + return resourceArmDateLakeStoreRead(d, meta) +} + +func resourceArmDateLakeStoreRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).dataLakeStoreAccountClient + ctx := meta.(*ArmClient).StopContext + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["accounts"] + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + return fmt.Errorf("Error making Read request on Azure Data Lake Store %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.Set("name", name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azureRMNormalizeLocation(*location)) + } + + d.Set("tier", resp.Type) + + flattenAndSetTags(d, resp.Tags) + + return nil +} + +func resourceArmDateLakeStoreDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).dataLakeStoreAccountClient + ctx := meta.(*ArmClient).StopContext + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + + resourceGroup := id.ResourceGroup + name := id.Path["accounts"] + future, err := client.Delete(ctx, resourceGroup, name) + if err != nil { + if response.WasNotFound(future.Response()) { + return nil + } + return fmt.Errorf("Error issuing delete request for Azure Data Lake Store %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + err = future.WaitForCompletion(ctx, client.Client) + if err != nil { + if response.WasNotFound(future.Response()) { + return nil + } + return fmt.Errorf("Error waiting for Azure Data Lake Store %q (Resource Group %q) to be deleted: %+v", name, resourceGroup, err) + } + + return err +} diff --git a/azurerm/resource_arm_data_lake_store_test.go b/azurerm/resource_arm_data_lake_store_test.go new file mode 100644 index 000000000000..39fe00aa725d --- /dev/null +++ b/azurerm/resource_arm_data_lake_store_test.go @@ -0,0 +1,204 @@ +package azurerm + +import ( + "fmt" + "log" + "net/http" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccAzureRMDataLakeStore_payasyougo(t *testing.T) { + resourceName := "azurerm_data_lake_store.test" + ri := acctest.RandInt() + config := testAccAzureRMDataLakeStore_payasyougo(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMDataLakeStoreDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDataLakeStoreExists(resourceName), + ), + }, + }, + }) +} + +func TestAccAzureRMDataLakeStore_monthlycommitment(t *testing.T) { + resourceName := "azurerm_data_lake_store.test" + ri := acctest.RandInt() + config := TestAccAzureRMDataLakeStore_monthlycommitment(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMDataLakeStoreDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDataLakeStoreExists(resourceName), + ), + }, + }, + }) +} + +func TestAccAzureRMDataLakeStore_withTags(t *testing.T) { + resourceName := "azurerm_data_lake_store.test" + ri := acctest.RandInt() + location := testLocation() + preConfig := testAccAzureRMDataLakeStore_withTags(ri, location) + postConfig := testAccAzureRMDataLakeStore_withTagsUpdate(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMDataLakeStoreDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDataLakeStoreExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDnsZoneExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + ), + }, + }, + }) +} + +func testCheckAzureRMDataLakeStoreExists(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + accountName := rs.Primary.Attributes["name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for data lake store: %s", name) + } + + conn := testAccProvider.Meta().(*ArmClient).dataLakeStoreAccountClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + resp, err := conn.Get(ctx, resourceGroup, accountName) + if err != nil { + return fmt.Errorf("Bad: Get on dataLakeStoreAccountClient: %+v", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: Date Lake Store %q (resource group: %q) does not exist", accountName, resourceGroup) + } + + return nil + } +} + +func testCheckAzureRMDataLakeStoreDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*ArmClient).dataLakeStoreAccountClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_data_lake_store" { + continue + } + + accountName := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := conn.Get(ctx, resourceGroup, accountName) + if err != nil { + if resp.StatusCode == http.StatusNotFound { + return nil + } + + return err + } + + return fmt.Errorf("Data Lake Store still exists:\n%#v", resp) + } + + return nil +} + +func testAccAzureRMDataLakeStore_payasyougo(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG_%d" + location = "%s" +} + +resource "azurerm_data_lake_store" "test" { + name = "acctestlake%d" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, rInt, location, rInt) +} + +func TestAccAzureRMDataLakeStore_monthlycommitment(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG_%d" + location = "%s" +} + +resource "azurerm_data_lake_store" "test" { + name = "acctestlake%d" + resource_group_name = "${azurerm_resource_group.test.name}" + tier = "Commitment_1TB" +} +`, rInt, location, rInt) +} + +func testAccAzureRMDataLakeStore_withTags(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG_%d" + location = "%s" +} + +resource "azurerm_data_lake_store" "test" { + name = "acctestlake%d" + resource_group_name = "${azurerm_resource_group.test.name}" + tags { + environment = "Production" + cost_center = "MSFT" + } +} +`, rInt, location, rInt) +} + +func testAccAzureRMDataLakeStore_withTagsUpdate(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG_%d" + location = "%s" +} + +resource "azurerm_data_lake_store" "test" { + name = "acctestlake%d" + resource_group_name = "${azurerm_resource_group.test.name}" + tags { + environment = "staging" + } +} +`, rInt, location, rInt) +} + From 9b4590c5d4198f63e71c0b28cb2befeeaad0eadc Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Fri, 4 May 2018 12:44:00 +0100 Subject: [PATCH 058/320] fixing errors --- azurerm/config.go | 6 +++--- azurerm/data_source_data_lake_store.go | 5 ++--- azurerm/data_source_data_lake_store_test.go | 8 ++++---- azurerm/import_arm_data_lake_store_test.go | 4 ++-- azurerm/resource_arm_data_lake_store.go | 21 ++++++++++---------- azurerm/resource_arm_data_lake_store_test.go | 18 +++++++++-------- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/azurerm/config.go b/azurerm/config.go index 8b73059373a0..f5f988c4a579 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -19,8 +19,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry" "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice" "github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb" - "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns" "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account" + "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns" "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid" "github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub" "github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac" @@ -139,7 +139,7 @@ type ArmClient struct { sqlVirtualNetworkRulesClient sql.VirtualNetworkRulesClient // Data Lake Store - dataLakeStoreAccount account.AccountsClient + dataLakeStoreAccountClient account.AccountsClient // KeyVault keyVaultClient keyvault.VaultsClient @@ -650,7 +650,7 @@ func (c *ArmClient) registerDNSClients(endpoint, subscriptionId string, auth aut } func (c *ArmClient) registerDataLakeStoreAccountClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) { - dataLakeStoreAccountClient := accounts.NewAccountsClientWithBaseURI(endpoint, subscriptionId) + dataLakeStoreAccountClient := account.NewAccountsClientWithBaseURI(endpoint, subscriptionId) c.configureClient(&dataLakeStoreAccountClient.Client, auth) c.dataLakeStoreAccountClient = dataLakeStoreAccountClient } diff --git a/azurerm/data_source_data_lake_store.go b/azurerm/data_source_data_lake_store.go index 2b8f48640e9b..e5db925ba599 100644 --- a/azurerm/data_source_data_lake_store.go +++ b/azurerm/data_source_data_lake_store.go @@ -24,7 +24,7 @@ func dataSourceArmDataLakeStoreAccount() *schema.Resource { "tier": { Type: schema.TypeString, Optional: true, - Default: false + Default: false, }, "tags": tagsForDataSourceSchema(), @@ -55,8 +55,7 @@ func dataSourceArmDateLakeStoreAccountRead(d *schema.ResourceData, meta interfac if location := resp.Location; location != nil { d.Set("location", azureRMNormalizeLocation(*location)) } - d.Set("tier", string(resp.Type)) - + d.Set("tier", resp.Type) flattenAndSetTags(d, resp.Tags) diff --git a/azurerm/data_source_data_lake_store_test.go b/azurerm/data_source_data_lake_store_test.go index 21b68e28eaeb..46c4d93cef75 100644 --- a/azurerm/data_source_data_lake_store_test.go +++ b/azurerm/data_source_data_lake_store_test.go @@ -20,7 +20,7 @@ func TestAccDataSourceAzureRMDataLakeStore_payasyougo(t *testing.T) { { Config: testAccDataSourceDataLakeStore_payasyougo(rInt, location), Check: resource.ComposeTestCheckFunc( - resource.testCheckAzureRMDataLakeStoreExists(dataSourceName), + testCheckAzureRMDataLakeStoreExists(dataSourceName), ), }, }, @@ -41,7 +41,7 @@ func TestAccDataSourceAzureRMDataLakeStore_monthlycommitment(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(dataSourceName, "tier", "Commitment_1TB"), resource.TestCheckResourceAttr(dataSourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(dataSourceName, "tags.hello", "world") + resource.TestCheckResourceAttr(dataSourceName, "tags.hello", "world"), ), }, }, @@ -68,7 +68,7 @@ data "azurerm_data_lake_store" "test" { name = "${azurerm_data_lake_store.test.name}" resource_group_name = "${azurerm_data_lake_store.test.resource_group_name}" } -`, rInt, location, rInt) +`, rInt, location, rInt, location) } func testAccDataSourceDataLakeStore_monthlycommitment(rInt int, location string) string { @@ -92,5 +92,5 @@ data "azurerm_data_lake_store" "test" { name = "${azurerm_data_lake_store.test.name}" resource_group_name = "${azurerm_data_lake_store.test.resource_group_name}" } -`, rInt, location, rInt) +`, rInt, location, rInt, location) } diff --git a/azurerm/import_arm_data_lake_store_test.go b/azurerm/import_arm_data_lake_store_test.go index f70057bd58a3..77e33d416bd1 100644 --- a/azurerm/import_arm_data_lake_store_test.go +++ b/azurerm/import_arm_data_lake_store_test.go @@ -30,11 +30,11 @@ func TestAccAzureRMDataLakeStore_importPayAsYouGo(t *testing.T) { }) } -func TestAccAzureRMDataLakeStore_importPayAsYouGoWithTags(t *testing.T) { +func TestAccAzureRMDataLakeStore_importTags(t *testing.T) { resourceName := "azurerm_data_lake_store.test" ri := acctest.RandInt() - config := testAccAzureDataLakeStore_withTags(ri, testLocation()) + config := testAccAzureRMDataLakeStore_withTags(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/azurerm/resource_arm_data_lake_store.go b/azurerm/resource_arm_data_lake_store.go index ee5843f867c9..1b98ce0dc428 100644 --- a/azurerm/resource_arm_data_lake_store.go +++ b/azurerm/resource_arm_data_lake_store.go @@ -6,7 +6,6 @@ import ( "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account" "github.com/hashicorp/terraform/helper/schema" - "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,9 +32,9 @@ func resourceArmDateLakeStore() *schema.Resource { "resource_group_name": resourceGroupNameSchema(), "tier": { - Type: schema.TypeString, - Required: false, - ForceNew: false, + Type: schema.TypeString, + Required: false, + ForceNew: false, DiffSuppressFunc: ignoreCaseDiffSuppressFunc, }, @@ -53,13 +52,13 @@ func resourceArmDateLakeStoreCreate(d *schema.ResourceData, meta interface{}) er name := d.Get("name").(string) location := azureRMNormalizeLocation(d.Get("location").(string)) resGroup := d.Get("resource_group_name").(string) - tier := d.Get("tier").(string) + tier := d.Get("tier").(account.TierType) tags := d.Get("tags").(map[string]interface{}) - dateLakeStore := accounts.CreateDataLakeStoreAccountParameters{ + dateLakeStore := account.CreateDataLakeStoreAccountParameters{ Location: &location, Tags: expandTags(tags), - CreateDataLakeStoreAccountProperties: &accounts.CreateDataLakeStoreAccountProperties{ + CreateDataLakeStoreAccountProperties: &account.CreateDataLakeStoreAccountProperties{ NewTier: tier, }, } @@ -98,13 +97,13 @@ func resourceArmDateLakeStoreUpdate(d *schema.ResourceData, meta interface{}) er name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) newTags := d.Get("tags").(map[string]interface{}) - newTier := d.Get("tier").(string) + newTier := d.Get("tier").(account.TierType) - props := accounts.UpdateDataLakeStoreAccountParameters{ + props := account.UpdateDataLakeStoreAccountParameters{ Tags: expandTags(newTags), - UpdateDataLakeStoreAccountProperties: &accounts.UpdateDataLakeStoreAccountProperties{ + UpdateDataLakeStoreAccountProperties: &account.UpdateDataLakeStoreAccountProperties{ NewTier: newTier, - } + }, } future, err := client.Update(ctx, resourceGroup, name, props) diff --git a/azurerm/resource_arm_data_lake_store_test.go b/azurerm/resource_arm_data_lake_store_test.go index 39fe00aa725d..6c1db16ff9d8 100644 --- a/azurerm/resource_arm_data_lake_store_test.go +++ b/azurerm/resource_arm_data_lake_store_test.go @@ -2,7 +2,6 @@ package azurerm import ( "fmt" - "log" "net/http" "testing" @@ -34,7 +33,7 @@ func TestAccAzureRMDataLakeStore_payasyougo(t *testing.T) { func TestAccAzureRMDataLakeStore_monthlycommitment(t *testing.T) { resourceName := "azurerm_data_lake_store.test" ri := acctest.RandInt() - config := TestAccAzureRMDataLakeStore_monthlycommitment(ri, testLocation()) + config := testAccAzureRMDataLakeStore_monthlycommitment(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -148,11 +147,12 @@ resource "azurerm_resource_group" "test" { resource "azurerm_data_lake_store" "test" { name = "acctestlake%d" resource_group_name = "${azurerm_resource_group.test.name}" + location = "%s" } -`, rInt, location, rInt) +`, rInt, location, rInt, location) } -func TestAccAzureRMDataLakeStore_monthlycommitment(rInt int, location string) string { +func testAccAzureRMDataLakeStore_monthlycommitment(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG_%d" @@ -162,9 +162,10 @@ resource "azurerm_resource_group" "test" { resource "azurerm_data_lake_store" "test" { name = "acctestlake%d" resource_group_name = "${azurerm_resource_group.test.name}" + location = "%s" tier = "Commitment_1TB" } -`, rInt, location, rInt) +`, rInt, location, rInt, location) } func testAccAzureRMDataLakeStore_withTags(rInt int, location string) string { @@ -177,12 +178,13 @@ resource "azurerm_resource_group" "test" { resource "azurerm_data_lake_store" "test" { name = "acctestlake%d" resource_group_name = "${azurerm_resource_group.test.name}" + location = "%s" tags { environment = "Production" cost_center = "MSFT" } } -`, rInt, location, rInt) +`, rInt, location, rInt, location) } func testAccAzureRMDataLakeStore_withTagsUpdate(rInt int, location string) string { @@ -195,10 +197,10 @@ resource "azurerm_resource_group" "test" { resource "azurerm_data_lake_store" "test" { name = "acctestlake%d" resource_group_name = "${azurerm_resource_group.test.name}" + location = "%s" tags { environment = "staging" } } -`, rInt, location, rInt) +`, rInt, location, rInt, location) } - From 0f434d8fcda4e2ab9bc077fd8c34f86ae8474365 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Fri, 4 May 2018 20:31:04 +0100 Subject: [PATCH 059/320] adding provider, sorted order and fixed tests --- azurerm/config.go | 14 ++++----- azurerm/provider.go | 3 ++ azurerm/resource_arm_cdn_profile_test.go | 2 +- azurerm/resource_arm_data_lake_store.go | 32 +++++++++++++------- azurerm/resource_arm_data_lake_store_test.go | 8 +++-- 5 files changed, 37 insertions(+), 22 deletions(-) diff --git a/azurerm/config.go b/azurerm/config.go index f5f988c4a579..1180004604ad 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -374,9 +374,9 @@ func getArmClient(c *authentication.Config) (*ArmClient, error) { client.registerContainerServicesClients(endpoint, c.SubscriptionID, auth) client.registerCosmosDBClients(endpoint, c.SubscriptionID, auth, sender) client.registerDatabases(endpoint, c.SubscriptionID, auth, sender) + client.registerDataLakeStoreAccountClients(endpoint, c.SubscriptionID, auth, sender) client.registerDeviceClients(endpoint, c.SubscriptionID, auth, sender) client.registerDNSClients(endpoint, c.SubscriptionID, auth, sender) - client.registerDataLakeStoreAccountClients(endpoint, c.SubscriptionID, auth, sender) client.registerEventGridClients(endpoint, c.SubscriptionID, auth, sender) client.registerEventHubClients(endpoint, c.SubscriptionID, auth, sender) client.registerKeyVaultClients(endpoint, c.SubscriptionID, auth, keyVaultAuth, sender) @@ -633,6 +633,12 @@ func (c *ArmClient) registerDatabases(endpoint, subscriptionId string, auth auto c.sqlVirtualNetworkRulesClient = sqlVNRClient } +func (c *ArmClient) registerDataLakeStoreAccountClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) { + dataLakeStoreAccountClient := account.NewAccountsClientWithBaseURI(endpoint, subscriptionId) + c.configureClient(&dataLakeStoreAccountClient.Client, auth) + c.dataLakeStoreAccountClient = dataLakeStoreAccountClient +} + func (c *ArmClient) registerDeviceClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) { iotClient := devices.NewIotHubResourceClientWithBaseURI(endpoint, subscriptionId) c.configureClient(&iotClient.Client, auth) @@ -649,12 +655,6 @@ func (c *ArmClient) registerDNSClients(endpoint, subscriptionId string, auth aut c.zonesClient = zo } -func (c *ArmClient) registerDataLakeStoreAccountClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) { - dataLakeStoreAccountClient := account.NewAccountsClientWithBaseURI(endpoint, subscriptionId) - c.configureClient(&dataLakeStoreAccountClient.Client, auth) - c.dataLakeStoreAccountClient = dataLakeStoreAccountClient -} - func (c *ArmClient) registerEventGridClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) { egtc := eventgrid.NewTopicsClientWithBaseURI(endpoint, subscriptionId) setUserAgent(&egtc.Client) diff --git a/azurerm/provider.go b/azurerm/provider.go index 13388cb2e9a4..7fec890e27bc 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -84,6 +84,7 @@ func Provider() terraform.ResourceProvider { "azurerm_client_config": dataSourceArmClientConfig(), "azurerm_cdn_profile": dataSourceArmCdnProfile(), "azurerm_dns_zone": dataSourceArmDnsZone(), + "azurerm_data_lake_store": dataSourceArmDataLakeStoreAccount(), "azurerm_eventhub_namespace": dataSourceEventHubNamespace(), "azurerm_image": dataSourceArmImage(), "azurerm_key_vault_access_policy": dataSourceArmKeyVaultAccessPolicy(), @@ -127,6 +128,7 @@ func Provider() terraform.ResourceProvider { "azurerm_container_service": resourceArmContainerService(), "azurerm_container_group": resourceArmContainerGroup(), "azurerm_cosmosdb_account": resourceArmCosmosDBAccount(), + "azurerm_data_lake_store": resourceArmDataLakeStore(), "azurerm_dns_a_record": resourceArmDnsARecord(), "azurerm_dns_aaaa_record": resourceArmDnsAAAARecord(), "azurerm_dns_cname_record": resourceArmDnsCNameRecord(), @@ -331,6 +333,7 @@ func determineAzureResourceProvidersToRegister(providerList []resources.Provider "Microsoft.DBforPostgreSQL": {}, "Microsoft.Devices": {}, "Microsoft.DocumentDB": {}, + "Microsoft.DataLakeStore": {}, "Microsoft.EventGrid": {}, "Microsoft.EventHub": {}, "Microsoft.KeyVault": {}, diff --git a/azurerm/resource_arm_cdn_profile_test.go b/azurerm/resource_arm_cdn_profile_test.go index 9bf1f8a2446a..c8e30c42f028 100644 --- a/azurerm/resource_arm_cdn_profile_test.go +++ b/azurerm/resource_arm_cdn_profile_test.go @@ -12,7 +12,7 @@ import ( ) func init() { - resource.AddTestSweepers("azurerm_data_lake_store", &resource.Sweeper{ + resource.AddTestSweepers("azurerm_cdn_profile", &resource.Sweeper{ Name: "azurerm_cdn_profile", F: testSweepCDNProfiles, }) diff --git a/azurerm/resource_arm_data_lake_store.go b/azurerm/resource_arm_data_lake_store.go index 1b98ce0dc428..56a125b05cfb 100644 --- a/azurerm/resource_arm_data_lake_store.go +++ b/azurerm/resource_arm_data_lake_store.go @@ -6,11 +6,12 @@ import ( "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceArmDateLakeStore() *schema.Resource { +func resourceArmDataLakeStore() *schema.Resource { return &schema.Resource{ Create: resourceArmDateLakeStoreCreate, Read: resourceArmDateLakeStoreRead, @@ -33,9 +34,19 @@ func resourceArmDateLakeStore() *schema.Resource { "tier": { Type: schema.TypeString, - Required: false, ForceNew: false, + Optional: true, + Default: string(account.Consumption), DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ValidateFunc: validation.StringInSlice([]string{ + string(account.Consumption), + string(account.Commitment1TB), + string(account.Commitment10TB), + string(account.Commitment100TB), + string(account.Commitment500TB), + string(account.Commitment1PB), + string(account.Commitment5PB), + }, true), }, "tags": tagsSchema(), @@ -52,14 +63,14 @@ func resourceArmDateLakeStoreCreate(d *schema.ResourceData, meta interface{}) er name := d.Get("name").(string) location := azureRMNormalizeLocation(d.Get("location").(string)) resGroup := d.Get("resource_group_name").(string) - tier := d.Get("tier").(account.TierType) + tier := d.Get("tier").(string) tags := d.Get("tags").(map[string]interface{}) dateLakeStore := account.CreateDataLakeStoreAccountParameters{ Location: &location, Tags: expandTags(tags), CreateDataLakeStoreAccountProperties: &account.CreateDataLakeStoreAccountProperties{ - NewTier: tier, + NewTier: account.TierType(tier), }, } @@ -90,19 +101,15 @@ func resourceArmDateLakeStoreUpdate(d *schema.ResourceData, meta interface{}) er client := meta.(*ArmClient).dataLakeStoreAccountClient ctx := meta.(*ArmClient).StopContext - if !d.HasChange("tags") { - return nil - } - name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) newTags := d.Get("tags").(map[string]interface{}) - newTier := d.Get("tier").(account.TierType) + newTier := d.Get("tier").(string) props := account.UpdateDataLakeStoreAccountParameters{ Tags: expandTags(newTags), UpdateDataLakeStoreAccountProperties: &account.UpdateDataLakeStoreAccountProperties{ - NewTier: newTier, + NewTier: account.TierType(newTier), }, } @@ -134,6 +141,7 @@ func resourceArmDateLakeStoreRead(d *schema.ResourceData, meta interface{}) erro if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") + fmt.Print("Oh no nothing was found") return nil } return fmt.Errorf("Error making Read request on Azure Data Lake Store %q (Resource Group %q): %+v", name, resourceGroup, err) @@ -145,7 +153,9 @@ func resourceArmDateLakeStoreRead(d *schema.ResourceData, meta interface{}) erro d.Set("location", azureRMNormalizeLocation(*location)) } - d.Set("tier", resp.Type) + if tier := resp.DataLakeStoreAccountProperties; tier != nil { + d.Set("tier", string(tier.CurrentTier)) + } flattenAndSetTags(d, resp.Tags) diff --git a/azurerm/resource_arm_data_lake_store_test.go b/azurerm/resource_arm_data_lake_store_test.go index 6c1db16ff9d8..182cfeaf3dd7 100644 --- a/azurerm/resource_arm_data_lake_store_test.go +++ b/azurerm/resource_arm_data_lake_store_test.go @@ -12,7 +12,7 @@ import ( func TestAccAzureRMDataLakeStore_payasyougo(t *testing.T) { resourceName := "azurerm_data_lake_store.test" - ri := acctest.RandInt() + ri := acctest.RandIntRange(1, 999999) config := testAccAzureRMDataLakeStore_payasyougo(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -24,6 +24,7 @@ func TestAccAzureRMDataLakeStore_payasyougo(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDataLakeStoreExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tier", "Consumption"), ), }, }, @@ -32,7 +33,7 @@ func TestAccAzureRMDataLakeStore_payasyougo(t *testing.T) { func TestAccAzureRMDataLakeStore_monthlycommitment(t *testing.T) { resourceName := "azurerm_data_lake_store.test" - ri := acctest.RandInt() + ri := acctest.RandIntRange(1, 999999) config := testAccAzureRMDataLakeStore_monthlycommitment(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -44,6 +45,7 @@ func TestAccAzureRMDataLakeStore_monthlycommitment(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDataLakeStoreExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tier", "Commitment_1TB"), ), }, }, @@ -52,7 +54,7 @@ func TestAccAzureRMDataLakeStore_monthlycommitment(t *testing.T) { func TestAccAzureRMDataLakeStore_withTags(t *testing.T) { resourceName := "azurerm_data_lake_store.test" - ri := acctest.RandInt() + ri := acctest.RandIntRange(1, 999999) location := testLocation() preConfig := testAccAzureRMDataLakeStore_withTags(ri, location) postConfig := testAccAzureRMDataLakeStore_withTagsUpdate(ri, location) From 05ee615fed88c3820769e9fc0a9466dece877287 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 4 May 2018 13:06:53 -0700 Subject: [PATCH 060/320] Update cosmosdb_account.html.markdown Updating something so teamcity can see new changes after force push. --- website/docs/r/cosmosdb_account.html.markdown | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/docs/r/cosmosdb_account.html.markdown b/website/docs/r/cosmosdb_account.html.markdown index 24688254ffc5..becd31c93e0e 100644 --- a/website/docs/r/cosmosdb_account.html.markdown +++ b/website/docs/r/cosmosdb_account.html.markdown @@ -111,8 +111,7 @@ The following attributes are exported: * `secondary_readonly_master_key` - The Secondary read-only master key for the CosmosDB Account. -* `connection_strings` - A list of connection strings available for this CosmosDB - account. If the kind is `GlobalDocumentDB`, this will be empty. +* `connection_strings` - A list of connection strings available for this CosmosDB account. If the kind is `GlobalDocumentDB`, this will be empty. ## Import From 2c86bac5e890ce2618eae11bd091c70e47b81b5b Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 4 May 2018 13:21:11 -0700 Subject: [PATCH 061/320] cosmos_db_account: Remove import tests and verify import on remaining tests --- azurerm/import_arm_cosmosdb_account_test.go | 176 ------------------ .../resource_arm_cosmos_db_account_test.go | 65 +++++++ 2 files changed, 65 insertions(+), 176 deletions(-) delete mode 100644 azurerm/import_arm_cosmosdb_account_test.go diff --git a/azurerm/import_arm_cosmosdb_account_test.go b/azurerm/import_arm_cosmosdb_account_test.go deleted file mode 100644 index ffb239ed3787..000000000000 --- a/azurerm/import_arm_cosmosdb_account_test.go +++ /dev/null @@ -1,176 +0,0 @@ -package azurerm - -import ( - "testing" - - "github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb" - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAzureRMCosmosDBAccount_importEventualConsistency(t *testing.T) { - resourceName := "azurerm_cosmosdb_account.test" - - ri := acctest.RandInt() - config := testAccAzureRMCosmosDBAccount_basic(ri, testLocation(), string(documentdb.Eventual), "", "") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMCosmosDBAccountDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAzureRMCosmosDBAccount_importSession(t *testing.T) { - resourceName := "azurerm_cosmosdb_account.test" - - ri := acctest.RandInt() - config := testAccAzureRMCosmosDBAccount_basic(ri, testLocation(), string(documentdb.Session), "", "") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMCosmosDBAccountDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAzureRMCosmosDBAccount_importStrong(t *testing.T) { - resourceName := "azurerm_cosmosdb_account.test" - - ri := acctest.RandInt() - config := testAccAzureRMCosmosDBAccount_basic(ri, testLocation(), string(documentdb.Strong), "", "") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMCosmosDBAccountDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAzureRMCosmosDBAccount_importBoundedStaleness(t *testing.T) { - resourceName := "azurerm_cosmosdb_account.test" - - ri := acctest.RandInt() - config := testAccAzureRMCosmosDBAccount_basic(ri, testLocation(), string(documentdb.BoundedStaleness), "", "") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMCosmosDBAccountDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAzureRMCosmosDBAccount_importBoundedStalenessComplete(t *testing.T) { - resourceName := "azurerm_cosmosdb_account.test" - - ri := acctest.RandInt() - config := testAccAzureRMCosmosDBAccount_boundedStaleness_complete(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMCosmosDBAccountDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAzureRMCosmosDBAccount_importMongoDB(t *testing.T) { - resourceName := "azurerm_cosmosdb_account.test" - - ri := acctest.RandInt() - config := testAccAzureRMCosmosDBAccount_mongoDB(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMCosmosDBAccountDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAzureRMCosmosDBAccount_importGeoReplicated(t *testing.T) { - resourceName := "azurerm_cosmosdb_account.test" - - ri := acctest.RandInt() - config := testAccAzureRMCosmosDBAccount_geoReplicated_customId(ri, testLocation(), testAltLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMCosmosDBAccountDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/azurerm/resource_arm_cosmos_db_account_test.go b/azurerm/resource_arm_cosmos_db_account_test.go index af543dfba05a..788925b0de9c 100644 --- a/azurerm/resource_arm_cosmos_db_account_test.go +++ b/azurerm/resource_arm_cosmos_db_account_test.go @@ -78,6 +78,11 @@ func TestAccAzureRMCosmosDBAccount_eventualConsistency(t *testing.T) { checkAccAzureRMCosmosDBAccount_basic(resourceName, testLocation(), string(documentdb.Eventual), 1), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -97,6 +102,11 @@ func TestAccAzureRMCosmosDBAccount_session(t *testing.T) { checkAccAzureRMCosmosDBAccount_basic(resourceName, testLocation(), string(documentdb.Session), 1), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -116,6 +126,11 @@ func TestAccAzureRMCosmosDBAccount_strong(t *testing.T) { checkAccAzureRMCosmosDBAccount_basic(resourceName, testLocation(), string(documentdb.Strong), 1), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -135,6 +150,11 @@ func TestAccAzureRMCosmosDBAccount_consistentPrefix(t *testing.T) { checkAccAzureRMCosmosDBAccount_basic(resourceName, testLocation(), string(documentdb.ConsistentPrefix), 1), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -154,6 +174,11 @@ func TestAccAzureRMCosmosDBAccount_boundedStaleness(t *testing.T) { checkAccAzureRMCosmosDBAccount_basic(resourceName, testLocation(), string(documentdb.BoundedStaleness), 1), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -175,6 +200,11 @@ func TestAccAzureRMCosmosDBAccount_boundedStaleness_complete(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "consistency_policy.0.max_staleness_prefix", "200"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -196,6 +226,11 @@ func TestAccAzureRMCosmosDBAccount_consistency_change(t *testing.T) { Config: testAccAzureRMCosmosDBAccount_basic(ri, testLocation(), string(documentdb.BoundedStaleness), "", ""), Check: checkAccAzureRMCosmosDBAccount_basic(resourceName, testLocation(), string(documentdb.BoundedStaleness), 1), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -217,6 +252,11 @@ func TestAccAzureRMCosmosDBAccount_mongoDB(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "kind", "MongoDB"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -238,6 +278,11 @@ func TestAbcAzureRMCosmosDBAccount_updatePropertiesAndLocation(t *testing.T) { Config: testAccAzureRMCosmosDBAccount_geoReplicated_customId(ri, testLocation(), testAltLocation()), Check: checkAccAzureRMCosmosDBAccount_basic(resourceName, testLocation(), string(documentdb.BoundedStaleness), 2), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -258,6 +303,11 @@ func TestAccAzureRMCosmosDBAccount_geoReplicated_customId(t *testing.T) { checkAccAzureRMCosmosDBAccount_basic(resourceName, testLocation(), string(documentdb.BoundedStaleness), 2), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -289,6 +339,11 @@ func TestAccAzureRMCosmosDBAccount_geoReplicated_add_remove(t *testing.T) { checkAccAzureRMCosmosDBAccount_basic(resourceName, testLocation(), string(documentdb.BoundedStaleness), 1), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -310,6 +365,11 @@ func TestAccAzureRMCosmosDBAccount_geoReplicated_rename(t *testing.T) { Config: testAccAzureRMCosmosDBAccount_geoReplicated_customId(ri, testLocation(), testAltLocation()), Check: checkAccAzureRMCosmosDBAccount_basic(resourceName, testLocation(), string(documentdb.BoundedStaleness), 2), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -336,6 +396,11 @@ func TestAccAzureRMCosmosDBAccount_complete(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "enable_automatic_failover", "true"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } From 32f0b80c7a1e746c6c5ab501294fbcd9329477e5 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 4 May 2018 13:56:24 -0700 Subject: [PATCH 062/320] cosmos_db_account: added ip_range_filter validation and example --- azurerm/resource_arm_cosmos_db_account.go | 4 ++++ examples/cosmos-db/main.tf | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/azurerm/resource_arm_cosmos_db_account.go b/azurerm/resource_arm_cosmos_db_account.go index b4c0e1bed192..6c3f61a1ca17 100644 --- a/azurerm/resource_arm_cosmos_db_account.go +++ b/azurerm/resource_arm_cosmos_db_account.go @@ -71,6 +71,10 @@ func resourceArmCosmosDBAccount() *schema.Resource { "ip_range_filter": { Type: schema.TypeString, Optional: true, + ValidateFunc: validation.StringMatch( + regexp.MustCompile(`^(\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b[,]?){1,}$`), + "Cosmos DB ip_range_filter must be a set of CIDR IP addresses separated by commas with no spaces: '10.0.0.1,10.0.0.2'", + ), }, "enable_automatic_failover": { diff --git a/examples/cosmos-db/main.tf b/examples/cosmos-db/main.tf index e4f572a30821..56d4989c79f4 100644 --- a/examples/cosmos-db/main.tf +++ b/examples/cosmos-db/main.tf @@ -18,10 +18,13 @@ resource "azurerm_cosmosdb_account" "db" { enable_automatic_failover = true + //set ip_range_filter to azure services (0.0.0.0) and azure portal. + ip_range_filter = "0.0.0.0,104.42.195.92,40.76.54.131,52.176.6.30,52.169.50.45,52.187.184.26" + consistency_policy { - consistency_level = "BoundedStaleness" - max_interval_in_seconds = 10 - max_staleness_prefix = 200 + consistency_level = "BoundedStaleness" + max_interval_in_seconds = 10 + max_staleness_prefix = 200 } geo_location { @@ -31,7 +34,7 @@ resource "azurerm_cosmosdb_account" "db" { } geo_location { - location = "${var.failover_location}" - failover_priority = 0 + location = "${var.failover_location}" + failover_priority = 0 } } \ No newline at end of file From d8aeea56f1ba82401acce48403a292f2002ae774 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 4 May 2018 14:28:17 -0700 Subject: [PATCH 063/320] Update CHANGELOG.md to include #1194 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ba4edab99bf..25007ff3f684 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ IMPROVEMENTS: * `azurerm_app_service` - support for HTTP2 [GH-1188] * `azurerm_app_service` - support for Managed Service Identity [GH-1130] +* `cosmos_db_account` - added support for the `connection_strings` property [GH-1194] ## 1.4.0 (April 26, 2018) From c875ea42898a68cabac6c9126e178c4b102e9dbb Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 4 May 2018 14:31:45 -0700 Subject: [PATCH 064/320] cosmos_db_account: removed unnecessary API call --- azurerm/resource_arm_cosmos_db_account.go | 8 +++----- examples/cosmos-db/outputs.tf | 8 ++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/azurerm/resource_arm_cosmos_db_account.go b/azurerm/resource_arm_cosmos_db_account.go index d7ff3b6b002b..4980b47a3774 100644 --- a/azurerm/resource_arm_cosmos_db_account.go +++ b/azurerm/resource_arm_cosmos_db_account.go @@ -507,12 +507,10 @@ func resourceArmCosmosDBAccountRead(d *schema.ResourceData, meta interface{}) er d.Set("primary_master_key", keys.PrimaryMasterKey) d.Set("secondary_master_key", keys.SecondaryMasterKey) - readonlyKeys, err := client.ListReadOnlyKeys(ctx, resourceGroup, name) - if err != nil { - return fmt.Errorf("[ERROR] Unable to List read-only keys for CosmosDB Account %s: %s", name, err) + if keys.DatabaseAccountListReadOnlyKeysResult != nil { + d.Set("primary_readonly_master_key", keys.PrimaryReadonlyMasterKey) + d.Set("secondary_readonly_master_key", keys.SecondaryReadonlyMasterKey) } - d.Set("primary_readonly_master_key", readonlyKeys.PrimaryReadonlyMasterKey) - d.Set("secondary_readonly_master_key", readonlyKeys.SecondaryReadonlyMasterKey) connStringResp, err := client.ListConnectionStrings(ctx, resourceGroup, name) if err != nil { diff --git a/examples/cosmos-db/outputs.tf b/examples/cosmos-db/outputs.tf index 7f4aa9f35c24..924c693f675b 100644 --- a/examples/cosmos-db/outputs.tf +++ b/examples/cosmos-db/outputs.tf @@ -20,4 +20,12 @@ output "cosmos-db-primary_master_key" { output "cosmos-db-secondary_master_key" { value = "${azurerm_cosmosdb_account.db.secondary_master_key}" +} + +output "cosmos-db-primary_read_key" { + value = "${azurerm_cosmosdb_account.db.primary_readonly_master_key}" +} + +output "cosmos-db-secondary_read_key" { + value = "${azurerm_cosmosdb_account.db.secondary_readonly_master_key}" } \ No newline at end of file From 32af2df85d5d5189e14bfe8404a55618b1fda651 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 4 May 2018 14:31:45 -0700 Subject: [PATCH 065/320] Revert "cosmos_db_account: removed unnecessary API call" This reverts commit c875ea42898a68cabac6c9126e178c4b102e9dbb. --- azurerm/resource_arm_cosmos_db_account.go | 8 +++++--- examples/cosmos-db/outputs.tf | 8 -------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/azurerm/resource_arm_cosmos_db_account.go b/azurerm/resource_arm_cosmos_db_account.go index 4980b47a3774..d7ff3b6b002b 100644 --- a/azurerm/resource_arm_cosmos_db_account.go +++ b/azurerm/resource_arm_cosmos_db_account.go @@ -507,10 +507,12 @@ func resourceArmCosmosDBAccountRead(d *schema.ResourceData, meta interface{}) er d.Set("primary_master_key", keys.PrimaryMasterKey) d.Set("secondary_master_key", keys.SecondaryMasterKey) - if keys.DatabaseAccountListReadOnlyKeysResult != nil { - d.Set("primary_readonly_master_key", keys.PrimaryReadonlyMasterKey) - d.Set("secondary_readonly_master_key", keys.SecondaryReadonlyMasterKey) + readonlyKeys, err := client.ListReadOnlyKeys(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("[ERROR] Unable to List read-only keys for CosmosDB Account %s: %s", name, err) } + d.Set("primary_readonly_master_key", readonlyKeys.PrimaryReadonlyMasterKey) + d.Set("secondary_readonly_master_key", readonlyKeys.SecondaryReadonlyMasterKey) connStringResp, err := client.ListConnectionStrings(ctx, resourceGroup, name) if err != nil { diff --git a/examples/cosmos-db/outputs.tf b/examples/cosmos-db/outputs.tf index 924c693f675b..7f4aa9f35c24 100644 --- a/examples/cosmos-db/outputs.tf +++ b/examples/cosmos-db/outputs.tf @@ -20,12 +20,4 @@ output "cosmos-db-primary_master_key" { output "cosmos-db-secondary_master_key" { value = "${azurerm_cosmosdb_account.db.secondary_master_key}" -} - -output "cosmos-db-primary_read_key" { - value = "${azurerm_cosmosdb_account.db.primary_readonly_master_key}" -} - -output "cosmos-db-secondary_read_key" { - value = "${azurerm_cosmosdb_account.db.secondary_readonly_master_key}" } \ No newline at end of file From 23a48b312fc2ee3fdcf3a5e7c22d8baf21dd7755 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 4 May 2018 19:01:43 -0700 Subject: [PATCH 066/320] cosmos_db_account: added comment about ListKeys api --- azurerm/resource_arm_cosmos_db_account.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azurerm/resource_arm_cosmos_db_account.go b/azurerm/resource_arm_cosmos_db_account.go index d7ff3b6b002b..805af209d8a3 100644 --- a/azurerm/resource_arm_cosmos_db_account.go +++ b/azurerm/resource_arm_cosmos_db_account.go @@ -500,6 +500,8 @@ func resourceArmCosmosDBAccountRead(d *schema.ResourceData, meta interface{}) er d.Set("write_endpoints", writeEndpoints) } + // ListKeys returns a data structure containing a DatabaseAccountListReadOnlyKeysResult pointer + // implying that it also returns the read only keys, however this appears to not be the case keys, err := client.ListKeys(ctx, resourceGroup, name) if err != nil { return fmt.Errorf("[ERROR] Unable to List Write keys for CosmosDB Account %s: %s", name, err) From 8bc8805006059b0487d143a3da4b6f711322c546 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 5 May 2018 14:34:19 -0700 Subject: [PATCH 067/320] Update azurerm_cosmosdb_account example comment --- examples/cosmos-db/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/cosmos-db/main.tf b/examples/cosmos-db/main.tf index 56d4989c79f4..dadd2dbff430 100644 --- a/examples/cosmos-db/main.tf +++ b/examples/cosmos-db/main.tf @@ -18,7 +18,7 @@ resource "azurerm_cosmosdb_account" "db" { enable_automatic_failover = true - //set ip_range_filter to azure services (0.0.0.0) and azure portal. + //set ip_range_filter to allow azure services (0.0.0.0) and azure portal. ip_range_filter = "0.0.0.0,104.42.195.92,40.76.54.131,52.176.6.30,52.169.50.45,52.187.184.26" consistency_policy { @@ -37,4 +37,4 @@ resource "azurerm_cosmosdb_account" "db" { location = "${var.failover_location}" failover_priority = 0 } -} \ No newline at end of file +} From e0a7e859890133f1b0d2d61c063169d7a208c60b Mon Sep 17 00:00:00 2001 From: Taylor Thomas Date: Sun, 6 May 2018 06:54:05 -0700 Subject: [PATCH 068/320] feat(keyvault): Adds certificate data to the key vault resource (#1200) --- azurerm/resource_arm_key_vault_certificate.go | 9 +++++++++ azurerm/resource_arm_key_vault_certificate_test.go | 3 +++ website/docs/r/key_vault_certificate.html.markdown | 1 + 3 files changed, 13 insertions(+) diff --git a/azurerm/resource_arm_key_vault_certificate.go b/azurerm/resource_arm_key_vault_certificate.go index f421d78248b6..5374eae3824e 100644 --- a/azurerm/resource_arm_key_vault_certificate.go +++ b/azurerm/resource_arm_key_vault_certificate.go @@ -231,6 +231,11 @@ func resourceArmKeyVaultCertificate() *schema.Resource { Computed: true, }, + "certificate_data": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tagsSchema(), }, } @@ -339,6 +344,10 @@ func resourceArmKeyVaultCertificateRead(d *schema.ResourceData, meta interface{} // Computed d.Set("version", id.Version) d.Set("secret_id", cert.Sid) + + if contents := cert.Cer; contents != nil { + d.Set("certificate_data", string(*contents)) + } flattenAndSetTags(d, cert.Tags) return nil diff --git a/azurerm/resource_arm_key_vault_certificate_test.go b/azurerm/resource_arm_key_vault_certificate_test.go index 32749d7c3e03..0e67f14436a9 100644 --- a/azurerm/resource_arm_key_vault_certificate_test.go +++ b/azurerm/resource_arm_key_vault_certificate_test.go @@ -24,6 +24,7 @@ func TestAccAzureRMKeyVaultCertificate_basicImportPFX(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultCertificateExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "certificate_data"), ), }, }, @@ -45,6 +46,7 @@ func TestAccAzureRMKeyVaultCertificate_basicGenerate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultCertificateExists(resourceName), resource.TestCheckResourceAttrSet(resourceName, "secret_id"), + resource.TestCheckResourceAttrSet(resourceName, "certificate_data"), ), }, }, @@ -65,6 +67,7 @@ func TestAccAzureRMKeyVaultCertificate_basicGenerateTags(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultCertificateExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "certificate_data"), resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), resource.TestCheckResourceAttr(resourceName, "tags.hello", "world"), ), diff --git a/website/docs/r/key_vault_certificate.html.markdown b/website/docs/r/key_vault_certificate.html.markdown index a747753af1db..b45953bd9f1f 100644 --- a/website/docs/r/key_vault_certificate.html.markdown +++ b/website/docs/r/key_vault_certificate.html.markdown @@ -251,6 +251,7 @@ The following attributes are exported: * `id` - The Key Vault Certificate ID. * `secret_id` - The ID of the associated Key Vault Secret. * `version` - The current version of the Key Vault Certificate. +* `certificate_data` - The raw Key Vault Certificate ## Import From 71ddb3b86f6aa1bf44ff160e7d7c4ca0b3d5052a Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 6 May 2018 06:55:13 -0700 Subject: [PATCH 069/320] Updating to include #1200 Also updating a couple of the older resource names to be correct --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25007ff3f684..a1521bd32e2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ IMPROVEMENTS: * `azurerm_app_service` - support for HTTP2 [GH-1188] * `azurerm_app_service` - support for Managed Service Identity [GH-1130] -* `cosmos_db_account` - added support for the `connection_strings` property [GH-1194] +* `azurerm_key_vault_certificate` - exposing the `certificate_data` [GH-1200] +* `azurerm_cosmosdb_account` - added support for the `connection_strings` property [GH-1194] ## 1.4.0 (April 26, 2018) @@ -16,7 +17,7 @@ FEATURES: * **New Data Source:** `azurerm_recovery_services_vault` ([#995](https://github.com/terraform-providers/terraform-provider-azurerm/issues/995)) * **New Resource:** `azurerm_recovery_services_vault` ([#995](https://github.com/terraform-providers/terraform-provider-azurerm/issues/995)) -* **New Resource:** `arm_servicebus_subscription_rule` ([#1124](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1124)) +* **New Resource:** `azurerm_servicebus_subscription_rule` ([#1124](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1124)) IMPROVEMENTS: From 182b29c32125f089523fd835da9705a725b16e04 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 6 May 2018 07:30:26 -0700 Subject: [PATCH 070/320] r/kubernetes_cluster: info on unexpected errors (#1197) * Documenting some known issues with the vnet_subnet_id field * Validating the agent pool name matches the regex in the error message from the API * Fixing a typo * Better explaining the routing issue --- azurerm/resource_arm_kubernetes_cluster.go | 15 ++++- .../resource_arm_kubernetes_cluster_test.go | 58 +++++++++++++++++++ .../docs/r/kubernetes_cluster.html.markdown | 15 +++++ 3 files changed, 85 insertions(+), 3 deletions(-) diff --git a/azurerm/resource_arm_kubernetes_cluster.go b/azurerm/resource_arm_kubernetes_cluster.go index be96c7932f5c..a8765ce9a03c 100644 --- a/azurerm/resource_arm_kubernetes_cluster.go +++ b/azurerm/resource_arm_kubernetes_cluster.go @@ -4,6 +4,7 @@ import ( "bytes" "fmt" "log" + "regexp" "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice" "github.com/hashicorp/terraform/helper/hashcode" @@ -127,9 +128,10 @@ func resourceArmKubernetesCluster() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateKubernetesClusterAgentPoolName(), }, "count": { @@ -560,3 +562,10 @@ func resourceAzureRMKubernetesClusterServicePrincipalProfileHash(v interface{}) return hashcode.String(buf.String()) } + +func validateKubernetesClusterAgentPoolName() schema.SchemaValidateFunc { + return validation.StringMatch( + regexp.MustCompile("^[a-z]{1}[a-z0-9]{0,11}$"), + "Agent Pool names must start with a lowercase letter, have max length of 12, and only have characters a-z0-9.", + ) +} diff --git a/azurerm/resource_arm_kubernetes_cluster_test.go b/azurerm/resource_arm_kubernetes_cluster_test.go index 061caeb6d9c1..a5b154e1f8db 100644 --- a/azurerm/resource_arm_kubernetes_cluster_test.go +++ b/azurerm/resource_arm_kubernetes_cluster_test.go @@ -11,6 +11,64 @@ import ( "github.com/hashicorp/terraform/terraform" ) +func TestAccAzureRMKubernetesCluster_agentPoolName(t *testing.T) { + cases := []struct { + Input string + ExpectError bool + }{ + { + Input: "", + ExpectError: true, + }, + { + Input: "hi", + ExpectError: false, + }, + { + Input: "hello", + ExpectError: false, + }, + { + Input: "hello-world", + ExpectError: true, + }, + { + Input: "helloworld123", + ExpectError: true, + }, + { + Input: "hello_world", + ExpectError: true, + }, + { + Input: "Hello-World", + ExpectError: true, + }, + { + Input: "20202020", + ExpectError: true, + }, + { + Input: "h20202020", + ExpectError: false, + }, + { + Input: "ABC123!@£", + ExpectError: true, + }, + } + + for _, tc := range cases { + _, errors := validateKubernetesClusterAgentPoolName()(tc.Input, "") + + hasError := len(errors) > 0 + + if tc.ExpectError && !hasError { + t.Fatalf("Expected the Kubernetes Cluster Agent Pool Name to trigger a validation error for '%s'", tc.Input) + } + } +} + func TestAccAzureRMKubernetesCluster_basic(t *testing.T) { resourceName := "azurerm_kubernetes_cluster.test" ri := acctest.RandInt() diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown index a48c46f7903a..0be4d53c6f7e 100644 --- a/website/docs/r/kubernetes_cluster.html.markdown +++ b/website/docs/r/kubernetes_cluster.html.markdown @@ -119,6 +119,8 @@ The following arguments are supported: * `os_type` - (Optional) The Operating System used for the Agents. Possible values are `Linux` and `Windows`. Changing this forces a new resource to be created. Defaults to `Linux`. * `vnet_subnet_id` - (Optional) The ID of the Subnet where the Agents in the Pool should be provisioned. Changing this forces a new resource to be created. +~> **NOTE:** There's a known issue where Agents connected to an Internal Network (e.g. on a Subnet) have their network routing configured incorrectly; such that Pods cannot communicate across nodes. This is a bug in the Azure API - and will be fixed there in the future. + `service_principal` supports the following: * `client_id` - (Required) The Client ID for the Service Principal. @@ -148,6 +150,19 @@ The following attributes are exported: * `password` - A password or token used to authenticate to the Kubernetes cluster. +-> **NOTE:** It's possible to use these credentials with [the Kubernetes Provider](/docs/providers/kubernetes/index.html) like so: + +``` +provider "kubernetes" { + host = "${azurerm_kubernetes_cluster.main.kube_config.0.host}" + username = "${azurerm_kubernetes_cluster.main.kube_config.0.username}" + password = "${azurerm_kubernetes_cluster.main.kube_config.0.password}" + client_certificate = "${base64decode(azurerm_kubernetes_cluster.main.kube_config.0.client_certificate)}" + client_key = "${base64decode(azurerm_kubernetes_cluster.main.kube_config.0.client_key)}" + cluster_ca_certificate = "${base64decode(azurerm_kubernetes_cluster.main.kube_config.0.cluster_ca_certificate)}" +} +``` + ## Import Kubernetes Managed Clusters can be imported using the `resource id`, e.g. From c1bf68289a9b8490d6c2488c5f3c6b4ee0976c7f Mon Sep 17 00:00:00 2001 From: YuriyKischenko Date: Sun, 6 May 2018 17:18:29 +0200 Subject: [PATCH 071/320] `azurerm_virtual_network_gateway`: ignoring the case of `GatewaySubnet` (#1141) * ignore case for gateway subnet name * Adding an acceptance test covering the subnet-name being in lowerCase --- .../resource_arm_virtual_network_gateway.go | 3 +- ...source_arm_virtual_network_gateway_test.go | 65 +++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_virtual_network_gateway.go b/azurerm/resource_arm_virtual_network_gateway.go index 60f36ce78dac..5d5261eef497 100644 --- a/azurerm/resource_arm_virtual_network_gateway.go +++ b/azurerm/resource_arm_virtual_network_gateway.go @@ -4,6 +4,7 @@ import ( "bytes" "fmt" "log" + "strings" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" "github.com/hashicorp/terraform/helper/hashcode" @@ -628,7 +629,7 @@ func validateArmVirtualNetworkGatewaySubnetId(i interface{}, k string) (s []stri return } - if subnet != "GatewaySubnet" { + if strings.ToLower(subnet) != "gatewaysubnet" { es = append(es, fmt.Errorf("expected %s to reference a gateway subnet with name GatewaySubnet", k)) } diff --git a/azurerm/resource_arm_virtual_network_gateway_test.go b/azurerm/resource_arm_virtual_network_gateway_test.go index da83380f030d..3ef5c3a7524a 100644 --- a/azurerm/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/resource_arm_virtual_network_gateway_test.go @@ -29,6 +29,25 @@ func TestAccAzureRMVirtualNetworkGateway_basic(t *testing.T) { }) } +func TestAccAzureRMVirtualNetworkGateway_lowerCaseSubnetName(t *testing.T) { + ri := acctest.RandInt() + config := testAccAzureRMVirtualNetworkGateway_lowerCaseSubnetName(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualNetworkGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualNetworkGatewayExists("azurerm_virtual_network_gateway.test"), + ), + }, + }, + }) +} + func TestAccAzureRMVirtualNetworkGateway_vpnGw1(t *testing.T) { ri := acctest.RandInt() config := testAccAzureRMVirtualNetworkGateway_vpnGw1(ri, testLocation()) @@ -162,6 +181,52 @@ resource "azurerm_virtual_network_gateway" "test" { `, rInt, location, rInt, rInt, rInt) } +func testAccAzureRMVirtualNetworkGateway_lowerCaseSubnetName(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvn-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + address_space = ["10.0.0.0/16"] +} + +resource "azurerm_subnet" "test" { + name = "gatewaySubnet" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_public_ip" "test" { + name = "acctestpip-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + public_ip_address_allocation = "Dynamic" +} + +resource "azurerm_virtual_network_gateway" "test" { + name = "acctestvng-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + type = "Vpn" + vpn_type = "RouteBased" + sku = "Basic" + + ip_configuration { + public_ip_address_id = "${azurerm_public_ip.test.id}" + private_ip_address_allocation = "Dynamic" + subnet_id = "${azurerm_subnet.test.id}" + } +} +`, rInt, location, rInt, rInt, rInt) +} + func testAccAzureRMVirtualNetworkGateway_vpnGw1(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From 80b1c5c63f6bf090cfabe6e5bc1e8a6542cbe066 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 6 May 2018 08:19:13 -0700 Subject: [PATCH 072/320] Updating to include #1141 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1521bd32e2e..0a742ac0e496 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,9 @@ IMPROVEMENTS: * `azurerm_app_service` - support for HTTP2 [GH-1188] * `azurerm_app_service` - support for Managed Service Identity [GH-1130] -* `azurerm_key_vault_certificate` - exposing the `certificate_data` [GH-1200] * `azurerm_cosmosdb_account` - added support for the `connection_strings` property [GH-1194] +* `azurerm_key_vault_certificate` - exposing the `certificate_data` [GH-1200] +* `azurerm_virtual_network_gateway` - ignoring the case of the `GatewaySubnet` [GH-1141] ## 1.4.0 (April 26, 2018) From 8ea22ad5a7668d61fa5f251046207ac39180adb9 Mon Sep 17 00:00:00 2001 From: kt Date: Sun, 6 May 2018 08:35:41 -0700 Subject: [PATCH 073/320] New Data Source: `azurerm_cosmosdb_account` (#1056) * Intial commit of updates to azurerm_cosmosdb_account resource * Updates to properly wait for adding/removing locations to be compleated * Updated cosmosdb_account resource to rename/reprioritize non-primary locations * Fixed failing azurerm_cosmosdb_account import tests * azurerm_cosmosdb_account minor updates and fixes * Added new datasource azurerm_cosmosdb_account * Fixed broken azurerm_cosmosdb_account import test * Small change to azurerm_cosmosdb_account tests * Updated cosmosdb_account with requested changes. * resGroup -> resourceGroup to fix the build * Fixing some minor nits * Reverted flattenAndSetTags merge regression * azurerm_cosmosdb_account: revert setting both failover_policy and geo_location on read, resulted in endless plans * Cleanup after merge * Fixing issues found during code review --- GNUmakefile | 3 + azurerm/data_source_cosmos_db_account.go | 224 ++++++++++++++++++ azurerm/data_source_cosmos_db_account_test.go | 112 +++++++++ azurerm/provider.go | 3 +- website/azurerm.erb | 5 + website/docs/d/cosmosdb_account.html.markdown | 77 ++++++ 6 files changed, 423 insertions(+), 1 deletion(-) create mode 100644 azurerm/data_source_cosmos_db_account.go create mode 100644 azurerm/data_source_cosmos_db_account_test.go create mode 100644 website/docs/d/cosmosdb_account.html.markdown diff --git a/GNUmakefile b/GNUmakefile index 2be12161a8eb..cd15d2ccdad4 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -16,6 +16,9 @@ test: fmtcheck testacc: fmtcheck TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 180m +debugacc: fmtcheck + TF_ACC=1 dlv test $(TEST) --headless --listen=:2345 --api-version=2 -- -test.v $(TESTARGS) + vet: @echo "go vet ." @go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \ diff --git a/azurerm/data_source_cosmos_db_account.go b/azurerm/data_source_cosmos_db_account.go new file mode 100644 index 000000000000..2eaf979689bc --- /dev/null +++ b/azurerm/data_source_cosmos_db_account.go @@ -0,0 +1,224 @@ +package azurerm + +import ( + "fmt" + "log" + + "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmCosmosDBAccount() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmCosmosDBAccountRead, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + + "resource_group_name": resourceGroupNameForDataSourceSchema(), + + "location": locationForDataSourceSchema(), + + "tags": tagsForDataSourceSchema(), + + "offer_type": { + Type: schema.TypeString, + Computed: true, + }, + + "kind": { + Type: schema.TypeString, + Computed: true, + }, + + "ip_range_filter": { + Type: schema.TypeString, + Computed: true, + }, + + "enable_automatic_failover": { + Type: schema.TypeBool, + Computed: true, + }, + + "consistency_policy": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "consistency_level": { + Type: schema.TypeString, + Computed: true, + }, + + "max_interval_in_seconds": { + Type: schema.TypeInt, + Computed: true, + }, + + "max_staleness_prefix": { + Type: schema.TypeInt, + Computed: true, + }, + }, + }, + }, + + "geo_location": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Computed: true, + }, + + "location": { + Type: schema.TypeString, + Computed: true, + }, + + "failover_priority": { + Type: schema.TypeInt, + Computed: true, + }, + }, + }, + }, + + "endpoint": { + Type: schema.TypeString, + Computed: true, + }, + + "read_endpoints": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + + "write_endpoints": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + + "primary_master_key": { + Type: schema.TypeString, + Computed: true, + }, + + "secondary_master_key": { + Type: schema.TypeString, + Computed: true, + }, + + "primary_readonly_master_key": { + Type: schema.TypeString, + Computed: true, + }, + + "secondary_readonly_master_key": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} + +func dataSourceArmCosmosDBAccountRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).cosmosDBClient + ctx := meta.(*ArmClient).StopContext + + resourceGroup := d.Get("resource_group_name").(string) + name := d.Get("name").(string) + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + + return fmt.Errorf("Error making Read request on AzureRM CosmosDB Account %s (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.SetId(*resp.ID) + d.Set("name", resp.Name) + d.Set("resource_group_name", resourceGroup) + + if location := resp.Location; location != nil { + d.Set("location", azureRMNormalizeLocation(*location)) + } + d.Set("kind", string(resp.Kind)) + flattenAndSetTags(d, resp.Tags) + + if props := resp.DatabaseAccountProperties; props != nil { + d.Set("offer_type", string(props.DatabaseAccountOfferType)) + d.Set("ip_range_filter", props.IPRangeFilter) + d.Set("endpoint", props.DocumentEndpoint) + d.Set("enable_automatic_failover", resp.EnableAutomaticFailover) + + if err := d.Set("consistency_policy", flattenAzureRmCosmosDBAccountConsistencyPolicy(resp.ConsistencyPolicy)); err != nil { + return fmt.Errorf("Error setting `consistency_policy`: %+v", err) + } + + //sort `geo_locations` by fail over priority + locations := make([]map[string]interface{}, len(*props.FailoverPolicies)) + for _, l := range *props.FailoverPolicies { + locations[*l.FailoverPriority] = map[string]interface{}{ + "id": *l.ID, + "location": azureRMNormalizeLocation(*l.LocationName), + "failover_priority": int(*l.FailoverPriority), + } + } + if err := d.Set("geo_location", locations); err != nil { + return fmt.Errorf("Error setting `geo_location`: %+v", err) + } + + readEndpoints := make([]string, 0) + if locations := props.ReadLocations; locations != nil { + for _, l := range *locations { + readEndpoints = append(readEndpoints, *l.DocumentEndpoint) + } + } + d.Set("read_endpoints", readEndpoints) + + writeEndpoints := make([]string, 0) + if locations := props.WriteLocations; locations != nil { + for _, l := range *locations { + writeEndpoints = append(writeEndpoints, *l.DocumentEndpoint) + } + } + d.Set("write_endpoints", writeEndpoints) + } + + keys, err := client.ListKeys(ctx, resourceGroup, name) + if err != nil { + log.Printf("[ERROR] Unable to List Write keys for CosmosDB Account %s: %s", name, err) + } else { + d.Set("primary_master_key", keys.PrimaryMasterKey) + d.Set("secondary_master_key", keys.SecondaryMasterKey) + } + + readonlyKeys, err := client.ListReadOnlyKeys(ctx, resourceGroup, name) + if err != nil { + log.Printf("[ERROR] Unable to List read-only keys for CosmosDB Account %s: %s", name, err) + } else { + d.Set("primary_readonly_master_key", readonlyKeys.PrimaryReadonlyMasterKey) + d.Set("secondary_readonly_master_key", readonlyKeys.SecondaryReadonlyMasterKey) + } + + return nil +} diff --git a/azurerm/data_source_cosmos_db_account_test.go b/azurerm/data_source_cosmos_db_account_test.go new file mode 100644 index 000000000000..9675ac3c3d05 --- /dev/null +++ b/azurerm/data_source_cosmos_db_account_test.go @@ -0,0 +1,112 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb" + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccDataSourceAzureRMCosmosDBAccount_boundedStaleness_complete(t *testing.T) { + ri := acctest.RandInt() + dataSourceName := "data.azurerm_cosmosdb_account.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMCosmosDBAccountDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDAtaSourceAzureRMCosmosDBAccount_boundedStaleness_complete(ri, testLocation()), + Check: resource.ComposeAggregateTestCheckFunc( + checkAccAzureRMCosmosDBAccount_basic(dataSourceName, testLocation(), string(documentdb.BoundedStaleness), 1), + resource.TestCheckResourceAttr(dataSourceName, "consistency_policy.0.max_interval_in_seconds", "10"), + resource.TestCheckResourceAttr(dataSourceName, "consistency_policy.0.max_staleness_prefix", "200"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMCosmosDBAccount_geoReplicated_customId(t *testing.T) { + ri := acctest.RandInt() + dataSourceName := "data.azurerm_cosmosdb_account.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMCosmosDBAccountDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMCosmosDBAccount_geoReplicated_customId(ri, testLocation(), testAltLocation()), + Check: resource.ComposeAggregateTestCheckFunc( + checkAccAzureRMCosmosDBAccount_basic(dataSourceName, testLocation(), string(documentdb.BoundedStaleness), 2), + resource.TestCheckResourceAttr(dataSourceName, "geo_location.0.location", testLocation()), + resource.TestCheckResourceAttr(dataSourceName, "geo_location.1.location", testAltLocation()), + resource.TestCheckResourceAttr(dataSourceName, "geo_location.0.failover_priority", "0"), + resource.TestCheckResourceAttr(dataSourceName, "geo_location.1.failover_priority", "1"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMCosmosDBAccount_complete(t *testing.T) { + ri := acctest.RandInt() + dataSourceName := "data.azurerm_cosmosdb_account.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMCosmosDBAccountDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMCosmosDBAccount_complete(ri, testLocation(), testAltLocation()), + Check: resource.ComposeAggregateTestCheckFunc( + checkAccAzureRMCosmosDBAccount_basic(dataSourceName, testLocation(), string(documentdb.BoundedStaleness), 2), + resource.TestCheckResourceAttr(dataSourceName, "ip_range_filter", "104.42.195.92,40.76.54.131,52.176.6.30,52.169.50.45,52.187.184.26"), + resource.TestCheckResourceAttr(dataSourceName, "enable_automatic_failover", "true"), + resource.TestCheckResourceAttr(dataSourceName, "geo_location.0.location", testLocation()), + resource.TestCheckResourceAttr(dataSourceName, "geo_location.1.location", testAltLocation()), + resource.TestCheckResourceAttr(dataSourceName, "geo_location.0.failover_priority", "0"), + resource.TestCheckResourceAttr(dataSourceName, "geo_location.1.failover_priority", "1"), + ), + }, + }, + }) +} + +func testAccDAtaSourceAzureRMCosmosDBAccount_boundedStaleness_complete(rInt int, location string) string { + return fmt.Sprintf(` +%s + +data "azurerm_cosmosdb_account" "test" { + name = "${azurerm_cosmosdb_account.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, testAccAzureRMCosmosDBAccount_boundedStaleness_complete(rInt, location)) +} + +func testAccDataSourceAzureRMCosmosDBAccount_geoReplicated_customId(rInt int, location string, altLocation string) string { + return fmt.Sprintf(` +%s + +data "azurerm_cosmosdb_account" "test" { + name = "${azurerm_cosmosdb_account.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, testAccAzureRMCosmosDBAccount_geoReplicated_customId(rInt, location, altLocation)) +} + +func testAccDataSourceAzureRMCosmosDBAccount_complete(rInt int, location string, altLocation string) string { + return fmt.Sprintf(` +%s + +data "azurerm_cosmosdb_account" "test" { + name = "${azurerm_cosmosdb_account.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, testAccAzureRMCosmosDBAccount_complete(rInt, location, altLocation)) +} diff --git a/azurerm/provider.go b/azurerm/provider.go index 13388cb2e9a4..e827dbb88a46 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -81,8 +81,9 @@ func Provider() terraform.ResourceProvider { "azurerm_app_service": dataSourceArmAppService(), "azurerm_app_service_plan": dataSourceAppServicePlan(), "azurerm_builtin_role_definition": dataSourceArmBuiltInRoleDefinition(), - "azurerm_client_config": dataSourceArmClientConfig(), "azurerm_cdn_profile": dataSourceArmCdnProfile(), + "azurerm_client_config": dataSourceArmClientConfig(), + "azurerm_cosmosdb_account": dataSourceArmCosmosDBAccount(), "azurerm_dns_zone": dataSourceArmDnsZone(), "azurerm_eventhub_namespace": dataSourceEventHubNamespace(), "azurerm_image": dataSourceArmImage(), diff --git a/website/azurerm.erb b/website/azurerm.erb index f52739eeb4cf..36ab89f4383b 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -51,6 +51,11 @@ azurerm_client_config + > + azurerm_cosmosdb_account + + + > azurerm_dns_zone diff --git a/website/docs/d/cosmosdb_account.html.markdown b/website/docs/d/cosmosdb_account.html.markdown new file mode 100644 index 000000000000..f54923fb9217 --- /dev/null +++ b/website/docs/d/cosmosdb_account.html.markdown @@ -0,0 +1,77 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_cosmosdb_account" +sidebar_current: "docs-azurerm-datasource-azurerm-cosmosdb-account" +description: |- + Get information about the specified CosmosDB (formally DocumentDB) Account. +--- + +# Data Source: azurerm_cosmosdb_account + +Use this data source to access the properties of an Azure CosmosDB (formally DocumentDB) Account. + +## Example Usage + +```hcl +data "azurerm_cosmosdb_account" "test" { + name = "tfex-cosmosdb-account" + resource_group_name = "tfex-cosmosdb-account-rg" +} + +output "cosmosdb_account_endpoint" { + value = "${data.azurerm_cosmosdb_account.jobs.endpoint}" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the CosmosDB Account. + +* `resource_group_name` - (Required) Specifies the name of the resource group in which the CosmosDB Account resides. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the CosmosDB Account. + +* `location` - The Azure location where the resource exists. + +* `tags` - A mapping of tags assigned to the resource. + +* `offer_type` - The Offer Type to used by this CosmosDB Account. + +* `kind` - The Kind of the CosmosDB account. + +* `ip_range_filter` - The current IP Filter for this CosmosDB account + +* `enable_automatic_failover` - If automatic failover is enabled for this CosmosDB Account. + +`consistency_policy` The current consistency Settings for this CosmosDB account with the following properties: + +* `consistency_level` - The Consistency Level used by this CosmosDB Account. +* `max_interval_in_seconds` - The amount of staleness (in seconds) tolerated when the consistency level is Bounded Staleness. +* `max_staleness_prefix` - The number of stale requests tolerated when the consistency level is Bounded Staleness. + + +`geo_location` The geographic locations data is replicated to with the following properties: + +* `id` - The ID of the location. +* `location` - The name of the Azure region hosting replicated data. +* `priority` - The locations fail over priority. + +* `endpoint` - The endpoint used to connect to the CosmosDB account. + +* `read_endpoints` - A list of read endpoints available for this CosmosDB account. + +* `write_endpoints` - A list of write endpoints available for this CosmosDB account. + +* `primary_master_key` - The Primary master key for the CosmosDB Account. + +* `secondary_master_key` - The Secondary master key for the CosmosDB Account. + +* `primary_readonly_master_key` - The Primary read-only master Key for the CosmosDB Account. + +* `secondary_readonly_master_key` - The Secondary read-only master key for the CosmosDB Account. From 4bbb41acccf05b90b09a2d1b5be2832b3874ad1f Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 6 May 2018 08:36:10 -0700 Subject: [PATCH 074/320] Updating to include #1056 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a742ac0e496..a15a02bd4684 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 1.5.0 (Unreleased) +FEATURES: + +* **New Data Source:** `azurerm_cosmosdb_account` [GH-1056] + IMPROVEMENTS: * `azurerm_app_service` - support for HTTP2 [GH-1188] From 6cef9dda45a4b3fab90197e52ecfbbb3a7ddecb3 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 7 May 2018 05:39:31 -0700 Subject: [PATCH 075/320] New Data Source: `azurerm_route_table` (#1203) * New Data Source: `azurerm_route_table` Fixes #1155 * Fixing issues identified during code review --- azurerm/data_source_route_table.go | 138 +++++++++++++++++++++++ azurerm/data_source_route_table_test.go | 120 ++++++++++++++++++++ azurerm/provider.go | 1 + website/azurerm.erb | 6 +- website/docs/d/route_table.html.markdown | 54 +++++++++ 5 files changed, 318 insertions(+), 1 deletion(-) create mode 100644 azurerm/data_source_route_table.go create mode 100644 azurerm/data_source_route_table_test.go create mode 100644 website/docs/d/route_table.html.markdown diff --git a/azurerm/data_source_route_table.go b/azurerm/data_source_route_table.go new file mode 100644 index 000000000000..d1ca24376730 --- /dev/null +++ b/azurerm/data_source_route_table.go @@ -0,0 +1,138 @@ +package azurerm + +import ( + "fmt" + + "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" + "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmRouteTable() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmRouteTableRead, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + + "resource_group_name": resourceGroupNameForDataSourceSchema(), + + "location": locationForDataSourceSchema(), + + "route": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Computed: true, + }, + + "address_prefix": { + Type: schema.TypeString, + Computed: true, + }, + + "next_hop_type": { + Type: schema.TypeString, + Computed: true, + }, + + "next_hop_in_ip_address": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + + "subnets": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + + "tags": tagsForDataSourceSchema(), + }, + } +} + +func dataSourceArmRouteTableRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).routeTablesClient + ctx := meta.(*ArmClient).StopContext + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + resp, err := client.Get(ctx, resourceGroup, name, "") + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + return fmt.Errorf("Error making Read request on Azure Route Table %q: %+v", name, err) + } + + d.SetId(*resp.ID) + + d.Set("name", name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azureRMNormalizeLocation(*location)) + } + + if props := resp.RouteTablePropertiesFormat; props != nil { + if err := d.Set("route", flattenRouteTableDataSourceRoutes(props.Routes)); err != nil { + return err + } + + if err := d.Set("subnets", flattenRouteTableDataSourceSubnets(props.Subnets)); err != nil { + return err + } + } + + flattenAndSetTags(d, resp.Tags) + + return nil +} + +func flattenRouteTableDataSourceRoutes(input *[]network.Route) []interface{} { + results := make([]interface{}, 0) + + if routes := input; routes != nil { + for _, route := range *routes { + r := make(map[string]interface{}) + + r["name"] = *route.Name + + if props := route.RoutePropertiesFormat; props != nil { + r["address_prefix"] = *props.AddressPrefix + r["next_hop_type"] = string(props.NextHopType) + if ip := props.NextHopIPAddress; ip != nil { + r["next_hop_in_ip_address"] = *ip + } + } + + results = append(results, r) + } + } + + return results +} + +func flattenRouteTableDataSourceSubnets(input *[]network.Subnet) []string { + output := make([]string, 0) + + if subnets := input; subnets != nil { + for _, subnet := range *subnets { + output = append(output, *subnet.ID) + } + } + + return output +} diff --git a/azurerm/data_source_route_table_test.go b/azurerm/data_source_route_table_test.go new file mode 100644 index 000000000000..77af1283d487 --- /dev/null +++ b/azurerm/data_source_route_table_test.go @@ -0,0 +1,120 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccDataSourceAzureRMRouteTable_basic(t *testing.T) { + dataSourceName := "data.azurerm_route_table.test" + ri := acctest.RandInt() + location := testLocation() + config := testAccDataSourceAzureRMRouteTable_basic(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRouteTableDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMRouteTableExists(dataSourceName), + resource.TestCheckResourceAttr(dataSourceName, "route.#", "0"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMRouteTable_singleRoute(t *testing.T) { + dataSourceName := "data.azurerm_route_table.test" + ri := acctest.RandInt() + location := testLocation() + config := testAccDataSourceAzureRMRouteTable_singleRoute(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRouteTableDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMRouteTableExists(dataSourceName), + resource.TestCheckResourceAttr(dataSourceName, "route.#", "1"), + resource.TestCheckResourceAttr(dataSourceName, "route.0.name", "route1"), + resource.TestCheckResourceAttr(dataSourceName, "route.0.address_prefix", "10.1.0.0/16"), + resource.TestCheckResourceAttr(dataSourceName, "route.0.next_hop_type", "VnetLocal"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMRouteTable_multipleRoutes(t *testing.T) { + dataSourceName := "data.azurerm_route_table.test" + ri := acctest.RandInt() + location := testLocation() + config := testAccDataSourceAzureRMRouteTable_multipleRoutes(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRouteTableDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMRouteTableExists(dataSourceName), + resource.TestCheckResourceAttr(dataSourceName, "route.#", "2"), + resource.TestCheckResourceAttr(dataSourceName, "route.0.name", "route1"), + resource.TestCheckResourceAttr(dataSourceName, "route.0.address_prefix", "10.1.0.0/16"), + resource.TestCheckResourceAttr(dataSourceName, "route.0.next_hop_type", "VnetLocal"), + resource.TestCheckResourceAttr(dataSourceName, "route.1.name", "route2"), + resource.TestCheckResourceAttr(dataSourceName, "route.1.address_prefix", "10.2.0.0/16"), + resource.TestCheckResourceAttr(dataSourceName, "route.1.next_hop_type", "VnetLocal"), + ), + }, + }, + }) +} + +func testAccDataSourceAzureRMRouteTable_basic(rInt int, location string) string { + resource := testAccAzureRMRouteTable_basic(rInt, location) + return fmt.Sprintf(` +%s + +data "azurerm_route_table" "test" { + name = "${azurerm_route_table.test.name}" + resource_group_name = "${azurerm_route_table.test.resource_group_name}" +} +`, resource) +} + +func testAccDataSourceAzureRMRouteTable_singleRoute(rInt int, location string) string { + resource := testAccAzureRMRouteTable_singleRoute(rInt, location) + return fmt.Sprintf(` +%s + +data "azurerm_route_table" "test" { + name = "${azurerm_route_table.test.name}" + resource_group_name = "${azurerm_route_table.test.resource_group_name}" +} +`, resource) +} + +func testAccDataSourceAzureRMRouteTable_multipleRoutes(rInt int, location string) string { + resource := testAccAzureRMRouteTable_multipleRoutes(rInt, location) + return fmt.Sprintf(` +%s + +data "azurerm_route_table" "test" { + name = "${azurerm_route_table.test.name}" + resource_group_name = "${azurerm_route_table.test.resource_group_name}" +} +`, resource) +} diff --git a/azurerm/provider.go b/azurerm/provider.go index e827dbb88a46..e4d7bd412cf1 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -97,6 +97,7 @@ func Provider() terraform.ResourceProvider { "azurerm_recovery_services_vault": dataSourceArmRecoveryServicesVault(), "azurerm_resource_group": dataSourceArmResourceGroup(), "azurerm_role_definition": dataSourceArmRoleDefinition(), + "azurerm_route_table": dataSourceArmRouteTable(), "azurerm_scheduler_job_collection": dataSourceArmSchedulerJobCollection(), "azurerm_snapshot": dataSourceArmSnapshot(), "azurerm_storage_account": dataSourceArmStorageAccount(), diff --git a/website/azurerm.erb b/website/azurerm.erb index 36ab89f4383b..7142801abd6e 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -104,10 +104,14 @@ azurerm_resource_group - > + > azurerm_role_definition + > + azurerm_route_table + + > azurerm_scheduler_job_collection diff --git a/website/docs/d/route_table.html.markdown b/website/docs/d/route_table.html.markdown new file mode 100644 index 000000000000..1c9be41ba560 --- /dev/null +++ b/website/docs/d/route_table.html.markdown @@ -0,0 +1,54 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_route_table" +sidebar_current: "docs-azurerm-data-source-route-table" +description: |- + Gets information about a Route Table + +--- + +# Data Source: azurerm_route_table + +Gets information about a Route Table + +## Example Usage + +```hcl +data "azurerm_route_table" "test" { + name = "myroutetable" + resource_group_name = "some-resource-group" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the Route Table. + +* `resource_group_name` - (Required) The name of the Resource Group in which the Route Table exists. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The Route Table ID. + +* `location` - The Azure Region in which the Route Table exists. + +* `route` - One or more `route` blocks as documented below. + +* `subnets` - The collection of Subnets associated with this route table. + +* `tags` - A mapping of tags assigned to the Route Table. + +The `route` block exports the following: + +* `name` - The name of the Route. + +* `address_prefix` - The destination CIDR to which the route applies. + +* `next_hop_type` - The type of Azure hop the packet should be sent to. + +* `next_hop_in_ip_address` - Contains the IP address packets should be forwarded to. + From b2222a788f3530fe20bf9b15085683ef22a64b57 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 7 May 2018 05:39:58 -0700 Subject: [PATCH 076/320] Updating to include #1203 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a15a02bd4684..1d6f9be43cde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ FEATURES: * **New Data Source:** `azurerm_cosmosdb_account` [GH-1056] +* **New Data Source:** `azurerm_route_table` [GH-1203] IMPROVEMENTS: From 2c0710ed20a8386df962ad21faa6d9bc6c91d0d4 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 7 May 2018 05:44:19 -0700 Subject: [PATCH 077/320] Adding `http2_enabled` to App Service Slot. (#1205) Fixes a Set error --- azurerm/resource_arm_app_service_slot.go | 6 ++ azurerm/resource_arm_app_service_slot_test.go | 60 +++++++++++++++++++ website/docs/r/app_service_slot.html.markdown | 2 +- 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_app_service_slot.go b/azurerm/resource_arm_app_service_slot.go index 0b6f8cbe2529..c4dc6f6d9101 100644 --- a/azurerm/resource_arm_app_service_slot.go +++ b/azurerm/resource_arm_app_service_slot.go @@ -75,6 +75,12 @@ func resourceArmAppServiceSlot() *schema.Resource { DiffSuppressFunc: ignoreCaseDiffSuppressFunc, }, + "http2_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "java_version": { Type: schema.TypeString, Optional: true, diff --git a/azurerm/resource_arm_app_service_slot_test.go b/azurerm/resource_arm_app_service_slot_test.go index ed84d8526382..2f427dbc5f63 100644 --- a/azurerm/resource_arm_app_service_slot_test.go +++ b/azurerm/resource_arm_app_service_slot_test.go @@ -202,6 +202,27 @@ func TestAccAzureRMAppServiceSlot_httpsOnly(t *testing.T) { }) } +func TestAccAzureRMAppServiceSlot_http2Enabled(t *testing.T) { + resourceName := "azurerm_app_service_slot.test" + ri := acctest.RandInt() + config := testAccAzureRMAppServiceSlot_http2Enabled(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAppServiceSlotDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceSlotExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "site_config.0.http2_enabled", "true"), + ), + }, + }, + }) +} + func TestAccAzureRMAppServiceSlot_localMySql(t *testing.T) { resourceName := "azurerm_app_service_slot.test" ri := acctest.RandInt() @@ -924,6 +945,45 @@ resource "azurerm_app_service_slot" "test" { `, rInt, location, rInt, rInt, rInt) } +func testAccAzureRMAppServiceSlot_http2Enabled(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_app_service_plan" "test" { + name = "acctestASP-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + tier = "Standard" + size = "S1" + } +} + +resource "azurerm_app_service" "test" { + name = "acctestAS-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_plan_id = "${azurerm_app_service_plan.test.id}" +} + +resource "azurerm_app_service_slot" "test" { + name = "acctestASSlot-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_plan_id = "${azurerm_app_service_plan.test.id}" + app_service_name = "${azurerm_app_service.test.name}" + + site_config { + http2_enabled = true + } +} +`, rInt, location, rInt, rInt, rInt) +} + func testAccAzureRMAppServiceSlot_localMySql(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/website/docs/r/app_service_slot.html.markdown b/website/docs/r/app_service_slot.html.markdown index 85913967465d..f53326f69871 100644 --- a/website/docs/r/app_service_slot.html.markdown +++ b/website/docs/r/app_service_slot.html.markdown @@ -183,7 +183,7 @@ The following arguments are supported: * `always_on` - (Optional) Should the app be loaded at all times? Defaults to `false`. * `default_documents` - (Optional) The ordering of default documents to load, if an address isn't specified. * `dotnet_framework_version` - (Optional) The version of the .net framework's CLR used in this App Service Slot. Possible values are `v2.0` (which will use the latest version of the .net framework for the .net CLR v2 - currently `.net 3.5`) and `v4.0` (which corresponds to the latest version of the .net CLR v4 - which at the time of writing is `.net 4.7.1`). [For more information on which .net CLR version to use based on the .net framework you're targetting - please see this table](https://en.wikipedia.org/wiki/.NET_Framework_version_history#Overview). Defaults to `v4.0`. - +* `http2_enabled` - (Optional) Is HTTP2 Enabled on this App Service? Defaults to `false`. * `java_version` - (Optional) The version of Java to use. If specified `java_container` and `java_container_version` must also be specified. Possible values are `1.7` and `1.8`. * `java_container` - (Optional) The Java Container to use. If specified `java_version` and `java_container_version` must also be specified. Possible values are `JETTY` and `TOMCAT`. * `java_container_version` - (Optional) The version of the Java Container to use. If specified `java_version` and `java_container` must also be specified. From 9004e72a4ee832d3d4f18ac1086fd8740b8ae037 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 7 May 2018 05:44:52 -0700 Subject: [PATCH 078/320] Updating to include #1205 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d6f9be43cde..997e94fab6a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ FEATURES: IMPROVEMENTS: * `azurerm_app_service` - support for HTTP2 [GH-1188] +* `azurerm_app_service_slot` - support for HTTP2 [GH-1205] * `azurerm_app_service` - support for Managed Service Identity [GH-1130] * `azurerm_cosmosdb_account` - added support for the `connection_strings` property [GH-1194] * `azurerm_key_vault_certificate` - exposing the `certificate_data` [GH-1200] From f00ef9c86068c602ce25c3802e8735c4aeb7493a Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 7 May 2018 05:45:02 -0700 Subject: [PATCH 079/320] Fixing the ordering --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 997e94fab6a5..c10b04f8485a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ FEATURES: IMPROVEMENTS: * `azurerm_app_service` - support for HTTP2 [GH-1188] -* `azurerm_app_service_slot` - support for HTTP2 [GH-1205] * `azurerm_app_service` - support for Managed Service Identity [GH-1130] +* `azurerm_app_service_slot` - support for HTTP2 [GH-1205] * `azurerm_cosmosdb_account` - added support for the `connection_strings` property [GH-1194] * `azurerm_key_vault_certificate` - exposing the `certificate_data` [GH-1200] * `azurerm_virtual_network_gateway` - ignoring the case of the `GatewaySubnet` [GH-1141] From 2986e41a649ee13963e0d8758c8bcaba8a87b81f Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 7 May 2018 06:40:07 -0700 Subject: [PATCH 080/320] `azurerm_virtual_network` - removing crash points (#1208) * Removing crash points from `azurerm_virtual_network` Fixes #1196 * Fixing issues raised during code review --- azurerm/resource_arm_virtual_network.go | 98 +++++++++++++++++-------- 1 file changed, 66 insertions(+), 32 deletions(-) diff --git a/azurerm/resource_arm_virtual_network.go b/azurerm/resource_arm_virtual_network.go index cd4f45a2bab2..c5284ff719a3 100644 --- a/azurerm/resource_arm_virtual_network.go +++ b/azurerm/resource_arm_virtual_network.go @@ -32,6 +32,10 @@ func resourceArmVirtualNetwork() *schema.Resource { ForceNew: true, }, + "resource_group_name": resourceGroupNameSchema(), + + "location": locationSchema(), + "address_space": { Type: schema.TypeList, Required: true, @@ -71,10 +75,6 @@ func resourceArmVirtualNetwork() *schema.Resource { Set: resourceAzureSubnetHash, }, - "location": locationSchema(), - - "resource_group_name": resourceGroupNameSchema(), - "tags": tagsSchema(), }, } @@ -90,7 +90,7 @@ func resourceArmVirtualNetworkCreate(d *schema.ResourceData, meta interface{}) e location := azureRMNormalizeLocation(d.Get("location").(string)) resGroup := d.Get("resource_group_name").(string) tags := d.Get("tags").(map[string]interface{}) - vnetProperties, vnetPropsErr := getVirtualNetworkProperties(ctx, d, meta) + vnetProperties, vnetPropsErr := expandVirtualNetworkProperties(ctx, d, meta) if vnetPropsErr != nil { return vnetPropsErr } @@ -162,39 +162,27 @@ func resourceArmVirtualNetworkRead(d *schema.ResourceData, meta interface{}) err return fmt.Errorf("Error making Read request on Virtual Network %q (Resource Group %q): %+v", name, resGroup, err) } - vnet := *resp.VirtualNetworkPropertiesFormat - - // update appropriate values d.Set("name", resp.Name) d.Set("resource_group_name", resGroup) - d.Set("address_space", vnet.AddressSpace.AddressPrefixes) if location := resp.Location; location != nil { d.Set("location", azureRMNormalizeLocation(*location)) } - subnets := &schema.Set{ - F: resourceAzureSubnetHash, - } - - for _, subnet := range *vnet.Subnets { - s := map[string]interface{}{} - - s["name"] = *subnet.Name - s["address_prefix"] = *subnet.SubnetPropertiesFormat.AddressPrefix - if subnet.SubnetPropertiesFormat.NetworkSecurityGroup != nil { - s["security_group"] = *subnet.SubnetPropertiesFormat.NetworkSecurityGroup.ID + if props := resp.VirtualNetworkPropertiesFormat; props != nil { + if space := props.AddressSpace; space != nil { + d.Set("address_space", space.AddressPrefixes) } - subnets.Add(s) - } - d.Set("subnet", subnets) + subnets := flattenVirtualNetworkSubnets(props.Subnets) + if err := d.Set("subnet", subnets); err != nil { + return fmt.Errorf("Error setting `subnets`: %+v", err) + } - if vnet.DhcpOptions != nil && vnet.DhcpOptions.DNSServers != nil { - dnses := []string{} - for _, dns := range *vnet.DhcpOptions.DNSServers { - dnses = append(dnses, dns) + dnsServers := flattenVirtualNetworkDNSServers(props.DhcpOptions) + if err := d.Set("dns_servers", dnsServers); err != nil { + return fmt.Errorf("Error setting `dns_servers`: %+v", err) } - d.Set("dns_servers", dnses) + } flattenAndSetTags(d, resp.Tags) @@ -234,7 +222,7 @@ func resourceArmVirtualNetworkDelete(d *schema.ResourceData, meta interface{}) e return nil } -func getVirtualNetworkProperties(ctx context.Context, d *schema.ResourceData, meta interface{}) (*network.VirtualNetworkPropertiesFormat, error) { +func expandVirtualNetworkProperties(ctx context.Context, d *schema.ResourceData, meta interface{}) (*network.VirtualNetworkPropertiesFormat, error) { // first; get address space prefixes: prefixes := []string{} for _, prefix := range d.Get("address_space").([]interface{}) { @@ -300,6 +288,51 @@ func getVirtualNetworkProperties(ctx context.Context, d *schema.ResourceData, me // finally; return the struct: return properties, nil } +func flattenVirtualNetworkSubnets(input *[]network.Subnet) *schema.Set { + results := &schema.Set{ + F: resourceAzureSubnetHash, + } + + if subnets := input; subnets != nil { + for _, subnet := range *input { + output := map[string]interface{}{} + + if name := subnet.Name; name != nil { + output["name"] = *name + } + + if props := subnet.SubnetPropertiesFormat; props != nil { + if prefix := props.AddressPrefix; prefix != nil { + output["address_prefix"] = *prefix + } + + if nsg := props.NetworkSecurityGroup; nsg != nil { + if nsg.ID != nil { + output["security_group"] = *nsg.ID + } + } + } + + results.Add(output) + } + } + + return results +} + +func flattenVirtualNetworkDNSServers(input *network.DhcpOptions) []string { + results := make([]string, 0) + + if input != nil { + if servers := input.DNSServers; servers != nil { + for _, dns := range *servers { + results = append(results, dns) + } + } + } + + return results +} func resourceAzureSubnetHash(v interface{}) int { var buf bytes.Buffer @@ -326,8 +359,9 @@ func getExistingSubnet(ctx context.Context, resGroup string, vnetName string, su return nil, err } - existingSubnet.SubnetPropertiesFormat = &network.SubnetPropertiesFormat{} - existingSubnet.SubnetPropertiesFormat.AddressPrefix = resp.SubnetPropertiesFormat.AddressPrefix + existingSubnet.SubnetPropertiesFormat = &network.SubnetPropertiesFormat{ + AddressPrefix: resp.SubnetPropertiesFormat.AddressPrefix, + } if resp.SubnetPropertiesFormat.NetworkSecurityGroup != nil { existingSubnet.SubnetPropertiesFormat.NetworkSecurityGroup = resp.SubnetPropertiesFormat.NetworkSecurityGroup @@ -338,7 +372,7 @@ func getExistingSubnet(ctx context.Context, resGroup string, vnetName string, su } if resp.SubnetPropertiesFormat.IPConfigurations != nil { - ips := make([]string, 0, len(*resp.SubnetPropertiesFormat.IPConfigurations)) + ips := make([]string, 0) for _, ip := range *resp.SubnetPropertiesFormat.IPConfigurations { ips = append(ips, *ip.ID) } From efe9ee9d7be2fd86443585db4ff878612da0a622 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 7 May 2018 06:41:28 -0700 Subject: [PATCH 081/320] Updating to include #1208 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c10b04f8485a..6dffba7ca630 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ IMPROVEMENTS: * `azurerm_app_service_slot` - support for HTTP2 [GH-1205] * `azurerm_cosmosdb_account` - added support for the `connection_strings` property [GH-1194] * `azurerm_key_vault_certificate` - exposing the `certificate_data` [GH-1200] +* `azurerm_virtual_network` - guarding against nil-objects in the response [GH-1208] * `azurerm_virtual_network_gateway` - ignoring the case of the `GatewaySubnet` [GH-1141] ## 1.4.0 (April 26, 2018) From c2ddf4fc91a9b56795356de920ba8fc3373409f4 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 7 May 2018 07:27:14 -0700 Subject: [PATCH 082/320] Upgrading to v16.2.1 of `Azure/azure-sdk-for-go` / v10.8.1 of `Azure/go-autorest` (#1198) * Upgrading to v16.1.0 of Azure/azure-sdk-for-go / v10.8.1 of Azure/go-autorest * Upgrading to v16.2.1 of `Azure/azure-sdk-for-go` --- .../mgmt/2015-05-01/insights/analyticsitem.go | 362 +++ .../mgmt/2015-05-01/insights/annotations.go | 34 +- .../mgmt/2015-05-01/insights/apikeys.go | 29 +- .../insights/componentavailablefeatures.go | 6 +- .../componentcurrentbillingfeatures.go | 15 +- .../insights/componentfeaturecapabilities.go | 6 +- .../insights/componentquotastatus.go | 6 +- .../mgmt/2015-05-01/insights/components.go | 137 +- .../insights/exportconfigurations.go | 41 +- .../mgmt/2015-05-01/insights/favorite.go | 34 +- .../mgmt/2015-05-01/insights/favorites.go | 16 +- .../mgmt/2015-05-01/insights/models.go | 382 ++- .../proactivedetectionconfigurations.go | 27 +- .../2015-05-01/insights/webtestlocations.go | 6 +- .../mgmt/2015-05-01/insights/webtests.go | 32 +- .../mgmt/2015-05-01/insights/workbook.go | 326 ++ .../mgmt/2015-05-01/insights/workbooks.go | 116 + .../insights/workitemconfigurations.go | 30 +- .../2015-07-01/authorization/permissions.go | 15 +- .../provideroperationsmetadata.go | 10 +- .../authorization/roleassignments.go | 89 +- .../authorization/roledefinitions.go | 28 +- .../2015-10-31/automation/dscconfiguration.go | 8 +- .../mgmt/2015-10-31/automation/keys.go | 7 +- .../mgmt/2015-10-31/automation/models.go | 16 +- .../2015-10-31/automation/runbookdraft.go | 10 +- .../cdn/mgmt/2017-04-02/cdn/client.go | 8 +- .../cdn/mgmt/2017-04-02/cdn/customdomains.go | 55 +- .../cdn/mgmt/2017-04-02/cdn/endpoints.go | 95 +- .../cdn/mgmt/2017-04-02/cdn/origins.go | 28 +- .../cdn/mgmt/2017-04-02/cdn/profiles.go | 49 +- .../containerinstance/client.go | 3 + .../containerinstance/containergroups.go | 29 + .../containerinstance/containergroupusage.go | 7 + .../containerinstance/containerlogs.go | 7 + .../containerinstance/models.go | 61 + .../containerinstance/operations.go | 7 + .../containerinstance/startcontainer.go | 7 + .../containerinstance/version.go | 3 +- .../2017-10-01/containerregistry/models.go | 87 + .../containerregistry/registries.go | 139 +- .../containerregistry/replications.go | 38 +- .../2017-10-01/containerregistry/webhooks.go | 59 +- .../containerservice/containerservices.go | 30 +- .../containerservice/managedclusters.go | 33 +- .../mgmt/2015-04-08/documentdb/collection.go | 34 +- .../documentdb/collectionpartition.go | 26 +- .../documentdb/collectionpartitionregion.go | 15 +- .../2015-04-08/documentdb/collectionregion.go | 15 +- .../mgmt/2015-04-08/documentdb/database.go | 29 +- .../documentdb/databaseaccountregion.go | 12 +- .../2015-04-08/documentdb/databaseaccounts.go | 86 +- .../mgmt/2015-04-08/documentdb/models.go | 14 + .../documentdb/partitionkeyrangeid.go | 15 +- .../documentdb/partitionkeyrangeidregion.go | 13 +- .../mgmt/2015-04-08/documentdb/percentile.go | 11 +- .../documentdb/percentilesourcetarget.go | 17 +- .../2015-04-08/documentdb/percentiletarget.go | 14 +- .../dns/mgmt/2016-04-01/dns/recordsets.go | 79 +- .../services/dns/mgmt/2016-04-01/dns/zones.go | 39 +- .../2017-09-15-preview/eventgrid/client.go | 3 + .../eventgrid/eventsubscriptions.go | 59 + .../2017-09-15-preview/eventgrid/models.go | 82 + .../eventgrid/operations.go | 7 + .../2017-09-15-preview/eventgrid/topics.go | 39 + .../eventgrid/topictypes.go | 15 + .../2017-09-15-preview/eventgrid/version.go | 3 +- .../2017-04-01/eventhub/consumergroups.go | 33 +- .../eventhub/disasterrecoveryconfigs.go | 73 +- .../mgmt/2017-04-01/eventhub/eventhubs.go | 79 +- .../mgmt/2017-04-01/eventhub/messagingplan.go | 118 - .../mgmt/2017-04-01/eventhub/models.go | 18 +- .../mgmt/2017-04-01/eventhub/namespaces.go | 155 +- .../mgmt/2017-04-01/eventhub/regions.go | 4 +- .../graphrbac/1.6/graphrbac/applications.go | 55 +- .../graphrbac/1.6/graphrbac/domains.go | 8 +- .../graphrbac/1.6/graphrbac/groups.go | 49 +- .../graphrbac/1.6/graphrbac/objects.go | 8 +- .../1.6/graphrbac/serviceprincipals.go | 44 +- .../services/graphrbac/1.6/graphrbac/users.go | 32 +- .../mgmt/2017-07-01/devices/certificates.go | 51 +- .../mgmt/2017-07-01/devices/iothubresource.go | 123 +- .../keyvault/2016-10-01/keyvault/client.go | 458 +-- .../mgmt/2016-10-01/keyvault/vaults.go | 62 +- .../insights/actiongroups.go | 33 +- .../insights/activitylogalerts.go | 27 + .../insights/alertruleincidents.go | 11 + .../2017-05-01-preview/insights/alertrules.go | 23 + .../insights/autoscalesettings.go | 24 + .../2017-05-01-preview/insights/client.go | 3 + .../insights/diagnosticsettings.go | 19 + .../insights/diagnosticsettingscategory.go | 11 + .../insights/logprofiles.go | 23 + .../2017-05-01-preview/insights/models.go | 199 ++ .../2017-05-01-preview/insights/operations.go | 7 + .../2017-05-01-preview/insights/version.go | 3 +- .../2017-09-01/network/applicationgateways.go | 53 +- .../network/applicationsecuritygroups.go | 23 +- .../network/availableendpointservices.go | 4 +- .../network/mgmt/2017-09-01/network/client.go | 7 +- .../network/defaultsecurityrules.go | 13 +- .../expressroutecircuitauthorizations.go | 29 +- .../network/expressroutecircuitpeerings.go | 28 +- .../network/expressroutecircuits.go | 64 +- .../2017-09-01/network/inboundnatrules.go | 29 +- .../network/interfaceipconfigurations.go | 12 +- .../network/interfaceloadbalancers.go | 5 +- .../mgmt/2017-09-01/network/interfaces.go | 85 +- .../loadbalancerbackendaddresspools.go | 12 +- .../loadbalancerfrontendipconfigurations.go | 12 +- .../network/loadbalancerloadbalancingrules.go | 12 +- .../network/loadbalancernetworkinterfaces.go | 5 +- .../2017-09-01/network/loadbalancerprobes.go | 12 +- .../mgmt/2017-09-01/network/loadbalancers.go | 30 +- .../network/localnetworkgateways.go | 30 +- .../mgmt/2017-09-01/network/packetcaptures.go | 43 +- .../2017-09-01/network/publicipaddresses.go | 59 +- .../2017-09-01/network/routefilterrules.go | 37 +- .../mgmt/2017-09-01/network/routefilters.go | 30 +- .../network/mgmt/2017-09-01/network/routes.go | 27 +- .../mgmt/2017-09-01/network/routetables.go | 30 +- .../mgmt/2017-09-01/network/securitygroups.go | 31 +- .../mgmt/2017-09-01/network/securityrules.go | 29 +- .../mgmt/2017-09-01/network/subnets.go | 29 +- .../network/mgmt/2017-09-01/network/usages.go | 4 +- .../virtualnetworkgatewayconnections.go | 56 +- .../network/virtualnetworkgateways.go | 102 +- .../network/virtualnetworkpeerings.go | 29 +- .../2017-09-01/network/virtualnetworks.go | 42 +- .../mgmt/2017-09-01/network/watchers.go | 105 +- .../operationalinsights/client.go | 3 + .../operationalinsights/datasources.go | 20 + .../operationalinsights/linkedservices.go | 19 + .../operationalinsights/models.go | 69 +- .../operationalinsights/operations.go | 8 + .../operationalinsights/version.go | 3 +- .../operationalinsights/workspaces.go | 51 + .../operationsmanagement/client.go | 3 + .../managementassociations.go | 19 + .../managementconfigurations.go | 19 + .../operationsmanagement/models.go | 16 + .../operationsmanagement/operations.go | 7 + .../operationsmanagement/solutions.go | 23 + .../operationsmanagement/version.go | 3 +- .../recoveryservices/registeredidentities.go | 7 +- .../recoveryservices/replicationusages.go | 6 +- .../2016-06-01/recoveryservices/usages.go | 6 +- .../recoveryservices/vaultcertificates.go | 9 +- .../recoveryservices/vaultextendedinfo.go | 20 +- .../2016-06-01/recoveryservices/vaults.go | 30 +- .../mgmt/2018-03-01/redis/firewallrules.go | 28 +- .../mgmt/2018-03-01/redis/linkedserver.go | 28 +- .../redis/mgmt/2018-03-01/redis/models.go | 110 +- .../mgmt/2018-03-01/redis/patchschedules.go | 112 +- .../redis/mgmt/2018-03-01/redis/redis.go | 80 +- .../2016-06-01/subscriptions/subscriptions.go | 8 +- .../mgmt/2016-09-01/locks/managementlocks.go | 115 +- .../mgmt/2016-12-01/policy/assignments.go | 56 +- .../mgmt/2016-12-01/policy/definitions.go | 41 +- .../resources/deploymentoperations.go | 14 +- .../mgmt/2017-05-10/resources/deployments.go | 59 +- .../mgmt/2017-05-10/resources/groups.go | 36 +- .../mgmt/2017-05-10/resources/providers.go | 24 +- .../mgmt/2017-05-10/resources/resources.go | 111 +- .../mgmt/2017-05-10/resources/tags.go | 18 +- .../2016-03-01/scheduler/jobcollections.go | 38 +- .../mgmt/2016-03-01/scheduler/jobs.go | 58 +- .../mgmt/2015-08-19/search/adminkeys.go | 24 +- .../mgmt/2015-08-19/search/querykeys.go | 37 +- .../search/mgmt/2015-08-19/search/services.go | 74 +- .../servicebus/disasterrecoveryconfigs.go | 73 +- .../mgmt/2017-04-01/servicebus/eventhubs.go | 6 +- .../2017-04-01/servicebus/migrationconfigs.go | 546 ++++ .../mgmt/2017-04-01/servicebus/models.go | 243 ++ .../mgmt/2017-04-01/servicebus/namespaces.go | 78 +- .../mgmt/2017-04-01/servicebus/queues.go | 111 +- .../mgmt/2017-04-01/servicebus/regions.go | 4 +- .../mgmt/2017-04-01/servicebus/rules.go | 69 +- .../2017-04-01/servicebus/subscriptions.go | 65 +- .../mgmt/2017-04-01/servicebus/topics.go | 111 +- .../sql/backuplongtermretentionpolicies.go | 15 + .../sql/backuplongtermretentionvaults.go | 15 + .../2015-05-01-preview/sql/capabilities.go | 7 + .../sql/mgmt/2015-05-01-preview/sql/client.go | 3 + .../sql/databaseblobauditingpolicies.go | 11 + .../mgmt/2015-05-01-preview/sql/databases.go | 67 + .../sql/databasethreatdetectionpolicies.go | 11 + .../2015-05-01-preview/sql/databaseusages.go | 7 + .../sql/datamaskingpolicies.go | 11 + .../sql/datamaskingrules.go | 11 + .../sql/elasticpoolactivities.go | 7 + .../sql/elasticpooldatabaseactivities.go | 7 + .../2015-05-01-preview/sql/elasticpools.go | 31 + .../sql/encryptionprotectors.go | 16 + .../2015-05-01-preview/sql/failovergroups.go | 32 + .../2015-05-01-preview/sql/firewallrules.go | 19 + .../sql/geobackuppolicies.go | 15 + .../sql/mgmt/2015-05-01-preview/sql/models.go | 697 ++++- .../mgmt/2015-05-01-preview/sql/operations.go | 8 + .../sql/recommendedelasticpools.go | 247 -- .../sql/recoverabledatabases.go | 11 + .../sql/replicationlinks.go | 23 + .../sql/restorabledroppeddatabases.go | 11 + .../2015-05-01-preview/sql/restorepoints.go | 7 + .../sql/serverazureadadministrators.go | 19 + .../sql/servercommunicationlinks.go | 19 + .../sql/serverconnectionpolicies.go | 11 + .../mgmt/2015-05-01-preview/sql/serverkeys.go | 20 + .../mgmt/2015-05-01-preview/sql/servers.go | 33 + .../2015-05-01-preview/sql/serverusages.go | 7 + .../sql/serviceobjectives.go | 11 + .../sql/servicetieradvisors.go | 11 + .../sql/subscriptionusages.go | 12 + .../mgmt/2015-05-01-preview/sql/syncagents.go | 29 + .../mgmt/2015-05-01-preview/sql/syncgroups.go | 51 + .../2015-05-01-preview/sql/syncmembers.go | 33 + .../transparentdataencryptionactivities.go | 7 + .../sql/transparentdataencryptions.go | 11 + .../mgmt/2015-05-01-preview/sql/version.go | 3 +- .../sql/virtualnetworkrules.go | 20 + .../mgmt/2017-10-01/storage/accounts.go | 92 +- .../2017-05-01/trafficmanager/endpoints.go | 41 +- .../2017-05-01/trafficmanager/profiles.go | 37 +- .../services/web/mgmt/2016-09-01/web/apps.go | 2625 ++++++++++------- .../web/appservicecertificateorders.go | 124 +- .../2016-09-01/web/appserviceenvironments.go | 294 +- .../mgmt/2016-09-01/web/appserviceplans.go | 219 +- .../web/mgmt/2016-09-01/web/billingmeters.go | 135 + .../web/mgmt/2016-09-01/web/certificates.go | 28 +- .../web/mgmt/2016-09-01/web/client.go | 50 +- .../web/mgmt/2016-09-01/web/diagnostics.go | 727 ++++- .../web/mgmt/2016-09-01/web/domains.go | 80 +- .../web/mgmt/2016-09-01/web/models.go | 487 +++ .../web/mgmt/2016-09-01/web/provider.go | 4 - .../mgmt/2016-09-01/web/recommendations.go | 67 +- .../2016-09-01/web/resourcehealthmetadata.go | 28 +- .../mgmt/2016-09-01/web/topleveldomains.go | 9 +- .../Azure/azure-sdk-for-go/storage/blob.go | 18 +- .../azure-sdk-for-go/storage/blockblob.go | 2 +- .../Azure/azure-sdk-for-go/storage/client.go | 7 + .../azure-sdk-for-go/storage/container.go | 16 +- .../azure-sdk-for-go/storage/copyblob.go | 6 +- .../azure-sdk-for-go/storage/directory.go | 4 +- .../Azure/azure-sdk-for-go/storage/entity.go | 10 +- .../Azure/azure-sdk-for-go/storage/file.go | 8 +- .../storage/fileserviceclient.go | 12 +- .../azure-sdk-for-go/storage/leaseblob.go | 2 +- .../Azure/azure-sdk-for-go/storage/message.go | 6 +- .../azure-sdk-for-go/storage/pageblob.go | 4 +- .../Azure/azure-sdk-for-go/storage/queue.go | 14 +- .../Azure/azure-sdk-for-go/storage/share.go | 4 +- .../storage/storageservice.go | 2 +- .../Azure/azure-sdk-for-go/storage/table.go | 4 +- .../azure-sdk-for-go/storage/table_batch.go | 2 +- .../Azure/azure-sdk-for-go/version/version.go | 2 +- .../Azure/go-autorest/autorest/adal/token.go | 127 +- .../go-autorest/autorest/authorization.go | 22 +- .../Azure/go-autorest/autorest/sender.go | 4 + .../Azure/go-autorest/autorest/utility.go | 9 + .../Azure/go-autorest/autorest/version.go | 2 +- vendor/vendor.json | 424 +-- 261 files changed, 11356 insertions(+), 4737 deletions(-) create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/analyticsitem.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/workbook.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/workbooks.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/messagingplan.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/migrationconfigs.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/recommendedelasticpools.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/billingmeters.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/analyticsitem.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/analyticsitem.go new file mode 100644 index 000000000000..a3a3c27d658d --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/analyticsitem.go @@ -0,0 +1,362 @@ +package insights + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// AnalyticsItemClient is the composite Swagger for Application Insights Management Client +type AnalyticsItemClient struct { + BaseClient +} + +// NewAnalyticsItemClient creates an instance of the AnalyticsItemClient client. +func NewAnalyticsItemClient(subscriptionID string) AnalyticsItemClient { + return NewAnalyticsItemClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewAnalyticsItemClientWithBaseURI creates an instance of the AnalyticsItemClient client. +func NewAnalyticsItemClientWithBaseURI(baseURI string, subscriptionID string) AnalyticsItemClient { + return AnalyticsItemClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// Delete deletes a specific Analytics Items defined within an Application Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// scopePath - enum indicating if this item definition is owned by a specific user or is shared between all +// users with access to the Application Insights component. +// ID - the Id of a specific item defined in the Application Insights component +// name - the name of a specific item defined in the Application Insights component +func (client AnalyticsItemClient) Delete(ctx context.Context, resourceGroupName string, resourceName string, scopePath ItemScopePath, ID string, name string) (result autorest.Response, err error) { + req, err := client.DeletePreparer(ctx, resourceGroupName, resourceName, scopePath, ID, name) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.AnalyticsItemClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "insights.AnalyticsItemClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.AnalyticsItemClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client AnalyticsItemClient) DeletePreparer(ctx context.Context, resourceGroupName string, resourceName string, scopePath ItemScopePath, ID string, name string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "scopePath": autorest.Encode("path", scopePath), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(ID) > 0 { + queryParameters["id"] = autorest.Encode("query", ID) + } + if len(name) > 0 { + queryParameters["name"] = autorest.Encode("query", name) + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.insights/components/{resourceName}/{scopePath}/item", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client AnalyticsItemClient) DeleteSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client AnalyticsItemClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get gets a specific Analytics Items defined within an Application Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// scopePath - enum indicating if this item definition is owned by a specific user or is shared between all +// users with access to the Application Insights component. +// ID - the Id of a specific item defined in the Application Insights component +// name - the name of a specific item defined in the Application Insights component +func (client AnalyticsItemClient) Get(ctx context.Context, resourceGroupName string, resourceName string, scopePath ItemScopePath, ID string, name string) (result ApplicationInsightsComponentAnalyticsItem, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, resourceName, scopePath, ID, name) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.AnalyticsItemClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.AnalyticsItemClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.AnalyticsItemClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client AnalyticsItemClient) GetPreparer(ctx context.Context, resourceGroupName string, resourceName string, scopePath ItemScopePath, ID string, name string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "scopePath": autorest.Encode("path", scopePath), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(ID) > 0 { + queryParameters["id"] = autorest.Encode("query", ID) + } + if len(name) > 0 { + queryParameters["name"] = autorest.Encode("query", name) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.insights/components/{resourceName}/{scopePath}/item", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client AnalyticsItemClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client AnalyticsItemClient) GetResponder(resp *http.Response) (result ApplicationInsightsComponentAnalyticsItem, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// List gets a list of Analytics Items defined within an Application Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// scopePath - enum indicating if this item definition is owned by a specific user or is shared between all +// users with access to the Application Insights component. +// scope - enum indicating if this item definition is owned by a specific user or is shared between all users +// with access to the Application Insights component. +// typeParameter - enum indicating the type of the Analytics item. +// includeContent - flag indicating whether or not to return the content of each applicable item. If false, +// only return the item information. +func (client AnalyticsItemClient) List(ctx context.Context, resourceGroupName string, resourceName string, scopePath ItemScopePath, scope ItemScope, typeParameter ItemTypeParameter, includeContent *bool) (result ListApplicationInsightsComponentAnalyticsItem, err error) { + req, err := client.ListPreparer(ctx, resourceGroupName, resourceName, scopePath, scope, typeParameter, includeContent) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.AnalyticsItemClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.AnalyticsItemClient", "List", resp, "Failure sending request") + return + } + + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.AnalyticsItemClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client AnalyticsItemClient) ListPreparer(ctx context.Context, resourceGroupName string, resourceName string, scopePath ItemScopePath, scope ItemScope, typeParameter ItemTypeParameter, includeContent *bool) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "scopePath": autorest.Encode("path", scopePath), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(string(scope)) > 0 { + queryParameters["scope"] = autorest.Encode("query", scope) + } else { + queryParameters["scope"] = autorest.Encode("query", "shared") + } + if len(string(typeParameter)) > 0 { + queryParameters["type"] = autorest.Encode("query", typeParameter) + } else { + queryParameters["type"] = autorest.Encode("query", "none") + } + if includeContent != nil { + queryParameters["includeContent"] = autorest.Encode("query", *includeContent) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.insights/components/{resourceName}/{scopePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client AnalyticsItemClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client AnalyticsItemClient) ListResponder(resp *http.Response) (result ListApplicationInsightsComponentAnalyticsItem, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result.Value), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Put adds or Updates a specific Analytics Item within an Application Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// scopePath - enum indicating if this item definition is owned by a specific user or is shared between all +// users with access to the Application Insights component. +// itemProperties - properties that need to be specified to create a new item and add it to an Application +// Insights component. +// overrideItem - flag indicating whether or not to force save an item. This allows overriding an item if it +// already exists. +func (client AnalyticsItemClient) Put(ctx context.Context, resourceGroupName string, resourceName string, scopePath ItemScopePath, itemProperties ApplicationInsightsComponentAnalyticsItem, overrideItem *bool) (result ApplicationInsightsComponentAnalyticsItem, err error) { + req, err := client.PutPreparer(ctx, resourceGroupName, resourceName, scopePath, itemProperties, overrideItem) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.AnalyticsItemClient", "Put", nil, "Failure preparing request") + return + } + + resp, err := client.PutSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.AnalyticsItemClient", "Put", resp, "Failure sending request") + return + } + + result, err = client.PutResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.AnalyticsItemClient", "Put", resp, "Failure responding to request") + } + + return +} + +// PutPreparer prepares the Put request. +func (client AnalyticsItemClient) PutPreparer(ctx context.Context, resourceGroupName string, resourceName string, scopePath ItemScopePath, itemProperties ApplicationInsightsComponentAnalyticsItem, overrideItem *bool) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "scopePath": autorest.Encode("path", scopePath), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if overrideItem != nil { + queryParameters["overrideItem"] = autorest.Encode("query", *overrideItem) + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.insights/components/{resourceName}/{scopePath}/item", pathParameters), + autorest.WithJSON(itemProperties), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// PutSender sends the Put request. The method will close the +// http.Response Body if it receives an error. +func (client AnalyticsItemClient) PutSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// PutResponder handles the response to the Put request. The method always +// closes the http.Response Body. +func (client AnalyticsItemClient) PutResponder(resp *http.Response) (result ApplicationInsightsComponentAnalyticsItem, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/annotations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/annotations.go index c6b16adb42e8..7e548ea9ad83 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/annotations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/annotations.go @@ -40,10 +40,11 @@ func NewAnnotationsClientWithBaseURI(baseURI string, subscriptionID string) Anno } // Create create an Annotation of an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. annotationProperties is properties that need to be specified to create an annotation of a -// Application Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// annotationProperties - properties that need to be specified to create an annotation of a Application +// Insights component. func (client AnnotationsClient) Create(ctx context.Context, resourceGroupName string, resourceName string, annotationProperties Annotation) (result ListAnnotation, err error) { req, err := client.CreatePreparer(ctx, resourceGroupName, resourceName, annotationProperties) if err != nil { @@ -110,10 +111,10 @@ func (client AnnotationsClient) CreateResponder(resp *http.Response) (result Lis } // Delete delete an Annotation of an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. annotationID is the unique annotation ID. This is unique within a Application Insights -// component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// annotationID - the unique annotation ID. This is unique within a Application Insights component. func (client AnnotationsClient) Delete(ctx context.Context, resourceGroupName string, resourceName string, annotationID string) (result SetObject, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, resourceName, annotationID) if err != nil { @@ -179,10 +180,10 @@ func (client AnnotationsClient) DeleteResponder(resp *http.Response) (result Set } // Get get the annotation for given id. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. annotationID is the unique annotation ID. This is unique within a Application Insights -// component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// annotationID - the unique annotation ID. This is unique within a Application Insights component. func (client AnnotationsClient) Get(ctx context.Context, resourceGroupName string, resourceName string, annotationID string) (result ListAnnotation, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, resourceName, annotationID) if err != nil { @@ -248,10 +249,11 @@ func (client AnnotationsClient) GetResponder(resp *http.Response) (result ListAn } // List gets the list of annotations for a component for given time range -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. start is the start time to query from for annotations, cannot be older than 90 days from -// current date. end is the end time to query for annotations. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// start - the start time to query from for annotations, cannot be older than 90 days from current date. +// end - the end time to query for annotations. func (client AnnotationsClient) List(ctx context.Context, resourceGroupName string, resourceName string, start string, end string) (result ListAnnotation, err error) { req, err := client.ListPreparer(ctx, resourceGroupName, resourceName, start, end) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/apikeys.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/apikeys.go index 832dfaf7f107..601b384c32fe 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/apikeys.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/apikeys.go @@ -40,10 +40,11 @@ func NewAPIKeysClientWithBaseURI(baseURI string, subscriptionID string) APIKeysC } // Create create an API Key of an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. APIKeyProperties is properties that need to be specified to create an API key of a -// Application Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// APIKeyProperties - properties that need to be specified to create an API key of a Application Insights +// component. func (client APIKeysClient) Create(ctx context.Context, resourceGroupName string, resourceName string, APIKeyProperties APIKeyRequest) (result ApplicationInsightsComponentAPIKey, err error) { req, err := client.CreatePreparer(ctx, resourceGroupName, resourceName, APIKeyProperties) if err != nil { @@ -110,9 +111,10 @@ func (client APIKeysClient) CreateResponder(resp *http.Response) (result Applica } // Delete delete an API Key of an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. keyID is the API Key ID. This is unique within a Application Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// keyID - the API Key ID. This is unique within a Application Insights component. func (client APIKeysClient) Delete(ctx context.Context, resourceGroupName string, resourceName string, keyID string) (result ApplicationInsightsComponentAPIKey, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, resourceName, keyID) if err != nil { @@ -178,9 +180,10 @@ func (client APIKeysClient) DeleteResponder(resp *http.Response) (result Applica } // Get get the API Key for this key id. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. keyID is the API Key ID. This is unique within a Application Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// keyID - the API Key ID. This is unique within a Application Insights component. func (client APIKeysClient) Get(ctx context.Context, resourceGroupName string, resourceName string, keyID string) (result ApplicationInsightsComponentAPIKey, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, resourceName, keyID) if err != nil { @@ -246,9 +249,9 @@ func (client APIKeysClient) GetResponder(resp *http.Response) (result Applicatio } // List gets a list of API keys of an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. func (client APIKeysClient) List(ctx context.Context, resourceGroupName string, resourceName string) (result ApplicationInsightsComponentAPIKeyListResult, err error) { req, err := client.ListPreparer(ctx, resourceGroupName, resourceName) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentavailablefeatures.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentavailablefeatures.go index 2e7d7b4c9733..81aff2abd2d3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentavailablefeatures.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentavailablefeatures.go @@ -40,9 +40,9 @@ func NewComponentAvailableFeaturesClientWithBaseURI(baseURI string, subscription } // Get returns all available features of the application insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. func (client ComponentAvailableFeaturesClient) Get(ctx context.Context, resourceGroupName string, resourceName string) (result ApplicationInsightsComponentAvailableFeatures, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, resourceName) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentcurrentbillingfeatures.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentcurrentbillingfeatures.go index 55678b16ce99..7b983c7c66ac 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentcurrentbillingfeatures.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentcurrentbillingfeatures.go @@ -41,9 +41,9 @@ func NewComponentCurrentBillingFeaturesClientWithBaseURI(baseURI string, subscri } // Get returns current billing features for an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. func (client ComponentCurrentBillingFeaturesClient) Get(ctx context.Context, resourceGroupName string, resourceName string) (result ApplicationInsightsComponentBillingFeatures, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -108,10 +108,11 @@ func (client ComponentCurrentBillingFeaturesClient) GetResponder(resp *http.Resp } // Update update current billing features for an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. billingFeaturesProperties is properties that need to be specified to update billing features -// for an Application Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// billingFeaturesProperties - properties that need to be specified to update billing features for an +// Application Insights component. func (client ComponentCurrentBillingFeaturesClient) Update(ctx context.Context, resourceGroupName string, resourceName string, billingFeaturesProperties ApplicationInsightsComponentBillingFeatures) (result ApplicationInsightsComponentBillingFeatures, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, resourceName, billingFeaturesProperties) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentfeaturecapabilities.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentfeaturecapabilities.go index 78a56cdd44b2..5e0ac6512866 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentfeaturecapabilities.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentfeaturecapabilities.go @@ -41,9 +41,9 @@ func NewComponentFeatureCapabilitiesClientWithBaseURI(baseURI string, subscripti } // Get returns feature capabilites of the application insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. func (client ComponentFeatureCapabilitiesClient) Get(ctx context.Context, resourceGroupName string, resourceName string) (result ApplicationInsightsComponentFeatureCapabilities, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, resourceName) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentquotastatus.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentquotastatus.go index 991b6d4bc255..24dbba59d652 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentquotastatus.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/componentquotastatus.go @@ -40,9 +40,9 @@ func NewComponentQuotaStatusClientWithBaseURI(baseURI string, subscriptionID str } // Get returns daily data volume cap (quota) status for an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. func (client ComponentQuotaStatusClient) Get(ctx context.Context, resourceGroupName string, resourceName string) (result ApplicationInsightsComponentQuotaStatus, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, resourceName) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/components.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/components.go index b403b928518b..90d532fdfd68 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/components.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/components.go @@ -42,10 +42,10 @@ func NewComponentsClientWithBaseURI(baseURI string, subscriptionID string) Compo // CreateOrUpdate creates (or updates) an Application Insights component. Note: You cannot specify a different value // for InstrumentationKey nor AppId in the Put operation. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. insightProperties is properties that need to be specified to create an Application Insights -// component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// insightProperties - properties that need to be specified to create an Application Insights component. func (client ComponentsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, resourceName string, insightProperties ApplicationInsightsComponent) (result ApplicationInsightsComponent, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: insightProperties, @@ -118,9 +118,9 @@ func (client ComponentsClient) CreateOrUpdateResponder(resp *http.Response) (res } // Delete deletes an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. func (client ComponentsClient) Delete(ctx context.Context, resourceGroupName string, resourceName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -184,9 +184,9 @@ func (client ComponentsClient) DeleteResponder(resp *http.Response) (result auto } // Get returns an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. func (client ComponentsClient) Get(ctx context.Context, resourceGroupName string, resourceName string) (result ApplicationInsightsComponent, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -250,76 +250,6 @@ func (client ComponentsClient) GetResponder(resp *http.Response) (result Applica return } -// GetPurgeStatus gets the status of a previously submitted purge using the id returned from the original purge -// request. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. purgeID is in a purge status request, this is the Id of the operation the status of which is -// returned. -func (client ComponentsClient) GetPurgeStatus(ctx context.Context, resourceGroupName string, resourceName string, purgeID string) (result ComponentPurgeStatusResponse, err error) { - req, err := client.GetPurgeStatusPreparer(ctx, resourceGroupName, resourceName, purgeID) - if err != nil { - err = autorest.NewErrorWithError(err, "insights.ComponentsClient", "GetPurgeStatus", nil, "Failure preparing request") - return - } - - resp, err := client.GetPurgeStatusSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "insights.ComponentsClient", "GetPurgeStatus", resp, "Failure sending request") - return - } - - result, err = client.GetPurgeStatusResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "insights.ComponentsClient", "GetPurgeStatus", resp, "Failure responding to request") - } - - return -} - -// GetPurgeStatusPreparer prepares the GetPurgeStatus request. -func (client ComponentsClient) GetPurgeStatusPreparer(ctx context.Context, resourceGroupName string, resourceName string, purgeID string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "purgeId": autorest.Encode("path", purgeID), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "resourceName": autorest.Encode("path", resourceName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2015-05-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Insights/components/{resourceName}/operations/{purgeId}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// GetPurgeStatusSender sends the GetPurgeStatus request. The method will close the -// http.Response Body if it receives an error. -func (client ComponentsClient) GetPurgeStatusSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// GetPurgeStatusResponder handles the response to the GetPurgeStatus request. The method always -// closes the http.Response Body. -func (client ComponentsClient) GetPurgeStatusResponder(resp *http.Response) (result ComponentPurgeStatusResponse, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - // List gets a list of all Application Insights components within a subscription. func (client ComponentsClient) List(ctx context.Context) (result ApplicationInsightsComponentListResultPage, err error) { result.fn = client.listNextResults @@ -411,8 +341,8 @@ func (client ComponentsClient) ListComplete(ctx context.Context) (result Applica } // ListByResourceGroup gets a list of Application Insights components within a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client ComponentsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ApplicationInsightsComponentListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) @@ -504,11 +434,11 @@ func (client ComponentsClient) ListByResourceGroupComplete(ctx context.Context, } // Purge purges data in an Application Insights component by a set of user-defined filters. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. body is describes the body of a request to purge data in a single table of an Application -// Insights component -func (client ComponentsClient) Purge(ctx context.Context, resourceGroupName string, resourceName string, body ComponentPurgeBody) (result ComponentPurgeResponse, err error) { +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// body - describes the body of a request to purge data in a single table of an Application Insights component +func (client ComponentsClient) Purge(ctx context.Context, resourceGroupName string, resourceName string, body ComponentPurgeBody) (result ComponentsPurgeFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: body, Constraints: []validation.Constraint{{Target: "body.Table", Name: validation.Null, Rule: true, Chain: nil}, @@ -522,18 +452,12 @@ func (client ComponentsClient) Purge(ctx context.Context, resourceGroupName stri return } - resp, err := client.PurgeSender(req) + result, err = client.PurgeSender(req) if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "insights.ComponentsClient", "Purge", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "insights.ComponentsClient", "Purge", result.Response(), "Failure sending request") return } - result, err = client.PurgeResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "insights.ComponentsClient", "Purge", resp, "Failure responding to request") - } - return } @@ -562,14 +486,22 @@ func (client ComponentsClient) PurgePreparer(ctx context.Context, resourceGroupN // PurgeSender sends the Purge request. The method will close the // http.Response Body if it receives an error. -func (client ComponentsClient) PurgeSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) +func (client ComponentsClient) PurgeSender(req *http.Request) (future ComponentsPurgeFuture, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + return } // PurgeResponder handles the response to the Purge request. The method always // closes the http.Response Body. -func (client ComponentsClient) PurgeResponder(resp *http.Response) (result ComponentPurgeResponse, err error) { +func (client ComponentsClient) PurgeResponder(resp *http.Response) (result SetObject, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -581,9 +513,10 @@ func (client ComponentsClient) PurgeResponder(resp *http.Response) (result Compo } // UpdateTags updates an existing component's tags. To update other fields use the CreateOrUpdate method. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. componentTags is updated tag information to set into the component instance. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// componentTags - updated tag information to set into the component instance. func (client ComponentsClient) UpdateTags(ctx context.Context, resourceGroupName string, resourceName string, componentTags TagsResource) (result ApplicationInsightsComponent, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, resourceName, componentTags) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/exportconfigurations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/exportconfigurations.go index c76a488ca74d..ab8cbf207fdf 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/exportconfigurations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/exportconfigurations.go @@ -40,10 +40,11 @@ func NewExportConfigurationsClientWithBaseURI(baseURI string, subscriptionID str } // Create create a Continuous Export configuration of an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. exportProperties is properties that need to be specified to create a Continuous Export -// configuration of a Application Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// exportProperties - properties that need to be specified to create a Continuous Export configuration of a +// Application Insights component. func (client ExportConfigurationsClient) Create(ctx context.Context, resourceGroupName string, resourceName string, exportProperties ApplicationInsightsComponentExportRequest) (result ListApplicationInsightsComponentExportConfiguration, err error) { req, err := client.CreatePreparer(ctx, resourceGroupName, resourceName, exportProperties) if err != nil { @@ -110,10 +111,10 @@ func (client ExportConfigurationsClient) CreateResponder(resp *http.Response) (r } // Delete delete a Continuous Export configuration of an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. exportID is the Continuous Export configuration ID. This is unique within a Application -// Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// exportID - the Continuous Export configuration ID. This is unique within a Application Insights component. func (client ExportConfigurationsClient) Delete(ctx context.Context, resourceGroupName string, resourceName string, exportID string) (result ApplicationInsightsComponentExportConfiguration, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, resourceName, exportID) if err != nil { @@ -179,10 +180,10 @@ func (client ExportConfigurationsClient) DeleteResponder(resp *http.Response) (r } // Get get the Continuous Export configuration for this export id. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. exportID is the Continuous Export configuration ID. This is unique within a Application -// Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// exportID - the Continuous Export configuration ID. This is unique within a Application Insights component. func (client ExportConfigurationsClient) Get(ctx context.Context, resourceGroupName string, resourceName string, exportID string) (result ApplicationInsightsComponentExportConfiguration, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, resourceName, exportID) if err != nil { @@ -248,9 +249,9 @@ func (client ExportConfigurationsClient) GetResponder(resp *http.Response) (resu } // List gets a list of Continuous Export configuration of an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. func (client ExportConfigurationsClient) List(ctx context.Context, resourceGroupName string, resourceName string) (result ListApplicationInsightsComponentExportConfiguration, err error) { req, err := client.ListPreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -315,11 +316,11 @@ func (client ExportConfigurationsClient) ListResponder(resp *http.Response) (res } // Update update the Continuous Export configuration for this export id. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. exportID is the Continuous Export configuration ID. This is unique within a Application -// Insights component. exportProperties is properties that need to be specified to update the Continuous Export -// configuration. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// exportID - the Continuous Export configuration ID. This is unique within a Application Insights component. +// exportProperties - properties that need to be specified to update the Continuous Export configuration. func (client ExportConfigurationsClient) Update(ctx context.Context, resourceGroupName string, resourceName string, exportID string, exportProperties ApplicationInsightsComponentExportRequest) (result ApplicationInsightsComponentExportConfiguration, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, resourceName, exportID, exportProperties) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/favorite.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/favorite.go index c18bef50305f..298cbefb4801 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/favorite.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/favorite.go @@ -40,11 +40,12 @@ func NewFavoriteClientWithBaseURI(baseURI string, subscriptionID string) Favorit } // Add adds a new favorites to an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. favoriteID is the Id of a specific favorite defined in the Application Insights component -// favoriteProperties is properties that need to be specified to create a new favorite and add it to an Application -// Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// favoriteID - the Id of a specific favorite defined in the Application Insights component +// favoriteProperties - properties that need to be specified to create a new favorite and add it to an +// Application Insights component. func (client FavoriteClient) Add(ctx context.Context, resourceGroupName string, resourceName string, favoriteID string, favoriteProperties ApplicationInsightsComponentFavorite) (result ApplicationInsightsComponentFavorite, err error) { req, err := client.AddPreparer(ctx, resourceGroupName, resourceName, favoriteID, favoriteProperties) if err != nil { @@ -112,9 +113,10 @@ func (client FavoriteClient) AddResponder(resp *http.Response) (result Applicati } // Delete remove a favorite that is associated to an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. favoriteID is the Id of a specific favorite defined in the Application Insights component +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// favoriteID - the Id of a specific favorite defined in the Application Insights component func (client FavoriteClient) Delete(ctx context.Context, resourceGroupName string, resourceName string, favoriteID string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, resourceName, favoriteID) if err != nil { @@ -179,9 +181,10 @@ func (client FavoriteClient) DeleteResponder(resp *http.Response) (result autore } // Get get a single favorite by its FavoriteId, defined within an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. favoriteID is the Id of a specific favorite defined in the Application Insights component +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// favoriteID - the Id of a specific favorite defined in the Application Insights component func (client FavoriteClient) Get(ctx context.Context, resourceGroupName string, resourceName string, favoriteID string) (result ApplicationInsightsComponentFavorite, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, resourceName, favoriteID) if err != nil { @@ -247,10 +250,11 @@ func (client FavoriteClient) GetResponder(resp *http.Response) (result Applicati } // Update updates a favorite that has already been added to an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. favoriteID is the Id of a specific favorite defined in the Application Insights component -// favoriteProperties is properties that need to be specified to update the existing favorite. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// favoriteID - the Id of a specific favorite defined in the Application Insights component +// favoriteProperties - properties that need to be specified to update the existing favorite. func (client FavoriteClient) Update(ctx context.Context, resourceGroupName string, resourceName string, favoriteID string, favoriteProperties ApplicationInsightsComponentFavorite) (result ApplicationInsightsComponentFavorite, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, resourceName, favoriteID, favoriteProperties) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/favorites.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/favorites.go index 119f18af713a..644e74980cd6 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/favorites.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/favorites.go @@ -40,13 +40,15 @@ func NewFavoritesClientWithBaseURI(baseURI string, subscriptionID string) Favori } // List gets a list of favorites defined within an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. favoriteType is the type of favorite. Value can be either shared or user. sourceType is -// source type of favorite to return. When left out, the source type defaults to 'other' (not present in this -// enum). canFetchContent is flag indicating whether or not to return the full content for each applicable -// favorite. If false, only return summary content for favorites. tags is tags that must be present on each -// favorite returned. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// favoriteType - the type of favorite. Value can be either shared or user. +// sourceType - source type of favorite to return. When left out, the source type defaults to 'other' (not +// present in this enum). +// canFetchContent - flag indicating whether or not to return the full content for each applicable favorite. If +// false, only return summary content for favorites. +// tags - tags that must be present on each favorite returned. func (client FavoritesClient) List(ctx context.Context, resourceGroupName string, resourceName string, favoriteType FavoriteType, sourceType FavoriteSourceType, canFetchContent *bool, tags []string) (result ListApplicationInsightsComponentFavorite, err error) { req, err := client.ListPreparer(ctx, resourceGroupName, resourceName, favoriteType, sourceType, canFetchContent, tags) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/models.go index 99026d27bb3b..993b4276d21a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/models.go @@ -20,6 +20,7 @@ package insights import ( "encoding/json" "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/date" "github.com/Azure/go-autorest/autorest/to" "net/http" @@ -40,6 +41,25 @@ func PossibleApplicationTypeValues() []ApplicationType { return []ApplicationType{Other, Web} } +// CategoryType enumerates the values for category type. +type CategoryType string + +const ( + // CategoryTypePerformance ... + CategoryTypePerformance CategoryType = "performance" + // CategoryTypeRetention ... + CategoryTypeRetention CategoryType = "retention" + // CategoryTypeTSG ... + CategoryTypeTSG CategoryType = "TSG" + // CategoryTypeWorkbook ... + CategoryTypeWorkbook CategoryType = "workbook" +) + +// PossibleCategoryTypeValues returns an array of possible values for the CategoryType const type. +func PossibleCategoryTypeValues() []CategoryType { + return []CategoryType{CategoryTypePerformance, CategoryTypeRetention, CategoryTypeTSG, CategoryTypeWorkbook} +} + // FavoriteSourceType enumerates the values for favorite source type. type FavoriteSourceType string @@ -95,6 +115,76 @@ func PossibleFlowTypeValues() []FlowType { return []FlowType{Bluefield} } +// ItemScope enumerates the values for item scope. +type ItemScope string + +const ( + // ItemScopeShared ... + ItemScopeShared ItemScope = "shared" + // ItemScopeUser ... + ItemScopeUser ItemScope = "user" +) + +// PossibleItemScopeValues returns an array of possible values for the ItemScope const type. +func PossibleItemScopeValues() []ItemScope { + return []ItemScope{ItemScopeShared, ItemScopeUser} +} + +// ItemScopePath enumerates the values for item scope path. +type ItemScopePath string + +const ( + // AnalyticsItems ... + AnalyticsItems ItemScopePath = "analyticsItems" + // MyanalyticsItems ... + MyanalyticsItems ItemScopePath = "myanalyticsItems" +) + +// PossibleItemScopePathValues returns an array of possible values for the ItemScopePath const type. +func PossibleItemScopePathValues() []ItemScopePath { + return []ItemScopePath{AnalyticsItems, MyanalyticsItems} +} + +// ItemType enumerates the values for item type. +type ItemType string + +const ( + // Folder ... + Folder ItemType = "folder" + // Function ... + Function ItemType = "function" + // Query ... + Query ItemType = "query" + // Recent ... + Recent ItemType = "recent" +) + +// PossibleItemTypeValues returns an array of possible values for the ItemType const type. +func PossibleItemTypeValues() []ItemType { + return []ItemType{Folder, Function, Query, Recent} +} + +// ItemTypeParameter enumerates the values for item type parameter. +type ItemTypeParameter string + +const ( + // ItemTypeParameterFolder ... + ItemTypeParameterFolder ItemTypeParameter = "folder" + // ItemTypeParameterFunction ... + ItemTypeParameterFunction ItemTypeParameter = "function" + // ItemTypeParameterNone ... + ItemTypeParameterNone ItemTypeParameter = "none" + // ItemTypeParameterQuery ... + ItemTypeParameterQuery ItemTypeParameter = "query" + // ItemTypeParameterRecent ... + ItemTypeParameterRecent ItemTypeParameter = "recent" +) + +// PossibleItemTypeParameterValues returns an array of possible values for the ItemTypeParameter const type. +func PossibleItemTypeParameterValues() []ItemTypeParameter { + return []ItemTypeParameter{ItemTypeParameterFolder, ItemTypeParameterFunction, ItemTypeParameterNone, ItemTypeParameterQuery, ItemTypeParameterRecent} +} + // PurgeState enumerates the values for purge state. type PurgeState string @@ -123,6 +213,21 @@ func PossibleRequestSourceValues() []RequestSource { return []RequestSource{Rest} } +// SharedTypeKind enumerates the values for shared type kind. +type SharedTypeKind string + +const ( + // SharedTypeKindShared ... + SharedTypeKindShared SharedTypeKind = "shared" + // SharedTypeKindUser ... + SharedTypeKindUser SharedTypeKind = "user" +) + +// PossibleSharedTypeKindValues returns an array of possible values for the SharedTypeKind const type. +func PossibleSharedTypeKindValues() []SharedTypeKind { + return []SharedTypeKind{SharedTypeKindShared, SharedTypeKindUser} +} + // WebTestKind enumerates the values for web test kind. type WebTestKind string @@ -297,6 +402,36 @@ func (aic *ApplicationInsightsComponent) UnmarshalJSON(body []byte) error { return nil } +// ApplicationInsightsComponentAnalyticsItem properties that define an Analytics item that is associated to an +// Application Insights component. +type ApplicationInsightsComponentAnalyticsItem struct { + autorest.Response `json:"-"` + // ID - Internally assigned unique id of the item definition. + ID *string `json:"Id,omitempty"` + // Name - The user-defined name of the item. + Name *string `json:"Name,omitempty"` + // Content - The content of this item + Content *string `json:"Content,omitempty"` + // Version - This instance's version of the data model. This can change as new features are added. + Version *string `json:"Version,omitempty"` + // Scope - Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component. Possible values include: 'ItemScopeShared', 'ItemScopeUser' + Scope ItemScope `json:"Scope,omitempty"` + // Type - Enum indicating the type of the Analytics item. Possible values include: 'Query', 'Function', 'Folder', 'Recent' + Type ItemType `json:"Type,omitempty"` + // TimeCreated - Date and time in UTC when this item was created. + TimeCreated *string `json:"TimeCreated,omitempty"` + // TimeModified - Date and time in UTC of the last modification that was made to this item. + TimeModified *string `json:"TimeModified,omitempty"` + Properties *ApplicationInsightsComponentAnalyticsItemProperties `json:"Properties,omitempty"` +} + +// ApplicationInsightsComponentAnalyticsItemProperties a set of properties that can be defined in the context of a +// specific item type. Each type may have its own properties. +type ApplicationInsightsComponentAnalyticsItemProperties struct { + // FunctionAlias - A function alias, used when the type of the item is Function + FunctionAlias *string `json:"functionAlias,omitempty"` +} + // ApplicationInsightsComponentAPIKey properties that define an API key of an Application Insights Component. type ApplicationInsightsComponentAPIKey struct { autorest.Response `json:"-"` @@ -733,24 +868,82 @@ type ComponentPurgeBody struct { type ComponentPurgeBodyFilters struct { // Column - The column of the table over which the given query should run Column *string `json:"column,omitempty"` - // Filter - A query to to run over the provided table and column to purge the corresponding data. - Filter *string `json:"filter,omitempty"` + // Operator - A query operator to evaluate over the provided column and value(s). + Operator *string `json:"operator,omitempty"` + // Value - the value for the operator to function over. This can be a number (e.g., > 100), a string (timestamp >= '2017-09-01') or array of values. + Value interface{} `json:"value,omitempty"` } // ComponentPurgeResponse response containing operationId for a specific purge action. type ComponentPurgeResponse struct { - autorest.Response `json:"-"` // OperationID - Id to use when querying for status for a particular purge operation. OperationID *string `json:"operationId,omitempty"` } // ComponentPurgeStatusResponse response containing status for a specific purge operation. type ComponentPurgeStatusResponse struct { - autorest.Response `json:"-"` // Status - Status of the operation represented by the requested Id. Possible values include: 'Pending', 'Completed' Status PurgeState `json:"status,omitempty"` } +// ComponentsPurgeFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type ComponentsPurgeFuture struct { + azure.Future + req *http.Request +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future ComponentsPurgeFuture) Result(client ComponentsClient) (so SetObject, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.ComponentsPurgeFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + return so, azure.NewAsyncOpIncompleteError("insights.ComponentsPurgeFuture") + } + if future.PollingMethod() == azure.PollingLocation { + so, err = client.PurgeResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.ComponentsPurgeFuture", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.ComponentsPurgeFuture", "Result", resp, "Failure sending request") + return + } + so, err = client.PurgeResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.ComponentsPurgeFuture", "Result", resp, "Failure responding to request") + } + return +} + +// ErrorFieldContract error Field contract. +type ErrorFieldContract struct { + // Code - Property level error code. + Code *string `json:"code,omitempty"` + // Message - Human-readable representation of property-level error. + Message *string `json:"message,omitempty"` + // Target - Property name. + Target *string `json:"target,omitempty"` +} + // ErrorResponse error reponse indicates Insights service is not able to process the incoming request. The reason // is provided in the error message. type ErrorResponse struct { @@ -768,12 +961,28 @@ type InnerError struct { Time *date.Time `json:"time,omitempty"` } +// LinkProperties contains a sourceId and workbook resource id to link two resources. +type LinkProperties struct { + // SourceID - The source Azure resource id + SourceID *string `json:"sourceId,omitempty"` + // TargetID - The workbook Azure resource id + TargetID *string `json:"targetId,omitempty"` + // Category - The category of workbook + Category *string `json:"category,omitempty"` +} + // ListAnnotation ... type ListAnnotation struct { autorest.Response `json:"-"` Value *[]Annotation `json:"value,omitempty"` } +// ListApplicationInsightsComponentAnalyticsItem ... +type ListApplicationInsightsComponentAnalyticsItem struct { + autorest.Response `json:"-"` + Value *[]ApplicationInsightsComponentAnalyticsItem `json:"value,omitempty"` +} + // ListApplicationInsightsComponentExportConfiguration ... type ListApplicationInsightsComponentExportConfiguration struct { autorest.Response `json:"-"` @@ -1241,6 +1450,171 @@ type WebTestPropertiesConfiguration struct { WebTest *string `json:"WebTest,omitempty"` } +// Workbook an Application Insights workbook definition. +type Workbook struct { + autorest.Response `json:"-"` + // Kind - The kind of workbook. Choices are user and shared. Possible values include: 'SharedTypeKindUser', 'SharedTypeKindShared' + Kind SharedTypeKind `json:"kind,omitempty"` + // WorkbookProperties - Metadata describing a web test for an Azure resource. + *WorkbookProperties `json:"properties,omitempty"` + // ID - Azure resource Id + ID *string `json:"id,omitempty"` + // Name - Azure resource name + Name *string `json:"name,omitempty"` + // Type - Azure resource type + Type *string `json:"type,omitempty"` + // Location - Resource location + Location *string `json:"location,omitempty"` + // Tags - Resource tags + Tags map[string]*string `json:"tags"` +} + +// MarshalJSON is the custom marshaler for Workbook. +func (w Workbook) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if w.Kind != "" { + objectMap["kind"] = w.Kind + } + if w.WorkbookProperties != nil { + objectMap["properties"] = w.WorkbookProperties + } + if w.ID != nil { + objectMap["id"] = w.ID + } + if w.Name != nil { + objectMap["name"] = w.Name + } + if w.Type != nil { + objectMap["type"] = w.Type + } + if w.Location != nil { + objectMap["location"] = w.Location + } + if w.Tags != nil { + objectMap["tags"] = w.Tags + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for Workbook struct. +func (w *Workbook) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "kind": + if v != nil { + var kind SharedTypeKind + err = json.Unmarshal(*v, &kind) + if err != nil { + return err + } + w.Kind = kind + } + case "properties": + if v != nil { + var workbookProperties WorkbookProperties + err = json.Unmarshal(*v, &workbookProperties) + if err != nil { + return err + } + w.WorkbookProperties = &workbookProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + w.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + w.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + w.Type = &typeVar + } + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + w.Location = &location + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + w.Tags = tags + } + } + } + + return nil +} + +// WorkbookError error message body that will indicate why the operation failed. +type WorkbookError struct { + // Code - Service-defined error code. This code serves as a sub-status for the HTTP error code specified in the response. + Code *string `json:"code,omitempty"` + // Message - Human-readable representation of the error. + Message *string `json:"message,omitempty"` + // Details - The list of invalid fields send in request, in case of validation error. + Details *[]ErrorFieldContract `json:"details,omitempty"` +} + +// WorkbookProperties properties that contain a workbook. +type WorkbookProperties struct { + // Name - The user-defined name of the workbook. + Name *string `json:"name,omitempty"` + // SerializedData - Configuration of this particular workbook. Configuration data is a string containing valid JSON + SerializedData *string `json:"serializedData,omitempty"` + // Version - This instance's version of the data model. This can change as new features are added that can be marked workbook. + Version *string `json:"version,omitempty"` + // WorkbookID - Internally assigned unique id of the workbook definition. + WorkbookID *string `json:"workbookId,omitempty"` + // SharedTypeKind - Enum indicating if this workbook definition is owned by a specific user or is shared between all users with access to the Application Insights component. Possible values include: 'SharedTypeKindUser', 'SharedTypeKindShared' + SharedTypeKind SharedTypeKind `json:"kind,omitempty"` + // TimeModified - Date and time in UTC of the last modification that was made to this workbook definition. + TimeModified *string `json:"timeModified,omitempty"` + // Category - Workbook category, as defined by the user at creation time. + Category *string `json:"category,omitempty"` + // Tags - A list of 0 or more tags that are associated with this workbook definition + Tags *[]string `json:"tags,omitempty"` + // UserID - Unique user id of the specific user that owns this workbook. + UserID *string `json:"userId,omitempty"` + // SourceResourceID - Optional resourceId for a source resource. + SourceResourceID *string `json:"sourceResourceId,omitempty"` +} + +// Workbooks workbook list result. +type Workbooks struct { + autorest.Response `json:"-"` + // Value - An array of workbooks. + Value *[]Workbook `json:"value,omitempty"` +} + // WorkItemConfiguration work item configuration associated with an application insights resource. type WorkItemConfiguration struct { autorest.Response `json:"-"` diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/proactivedetectionconfigurations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/proactivedetectionconfigurations.go index 00b8a1aa812b..d794a135561e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/proactivedetectionconfigurations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/proactivedetectionconfigurations.go @@ -41,10 +41,11 @@ func NewProactiveDetectionConfigurationsClientWithBaseURI(baseURI string, subscr } // Get get the ProactiveDetection configuration for this configuration id. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. configurationID is the ProactiveDetection configuration ID. This is unique within a -// Application Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// configurationID - the ProactiveDetection configuration ID. This is unique within a Application Insights +// component. func (client ProactiveDetectionConfigurationsClient) Get(ctx context.Context, resourceGroupName string, resourceName string, configurationID string) (result ApplicationInsightsComponentProactiveDetectionConfiguration, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, resourceName, configurationID) if err != nil { @@ -110,9 +111,9 @@ func (client ProactiveDetectionConfigurationsClient) GetResponder(resp *http.Res } // List gets a list of ProactiveDetection configurations of an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. func (client ProactiveDetectionConfigurationsClient) List(ctx context.Context, resourceGroupName string, resourceName string) (result ListApplicationInsightsComponentProactiveDetectionConfiguration, err error) { req, err := client.ListPreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -177,11 +178,13 @@ func (client ProactiveDetectionConfigurationsClient) ListResponder(resp *http.Re } // Update update the ProactiveDetection configuration for this configuration id. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. configurationID is the ProactiveDetection configuration ID. This is unique within a -// Application Insights component. proactiveDetectionProperties is properties that need to be specified to update -// the ProactiveDetection configuration. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// configurationID - the ProactiveDetection configuration ID. This is unique within a Application Insights +// component. +// proactiveDetectionProperties - properties that need to be specified to update the ProactiveDetection +// configuration. func (client ProactiveDetectionConfigurationsClient) Update(ctx context.Context, resourceGroupName string, resourceName string, configurationID string, proactiveDetectionProperties ApplicationInsightsComponentProactiveDetectionConfiguration) (result ApplicationInsightsComponentProactiveDetectionConfiguration, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, resourceName, configurationID, proactiveDetectionProperties) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/webtestlocations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/webtestlocations.go index 5f865462c81e..b319546fb38f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/webtestlocations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/webtestlocations.go @@ -40,9 +40,9 @@ func NewWebTestLocationsClientWithBaseURI(baseURI string, subscriptionID string) } // List gets a list of web test locations available to this Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. func (client WebTestLocationsClient) List(ctx context.Context, resourceGroupName string, resourceName string) (result ApplicationInsightsWebTestLocationsListResult, err error) { req, err := client.ListPreparer(ctx, resourceGroupName, resourceName) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/webtests.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/webtests.go index 5d8de80ebddf..7ac7ab23d55f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/webtests.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/webtests.go @@ -41,10 +41,11 @@ func NewWebTestsClientWithBaseURI(baseURI string, subscriptionID string) WebTest } // CreateOrUpdate creates or updates an Application Insights web test definition. -// -// resourceGroupName is the name of the resource group. webTestName is the name of the Application Insights webtest -// resource. webTestDefinition is properties that need to be specified to create or update an Application Insights -// web test definition. +// Parameters: +// resourceGroupName - the name of the resource group. +// webTestName - the name of the Application Insights webtest resource. +// webTestDefinition - properties that need to be specified to create or update an Application Insights web +// test definition. func (client WebTestsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, webTestName string, webTestDefinition WebTest) (result WebTest, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: webTestDefinition, @@ -121,9 +122,9 @@ func (client WebTestsClient) CreateOrUpdateResponder(resp *http.Response) (resul } // Delete deletes an Application Insights web test. -// -// resourceGroupName is the name of the resource group. webTestName is the name of the Application Insights webtest -// resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// webTestName - the name of the Application Insights webtest resource. func (client WebTestsClient) Delete(ctx context.Context, resourceGroupName string, webTestName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, webTestName) if err != nil { @@ -187,9 +188,9 @@ func (client WebTestsClient) DeleteResponder(resp *http.Response) (result autore } // Get get a specific Application Insights web test definition. -// -// resourceGroupName is the name of the resource group. webTestName is the name of the Application Insights webtest -// resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// webTestName - the name of the Application Insights webtest resource. func (client WebTestsClient) Get(ctx context.Context, resourceGroupName string, webTestName string) (result WebTest, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, webTestName) if err != nil { @@ -344,8 +345,8 @@ func (client WebTestsClient) ListComplete(ctx context.Context) (result WebTestLi } // ListByResourceGroup get all Application Insights web tests defined within a specified resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client WebTestsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result WebTestListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) @@ -437,9 +438,10 @@ func (client WebTestsClient) ListByResourceGroupComplete(ctx context.Context, re } // UpdateTags creates or updates an Application Insights web test definition. -// -// resourceGroupName is the name of the resource group. webTestName is the name of the Application Insights webtest -// resource. webTestTags is updated tag information to set into the web test instance. +// Parameters: +// resourceGroupName - the name of the resource group. +// webTestName - the name of the Application Insights webtest resource. +// webTestTags - updated tag information to set into the web test instance. func (client WebTestsClient) UpdateTags(ctx context.Context, resourceGroupName string, webTestName string, webTestTags TagsResource) (result WebTest, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, webTestName, webTestTags) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/workbook.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/workbook.go new file mode 100644 index 000000000000..65e002ea71fb --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/workbook.go @@ -0,0 +1,326 @@ +package insights + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// WorkbookClient is the composite Swagger for Application Insights Management Client +type WorkbookClient struct { + BaseClient +} + +// NewWorkbookClient creates an instance of the WorkbookClient client. +func NewWorkbookClient(subscriptionID string) WorkbookClient { + return NewWorkbookClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewWorkbookClientWithBaseURI creates an instance of the WorkbookClient client. +func NewWorkbookClientWithBaseURI(baseURI string, subscriptionID string) WorkbookClient { + return WorkbookClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate create a new workbook. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// workbookProperties - properties that need to be specified to create a new workbook. +func (client WorkbookClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, resourceName string, workbookProperties Workbook) (result Workbook, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: workbookProperties, + Constraints: []validation.Constraint{{Target: "workbookProperties.WorkbookProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "workbookProperties.WorkbookProperties.Name", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "workbookProperties.WorkbookProperties.SerializedData", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "workbookProperties.WorkbookProperties.WorkbookID", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "workbookProperties.WorkbookProperties.Category", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "workbookProperties.WorkbookProperties.UserID", Name: validation.Null, Rule: true, Chain: nil}, + }}}}}); err != nil { + return result, validation.NewError("insights.WorkbookClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, resourceName, workbookProperties) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WorkbookClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.WorkbookClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WorkbookClient", "CreateOrUpdate", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client WorkbookClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, resourceName string, workbookProperties Workbook) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroup/{resourceGroupName}/providers/microsoft.insights/workbooks/{resourceName}", pathParameters), + autorest.WithJSON(workbookProperties), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client WorkbookClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client WorkbookClient) CreateOrUpdateResponder(resp *http.Response) (result Workbook, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete delete a workbook. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +func (client WorkbookClient) Delete(ctx context.Context, resourceGroupName string, resourceName string) (result autorest.Response, err error) { + req, err := client.DeletePreparer(ctx, resourceGroupName, resourceName) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WorkbookClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "insights.WorkbookClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WorkbookClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client WorkbookClient) DeletePreparer(ctx context.Context, resourceGroupName string, resourceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroup/{resourceGroupName}/providers/microsoft.insights/workbooks/{resourceName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client WorkbookClient) DeleteSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client WorkbookClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get get a single workbook by its resourceName. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +func (client WorkbookClient) Get(ctx context.Context, resourceGroupName string, resourceName string) (result Workbook, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, resourceName) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WorkbookClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.WorkbookClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WorkbookClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client WorkbookClient) GetPreparer(ctx context.Context, resourceGroupName string, resourceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroup/{resourceGroupName}/providers/microsoft.insights/workbooks/{resourceName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client WorkbookClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client WorkbookClient) GetResponder(resp *http.Response) (result Workbook, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Update updates a workbook that has already been added. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// workbookProperties - properties that need to be specified to create a new workbook. +func (client WorkbookClient) Update(ctx context.Context, resourceGroupName string, resourceName string, workbookProperties Workbook) (result Workbook, err error) { + req, err := client.UpdatePreparer(ctx, resourceGroupName, resourceName, workbookProperties) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WorkbookClient", "Update", nil, "Failure preparing request") + return + } + + resp, err := client.UpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.WorkbookClient", "Update", resp, "Failure sending request") + return + } + + result, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WorkbookClient", "Update", resp, "Failure responding to request") + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client WorkbookClient) UpdatePreparer(ctx context.Context, resourceGroupName string, resourceName string, workbookProperties Workbook) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroup/{resourceGroupName}/providers/microsoft.insights/workbooks/{resourceName}", pathParameters), + autorest.WithJSON(workbookProperties), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client WorkbookClient) UpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client WorkbookClient) UpdateResponder(resp *http.Response) (result Workbook, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/workbooks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/workbooks.go new file mode 100644 index 000000000000..46e4f0d82c87 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/workbooks.go @@ -0,0 +1,116 @@ +package insights + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// WorkbooksClient is the composite Swagger for Application Insights Management Client +type WorkbooksClient struct { + BaseClient +} + +// NewWorkbooksClient creates an instance of the WorkbooksClient client. +func NewWorkbooksClient(subscriptionID string) WorkbooksClient { + return NewWorkbooksClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewWorkbooksClientWithBaseURI creates an instance of the WorkbooksClient client. +func NewWorkbooksClientWithBaseURI(baseURI string, subscriptionID string) WorkbooksClient { + return WorkbooksClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// ListByResourceGroup get all Workbooks defined within a specified resource group and category. +// Parameters: +// resourceGroupName - the name of the resource group. +// category - category of workbook to return. +// tags - tags presents on each workbook returned. +// canFetchContent - flag indicating whether or not to return the full content for each applicable workbook. If +// false, only return summary content for workbooks. +func (client WorkbooksClient) ListByResourceGroup(ctx context.Context, resourceGroupName string, category CategoryType, tags []string, canFetchContent *bool) (result Workbooks, err error) { + req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName, category, tags, canFetchContent) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WorkbooksClient", "ListByResourceGroup", nil, "Failure preparing request") + return + } + + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.WorkbooksClient", "ListByResourceGroup", resp, "Failure sending request") + return + } + + result, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WorkbooksClient", "ListByResourceGroup", resp, "Failure responding to request") + } + + return +} + +// ListByResourceGroupPreparer prepares the ListByResourceGroup request. +func (client WorkbooksClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string, category CategoryType, tags []string, canFetchContent *bool) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "category": autorest.Encode("query", category), + } + if tags != nil && len(tags) > 0 { + queryParameters["tags"] = autorest.Encode("query", tags, ",") + } + if canFetchContent != nil { + queryParameters["canFetchContent"] = autorest.Encode("query", *canFetchContent) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroup/{resourceGroupName}/providers/microsoft.insights/workbooks", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the +// http.Response Body if it receives an error. +func (client WorkbooksClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always +// closes the http.Response Body. +func (client WorkbooksClient) ListByResourceGroupResponder(resp *http.Response) (result Workbooks, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/workitemconfigurations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/workitemconfigurations.go index 4b05a66cd462..a8bab87a38b5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/workitemconfigurations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/workitemconfigurations.go @@ -40,10 +40,11 @@ func NewWorkItemConfigurationsClientWithBaseURI(baseURI string, subscriptionID s } // Create create a work item configuration for an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. workItemConfigurationProperties is properties that need to be specified to create a work -// item configuration of a Application Insights component. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// workItemConfigurationProperties - properties that need to be specified to create a work item configuration +// of a Application Insights component. func (client WorkItemConfigurationsClient) Create(ctx context.Context, resourceGroupName string, resourceName string, workItemConfigurationProperties WorkItemCreateConfiguration) (result WorkItemConfiguration, err error) { req, err := client.CreatePreparer(ctx, resourceGroupName, resourceName, workItemConfigurationProperties) if err != nil { @@ -110,10 +111,11 @@ func (client WorkItemConfigurationsClient) CreateResponder(resp *http.Response) } // Delete delete an workitem configuration of an Application Insights component. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. workItemConfigID is the unique work item configuration Id. This can be either friendly name -// of connector as defined in connector configuration +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. +// workItemConfigID - the unique work item configuration Id. This can be either friendly name of connector as +// defined in connector configuration func (client WorkItemConfigurationsClient) Delete(ctx context.Context, resourceGroupName string, resourceName string, workItemConfigID string) (result SetObject, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, resourceName, workItemConfigID) if err != nil { @@ -179,9 +181,9 @@ func (client WorkItemConfigurationsClient) DeleteResponder(resp *http.Response) } // GetDefault gets default work item configurations that exist for the application -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. func (client WorkItemConfigurationsClient) GetDefault(ctx context.Context, resourceGroupName string, resourceName string) (result WorkItemConfiguration, err error) { req, err := client.GetDefaultPreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -246,9 +248,9 @@ func (client WorkItemConfigurationsClient) GetDefaultResponder(resp *http.Respon } // List gets the list work item configurations that exist for the application -// -// resourceGroupName is the name of the resource group. resourceName is the name of the Application Insights -// component resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the Application Insights component resource. func (client WorkItemConfigurationsClient) List(ctx context.Context, resourceGroupName string, resourceName string) (result ListWorkItemConfiguration, err error) { req, err := client.ListPreparer(ctx, resourceGroupName, resourceName) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/permissions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/permissions.go index 935be1f5a688..75e37dac79ee 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/permissions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/permissions.go @@ -43,11 +43,12 @@ func NewPermissionsClientWithBaseURI(baseURI string, subscriptionID string) Perm } // ListForResource gets all permissions the caller has for a resource. -// -// resourceGroupName is the name of the resource group containing the resource. The name is case insensitive. -// resourceProviderNamespace is the namespace of the resource provider. parentResourcePath is the parent resource -// identity. resourceType is the resource type of the resource. resourceName is the name of the resource to get the -// permissions for. +// Parameters: +// resourceGroupName - the name of the resource group containing the resource. The name is case insensitive. +// resourceProviderNamespace - the namespace of the resource provider. +// parentResourcePath - the parent resource identity. +// resourceType - the resource type of the resource. +// resourceName - the name of the resource to get the permissions for. func (client PermissionsClient) ListForResource(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string) (result PermissionGetResultPage, err error) { result.fn = client.listForResourceNextResults req, err := client.ListForResourcePreparer(ctx, resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName) @@ -143,8 +144,8 @@ func (client PermissionsClient) ListForResourceComplete(ctx context.Context, res } // ListForResourceGroup gets all permissions the caller has for a resource group. -// -// resourceGroupName is the name of the resource group to get the permissions for. The name is case insensitive. +// Parameters: +// resourceGroupName - the name of the resource group to get the permissions for. The name is case insensitive. func (client PermissionsClient) ListForResourceGroup(ctx context.Context, resourceGroupName string) (result PermissionGetResultPage, err error) { result.fn = client.listForResourceGroupNextResults req, err := client.ListForResourceGroupPreparer(ctx, resourceGroupName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/provideroperationsmetadata.go b/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/provideroperationsmetadata.go index 39dcb3028ea7..d8f0df2a99c2 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/provideroperationsmetadata.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/provideroperationsmetadata.go @@ -43,9 +43,9 @@ func NewProviderOperationsMetadataClientWithBaseURI(baseURI string, subscription } // Get gets provider operations metadata for the specified resource provider. -// -// resourceProviderNamespace is the namespace of the resource provider. expand is specifies whether to expand the -// values. +// Parameters: +// resourceProviderNamespace - the namespace of the resource provider. +// expand - specifies whether to expand the values. func (client ProviderOperationsMetadataClient) Get(ctx context.Context, resourceProviderNamespace string, expand string) (result ProviderOperationsMetadata, err error) { req, err := client.GetPreparer(ctx, resourceProviderNamespace, expand) if err != nil { @@ -113,8 +113,8 @@ func (client ProviderOperationsMetadataClient) GetResponder(resp *http.Response) } // List gets provider operations metadata for all resource providers. -// -// expand is specifies whether to expand the values. +// Parameters: +// expand - specifies whether to expand the values. func (client ProviderOperationsMetadataClient) List(ctx context.Context, expand string) (result ProviderOperationsMetadataListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, expand) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roleassignments.go b/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roleassignments.go index a1186a9537e2..5a842663c477 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roleassignments.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roleassignments.go @@ -43,13 +43,14 @@ func NewRoleAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) } // Create creates a role assignment. -// -// scope is the scope of the role assignment to create. The scope can be any REST resource instance. For example, -// use '/subscriptions/{subscription-id}/' for a subscription, +// Parameters: +// scope - the scope of the role assignment to create. The scope can be any REST resource instance. For +// example, use '/subscriptions/{subscription-id}/' for a subscription, // '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for a resource group, and // '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider}/{resource-type}/{resource-name}' -// for a resource. roleAssignmentName is the name of the role assignment to create. It can be any valid GUID. -// parameters is parameters for the role assignment. +// for a resource. +// roleAssignmentName - the name of the role assignment to create. It can be any valid GUID. +// parameters - parameters for the role assignment. func (client RoleAssignmentsClient) Create(ctx context.Context, scope string, roleAssignmentName string, parameters RoleAssignmentCreateParameters) (result RoleAssignment, err error) { req, err := client.CreatePreparer(ctx, scope, roleAssignmentName, parameters) if err != nil { @@ -115,12 +116,12 @@ func (client RoleAssignmentsClient) CreateResponder(resp *http.Response) (result } // CreateByID creates a role assignment by ID. -// -// roleAssignmentID is the fully qualified ID of the role assignment, including the scope, resource name and -// resource type. Use the format, /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. -// Example: +// Parameters: +// roleAssignmentID - the fully qualified ID of the role assignment, including the scope, resource name and +// resource type. Use the format, +// /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. Example: // /subscriptions/{subId}/resourcegroups/{rgname}//providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. -// parameters is parameters for the role assignment. +// parameters - parameters for the role assignment. func (client RoleAssignmentsClient) CreateByID(ctx context.Context, roleAssignmentID string, parameters RoleAssignmentCreateParameters) (result RoleAssignment, err error) { req, err := client.CreateByIDPreparer(ctx, roleAssignmentID, parameters) if err != nil { @@ -185,9 +186,9 @@ func (client RoleAssignmentsClient) CreateByIDResponder(resp *http.Response) (re } // Delete deletes a role assignment. -// -// scope is the scope of the role assignment to delete. roleAssignmentName is the name of the role assignment to -// delete. +// Parameters: +// scope - the scope of the role assignment to delete. +// roleAssignmentName - the name of the role assignment to delete. func (client RoleAssignmentsClient) Delete(ctx context.Context, scope string, roleAssignmentName string) (result RoleAssignment, err error) { req, err := client.DeletePreparer(ctx, scope, roleAssignmentName) if err != nil { @@ -251,10 +252,10 @@ func (client RoleAssignmentsClient) DeleteResponder(resp *http.Response) (result } // DeleteByID deletes a role assignment. -// -// roleAssignmentID is the fully qualified ID of the role assignment, including the scope, resource name and -// resource type. Use the format, /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. -// Example: +// Parameters: +// roleAssignmentID - the fully qualified ID of the role assignment, including the scope, resource name and +// resource type. Use the format, +// /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. Example: // /subscriptions/{subId}/resourcegroups/{rgname}//providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. func (client RoleAssignmentsClient) DeleteByID(ctx context.Context, roleAssignmentID string) (result RoleAssignment, err error) { req, err := client.DeleteByIDPreparer(ctx, roleAssignmentID) @@ -318,8 +319,9 @@ func (client RoleAssignmentsClient) DeleteByIDResponder(resp *http.Response) (re } // Get get the specified role assignment. -// -// scope is the scope of the role assignment. roleAssignmentName is the name of the role assignment to get. +// Parameters: +// scope - the scope of the role assignment. +// roleAssignmentName - the name of the role assignment to get. func (client RoleAssignmentsClient) Get(ctx context.Context, scope string, roleAssignmentName string) (result RoleAssignment, err error) { req, err := client.GetPreparer(ctx, scope, roleAssignmentName) if err != nil { @@ -383,10 +385,10 @@ func (client RoleAssignmentsClient) GetResponder(resp *http.Response) (result Ro } // GetByID gets a role assignment by ID. -// -// roleAssignmentID is the fully qualified ID of the role assignment, including the scope, resource name and -// resource type. Use the format, /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. -// Example: +// Parameters: +// roleAssignmentID - the fully qualified ID of the role assignment, including the scope, resource name and +// resource type. Use the format, +// /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. Example: // /subscriptions/{subId}/resourcegroups/{rgname}//providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. func (client RoleAssignmentsClient) GetByID(ctx context.Context, roleAssignmentID string) (result RoleAssignment, err error) { req, err := client.GetByIDPreparer(ctx, roleAssignmentID) @@ -450,10 +452,10 @@ func (client RoleAssignmentsClient) GetByIDResponder(resp *http.Response) (resul } // List gets all role assignments for the subscription. -// -// filter is the filter to apply on the operation. Use $filter=atScope() to return all role assignments at or above -// the scope. Use $filter=principalId eq {id} to return all role assignments at, above or below the scope for the -// specified principal. +// Parameters: +// filter - the filter to apply on the operation. Use $filter=atScope() to return all role assignments at or +// above the scope. Use $filter=principalId eq {id} to return all role assignments at, above or below the scope +// for the specified principal. func (client RoleAssignmentsClient) List(ctx context.Context, filter string) (result RoleAssignmentListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, filter) @@ -547,12 +549,15 @@ func (client RoleAssignmentsClient) ListComplete(ctx context.Context, filter str } // ListForResource gets role assignments for a resource. -// -// resourceGroupName is the name of the resource group. resourceProviderNamespace is the namespace of the resource -// provider. parentResourcePath is the parent resource identity. resourceType is the resource type of the resource. -// resourceName is the name of the resource to get role assignments for. filter is the filter to apply on the -// operation. Use $filter=atScope() to return all role assignments at or above the scope. Use $filter=principalId -// eq {id} to return all role assignments at, above or below the scope for the specified principal. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceProviderNamespace - the namespace of the resource provider. +// parentResourcePath - the parent resource identity. +// resourceType - the resource type of the resource. +// resourceName - the name of the resource to get role assignments for. +// filter - the filter to apply on the operation. Use $filter=atScope() to return all role assignments at or +// above the scope. Use $filter=principalId eq {id} to return all role assignments at, above or below the scope +// for the specified principal. func (client RoleAssignmentsClient) ListForResource(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string, filter string) (result RoleAssignmentListResultPage, err error) { result.fn = client.listForResourceNextResults req, err := client.ListForResourcePreparer(ctx, resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName, filter) @@ -651,10 +656,11 @@ func (client RoleAssignmentsClient) ListForResourceComplete(ctx context.Context, } // ListForResourceGroup gets role assignments for a resource group. -// -// resourceGroupName is the name of the resource group. filter is the filter to apply on the operation. Use -// $filter=atScope() to return all role assignments at or above the scope. Use $filter=principalId eq {id} to -// return all role assignments at, above or below the scope for the specified principal. +// Parameters: +// resourceGroupName - the name of the resource group. +// filter - the filter to apply on the operation. Use $filter=atScope() to return all role assignments at or +// above the scope. Use $filter=principalId eq {id} to return all role assignments at, above or below the scope +// for the specified principal. func (client RoleAssignmentsClient) ListForResourceGroup(ctx context.Context, resourceGroupName string, filter string) (result RoleAssignmentListResultPage, err error) { result.fn = client.listForResourceGroupNextResults req, err := client.ListForResourceGroupPreparer(ctx, resourceGroupName, filter) @@ -749,10 +755,11 @@ func (client RoleAssignmentsClient) ListForResourceGroupComplete(ctx context.Con } // ListForScope gets role assignments for a scope. -// -// scope is the scope of the role assignments. filter is the filter to apply on the operation. Use -// $filter=atScope() to return all role assignments at or above the scope. Use $filter=principalId eq {id} to -// return all role assignments at, above or below the scope for the specified principal. +// Parameters: +// scope - the scope of the role assignments. +// filter - the filter to apply on the operation. Use $filter=atScope() to return all role assignments at or +// above the scope. Use $filter=principalId eq {id} to return all role assignments at, above or below the scope +// for the specified principal. func (client RoleAssignmentsClient) ListForScope(ctx context.Context, scope string, filter string) (result RoleAssignmentListResultPage, err error) { result.fn = client.listForScopeNextResults req, err := client.ListForScopePreparer(ctx, scope, filter) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roledefinitions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roledefinitions.go index dd90e819f46a..a5e5afd5a721 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roledefinitions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roledefinitions.go @@ -43,9 +43,10 @@ func NewRoleDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) } // CreateOrUpdate creates or updates a role definition. -// -// scope is the scope of the role definition. roleDefinitionID is the ID of the role definition. roleDefinition is -// the values for the role definition. +// Parameters: +// scope - the scope of the role definition. +// roleDefinitionID - the ID of the role definition. +// roleDefinition - the values for the role definition. func (client RoleDefinitionsClient) CreateOrUpdate(ctx context.Context, scope string, roleDefinitionID string, roleDefinition RoleDefinition) (result RoleDefinition, err error) { req, err := client.CreateOrUpdatePreparer(ctx, scope, roleDefinitionID, roleDefinition) if err != nil { @@ -111,8 +112,9 @@ func (client RoleDefinitionsClient) CreateOrUpdateResponder(resp *http.Response) } // Delete deletes a role definition. -// -// scope is the scope of the role definition. roleDefinitionID is the ID of the role definition to delete. +// Parameters: +// scope - the scope of the role definition. +// roleDefinitionID - the ID of the role definition to delete. func (client RoleDefinitionsClient) Delete(ctx context.Context, scope string, roleDefinitionID string) (result RoleDefinition, err error) { req, err := client.DeletePreparer(ctx, scope, roleDefinitionID) if err != nil { @@ -176,8 +178,9 @@ func (client RoleDefinitionsClient) DeleteResponder(resp *http.Response) (result } // Get get role definition by name (GUID). -// -// scope is the scope of the role definition. roleDefinitionID is the ID of the role definition. +// Parameters: +// scope - the scope of the role definition. +// roleDefinitionID - the ID of the role definition. func (client RoleDefinitionsClient) Get(ctx context.Context, scope string, roleDefinitionID string) (result RoleDefinition, err error) { req, err := client.GetPreparer(ctx, scope, roleDefinitionID) if err != nil { @@ -241,8 +244,8 @@ func (client RoleDefinitionsClient) GetResponder(resp *http.Response) (result Ro } // GetByID gets a role definition by ID. -// -// roleDefinitionID is the fully qualified role definition ID. Use the format, +// Parameters: +// roleDefinitionID - the fully qualified role definition ID. Use the format, // /subscriptions/{guid}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId} for subscription // level role definitions, or /providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId} for tenant // level role definitions. @@ -308,9 +311,10 @@ func (client RoleDefinitionsClient) GetByIDResponder(resp *http.Response) (resul } // List get all role definitions that are applicable at scope and above. -// -// scope is the scope of the role definition. filter is the filter to apply on the operation. Use atScopeAndBelow -// filter to search below the given scope as well. +// Parameters: +// scope - the scope of the role definition. +// filter - the filter to apply on the operation. Use atScopeAndBelow filter to search below the given scope as +// well. func (client RoleDefinitionsClient) List(ctx context.Context, scope string, filter string) (result RoleDefinitionListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, scope, filter) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/dscconfiguration.go b/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/dscconfiguration.go index 1f28f202cd34..bd6e51e2fa8e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/dscconfiguration.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/dscconfiguration.go @@ -19,11 +19,10 @@ package automation import ( "context" - "net/http" - "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/validation" + "net/http" ) // DscConfigurationClient is the automation Client @@ -450,8 +449,9 @@ func (client DscConfigurationClient) ListByAutomationAccountComplete(ctx context // Update create the configuration identified by configuration name. // -// automationAccountName is the automation account name. configurationName is the create or update parameters for -// configuration. parameters is the create or update parameters for configuration. +// resourceGroupName is the resource group name. automationAccountName is the automation account name. +// configurationName is the create or update parameters for configuration. parameters is the create or update +// parameters for configuration. func (client DscConfigurationClient) Update(ctx context.Context, resourceGroupName string, automationAccountName string, configurationName string, parameters *DscConfigurationUpdateParameters) (result DscConfiguration, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/keys.go b/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/keys.go index c134e82cb5f7..2f3b9cac4a0d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/keys.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/keys.go @@ -19,11 +19,10 @@ package automation import ( "context" - "net/http" - "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/validation" + "net/http" ) // KeysClient is the automation Client @@ -43,7 +42,7 @@ func NewKeysClientWithBaseURI(baseURI string, subscriptionID string) KeysClient // ListByAutomationAccount retrieve the automation keys for an account. // -// automationAccountName is the automation account name. +// resourceGroupName is the resource group name. automationAccountName is the automation account name. func (client KeysClient) ListByAutomationAccount(ctx context.Context, resourceGroupName string, automationAccountName string) (result KeyListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -75,8 +74,8 @@ func (client KeysClient) ListByAutomationAccount(ctx context.Context, resourceGr // ListByAutomationAccountPreparer prepares the ListByAutomationAccount request. func (client KeysClient) ListByAutomationAccountPreparer(ctx context.Context, resourceGroupName string, automationAccountName string) (*http.Request, error) { pathParameters := map[string]interface{}{ - "resourceGroupName": autorest.Encode("path", resourceGroupName), "automationAccountName": autorest.Encode("path", automationAccountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), "subscriptionId": autorest.Encode("path", client.SubscriptionID), } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/models.go index 240df47a9a14..dcdd6f820004 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/models.go @@ -5654,7 +5654,7 @@ type RunbookDraftPublishFuture struct { // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RunbookDraftPublishFuture) Result(client RunbookDraftClient) (ar autorest.Response, err error) { +func (future RunbookDraftPublishFuture) Result(client RunbookDraftClient) (s String, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -5662,10 +5662,10 @@ func (future RunbookDraftPublishFuture) Result(client RunbookDraftClient) (ar au return } if !done { - return ar, azure.NewAsyncOpIncompleteError("automation.RunbookDraftPublishFuture") + return s, azure.NewAsyncOpIncompleteError("automation.RunbookDraftPublishFuture") } if future.PollingMethod() == azure.PollingLocation { - ar, err = client.PublishResponder(future.Response()) + s, err = client.PublishResponder(future.Response()) if err != nil { err = autorest.NewErrorWithError(err, "automation.RunbookDraftPublishFuture", "Result", future.Response(), "Failure responding to request") } @@ -5687,7 +5687,7 @@ func (future RunbookDraftPublishFuture) Result(client RunbookDraftClient) (ar au err = autorest.NewErrorWithError(err, "automation.RunbookDraftPublishFuture", "Result", resp, "Failure sending request") return } - ar, err = client.PublishResponder(resp) + s, err = client.PublishResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "automation.RunbookDraftPublishFuture", "Result", resp, "Failure responding to request") } @@ -5703,7 +5703,7 @@ type RunbookDraftReplaceContentFuture struct { // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RunbookDraftReplaceContentFuture) Result(client RunbookDraftClient) (ar autorest.Response, err error) { +func (future RunbookDraftReplaceContentFuture) Result(client RunbookDraftClient) (s String, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -5711,10 +5711,10 @@ func (future RunbookDraftReplaceContentFuture) Result(client RunbookDraftClient) return } if !done { - return ar, azure.NewAsyncOpIncompleteError("automation.RunbookDraftReplaceContentFuture") + return s, azure.NewAsyncOpIncompleteError("automation.RunbookDraftReplaceContentFuture") } if future.PollingMethod() == azure.PollingLocation { - ar, err = client.ReplaceContentResponder(future.Response()) + s, err = client.ReplaceContentResponder(future.Response()) if err != nil { err = autorest.NewErrorWithError(err, "automation.RunbookDraftReplaceContentFuture", "Result", future.Response(), "Failure responding to request") } @@ -5736,7 +5736,7 @@ func (future RunbookDraftReplaceContentFuture) Result(client RunbookDraftClient) err = autorest.NewErrorWithError(err, "automation.RunbookDraftReplaceContentFuture", "Result", resp, "Failure sending request") return } - ar, err = client.ReplaceContentResponder(resp) + s, err = client.ReplaceContentResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "automation.RunbookDraftReplaceContentFuture", "Result", resp, "Failure responding to request") } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/runbookdraft.go b/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/runbookdraft.go index b1bcf9e2ef5c..4bc9805d5944 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/runbookdraft.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation/runbookdraft.go @@ -253,13 +253,14 @@ func (client RunbookDraftClient) PublishSender(req *http.Request) (future Runboo // PublishResponder handles the response to the Publish request. The method always // closes the http.Response Body. -func (client RunbookDraftClient) PublishResponder(resp *http.Response) (result autorest.Response, err error) { +func (client RunbookDraftClient) PublishResponder(resp *http.Response) (result String, err error) { err = autorest.Respond( resp, client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) - result.Response = resp + result.Response = autorest.Response{Response: resp} return } @@ -330,13 +331,14 @@ func (client RunbookDraftClient) ReplaceContentSender(req *http.Request) (future // ReplaceContentResponder handles the response to the ReplaceContent request. The method always // closes the http.Response Body. -func (client RunbookDraftClient) ReplaceContentResponder(resp *http.Response) (result autorest.Response, err error) { +func (client RunbookDraftClient) ReplaceContentResponder(resp *http.Response) (result String, err error) { err = autorest.Respond( resp, client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) - result.Response = resp + result.Response = autorest.Response{Response: resp} return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/client.go index 71684216b603..033c6e204dd1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/client.go @@ -57,8 +57,8 @@ func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { // CheckNameAvailability check the availability of a resource name. This is needed for resources where name is globally // unique, such as a CDN endpoint. -// -// checkNameAvailabilityInput is input to check. +// Parameters: +// checkNameAvailabilityInput - input to check. func (client BaseClient) CheckNameAvailability(ctx context.Context, checkNameAvailabilityInput CheckNameAvailabilityInput) (result CheckNameAvailabilityOutput, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: checkNameAvailabilityInput, @@ -128,8 +128,8 @@ func (client BaseClient) CheckNameAvailabilityResponder(resp *http.Response) (re // ValidateProbe check if the probe path is a valid path and the file can be accessed. Probe path is the path to a file // hosted on the origin server to help accelerate the delivery of dynamic content via the CDN endpoint. This path is // relative to the origin path specified in the endpoint configuration. -// -// validateProbeInput is input to check. +// Parameters: +// validateProbeInput - input to check. func (client BaseClient) ValidateProbe(ctx context.Context, validateProbeInput ValidateProbeInput) (result ValidateProbeOutput, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: validateProbeInput, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/customdomains.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/customdomains.go index 72144d3a952d..2ac10acc2a3a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/customdomains.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/customdomains.go @@ -42,11 +42,12 @@ func NewCustomDomainsClientWithBaseURI(baseURI string, subscriptionID string) Cu } // Create creates a new custom domain within an endpoint. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. customDomainName is name of the custom domain within an endpoint. customDomainProperties is -// properties required to create a new custom domain. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. +// customDomainName - name of the custom domain within an endpoint. +// customDomainProperties - properties required to create a new custom domain. func (client CustomDomainsClient) Create(ctx context.Context, resourceGroupName string, profileName string, endpointName string, customDomainName string, customDomainProperties CustomDomainParameters) (result CustomDomainsCreateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -128,10 +129,11 @@ func (client CustomDomainsClient) CreateResponder(resp *http.Response) (result C } // Delete deletes an existing custom domain within an endpoint. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. customDomainName is name of the custom domain within an endpoint. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. +// customDomainName - name of the custom domain within an endpoint. func (client CustomDomainsClient) Delete(ctx context.Context, resourceGroupName string, profileName string, endpointName string, customDomainName string) (result CustomDomainsDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -208,10 +210,11 @@ func (client CustomDomainsClient) DeleteResponder(resp *http.Response) (result C } // DisableCustomHTTPS disable https delivery of the custom domain. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. customDomainName is name of the custom domain within an endpoint. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. +// customDomainName - name of the custom domain within an endpoint. func (client CustomDomainsClient) DisableCustomHTTPS(ctx context.Context, resourceGroupName string, profileName string, endpointName string, customDomainName string) (result CustomDomain, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -286,10 +289,11 @@ func (client CustomDomainsClient) DisableCustomHTTPSResponder(resp *http.Respons } // EnableCustomHTTPS enable https delivery of the custom domain. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. customDomainName is name of the custom domain within an endpoint. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. +// customDomainName - name of the custom domain within an endpoint. func (client CustomDomainsClient) EnableCustomHTTPS(ctx context.Context, resourceGroupName string, profileName string, endpointName string, customDomainName string) (result CustomDomain, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -364,10 +368,11 @@ func (client CustomDomainsClient) EnableCustomHTTPSResponder(resp *http.Response } // Get gets an exisitng custom domain within an endpoint. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. customDomainName is name of the custom domain within an endpoint. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. +// customDomainName - name of the custom domain within an endpoint. func (client CustomDomainsClient) Get(ctx context.Context, resourceGroupName string, profileName string, endpointName string, customDomainName string) (result CustomDomain, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -442,10 +447,10 @@ func (client CustomDomainsClient) GetResponder(resp *http.Response) (result Cust } // ListByEndpoint lists all of the existing custom domains within an endpoint. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. func (client CustomDomainsClient) ListByEndpoint(ctx context.Context, resourceGroupName string, profileName string, endpointName string) (result CustomDomainListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/endpoints.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/endpoints.go index 7f5f2db0764c..d47ac81a73b4 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/endpoints.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/endpoints.go @@ -43,10 +43,11 @@ func NewEndpointsClientWithBaseURI(baseURI string, subscriptionID string) Endpoi // Create creates a new CDN endpoint with the specified endpoint name under the specified subscription, resource group // and profile. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. endpoint is endpoint properties +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. +// endpoint - endpoint properties func (client EndpointsClient) Create(ctx context.Context, resourceGroupName string, profileName string, endpointName string, endpoint Endpoint) (result EndpointsCreateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -128,10 +129,10 @@ func (client EndpointsClient) CreateResponder(resp *http.Response) (result Endpo // Delete deletes an existing CDN endpoint with the specified endpoint name under the specified subscription, resource // group and profile. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. func (client EndpointsClient) Delete(ctx context.Context, resourceGroupName string, profileName string, endpointName string) (result EndpointsDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -207,10 +208,10 @@ func (client EndpointsClient) DeleteResponder(resp *http.Response) (result autor // Get gets an existing CDN endpoint with the specified endpoint name under the specified subscription, resource group // and profile. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. func (client EndpointsClient) Get(ctx context.Context, resourceGroupName string, profileName string, endpointName string) (result Endpoint, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -284,9 +285,9 @@ func (client EndpointsClient) GetResponder(resp *http.Response) (result Endpoint } // ListByProfile lists existing CDN endpoints. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. func (client EndpointsClient) ListByProfile(ctx context.Context, resourceGroupName string, profileName string) (result EndpointListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -387,10 +388,10 @@ func (client EndpointsClient) ListByProfileComplete(ctx context.Context, resourc } // ListResourceUsage checks the quota and usage of geo filters and custom domains under the given endpoint. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. func (client EndpointsClient) ListResourceUsage(ctx context.Context, resourceGroupName string, profileName string, endpointName string) (result ResourceUsageListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -492,10 +493,11 @@ func (client EndpointsClient) ListResourceUsageComplete(ctx context.Context, res } // LoadContent pre-loads a content to CDN. Available for Verizon Profiles. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. contentFilePaths is the path to the content to be loaded. Path should be a full URL, e.g. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. +// contentFilePaths - the path to the content to be loaded. Path should be a full URL, e.g. // ‘/pictires/city.png' which loads a single file func (client EndpointsClient) LoadContent(ctx context.Context, resourceGroupName string, profileName string, endpointName string, contentFilePaths LoadParameters) (result EndpointsLoadContentFuture, err error) { if err := validation.Validate([]validation.Validation{ @@ -575,12 +577,13 @@ func (client EndpointsClient) LoadContentResponder(resp *http.Response) (result } // PurgeContent removes a content from CDN. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. contentFilePaths is the path to the content to be purged. Path can be a full URL, e.g. -// '/pictures/city.png' which removes a single file, or a directory with a wildcard, e.g. '/pictures/*' which -// removes all folders and files in the directory. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. +// contentFilePaths - the path to the content to be purged. Path can be a full URL, e.g. '/pictures/city.png' +// which removes a single file, or a directory with a wildcard, e.g. '/pictures/*' which removes all folders +// and files in the directory. func (client EndpointsClient) PurgeContent(ctx context.Context, resourceGroupName string, profileName string, endpointName string, contentFilePaths PurgeParameters) (result EndpointsPurgeContentFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -659,10 +662,10 @@ func (client EndpointsClient) PurgeContentResponder(resp *http.Response) (result } // Start starts an existing CDN endpoint that is on a stopped state. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. func (client EndpointsClient) Start(ctx context.Context, resourceGroupName string, profileName string, endpointName string) (result EndpointsStartFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -738,10 +741,10 @@ func (client EndpointsClient) StartResponder(resp *http.Response) (result Endpoi } // Stop stops an existing running CDN endpoint. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. func (client EndpointsClient) Stop(ctx context.Context, resourceGroupName string, profileName string, endpointName string) (result EndpointsStopFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -819,10 +822,11 @@ func (client EndpointsClient) StopResponder(resp *http.Response) (result Endpoin // Update updates an existing CDN endpoint with the specified endpoint name under the specified subscription, resource // group and profile. Only tags and Origin HostHeader can be updated after creating an endpoint. To update origins, use // the Update Origin operation. To update custom domains, use the Update Custom Domain operation. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. endpointUpdateProperties is endpoint update properties +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. +// endpointUpdateProperties - endpoint update properties func (client EndpointsClient) Update(ctx context.Context, resourceGroupName string, profileName string, endpointName string, endpointUpdateProperties EndpointUpdateParameters) (result EndpointsUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -900,10 +904,11 @@ func (client EndpointsClient) UpdateResponder(resp *http.Response) (result Endpo } // ValidateCustomDomain validates the custom domain mapping to ensure it maps to the correct CDN endpoint in DNS. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. customDomainProperties is custom domain to be validated. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. +// customDomainProperties - custom domain to be validated. func (client EndpointsClient) ValidateCustomDomain(ctx context.Context, resourceGroupName string, profileName string, endpointName string, customDomainProperties ValidateCustomDomainInput) (result ValidateCustomDomainOutput, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/origins.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/origins.go index 227b43f9af8a..4cc1fd9c0c50 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/origins.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/origins.go @@ -42,10 +42,11 @@ func NewOriginsClientWithBaseURI(baseURI string, subscriptionID string) OriginsC } // Get gets an existing origin within an endpoint. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. originName is name of the origin which is unique within the endpoint. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. +// originName - name of the origin which is unique within the endpoint. func (client OriginsClient) Get(ctx context.Context, resourceGroupName string, profileName string, endpointName string, originName string) (result Origin, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -120,10 +121,10 @@ func (client OriginsClient) GetResponder(resp *http.Response) (result Origin, er } // ListByEndpoint lists all of the existing origins within an endpoint. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. func (client OriginsClient) ListByEndpoint(ctx context.Context, resourceGroupName string, profileName string, endpointName string) (result OriginListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -225,11 +226,12 @@ func (client OriginsClient) ListByEndpointComplete(ctx context.Context, resource } // Update updates an existing origin within an endpoint. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. endpointName is name of the endpoint under the profile which -// is unique globally. originName is name of the origin which is unique within the endpoint. originUpdateProperties -// is origin properties +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// endpointName - name of the endpoint under the profile which is unique globally. +// originName - name of the origin which is unique within the endpoint. +// originUpdateProperties - origin properties func (client OriginsClient) Update(ctx context.Context, resourceGroupName string, profileName string, endpointName string, originName string, originUpdateProperties OriginUpdateParameters) (result OriginsUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/profiles.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/profiles.go index 57531c889fa7..6bd15876408b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/profiles.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/profiles.go @@ -42,9 +42,10 @@ func NewProfilesClientWithBaseURI(baseURI string, subscriptionID string) Profile } // Create creates a new CDN profile with a profile name under the specified subscription and resource group. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. profile is profile properties needed to create a new profile. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// profile - profile properties needed to create a new profile. func (client ProfilesClient) Create(ctx context.Context, resourceGroupName string, profileName string, profile Profile) (result ProfilesCreateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -124,9 +125,9 @@ func (client ProfilesClient) CreateResponder(resp *http.Response) (result Profil // Delete deletes an existing CDN profile with the specified parameters. Deleting a profile will result in the deletion // of all of the sub-resources including endpoints, origins and custom domains. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. func (client ProfilesClient) Delete(ctx context.Context, resourceGroupName string, profileName string) (result ProfilesDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -203,9 +204,9 @@ func (client ProfilesClient) DeleteResponder(resp *http.Response) (result autore // used to configure advanced feature capabilities that are not yet available in the Azure portal, such as core reports // in a standard profile; rules engine, advanced HTTP reports, and real-time stats and alerts in a premium profile. The // SSO URI changes approximately every 10 minutes. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. func (client ProfilesClient) GenerateSsoURI(ctx context.Context, resourceGroupName string, profileName string) (result SsoURI, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -278,9 +279,9 @@ func (client ProfilesClient) GenerateSsoURIResponder(resp *http.Response) (resul } // Get gets a CDN profile with the specified profile name under the specified subscription and resource group. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. func (client ProfilesClient) Get(ctx context.Context, resourceGroupName string, profileName string) (result Profile, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -443,8 +444,8 @@ func (client ProfilesClient) ListComplete(ctx context.Context) (result ProfileLi } // ListByResourceGroup lists all of the CDN profiles within a resource group. -// -// resourceGroupName is name of the Resource group within the Azure subscription. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. func (client ProfilesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ProfileListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -544,9 +545,9 @@ func (client ProfilesClient) ListByResourceGroupComplete(ctx context.Context, re } // ListResourceUsage checks the quota and actual usage of endpoints under the given CDN profile. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. func (client ProfilesClient) ListResourceUsage(ctx context.Context, resourceGroupName string, profileName string) (result ResourceUsageListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -648,9 +649,9 @@ func (client ProfilesClient) ListResourceUsageComplete(ctx context.Context, reso // ListSupportedOptimizationTypes gets the supported optimization types for the current profile. A user can create an // endpoint with an optimization type from the listed values. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. func (client ProfilesClient) ListSupportedOptimizationTypes(ctx context.Context, resourceGroupName string, profileName string) (result SupportedOptimizationTypesListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -724,10 +725,10 @@ func (client ProfilesClient) ListSupportedOptimizationTypesResponder(resp *http. // Update updates an existing CDN profile with the specified profile name under the specified subscription and resource // group. -// -// resourceGroupName is name of the Resource group within the Azure subscription. profileName is name of the CDN -// profile which is unique within the resource group. profileUpdateParameters is profile properties needed to -// update an existing profile. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// profileName - name of the CDN profile which is unique within the resource group. +// profileUpdateParameters - profile properties needed to update an existing profile. func (client ProfilesClient) Update(ctx context.Context, resourceGroupName string, profileName string, profileUpdateParameters ProfileUpdateParameters) (result ProfilesUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/client.go index 09c33225fe2f..b76c496f31ac 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/client.go @@ -29,6 +29,7 @@ const ( DefaultBaseURI = "https://management.azure.com" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // BaseClient is the base client for Containerinstance. type BaseClient struct { autorest.Client @@ -36,11 +37,13 @@ type BaseClient struct { SubscriptionID string } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // New creates an instance of the BaseClient client. func New(subscriptionID string) BaseClient { return NewWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewWithBaseURI creates an instance of the BaseClient client. func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { return BaseClient{ diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroups.go index 71daef48f029..485f65477681 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroups.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupsClient is the client for the ContainerGroups methods of the Containerinstance service. type ContainerGroupsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewContainerGroupsClient creates an instance of the ContainerGroupsClient client. func NewContainerGroupsClient(subscriptionID string) ContainerGroupsClient { return NewContainerGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewContainerGroupsClientWithBaseURI creates an instance of the ContainerGroupsClient client. func NewContainerGroupsClientWithBaseURI(baseURI string, subscriptionID string) ContainerGroupsClient { return ContainerGroupsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // CreateOrUpdate create or update container groups with specified configurations. // // resourceGroupName is the name of the resource group. containerGroupName is the name of the container group. @@ -72,6 +76,7 @@ func (client ContainerGroupsClient) CreateOrUpdate(ctx context.Context, resource return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ContainerGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, containerGroupName string, containerGroup ContainerGroup) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,6 +100,7 @@ func (client ContainerGroupsClient) CreateOrUpdatePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) CreateOrUpdateSender(req *http.Request) (future ContainerGroupsCreateOrUpdateFuture, err error) { @@ -110,6 +116,7 @@ func (client ContainerGroupsClient) CreateOrUpdateSender(req *http.Request) (fut return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ContainerGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result ContainerGroup, err error) { @@ -123,6 +130,7 @@ func (client ContainerGroupsClient) CreateOrUpdateResponder(resp *http.Response) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Delete delete the specified container group in the specified subscription and resource group. The operation does not // delete other resources provided by the user, such as volumes. // @@ -149,6 +157,7 @@ func (client ContainerGroupsClient) Delete(ctx context.Context, resourceGroupNam return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // DeletePreparer prepares the Delete request. func (client ContainerGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, containerGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -170,6 +179,7 @@ func (client ContainerGroupsClient) DeletePreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -177,6 +187,7 @@ func (client ContainerGroupsClient) DeleteSender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ContainerGroupsClient) DeleteResponder(resp *http.Response) (result ContainerGroup, err error) { @@ -190,6 +201,7 @@ func (client ContainerGroupsClient) DeleteResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Get gets the properties of the specified container group in the specified subscription and resource group. The // operation returns the properties of each container group including containers, image registry credentials, restart // policy, IP address type, OS type, state, and volumes. @@ -217,6 +229,7 @@ func (client ContainerGroupsClient) Get(ctx context.Context, resourceGroupName s return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // GetPreparer prepares the Get request. func (client ContainerGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, containerGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -238,6 +251,7 @@ func (client ContainerGroupsClient) GetPreparer(ctx context.Context, resourceGro return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -245,6 +259,7 @@ func (client ContainerGroupsClient) GetSender(req *http.Request) (*http.Response azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ContainerGroupsClient) GetResponder(resp *http.Response) (result ContainerGroup, err error) { @@ -258,6 +273,7 @@ func (client ContainerGroupsClient) GetResponder(resp *http.Response) (result Co return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // List get a list of container groups in the specified subscription. This operation returns properties of each // container group including containers, image registry credentials, restart policy, IP address type, OS type, state, // and volumes. @@ -284,6 +300,7 @@ func (client ContainerGroupsClient) List(ctx context.Context) (result ContainerG return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListPreparer prepares the List request. func (client ContainerGroupsClient) ListPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -303,6 +320,7 @@ func (client ContainerGroupsClient) ListPreparer(ctx context.Context) (*http.Req return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -310,6 +328,7 @@ func (client ContainerGroupsClient) ListSender(req *http.Request) (*http.Respons azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client ContainerGroupsClient) ListResponder(resp *http.Response) (result ContainerGroupListResult, err error) { @@ -344,12 +363,14 @@ func (client ContainerGroupsClient) listNextResults(lastResults ContainerGroupLi return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListComplete enumerates all values, automatically crossing page boundaries as required. func (client ContainerGroupsClient) ListComplete(ctx context.Context) (result ContainerGroupListResultIterator, err error) { result.page, err = client.List(ctx) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListByResourceGroup get a list of container groups in a specified subscription and resource group. This operation // returns properties of each container group including containers, image registry credentials, restart policy, IP // address type, OS type, state, and volumes. @@ -378,6 +399,7 @@ func (client ContainerGroupsClient) ListByResourceGroup(ctx context.Context, res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client ContainerGroupsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -398,6 +420,7 @@ func (client ContainerGroupsClient) ListByResourceGroupPreparer(ctx context.Cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -405,6 +428,7 @@ func (client ContainerGroupsClient) ListByResourceGroupSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client ContainerGroupsClient) ListByResourceGroupResponder(resp *http.Response) (result ContainerGroupListResult, err error) { @@ -439,12 +463,14 @@ func (client ContainerGroupsClient) listByResourceGroupNextResults(lastResults C return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. func (client ContainerGroupsClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result ContainerGroupListResultIterator, err error) { result.page, err = client.ListByResourceGroup(ctx, resourceGroupName) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Update updates container group tags with specified values. // // resourceGroupName is the name of the resource group. containerGroupName is the name of the container group. @@ -471,6 +497,7 @@ func (client ContainerGroupsClient) Update(ctx context.Context, resourceGroupNam return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UpdatePreparer prepares the Update request. func (client ContainerGroupsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, containerGroupName string, resource Resource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -494,6 +521,7 @@ func (client ContainerGroupsClient) UpdatePreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -501,6 +529,7 @@ func (client ContainerGroupsClient) UpdateSender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client ContainerGroupsClient) UpdateResponder(resp *http.Response) (result ContainerGroup, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroupusage.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroupusage.go index 1fc903603273..a75432e4e1d2 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroupusage.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroupusage.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupUsageClient is the client for the ContainerGroupUsage methods of the Containerinstance service. type ContainerGroupUsageClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewContainerGroupUsageClient creates an instance of the ContainerGroupUsageClient client. func NewContainerGroupUsageClient(subscriptionID string) ContainerGroupUsageClient { return NewContainerGroupUsageClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewContainerGroupUsageClientWithBaseURI creates an instance of the ContainerGroupUsageClient client. func NewContainerGroupUsageClientWithBaseURI(baseURI string, subscriptionID string) ContainerGroupUsageClient { return ContainerGroupUsageClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // List get the usage for a subscription // // location is the identifier for the physical azure location. @@ -64,6 +68,7 @@ func (client ContainerGroupUsageClient) List(ctx context.Context, location strin return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListPreparer prepares the List request. func (client ContainerGroupUsageClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -84,6 +89,7 @@ func (client ContainerGroupUsageClient) ListPreparer(ctx context.Context, locati return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupUsageClient) ListSender(req *http.Request) (*http.Response, error) { @@ -91,6 +97,7 @@ func (client ContainerGroupUsageClient) ListSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client ContainerGroupUsageClient) ListResponder(resp *http.Response) (result UsageListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containerlogs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containerlogs.go index 1ef717fa64e0..794f39a193cc 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containerlogs.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containerlogs.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerLogsClient is the client for the ContainerLogs methods of the Containerinstance service. type ContainerLogsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewContainerLogsClient creates an instance of the ContainerLogsClient client. func NewContainerLogsClient(subscriptionID string) ContainerLogsClient { return NewContainerLogsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewContainerLogsClientWithBaseURI creates an instance of the ContainerLogsClient client. func NewContainerLogsClientWithBaseURI(baseURI string, subscriptionID string) ContainerLogsClient { return ContainerLogsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // List get the logs for a specified container instance in a specified resource group and container group. // // resourceGroupName is the name of the resource group. containerGroupName is the name of the container group. @@ -66,6 +70,7 @@ func (client ContainerLogsClient) List(ctx context.Context, resourceGroupName st return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListPreparer prepares the List request. func (client ContainerLogsClient) ListPreparer(ctx context.Context, resourceGroupName string, containerGroupName string, containerName string, tail *int32) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -91,6 +96,7 @@ func (client ContainerLogsClient) ListPreparer(ctx context.Context, resourceGrou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client ContainerLogsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -98,6 +104,7 @@ func (client ContainerLogsClient) ListSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client ContainerLogsClient) ListResponder(resp *http.Response) (result Logs, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/models.go index a68957c7e977..c6f73c8c6df3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/models.go @@ -26,6 +26,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupNetworkProtocol enumerates the values for container group network protocol. type ContainerGroupNetworkProtocol string @@ -36,11 +37,13 @@ const ( UDP ContainerGroupNetworkProtocol = "UDP" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // PossibleContainerGroupNetworkProtocolValues returns an array of possible values for the ContainerGroupNetworkProtocol const type. func PossibleContainerGroupNetworkProtocolValues() []ContainerGroupNetworkProtocol { return []ContainerGroupNetworkProtocol{TCP, UDP} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupRestartPolicy enumerates the values for container group restart policy. type ContainerGroupRestartPolicy string @@ -53,11 +56,13 @@ const ( OnFailure ContainerGroupRestartPolicy = "OnFailure" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // PossibleContainerGroupRestartPolicyValues returns an array of possible values for the ContainerGroupRestartPolicy const type. func PossibleContainerGroupRestartPolicyValues() []ContainerGroupRestartPolicy { return []ContainerGroupRestartPolicy{Always, Never, OnFailure} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerNetworkProtocol enumerates the values for container network protocol. type ContainerNetworkProtocol string @@ -68,11 +73,13 @@ const ( ContainerNetworkProtocolUDP ContainerNetworkProtocol = "UDP" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // PossibleContainerNetworkProtocolValues returns an array of possible values for the ContainerNetworkProtocol const type. func PossibleContainerNetworkProtocolValues() []ContainerNetworkProtocol { return []ContainerNetworkProtocol{ContainerNetworkProtocolTCP, ContainerNetworkProtocolUDP} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // OperatingSystemTypes enumerates the values for operating system types. type OperatingSystemTypes string @@ -83,11 +90,13 @@ const ( Windows OperatingSystemTypes = "Windows" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // PossibleOperatingSystemTypesValues returns an array of possible values for the OperatingSystemTypes const type. func PossibleOperatingSystemTypesValues() []OperatingSystemTypes { return []OperatingSystemTypes{Linux, Windows} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // OperationsOrigin enumerates the values for operations origin. type OperationsOrigin string @@ -98,11 +107,13 @@ const ( User OperationsOrigin = "User" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // PossibleOperationsOriginValues returns an array of possible values for the OperationsOrigin const type. func PossibleOperationsOriginValues() []OperationsOrigin { return []OperationsOrigin{System, User} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // AzureFileVolume the properties of the Azure File volume. Azure File shares are mounted as volumes. type AzureFileVolume struct { // ShareName - The name of the Azure File share to be mounted as a volume. @@ -115,6 +126,7 @@ type AzureFileVolume struct { StorageAccountKey *string `json:"storageAccountKey,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Container a container instance. type Container struct { // Name - The user-provided name of the container instance. @@ -123,6 +135,7 @@ type Container struct { *ContainerProperties `json:"properties,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // MarshalJSON is the custom marshaler for Container. func (c Container) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -135,6 +148,7 @@ func (c Container) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UnmarshalJSON is the custom unmarshaler for Container struct. func (c *Container) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -168,6 +182,7 @@ func (c *Container) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerExecRequest the start container exec request. type ContainerExecRequest struct { // Command - The command to be executed. @@ -176,6 +191,7 @@ type ContainerExecRequest struct { TerminalSize *ContainerExecRequestTerminalSize `json:"terminalSize,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerExecRequestTerminalSize the size of the terminal. type ContainerExecRequestTerminalSize struct { // Rows - The row size of the terminal @@ -184,6 +200,7 @@ type ContainerExecRequestTerminalSize struct { Cols *int32 `json:"cols,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerExecResponse the information for the container exec command. type ContainerExecResponse struct { autorest.Response `json:"-"` @@ -193,6 +210,7 @@ type ContainerExecResponse struct { Password *string `json:"password,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroup a container group. type ContainerGroup struct { autorest.Response `json:"-"` @@ -209,6 +227,7 @@ type ContainerGroup struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // MarshalJSON is the custom marshaler for ContainerGroup. func (cg ContainerGroup) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -233,6 +252,7 @@ func (cg ContainerGroup) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UnmarshalJSON is the custom unmarshaler for ContainerGroup struct. func (cg *ContainerGroup) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -302,6 +322,7 @@ func (cg *ContainerGroup) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupListResult the container group list response that contains the container group properties. type ContainerGroupListResult struct { autorest.Response `json:"-"` @@ -311,12 +332,14 @@ type ContainerGroupListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupListResultIterator provides access to a complete listing of ContainerGroup values. type ContainerGroupListResultIterator struct { i int page ContainerGroupListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *ContainerGroupListResultIterator) Next() error { @@ -333,16 +356,19 @@ func (iter *ContainerGroupListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter ContainerGroupListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Response returns the raw server response from the last page request. func (iter ContainerGroupListResultIterator) Response() ContainerGroupListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter ContainerGroupListResultIterator) Value() ContainerGroup { @@ -352,6 +378,7 @@ func (iter ContainerGroupListResultIterator) Value() ContainerGroup { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // IsEmpty returns true if the ListResult contains no values. func (cglr ContainerGroupListResult) IsEmpty() bool { return cglr.Value == nil || len(*cglr.Value) == 0 @@ -369,12 +396,14 @@ func (cglr ContainerGroupListResult) containerGroupListResultPreparer() (*http.R autorest.WithBaseURL(to.String(cglr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupListResultPage contains a page of ContainerGroup values. type ContainerGroupListResultPage struct { fn func(ContainerGroupListResult) (ContainerGroupListResult, error) cglr ContainerGroupListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *ContainerGroupListResultPage) Next() error { @@ -386,16 +415,19 @@ func (page *ContainerGroupListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page ContainerGroupListResultPage) NotDone() bool { return !page.cglr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Response returns the raw server response from the last page request. func (page ContainerGroupListResultPage) Response() ContainerGroupListResult { return page.cglr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Values returns the slice of values for the current page or nil if there are no values. func (page ContainerGroupListResultPage) Values() []ContainerGroup { if page.cglr.IsEmpty() { @@ -404,6 +436,7 @@ func (page ContainerGroupListResultPage) Values() []ContainerGroup { return *page.cglr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupProperties ... type ContainerGroupProperties struct { // ProvisioningState - The provisioning state of the container group. This only appears in the response. @@ -428,6 +461,7 @@ type ContainerGroupProperties struct { InstanceView *ContainerGroupPropertiesInstanceView `json:"instanceView,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupPropertiesInstanceView the instance view of the container group. Only valid in response. type ContainerGroupPropertiesInstanceView struct { // Events - The events of this container group. @@ -436,6 +470,7 @@ type ContainerGroupPropertiesInstanceView struct { State *string `json:"state,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ContainerGroupsCreateOrUpdateFuture struct { @@ -443,6 +478,7 @@ type ContainerGroupsCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ContainerGroupsCreateOrUpdateFuture) Result(client ContainerGroupsClient) (cg ContainerGroup, err error) { @@ -485,6 +521,7 @@ func (future ContainerGroupsCreateOrUpdateFuture) Result(client ContainerGroupsC return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerPort the port exposed on the container instance. type ContainerPort struct { // Protocol - The protocol associated with the port. Possible values include: 'ContainerNetworkProtocolTCP', 'ContainerNetworkProtocolUDP' @@ -493,6 +530,7 @@ type ContainerPort struct { Port *int32 `json:"port,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerProperties the container instance properties. type ContainerProperties struct { // Image - The name of the image used to create the container instance. @@ -511,6 +549,7 @@ type ContainerProperties struct { VolumeMounts *[]VolumeMount `json:"volumeMounts,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerPropertiesInstanceView the instance view of the container instance. Only valid in response. type ContainerPropertiesInstanceView struct { // RestartCount - The number of times that the container instance has been restarted. @@ -523,6 +562,7 @@ type ContainerPropertiesInstanceView struct { Events *[]Event `json:"events,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerState the container instance state. type ContainerState struct { // State - The state of the container instance. @@ -537,6 +577,7 @@ type ContainerState struct { DetailStatus *string `json:"detailStatus,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // EnvironmentVariable the environment variable to set within the container instance. type EnvironmentVariable struct { // Name - The name of the environment variable. @@ -545,6 +586,7 @@ type EnvironmentVariable struct { Value *string `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Event a container group or container instance event. type Event struct { // Count - The count of the event. @@ -561,6 +603,7 @@ type Event struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // GitRepoVolume represents a volume that is populated with the contents of a git repository type GitRepoVolume struct { // Directory - Target directory name. Must not contain or start with '..'. If '.' is supplied, the volume directory will be the git repository. Otherwise, if specified, the volume will contain the git repository in the subdirectory with the given name. @@ -571,6 +614,7 @@ type GitRepoVolume struct { Revision *string `json:"revision,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ImageRegistryCredential image registry credential. type ImageRegistryCredential struct { // Server - The Docker image registry server without a protocol such as "http" and "https". @@ -581,6 +625,7 @@ type ImageRegistryCredential struct { Password *string `json:"password,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // IPAddress IP address for the container group. type IPAddress struct { // Ports - The list of ports exposed on the container group. @@ -595,6 +640,7 @@ type IPAddress struct { Fqdn *string `json:"fqdn,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Logs the logs. type Logs struct { autorest.Response `json:"-"` @@ -602,6 +648,7 @@ type Logs struct { Content *string `json:"content,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Operation an operation for Azure Container Instance service. type Operation struct { // Name - The name of the operation. @@ -612,6 +659,7 @@ type Operation struct { Origin OperationsOrigin `json:"origin,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // OperationDisplay the display information of the operation. type OperationDisplay struct { // Provider - The name of the provider of the operation. @@ -624,6 +672,7 @@ type OperationDisplay struct { Description *string `json:"description,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // OperationListResult the operation list response that contains all operations for Azure Container Instance // service. type OperationListResult struct { @@ -634,6 +683,7 @@ type OperationListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Port the port exposed on the container group. type Port struct { // Protocol - The protocol associated with the port. Possible values include: 'TCP', 'UDP' @@ -642,6 +692,7 @@ type Port struct { Port *int32 `json:"port,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Resource the Resource model definition. type Resource struct { // ID - The resource id. @@ -656,6 +707,7 @@ type Resource struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // MarshalJSON is the custom marshaler for Resource. func (r Resource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -677,6 +729,7 @@ func (r Resource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ResourceLimits the resource limits. type ResourceLimits struct { // MemoryInGB - The memory limit in GB of this container instance. @@ -685,6 +738,7 @@ type ResourceLimits struct { CPU *float64 `json:"cpu,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ResourceRequests the resource requests. type ResourceRequests struct { // MemoryInGB - The memory request in GB of this container instance. @@ -693,6 +747,7 @@ type ResourceRequests struct { CPU *float64 `json:"cpu,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ResourceRequirements the resource requirements. type ResourceRequirements struct { // Requests - The resource requests of this container instance. @@ -701,6 +756,7 @@ type ResourceRequirements struct { Limits *ResourceLimits `json:"limits,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Usage a single usage result type Usage struct { // Unit - Unit of the usage result @@ -713,12 +769,14 @@ type Usage struct { Name *UsageName `json:"name,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UsageListResult the response containing the usage data type UsageListResult struct { autorest.Response `json:"-"` Value *[]Usage `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UsageName the name object of the resource type UsageName struct { // Value - The name of the resource @@ -727,6 +785,7 @@ type UsageName struct { LocalizedValue *string `json:"localizedValue,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Volume the properties of the volume. type Volume struct { // Name - The name of the volume. @@ -741,6 +800,7 @@ type Volume struct { GitRepo *GitRepoVolume `json:"gitRepo,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // MarshalJSON is the custom marshaler for Volume. func (vVar Volume) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -760,6 +820,7 @@ func (vVar Volume) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // VolumeMount the properties of the volume mount. type VolumeMount struct { // Name - The name of the volume mount. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/operations.go index 32ef1f5fc647..c95180c46294 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/operations.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // OperationsClient is the client for the Operations methods of the Containerinstance service. type OperationsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewOperationsClient creates an instance of the OperationsClient client. func NewOperationsClient(subscriptionID string) OperationsClient { return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // List list the operations for Azure Container Instance service. func (client OperationsClient) List(ctx context.Context) (result OperationListResult, err error) { req, err := client.ListPreparer(ctx) @@ -62,6 +66,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2018-02-01-preview" @@ -77,6 +82,7 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -84,6 +90,7 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/startcontainer.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/startcontainer.go index 7db3b7e32b3d..751cf72f5e34 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/startcontainer.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/startcontainer.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // StartContainerClient is the client for the StartContainer methods of the Containerinstance service. type StartContainerClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewStartContainerClient creates an instance of the StartContainerClient client. func NewStartContainerClient(subscriptionID string) StartContainerClient { return NewStartContainerClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewStartContainerClientWithBaseURI creates an instance of the StartContainerClient client. func NewStartContainerClientWithBaseURI(baseURI string, subscriptionID string) StartContainerClient { return StartContainerClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // LaunchExec starts the exec command for a specified container instance in a specified resource group and container // group. // @@ -66,6 +70,7 @@ func (client StartContainerClient) LaunchExec(ctx context.Context, resourceGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // LaunchExecPreparer prepares the LaunchExec request. func (client StartContainerClient) LaunchExecPreparer(ctx context.Context, resourceGroupName string, containerGroupName string, containerName string, containerExecRequest ContainerExecRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -90,6 +95,7 @@ func (client StartContainerClient) LaunchExecPreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // LaunchExecSender sends the LaunchExec request. The method will close the // http.Response Body if it receives an error. func (client StartContainerClient) LaunchExecSender(req *http.Request) (*http.Response, error) { @@ -97,6 +103,7 @@ func (client StartContainerClient) LaunchExecSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // LaunchExecResponder handles the response to the LaunchExec request. The method always // closes the http.Response Body. func (client StartContainerClient) LaunchExecResponder(resp *http.Response) (result ContainerExecResponse, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/version.go index 877004c00336..718810b207e5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/version.go @@ -18,12 +18,13 @@ import "github.com/Azure/azure-sdk-for-go/version" // // Code generated by Microsoft (R) AutoRest Code Generator. // Changes may cause incorrect behavior and will be lost if the code is regenerated. - +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { return "Azure-SDK-For-Go/" + version.Number + " containerinstance/2018-02-01-preview" } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Version returns the semantic version (see http://semver.org) of the client. func Version() string { return version.Number diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/models.go index 61c6cd67b3ce..4b16260110a6 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/models.go @@ -26,6 +26,21 @@ import ( "net/http" ) +// ImportMode enumerates the values for import mode. +type ImportMode string + +const ( + // Force ... + Force ImportMode = "Force" + // NoForce ... + NoForce ImportMode = "NoForce" +) + +// PossibleImportModeValues returns an array of possible values for the ImportMode const type. +func PossibleImportModeValues() []ImportMode { + return []ImportMode{Force, NoForce} +} + // PasswordName enumerates the values for password name. type PasswordName string @@ -382,6 +397,29 @@ func (erm EventResponseMessage) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// ImportImageParameters ... +type ImportImageParameters struct { + // Source - The source of the image. + Source *ImportSource `json:"source,omitempty"` + // TargetTags - List of strings of the form repo[:tag]. When tag is omitted the source will be used (or 'latest' if source tag is also omitted). + TargetTags *[]string `json:"targetTags,omitempty"` + // UntaggedTargetRepositories - List of strings of repository names to do a manifest only copy. No tag will be created. + UntaggedTargetRepositories *[]string `json:"untaggedTargetRepositories,omitempty"` + // Mode - When Force, any existing target tags will be overwritten. When NoForce, any existing target tags will fail the operation before any copying begins. Possible values include: 'NoForce', 'Force' + Mode ImportMode `json:"mode,omitempty"` +} + +// ImportSource ... +type ImportSource struct { + // ResourceID - The resource identifier of the target Azure Container Registry. + ResourceID *string `json:"resourceId,omitempty"` + // SourceImage - Repository name of the source image. + // Specify an image by repository ('hello-world'). This will use the 'latest' tag. + // Specify an image by tag ('hello-world:latest'). + // Specify an image by sha256-based manifest digest ('hello-world@sha256:abc123'). + SourceImage *string `json:"sourceImage,omitempty"` +} + // OperationDefinition the definition of a container registry operation. type OperationDefinition struct { // Name - Operation name: {provider}/{resource}/{operation}. @@ -606,6 +644,55 @@ func (future RegistriesDeleteFuture) Result(client RegistriesClient) (ar autores return } +// RegistriesImportImageFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type RegistriesImportImageFuture struct { + azure.Future + req *http.Request +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future RegistriesImportImageFuture) Result(client RegistriesClient) (ar autorest.Response, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "containerregistry.RegistriesImportImageFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + return ar, azure.NewAsyncOpIncompleteError("containerregistry.RegistriesImportImageFuture") + } + if future.PollingMethod() == azure.PollingLocation { + ar, err = client.ImportImageResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "containerregistry.RegistriesImportImageFuture", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "containerregistry.RegistriesImportImageFuture", "Result", resp, "Failure sending request") + return + } + ar, err = client.ImportImageResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "containerregistry.RegistriesImportImageFuture", "Result", resp, "Failure responding to request") + } + return +} + // RegistriesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type RegistriesUpdateFuture struct { azure.Future diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/registries.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/registries.go index 2157367e5390..e341c0e62252 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/registries.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/registries.go @@ -42,8 +42,8 @@ func NewRegistriesClientWithBaseURI(baseURI string, subscriptionID string) Regis // CheckNameAvailability checks whether the container registry name is available for use. The name must contain only // alphanumeric characters, be globally unique, and between 5 and 50 characters in length. -// -// registryNameCheckRequest is the object containing information for the availability request. +// Parameters: +// registryNameCheckRequest - the object containing information for the availability request. func (client RegistriesClient) CheckNameAvailability(ctx context.Context, registryNameCheckRequest RegistryNameCheckRequest) (result RegistryNameStatus, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryNameCheckRequest, @@ -119,9 +119,10 @@ func (client RegistriesClient) CheckNameAvailabilityResponder(resp *http.Respons } // Create creates a container registry with the specified parameters. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. registry is the parameters for creating a container registry. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// registry - the parameters for creating a container registry. func (client RegistriesClient) Create(ctx context.Context, resourceGroupName string, registryName string, registry Registry) (result RegistriesCreateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -204,9 +205,9 @@ func (client RegistriesClient) CreateResponder(resp *http.Response) (result Regi } // Delete deletes a container registry. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. func (client RegistriesClient) Delete(ctx context.Context, resourceGroupName string, registryName string) (result RegistriesDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -280,9 +281,9 @@ func (client RegistriesClient) DeleteResponder(resp *http.Response) (result auto } // Get gets the properties of the specified container registry. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. func (client RegistriesClient) Get(ctx context.Context, resourceGroupName string, registryName string) (result Registry, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -354,6 +355,90 @@ func (client RegistriesClient) GetResponder(resp *http.Response) (result Registr return } +// ImportImage copies an image to this container registry from the specified container registry. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// parameters - the parameters specifying the image to copy and the source container registry. +func (client RegistriesClient) ImportImage(ctx context.Context, resourceGroupName string, registryName string, parameters ImportImageParameters) (result RegistriesImportImageFuture, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: registryName, + Constraints: []validation.Constraint{{Target: "registryName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "registryName", Name: validation.MinLength, Rule: 5, Chain: nil}, + {Target: "registryName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9]*$`, Chain: nil}}}, + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.Source", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.Source.ResourceID", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "parameters.Source.SourceImage", Name: validation.Null, Rule: true, Chain: nil}, + }}}}}); err != nil { + return result, validation.NewError("containerregistry.RegistriesClient", "ImportImage", err.Error()) + } + + req, err := client.ImportImagePreparer(ctx, resourceGroupName, registryName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "containerregistry.RegistriesClient", "ImportImage", nil, "Failure preparing request") + return + } + + result, err = client.ImportImageSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "containerregistry.RegistriesClient", "ImportImage", result.Response(), "Failure sending request") + return + } + + return +} + +// ImportImagePreparer prepares the ImportImage request. +func (client RegistriesClient) ImportImagePreparer(ctx context.Context, resourceGroupName string, registryName string, parameters ImportImageParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "registryName": autorest.Encode("path", registryName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-10-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/importImage", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ImportImageSender sends the ImportImage request. The method will close the +// http.Response Body if it receives an error. +func (client RegistriesClient) ImportImageSender(req *http.Request) (future RegistriesImportImageFuture, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + return +} + +// ImportImageResponder handles the response to the ImportImage request. The method always +// closes the http.Response Body. +func (client RegistriesClient) ImportImageResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByClosing()) + result.Response = resp + return +} + // List lists all the container registries under the specified subscription. func (client RegistriesClient) List(ctx context.Context) (result RegistryListResultPage, err error) { result.fn = client.listNextResults @@ -445,8 +530,8 @@ func (client RegistriesClient) ListComplete(ctx context.Context) (result Registr } // ListByResourceGroup lists all the container registries under the specified resource group. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. func (client RegistriesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RegistryListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) @@ -538,9 +623,9 @@ func (client RegistriesClient) ListByResourceGroupComplete(ctx context.Context, } // ListCredentials lists the login credentials for the specified container registry. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. func (client RegistriesClient) ListCredentials(ctx context.Context, resourceGroupName string, registryName string) (result RegistryListCredentialsResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -613,9 +698,9 @@ func (client RegistriesClient) ListCredentialsResponder(resp *http.Response) (re } // ListUsages gets the quota usages for the specified container registry. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. func (client RegistriesClient) ListUsages(ctx context.Context, resourceGroupName string, registryName string) (result RegistryUsageListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -688,10 +773,11 @@ func (client RegistriesClient) ListUsagesResponder(resp *http.Response) (result } // RegenerateCredential regenerates one of the login credentials for the specified container registry. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. regenerateCredentialParameters is specifies name of the password which should be -// regenerated -- password or password2. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// regenerateCredentialParameters - specifies name of the password which should be regenerated -- password or +// password2. func (client RegistriesClient) RegenerateCredential(ctx context.Context, resourceGroupName string, registryName string, regenerateCredentialParameters RegenerateCredentialParameters) (result RegistryListCredentialsResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -766,9 +852,10 @@ func (client RegistriesClient) RegenerateCredentialResponder(resp *http.Response } // Update updates a container registry with the specified parameters. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. registryUpdateParameters is the parameters for updating a container registry. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// registryUpdateParameters - the parameters for updating a container registry. func (client RegistriesClient) Update(ctx context.Context, resourceGroupName string, registryName string, registryUpdateParameters RegistryUpdateParameters) (result RegistriesUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/replications.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/replications.go index 9bb5b87928db..dc05abe72d71 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/replications.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/replications.go @@ -41,10 +41,11 @@ func NewReplicationsClientWithBaseURI(baseURI string, subscriptionID string) Rep } // Create creates a replication for a container registry with the specified parameters. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. replicationName is the name of the replication. replication is the parameters -// for creating a replication. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// replicationName - the name of the replication. +// replication - the parameters for creating a replication. func (client ReplicationsClient) Create(ctx context.Context, resourceGroupName string, registryName string, replicationName string, replication Replication) (result ReplicationsCreateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -126,9 +127,10 @@ func (client ReplicationsClient) CreateResponder(resp *http.Response) (result Re } // Delete deletes a replication from a container registry. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. replicationName is the name of the replication. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// replicationName - the name of the replication. func (client ReplicationsClient) Delete(ctx context.Context, resourceGroupName string, registryName string, replicationName string) (result ReplicationsDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -207,9 +209,10 @@ func (client ReplicationsClient) DeleteResponder(resp *http.Response) (result au } // Get gets the properties of the specified replication. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. replicationName is the name of the replication. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// replicationName - the name of the replication. func (client ReplicationsClient) Get(ctx context.Context, resourceGroupName string, registryName string, replicationName string) (result Replication, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -287,9 +290,9 @@ func (client ReplicationsClient) GetResponder(resp *http.Response) (result Repli } // List lists all the replications for the specified container registry. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. func (client ReplicationsClient) List(ctx context.Context, resourceGroupName string, registryName string) (result ReplicationListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -390,10 +393,11 @@ func (client ReplicationsClient) ListComplete(ctx context.Context, resourceGroup } // Update updates a replication for a container registry with the specified parameters. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. replicationName is the name of the replication. replicationUpdateParameters is -// the parameters for updating a replication. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// replicationName - the name of the replication. +// replicationUpdateParameters - the parameters for updating a replication. func (client ReplicationsClient) Update(ctx context.Context, resourceGroupName string, registryName string, replicationName string, replicationUpdateParameters ReplicationUpdateParameters) (result ReplicationsUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/webhooks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/webhooks.go index 09eab0c91688..33b67fa2acc9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/webhooks.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/webhooks.go @@ -41,10 +41,11 @@ func NewWebhooksClientWithBaseURI(baseURI string, subscriptionID string) Webhook } // Create creates a webhook for a container registry with the specified parameters. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. webhookName is the name of the webhook. webhookCreateParameters is the -// parameters for creating a webhook. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// webhookName - the name of the webhook. +// webhookCreateParameters - the parameters for creating a webhook. func (client WebhooksClient) Create(ctx context.Context, resourceGroupName string, registryName string, webhookName string, webhookCreateParameters WebhookCreateParameters) (result WebhooksCreateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -132,9 +133,10 @@ func (client WebhooksClient) CreateResponder(resp *http.Response) (result Webhoo } // Delete deletes a webhook from a container registry. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. webhookName is the name of the webhook. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// webhookName - the name of the webhook. func (client WebhooksClient) Delete(ctx context.Context, resourceGroupName string, registryName string, webhookName string) (result WebhooksDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -213,9 +215,10 @@ func (client WebhooksClient) DeleteResponder(resp *http.Response) (result autore } // Get gets the properties of the specified webhook. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. webhookName is the name of the webhook. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// webhookName - the name of the webhook. func (client WebhooksClient) Get(ctx context.Context, resourceGroupName string, registryName string, webhookName string) (result Webhook, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -293,9 +296,10 @@ func (client WebhooksClient) GetResponder(resp *http.Response) (result Webhook, } // GetCallbackConfig gets the configuration of service URI and custom headers for the webhook. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. webhookName is the name of the webhook. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// webhookName - the name of the webhook. func (client WebhooksClient) GetCallbackConfig(ctx context.Context, resourceGroupName string, registryName string, webhookName string) (result CallbackConfig, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -373,9 +377,9 @@ func (client WebhooksClient) GetCallbackConfigResponder(resp *http.Response) (re } // List lists all the webhooks for the specified container registry. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. func (client WebhooksClient) List(ctx context.Context, resourceGroupName string, registryName string) (result WebhookListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -476,9 +480,10 @@ func (client WebhooksClient) ListComplete(ctx context.Context, resourceGroupName } // ListEvents lists recent events for the specified webhook. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. webhookName is the name of the webhook. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// webhookName - the name of the webhook. func (client WebhooksClient) ListEvents(ctx context.Context, resourceGroupName string, registryName string, webhookName string) (result EventListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -584,9 +589,10 @@ func (client WebhooksClient) ListEventsComplete(ctx context.Context, resourceGro } // Ping triggers a ping event to be sent to the webhook. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. webhookName is the name of the webhook. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// webhookName - the name of the webhook. func (client WebhooksClient) Ping(ctx context.Context, resourceGroupName string, registryName string, webhookName string) (result EventInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, @@ -664,10 +670,11 @@ func (client WebhooksClient) PingResponder(resp *http.Response) (result EventInf } // Update updates a webhook with the specified parameters. -// -// resourceGroupName is the name of the resource group to which the container registry belongs. registryName is the -// name of the container registry. webhookName is the name of the webhook. webhookUpdateParameters is the -// parameters for updating a webhook. +// Parameters: +// resourceGroupName - the name of the resource group to which the container registry belongs. +// registryName - the name of the container registry. +// webhookName - the name of the webhook. +// webhookUpdateParameters - the parameters for updating a webhook. func (client WebhooksClient) Update(ctx context.Context, resourceGroupName string, registryName string, webhookName string, webhookUpdateParameters WebhookUpdateParameters) (result WebhooksUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: registryName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/containerservices.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/containerservices.go index 574c4cb17f48..317b63851897 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/containerservices.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/containerservices.go @@ -42,10 +42,10 @@ func NewContainerServicesClientWithBaseURI(baseURI string, subscriptionID string // CreateOrUpdate creates or updates a container service with the specified configuration of orchestrator, 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. parameters is parameters supplied to the Create or Update a -// Container Service operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// containerServiceName - the name of the container service in the specified subscription and resource group. +// parameters - parameters supplied to the Create or Update a Container Service operation. func (client ContainerServicesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, containerServiceName string, parameters ContainerService) (result ContainerServicesCreateOrUpdateFutureType, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -151,9 +151,9 @@ func (client ContainerServicesClient) CreateOrUpdateResponder(resp *http.Respons // 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. -// -// resourceGroupName is the name of the resource group. containerServiceName is the name of the container service -// in the specified subscription and resource group. +// Parameters: +// resourceGroupName - the name of the resource group. +// containerServiceName - the name of the container service in the specified subscription and resource group. func (client ContainerServicesClient) Delete(ctx context.Context, resourceGroupName string, containerServiceName string) (result ContainerServicesDeleteFutureType, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, containerServiceName) if err != nil { @@ -221,9 +221,9 @@ func (client ContainerServicesClient) DeleteResponder(resp *http.Response) (resu // Get gets the properties of the specified container service in the specified subscription and resource group. The // operation returns the properties 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. +// Parameters: +// resourceGroupName - the name of the resource group. +// containerServiceName - the name of the container service in the specified subscription and resource group. func (client ContainerServicesClient) Get(ctx context.Context, resourceGroupName string, containerServiceName string) (result ContainerService, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, containerServiceName) if err != nil { @@ -381,8 +381,8 @@ func (client ContainerServicesClient) ListComplete(ctx context.Context) (result // ListByResourceGroup gets a list of container services in the specified subscription and resource group. The // operation returns properties of each container service including state, orchestrator, number of masters and agents, // and FQDNs of masters and agents. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client ContainerServicesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) @@ -475,9 +475,9 @@ func (client ContainerServicesClient) ListByResourceGroupComplete(ctx context.Co // ListOrchestrators gets a list of supported orchestrators in the specified subscription. The operation returns // properties of each orchestrator including verison and available upgrades. -// -// location is the name of a supported Azure region. resourceType is resource type for which the list of -// orchestrators needs to be returned +// Parameters: +// location - the name of a supported Azure region. +// resourceType - resource type for which the list of orchestrators needs to be returned func (client ContainerServicesClient) ListOrchestrators(ctx context.Context, location string, resourceType string) (result OrchestratorVersionProfileListResult, err error) { req, err := client.ListOrchestratorsPreparer(ctx, location, resourceType) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/managedclusters.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/managedclusters.go index ad1a847e8cfc..1e03bc6dc9c5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/managedclusters.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/managedclusters.go @@ -42,9 +42,10 @@ func NewManagedClustersClientWithBaseURI(baseURI string, subscriptionID string) // CreateOrUpdate creates or updates a managed cluster with the specified configuration for agents and Kubernetes // version. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the managed cluster resource. -// parameters is parameters supplied to the Create or Update a Managed Cluster operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the managed cluster resource. +// parameters - parameters supplied to the Create or Update a Managed Cluster operation. func (client ManagedClustersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, resourceName string, parameters ManagedCluster) (result ManagedClustersCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -133,8 +134,9 @@ func (client ManagedClustersClient) CreateOrUpdateResponder(resp *http.Response) } // Delete deletes the managed cluster with a specified resource group and name. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the managed cluster resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the managed cluster resource. func (client ManagedClustersClient) Delete(ctx context.Context, resourceGroupName string, resourceName string) (result ManagedClustersDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -200,8 +202,9 @@ func (client ManagedClustersClient) DeleteResponder(resp *http.Response) (result } // Get gets the details of the managed cluster with a specified resource group and name. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the managed cluster resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the managed cluster resource. func (client ManagedClustersClient) Get(ctx context.Context, resourceGroupName string, resourceName string) (result ManagedCluster, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -267,9 +270,10 @@ func (client ManagedClustersClient) GetResponder(resp *http.Response) (result Ma // GetAccessProfiles gets the accessProfile for the specified role name of the managed cluster with a specified // resource group and name. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the managed cluster resource. -// roleName is the name of the role for managed cluster accessProfile resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the managed cluster resource. +// roleName - the name of the role for managed cluster accessProfile resource. func (client ManagedClustersClient) GetAccessProfiles(ctx context.Context, resourceGroupName string, resourceName string, roleName string) (result ManagedClusterAccessProfile, err error) { req, err := client.GetAccessProfilesPreparer(ctx, resourceGroupName, resourceName, roleName) if err != nil { @@ -336,8 +340,9 @@ func (client ManagedClustersClient) GetAccessProfilesResponder(resp *http.Respon // GetUpgradeProfile gets the details of the upgrade profile for a managed cluster with a specified resource group and // name. -// -// resourceGroupName is the name of the resource group. resourceName is the name of the managed cluster resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the managed cluster resource. func (client ManagedClustersClient) GetUpgradeProfile(ctx context.Context, resourceGroupName string, resourceName string) (result ManagedClusterUpgradeProfile, err error) { req, err := client.GetUpgradeProfilePreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -494,8 +499,8 @@ func (client ManagedClustersClient) ListComplete(ctx context.Context) (result Ma // ListByResourceGroup lists managed clusters in the specified subscription and resource group. The operation returns // properties of each managed cluster. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client ManagedClustersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ManagedClusterListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collection.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collection.go index 03a00d8d9492..2fd8131f1cfa 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collection.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collection.go @@ -41,9 +41,11 @@ func NewCollectionClientWithBaseURI(baseURI string, subscriptionID string) Colle } // ListMetricDefinitions retrieves metric defintions for the given collection. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// databaseRid is cosmos DB database rid. collectionRid is cosmos DB collection rid. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// databaseRid - cosmos DB database rid. +// collectionRid - cosmos DB collection rid. func (client CollectionClient) ListMetricDefinitions(ctx context.Context, resourceGroupName string, accountName string, databaseRid string, collectionRid string) (result MetricDefinitionsListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -121,12 +123,14 @@ func (client CollectionClient) ListMetricDefinitionsResponder(resp *http.Respons } // ListMetrics retrieves the metrics determined by the given filter for the given database account and collection. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// databaseRid is cosmos DB database rid. collectionRid is cosmos DB collection rid. filter is an OData filter -// expression that describes a subset of metrics to return. The parameters that can be filtered are name.value -// (name of the metric, can have an or of multiple names), startTime, endTime, and timeGrain. The supported -// operator is eq. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// databaseRid - cosmos DB database rid. +// collectionRid - cosmos DB collection rid. +// filter - an OData filter expression that describes a subset of metrics to return. The parameters that can be +// filtered are name.value (name of the metric, can have an or of multiple names), startTime, endTime, and +// timeGrain. The supported operator is eq. func (client CollectionClient) ListMetrics(ctx context.Context, resourceGroupName string, accountName string, databaseRid string, collectionRid string, filter string) (result MetricListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -205,11 +209,13 @@ func (client CollectionClient) ListMetricsResponder(resp *http.Response) (result } // ListUsages retrieves the usages (most recent storage data) for the given collection. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// databaseRid is cosmos DB database rid. collectionRid is cosmos DB collection rid. filter is an OData filter -// expression that describes a subset of usages to return. The supported parameter is name.value (name of the -// metric, can have an or of multiple names). +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// databaseRid - cosmos DB database rid. +// collectionRid - cosmos DB collection rid. +// filter - an OData filter expression that describes a subset of usages to return. The supported parameter is +// name.value (name of the metric, can have an or of multiple names). func (client CollectionClient) ListUsages(ctx context.Context, resourceGroupName string, accountName string, databaseRid string, collectionRid string, filter string) (result UsagesResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collectionpartition.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collectionpartition.go index e895d340ce46..8c1aab2512af 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collectionpartition.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collectionpartition.go @@ -41,12 +41,14 @@ func NewCollectionPartitionClientWithBaseURI(baseURI string, subscriptionID stri } // ListMetrics retrieves the metrics determined by the given filter for the given collection, split by partition. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// databaseRid is cosmos DB database rid. collectionRid is cosmos DB collection rid. filter is an OData filter -// expression that describes a subset of metrics to return. The parameters that can be filtered are name.value -// (name of the metric, can have an or of multiple names), startTime, endTime, and timeGrain. The supported -// operator is eq. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// databaseRid - cosmos DB database rid. +// collectionRid - cosmos DB collection rid. +// filter - an OData filter expression that describes a subset of metrics to return. The parameters that can be +// filtered are name.value (name of the metric, can have an or of multiple names), startTime, endTime, and +// timeGrain. The supported operator is eq. func (client CollectionPartitionClient) ListMetrics(ctx context.Context, resourceGroupName string, accountName string, databaseRid string, collectionRid string, filter string) (result PartitionMetricListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -125,11 +127,13 @@ func (client CollectionPartitionClient) ListMetricsResponder(resp *http.Response } // ListUsages retrieves the usages (most recent storage data) for the given collection, split by partition. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// databaseRid is cosmos DB database rid. collectionRid is cosmos DB collection rid. filter is an OData filter -// expression that describes a subset of usages to return. The supported parameter is name.value (name of the -// metric, can have an or of multiple names). +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// databaseRid - cosmos DB database rid. +// collectionRid - cosmos DB collection rid. +// filter - an OData filter expression that describes a subset of usages to return. The supported parameter is +// name.value (name of the metric, can have an or of multiple names). func (client CollectionPartitionClient) ListUsages(ctx context.Context, resourceGroupName string, accountName string, databaseRid string, collectionRid string, filter string) (result PartitionUsagesResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collectionpartitionregion.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collectionpartitionregion.go index 46e010eaebff..6202ee61147f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collectionpartitionregion.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collectionpartitionregion.go @@ -42,12 +42,15 @@ func NewCollectionPartitionRegionClientWithBaseURI(baseURI string, subscriptionI // ListMetrics retrieves the metrics determined by the given filter for the given collection and region, split by // partition. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. region is -// cosmos DB region, with spaces between words and each word capitalized. databaseRid is cosmos DB database rid. -// collectionRid is cosmos DB collection rid. filter is an OData filter expression that describes a subset of -// metrics to return. The parameters that can be filtered are name.value (name of the metric, can have an or of -// multiple names), startTime, endTime, and timeGrain. The supported operator is eq. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// region - cosmos DB region, with spaces between words and each word capitalized. +// databaseRid - cosmos DB database rid. +// collectionRid - cosmos DB collection rid. +// filter - an OData filter expression that describes a subset of metrics to return. The parameters that can be +// filtered are name.value (name of the metric, can have an or of multiple names), startTime, endTime, and +// timeGrain. The supported operator is eq. func (client CollectionPartitionRegionClient) ListMetrics(ctx context.Context, resourceGroupName string, accountName string, region string, databaseRid string, collectionRid string, filter string) (result PartitionMetricListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collectionregion.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collectionregion.go index 3dfcb252e1f5..3877475c1c45 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collectionregion.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/collectionregion.go @@ -42,12 +42,15 @@ func NewCollectionRegionClientWithBaseURI(baseURI string, subscriptionID string) // ListMetrics retrieves the metrics determined by the given filter for the given database account, collection and // region. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. region is -// cosmos DB region, with spaces between words and each word capitalized. databaseRid is cosmos DB database rid. -// collectionRid is cosmos DB collection rid. filter is an OData filter expression that describes a subset of -// metrics to return. The parameters that can be filtered are name.value (name of the metric, can have an or of -// multiple names), startTime, endTime, and timeGrain. The supported operator is eq. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// region - cosmos DB region, with spaces between words and each word capitalized. +// databaseRid - cosmos DB database rid. +// collectionRid - cosmos DB collection rid. +// filter - an OData filter expression that describes a subset of metrics to return. The parameters that can be +// filtered are name.value (name of the metric, can have an or of multiple names), startTime, endTime, and +// timeGrain. The supported operator is eq. func (client CollectionRegionClient) ListMetrics(ctx context.Context, resourceGroupName string, accountName string, region string, databaseRid string, collectionRid string, filter string) (result MetricListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/database.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/database.go index d0615b1a004c..a8354a634984 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/database.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/database.go @@ -41,9 +41,10 @@ func NewDatabaseClientWithBaseURI(baseURI string, subscriptionID string) Databas } // ListMetricDefinitions retrieves metric defintions for the given database. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// databaseRid is cosmos DB database rid. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// databaseRid - cosmos DB database rid. func (client DatabaseClient) ListMetricDefinitions(ctx context.Context, resourceGroupName string, accountName string, databaseRid string) (result MetricDefinitionsListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -120,11 +121,13 @@ func (client DatabaseClient) ListMetricDefinitionsResponder(resp *http.Response) } // ListMetrics retrieves the metrics determined by the given filter for the given database account and database. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// databaseRid is cosmos DB database rid. filter is an OData filter expression that describes a subset of metrics -// to return. The parameters that can be filtered are name.value (name of the metric, can have an or of multiple -// names), startTime, endTime, and timeGrain. The supported operator is eq. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// databaseRid - cosmos DB database rid. +// filter - an OData filter expression that describes a subset of metrics to return. The parameters that can be +// filtered are name.value (name of the metric, can have an or of multiple names), startTime, endTime, and +// timeGrain. The supported operator is eq. func (client DatabaseClient) ListMetrics(ctx context.Context, resourceGroupName string, accountName string, databaseRid string, filter string) (result MetricListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -202,10 +205,12 @@ func (client DatabaseClient) ListMetricsResponder(resp *http.Response) (result M } // ListUsages retrieves the usages (most recent data) for the given database. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// databaseRid is cosmos DB database rid. filter is an OData filter expression that describes a subset of usages to -// return. The supported parameter is name.value (name of the metric, can have an or of multiple names). +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// databaseRid - cosmos DB database rid. +// filter - an OData filter expression that describes a subset of usages to return. The supported parameter is +// name.value (name of the metric, can have an or of multiple names). func (client DatabaseClient) ListUsages(ctx context.Context, resourceGroupName string, accountName string, databaseRid string, filter string) (result UsagesResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/databaseaccountregion.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/databaseaccountregion.go index 221bdc7cfbaa..be1aa360e501 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/databaseaccountregion.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/databaseaccountregion.go @@ -41,11 +41,13 @@ func NewDatabaseAccountRegionClientWithBaseURI(baseURI string, subscriptionID st } // ListMetrics retrieves the metrics determined by the given filter for the given database account and region. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. region is -// cosmos DB region, with spaces between words and each word capitalized. filter is an OData filter expression that -// describes a subset of metrics to return. The parameters that can be filtered are name.value (name of the metric, -// can have an or of multiple names), startTime, endTime, and timeGrain. The supported operator is eq. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// region - cosmos DB region, with spaces between words and each word capitalized. +// filter - an OData filter expression that describes a subset of metrics to return. The parameters that can be +// filtered are name.value (name of the metric, can have an or of multiple names), startTime, endTime, and +// timeGrain. The supported operator is eq. func (client DatabaseAccountRegionClient) ListMetrics(ctx context.Context, resourceGroupName string, accountName string, region string, filter string) (result MetricListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/databaseaccounts.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/databaseaccounts.go index 42548e8cd67b..ca3c1b24d6bf 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/databaseaccounts.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/databaseaccounts.go @@ -42,8 +42,8 @@ func NewDatabaseAccountsClientWithBaseURI(baseURI string, subscriptionID string) // CheckNameExists checks that the Azure Cosmos DB account name already exists. A valid account name may contain only // lowercase letters, numbers, and the '-' character, and must be between 3 and 50 characters. -// -// accountName is cosmos DB database account name. +// Parameters: +// accountName - cosmos DB database account name. func (client DatabaseAccountsClient) CheckNameExists(ctx context.Context, accountName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: accountName, @@ -112,9 +112,10 @@ func (client DatabaseAccountsClient) CheckNameExistsResponder(resp *http.Respons } // CreateOrUpdate creates or updates an Azure Cosmos DB database account. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// createUpdateParameters is the parameters to provide for the current database account. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// createUpdateParameters - the parameters to provide for the current database account. func (client DatabaseAccountsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, accountName string, createUpdateParameters DatabaseAccountCreateUpdateParameters) (result DatabaseAccountsCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -209,8 +210,9 @@ func (client DatabaseAccountsClient) CreateOrUpdateResponder(resp *http.Response } // Delete deletes an existing Azure Cosmos DB database account. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. func (client DatabaseAccountsClient) Delete(ctx context.Context, resourceGroupName string, accountName string) (result DatabaseAccountsDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -289,9 +291,10 @@ func (client DatabaseAccountsClient) DeleteResponder(resp *http.Response) (resul // FailoverPriorityChange changes the failover priority for the Azure Cosmos DB database account. A failover priority // of 0 indicates a write region. The maximum value for a failover priority = (total number of regions - 1). Failover // priority values must be unique for each of the regions in which the database account exists. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// failoverParameters is the new failover policies for the database account. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// failoverParameters - the new failover policies for the database account. func (client DatabaseAccountsClient) FailoverPriorityChange(ctx context.Context, resourceGroupName string, accountName string, failoverParameters FailoverPolicies) (result DatabaseAccountsFailoverPriorityChangeFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -372,8 +375,9 @@ func (client DatabaseAccountsClient) FailoverPriorityChangeResponder(resp *http. } // Get retrieves the properties of an existing Azure Cosmos DB database account. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. func (client DatabaseAccountsClient) Get(ctx context.Context, resourceGroupName string, accountName string) (result DatabaseAccount, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -511,8 +515,8 @@ func (client DatabaseAccountsClient) ListResponder(resp *http.Response) (result } // ListByResourceGroup lists all the Azure Cosmos DB database accounts available under the given resource group. -// -// resourceGroupName is name of an Azure resource group. +// Parameters: +// resourceGroupName - name of an Azure resource group. func (client DatabaseAccountsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result DatabaseAccountsListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -584,8 +588,9 @@ func (client DatabaseAccountsClient) ListByResourceGroupResponder(resp *http.Res } // ListConnectionStrings lists the connection strings for the specified Azure Cosmos DB database account. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. func (client DatabaseAccountsClient) ListConnectionStrings(ctx context.Context, resourceGroupName string, accountName string) (result DatabaseAccountListConnectionStringsResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -661,8 +666,9 @@ func (client DatabaseAccountsClient) ListConnectionStringsResponder(resp *http.R } // ListKeys lists the access keys for the specified Azure Cosmos DB database account. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. func (client DatabaseAccountsClient) ListKeys(ctx context.Context, resourceGroupName string, accountName string) (result DatabaseAccountListKeysResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -738,8 +744,9 @@ func (client DatabaseAccountsClient) ListKeysResponder(resp *http.Response) (res } // ListMetricDefinitions retrieves metric defintions for the given database account. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. func (client DatabaseAccountsClient) ListMetricDefinitions(ctx context.Context, resourceGroupName string, accountName string) (result MetricDefinitionsListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -815,11 +822,12 @@ func (client DatabaseAccountsClient) ListMetricDefinitionsResponder(resp *http.R } // ListMetrics retrieves the metrics determined by the given filter for the given database account. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. filter is -// an OData filter expression that describes a subset of metrics to return. The parameters that can be filtered are -// name.value (name of the metric, can have an or of multiple names), startTime, endTime, and timeGrain. The -// supported operator is eq. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// filter - an OData filter expression that describes a subset of metrics to return. The parameters that can be +// filtered are name.value (name of the metric, can have an or of multiple names), startTime, endTime, and +// timeGrain. The supported operator is eq. func (client DatabaseAccountsClient) ListMetrics(ctx context.Context, resourceGroupName string, accountName string, filter string) (result MetricListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -896,8 +904,9 @@ func (client DatabaseAccountsClient) ListMetricsResponder(resp *http.Response) ( } // ListReadOnlyKeys lists the read-only access keys for the specified Azure Cosmos DB database account. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. func (client DatabaseAccountsClient) ListReadOnlyKeys(ctx context.Context, resourceGroupName string, accountName string) (result DatabaseAccountListReadOnlyKeysResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -973,10 +982,11 @@ func (client DatabaseAccountsClient) ListReadOnlyKeysResponder(resp *http.Respon } // ListUsages retrieves the usages (most recent data) for the given database account. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. filter is -// an OData filter expression that describes a subset of usages to return. The supported parameter is name.value -// (name of the metric, can have an or of multiple names). +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// filter - an OData filter expression that describes a subset of usages to return. The supported parameter is +// name.value (name of the metric, can have an or of multiple names). func (client DatabaseAccountsClient) ListUsages(ctx context.Context, resourceGroupName string, accountName string, filter string) (result UsagesResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1055,9 +1065,10 @@ func (client DatabaseAccountsClient) ListUsagesResponder(resp *http.Response) (r } // Patch patches the properties of an existing Azure Cosmos DB database account. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// updateParameters is the tags parameter to patch for the current database account. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// updateParameters - the tags parameter to patch for the current database account. func (client DatabaseAccountsClient) Patch(ctx context.Context, resourceGroupName string, accountName string, updateParameters DatabaseAccountPatchParameters) (result DatabaseAccountsPatchFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1137,9 +1148,10 @@ func (client DatabaseAccountsClient) PatchResponder(resp *http.Response) (result } // RegenerateKey regenerates an access key for the specified Azure Cosmos DB database account. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// keyToRegenerate is the name of the key to regenerate. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// keyToRegenerate - the name of the key to regenerate. func (client DatabaseAccountsClient) RegenerateKey(ctx context.Context, resourceGroupName string, accountName string, keyToRegenerate DatabaseAccountRegenerateKeyParameters) (result DatabaseAccountsRegenerateKeyFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/models.go index b5cde0669a2e..e831e0925975 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/models.go @@ -420,10 +420,14 @@ type DatabaseAccountCreateUpdateProperties struct { DatabaseAccountOfferType *string `json:"databaseAccountOfferType,omitempty"` // IPRangeFilter - Cosmos DB Firewall Support: This value specifies the set of IP addresses or IP address ranges in CIDR form to be included as the allowed list of client IPs for a given database account. IP addresses/ranges must be comma separated and must not contain any spaces. IPRangeFilter *string `json:"ipRangeFilter,omitempty"` + // IsVirtualNetworkFilterEnabled - Flag to indicate whether to enable/disable Virtual Network ACL rules. + IsVirtualNetworkFilterEnabled *bool `json:"isVirtualNetworkFilterEnabled,omitempty"` // EnableAutomaticFailover - Enables automatic failover of the write region in the rare event that the region is unavailable due to an outage. Automatic failover will result in a new write region for the account and is chosen based on the failover priorities configured for the account. EnableAutomaticFailover *bool `json:"enableAutomaticFailover,omitempty"` // Capabilities - List of Cosmos DB capabilities for the account Capabilities *[]Capability `json:"capabilities,omitempty"` + // VirtualNetworkRules - List of Virtual Network ACL rules configured for the Cosmos DB account. + VirtualNetworkRules *[]VirtualNetworkRule `json:"virtualNetworkRules,omitempty"` } // DatabaseAccountListConnectionStringsResult the connection strings for the given database account. @@ -575,6 +579,8 @@ type DatabaseAccountProperties struct { DatabaseAccountOfferType DatabaseAccountOfferType `json:"databaseAccountOfferType,omitempty"` // IPRangeFilter - Cosmos DB Firewall Support: This value specifies the set of IP addresses or IP address ranges in CIDR form to be included as the allowed list of client IPs for a given database account. IP addresses/ranges must be comma separated and must not contain any spaces. IPRangeFilter *string `json:"ipRangeFilter,omitempty"` + // IsVirtualNetworkFilterEnabled - Flag to indicate whether to enable/disable Virtual Network ACL rules. + IsVirtualNetworkFilterEnabled *bool `json:"isVirtualNetworkFilterEnabled,omitempty"` // EnableAutomaticFailover - Enables automatic failover of the write region in the rare event that the region is unavailable due to an outage. Automatic failover will result in a new write region for the account and is chosen based on the failover priorities configured for the account. EnableAutomaticFailover *bool `json:"enableAutomaticFailover,omitempty"` // ConsistencyPolicy - The consistency policy for the Cosmos DB database account. @@ -587,6 +593,8 @@ type DatabaseAccountProperties struct { ReadLocations *[]Location `json:"readLocations,omitempty"` // FailoverPolicies - An array that contains the regions ordered by their failover priorities. FailoverPolicies *[]FailoverPolicy `json:"failoverPolicies,omitempty"` + // VirtualNetworkRules - List of Virtual Network ACL rules configured for the Cosmos DB account. + VirtualNetworkRules *[]VirtualNetworkRule `json:"virtualNetworkRules,omitempty"` } // DatabaseAccountRegenerateKeyParameters parameters to regenerate the keys within the database account. @@ -1235,3 +1243,9 @@ type UsagesResult struct { // Value - The list of usages for the database. A usage is a point in time metric Value *[]Usage `json:"value,omitempty"` } + +// VirtualNetworkRule virtual Network ACL Rule object +type VirtualNetworkRule struct { + // ID - Resource ID of a subnet, for example: /subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}. + ID *string `json:"id,omitempty"` +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/partitionkeyrangeid.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/partitionkeyrangeid.go index 1de1a9805665..f51432580480 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/partitionkeyrangeid.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/partitionkeyrangeid.go @@ -41,12 +41,15 @@ func NewPartitionKeyRangeIDClientWithBaseURI(baseURI string, subscriptionID stri } // ListMetrics retrieves the metrics determined by the given filter for the given partition key range id. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// databaseRid is cosmos DB database rid. collectionRid is cosmos DB collection rid. partitionKeyRangeID is -// partition Key Range Id for which to get data. filter is an OData filter expression that describes a subset of -// metrics to return. The parameters that can be filtered are name.value (name of the metric, can have an or of -// multiple names), startTime, endTime, and timeGrain. The supported operator is eq. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// databaseRid - cosmos DB database rid. +// collectionRid - cosmos DB collection rid. +// partitionKeyRangeID - partition Key Range Id for which to get data. +// filter - an OData filter expression that describes a subset of metrics to return. The parameters that can be +// filtered are name.value (name of the metric, can have an or of multiple names), startTime, endTime, and +// timeGrain. The supported operator is eq. func (client PartitionKeyRangeIDClient) ListMetrics(ctx context.Context, resourceGroupName string, accountName string, databaseRid string, collectionRid string, partitionKeyRangeID string, filter string) (result PartitionMetricListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/partitionkeyrangeidregion.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/partitionkeyrangeidregion.go index c3067ba51c17..1592f6c455b7 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/partitionkeyrangeidregion.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/partitionkeyrangeidregion.go @@ -41,11 +41,14 @@ func NewPartitionKeyRangeIDRegionClientWithBaseURI(baseURI string, subscriptionI } // ListMetrics retrieves the metrics determined by the given filter for the given partition key range id and region. -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. region is -// cosmos DB region, with spaces between words and each word capitalized. databaseRid is cosmos DB database rid. -// collectionRid is cosmos DB collection rid. partitionKeyRangeID is partition Key Range Id for which to get data. -// filter is an OData filter expression that describes a subset of metrics to return. The parameters that can be +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// region - cosmos DB region, with spaces between words and each word capitalized. +// databaseRid - cosmos DB database rid. +// collectionRid - cosmos DB collection rid. +// partitionKeyRangeID - partition Key Range Id for which to get data. +// filter - an OData filter expression that describes a subset of metrics to return. The parameters that can be // filtered are name.value (name of the metric, can have an or of multiple names), startTime, endTime, and // timeGrain. The supported operator is eq. func (client PartitionKeyRangeIDRegionClient) ListMetrics(ctx context.Context, resourceGroupName string, accountName string, region string, databaseRid string, collectionRid string, partitionKeyRangeID string, filter string) (result PartitionMetricListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/percentile.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/percentile.go index 07ddaa7c7a3b..9cf2be4657cc 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/percentile.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/percentile.go @@ -42,11 +42,12 @@ func NewPercentileClientWithBaseURI(baseURI string, subscriptionID string) Perce // ListMetrics retrieves the metrics determined by the given filter for the given database account. This url is only // for PBS and Replication Latency data -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. filter is -// an OData filter expression that describes a subset of metrics to return. The parameters that can be filtered are -// name.value (name of the metric, can have an or of multiple names), startTime, endTime, and timeGrain. The -// supported operator is eq. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// filter - an OData filter expression that describes a subset of metrics to return. The parameters that can be +// filtered are name.value (name of the metric, can have an or of multiple names), startTime, endTime, and +// timeGrain. The supported operator is eq. func (client PercentileClient) ListMetrics(ctx context.Context, resourceGroupName string, accountName string, filter string) (result PercentileMetricListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/percentilesourcetarget.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/percentilesourcetarget.go index f913350181f6..31f1f3f6910e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/percentilesourcetarget.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/percentilesourcetarget.go @@ -42,13 +42,16 @@ func NewPercentileSourceTargetClientWithBaseURI(baseURI string, subscriptionID s // ListMetrics retrieves the metrics determined by the given filter for the given account, source and target region. // This url is only for PBS and Replication Latency data -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// sourceRegion is source region from which data is written. Cosmos DB region, with spaces between words and each -// word capitalized. targetRegion is target region to which data is written. Cosmos DB region, with spaces between -// words and each word capitalized. filter is an OData filter expression that describes a subset of metrics to -// return. The parameters that can be filtered are name.value (name of the metric, can have an or of multiple -// names), startTime, endTime, and timeGrain. The supported operator is eq. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// sourceRegion - source region from which data is written. Cosmos DB region, with spaces between words and +// each word capitalized. +// targetRegion - target region to which data is written. Cosmos DB region, with spaces between words and each +// word capitalized. +// filter - an OData filter expression that describes a subset of metrics to return. The parameters that can be +// filtered are name.value (name of the metric, can have an or of multiple names), startTime, endTime, and +// timeGrain. The supported operator is eq. func (client PercentileSourceTargetClient) ListMetrics(ctx context.Context, resourceGroupName string, accountName string, sourceRegion string, targetRegion string, filter string) (result PercentileMetricListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/percentiletarget.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/percentiletarget.go index 1357b5dcd2ea..61ca372b388a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/percentiletarget.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/percentiletarget.go @@ -42,12 +42,14 @@ func NewPercentileTargetClientWithBaseURI(baseURI string, subscriptionID string) // ListMetrics retrieves the metrics determined by the given filter for the given account target region. This url is // only for PBS and Replication Latency data -// -// resourceGroupName is name of an Azure resource group. accountName is cosmos DB database account name. -// targetRegion is target region to which data is written. Cosmos DB region, with spaces between words and each -// word capitalized. filter is an OData filter expression that describes a subset of metrics to return. The -// parameters that can be filtered are name.value (name of the metric, can have an or of multiple names), -// startTime, endTime, and timeGrain. The supported operator is eq. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// targetRegion - target region to which data is written. Cosmos DB region, with spaces between words and each +// word capitalized. +// filter - an OData filter expression that describes a subset of metrics to return. The parameters that can be +// filtered are name.value (name of the metric, can have an or of multiple names), startTime, endTime, and +// timeGrain. The supported operator is eq. func (client PercentileTargetClient) ListMetrics(ctx context.Context, resourceGroupName string, accountName string, targetRegion string, filter string) (result PercentileMetricListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/recordsets.go b/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/recordsets.go index 36e683114495..cd10b4004e73 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/recordsets.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/recordsets.go @@ -40,14 +40,17 @@ func NewRecordSetsClientWithBaseURI(baseURI string, subscriptionID string) Recor } // CreateOrUpdate creates or updates a record set within a DNS zone. -// -// resourceGroupName is the name of the resource group. zoneName is the name of the DNS zone (without a terminating -// dot). relativeRecordSetName is the name of the record set, relative to the name of the zone. recordType is the -// type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created -// when the DNS zone is created). parameters is parameters supplied to the CreateOrUpdate operation. ifMatch is the -// etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag -// value to prevent accidentally overwritting any concurrent changes. ifNoneMatch is set to '*' to allow a new -// record set to be created, but to prevent updating an existing record set. Other values will be ignored. +// Parameters: +// resourceGroupName - the name of the resource group. +// zoneName - the name of the DNS zone (without a terminating dot). +// relativeRecordSetName - the name of the record set, relative to the name of the zone. +// recordType - the type of DNS record in this record set. Record sets of type SOA can be updated but not +// created (they are created when the DNS zone is created). +// parameters - parameters supplied to the CreateOrUpdate operation. +// ifMatch - the etag of the record set. Omit this value to always overwrite the current record set. Specify +// the last-seen etag value to prevent accidentally overwritting any concurrent changes. +// ifNoneMatch - set to '*' to allow a new record set to be created, but to prevent updating an existing record +// set. Other values will be ignored. func (client RecordSetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, zoneName string, relativeRecordSetName string, recordType RecordType, parameters RecordSet, ifMatch string, ifNoneMatch string) (result RecordSet, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, zoneName, relativeRecordSetName, recordType, parameters, ifMatch, ifNoneMatch) if err != nil { @@ -124,12 +127,14 @@ func (client RecordSetsClient) CreateOrUpdateResponder(resp *http.Response) (res } // Delete deletes a record set from a DNS zone. This operation cannot be undone. -// -// resourceGroupName is the name of the resource group. zoneName is the name of the DNS zone (without a terminating -// dot). relativeRecordSetName is the name of the record set, relative to the name of the zone. recordType is the -// type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS -// zone is deleted). ifMatch is the etag of the record set. Omit this value to always delete the current record -// set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes. +// Parameters: +// resourceGroupName - the name of the resource group. +// zoneName - the name of the DNS zone (without a terminating dot). +// relativeRecordSetName - the name of the record set, relative to the name of the zone. +// recordType - the type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are +// deleted when the DNS zone is deleted). +// ifMatch - the etag of the record set. Omit this value to always delete the current record set. Specify the +// last-seen etag value to prevent accidentally deleting any concurrent changes. func (client RecordSetsClient) Delete(ctx context.Context, resourceGroupName string, zoneName string, relativeRecordSetName string, recordType RecordType, ifMatch string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, zoneName, relativeRecordSetName, recordType, ifMatch) if err != nil { @@ -199,10 +204,11 @@ func (client RecordSetsClient) DeleteResponder(resp *http.Response) (result auto } // Get gets a record set. -// -// resourceGroupName is the name of the resource group. zoneName is the name of the DNS zone (without a terminating -// dot). relativeRecordSetName is the name of the record set, relative to the name of the zone. recordType is the -// type of DNS record in this record set. +// Parameters: +// resourceGroupName - the name of the resource group. +// zoneName - the name of the DNS zone (without a terminating dot). +// relativeRecordSetName - the name of the record set, relative to the name of the zone. +// recordType - the type of DNS record in this record set. func (client RecordSetsClient) Get(ctx context.Context, resourceGroupName string, zoneName string, relativeRecordSetName string, recordType RecordType) (result RecordSet, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, zoneName, relativeRecordSetName, recordType) if err != nil { @@ -269,10 +275,11 @@ func (client RecordSetsClient) GetResponder(resp *http.Response) (result RecordS } // ListByDNSZone lists all record sets in a DNS zone. -// -// resourceGroupName is the name of the resource group. zoneName is the name of the DNS zone (without a terminating -// dot). top is the maximum number of record sets to return. If not specified, returns up to 100 record sets. -// recordsetnamesuffix is the suffix label of the record set name that has to be used to filter the record set +// Parameters: +// resourceGroupName - the name of the resource group. +// zoneName - the name of the DNS zone (without a terminating dot). +// top - the maximum number of record sets to return. If not specified, returns up to 100 record sets. +// recordsetnamesuffix - the suffix label of the record set name that has to be used to filter the record set // enumerations. If this parameter is specified, Enumeration will return only records that end with // . func (client RecordSetsClient) ListByDNSZone(ctx context.Context, resourceGroupName string, zoneName string, top *int32, recordsetnamesuffix string) (result RecordSetListResultPage, err error) { @@ -373,12 +380,14 @@ func (client RecordSetsClient) ListByDNSZoneComplete(ctx context.Context, resour } // ListByType lists the record sets of a specified type in a DNS zone. -// -// resourceGroupName is the name of the resource group. zoneName is the name of the DNS zone (without a terminating -// dot). recordType is the type of record sets to enumerate. top is the maximum number of record sets to return. If -// not specified, returns up to 100 record sets. recordsetnamesuffix is the suffix label of the record set name -// that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will -// return only records that end with . +// Parameters: +// resourceGroupName - the name of the resource group. +// zoneName - the name of the DNS zone (without a terminating dot). +// recordType - the type of record sets to enumerate. +// top - the maximum number of record sets to return. If not specified, returns up to 100 record sets. +// recordsetnamesuffix - the suffix label of the record set name that has to be used to filter the record set +// enumerations. If this parameter is specified, Enumeration will return only records that end with +// . func (client RecordSetsClient) ListByType(ctx context.Context, resourceGroupName string, zoneName string, recordType RecordType, top *int32, recordsetnamesuffix string) (result RecordSetListResultPage, err error) { result.fn = client.listByTypeNextResults req, err := client.ListByTypePreparer(ctx, resourceGroupName, zoneName, recordType, top, recordsetnamesuffix) @@ -478,12 +487,14 @@ func (client RecordSetsClient) ListByTypeComplete(ctx context.Context, resourceG } // Update updates a record set within a DNS zone. -// -// resourceGroupName is the name of the resource group. zoneName is the name of the DNS zone (without a terminating -// dot). relativeRecordSetName is the name of the record set, relative to the name of the zone. recordType is the -// type of DNS record in this record set. parameters is parameters supplied to the Update operation. ifMatch is the -// etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag -// value to prevent accidentally overwritting concurrent changes. +// Parameters: +// resourceGroupName - the name of the resource group. +// zoneName - the name of the DNS zone (without a terminating dot). +// relativeRecordSetName - the name of the record set, relative to the name of the zone. +// recordType - the type of DNS record in this record set. +// parameters - parameters supplied to the Update operation. +// ifMatch - the etag of the record set. Omit this value to always overwrite the current record set. Specify +// the last-seen etag value to prevent accidentally overwritting concurrent changes. func (client RecordSetsClient) Update(ctx context.Context, resourceGroupName string, zoneName string, relativeRecordSetName string, recordType RecordType, parameters RecordSet, ifMatch string) (result RecordSet, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, zoneName, relativeRecordSetName, recordType, parameters, ifMatch) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/zones.go b/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/zones.go index c109156f0003..d085c1784a10 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/zones.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/zones.go @@ -40,12 +40,14 @@ func NewZonesClientWithBaseURI(baseURI string, subscriptionID string) ZonesClien } // CreateOrUpdate creates or updates a DNS zone. Does not modify DNS records within the zone. -// -// resourceGroupName is the name of the resource group. zoneName is the name of the DNS zone (without a terminating -// dot). parameters is parameters supplied to the CreateOrUpdate operation. ifMatch is the etag of the DNS zone. -// Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally -// overwritting any concurrent changes. ifNoneMatch is set to '*' to allow a new DNS zone to be created, but to -// prevent updating an existing zone. Other values will be ignored. +// Parameters: +// resourceGroupName - the name of the resource group. +// zoneName - the name of the DNS zone (without a terminating dot). +// parameters - parameters supplied to the CreateOrUpdate operation. +// ifMatch - the etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the +// last-seen etag value to prevent accidentally overwritting any concurrent changes. +// ifNoneMatch - set to '*' to allow a new DNS zone to be created, but to prevent updating an existing zone. +// Other values will be ignored. func (client ZonesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, zoneName string, parameters Zone, ifMatch string, ifNoneMatch string) (result Zone, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, zoneName, parameters, ifMatch, ifNoneMatch) if err != nil { @@ -121,10 +123,11 @@ func (client ZonesClient) CreateOrUpdateResponder(resp *http.Response) (result Z // Delete deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be // undone. -// -// resourceGroupName is the name of the resource group. zoneName is the name of the DNS zone (without a terminating -// dot). ifMatch is the etag of the DNS zone. Omit this value to always delete the current zone. Specify the -// last-seen etag value to prevent accidentally deleting any concurrent changes. +// Parameters: +// resourceGroupName - the name of the resource group. +// zoneName - the name of the DNS zone (without a terminating dot). +// ifMatch - the etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen +// etag value to prevent accidentally deleting any concurrent changes. func (client ZonesClient) Delete(ctx context.Context, resourceGroupName string, zoneName string, ifMatch string) (result ZonesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, zoneName, ifMatch) if err != nil { @@ -195,9 +198,9 @@ func (client ZonesClient) DeleteResponder(resp *http.Response) (result ZoneDelet } // Get gets a DNS zone. Retrieves the zone properties, but not the record sets within the zone. -// -// resourceGroupName is the name of the resource group. zoneName is the name of the DNS zone (without a terminating -// dot). +// Parameters: +// resourceGroupName - the name of the resource group. +// zoneName - the name of the DNS zone (without a terminating dot). func (client ZonesClient) Get(ctx context.Context, resourceGroupName string, zoneName string) (result Zone, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, zoneName) if err != nil { @@ -262,8 +265,8 @@ func (client ZonesClient) GetResponder(resp *http.Response) (result Zone, err er } // List lists the DNS zones in all resource groups in a subscription. -// -// top is the maximum number of DNS zones to return. If not specified, returns up to 100 zones. +// Parameters: +// top - the maximum number of DNS zones to return. If not specified, returns up to 100 zones. func (client ZonesClient) List(ctx context.Context, top *int32) (result ZoneListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, top) @@ -357,9 +360,9 @@ func (client ZonesClient) ListComplete(ctx context.Context, top *int32) (result } // ListByResourceGroup lists the DNS zones within a resource group. -// -// resourceGroupName is the name of the resource group. top is the maximum number of record sets to return. If not -// specified, returns up to 100 record sets. +// Parameters: +// resourceGroupName - the name of the resource group. +// top - the maximum number of record sets to return. If not specified, returns up to 100 record sets. func (client ZonesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string, top *int32) (result ZoneListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName, top) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/client.go index 48762abb3fc9..7151f5f4a2ba 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/client.go @@ -29,6 +29,7 @@ const ( DefaultBaseURI = "https://management.azure.com" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // BaseClient is the base client for Eventgrid. type BaseClient struct { autorest.Client @@ -36,11 +37,13 @@ type BaseClient struct { SubscriptionID string } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // New creates an instance of the BaseClient client. func New(subscriptionID string) BaseClient { return NewWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewWithBaseURI creates an instance of the BaseClient client. func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { return BaseClient{ diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/eventsubscriptions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/eventsubscriptions.go index 5d91ce184ba3..51ea2ae7ec67 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/eventsubscriptions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/eventsubscriptions.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionsClient is the azure EventGrid Management Client type EventSubscriptionsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewEventSubscriptionsClient creates an instance of the EventSubscriptionsClient client. func NewEventSubscriptionsClient(subscriptionID string) EventSubscriptionsClient { return NewEventSubscriptionsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewEventSubscriptionsClientWithBaseURI creates an instance of the EventSubscriptionsClient client. func NewEventSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) EventSubscriptionsClient { return EventSubscriptionsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Create asynchronously creates a new event subscription to the specified scope. Existing event subscriptions cannot // be updated with this API and should instead use the Update event subscription API. // @@ -68,6 +72,7 @@ func (client EventSubscriptionsClient) Create(ctx context.Context, scope string, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // CreatePreparer prepares the Create request. func (client EventSubscriptionsClient) CreatePreparer(ctx context.Context, scope string, eventSubscriptionName string, eventSubscriptionInfo EventSubscription) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -90,6 +95,7 @@ func (client EventSubscriptionsClient) CreatePreparer(ctx context.Context, scope return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) CreateSender(req *http.Request) (future EventSubscriptionsCreateFuture, err error) { @@ -105,6 +111,7 @@ func (client EventSubscriptionsClient) CreateSender(req *http.Request) (future E return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // CreateResponder handles the response to the Create request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) CreateResponder(resp *http.Response) (result EventSubscription, err error) { @@ -118,6 +125,7 @@ func (client EventSubscriptionsClient) CreateResponder(resp *http.Response) (res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Delete delete an existing event subscription // // scope is the scope of the event subscription. The scope can be a subscription, or a resource group, or a top @@ -144,6 +152,7 @@ func (client EventSubscriptionsClient) Delete(ctx context.Context, scope string, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // DeletePreparer prepares the Delete request. func (client EventSubscriptionsClient) DeletePreparer(ctx context.Context, scope string, eventSubscriptionName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -164,6 +173,7 @@ func (client EventSubscriptionsClient) DeletePreparer(ctx context.Context, scope return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) DeleteSender(req *http.Request) (future EventSubscriptionsDeleteFuture, err error) { @@ -179,6 +189,7 @@ func (client EventSubscriptionsClient) DeleteSender(req *http.Request) (future E return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -191,6 +202,7 @@ func (client EventSubscriptionsClient) DeleteResponder(resp *http.Response) (res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Get get properties of an event subscription // // scope is the scope of the event subscription. The scope can be a subscription, or a resource group, or a top @@ -223,6 +235,7 @@ func (client EventSubscriptionsClient) Get(ctx context.Context, scope string, ev return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetPreparer prepares the Get request. func (client EventSubscriptionsClient) GetPreparer(ctx context.Context, scope string, eventSubscriptionName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -243,6 +256,7 @@ func (client EventSubscriptionsClient) GetPreparer(ctx context.Context, scope st return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -250,6 +264,7 @@ func (client EventSubscriptionsClient) GetSender(req *http.Request) (*http.Respo autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) GetResponder(resp *http.Response) (result EventSubscription, err error) { @@ -263,6 +278,7 @@ func (client EventSubscriptionsClient) GetResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetFullURL get the full endpoint URL for an event subscription // // scope is the scope of the event subscription. The scope can be a subscription, or a resource group, or a top @@ -295,6 +311,7 @@ func (client EventSubscriptionsClient) GetFullURL(ctx context.Context, scope str return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetFullURLPreparer prepares the GetFullURL request. func (client EventSubscriptionsClient) GetFullURLPreparer(ctx context.Context, scope string, eventSubscriptionName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -315,6 +332,7 @@ func (client EventSubscriptionsClient) GetFullURLPreparer(ctx context.Context, s return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetFullURLSender sends the GetFullURL request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) GetFullURLSender(req *http.Request) (*http.Response, error) { @@ -322,6 +340,7 @@ func (client EventSubscriptionsClient) GetFullURLSender(req *http.Request) (*htt autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetFullURLResponder handles the response to the GetFullURL request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) GetFullURLResponder(resp *http.Response) (result EventSubscriptionFullURL, err error) { @@ -335,6 +354,7 @@ func (client EventSubscriptionsClient) GetFullURLResponder(resp *http.Response) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResource list all event subscriptions that have been created for a specific topic // // resourceGroupName is the name of the resource group within the user's subscription. providerNamespace is @@ -362,6 +382,7 @@ func (client EventSubscriptionsClient) ListByResource(ctx context.Context, resou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourcePreparer prepares the ListByResource request. func (client EventSubscriptionsClient) ListByResourcePreparer(ctx context.Context, resourceGroupName string, providerNamespace string, resourceTypeName string, resourceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -385,6 +406,7 @@ func (client EventSubscriptionsClient) ListByResourcePreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourceSender sends the ListByResource request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListByResourceSender(req *http.Request) (*http.Response, error) { @@ -392,6 +414,7 @@ func (client EventSubscriptionsClient) ListByResourceSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourceResponder handles the response to the ListByResource request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListByResourceResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -405,6 +428,7 @@ func (client EventSubscriptionsClient) ListByResourceResponder(resp *http.Respon return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroup list all global event subscriptions under a specific Azure subscription and resource group // // resourceGroupName is the name of the resource group within the user's subscription. @@ -430,6 +454,7 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroup(ctx context.Con return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupPreparer prepares the ListGlobalByResourceGroup request. func (client EventSubscriptionsClient) ListGlobalByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -450,6 +475,7 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupPreparer(ctx con return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupSender sends the ListGlobalByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListGlobalByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -457,6 +483,7 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupSender(req *http azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupResponder handles the response to the ListGlobalByResourceGroup request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListGlobalByResourceGroupResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -470,6 +497,7 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupResponder(resp * return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupForTopicType list all global event subscriptions under a resource group for a specific // topic type. // @@ -497,6 +525,7 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicType(ctx return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupForTopicTypePreparer prepares the ListGlobalByResourceGroupForTopicType request. func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypePreparer(ctx context.Context, resourceGroupName string, topicTypeName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -518,6 +547,7 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypePrep return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupForTopicTypeSender sends the ListGlobalByResourceGroupForTopicType request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypeSender(req *http.Request) (*http.Response, error) { @@ -525,6 +555,7 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypeSend azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupForTopicTypeResponder handles the response to the ListGlobalByResourceGroupForTopicType request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypeResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -538,6 +569,7 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypeResp return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscription list all aggregated global event subscriptions under a specific Azure subscription func (client EventSubscriptionsClient) ListGlobalBySubscription(ctx context.Context) (result EventSubscriptionsListResult, err error) { req, err := client.ListGlobalBySubscriptionPreparer(ctx) @@ -561,6 +593,7 @@ func (client EventSubscriptionsClient) ListGlobalBySubscription(ctx context.Cont return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionPreparer prepares the ListGlobalBySubscription request. func (client EventSubscriptionsClient) ListGlobalBySubscriptionPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -580,6 +613,7 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionPreparer(ctx cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionSender sends the ListGlobalBySubscription request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListGlobalBySubscriptionSender(req *http.Request) (*http.Response, error) { @@ -587,6 +621,7 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionSender(req *http. azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionResponder handles the response to the ListGlobalBySubscription request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListGlobalBySubscriptionResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -600,6 +635,7 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionResponder(resp *h return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionForTopicType list all global event subscriptions under an Azure subscription for a topic // type. // @@ -626,6 +662,7 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicType(ctx return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionForTopicTypePreparer prepares the ListGlobalBySubscriptionForTopicType request. func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypePreparer(ctx context.Context, topicTypeName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -646,6 +683,7 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypePrepa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionForTopicTypeSender sends the ListGlobalBySubscriptionForTopicType request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypeSender(req *http.Request) (*http.Response, error) { @@ -653,6 +691,7 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypeSende azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionForTopicTypeResponder handles the response to the ListGlobalBySubscriptionForTopicType request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypeResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -666,6 +705,7 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypeRespo return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroup list all event subscriptions from the given location under a specific Azure subscription // and resource group // @@ -693,6 +733,7 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroup(ctx context.C return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupPreparer prepares the ListRegionalByResourceGroup request. func (client EventSubscriptionsClient) ListRegionalByResourceGroupPreparer(ctx context.Context, resourceGroupName string, location string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -714,6 +755,7 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupPreparer(ctx c return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupSender sends the ListRegionalByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListRegionalByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -721,6 +763,7 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupSender(req *ht azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupResponder handles the response to the ListRegionalByResourceGroup request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListRegionalByResourceGroupResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -734,6 +777,7 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupResponder(resp return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupForTopicType list all event subscriptions from the given location under a specific Azure // subscription and resource group and topic type // @@ -761,6 +805,7 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicType(c return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupForTopicTypePreparer prepares the ListRegionalByResourceGroupForTopicType request. func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypePreparer(ctx context.Context, resourceGroupName string, location string, topicTypeName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -783,6 +828,7 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypePr return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupForTopicTypeSender sends the ListRegionalByResourceGroupForTopicType request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypeSender(req *http.Request) (*http.Response, error) { @@ -790,6 +836,7 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypeSe azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupForTopicTypeResponder handles the response to the ListRegionalByResourceGroupForTopicType request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypeResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -803,6 +850,7 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypeRe return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscription list all event subscriptions from the given location under a specific Azure subscription // // location is name of the location @@ -828,6 +876,7 @@ func (client EventSubscriptionsClient) ListRegionalBySubscription(ctx context.Co return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionPreparer prepares the ListRegionalBySubscription request. func (client EventSubscriptionsClient) ListRegionalBySubscriptionPreparer(ctx context.Context, location string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -848,6 +897,7 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionPreparer(ctx co return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionSender sends the ListRegionalBySubscription request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListRegionalBySubscriptionSender(req *http.Request) (*http.Response, error) { @@ -855,6 +905,7 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionSender(req *htt azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionResponder handles the response to the ListRegionalBySubscription request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListRegionalBySubscriptionResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -868,6 +919,7 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionResponder(resp return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionForTopicType list all event subscriptions from the given location under a specific Azure // subscription and topic type. // @@ -894,6 +946,7 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicType(ct return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionForTopicTypePreparer prepares the ListRegionalBySubscriptionForTopicType request. func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypePreparer(ctx context.Context, location string, topicTypeName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -915,6 +968,7 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypePre return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionForTopicTypeSender sends the ListRegionalBySubscriptionForTopicType request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypeSender(req *http.Request) (*http.Response, error) { @@ -922,6 +976,7 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypeSen azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionForTopicTypeResponder handles the response to the ListRegionalBySubscriptionForTopicType request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypeResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -935,6 +990,7 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypeRes return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Update asynchronously updates an existing event subscription. // // scope is the scope of existing event subscription. The scope can be a subscription, or a resource group, or a @@ -962,6 +1018,7 @@ func (client EventSubscriptionsClient) Update(ctx context.Context, scope string, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UpdatePreparer prepares the Update request. func (client EventSubscriptionsClient) UpdatePreparer(ctx context.Context, scope string, eventSubscriptionName string, eventSubscriptionUpdateParameters EventSubscriptionUpdateParameters) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -984,6 +1041,7 @@ func (client EventSubscriptionsClient) UpdatePreparer(ctx context.Context, scope return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) UpdateSender(req *http.Request) (future EventSubscriptionsUpdateFuture, err error) { @@ -999,6 +1057,7 @@ func (client EventSubscriptionsClient) UpdateSender(req *http.Request) (future E return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) UpdateResponder(resp *http.Response) (result EventSubscription, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/models.go index c0856820e8c4..aeec2b1758aa 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/models.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EndpointType enumerates the values for endpoint type. type EndpointType string @@ -36,11 +37,13 @@ const ( EndpointTypeWebHook EndpointType = "WebHook" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // PossibleEndpointTypeValues returns an array of possible values for the EndpointType const type. func PossibleEndpointTypeValues() []EndpointType { return []EndpointType{EndpointTypeEventHub, EndpointTypeEventSubscriptionDestination, EndpointTypeWebHook} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionProvisioningState enumerates the values for event subscription provisioning state. type EventSubscriptionProvisioningState string @@ -59,11 +62,13 @@ const ( Updating EventSubscriptionProvisioningState = "Updating" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // PossibleEventSubscriptionProvisioningStateValues returns an array of possible values for the EventSubscriptionProvisioningState const type. func PossibleEventSubscriptionProvisioningStateValues() []EventSubscriptionProvisioningState { return []EventSubscriptionProvisioningState{Canceled, Creating, Deleting, Failed, Succeeded, Updating} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // OperationOrigin enumerates the values for operation origin. type OperationOrigin string @@ -76,11 +81,13 @@ const ( UserAndSystem OperationOrigin = "UserAndSystem" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // PossibleOperationOriginValues returns an array of possible values for the OperationOrigin const type. func PossibleOperationOriginValues() []OperationOrigin { return []OperationOrigin{System, User, UserAndSystem} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ResourceRegionType enumerates the values for resource region type. type ResourceRegionType string @@ -91,11 +98,13 @@ const ( RegionalResource ResourceRegionType = "RegionalResource" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // PossibleResourceRegionTypeValues returns an array of possible values for the ResourceRegionType const type. func PossibleResourceRegionTypeValues() []ResourceRegionType { return []ResourceRegionType{GlobalResource, RegionalResource} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicProvisioningState enumerates the values for topic provisioning state. type TopicProvisioningState string @@ -114,11 +123,13 @@ const ( TopicProvisioningStateUpdating TopicProvisioningState = "Updating" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // PossibleTopicProvisioningStateValues returns an array of possible values for the TopicProvisioningState const type. func PossibleTopicProvisioningStateValues() []TopicProvisioningState { return []TopicProvisioningState{TopicProvisioningStateCanceled, TopicProvisioningStateCreating, TopicProvisioningStateDeleting, TopicProvisioningStateFailed, TopicProvisioningStateSucceeded, TopicProvisioningStateUpdating} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicTypeProvisioningState enumerates the values for topic type provisioning state. type TopicTypeProvisioningState string @@ -137,11 +148,13 @@ const ( TopicTypeProvisioningStateUpdating TopicTypeProvisioningState = "Updating" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // PossibleTopicTypeProvisioningStateValues returns an array of possible values for the TopicTypeProvisioningState const type. func PossibleTopicTypeProvisioningStateValues() []TopicTypeProvisioningState { return []TopicTypeProvisioningState{TopicTypeProvisioningStateCanceled, TopicTypeProvisioningStateCreating, TopicTypeProvisioningStateDeleting, TopicTypeProvisioningStateFailed, TopicTypeProvisioningStateSucceeded, TopicTypeProvisioningStateUpdating} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventHubEventSubscriptionDestination information about the event hub destination for an event subscription type EventHubEventSubscriptionDestination struct { // EventHubEventSubscriptionDestinationProperties - Event Hub Properties of the event subscription destination @@ -150,6 +163,7 @@ type EventHubEventSubscriptionDestination struct { EndpointType EndpointType `json:"endpointType,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for EventHubEventSubscriptionDestination. func (ehesd EventHubEventSubscriptionDestination) MarshalJSON() ([]byte, error) { ehesd.EndpointType = EndpointTypeEventHub @@ -163,26 +177,31 @@ func (ehesd EventHubEventSubscriptionDestination) MarshalJSON() ([]byte, error) return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsWebHookEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventHubEventSubscriptionDestination. func (ehesd EventHubEventSubscriptionDestination) AsWebHookEventSubscriptionDestination() (*WebHookEventSubscriptionDestination, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsEventHubEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventHubEventSubscriptionDestination. func (ehesd EventHubEventSubscriptionDestination) AsEventHubEventSubscriptionDestination() (*EventHubEventSubscriptionDestination, bool) { return &ehesd, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventHubEventSubscriptionDestination. func (ehesd EventHubEventSubscriptionDestination) AsEventSubscriptionDestination() (*EventSubscriptionDestination, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsBasicEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventHubEventSubscriptionDestination. func (ehesd EventHubEventSubscriptionDestination) AsBasicEventSubscriptionDestination() (BasicEventSubscriptionDestination, bool) { return &ehesd, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for EventHubEventSubscriptionDestination struct. func (ehesd *EventHubEventSubscriptionDestination) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -216,12 +235,14 @@ func (ehesd *EventHubEventSubscriptionDestination) UnmarshalJSON(body []byte) er return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventHubEventSubscriptionDestinationProperties the properties for a event hub destination. type EventHubEventSubscriptionDestinationProperties struct { // ResourceID - The Azure Resource Id that represents the endpoint of an Event Hub destination of an event subscription. ResourceID *string `json:"resourceId,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscription event Subscription type EventSubscription struct { autorest.Response `json:"-"` @@ -235,6 +256,7 @@ type EventSubscription struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for EventSubscription. func (es EventSubscription) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -253,6 +275,7 @@ func (es EventSubscription) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for EventSubscription struct. func (es *EventSubscription) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -304,6 +327,7 @@ func (es *EventSubscription) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // BasicEventSubscriptionDestination information about the destination for an event subscription type BasicEventSubscriptionDestination interface { AsWebHookEventSubscriptionDestination() (*WebHookEventSubscriptionDestination, bool) @@ -311,6 +335,7 @@ type BasicEventSubscriptionDestination interface { AsEventSubscriptionDestination() (*EventSubscriptionDestination, bool) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionDestination information about the destination for an event subscription type EventSubscriptionDestination struct { // EndpointType - Possible values include: 'EndpointTypeEventSubscriptionDestination', 'EndpointTypeWebHook', 'EndpointTypeEventHub' @@ -358,6 +383,7 @@ func unmarshalBasicEventSubscriptionDestinationArray(body []byte) ([]BasicEventS return esdArray, nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for EventSubscriptionDestination. func (esd EventSubscriptionDestination) MarshalJSON() ([]byte, error) { esd.EndpointType = EndpointTypeEventSubscriptionDestination @@ -368,26 +394,31 @@ func (esd EventSubscriptionDestination) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsWebHookEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventSubscriptionDestination. func (esd EventSubscriptionDestination) AsWebHookEventSubscriptionDestination() (*WebHookEventSubscriptionDestination, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsEventHubEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventSubscriptionDestination. func (esd EventSubscriptionDestination) AsEventHubEventSubscriptionDestination() (*EventHubEventSubscriptionDestination, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventSubscriptionDestination. func (esd EventSubscriptionDestination) AsEventSubscriptionDestination() (*EventSubscriptionDestination, bool) { return &esd, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsBasicEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventSubscriptionDestination. func (esd EventSubscriptionDestination) AsBasicEventSubscriptionDestination() (BasicEventSubscriptionDestination, bool) { return &esd, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionFilter filter for the Event Subscription type EventSubscriptionFilter struct { // SubjectBeginsWith - An optional string to filter events for an event subscription based on a resource path prefix. @@ -405,6 +436,7 @@ type EventSubscriptionFilter struct { IsSubjectCaseSensitive *bool `json:"isSubjectCaseSensitive,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionFullURL full endpoint url of an event subscription type EventSubscriptionFullURL struct { autorest.Response `json:"-"` @@ -412,6 +444,7 @@ type EventSubscriptionFullURL struct { EndpointURL *string `json:"endpointUrl,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionProperties properties of the Event Subscription type EventSubscriptionProperties struct { // Topic - Name of the topic of the event subscription. @@ -426,6 +459,7 @@ type EventSubscriptionProperties struct { Labels *[]string `json:"labels,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for EventSubscriptionProperties struct. func (esp *EventSubscriptionProperties) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -485,6 +519,7 @@ func (esp *EventSubscriptionProperties) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionsCreateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type EventSubscriptionsCreateFuture struct { @@ -492,6 +527,7 @@ type EventSubscriptionsCreateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future EventSubscriptionsCreateFuture) Result(client EventSubscriptionsClient) (es EventSubscription, err error) { @@ -534,6 +570,7 @@ func (future EventSubscriptionsCreateFuture) Result(client EventSubscriptionsCli return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type EventSubscriptionsDeleteFuture struct { @@ -541,6 +578,7 @@ type EventSubscriptionsDeleteFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future EventSubscriptionsDeleteFuture) Result(client EventSubscriptionsClient) (ar autorest.Response, err error) { @@ -583,6 +621,7 @@ func (future EventSubscriptionsDeleteFuture) Result(client EventSubscriptionsCli return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionsListResult result of the List EventSubscriptions operation type EventSubscriptionsListResult struct { autorest.Response `json:"-"` @@ -590,6 +629,7 @@ type EventSubscriptionsListResult struct { Value *[]EventSubscription `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type EventSubscriptionsUpdateFuture struct { @@ -597,6 +637,7 @@ type EventSubscriptionsUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future EventSubscriptionsUpdateFuture) Result(client EventSubscriptionsClient) (es EventSubscription, err error) { @@ -639,6 +680,7 @@ func (future EventSubscriptionsUpdateFuture) Result(client EventSubscriptionsCli return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionUpdateParameters properties of the Event Subscription update type EventSubscriptionUpdateParameters struct { // Destination - Information about the destination where events have to be delivered for the event subscription. @@ -649,6 +691,7 @@ type EventSubscriptionUpdateParameters struct { Labels *[]string `json:"labels,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for EventSubscriptionUpdateParameters struct. func (esup *EventSubscriptionUpdateParameters) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -690,6 +733,7 @@ func (esup *EventSubscriptionUpdateParameters) UnmarshalJSON(body []byte) error return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventType event Type for a subject under a topic type EventType struct { // EventTypeProperties - Properties of the event type. @@ -702,6 +746,7 @@ type EventType struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for EventType. func (et EventType) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -720,6 +765,7 @@ func (et EventType) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for EventType struct. func (et *EventType) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -771,6 +817,7 @@ func (et *EventType) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventTypeProperties properties of the event type type EventTypeProperties struct { // DisplayName - Display name of the event type. @@ -781,6 +828,7 @@ type EventTypeProperties struct { SchemaURL *string `json:"schemaUrl,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventTypesListResult result of the List Event Types operation type EventTypesListResult struct { autorest.Response `json:"-"` @@ -788,6 +836,7 @@ type EventTypesListResult struct { Value *[]EventType `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Operation represents an operation returned by the GetOperations request type Operation struct { // Name - Name of the operation @@ -800,6 +849,7 @@ type Operation struct { Properties interface{} `json:"properties,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // OperationInfo information about an operation type OperationInfo struct { // Provider - Name of the provider @@ -812,6 +862,7 @@ type OperationInfo struct { Description *string `json:"description,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // OperationsListResult result of the List Operations operation type OperationsListResult struct { autorest.Response `json:"-"` @@ -819,6 +870,7 @@ type OperationsListResult struct { Value *[]Operation `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Resource definition of a Resource type Resource struct { // ID - Fully qualified identifier of the resource @@ -829,6 +881,7 @@ type Resource struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Topic eventGrid Topic type Topic struct { autorest.Response `json:"-"` @@ -846,6 +899,7 @@ type Topic struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for Topic. func (t Topic) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -870,6 +924,7 @@ func (t Topic) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for Topic struct. func (t *Topic) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -939,6 +994,7 @@ func (t *Topic) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicProperties properties of the Topic type TopicProperties struct { // ProvisioningState - Provisioning state of the topic. Possible values include: 'TopicProvisioningStateCreating', 'TopicProvisioningStateUpdating', 'TopicProvisioningStateDeleting', 'TopicProvisioningStateSucceeded', 'TopicProvisioningStateCanceled', 'TopicProvisioningStateFailed' @@ -947,18 +1003,21 @@ type TopicProperties struct { Endpoint *string `json:"endpoint,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicRegenerateKeyRequest topic regenerate share access key key request type TopicRegenerateKeyRequest struct { // KeyName - Key name to regenerate key1 or key2 KeyName *string `json:"keyName,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type TopicsCreateOrUpdateFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future TopicsCreateOrUpdateFuture) Result(client TopicsClient) (t Topic, err error) { @@ -1001,12 +1060,14 @@ func (future TopicsCreateOrUpdateFuture) Result(client TopicsClient) (t Topic, e return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type TopicsDeleteFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future TopicsDeleteFuture) Result(client TopicsClient) (ar autorest.Response, err error) { @@ -1049,6 +1110,7 @@ func (future TopicsDeleteFuture) Result(client TopicsClient) (ar autorest.Respon return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicSharedAccessKeys shared access keys of the Topic type TopicSharedAccessKeys struct { autorest.Response `json:"-"` @@ -1058,6 +1120,7 @@ type TopicSharedAccessKeys struct { Key2 *string `json:"key2,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicsListResult result of the List Topics operation type TopicsListResult struct { autorest.Response `json:"-"` @@ -1065,12 +1128,14 @@ type TopicsListResult struct { Value *[]Topic `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type TopicsUpdateFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future TopicsUpdateFuture) Result(client TopicsClient) (t Topic, err error) { @@ -1113,6 +1178,7 @@ func (future TopicsUpdateFuture) Result(client TopicsClient) (t Topic, err error return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicTypeInfo properties of a topic type info. type TopicTypeInfo struct { autorest.Response `json:"-"` @@ -1126,6 +1192,7 @@ type TopicTypeInfo struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for TopicTypeInfo. func (tti TopicTypeInfo) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1144,6 +1211,7 @@ func (tti TopicTypeInfo) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for TopicTypeInfo struct. func (tti *TopicTypeInfo) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1195,6 +1263,7 @@ func (tti *TopicTypeInfo) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicTypeProperties properties of a topic type. type TopicTypeProperties struct { // Provider - Namespace of the provider of the topic type. @@ -1211,6 +1280,7 @@ type TopicTypeProperties struct { SupportedLocations *[]string `json:"supportedLocations,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicTypesListResult result of the List Topic Types operation type TopicTypesListResult struct { autorest.Response `json:"-"` @@ -1218,12 +1288,14 @@ type TopicTypesListResult struct { Value *[]TopicTypeInfo `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicUpdateParameters properties of the Topic update type TopicUpdateParameters struct { // Tags - Tags of the resource Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for TopicUpdateParameters. func (tup TopicUpdateParameters) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1233,6 +1305,7 @@ func (tup TopicUpdateParameters) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TrackedResource definition of a Tracked Resource type TrackedResource struct { // Location - Location of the resource @@ -1247,6 +1320,7 @@ type TrackedResource struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for TrackedResource. func (tr TrackedResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1268,6 +1342,7 @@ func (tr TrackedResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // WebHookEventSubscriptionDestination information about the webhook destination for an event subscription type WebHookEventSubscriptionDestination struct { // WebHookEventSubscriptionDestinationProperties - WebHook Properties of the event subscription destination @@ -1276,6 +1351,7 @@ type WebHookEventSubscriptionDestination struct { EndpointType EndpointType `json:"endpointType,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for WebHookEventSubscriptionDestination. func (whesd WebHookEventSubscriptionDestination) MarshalJSON() ([]byte, error) { whesd.EndpointType = EndpointTypeWebHook @@ -1289,26 +1365,31 @@ func (whesd WebHookEventSubscriptionDestination) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsWebHookEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for WebHookEventSubscriptionDestination. func (whesd WebHookEventSubscriptionDestination) AsWebHookEventSubscriptionDestination() (*WebHookEventSubscriptionDestination, bool) { return &whesd, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsEventHubEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for WebHookEventSubscriptionDestination. func (whesd WebHookEventSubscriptionDestination) AsEventHubEventSubscriptionDestination() (*EventHubEventSubscriptionDestination, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for WebHookEventSubscriptionDestination. func (whesd WebHookEventSubscriptionDestination) AsEventSubscriptionDestination() (*EventSubscriptionDestination, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsBasicEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for WebHookEventSubscriptionDestination. func (whesd WebHookEventSubscriptionDestination) AsBasicEventSubscriptionDestination() (BasicEventSubscriptionDestination, bool) { return &whesd, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for WebHookEventSubscriptionDestination struct. func (whesd *WebHookEventSubscriptionDestination) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1342,6 +1423,7 @@ func (whesd *WebHookEventSubscriptionDestination) UnmarshalJSON(body []byte) err return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // WebHookEventSubscriptionDestinationProperties information about the webhook destination properties for an event // subscription type WebHookEventSubscriptionDestinationProperties struct { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/operations.go index 1e2cbc609c1e..14ae5d15eb90 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/operations.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // OperationsClient is the azure EventGrid Management Client type OperationsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewOperationsClient creates an instance of the OperationsClient client. func NewOperationsClient(subscriptionID string) OperationsClient { return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // List list the available operations supported by the Microsoft.EventGrid resource provider func (client OperationsClient) List(ctx context.Context) (result OperationsListResult, err error) { req, err := client.ListPreparer(ctx) @@ -62,6 +66,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationsListR return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2017-09-15-preview" @@ -77,6 +82,7 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -84,6 +90,7 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client OperationsClient) ListResponder(resp *http.Response) (result OperationsListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topics.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topics.go index 0481d5553ca6..a954373b1259 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topics.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topics.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicsClient is the azure EventGrid Management Client type TopicsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewTopicsClient creates an instance of the TopicsClient client. func NewTopicsClient(subscriptionID string) TopicsClient { return NewTopicsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewTopicsClientWithBaseURI creates an instance of the TopicsClient client. func NewTopicsClientWithBaseURI(baseURI string, subscriptionID string) TopicsClient { return TopicsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // CreateOrUpdate asynchronously creates a new topic with the specified parameters. // // resourceGroupName is the name of the resource group within the user's subscription. topicName is name of the @@ -60,6 +64,7 @@ func (client TopicsClient) CreateOrUpdate(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client TopicsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, topicName string, topicInfo Topic) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -83,6 +88,7 @@ func (client TopicsClient) CreateOrUpdatePreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) CreateOrUpdateSender(req *http.Request) (future TopicsCreateOrUpdateFuture, err error) { @@ -98,6 +104,7 @@ func (client TopicsClient) CreateOrUpdateSender(req *http.Request) (future Topic return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client TopicsClient) CreateOrUpdateResponder(resp *http.Response) (result Topic, err error) { @@ -111,6 +118,7 @@ func (client TopicsClient) CreateOrUpdateResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Delete delete existing topic // // resourceGroupName is the name of the resource group within the user's subscription. topicName is name of the @@ -131,6 +139,7 @@ func (client TopicsClient) Delete(ctx context.Context, resourceGroupName string, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // DeletePreparer prepares the Delete request. func (client TopicsClient) DeletePreparer(ctx context.Context, resourceGroupName string, topicName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -152,6 +161,7 @@ func (client TopicsClient) DeletePreparer(ctx context.Context, resourceGroupName return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) DeleteSender(req *http.Request) (future TopicsDeleteFuture, err error) { @@ -167,6 +177,7 @@ func (client TopicsClient) DeleteSender(req *http.Request) (future TopicsDeleteF return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client TopicsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -179,6 +190,7 @@ func (client TopicsClient) DeleteResponder(resp *http.Response) (result autorest return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Get get properties of a topic // // resourceGroupName is the name of the resource group within the user's subscription. topicName is name of the @@ -205,6 +217,7 @@ func (client TopicsClient) Get(ctx context.Context, resourceGroupName string, to return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetPreparer prepares the Get request. func (client TopicsClient) GetPreparer(ctx context.Context, resourceGroupName string, topicName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -226,6 +239,7 @@ func (client TopicsClient) GetPreparer(ctx context.Context, resourceGroupName st return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -233,6 +247,7 @@ func (client TopicsClient) GetSender(req *http.Request) (*http.Response, error) azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client TopicsClient) GetResponder(resp *http.Response) (result Topic, err error) { @@ -246,6 +261,7 @@ func (client TopicsClient) GetResponder(resp *http.Response) (result Topic, err return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourceGroup list all the topics under a resource group // // resourceGroupName is the name of the resource group within the user's subscription. @@ -271,6 +287,7 @@ func (client TopicsClient) ListByResourceGroup(ctx context.Context, resourceGrou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client TopicsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -291,6 +308,7 @@ func (client TopicsClient) ListByResourceGroupPreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -298,6 +316,7 @@ func (client TopicsClient) ListByResourceGroupSender(req *http.Request) (*http.R azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client TopicsClient) ListByResourceGroupResponder(resp *http.Response) (result TopicsListResult, err error) { @@ -311,6 +330,7 @@ func (client TopicsClient) ListByResourceGroupResponder(resp *http.Response) (re return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListBySubscription list all the topics under an Azure subscription func (client TopicsClient) ListBySubscription(ctx context.Context) (result TopicsListResult, err error) { req, err := client.ListBySubscriptionPreparer(ctx) @@ -334,6 +354,7 @@ func (client TopicsClient) ListBySubscription(ctx context.Context) (result Topic return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListBySubscriptionPreparer prepares the ListBySubscription request. func (client TopicsClient) ListBySubscriptionPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -353,6 +374,7 @@ func (client TopicsClient) ListBySubscriptionPreparer(ctx context.Context) (*htt return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListBySubscriptionSender sends the ListBySubscription request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) ListBySubscriptionSender(req *http.Request) (*http.Response, error) { @@ -360,6 +382,7 @@ func (client TopicsClient) ListBySubscriptionSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListBySubscriptionResponder handles the response to the ListBySubscription request. The method always // closes the http.Response Body. func (client TopicsClient) ListBySubscriptionResponder(resp *http.Response) (result TopicsListResult, err error) { @@ -373,6 +396,7 @@ func (client TopicsClient) ListBySubscriptionResponder(resp *http.Response) (res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypes list event types for a topic // // resourceGroupName is the name of the resource group within the user's subscription. providerNamespace is @@ -400,6 +424,7 @@ func (client TopicsClient) ListEventTypes(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypesPreparer prepares the ListEventTypes request. func (client TopicsClient) ListEventTypesPreparer(ctx context.Context, resourceGroupName string, providerNamespace string, resourceTypeName string, resourceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -423,6 +448,7 @@ func (client TopicsClient) ListEventTypesPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypesSender sends the ListEventTypes request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) ListEventTypesSender(req *http.Request) (*http.Response, error) { @@ -430,6 +456,7 @@ func (client TopicsClient) ListEventTypesSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypesResponder handles the response to the ListEventTypes request. The method always // closes the http.Response Body. func (client TopicsClient) ListEventTypesResponder(resp *http.Response) (result EventTypesListResult, err error) { @@ -443,6 +470,7 @@ func (client TopicsClient) ListEventTypesResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListSharedAccessKeys list the two keys used to publish to a topic // // resourceGroupName is the name of the resource group within the user's subscription. topicName is name of the @@ -469,6 +497,7 @@ func (client TopicsClient) ListSharedAccessKeys(ctx context.Context, resourceGro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListSharedAccessKeysPreparer prepares the ListSharedAccessKeys request. func (client TopicsClient) ListSharedAccessKeysPreparer(ctx context.Context, resourceGroupName string, topicName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -490,6 +519,7 @@ func (client TopicsClient) ListSharedAccessKeysPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListSharedAccessKeysSender sends the ListSharedAccessKeys request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) ListSharedAccessKeysSender(req *http.Request) (*http.Response, error) { @@ -497,6 +527,7 @@ func (client TopicsClient) ListSharedAccessKeysSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListSharedAccessKeysResponder handles the response to the ListSharedAccessKeys request. The method always // closes the http.Response Body. func (client TopicsClient) ListSharedAccessKeysResponder(resp *http.Response) (result TopicSharedAccessKeys, err error) { @@ -510,6 +541,7 @@ func (client TopicsClient) ListSharedAccessKeysResponder(resp *http.Response) (r return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // RegenerateKey regenerate a shared access key for a topic // // resourceGroupName is the name of the resource group within the user's subscription. topicName is name of the @@ -542,6 +574,7 @@ func (client TopicsClient) RegenerateKey(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // RegenerateKeyPreparer prepares the RegenerateKey request. func (client TopicsClient) RegenerateKeyPreparer(ctx context.Context, resourceGroupName string, topicName string, regenerateKeyRequest TopicRegenerateKeyRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -565,6 +598,7 @@ func (client TopicsClient) RegenerateKeyPreparer(ctx context.Context, resourceGr return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // RegenerateKeySender sends the RegenerateKey request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) RegenerateKeySender(req *http.Request) (*http.Response, error) { @@ -572,6 +606,7 @@ func (client TopicsClient) RegenerateKeySender(req *http.Request) (*http.Respons azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // RegenerateKeyResponder handles the response to the RegenerateKey request. The method always // closes the http.Response Body. func (client TopicsClient) RegenerateKeyResponder(resp *http.Response) (result TopicSharedAccessKeys, err error) { @@ -585,6 +620,7 @@ func (client TopicsClient) RegenerateKeyResponder(resp *http.Response) (result T return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Update asynchronously updates a topic with the specified parameters. // // resourceGroupName is the name of the resource group within the user's subscription. topicName is name of the @@ -605,6 +641,7 @@ func (client TopicsClient) Update(ctx context.Context, resourceGroupName string, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UpdatePreparer prepares the Update request. func (client TopicsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, topicName string, topicUpdateParameters TopicUpdateParameters) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -628,6 +665,7 @@ func (client TopicsClient) UpdatePreparer(ctx context.Context, resourceGroupName return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) UpdateSender(req *http.Request) (future TopicsUpdateFuture, err error) { @@ -643,6 +681,7 @@ func (client TopicsClient) UpdateSender(req *http.Request) (future TopicsUpdateF return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client TopicsClient) UpdateResponder(resp *http.Response) (result Topic, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topictypes.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topictypes.go index a703d0bdb00d..80f888d16903 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topictypes.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topictypes.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicTypesClient is the azure EventGrid Management Client type TopicTypesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewTopicTypesClient creates an instance of the TopicTypesClient client. func NewTopicTypesClient(subscriptionID string) TopicTypesClient { return NewTopicTypesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewTopicTypesClientWithBaseURI creates an instance of the TopicTypesClient client. func NewTopicTypesClientWithBaseURI(baseURI string, subscriptionID string) TopicTypesClient { return TopicTypesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Get get information about a topic type // // topicTypeName is name of the topic type @@ -64,6 +68,7 @@ func (client TopicTypesClient) Get(ctx context.Context, topicTypeName string) (r return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetPreparer prepares the Get request. func (client TopicTypesClient) GetPreparer(ctx context.Context, topicTypeName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -83,6 +88,7 @@ func (client TopicTypesClient) GetPreparer(ctx context.Context, topicTypeName st return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client TopicTypesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -90,6 +96,7 @@ func (client TopicTypesClient) GetSender(req *http.Request) (*http.Response, err autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client TopicTypesClient) GetResponder(resp *http.Response) (result TopicTypeInfo, err error) { @@ -103,6 +110,7 @@ func (client TopicTypesClient) GetResponder(resp *http.Response) (result TopicTy return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // List list all registered topic types func (client TopicTypesClient) List(ctx context.Context) (result TopicTypesListResult, err error) { req, err := client.ListPreparer(ctx) @@ -126,6 +134,7 @@ func (client TopicTypesClient) List(ctx context.Context) (result TopicTypesListR return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListPreparer prepares the List request. func (client TopicTypesClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2017-09-15-preview" @@ -141,6 +150,7 @@ func (client TopicTypesClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client TopicTypesClient) ListSender(req *http.Request) (*http.Response, error) { @@ -148,6 +158,7 @@ func (client TopicTypesClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client TopicTypesClient) ListResponder(resp *http.Response) (result TopicTypesListResult, err error) { @@ -161,6 +172,7 @@ func (client TopicTypesClient) ListResponder(resp *http.Response) (result TopicT return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypes list event types for a topic type // // topicTypeName is name of the topic type @@ -186,6 +198,7 @@ func (client TopicTypesClient) ListEventTypes(ctx context.Context, topicTypeName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypesPreparer prepares the ListEventTypes request. func (client TopicTypesClient) ListEventTypesPreparer(ctx context.Context, topicTypeName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -205,6 +218,7 @@ func (client TopicTypesClient) ListEventTypesPreparer(ctx context.Context, topic return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypesSender sends the ListEventTypes request. The method will close the // http.Response Body if it receives an error. func (client TopicTypesClient) ListEventTypesSender(req *http.Request) (*http.Response, error) { @@ -212,6 +226,7 @@ func (client TopicTypesClient) ListEventTypesSender(req *http.Request) (*http.Re autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypesResponder handles the response to the ListEventTypes request. The method always // closes the http.Response Body. func (client TopicTypesClient) ListEventTypesResponder(resp *http.Response) (result EventTypesListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/version.go index 4696946ef8b3..62d31fdb7876 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/version.go @@ -18,12 +18,13 @@ import "github.com/Azure/azure-sdk-for-go/version" // // Code generated by Microsoft (R) AutoRest Code Generator. // Changes may cause incorrect behavior and will be lost if the code is regenerated. - +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { return "Azure-SDK-For-Go/" + version.Number + " eventgrid/2017-09-15-preview" } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Version returns the semantic version (see http://semver.org) of the client. func Version() string { return version.Number diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go index 274da2f4ed52..07a0faf85b7a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go @@ -41,10 +41,12 @@ func NewConsumerGroupsClientWithBaseURI(baseURI string, subscriptionID string) C } // CreateOrUpdate creates or updates an Event Hubs consumer group as a nested resource within a Namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name consumerGroupName is the consumer group name parameters is parameters -// supplied to create or update a consumer group resource. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name +// consumerGroupName - the consumer group name +// parameters - parameters supplied to create or update a consumer group resource. func (client ConsumerGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string, consumerGroupName string, parameters ConsumerGroup) (result ConsumerGroup, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -128,9 +130,11 @@ func (client ConsumerGroupsClient) CreateOrUpdateResponder(resp *http.Response) } // Delete deletes a consumer group from the specified Event Hub and resource group. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name consumerGroupName is the consumer group name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name +// consumerGroupName - the consumer group name func (client ConsumerGroupsClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string, consumerGroupName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -211,9 +215,11 @@ func (client ConsumerGroupsClient) DeleteResponder(resp *http.Response) (result } // Get gets a description for the specified consumer group. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name consumerGroupName is the consumer group name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name +// consumerGroupName - the consumer group name func (client ConsumerGroupsClient) Get(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string, consumerGroupName string) (result ConsumerGroup, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -296,9 +302,10 @@ func (client ConsumerGroupsClient) GetResponder(resp *http.Response) (result Con // ListByEventHub gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in // the Namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name func (client ConsumerGroupsClient) ListByEventHub(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string) (result ConsumerGroupListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/disasterrecoveryconfigs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/disasterrecoveryconfigs.go index a2d63e559336..9e3e1dfca2d4 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/disasterrecoveryconfigs.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/disasterrecoveryconfigs.go @@ -42,9 +42,10 @@ func NewDisasterRecoveryConfigsClientWithBaseURI(baseURI string, subscriptionID // BreakPairing this operation disables the Disaster Recovery and stops replicating changes from primary to secondary // namespaces -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name alias is the Disaster Recovery configuration name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// alias - the Disaster Recovery configuration name func (client DisasterRecoveryConfigsClient) BreakPairing(ctx context.Context, resourceGroupName string, namespaceName string, alias string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -122,9 +123,10 @@ func (client DisasterRecoveryConfigsClient) BreakPairingResponder(resp *http.Res } // CheckNameAvailability check the give Namespace name availability. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name parameters is parameters to check availability of the given Alias name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// parameters - parameters to check availability of the given Alias name func (client DisasterRecoveryConfigsClient) CheckNameAvailability(ctx context.Context, resourceGroupName string, namespaceName string, parameters CheckNameAvailabilityParameter) (result CheckNameAvailabilityResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -203,10 +205,11 @@ func (client DisasterRecoveryConfigsClient) CheckNameAvailabilityResponder(resp } // CreateOrUpdate creates or updates a new Alias(Disaster Recovery configuration) -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name alias is the Disaster Recovery configuration name parameters is parameters required to create an -// Alias(Disaster Recovery configuration) +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// alias - the Disaster Recovery configuration name +// parameters - parameters required to create an Alias(Disaster Recovery configuration) func (client DisasterRecoveryConfigsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, alias string, parameters ArmDisasterRecovery) (result ArmDisasterRecovery, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -287,9 +290,10 @@ func (client DisasterRecoveryConfigsClient) CreateOrUpdateResponder(resp *http.R } // Delete deletes an Alias(Disaster Recovery configuration) -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name alias is the Disaster Recovery configuration name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// alias - the Disaster Recovery configuration name func (client DisasterRecoveryConfigsClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string, alias string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -367,9 +371,10 @@ func (client DisasterRecoveryConfigsClient) DeleteResponder(resp *http.Response) } // FailOver envokes GEO DR failover and reconfigure the alias to point to the secondary namespace -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name alias is the Disaster Recovery configuration name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// alias - the Disaster Recovery configuration name func (client DisasterRecoveryConfigsClient) FailOver(ctx context.Context, resourceGroupName string, namespaceName string, alias string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -447,9 +452,10 @@ func (client DisasterRecoveryConfigsClient) FailOverResponder(resp *http.Respons } // Get retrieves Alias(Disaster Recovery configuration) for primary or secondary namespace -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name alias is the Disaster Recovery configuration name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// alias - the Disaster Recovery configuration name func (client DisasterRecoveryConfigsClient) Get(ctx context.Context, resourceGroupName string, namespaceName string, alias string) (result ArmDisasterRecovery, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -528,9 +534,11 @@ func (client DisasterRecoveryConfigsClient) GetResponder(resp *http.Response) (r } // GetAuthorizationRule gets an AuthorizationRule for a Namespace by rule name. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name alias is the Disaster Recovery configuration name authorizationRuleName is the authorization rule name. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// alias - the Disaster Recovery configuration name +// authorizationRuleName - the authorization rule name. func (client DisasterRecoveryConfigsClient) GetAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, alias string, authorizationRuleName string) (result AuthorizationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -612,9 +620,9 @@ func (client DisasterRecoveryConfigsClient) GetAuthorizationRuleResponder(resp * } // List gets all Alias(Disaster Recovery configurations) -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name func (client DisasterRecoveryConfigsClient) List(ctx context.Context, resourceGroupName string, namespaceName string) (result ArmDisasterRecoveryListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -717,9 +725,10 @@ func (client DisasterRecoveryConfigsClient) ListComplete(ctx context.Context, re } // ListAuthorizationRules gets a list of authorization rules for a Namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name alias is the Disaster Recovery configuration name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// alias - the Disaster Recovery configuration name func (client DisasterRecoveryConfigsClient) ListAuthorizationRules(ctx context.Context, resourceGroupName string, namespaceName string, alias string) (result AuthorizationRuleListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -826,9 +835,11 @@ func (client DisasterRecoveryConfigsClient) ListAuthorizationRulesComplete(ctx c } // ListKeys gets the primary and secondary connection strings for the Namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name alias is the Disaster Recovery configuration name authorizationRuleName is the authorization rule name. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// alias - the Disaster Recovery configuration name +// authorizationRuleName - the authorization rule name. func (client DisasterRecoveryConfigsClient) ListKeys(ctx context.Context, resourceGroupName string, namespaceName string, alias string, authorizationRuleName string) (result AccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go index c863b80cfbe5..b98f5e1cf502 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go @@ -41,9 +41,11 @@ func NewEventHubsClientWithBaseURI(baseURI string, subscriptionID string) EventH } // CreateOrUpdate creates or updates a new Event Hub as a nested resource within a Namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name parameters is parameters supplied to create an Event Hub resource. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name +// parameters - parameters supplied to create an Event Hub resource. func (client EventHubsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string, parameters Model) (result Model, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -140,10 +142,12 @@ func (client EventHubsClient) CreateOrUpdateResponder(resp *http.Response) (resu } // CreateOrUpdateAuthorizationRule creates or updates an AuthorizationRule for the specified Event Hub. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name authorizationRuleName is the authorization rule name. parameters is the -// shared access AuthorizationRule. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name +// authorizationRuleName - the authorization rule name. +// parameters - the shared access AuthorizationRule. func (client EventHubsClient) CreateOrUpdateAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string, authorizationRuleName string, parameters AuthorizationRule) (result AuthorizationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -229,9 +233,10 @@ func (client EventHubsClient) CreateOrUpdateAuthorizationRuleResponder(resp *htt } // Delete deletes an Event Hub from the specified Namespace and resource group. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name func (client EventHubsClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -308,9 +313,11 @@ func (client EventHubsClient) DeleteResponder(resp *http.Response) (result autor } // DeleteAuthorizationRule deletes an Event Hub AuthorizationRule. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name authorizationRuleName is the authorization rule name. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name +// authorizationRuleName - the authorization rule name. func (client EventHubsClient) DeleteAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string, authorizationRuleName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -390,9 +397,10 @@ func (client EventHubsClient) DeleteAuthorizationRuleResponder(resp *http.Respon } // Get gets an Event Hubs description for the specified Event Hub. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name func (client EventHubsClient) Get(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string) (result Model, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -470,9 +478,11 @@ func (client EventHubsClient) GetResponder(resp *http.Response) (result Model, e } // GetAuthorizationRule gets an AuthorizationRule for an Event Hub by rule name. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name authorizationRuleName is the authorization rule name. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name +// authorizationRuleName - the authorization rule name. func (client EventHubsClient) GetAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string, authorizationRuleName string) (result AuthorizationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -553,9 +563,10 @@ func (client EventHubsClient) GetAuthorizationRuleResponder(resp *http.Response) } // ListAuthorizationRules gets the authorization rules for an Event Hub. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name func (client EventHubsClient) ListAuthorizationRules(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string) (result AuthorizationRuleListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -661,9 +672,9 @@ func (client EventHubsClient) ListAuthorizationRulesComplete(ctx context.Context } // ListByNamespace gets all the Event Hubs in a Namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name func (client EventHubsClient) ListByNamespace(ctx context.Context, resourceGroupName string, namespaceName string) (result ListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -766,9 +777,11 @@ func (client EventHubsClient) ListByNamespaceComplete(ctx context.Context, resou } // ListKeys gets the ACS and SAS connection strings for the Event Hub. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name authorizationRuleName is the authorization rule name. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name +// authorizationRuleName - the authorization rule name. func (client EventHubsClient) ListKeys(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string, authorizationRuleName string) (result AccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -849,10 +862,12 @@ func (client EventHubsClient) ListKeysResponder(resp *http.Response) (result Acc } // RegenerateKeys regenerates the ACS and SAS connection strings for the Event Hub. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name eventHubName is the Event Hub name authorizationRuleName is the authorization rule name. parameters is -// parameters supplied to regenerate the AuthorizationRule Keys (PrimaryKey/SecondaryKey). +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// eventHubName - the Event Hub name +// authorizationRuleName - the authorization rule name. +// parameters - parameters supplied to regenerate the AuthorizationRule Keys (PrimaryKey/SecondaryKey). func (client EventHubsClient) RegenerateKeys(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string, authorizationRuleName string, parameters RegenerateAccessKeyParameters) (result AccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/messagingplan.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/messagingplan.go deleted file mode 100644 index 59eababf32d7..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/messagingplan.go +++ /dev/null @@ -1,118 +0,0 @@ -package eventhub - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "context" - "github.com/Azure/go-autorest/autorest" - "github.com/Azure/go-autorest/autorest/azure" - "github.com/Azure/go-autorest/autorest/validation" - "net/http" -) - -// MessagingPlanClient is the azure Event Hubs client -type MessagingPlanClient struct { - BaseClient -} - -// NewMessagingPlanClient creates an instance of the MessagingPlanClient client. -func NewMessagingPlanClient(subscriptionID string) MessagingPlanClient { - return NewMessagingPlanClientWithBaseURI(DefaultBaseURI, subscriptionID) -} - -// NewMessagingPlanClientWithBaseURI creates an instance of the MessagingPlanClient client. -func NewMessagingPlanClientWithBaseURI(baseURI string, subscriptionID string) MessagingPlanClient { - return MessagingPlanClient{NewWithBaseURI(baseURI, subscriptionID)} -} - -// Get gets a description for the specified namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name -func (client MessagingPlanClient) Get(ctx context.Context, resourceGroupName string, namespaceName string) (result MessagingPlan, err error) { - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, - {TargetValue: namespaceName, - Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, - {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { - return result, validation.NewError("eventhub.MessagingPlanClient", "Get", err.Error()) - } - - req, err := client.GetPreparer(ctx, resourceGroupName, namespaceName) - if err != nil { - err = autorest.NewErrorWithError(err, "eventhub.MessagingPlanClient", "Get", nil, "Failure preparing request") - return - } - - resp, err := client.GetSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "eventhub.MessagingPlanClient", "Get", resp, "Failure sending request") - return - } - - result, err = client.GetResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "eventhub.MessagingPlanClient", "Get", resp, "Failure responding to request") - } - - return -} - -// GetPreparer prepares the Get request. -func (client MessagingPlanClient) GetPreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "namespaceName": autorest.Encode("path", namespaceName), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2017-04-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/messagingplan", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// GetSender sends the Get request. The method will close the -// http.Response Body if it receives an error. -func (client MessagingPlanClient) GetSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// GetResponder handles the response to the Get request. The method always -// closes the http.Response Body. -func (client MessagingPlanClient) GetResponder(resp *http.Response) (result MessagingPlan, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/models.go index 23b11d79fcc7..6d642772a787 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/models.go @@ -1239,10 +1239,10 @@ func (page ListResultPage) Values() []Model { return *page.lr.Value } -// MessagingPlan messaging +// MessagingPlan messaging Plan for the namespace type MessagingPlan struct { autorest.Response `json:"-"` - *MessagingPlanproperties `json:"properties,omitempty"` + *MessagingPlanProperties `json:"properties,omitempty"` // Location - Resource location Location *string `json:"location,omitempty"` // Tags - Resource tags @@ -1258,8 +1258,8 @@ type MessagingPlan struct { // MarshalJSON is the custom marshaler for MessagingPlan. func (mp MessagingPlan) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) - if mp.MessagingPlanproperties != nil { - objectMap["properties"] = mp.MessagingPlanproperties + if mp.MessagingPlanProperties != nil { + objectMap["properties"] = mp.MessagingPlanProperties } if mp.Location != nil { objectMap["location"] = mp.Location @@ -1290,12 +1290,12 @@ func (mp *MessagingPlan) UnmarshalJSON(body []byte) error { switch k { case "properties": if v != nil { - var messagingPlanproperties MessagingPlanproperties - err = json.Unmarshal(*v, &messagingPlanproperties) + var messagingPlanProperties MessagingPlanProperties + err = json.Unmarshal(*v, &messagingPlanProperties) if err != nil { return err } - mp.MessagingPlanproperties = &messagingPlanproperties + mp.MessagingPlanProperties = &messagingPlanProperties } case "location": if v != nil { @@ -1348,8 +1348,8 @@ func (mp *MessagingPlan) UnmarshalJSON(body []byte) error { return nil } -// MessagingPlanproperties messaging Region -type MessagingPlanproperties struct { +// MessagingPlanProperties ... +type MessagingPlanProperties struct { // Sku - Sku type Sku *int32 `json:"sku,omitempty"` // SelectedEventHubUnit - Selected event hub unit diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go index a938c085d221..5d69e5453ef9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go @@ -41,8 +41,8 @@ func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) Names } // CheckNameAvailability check the give Namespace name availability. -// -// parameters is parameters to check availability of the given Namespace name +// Parameters: +// parameters - parameters to check availability of the given Namespace name func (client NamespacesClient) CheckNameAvailability(ctx context.Context, parameters CheckNameAvailabilityParameter) (result CheckNameAvailabilityResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -114,9 +114,10 @@ func (client NamespacesClient) CheckNameAvailabilityResponder(resp *http.Respons // CreateOrUpdate creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This // operation is idempotent. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name parameters is parameters for creating a namespace resource. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// parameters - parameters for creating a namespace resource. func (client NamespacesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, parameters EHNamespace) (result NamespacesCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -208,9 +209,11 @@ func (client NamespacesClient) CreateOrUpdateResponder(resp *http.Response) (res } // CreateOrUpdateAuthorizationRule creates or updates an AuthorizationRule for a Namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name authorizationRuleName is the authorization rule name. parameters is the shared access AuthorizationRule. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// authorizationRuleName - the authorization rule name. +// parameters - the shared access AuthorizationRule. func (client NamespacesClient) CreateOrUpdateAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string, parameters AuthorizationRule) (result AuthorizationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -293,9 +296,9 @@ func (client NamespacesClient) CreateOrUpdateAuthorizationRuleResponder(resp *ht } // Delete deletes an existing namespace. This operation also removes all associated resources under the namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name func (client NamespacesClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string) (result NamespacesDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -371,9 +374,10 @@ func (client NamespacesClient) DeleteResponder(resp *http.Response) (result auto } // DeleteAuthorizationRule deletes an AuthorizationRule for a Namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name authorizationRuleName is the authorization rule name. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// authorizationRuleName - the authorization rule name. func (client NamespacesClient) DeleteAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -450,9 +454,9 @@ func (client NamespacesClient) DeleteAuthorizationRuleResponder(resp *http.Respo } // Get gets the description of the specified namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name func (client NamespacesClient) Get(ctx context.Context, resourceGroupName string, namespaceName string) (result EHNamespace, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -527,9 +531,10 @@ func (client NamespacesClient) GetResponder(resp *http.Response) (result EHNames } // GetAuthorizationRule gets an AuthorizationRule for a Namespace by rule name. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name authorizationRuleName is the authorization rule name. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// authorizationRuleName - the authorization rule name. func (client NamespacesClient) GetAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string) (result AuthorizationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -606,6 +611,83 @@ func (client NamespacesClient) GetAuthorizationRuleResponder(resp *http.Response return } +// GetMessagingPlan gets messaging plan for specified namespace. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +func (client NamespacesClient) GetMessagingPlan(ctx context.Context, resourceGroupName string, namespaceName string) (result MessagingPlan, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + return result, validation.NewError("eventhub.NamespacesClient", "GetMessagingPlan", err.Error()) + } + + req, err := client.GetMessagingPlanPreparer(ctx, resourceGroupName, namespaceName) + if err != nil { + err = autorest.NewErrorWithError(err, "eventhub.NamespacesClient", "GetMessagingPlan", nil, "Failure preparing request") + return + } + + resp, err := client.GetMessagingPlanSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "eventhub.NamespacesClient", "GetMessagingPlan", resp, "Failure sending request") + return + } + + result, err = client.GetMessagingPlanResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "eventhub.NamespacesClient", "GetMessagingPlan", resp, "Failure responding to request") + } + + return +} + +// GetMessagingPlanPreparer prepares the GetMessagingPlan request. +func (client NamespacesClient) GetMessagingPlanPreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/messagingplan", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetMessagingPlanSender sends the GetMessagingPlan request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) GetMessagingPlanSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetMessagingPlanResponder handles the response to the GetMessagingPlan request. The method always +// closes the http.Response Body. +func (client NamespacesClient) GetMessagingPlanResponder(resp *http.Response) (result MessagingPlan, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + // List lists all the available Namespaces within a subscription, irrespective of the resource groups. func (client NamespacesClient) List(ctx context.Context) (result EHNamespaceListResultPage, err error) { result.fn = client.listNextResults @@ -697,9 +779,9 @@ func (client NamespacesClient) ListComplete(ctx context.Context) (result EHNames } // ListAuthorizationRules gets a list of authorization rules for a Namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name func (client NamespacesClient) ListAuthorizationRules(ctx context.Context, resourceGroupName string, namespaceName string) (result AuthorizationRuleListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -802,8 +884,8 @@ func (client NamespacesClient) ListAuthorizationRulesComplete(ctx context.Contex } // ListByResourceGroup lists the available Namespaces within a resource group. -// -// resourceGroupName is name of the resource group within the azure subscription. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. func (client NamespacesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result EHNamespaceListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -902,9 +984,10 @@ func (client NamespacesClient) ListByResourceGroupComplete(ctx context.Context, } // ListKeys gets the primary and secondary connection strings for the Namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name authorizationRuleName is the authorization rule name. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// authorizationRuleName - the authorization rule name. func (client NamespacesClient) ListKeys(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string) (result AccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -982,10 +1065,11 @@ func (client NamespacesClient) ListKeysResponder(resp *http.Response) (result Ac } // RegenerateKeys regenerates the primary or secondary connection strings for the specified Namespace. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name authorizationRuleName is the authorization rule name. parameters is parameters required to regenerate the -// connection string. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// authorizationRuleName - the authorization rule name. +// parameters - parameters required to regenerate the connection string. func (client NamespacesClient) RegenerateKeys(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string, parameters RegenerateAccessKeyParameters) (result AccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1066,9 +1150,10 @@ func (client NamespacesClient) RegenerateKeysResponder(resp *http.Response) (res // Update creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation // is idempotent. -// -// resourceGroupName is name of the resource group within the azure subscription. namespaceName is the Namespace -// name parameters is parameters for updating a namespace resource. +// Parameters: +// resourceGroupName - name of the resource group within the azure subscription. +// namespaceName - the Namespace name +// parameters - parameters for updating a namespace resource. func (client NamespacesClient) Update(ctx context.Context, resourceGroupName string, namespaceName string, parameters EHNamespace) (result EHNamespace, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/regions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/regions.go index 118dfd461a49..537abd1ec5ae 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/regions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/regions.go @@ -41,8 +41,8 @@ func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsC } // ListBySku gets the available Regions for a given sku -// -// sku is the sku type. +// Parameters: +// sku - the sku type. func (client RegionsClient) ListBySku(ctx context.Context, sku string) (result MessagingRegionsListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: sku, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/applications.go b/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/applications.go index c70036f6dde8..61c0c5313ee9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/applications.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/applications.go @@ -42,9 +42,9 @@ func NewApplicationsClientWithBaseURI(baseURI string, tenantID string) Applicati } // AddOwner add an owner to an application. -// -// applicationObjectID is the object ID of the application to which to add the owner. parameters is the URL of the -// owner object, such as +// Parameters: +// applicationObjectID - the object ID of the application to which to add the owner. +// parameters - the URL of the owner object, such as // https://graph.windows.net/0b1f9851-1bf0-433f-aec3-cb9272f093dc/directoryObjects/f260bbc4-c254-447b-94cf-293b5ec434dd. func (client ApplicationsClient) AddOwner(ctx context.Context, applicationObjectID string, parameters ApplicationAddOwnerParameters) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ @@ -116,8 +116,8 @@ func (client ApplicationsClient) AddOwnerResponder(resp *http.Response) (result } // Create create a new application. -// -// parameters is the parameters for creating an application. +// Parameters: +// parameters - the parameters for creating an application. func (client ApplicationsClient) Create(ctx context.Context, parameters ApplicationCreateParameters) (result Application, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -190,8 +190,8 @@ func (client ApplicationsClient) CreateResponder(resp *http.Response) (result Ap } // Delete delete an application. -// -// applicationObjectID is application object ID. +// Parameters: +// applicationObjectID - application object ID. func (client ApplicationsClient) Delete(ctx context.Context, applicationObjectID string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, applicationObjectID) if err != nil { @@ -254,8 +254,8 @@ func (client ApplicationsClient) DeleteResponder(resp *http.Response) (result au } // Get get an application by object ID. -// -// applicationObjectID is application object ID. +// Parameters: +// applicationObjectID - application object ID. func (client ApplicationsClient) Get(ctx context.Context, applicationObjectID string) (result Application, err error) { req, err := client.GetPreparer(ctx, applicationObjectID) if err != nil { @@ -319,8 +319,8 @@ func (client ApplicationsClient) GetResponder(resp *http.Response) (result Appli } // List lists applications by filter parameters. -// -// filter is the filters to apply to the operation. +// Parameters: +// filter - the filters to apply to the operation. func (client ApplicationsClient) List(ctx context.Context, filter string) (result ApplicationListResultPage, err error) { result.fn = func(lastResult ApplicationListResult) (ApplicationListResult, error) { if lastResult.OdataNextLink == nil || len(to.String(lastResult.OdataNextLink)) < 1 { @@ -398,8 +398,8 @@ func (client ApplicationsClient) ListComplete(ctx context.Context, filter string } // ListKeyCredentials get the keyCredentials associated with an application. -// -// applicationObjectID is application object ID. +// Parameters: +// applicationObjectID - application object ID. func (client ApplicationsClient) ListKeyCredentials(ctx context.Context, applicationObjectID string) (result KeyCredentialListResult, err error) { req, err := client.ListKeyCredentialsPreparer(ctx, applicationObjectID) if err != nil { @@ -463,8 +463,8 @@ func (client ApplicationsClient) ListKeyCredentialsResponder(resp *http.Response } // ListNext gets a list of applications from the current tenant. -// -// nextLink is next link for the list operation. +// Parameters: +// nextLink - next link for the list operation. func (client ApplicationsClient) ListNext(ctx context.Context, nextLink string) (result ApplicationListResult, err error) { req, err := client.ListNextPreparer(ctx, nextLink) if err != nil { @@ -528,8 +528,8 @@ func (client ApplicationsClient) ListNextResponder(resp *http.Response) (result } // ListOwners the owners are a set of non-admin users who are allowed to modify this object. -// -// applicationObjectID is the object ID of the application for which to get owners. +// Parameters: +// applicationObjectID - the object ID of the application for which to get owners. func (client ApplicationsClient) ListOwners(ctx context.Context, applicationObjectID string) (result DirectoryObjectListResult, err error) { req, err := client.ListOwnersPreparer(ctx, applicationObjectID) if err != nil { @@ -593,8 +593,8 @@ func (client ApplicationsClient) ListOwnersResponder(resp *http.Response) (resul } // ListPasswordCredentials get the passwordCredentials associated with an application. -// -// applicationObjectID is application object ID. +// Parameters: +// applicationObjectID - application object ID. func (client ApplicationsClient) ListPasswordCredentials(ctx context.Context, applicationObjectID string) (result PasswordCredentialListResult, err error) { req, err := client.ListPasswordCredentialsPreparer(ctx, applicationObjectID) if err != nil { @@ -658,8 +658,9 @@ func (client ApplicationsClient) ListPasswordCredentialsResponder(resp *http.Res } // Patch update an existing application. -// -// applicationObjectID is application object ID. parameters is parameters to update an existing application. +// Parameters: +// applicationObjectID - application object ID. +// parameters - parameters to update an existing application. func (client ApplicationsClient) Patch(ctx context.Context, applicationObjectID string, parameters ApplicationUpdateParameters) (result autorest.Response, err error) { req, err := client.PatchPreparer(ctx, applicationObjectID, parameters) if err != nil { @@ -724,9 +725,9 @@ func (client ApplicationsClient) PatchResponder(resp *http.Response) (result aut } // UpdateKeyCredentials update the keyCredentials associated with an application. -// -// applicationObjectID is application object ID. parameters is parameters to update the keyCredentials of an -// existing application. +// Parameters: +// applicationObjectID - application object ID. +// parameters - parameters to update the keyCredentials of an existing application. func (client ApplicationsClient) UpdateKeyCredentials(ctx context.Context, applicationObjectID string, parameters KeyCredentialsUpdateParameters) (result autorest.Response, err error) { req, err := client.UpdateKeyCredentialsPreparer(ctx, applicationObjectID, parameters) if err != nil { @@ -791,9 +792,9 @@ func (client ApplicationsClient) UpdateKeyCredentialsResponder(resp *http.Respon } // UpdatePasswordCredentials update passwordCredentials associated with an application. -// -// applicationObjectID is application object ID. parameters is parameters to update passwordCredentials of an -// existing application. +// Parameters: +// applicationObjectID - application object ID. +// parameters - parameters to update passwordCredentials of an existing application. func (client ApplicationsClient) UpdatePasswordCredentials(ctx context.Context, applicationObjectID string, parameters PasswordCredentialsUpdateParameters) (result autorest.Response, err error) { req, err := client.UpdatePasswordCredentialsPreparer(ctx, applicationObjectID, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/domains.go b/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/domains.go index 30d53aa9e3be..e6d990273f0d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/domains.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/domains.go @@ -40,8 +40,8 @@ func NewDomainsClientWithBaseURI(baseURI string, tenantID string) DomainsClient } // Get gets a specific domain in the current tenant. -// -// domainName is name of the domain. +// Parameters: +// domainName - name of the domain. func (client DomainsClient) Get(ctx context.Context, domainName string) (result Domain, err error) { req, err := client.GetPreparer(ctx, domainName) if err != nil { @@ -105,8 +105,8 @@ func (client DomainsClient) GetResponder(resp *http.Response) (result Domain, er } // List gets a list of domains for the current tenant. -// -// filter is the filter to apply to the operation. +// Parameters: +// filter - the filter to apply to the operation. func (client DomainsClient) List(ctx context.Context, filter string) (result DomainListResult, err error) { req, err := client.ListPreparer(ctx, filter) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/groups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/groups.go index 7d869adad070..9fbe85cbbd30 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/groups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/groups.go @@ -42,9 +42,9 @@ func NewGroupsClientWithBaseURI(baseURI string, tenantID string) GroupsClient { } // AddMember add a member to a group. -// -// groupObjectID is the object ID of the group to which to add the member. parameters is the URL of the member -// object, such as +// Parameters: +// groupObjectID - the object ID of the group to which to add the member. +// parameters - the URL of the member object, such as // https://graph.windows.net/0b1f9851-1bf0-433f-aec3-cb9272f093dc/directoryObjects/f260bbc4-c254-447b-94cf-293b5ec434dd. func (client GroupsClient) AddMember(ctx context.Context, groupObjectID string, parameters GroupAddMemberParameters) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ @@ -116,8 +116,8 @@ func (client GroupsClient) AddMemberResponder(resp *http.Response) (result autor } // Create create a group in the directory. -// -// parameters is the parameters for the group to create. +// Parameters: +// parameters - the parameters for the group to create. func (client GroupsClient) Create(ctx context.Context, parameters GroupCreateParameters) (result ADGroup, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -191,8 +191,8 @@ func (client GroupsClient) CreateResponder(resp *http.Response) (result ADGroup, } // Delete delete a group from the directory. -// -// objectID is the object ID of the group to delete. +// Parameters: +// objectID - the object ID of the group to delete. func (client GroupsClient) Delete(ctx context.Context, objectID string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, objectID) if err != nil { @@ -255,8 +255,8 @@ func (client GroupsClient) DeleteResponder(resp *http.Response) (result autorest } // Get gets group information from the directory. -// -// objectID is the object ID of the user for which to get group information. +// Parameters: +// objectID - the object ID of the user for which to get group information. func (client GroupsClient) Get(ctx context.Context, objectID string) (result ADGroup, err error) { req, err := client.GetPreparer(ctx, objectID) if err != nil { @@ -320,8 +320,8 @@ func (client GroupsClient) GetResponder(resp *http.Response) (result ADGroup, er } // GetGroupMembers gets the members of a group. -// -// objectID is the object ID of the group whose members should be retrieved. +// Parameters: +// objectID - the object ID of the group whose members should be retrieved. func (client GroupsClient) GetGroupMembers(ctx context.Context, objectID string) (result GetObjectsResultPage, err error) { result.fn = func(lastResult GetObjectsResult) (GetObjectsResult, error) { if lastResult.OdataNextLink == nil || len(to.String(lastResult.OdataNextLink)) < 1 { @@ -397,8 +397,8 @@ func (client GroupsClient) GetGroupMembersComplete(ctx context.Context, objectID } // GetGroupMembersNext gets the members of a group. -// -// nextLink is next link for the list operation. +// Parameters: +// nextLink - next link for the list operation. func (client GroupsClient) GetGroupMembersNext(ctx context.Context, nextLink string) (result GetObjectsResult, err error) { req, err := client.GetGroupMembersNextPreparer(ctx, nextLink) if err != nil { @@ -462,9 +462,9 @@ func (client GroupsClient) GetGroupMembersNextResponder(resp *http.Response) (re } // GetMemberGroups gets a collection of object IDs of groups of which the specified group is a member. -// -// objectID is the object ID of the group for which to get group membership. parameters is group filtering -// parameters. +// Parameters: +// objectID - the object ID of the group for which to get group membership. +// parameters - group filtering parameters. func (client GroupsClient) GetMemberGroups(ctx context.Context, objectID string, parameters GroupGetMemberGroupsParameters) (result GroupGetMemberGroupsResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -537,8 +537,8 @@ func (client GroupsClient) GetMemberGroupsResponder(resp *http.Response) (result // IsMemberOf checks whether the specified user, group, contact, or service principal is a direct or transitive member // of the specified group. -// -// parameters is the check group membership parameters. +// Parameters: +// parameters - the check group membership parameters. func (client GroupsClient) IsMemberOf(ctx context.Context, parameters CheckGroupMembershipParameters) (result CheckGroupMembershipResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -610,8 +610,8 @@ func (client GroupsClient) IsMemberOfResponder(resp *http.Response) (result Chec } // List gets list of groups for the current tenant. -// -// filter is the filter to apply to the operation. +// Parameters: +// filter - the filter to apply to the operation. func (client GroupsClient) List(ctx context.Context, filter string) (result GroupListResultPage, err error) { result.fn = func(lastResult GroupListResult) (GroupListResult, error) { if lastResult.OdataNextLink == nil || len(to.String(lastResult.OdataNextLink)) < 1 { @@ -689,8 +689,8 @@ func (client GroupsClient) ListComplete(ctx context.Context, filter string) (res } // ListNext gets a list of groups for the current tenant. -// -// nextLink is next link for the list operation. +// Parameters: +// nextLink - next link for the list operation. func (client GroupsClient) ListNext(ctx context.Context, nextLink string) (result GroupListResult, err error) { req, err := client.ListNextPreparer(ctx, nextLink) if err != nil { @@ -754,8 +754,9 @@ func (client GroupsClient) ListNextResponder(resp *http.Response) (result GroupL } // RemoveMember remove a member from a group. -// -// groupObjectID is the object ID of the group from which to remove the member. memberObjectID is member object id +// Parameters: +// groupObjectID - the object ID of the group from which to remove the member. +// memberObjectID - member object id func (client GroupsClient) RemoveMember(ctx context.Context, groupObjectID string, memberObjectID string) (result autorest.Response, err error) { req, err := client.RemoveMemberPreparer(ctx, groupObjectID, memberObjectID) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/objects.go b/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/objects.go index bc4178e5659f..638a0f02a183 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/objects.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/objects.go @@ -104,8 +104,8 @@ func (client ObjectsClient) GetCurrentUserResponder(resp *http.Response) (result } // GetObjectsByObjectIds gets AD group membership for the specified AD object IDs. -// -// parameters is objects filtering parameters. +// Parameters: +// parameters - objects filtering parameters. func (client ObjectsClient) GetObjectsByObjectIds(ctx context.Context, parameters GetObjectsParameters) (result GetObjectsResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -188,8 +188,8 @@ func (client ObjectsClient) GetObjectsByObjectIdsComplete(ctx context.Context, p } // GetObjectsByObjectIdsNext gets AD group membership for the specified AD object IDs. -// -// nextLink is next link for the list operation. +// Parameters: +// nextLink - next link for the list operation. func (client ObjectsClient) GetObjectsByObjectIdsNext(ctx context.Context, nextLink string) (result GetObjectsResult, err error) { req, err := client.GetObjectsByObjectIdsNextPreparer(ctx, nextLink) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/serviceprincipals.go b/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/serviceprincipals.go index 27392c322aba..4caf3f817e1f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/serviceprincipals.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/serviceprincipals.go @@ -42,8 +42,8 @@ func NewServicePrincipalsClientWithBaseURI(baseURI string, tenantID string) Serv } // Create creates a service principal in the directory. -// -// parameters is parameters to create a service principal. +// Parameters: +// parameters - parameters to create a service principal. func (client ServicePrincipalsClient) Create(ctx context.Context, parameters ServicePrincipalCreateParameters) (result ServicePrincipal, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -115,8 +115,8 @@ func (client ServicePrincipalsClient) CreateResponder(resp *http.Response) (resu } // Delete deletes a service principal from the directory. -// -// objectID is the object ID of the service principal to delete. +// Parameters: +// objectID - the object ID of the service principal to delete. func (client ServicePrincipalsClient) Delete(ctx context.Context, objectID string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, objectID) if err != nil { @@ -179,8 +179,8 @@ func (client ServicePrincipalsClient) DeleteResponder(resp *http.Response) (resu } // Get gets service principal information from the directory. -// -// objectID is the object ID of the service principal to get. +// Parameters: +// objectID - the object ID of the service principal to get. func (client ServicePrincipalsClient) Get(ctx context.Context, objectID string) (result ServicePrincipal, err error) { req, err := client.GetPreparer(ctx, objectID) if err != nil { @@ -244,8 +244,8 @@ func (client ServicePrincipalsClient) GetResponder(resp *http.Response) (result } // List gets a list of service principals from the current tenant. -// -// filter is the filter to apply to the operation. +// Parameters: +// filter - the filter to apply to the operation. func (client ServicePrincipalsClient) List(ctx context.Context, filter string) (result ServicePrincipalListResultPage, err error) { result.fn = func(lastResult ServicePrincipalListResult) (ServicePrincipalListResult, error) { if lastResult.OdataNextLink == nil || len(to.String(lastResult.OdataNextLink)) < 1 { @@ -323,8 +323,8 @@ func (client ServicePrincipalsClient) ListComplete(ctx context.Context, filter s } // ListKeyCredentials get the keyCredentials associated with the specified service principal. -// -// objectID is the object ID of the service principal for which to get keyCredentials. +// Parameters: +// objectID - the object ID of the service principal for which to get keyCredentials. func (client ServicePrincipalsClient) ListKeyCredentials(ctx context.Context, objectID string) (result KeyCredentialListResult, err error) { req, err := client.ListKeyCredentialsPreparer(ctx, objectID) if err != nil { @@ -388,8 +388,8 @@ func (client ServicePrincipalsClient) ListKeyCredentialsResponder(resp *http.Res } // ListNext gets a list of service principals from the current tenant. -// -// nextLink is next link for the list operation. +// Parameters: +// nextLink - next link for the list operation. func (client ServicePrincipalsClient) ListNext(ctx context.Context, nextLink string) (result ServicePrincipalListResult, err error) { req, err := client.ListNextPreparer(ctx, nextLink) if err != nil { @@ -453,8 +453,8 @@ func (client ServicePrincipalsClient) ListNextResponder(resp *http.Response) (re } // ListOwners the owners are a set of non-admin users who are allowed to modify this object. -// -// objectID is the object ID of the service principal for which to get owners. +// Parameters: +// objectID - the object ID of the service principal for which to get owners. func (client ServicePrincipalsClient) ListOwners(ctx context.Context, objectID string) (result DirectoryObjectListResult, err error) { req, err := client.ListOwnersPreparer(ctx, objectID) if err != nil { @@ -518,8 +518,8 @@ func (client ServicePrincipalsClient) ListOwnersResponder(resp *http.Response) ( } // ListPasswordCredentials gets the passwordCredentials associated with a service principal. -// -// objectID is the object ID of the service principal. +// Parameters: +// objectID - the object ID of the service principal. func (client ServicePrincipalsClient) ListPasswordCredentials(ctx context.Context, objectID string) (result PasswordCredentialListResult, err error) { req, err := client.ListPasswordCredentialsPreparer(ctx, objectID) if err != nil { @@ -583,9 +583,9 @@ func (client ServicePrincipalsClient) ListPasswordCredentialsResponder(resp *htt } // UpdateKeyCredentials update the keyCredentials associated with a service principal. -// -// objectID is the object ID for which to get service principal information. parameters is parameters to update the -// keyCredentials of an existing service principal. +// Parameters: +// objectID - the object ID for which to get service principal information. +// parameters - parameters to update the keyCredentials of an existing service principal. func (client ServicePrincipalsClient) UpdateKeyCredentials(ctx context.Context, objectID string, parameters KeyCredentialsUpdateParameters) (result autorest.Response, err error) { req, err := client.UpdateKeyCredentialsPreparer(ctx, objectID, parameters) if err != nil { @@ -650,9 +650,9 @@ func (client ServicePrincipalsClient) UpdateKeyCredentialsResponder(resp *http.R } // UpdatePasswordCredentials updates the passwordCredentials associated with a service principal. -// -// objectID is the object ID of the service principal. parameters is parameters to update the passwordCredentials -// of an existing service principal. +// Parameters: +// objectID - the object ID of the service principal. +// parameters - parameters to update the passwordCredentials of an existing service principal. func (client ServicePrincipalsClient) UpdatePasswordCredentials(ctx context.Context, objectID string, parameters PasswordCredentialsUpdateParameters) (result autorest.Response, err error) { req, err := client.UpdatePasswordCredentialsPreparer(ctx, objectID, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/users.go b/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/users.go index 47db7ba00eee..9d0cd833ad29 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/users.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac/users.go @@ -42,8 +42,8 @@ func NewUsersClientWithBaseURI(baseURI string, tenantID string) UsersClient { } // Create create a new user. -// -// parameters is parameters to create a user. +// Parameters: +// parameters - parameters to create a user. func (client UsersClient) Create(ctx context.Context, parameters UserCreateParameters) (result User, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -119,8 +119,8 @@ func (client UsersClient) CreateResponder(resp *http.Response) (result User, err } // Delete delete a user. -// -// upnOrObjectID is the object ID or principal name of the user to delete. +// Parameters: +// upnOrObjectID - the object ID or principal name of the user to delete. func (client UsersClient) Delete(ctx context.Context, upnOrObjectID string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, upnOrObjectID) if err != nil { @@ -183,8 +183,8 @@ func (client UsersClient) DeleteResponder(resp *http.Response) (result autorest. } // Get gets user information from the directory. -// -// upnOrObjectID is the object ID or principal name of the user for which to get information. +// Parameters: +// upnOrObjectID - the object ID or principal name of the user for which to get information. func (client UsersClient) Get(ctx context.Context, upnOrObjectID string) (result User, err error) { req, err := client.GetPreparer(ctx, upnOrObjectID) if err != nil { @@ -248,9 +248,9 @@ func (client UsersClient) GetResponder(resp *http.Response) (result User, err er } // GetMemberGroups gets a collection that contains the object IDs of the groups of which the user is a member. -// -// objectID is the object ID of the user for which to get group membership. parameters is user filtering -// parameters. +// Parameters: +// objectID - the object ID of the user for which to get group membership. +// parameters - user filtering parameters. func (client UsersClient) GetMemberGroups(ctx context.Context, objectID string, parameters UserGetMemberGroupsParameters) (result UserGetMemberGroupsResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -322,8 +322,8 @@ func (client UsersClient) GetMemberGroupsResponder(resp *http.Response) (result } // List gets list of users for the current tenant. -// -// filter is the filter to apply to the operation. +// Parameters: +// filter - the filter to apply to the operation. func (client UsersClient) List(ctx context.Context, filter string) (result UserListResultPage, err error) { result.fn = func(lastResult UserListResult) (UserListResult, error) { if lastResult.OdataNextLink == nil || len(to.String(lastResult.OdataNextLink)) < 1 { @@ -401,8 +401,8 @@ func (client UsersClient) ListComplete(ctx context.Context, filter string) (resu } // ListNext gets a list of users for the current tenant. -// -// nextLink is next link for the list operation. +// Parameters: +// nextLink - next link for the list operation. func (client UsersClient) ListNext(ctx context.Context, nextLink string) (result UserListResult, err error) { req, err := client.ListNextPreparer(ctx, nextLink) if err != nil { @@ -466,9 +466,9 @@ func (client UsersClient) ListNextResponder(resp *http.Response) (result UserLis } // Update updates a user. -// -// upnOrObjectID is the object ID or principal name of the user to update. parameters is parameters to update an -// existing user. +// Parameters: +// upnOrObjectID - the object ID or principal name of the user to update. +// parameters - parameters to update an existing user. func (client UsersClient) Update(ctx context.Context, upnOrObjectID string, parameters UserUpdateParameters) (result autorest.Response, err error) { req, err := client.UpdatePreparer(ctx, upnOrObjectID, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/certificates.go b/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/certificates.go index 854ff2d1262f..8939377627d6 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/certificates.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/certificates.go @@ -41,11 +41,13 @@ func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) Cer } // CreateOrUpdate adds new or replaces existing certificate. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. certificateName is the name of the certificate certificateDescription is the certificate body. ifMatch -// is eTag of the Certificate. Do not specify for creating a brand new certificate. Required to update an existing -// certificate. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// certificateName - the name of the certificate +// certificateDescription - the certificate body. +// ifMatch - eTag of the Certificate. Do not specify for creating a brand new certificate. Required to update +// an existing certificate. func (client CertificatesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, resourceName string, certificateName string, certificateDescription CertificateBodyDescription, ifMatch string) (result CertificateDescription, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: certificateName, @@ -123,9 +125,11 @@ func (client CertificatesClient) CreateOrUpdateResponder(resp *http.Response) (r } // Delete deletes an existing X509 certificate or does nothing if it does not exist. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. certificateName is the name of the certificate ifMatch is eTag of the Certificate. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// certificateName - the name of the certificate +// ifMatch - eTag of the Certificate. func (client CertificatesClient) Delete(ctx context.Context, resourceGroupName string, resourceName string, certificateName string, ifMatch string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: certificateName, @@ -198,9 +202,11 @@ func (client CertificatesClient) DeleteResponder(resp *http.Response) (result au // GenerateVerificationCode generates verification code for proof of possession flow. The verification code will be // used to generate a leaf certificate. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. certificateName is the name of the certificate ifMatch is eTag of the Certificate. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// certificateName - the name of the certificate +// ifMatch - eTag of the Certificate. func (client CertificatesClient) GenerateVerificationCode(ctx context.Context, resourceGroupName string, resourceName string, certificateName string, ifMatch string) (result CertificateWithNonceDescription, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: certificateName, @@ -273,9 +279,10 @@ func (client CertificatesClient) GenerateVerificationCodeResponder(resp *http.Re } // Get returns the certificate. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. certificateName is the name of the certificate +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// certificateName - the name of the certificate func (client CertificatesClient) Get(ctx context.Context, resourceGroupName string, resourceName string, certificateName string) (result CertificateDescription, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: certificateName, @@ -347,9 +354,9 @@ func (client CertificatesClient) GetResponder(resp *http.Response) (result Certi } // ListByIotHub returns the list of certificates. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. func (client CertificatesClient) ListByIotHub(ctx context.Context, resourceGroupName string, resourceName string) (result CertificateListDescription, err error) { req, err := client.ListByIotHubPreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -415,10 +422,12 @@ func (client CertificatesClient) ListByIotHubResponder(resp *http.Response) (res // Verify verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre // uploaded certificate. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. certificateName is the name of the certificate certificateVerificationBody is the name of the -// certificate ifMatch is eTag of the Certificate. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// certificateName - the name of the certificate +// certificateVerificationBody - the name of the certificate +// ifMatch - eTag of the Certificate. func (client CertificatesClient) Verify(ctx context.Context, resourceGroupName string, resourceName string, certificateName string, certificateVerificationBody CertificateVerificationDescription, ifMatch string) (result CertificateDescription, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: certificateName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/iothubresource.go b/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/iothubresource.go index 713cbb91e16d..cd05df353aeb 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/iothubresource.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/iothubresource.go @@ -41,8 +41,9 @@ func NewIotHubResourceClientWithBaseURI(baseURI string, subscriptionID string) I } // CheckNameAvailability check if an IoT hub name is available. -// -// operationInputs is set the name parameter in the OperationInputs structure to the name of the IoT hub to check. +// Parameters: +// operationInputs - set the name parameter in the OperationInputs structure to the name of the IoT hub to +// check. func (client IotHubResourceClient) CheckNameAvailability(ctx context.Context, operationInputs OperationInputs) (result IotHubNameAvailabilityInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: operationInputs, @@ -113,10 +114,11 @@ func (client IotHubResourceClient) CheckNameAvailabilityResponder(resp *http.Res } // CreateEventHubConsumerGroup add a consumer group to an Event Hub-compatible endpoint in an IoT hub. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. eventHubEndpointName is the name of the Event Hub-compatible endpoint in the IoT hub. name is the name -// of the consumer group to add. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// eventHubEndpointName - the name of the Event Hub-compatible endpoint in the IoT hub. +// name - the name of the consumer group to add. func (client IotHubResourceClient) CreateEventHubConsumerGroup(ctx context.Context, resourceGroupName string, resourceName string, eventHubEndpointName string, name string) (result EventHubConsumerGroupInfo, err error) { req, err := client.CreateEventHubConsumerGroupPreparer(ctx, resourceGroupName, resourceName, eventHubEndpointName, name) if err != nil { @@ -185,10 +187,12 @@ func (client IotHubResourceClient) CreateEventHubConsumerGroupResponder(resp *ht // CreateOrUpdate create or update the metadata of an Iot hub. The usual pattern to modify a property is to retrieve // the IoT hub metadata and security metadata, and then combine them with the modified values in a new body to update // the IoT hub. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. iotHubDescription is the IoT hub metadata and security metadata. ifMatch is eTag of the IoT Hub. Do not -// specify for creating a brand new IoT Hub. Required to update an existing IoT Hub. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// iotHubDescription - the IoT hub metadata and security metadata. +// ifMatch - eTag of the IoT Hub. Do not specify for creating a brand new IoT Hub. Required to update an +// existing IoT Hub. func (client IotHubResourceClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, resourceName string, iotHubDescription IotHubDescription, ifMatch string) (result IotHubResourceCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: iotHubDescription, @@ -294,9 +298,9 @@ func (client IotHubResourceClient) CreateOrUpdateResponder(resp *http.Response) } // Delete delete an IoT hub. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. func (client IotHubResourceClient) Delete(ctx context.Context, resourceGroupName string, resourceName string) (result IotHubResourceDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -363,10 +367,11 @@ func (client IotHubResourceClient) DeleteResponder(resp *http.Response) (result } // DeleteEventHubConsumerGroup delete a consumer group from an Event Hub-compatible endpoint in an IoT hub. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. eventHubEndpointName is the name of the Event Hub-compatible endpoint in the IoT hub. name is the name -// of the consumer group to delete. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// eventHubEndpointName - the name of the Event Hub-compatible endpoint in the IoT hub. +// name - the name of the consumer group to delete. func (client IotHubResourceClient) DeleteEventHubConsumerGroup(ctx context.Context, resourceGroupName string, resourceName string, eventHubEndpointName string, name string) (result autorest.Response, err error) { req, err := client.DeleteEventHubConsumerGroupPreparer(ctx, resourceGroupName, resourceName, eventHubEndpointName, name) if err != nil { @@ -434,9 +439,10 @@ func (client IotHubResourceClient) DeleteEventHubConsumerGroupResponder(resp *ht // ExportDevices exports all the device identities in the IoT hub identity registry to an Azure Storage blob container. // For more information, see: // https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. exportDevicesParameters is the parameters that specify the export devices operation. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// exportDevicesParameters - the parameters that specify the export devices operation. func (client IotHubResourceClient) ExportDevices(ctx context.Context, resourceGroupName string, resourceName string, exportDevicesParameters ExportDevicesRequest) (result JobResponse, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: exportDevicesParameters, @@ -510,9 +516,9 @@ func (client IotHubResourceClient) ExportDevicesResponder(resp *http.Response) ( } // Get get the non-security related metadata of an IoT hub. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. func (client IotHubResourceClient) Get(ctx context.Context, resourceGroupName string, resourceName string) (result IotHubDescription, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -577,10 +583,11 @@ func (client IotHubResourceClient) GetResponder(resp *http.Response) (result Iot } // GetEventHubConsumerGroup get a consumer group from the Event Hub-compatible device-to-cloud endpoint for an IoT hub. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. eventHubEndpointName is the name of the Event Hub-compatible endpoint in the IoT hub. name is the name -// of the consumer group to retrieve. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// eventHubEndpointName - the name of the Event Hub-compatible endpoint in the IoT hub. +// name - the name of the consumer group to retrieve. func (client IotHubResourceClient) GetEventHubConsumerGroup(ctx context.Context, resourceGroupName string, resourceName string, eventHubEndpointName string, name string) (result EventHubConsumerGroupInfo, err error) { req, err := client.GetEventHubConsumerGroupPreparer(ctx, resourceGroupName, resourceName, eventHubEndpointName, name) if err != nil { @@ -648,9 +655,10 @@ func (client IotHubResourceClient) GetEventHubConsumerGroupResponder(resp *http. // GetJob get the details of a job from an IoT hub. For more information, see: // https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. jobID is the job identifier. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// jobID - the job identifier. func (client IotHubResourceClient) GetJob(ctx context.Context, resourceGroupName string, resourceName string, jobID string) (result JobResponse, err error) { req, err := client.GetJobPreparer(ctx, resourceGroupName, resourceName, jobID) if err != nil { @@ -717,9 +725,10 @@ func (client IotHubResourceClient) GetJobResponder(resp *http.Response) (result // GetKeysForKeyName get a shared access policy by name from an IoT hub. For more information, see: // https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-security. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. keyName is the name of the shared access policy. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// keyName - the name of the shared access policy. func (client IotHubResourceClient) GetKeysForKeyName(ctx context.Context, resourceGroupName string, resourceName string, keyName string) (result SharedAccessSignatureAuthorizationRule, err error) { req, err := client.GetKeysForKeyNamePreparer(ctx, resourceGroupName, resourceName, keyName) if err != nil { @@ -785,9 +794,9 @@ func (client IotHubResourceClient) GetKeysForKeyNameResponder(resp *http.Respons } // GetQuotaMetrics get the quota metrics for an IoT hub. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. func (client IotHubResourceClient) GetQuotaMetrics(ctx context.Context, resourceGroupName string, resourceName string) (result IotHubQuotaMetricInfoListResultPage, err error) { result.fn = client.getQuotaMetricsNextResults req, err := client.GetQuotaMetricsPreparer(ctx, resourceGroupName, resourceName) @@ -880,9 +889,9 @@ func (client IotHubResourceClient) GetQuotaMetricsComplete(ctx context.Context, } // GetStats get the statistics from an IoT hub. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. func (client IotHubResourceClient) GetStats(ctx context.Context, resourceGroupName string, resourceName string) (result RegistryStatistics, err error) { req, err := client.GetStatsPreparer(ctx, resourceGroupName, resourceName) if err != nil { @@ -947,9 +956,9 @@ func (client IotHubResourceClient) GetStatsResponder(resp *http.Response) (resul } // GetValidSkus get the list of valid SKUs for an IoT hub. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. func (client IotHubResourceClient) GetValidSkus(ctx context.Context, resourceGroupName string, resourceName string) (result IotHubSkuDescriptionListResultPage, err error) { result.fn = client.getValidSkusNextResults req, err := client.GetValidSkusPreparer(ctx, resourceGroupName, resourceName) @@ -1044,9 +1053,10 @@ func (client IotHubResourceClient) GetValidSkusComplete(ctx context.Context, res // ImportDevices import, update, or delete device identities in the IoT hub identity registry from a blob. For more // information, see: // https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. importDevicesParameters is the parameters that specify the import devices operation. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// importDevicesParameters - the parameters that specify the import devices operation. func (client IotHubResourceClient) ImportDevices(ctx context.Context, resourceGroupName string, resourceName string, importDevicesParameters ImportDevicesRequest) (result JobResponse, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: importDevicesParameters, @@ -1120,8 +1130,8 @@ func (client IotHubResourceClient) ImportDevicesResponder(resp *http.Response) ( } // ListByResourceGroup get all the IoT hubs in a resource group. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. func (client IotHubResourceClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result IotHubDescriptionListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) @@ -1304,9 +1314,10 @@ func (client IotHubResourceClient) ListBySubscriptionComplete(ctx context.Contex // ListEventHubConsumerGroups get a list of the consumer groups in the Event Hub-compatible device-to-cloud endpoint in // an IoT hub. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. eventHubEndpointName is the name of the Event Hub-compatible endpoint. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. +// eventHubEndpointName - the name of the Event Hub-compatible endpoint. func (client IotHubResourceClient) ListEventHubConsumerGroups(ctx context.Context, resourceGroupName string, resourceName string, eventHubEndpointName string) (result EventHubConsumerGroupsListResultPage, err error) { result.fn = client.listEventHubConsumerGroupsNextResults req, err := client.ListEventHubConsumerGroupsPreparer(ctx, resourceGroupName, resourceName, eventHubEndpointName) @@ -1401,9 +1412,9 @@ func (client IotHubResourceClient) ListEventHubConsumerGroupsComplete(ctx contex // ListJobs get a list of all the jobs in an IoT hub. For more information, see: // https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. func (client IotHubResourceClient) ListJobs(ctx context.Context, resourceGroupName string, resourceName string) (result JobResponseListResultPage, err error) { result.fn = client.listJobsNextResults req, err := client.ListJobsPreparer(ctx, resourceGroupName, resourceName) @@ -1497,9 +1508,9 @@ func (client IotHubResourceClient) ListJobsComplete(ctx context.Context, resourc // ListKeys get the security metadata for an IoT hub. For more information, see: // https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-security. -// -// resourceGroupName is the name of the resource group that contains the IoT hub. resourceName is the name of the -// IoT hub. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT hub. +// resourceName - the name of the IoT hub. func (client IotHubResourceClient) ListKeys(ctx context.Context, resourceGroupName string, resourceName string) (result SharedAccessSignatureAuthorizationRuleListResultPage, err error) { result.fn = client.listKeysNextResults req, err := client.ListKeysPreparer(ctx, resourceGroupName, resourceName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault/client.go index 26df00d4b964..73558939d68f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault/client.go @@ -54,8 +54,9 @@ func NewWithoutDefaults() BaseClient { // geographical boundaries only; meaning that a BACKUP from one geographical area cannot be restored to another // geographical area. For example, a backup from the US geographical area cannot be restored in an EU geographical // area. This operation requires the key/backup permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the key. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the key. func (client BaseClient) BackupKey(ctx context.Context, vaultBaseURL string, keyName string) (result BackupKeyResult, err error) { req, err := client.BackupKeyPreparer(ctx, vaultBaseURL, keyName) if err != nil { @@ -123,9 +124,9 @@ func (client BaseClient) BackupKeyResponder(resp *http.Response) (result BackupK // BackupSecret requests that a backup of the specified secret be downloaded to the client. All versions of the secret // will be downloaded. This operation requires the secrets/backup permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. secretName is the name of the -// secret. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// secretName - the name of the secret. func (client BaseClient) BackupSecret(ctx context.Context, vaultBaseURL string, secretName string) (result BackupSecretResult, err error) { req, err := client.BackupSecretPreparer(ctx, vaultBaseURL, secretName) if err != nil { @@ -193,9 +194,10 @@ func (client BaseClient) BackupSecretResponder(resp *http.Response) (result Back // CreateCertificate if this is the first version, the certificate resource is created. This operation requires the // certificates/create permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate. parameters is the parameters to create a certificate. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate. +// parameters - the parameters to create a certificate. func (client BaseClient) CreateCertificate(ctx context.Context, vaultBaseURL string, certificateName string, parameters CertificateCreateParameters) (result CertificateOperation, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: certificateName, @@ -278,9 +280,10 @@ func (client BaseClient) CreateCertificateResponder(resp *http.Response) (result // CreateKey the create key operation can be used to create any key type in Azure Key Vault. If the named key already // exists, Azure Key Vault creates a new version of the key. It requires the keys/create permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name for the new -// key. The system will generate the version name for the new key. parameters is the parameters to create a key. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name for the new key. The system will generate the version name for the new key. +// parameters - the parameters to create a key. func (client BaseClient) CreateKey(ctx context.Context, vaultBaseURL string, keyName string, parameters KeyCreateParameters) (result KeyBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: keyName, @@ -359,9 +362,11 @@ func (client BaseClient) CreateKeyResponder(resp *http.Response) (result KeyBund // decrypted, the size of this block is dependent on the target key and the algorithm to be used. The DECRYPT operation // applies to asymmetric and symmetric keys stored in Azure Key Vault since it uses the private portion of the key. // This operation requires the keys/decrypt permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the key. -// keyVersion is the version of the key. parameters is the parameters for the decryption operation. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the key. +// keyVersion - the version of the key. +// parameters - the parameters for the decryption operation. func (client BaseClient) Decrypt(ctx context.Context, vaultBaseURL string, keyName string, keyVersion string, parameters KeyOperationsParameters) (result KeyOperationResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -439,9 +444,9 @@ func (client BaseClient) DecryptResponder(resp *http.Response) (result KeyOperat // DeleteCertificate deletes all versions of a certificate object along with its associated policy. Delete certificate // cannot be used to remove individual versions of a certificate object. This operation requires the // certificates/delete permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate. func (client BaseClient) DeleteCertificate(ctx context.Context, vaultBaseURL string, certificateName string) (result DeletedCertificateBundle, err error) { req, err := client.DeleteCertificatePreparer(ctx, vaultBaseURL, certificateName) if err != nil { @@ -509,8 +514,8 @@ func (client BaseClient) DeleteCertificateResponder(resp *http.Response) (result // DeleteCertificateContacts deletes the certificate contacts for a specified key vault certificate. This operation // requires the certificates/managecontacts permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. func (client BaseClient) DeleteCertificateContacts(ctx context.Context, vaultBaseURL string) (result Contacts, err error) { req, err := client.DeleteCertificateContactsPreparer(ctx, vaultBaseURL) if err != nil { @@ -574,9 +579,9 @@ func (client BaseClient) DeleteCertificateContactsResponder(resp *http.Response) // DeleteCertificateIssuer the DeleteCertificateIssuer operation permanently removes the specified certificate issuer // from the vault. This operation requires the certificates/manageissuers/deleteissuers permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. issuerName is the name of the -// issuer. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// issuerName - the name of the issuer. func (client BaseClient) DeleteCertificateIssuer(ctx context.Context, vaultBaseURL string, issuerName string) (result IssuerBundle, err error) { req, err := client.DeleteCertificateIssuerPreparer(ctx, vaultBaseURL, issuerName) if err != nil { @@ -644,9 +649,9 @@ func (client BaseClient) DeleteCertificateIssuerResponder(resp *http.Response) ( // DeleteCertificateOperation deletes the creation operation for a specified certificate that is in the process of // being created. The certificate is no longer created. This operation requires the certificates/update permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate. func (client BaseClient) DeleteCertificateOperation(ctx context.Context, vaultBaseURL string, certificateName string) (result CertificateOperation, err error) { req, err := client.DeleteCertificateOperationPreparer(ctx, vaultBaseURL, certificateName) if err != nil { @@ -715,9 +720,9 @@ func (client BaseClient) DeleteCertificateOperationResponder(resp *http.Response // DeleteKey the delete key operation cannot be used to remove individual versions of a key. This operation removes the // cryptographic material associated with the key, which means the key is not usable for Sign/Verify, Wrap/Unwrap or // Encrypt/Decrypt operations. This operation requires the keys/delete permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the key to -// delete. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the key to delete. func (client BaseClient) DeleteKey(ctx context.Context, vaultBaseURL string, keyName string) (result DeletedKeyBundle, err error) { req, err := client.DeleteKeyPreparer(ctx, vaultBaseURL, keyName) if err != nil { @@ -785,9 +790,10 @@ func (client BaseClient) DeleteKeyResponder(resp *http.Response) (result Deleted // DeleteSasDefinition deletes a SAS definition from a specified storage account. This operation requires the // storage/deletesas permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. storageAccountName is the name of -// the storage account. sasDefinitionName is the name of the SAS definition. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// storageAccountName - the name of the storage account. +// sasDefinitionName - the name of the SAS definition. func (client BaseClient) DeleteSasDefinition(ctx context.Context, vaultBaseURL string, storageAccountName string, sasDefinitionName string) (result SasDefinitionBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: storageAccountName, @@ -864,9 +870,9 @@ func (client BaseClient) DeleteSasDefinitionResponder(resp *http.Response) (resu // DeleteSecret the DELETE operation applies to any secret stored in Azure Key Vault. DELETE cannot be applied to an // individual version of a secret. This operation requires the secrets/delete permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. secretName is the name of the -// secret. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// secretName - the name of the secret. func (client BaseClient) DeleteSecret(ctx context.Context, vaultBaseURL string, secretName string) (result DeletedSecretBundle, err error) { req, err := client.DeleteSecretPreparer(ctx, vaultBaseURL, secretName) if err != nil { @@ -933,9 +939,9 @@ func (client BaseClient) DeleteSecretResponder(resp *http.Response) (result Dele } // DeleteStorageAccount deletes a storage account. This operation requires the storage/delete permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. storageAccountName is the name of -// the storage account. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// storageAccountName - the name of the storage account. func (client BaseClient) DeleteStorageAccount(ctx context.Context, vaultBaseURL string, storageAccountName string) (result StorageBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: storageAccountName, @@ -1014,9 +1020,11 @@ func (client BaseClient) DeleteStorageAccountResponder(resp *http.Response) (res // using public portion of the key. This operation is supported for asymmetric keys as a convenience for callers that // have a key-reference but do not have access to the public key material. This operation requires the keys/encypt // permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the key. -// keyVersion is the version of the key. parameters is the parameters for the encryption operation. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the key. +// keyVersion - the version of the key. +// parameters - the parameters for the encryption operation. func (client BaseClient) Encrypt(ctx context.Context, vaultBaseURL string, keyName string, keyVersion string, parameters KeyOperationsParameters) (result KeyOperationResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -1093,9 +1101,10 @@ func (client BaseClient) EncryptResponder(resp *http.Response) (result KeyOperat // GetCertificate gets information about a specific certificate. This operation requires the certificates/get // permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate in the given vault. certificateVersion is the version of the certificate. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate in the given vault. +// certificateVersion - the version of the certificate. func (client BaseClient) GetCertificate(ctx context.Context, vaultBaseURL string, certificateName string, certificateVersion string) (result CertificateBundle, err error) { req, err := client.GetCertificatePreparer(ctx, vaultBaseURL, certificateName, certificateVersion) if err != nil { @@ -1164,8 +1173,8 @@ func (client BaseClient) GetCertificateResponder(resp *http.Response) (result Ce // GetCertificateContacts the GetCertificateContacts operation returns the set of certificate contact resources in the // specified key vault. This operation requires the certificates/managecontacts permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. func (client BaseClient) GetCertificateContacts(ctx context.Context, vaultBaseURL string) (result Contacts, err error) { req, err := client.GetCertificateContactsPreparer(ctx, vaultBaseURL) if err != nil { @@ -1229,9 +1238,9 @@ func (client BaseClient) GetCertificateContactsResponder(resp *http.Response) (r // GetCertificateIssuer the GetCertificateIssuer operation returns the specified certificate issuer resources in the // specified key vault. This operation requires the certificates/manageissuers/getissuers permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. issuerName is the name of the -// issuer. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// issuerName - the name of the issuer. func (client BaseClient) GetCertificateIssuer(ctx context.Context, vaultBaseURL string, issuerName string) (result IssuerBundle, err error) { req, err := client.GetCertificateIssuerPreparer(ctx, vaultBaseURL, issuerName) if err != nil { @@ -1299,9 +1308,10 @@ func (client BaseClient) GetCertificateIssuerResponder(resp *http.Response) (res // GetCertificateIssuers the GetCertificateIssuers operation returns the set of certificate issuer resources in the // specified key vault. This operation requires the certificates/manageissuers/getissuers permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. maxresults is maximum number of -// results to return in a page. If not specified the service will return up to 25 results. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// maxresults - maximum number of results to return in a page. If not specified the service will return up to +// 25 results. func (client BaseClient) GetCertificateIssuers(ctx context.Context, vaultBaseURL string, maxresults *int32) (result CertificateIssuerListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: maxresults, @@ -1405,9 +1415,9 @@ func (client BaseClient) GetCertificateIssuersComplete(ctx context.Context, vaul // GetCertificateOperation gets the creation operation associated with a specified certificate. This operation requires // the certificates/get permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate. func (client BaseClient) GetCertificateOperation(ctx context.Context, vaultBaseURL string, certificateName string) (result CertificateOperation, err error) { req, err := client.GetCertificateOperationPreparer(ctx, vaultBaseURL, certificateName) if err != nil { @@ -1475,9 +1485,9 @@ func (client BaseClient) GetCertificateOperationResponder(resp *http.Response) ( // GetCertificatePolicy the GetCertificatePolicy operation returns the specified certificate policy resources in the // specified key vault. This operation requires the certificates/get permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate in a given key vault. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate in a given key vault. func (client BaseClient) GetCertificatePolicy(ctx context.Context, vaultBaseURL string, certificateName string) (result CertificatePolicy, err error) { req, err := client.GetCertificatePolicyPreparer(ctx, vaultBaseURL, certificateName) if err != nil { @@ -1545,9 +1555,10 @@ func (client BaseClient) GetCertificatePolicyResponder(resp *http.Response) (res // GetCertificates the GetCertificates operation returns the set of certificates resources in the specified key vault. // This operation requires the certificates/list permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. maxresults is maximum number of -// results to return in a page. If not specified the service will return up to 25 results. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// maxresults - maximum number of results to return in a page. If not specified the service will return up to +// 25 results. func (client BaseClient) GetCertificates(ctx context.Context, vaultBaseURL string, maxresults *int32) (result CertificateListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: maxresults, @@ -1651,10 +1662,11 @@ func (client BaseClient) GetCertificatesComplete(ctx context.Context, vaultBaseU // GetCertificateVersions the GetCertificateVersions operation returns the versions of a certificate in the specified // key vault. This operation requires the certificates/list permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate. maxresults is maximum number of results to return in a page. If not specified the service will -// return up to 25 results. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate. +// maxresults - maximum number of results to return in a page. If not specified the service will return up to +// 25 results. func (client BaseClient) GetCertificateVersions(ctx context.Context, vaultBaseURL string, certificateName string, maxresults *int32) (result CertificateListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: maxresults, @@ -1763,9 +1775,9 @@ func (client BaseClient) GetCertificateVersionsComplete(ctx context.Context, vau // GetDeletedCertificate the GetDeletedCertificate operation retrieves the deleted certificate information plus its // attributes, such as retention interval, scheduled permanent deletion and the current deletion recovery level. This // operation requires the certificates/get permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate func (client BaseClient) GetDeletedCertificate(ctx context.Context, vaultBaseURL string, certificateName string) (result DeletedCertificateBundle, err error) { req, err := client.GetDeletedCertificatePreparer(ctx, vaultBaseURL, certificateName) if err != nil { @@ -1835,9 +1847,10 @@ func (client BaseClient) GetDeletedCertificateResponder(resp *http.Response) (re // are in a deleted state and ready for recovery or purging. This operation includes deletion-specific information. // This operation requires the certificates/get/list permission. This operation can only be enabled on soft-delete // enabled vaults. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. maxresults is maximum number of -// results to return in a page. If not specified the service will return up to 25 results. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// maxresults - maximum number of results to return in a page. If not specified the service will return up to +// 25 results. func (client BaseClient) GetDeletedCertificates(ctx context.Context, vaultBaseURL string, maxresults *int32) (result DeletedCertificateListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: maxresults, @@ -1942,8 +1955,9 @@ func (client BaseClient) GetDeletedCertificatesComplete(ctx context.Context, vau // GetDeletedKey the Get Deleted Key operation is applicable for soft-delete enabled vaults. While the operation can be // invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires // the keys/get permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the key. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the key. func (client BaseClient) GetDeletedKey(ctx context.Context, vaultBaseURL string, keyName string) (result DeletedKeyBundle, err error) { req, err := client.GetDeletedKeyPreparer(ctx, vaultBaseURL, keyName) if err != nil { @@ -2013,9 +2027,10 @@ func (client BaseClient) GetDeletedKeyResponder(resp *http.Response) (result Del // of a deleted key. This operation includes deletion-specific information. The Get Deleted Keys operation is // applicable for vaults enabled for soft-delete. While the operation can be invoked on any vault, it will return an // error if invoked on a non soft-delete enabled vault. This operation requires the keys/list permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. maxresults is maximum number of -// results to return in a page. If not specified the service will return up to 25 results. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// maxresults - maximum number of results to return in a page. If not specified the service will return up to +// 25 results. func (client BaseClient) GetDeletedKeys(ctx context.Context, vaultBaseURL string, maxresults *int32) (result DeletedKeyListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: maxresults, @@ -2119,9 +2134,9 @@ func (client BaseClient) GetDeletedKeysComplete(ctx context.Context, vaultBaseUR // GetDeletedSecret the Get Deleted Secret operation returns the specified deleted secret along with its attributes. // This operation requires the secrets/get permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. secretName is the name of the -// secret. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// secretName - the name of the secret. func (client BaseClient) GetDeletedSecret(ctx context.Context, vaultBaseURL string, secretName string) (result DeletedSecretBundle, err error) { req, err := client.GetDeletedSecretPreparer(ctx, vaultBaseURL, secretName) if err != nil { @@ -2189,9 +2204,10 @@ func (client BaseClient) GetDeletedSecretResponder(resp *http.Response) (result // GetDeletedSecrets the Get Deleted Secrets operation returns the secrets that have been deleted for a vault enabled // for soft-delete. This operation requires the secrets/list permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. maxresults is maximum number of -// results to return in a page. If not specified the service will return up to 25 results. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// maxresults - maximum number of results to return in a page. If not specified the service will return up to +// 25 results. func (client BaseClient) GetDeletedSecrets(ctx context.Context, vaultBaseURL string, maxresults *int32) (result DeletedSecretListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: maxresults, @@ -2295,9 +2311,10 @@ func (client BaseClient) GetDeletedSecretsComplete(ctx context.Context, vaultBas // GetKey the get key operation is applicable to all key types. If the requested key is symmetric, then no key material // is released in the response. This operation requires the keys/get permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the key to -// get. keyVersion is adding the version parameter retrieves a specific version of a key. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the key to get. +// keyVersion - adding the version parameter retrieves a specific version of a key. func (client BaseClient) GetKey(ctx context.Context, vaultBaseURL string, keyName string, keyVersion string) (result KeyBundle, err error) { req, err := client.GetKeyPreparer(ctx, vaultBaseURL, keyName, keyVersion) if err != nil { @@ -2368,9 +2385,10 @@ func (client BaseClient) GetKeyResponder(resp *http.Response) (result KeyBundle, // stored key. The LIST operation is applicable to all key types, however only the base key identifier, attributes, and // tags are provided in the response. Individual versions of a key are not listed in the response. This operation // requires the keys/list permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. maxresults is maximum number of -// results to return in a page. If not specified the service will return up to 25 results. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// maxresults - maximum number of results to return in a page. If not specified the service will return up to +// 25 results. func (client BaseClient) GetKeys(ctx context.Context, vaultBaseURL string, maxresults *int32) (result KeyListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: maxresults, @@ -2474,10 +2492,11 @@ func (client BaseClient) GetKeysComplete(ctx context.Context, vaultBaseURL strin // GetKeyVersions the full key identifier, attributes, and tags are provided in the response. This operation requires // the keys/list permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the key. -// maxresults is maximum number of results to return in a page. If not specified the service will return up to 25 -// results. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the key. +// maxresults - maximum number of results to return in a page. If not specified the service will return up to +// 25 results. func (client BaseClient) GetKeyVersions(ctx context.Context, vaultBaseURL string, keyName string, maxresults *int32) (result KeyListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: maxresults, @@ -2585,9 +2604,10 @@ func (client BaseClient) GetKeyVersionsComplete(ctx context.Context, vaultBaseUR // GetSasDefinition gets information about a SAS definition for the specified storage account. This operation requires // the storage/getsas permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. storageAccountName is the name of -// the storage account. sasDefinitionName is the name of the SAS definition. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// storageAccountName - the name of the storage account. +// sasDefinitionName - the name of the SAS definition. func (client BaseClient) GetSasDefinition(ctx context.Context, vaultBaseURL string, storageAccountName string, sasDefinitionName string) (result SasDefinitionBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: storageAccountName, @@ -2664,10 +2684,11 @@ func (client BaseClient) GetSasDefinitionResponder(resp *http.Response) (result // GetSasDefinitions list storage SAS definitions for the given storage account. This operation requires the // storage/listsas permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. storageAccountName is the name of -// the storage account. maxresults is maximum number of results to return in a page. If not specified the service -// will return up to 25 results. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// storageAccountName - the name of the storage account. +// maxresults - maximum number of results to return in a page. If not specified the service will return up to +// 25 results. func (client BaseClient) GetSasDefinitions(ctx context.Context, vaultBaseURL string, storageAccountName string, maxresults *int32) (result SasDefinitionListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: storageAccountName, @@ -2777,9 +2798,10 @@ func (client BaseClient) GetSasDefinitionsComplete(ctx context.Context, vaultBas // GetSecret the GET operation is applicable to any secret stored in Azure Key Vault. This operation requires the // secrets/get permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. secretName is the name of the -// secret. secretVersion is the version of the secret. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// secretName - the name of the secret. +// secretVersion - the version of the secret. func (client BaseClient) GetSecret(ctx context.Context, vaultBaseURL string, secretName string, secretVersion string) (result SecretBundle, err error) { req, err := client.GetSecretPreparer(ctx, vaultBaseURL, secretName, secretVersion) if err != nil { @@ -2849,9 +2871,10 @@ func (client BaseClient) GetSecretResponder(resp *http.Response) (result SecretB // GetSecrets the Get Secrets operation is applicable to the entire vault. However, only the base secret identifier and // its attributes are provided in the response. Individual secret versions are not listed in the response. This // operation requires the secrets/list permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. maxresults is maximum number of -// results to return in a page. If not specified, the service will return up to 25 results. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// maxresults - maximum number of results to return in a page. If not specified, the service will return up to +// 25 results. func (client BaseClient) GetSecrets(ctx context.Context, vaultBaseURL string, maxresults *int32) (result SecretListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: maxresults, @@ -2955,10 +2978,11 @@ func (client BaseClient) GetSecretsComplete(ctx context.Context, vaultBaseURL st // GetSecretVersions the full secret identifier and attributes are provided in the response. No values are returned for // the secrets. This operations requires the secrets/list permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. secretName is the name of the -// secret. maxresults is maximum number of results to return in a page. If not specified, the service will return -// up to 25 results. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// secretName - the name of the secret. +// maxresults - maximum number of results to return in a page. If not specified, the service will return up to +// 25 results. func (client BaseClient) GetSecretVersions(ctx context.Context, vaultBaseURL string, secretName string, maxresults *int32) (result SecretListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: maxresults, @@ -3066,9 +3090,9 @@ func (client BaseClient) GetSecretVersionsComplete(ctx context.Context, vaultBas // GetStorageAccount gets information about a specified storage account. This operation requires the storage/get // permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. storageAccountName is the name of -// the storage account. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// storageAccountName - the name of the storage account. func (client BaseClient) GetStorageAccount(ctx context.Context, vaultBaseURL string, storageAccountName string) (result StorageBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: storageAccountName, @@ -3142,9 +3166,10 @@ func (client BaseClient) GetStorageAccountResponder(resp *http.Response) (result // GetStorageAccounts list storage accounts managed by the specified key vault. This operation requires the // storage/list permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. maxresults is maximum number of -// results to return in a page. If not specified the service will return up to 25 results. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// maxresults - maximum number of results to return in a page. If not specified the service will return up to +// 25 results. func (client BaseClient) GetStorageAccounts(ctx context.Context, vaultBaseURL string, maxresults *int32) (result StorageListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: maxresults, @@ -3249,9 +3274,10 @@ func (client BaseClient) GetStorageAccountsComplete(ctx context.Context, vaultBa // ImportCertificate imports an existing valid certificate, containing a private key, into Azure Key Vault. The // certificate to be imported can be in either PFX or PEM format. If the certificate is in PEM format the PEM file must // contain the key as well as x509 certificates. This operation requires the certificates/import permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate. parameters is the parameters to import the certificate. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate. +// parameters - the parameters to import the certificate. func (client BaseClient) ImportCertificate(ctx context.Context, vaultBaseURL string, certificateName string, parameters CertificateImportParameters) (result CertificateBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: certificateName, @@ -3336,9 +3362,10 @@ func (client BaseClient) ImportCertificateResponder(resp *http.Response) (result // ImportKey the import key operation may be used to import any key type into an Azure Key Vault. If the named key // already exists, Azure Key Vault creates a new version of the key. This operation requires the keys/import // permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is name for the imported -// key. parameters is the parameters to import a key. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - name for the imported key. +// parameters - the parameters to import a key. func (client BaseClient) ImportKey(ctx context.Context, vaultBaseURL string, keyName string, parameters KeyImportParameters) (result KeyBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: keyName, @@ -3416,9 +3443,10 @@ func (client BaseClient) ImportKeyResponder(resp *http.Response) (result KeyBund // MergeCertificate the MergeCertificate operation performs the merging of a certificate or certificate chain with a // key pair currently available in the service. This operation requires the certificates/create permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate. parameters is the parameters to merge certificate. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate. +// parameters - the parameters to merge certificate. func (client BaseClient) MergeCertificate(ctx context.Context, vaultBaseURL string, certificateName string, parameters CertificateMergeParameters) (result CertificateBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -3495,9 +3523,9 @@ func (client BaseClient) MergeCertificateResponder(resp *http.Response) (result // PurgeDeletedCertificate the PurgeDeletedCertificate operation performs an irreversible deletion of the specified // certificate, without possibility for recovery. The operation is not available if the recovery level does not specify // 'Purgeable'. This operation requires the certificate/purge permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate func (client BaseClient) PurgeDeletedCertificate(ctx context.Context, vaultBaseURL string, certificateName string) (result autorest.Response, err error) { req, err := client.PurgeDeletedCertificatePreparer(ctx, vaultBaseURL, certificateName) if err != nil { @@ -3565,8 +3593,9 @@ func (client BaseClient) PurgeDeletedCertificateResponder(resp *http.Response) ( // PurgeDeletedKey the Purge Deleted Key operation is applicable for soft-delete enabled vaults. While the operation // can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation // requires the keys/purge permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the key +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the key func (client BaseClient) PurgeDeletedKey(ctx context.Context, vaultBaseURL string, keyName string) (result autorest.Response, err error) { req, err := client.PurgeDeletedKeyPreparer(ctx, vaultBaseURL, keyName) if err != nil { @@ -3634,9 +3663,9 @@ func (client BaseClient) PurgeDeletedKeyResponder(resp *http.Response) (result a // PurgeDeletedSecret the purge deleted secret operation removes the secret permanently, without the possibility of // recovery. This operation can only be enabled on a soft-delete enabled vault. This operation requires the // secrets/purge permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. secretName is the name of the -// secret. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// secretName - the name of the secret. func (client BaseClient) PurgeDeletedSecret(ctx context.Context, vaultBaseURL string, secretName string) (result autorest.Response, err error) { req, err := client.PurgeDeletedSecretPreparer(ctx, vaultBaseURL, secretName) if err != nil { @@ -3704,9 +3733,9 @@ func (client BaseClient) PurgeDeletedSecretResponder(resp *http.Response) (resul // RecoverDeletedCertificate the RecoverDeletedCertificate operation performs the reversal of the Delete operation. The // operation is applicable in vaults enabled for soft-delete, and must be issued during the retention interval // (available in the deleted certificate's attributes). This operation requires the certificates/recover permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// deleted certificate +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the deleted certificate func (client BaseClient) RecoverDeletedCertificate(ctx context.Context, vaultBaseURL string, certificateName string) (result CertificateBundle, err error) { req, err := client.RecoverDeletedCertificatePreparer(ctx, vaultBaseURL, certificateName) if err != nil { @@ -3776,9 +3805,9 @@ func (client BaseClient) RecoverDeletedCertificateResponder(resp *http.Response) // recovers the deleted key back to its latest version under /keys. An attempt to recover an non-deleted key will // return an error. Consider this the inverse of the delete operation on soft-delete enabled vaults. This operation // requires the keys/recover permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the deleted -// key. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the deleted key. func (client BaseClient) RecoverDeletedKey(ctx context.Context, vaultBaseURL string, keyName string) (result KeyBundle, err error) { req, err := client.RecoverDeletedKeyPreparer(ctx, vaultBaseURL, keyName) if err != nil { @@ -3846,9 +3875,9 @@ func (client BaseClient) RecoverDeletedKeyResponder(resp *http.Response) (result // RecoverDeletedSecret recovers the deleted secret in the specified vault. This operation can only be performed on a // soft-delete enabled vault. This operation requires the secrets/recover permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. secretName is the name of the -// deleted secret. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// secretName - the name of the deleted secret. func (client BaseClient) RecoverDeletedSecret(ctx context.Context, vaultBaseURL string, secretName string) (result SecretBundle, err error) { req, err := client.RecoverDeletedSecretPreparer(ctx, vaultBaseURL, secretName) if err != nil { @@ -3916,9 +3945,10 @@ func (client BaseClient) RecoverDeletedSecretResponder(resp *http.Response) (res // RegenerateStorageAccountKey regenerates the specified key value for the given storage account. This operation // requires the storage/regeneratekey permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. storageAccountName is the name of -// the storage account. parameters is the parameters to regenerate storage account key. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// storageAccountName - the name of the storage account. +// parameters - the parameters to regenerate storage account key. func (client BaseClient) RegenerateStorageAccountKey(ctx context.Context, vaultBaseURL string, storageAccountName string, parameters StorageAccountRegenerteKeyParameters) (result StorageBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: storageAccountName, @@ -4003,9 +4033,9 @@ func (client BaseClient) RegenerateStorageAccountKeyResponder(resp *http.Respons // subject to security constraints: The target Key Vault must be owned by the same Microsoft Azure Subscription as the // source Key Vault The user must have RESTORE permission in the target Key Vault. This operation requires the // keys/restore permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. parameters is the parameters to -// restore the key. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// parameters - the parameters to restore the key. func (client BaseClient) RestoreKey(ctx context.Context, vaultBaseURL string, parameters KeyRestoreParameters) (result KeyBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -4077,9 +4107,9 @@ func (client BaseClient) RestoreKeyResponder(resp *http.Response) (result KeyBun // RestoreSecret restores a backed up secret, and all its versions, to a vault. This operation requires the // secrets/restore permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. parameters is the parameters to -// restore the secret. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// parameters - the parameters to restore the secret. func (client BaseClient) RestoreSecret(ctx context.Context, vaultBaseURL string, parameters SecretRestoreParameters) (result SecretBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -4151,9 +4181,9 @@ func (client BaseClient) RestoreSecretResponder(resp *http.Response) (result Sec // SetCertificateContacts sets the certificate contacts for the specified key vault. This operation requires the // certificates/managecontacts permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. contacts is the contacts for the -// key vault certificate. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// contacts - the contacts for the key vault certificate. func (client BaseClient) SetCertificateContacts(ctx context.Context, vaultBaseURL string, contacts Contacts) (result Contacts, err error) { req, err := client.SetCertificateContactsPreparer(ctx, vaultBaseURL, contacts) if err != nil { @@ -4219,9 +4249,10 @@ func (client BaseClient) SetCertificateContactsResponder(resp *http.Response) (r // SetCertificateIssuer the SetCertificateIssuer operation adds or updates the specified certificate issuer. This // operation requires the certificates/setissuers permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. issuerName is the name of the -// issuer. parameter is certificate issuer set parameter. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// issuerName - the name of the issuer. +// parameter - certificate issuer set parameter. func (client BaseClient) SetCertificateIssuer(ctx context.Context, vaultBaseURL string, issuerName string, parameter CertificateIssuerSetParameters) (result IssuerBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameter, @@ -4297,10 +4328,11 @@ func (client BaseClient) SetCertificateIssuerResponder(resp *http.Response) (res // SetSasDefinition creates or updates a new SAS definition for the specified storage account. This operation requires // the storage/setsas permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. storageAccountName is the name of -// the storage account. sasDefinitionName is the name of the SAS definition. parameters is the parameters to create -// a SAS definition. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// storageAccountName - the name of the storage account. +// sasDefinitionName - the name of the SAS definition. +// parameters - the parameters to create a SAS definition. func (client BaseClient) SetSasDefinition(ctx context.Context, vaultBaseURL string, storageAccountName string, sasDefinitionName string, parameters SasDefinitionCreateParameters) (result SasDefinitionBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: storageAccountName, @@ -4381,9 +4413,10 @@ func (client BaseClient) SetSasDefinitionResponder(resp *http.Response) (result // SetSecret the SET operation adds a secret to the Azure Key Vault. If the named secret already exists, Azure Key // Vault creates a new version of that secret. This operation requires the secrets/set permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. secretName is the name of the -// secret. parameters is the parameters for setting the secret. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// secretName - the name of the secret. +// parameters - the parameters for setting the secret. func (client BaseClient) SetSecret(ctx context.Context, vaultBaseURL string, secretName string, parameters SecretSetParameters) (result SecretBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: secretName, @@ -4460,9 +4493,10 @@ func (client BaseClient) SetSecretResponder(resp *http.Response) (result SecretB } // SetStorageAccount creates or updates a new storage account. This operation requires the storage/set permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. storageAccountName is the name of -// the storage account. parameters is the parameters to create a storage account. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// storageAccountName - the name of the storage account. +// parameters - the parameters to create a storage account. func (client BaseClient) SetStorageAccount(ctx context.Context, vaultBaseURL string, storageAccountName string, parameters StorageAccountCreateParameters) (result StorageBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: storageAccountName, @@ -4542,9 +4576,11 @@ func (client BaseClient) SetStorageAccountResponder(resp *http.Response) (result // Sign the SIGN operation is applicable to asymmetric and symmetric keys stored in Azure Key Vault since this // operation uses the private portion of the key. This operation requires the keys/sign permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the key. -// keyVersion is the version of the key. parameters is the parameters for the signing operation. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the key. +// keyVersion - the version of the key. +// parameters - the parameters for the signing operation. func (client BaseClient) Sign(ctx context.Context, vaultBaseURL string, keyName string, keyVersion string, parameters KeySignParameters) (result KeyOperationResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -4623,9 +4659,11 @@ func (client BaseClient) SignResponder(resp *http.Response) (result KeyOperation // operation is the reverse of the WRAP operation. The UNWRAP operation applies to asymmetric and symmetric keys stored // in Azure Key Vault since it uses the private portion of the key. This operation requires the keys/unwrapKey // permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the key. -// keyVersion is the version of the key. parameters is the parameters for the key operation. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the key. +// keyVersion - the version of the key. +// parameters - the parameters for the key operation. func (client BaseClient) UnwrapKey(ctx context.Context, vaultBaseURL string, keyName string, keyVersion string, parameters KeyOperationsParameters) (result KeyOperationResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -4702,10 +4740,11 @@ func (client BaseClient) UnwrapKeyResponder(resp *http.Response) (result KeyOper // UpdateCertificate the UpdateCertificate operation applies the specified update on the given certificate; the only // elements updated are the certificate's attributes. This operation requires the certificates/update permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate in the given key vault. certificateVersion is the version of the certificate. parameters is the -// parameters for certificate update. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate in the given key vault. +// certificateVersion - the version of the certificate. +// parameters - the parameters for certificate update. func (client BaseClient) UpdateCertificate(ctx context.Context, vaultBaseURL string, certificateName string, certificateVersion string, parameters CertificateUpdateParameters) (result CertificateBundle, err error) { req, err := client.UpdateCertificatePreparer(ctx, vaultBaseURL, certificateName, certificateVersion, parameters) if err != nil { @@ -4776,9 +4815,10 @@ func (client BaseClient) UpdateCertificateResponder(resp *http.Response) (result // UpdateCertificateIssuer the UpdateCertificateIssuer operation performs an update on the specified certificate issuer // entity. This operation requires the certificates/setissuers permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. issuerName is the name of the -// issuer. parameter is certificate issuer update parameter. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// issuerName - the name of the issuer. +// parameter - certificate issuer update parameter. func (client BaseClient) UpdateCertificateIssuer(ctx context.Context, vaultBaseURL string, issuerName string, parameter CertificateIssuerUpdateParameters) (result IssuerBundle, err error) { req, err := client.UpdateCertificateIssuerPreparer(ctx, vaultBaseURL, issuerName, parameter) if err != nil { @@ -4848,9 +4888,10 @@ func (client BaseClient) UpdateCertificateIssuerResponder(resp *http.Response) ( // UpdateCertificateOperation updates a certificate creation operation that is already in progress. This operation // requires the certificates/update permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate. certificateOperation is the certificate operation response. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate. +// certificateOperation - the certificate operation response. func (client BaseClient) UpdateCertificateOperation(ctx context.Context, vaultBaseURL string, certificateName string, certificateOperation CertificateOperationUpdateParameter) (result CertificateOperation, err error) { req, err := client.UpdateCertificateOperationPreparer(ctx, vaultBaseURL, certificateName, certificateOperation) if err != nil { @@ -4920,9 +4961,10 @@ func (client BaseClient) UpdateCertificateOperationResponder(resp *http.Response // UpdateCertificatePolicy set specified members in the certificate policy. Leave others as null. This operation // requires the certificates/update permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. certificateName is the name of the -// certificate in the given vault. certificatePolicy is the policy for the certificate. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// certificateName - the name of the certificate in the given vault. +// certificatePolicy - the policy for the certificate. func (client BaseClient) UpdateCertificatePolicy(ctx context.Context, vaultBaseURL string, certificateName string, certificatePolicy CertificatePolicy) (result CertificatePolicy, err error) { req, err := client.UpdateCertificatePolicyPreparer(ctx, vaultBaseURL, certificateName, certificatePolicy) if err != nil { @@ -4992,9 +5034,11 @@ func (client BaseClient) UpdateCertificatePolicyResponder(resp *http.Response) ( // UpdateKey in order to perform this operation, the key must already exist in the Key Vault. Note: The cryptographic // material of a key itself cannot be changed. This operation requires the keys/update permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of key to -// update. keyVersion is the version of the key to update. parameters is the parameters of the key to update. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of key to update. +// keyVersion - the version of the key to update. +// parameters - the parameters of the key to update. func (client BaseClient) UpdateKey(ctx context.Context, vaultBaseURL string, keyName string, keyVersion string, parameters KeyUpdateParameters) (result KeyBundle, err error) { req, err := client.UpdateKeyPreparer(ctx, vaultBaseURL, keyName, keyVersion, parameters) if err != nil { @@ -5065,10 +5109,11 @@ func (client BaseClient) UpdateKeyResponder(resp *http.Response) (result KeyBund // UpdateSasDefinition updates the specified attributes associated with the given SAS definition. This operation // requires the storage/setsas permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. storageAccountName is the name of -// the storage account. sasDefinitionName is the name of the SAS definition. parameters is the parameters to update -// a SAS definition. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// storageAccountName - the name of the storage account. +// sasDefinitionName - the name of the SAS definition. +// parameters - the parameters to update a SAS definition. func (client BaseClient) UpdateSasDefinition(ctx context.Context, vaultBaseURL string, storageAccountName string, sasDefinitionName string, parameters SasDefinitionUpdateParameters) (result SasDefinitionBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: storageAccountName, @@ -5148,9 +5193,11 @@ func (client BaseClient) UpdateSasDefinitionResponder(resp *http.Response) (resu // UpdateSecret the UPDATE operation changes specified attributes of an existing stored secret. Attributes that are not // specified in the request are left unchanged. The value of a secret itself cannot be changed. This operation requires // the secrets/set permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. secretName is the name of the -// secret. secretVersion is the version of the secret. parameters is the parameters for update secret operation. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// secretName - the name of the secret. +// secretVersion - the version of the secret. +// parameters - the parameters for update secret operation. func (client BaseClient) UpdateSecret(ctx context.Context, vaultBaseURL string, secretName string, secretVersion string, parameters SecretUpdateParameters) (result SecretBundle, err error) { req, err := client.UpdateSecretPreparer(ctx, vaultBaseURL, secretName, secretVersion, parameters) if err != nil { @@ -5221,9 +5268,10 @@ func (client BaseClient) UpdateSecretResponder(resp *http.Response) (result Secr // UpdateStorageAccount updates the specified attributes associated with the given storage account. This operation // requires the storage/set/update permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. storageAccountName is the name of -// the storage account. parameters is the parameters to update a storage account. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// storageAccountName - the name of the storage account. +// parameters - the parameters to update a storage account. func (client BaseClient) UpdateStorageAccount(ctx context.Context, vaultBaseURL string, storageAccountName string, parameters StorageAccountUpdateParameters) (result StorageBundle, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: storageAccountName, @@ -5301,9 +5349,11 @@ func (client BaseClient) UpdateStorageAccountResponder(resp *http.Response) (res // necessary for asymmetric keys stored in Azure Key Vault since signature verification can be performed using the // public portion of the key but this operation is supported as a convenience for callers that only have a // key-reference and not the public portion of the key. This operation requires the keys/verify permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the key. -// keyVersion is the version of the key. parameters is the parameters for verify operations. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the key. +// keyVersion - the version of the key. +// parameters - the parameters for verify operations. func (client BaseClient) Verify(ctx context.Context, vaultBaseURL string, keyName string, keyVersion string, parameters KeyVerifyParameters) (result KeyVerifyResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -5384,9 +5434,11 @@ func (client BaseClient) VerifyResponder(resp *http.Response) (result KeyVerifyR // Key Vault since protection with an asymmetric key can be performed using the public portion of the key. This // operation is supported for asymmetric keys as a convenience for callers that have a key-reference but do not have // access to the public key material. This operation requires the keys/wrapKey permission. -// -// vaultBaseURL is the vault name, for example https://myvault.vault.azure.net. keyName is the name of the key. -// keyVersion is the version of the key. parameters is the parameters for wrap operation. +// Parameters: +// vaultBaseURL - the vault name, for example https://myvault.vault.azure.net. +// keyName - the name of the key. +// keyVersion - the version of the key. +// parameters - the parameters for wrap operation. func (client BaseClient) WrapKey(ctx context.Context, vaultBaseURL string, keyName string, keyVersion string, parameters KeyOperationsParameters) (result KeyOperationResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault/vaults.go b/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault/vaults.go index 4f3c75838de0..9ee6ddc18e64 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault/vaults.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault/vaults.go @@ -42,8 +42,8 @@ func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsCli } // CheckNameAvailability checks that the vault name is valid and is not already in use. -// -// vaultName is the name of the vault. +// Parameters: +// vaultName - the name of the vault. func (client VaultsClient) CheckNameAvailability(ctx context.Context, vaultName VaultCheckNameAvailabilityParameters) (result CheckNameAvailabilityResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: vaultName, @@ -115,9 +115,10 @@ func (client VaultsClient) CheckNameAvailabilityResponder(resp *http.Response) ( } // CreateOrUpdate create or update a key vault in the specified subscription. -// -// resourceGroupName is the name of the Resource Group to which the server belongs. vaultName is name of the vault -// parameters is parameters to create or update the vault +// Parameters: +// resourceGroupName - the name of the Resource Group to which the server belongs. +// vaultName - name of the vault +// parameters - parameters to create or update the vault func (client VaultsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, vaultName string, parameters VaultCreateOrUpdateParameters) (result Vault, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: vaultName, @@ -197,9 +198,9 @@ func (client VaultsClient) CreateOrUpdateResponder(resp *http.Response) (result } // Delete deletes the specified Azure key vault. -// -// resourceGroupName is the name of the Resource Group to which the vault belongs. vaultName is the name of the -// vault to delete +// Parameters: +// resourceGroupName - the name of the Resource Group to which the vault belongs. +// vaultName - the name of the vault to delete func (client VaultsClient) Delete(ctx context.Context, resourceGroupName string, vaultName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, vaultName) if err != nil { @@ -263,9 +264,9 @@ func (client VaultsClient) DeleteResponder(resp *http.Response) (result autorest } // Get gets the specified Azure key vault. -// -// resourceGroupName is the name of the Resource Group to which the vault belongs. vaultName is the name of the -// vault. +// Parameters: +// resourceGroupName - the name of the Resource Group to which the vault belongs. +// vaultName - the name of the vault. func (client VaultsClient) Get(ctx context.Context, resourceGroupName string, vaultName string) (result Vault, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, vaultName) if err != nil { @@ -330,8 +331,9 @@ func (client VaultsClient) GetResponder(resp *http.Response) (result Vault, err } // GetDeleted gets the deleted Azure key vault. -// -// vaultName is the name of the vault. location is the location of the deleted vault. +// Parameters: +// vaultName - the name of the vault. +// location - the location of the deleted vault. func (client VaultsClient) GetDeleted(ctx context.Context, vaultName string, location string) (result DeletedVault, err error) { req, err := client.GetDeletedPreparer(ctx, vaultName, location) if err != nil { @@ -396,8 +398,8 @@ func (client VaultsClient) GetDeletedResponder(resp *http.Response) (result Dele } // List the List operation gets information about the vaults associated with the subscription. -// -// top is maximum number of results to return. +// Parameters: +// top - maximum number of results to return. func (client VaultsClient) List(ctx context.Context, top *int32) (result ResourceListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, top) @@ -493,9 +495,9 @@ func (client VaultsClient) ListComplete(ctx context.Context, top *int32) (result // ListByResourceGroup the List operation gets information about the vaults associated with the subscription and within // the specified resource group. -// -// resourceGroupName is the name of the Resource Group to which the vault belongs. top is maximum number of results -// to return. +// Parameters: +// resourceGroupName - the name of the Resource Group to which the vault belongs. +// top - maximum number of results to return. func (client VaultsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string, top *int32) (result VaultListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName, top) @@ -590,8 +592,8 @@ func (client VaultsClient) ListByResourceGroupComplete(ctx context.Context, reso } // ListBySubscription the List operation gets information about the vaults associated with the subscription. -// -// top is maximum number of results to return. +// Parameters: +// top - maximum number of results to return. func (client VaultsClient) ListBySubscription(ctx context.Context, top *int32) (result VaultListResultPage, err error) { result.fn = client.listBySubscriptionNextResults req, err := client.ListBySubscriptionPreparer(ctx, top) @@ -775,8 +777,9 @@ func (client VaultsClient) ListDeletedComplete(ctx context.Context) (result Dele } // PurgeDeleted permanently deletes the specified vault. aka Purges the deleted Azure key vault. -// -// vaultName is the name of the soft-deleted vault. location is the location of the soft-deleted vault. +// Parameters: +// vaultName - the name of the soft-deleted vault. +// location - the location of the soft-deleted vault. func (client VaultsClient) PurgeDeleted(ctx context.Context, vaultName string, location string) (result VaultsPurgeDeletedFuture, err error) { req, err := client.PurgeDeletedPreparer(ctx, vaultName, location) if err != nil { @@ -842,9 +845,10 @@ func (client VaultsClient) PurgeDeletedResponder(resp *http.Response) (result au } // Update update a key vault in the specified subscription. -// -// resourceGroupName is the name of the Resource Group to which the server belongs. vaultName is name of the vault -// parameters is parameters to patch the vault +// Parameters: +// resourceGroupName - the name of the Resource Group to which the server belongs. +// vaultName - name of the vault +// parameters - parameters to patch the vault func (client VaultsClient) Update(ctx context.Context, resourceGroupName string, vaultName string, parameters VaultPatchParameters) (result Vault, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: vaultName, @@ -917,9 +921,11 @@ func (client VaultsClient) UpdateResponder(resp *http.Response) (result Vault, e } // UpdateAccessPolicy update access policies in a key vault in the specified subscription. -// -// resourceGroupName is the name of the Resource Group to which the vault belongs. vaultName is name of the vault -// operationKind is name of the operation parameters is access policy to merge into the vault +// Parameters: +// resourceGroupName - the name of the Resource Group to which the vault belongs. +// vaultName - name of the vault +// operationKind - name of the operation +// parameters - access policy to merge into the vault func (client VaultsClient) UpdateAccessPolicy(ctx context.Context, resourceGroupName string, vaultName string, operationKind AccessPolicyUpdateKind, parameters VaultAccessPolicyParameters) (result VaultAccessPolicyParameters, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: vaultName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/actiongroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/actiongroups.go index f176cae03ded..0d3031bab37b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/actiongroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/actiongroups.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActionGroupsClient is the monitor Management Client type ActionGroupsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewActionGroupsClient creates an instance of the ActionGroupsClient client. func NewActionGroupsClient(subscriptionID string) ActionGroupsClient { return NewActionGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewActionGroupsClientWithBaseURI creates an instance of the ActionGroupsClient client. func NewActionGroupsClientWithBaseURI(baseURI string, subscriptionID string) ActionGroupsClient { return ActionGroupsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdate create a new action group or update an existing one. // // resourceGroupName is the name of the resource group. actionGroupName is the name of the action group. @@ -49,7 +53,7 @@ func (client ActionGroupsClient) CreateOrUpdate(ctx context.Context, resourceGro {TargetValue: actionGroup, Constraints: []validation.Constraint{{Target: "actionGroup.ActionGroup", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "actionGroup.ActionGroup.GroupShortName", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "actionGroup.ActionGroup.GroupShortName", Name: validation.MaxLength, Rule: 15, Chain: nil}}}, + Chain: []validation.Constraint{{Target: "actionGroup.ActionGroup.GroupShortName", Name: validation.MaxLength, Rule: 12, Chain: nil}}}, {Target: "actionGroup.ActionGroup.Enabled", Name: validation.Null, Rule: true, Chain: nil}, }}}}}); err != nil { return result, validation.NewError("insights.ActionGroupsClient", "CreateOrUpdate", err.Error()) @@ -76,6 +80,7 @@ func (client ActionGroupsClient) CreateOrUpdate(ctx context.Context, resourceGro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ActionGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, actionGroupName string, actionGroup ActionGroupResource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -99,6 +104,7 @@ func (client ActionGroupsClient) CreateOrUpdatePreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -106,6 +112,7 @@ func (client ActionGroupsClient) CreateOrUpdateSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ActionGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result ActionGroupResource, err error) { @@ -119,6 +126,7 @@ func (client ActionGroupsClient) CreateOrUpdateResponder(resp *http.Response) (r return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Delete delete an action group. // // resourceGroupName is the name of the resource group. actionGroupName is the name of the action group. @@ -144,6 +152,7 @@ func (client ActionGroupsClient) Delete(ctx context.Context, resourceGroupName s return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeletePreparer prepares the Delete request. func (client ActionGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, actionGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -165,6 +174,7 @@ func (client ActionGroupsClient) DeletePreparer(ctx context.Context, resourceGro return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -172,6 +182,7 @@ func (client ActionGroupsClient) DeleteSender(req *http.Request) (*http.Response azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ActionGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -184,6 +195,7 @@ func (client ActionGroupsClient) DeleteResponder(resp *http.Response) (result au return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // EnableReceiver enable a receiver in an action group. This changes the receiver's status from Disabled to Enabled. // // resourceGroupName is the name of the resource group. actionGroupName is the name of the action group. @@ -216,6 +228,7 @@ func (client ActionGroupsClient) EnableReceiver(ctx context.Context, resourceGro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // EnableReceiverPreparer prepares the EnableReceiver request. func (client ActionGroupsClient) EnableReceiverPreparer(ctx context.Context, resourceGroupName string, actionGroupName string, enableRequest EnableRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -239,6 +252,7 @@ func (client ActionGroupsClient) EnableReceiverPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // EnableReceiverSender sends the EnableReceiver request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) EnableReceiverSender(req *http.Request) (*http.Response, error) { @@ -246,6 +260,7 @@ func (client ActionGroupsClient) EnableReceiverSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // EnableReceiverResponder handles the response to the EnableReceiver request. The method always // closes the http.Response Body. func (client ActionGroupsClient) EnableReceiverResponder(resp *http.Response) (result autorest.Response, err error) { @@ -258,6 +273,7 @@ func (client ActionGroupsClient) EnableReceiverResponder(resp *http.Response) (r return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Get get an action group. // // resourceGroupName is the name of the resource group. actionGroupName is the name of the action group. @@ -283,6 +299,7 @@ func (client ActionGroupsClient) Get(ctx context.Context, resourceGroupName stri return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetPreparer prepares the Get request. func (client ActionGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, actionGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -304,6 +321,7 @@ func (client ActionGroupsClient) GetPreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -311,6 +329,7 @@ func (client ActionGroupsClient) GetSender(req *http.Request) (*http.Response, e azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ActionGroupsClient) GetResponder(resp *http.Response) (result ActionGroupResource, err error) { @@ -324,6 +343,7 @@ func (client ActionGroupsClient) GetResponder(resp *http.Response) (result Actio return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroup get a list of all action groups in a resource group. // // resourceGroupName is the name of the resource group. @@ -349,6 +369,7 @@ func (client ActionGroupsClient) ListByResourceGroup(ctx context.Context, resour return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client ActionGroupsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -369,6 +390,7 @@ func (client ActionGroupsClient) ListByResourceGroupPreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -376,6 +398,7 @@ func (client ActionGroupsClient) ListByResourceGroupSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client ActionGroupsClient) ListByResourceGroupResponder(resp *http.Response) (result ActionGroupList, err error) { @@ -389,6 +412,7 @@ func (client ActionGroupsClient) ListByResourceGroupResponder(resp *http.Respons return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListBySubscriptionID get a list of all action groups in a subscription. func (client ActionGroupsClient) ListBySubscriptionID(ctx context.Context) (result ActionGroupList, err error) { req, err := client.ListBySubscriptionIDPreparer(ctx) @@ -412,6 +436,7 @@ func (client ActionGroupsClient) ListBySubscriptionID(ctx context.Context) (resu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListBySubscriptionIDPreparer prepares the ListBySubscriptionID request. func (client ActionGroupsClient) ListBySubscriptionIDPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -431,6 +456,7 @@ func (client ActionGroupsClient) ListBySubscriptionIDPreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListBySubscriptionIDSender sends the ListBySubscriptionID request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) ListBySubscriptionIDSender(req *http.Request) (*http.Response, error) { @@ -438,6 +464,7 @@ func (client ActionGroupsClient) ListBySubscriptionIDSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListBySubscriptionIDResponder handles the response to the ListBySubscriptionID request. The method always // closes the http.Response Body. func (client ActionGroupsClient) ListBySubscriptionIDResponder(resp *http.Response) (result ActionGroupList, err error) { @@ -451,6 +478,7 @@ func (client ActionGroupsClient) ListBySubscriptionIDResponder(resp *http.Respon return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Update updates an existing action group's tags. To update other fields use the CreateOrUpdate method. // // resourceGroupName is the name of the resource group. actionGroupName is the name of the action group. @@ -477,6 +505,7 @@ func (client ActionGroupsClient) Update(ctx context.Context, resourceGroupName s return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdatePreparer prepares the Update request. func (client ActionGroupsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, actionGroupName string, actionGroupPatch ActionGroupPatchBody) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -500,6 +529,7 @@ func (client ActionGroupsClient) UpdatePreparer(ctx context.Context, resourceGro return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -507,6 +537,7 @@ func (client ActionGroupsClient) UpdateSender(req *http.Request) (*http.Response azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client ActionGroupsClient) UpdateResponder(resp *http.Response) (result ActionGroupResource, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/activitylogalerts.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/activitylogalerts.go index fb767a084e10..ce4ed0650ab5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/activitylogalerts.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/activitylogalerts.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActivityLogAlertsClient is the monitor Management Client type ActivityLogAlertsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewActivityLogAlertsClient creates an instance of the ActivityLogAlertsClient client. func NewActivityLogAlertsClient(subscriptionID string) ActivityLogAlertsClient { return NewActivityLogAlertsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewActivityLogAlertsClientWithBaseURI creates an instance of the ActivityLogAlertsClient client. func NewActivityLogAlertsClientWithBaseURI(baseURI string, subscriptionID string) ActivityLogAlertsClient { return ActivityLogAlertsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdate create a new activity log alert or update an existing one. // // resourceGroupName is the name of the resource group. activityLogAlertName is the name of the activity log alert. @@ -77,6 +81,7 @@ func (client ActivityLogAlertsClient) CreateOrUpdate(ctx context.Context, resour return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ActivityLogAlertsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, activityLogAlertName string, activityLogAlert ActivityLogAlertResource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -100,6 +105,7 @@ func (client ActivityLogAlertsClient) CreateOrUpdatePreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ActivityLogAlertsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -107,6 +113,7 @@ func (client ActivityLogAlertsClient) CreateOrUpdateSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ActivityLogAlertsClient) CreateOrUpdateResponder(resp *http.Response) (result ActivityLogAlertResource, err error) { @@ -120,6 +127,7 @@ func (client ActivityLogAlertsClient) CreateOrUpdateResponder(resp *http.Respons return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Delete delete an activity log alert. // // resourceGroupName is the name of the resource group. activityLogAlertName is the name of the activity log alert. @@ -145,6 +153,7 @@ func (client ActivityLogAlertsClient) Delete(ctx context.Context, resourceGroupN return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeletePreparer prepares the Delete request. func (client ActivityLogAlertsClient) DeletePreparer(ctx context.Context, resourceGroupName string, activityLogAlertName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -166,6 +175,7 @@ func (client ActivityLogAlertsClient) DeletePreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ActivityLogAlertsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -173,6 +183,7 @@ func (client ActivityLogAlertsClient) DeleteSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ActivityLogAlertsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -185,6 +196,7 @@ func (client ActivityLogAlertsClient) DeleteResponder(resp *http.Response) (resu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Get get an activity log alert. // // resourceGroupName is the name of the resource group. activityLogAlertName is the name of the activity log alert. @@ -210,6 +222,7 @@ func (client ActivityLogAlertsClient) Get(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetPreparer prepares the Get request. func (client ActivityLogAlertsClient) GetPreparer(ctx context.Context, resourceGroupName string, activityLogAlertName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -231,6 +244,7 @@ func (client ActivityLogAlertsClient) GetPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ActivityLogAlertsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -238,6 +252,7 @@ func (client ActivityLogAlertsClient) GetSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ActivityLogAlertsClient) GetResponder(resp *http.Response) (result ActivityLogAlertResource, err error) { @@ -251,6 +266,7 @@ func (client ActivityLogAlertsClient) GetResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroup get a list of all activity log alerts in a resource group. // // resourceGroupName is the name of the resource group. @@ -276,6 +292,7 @@ func (client ActivityLogAlertsClient) ListByResourceGroup(ctx context.Context, r return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client ActivityLogAlertsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -296,6 +313,7 @@ func (client ActivityLogAlertsClient) ListByResourceGroupPreparer(ctx context.Co return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client ActivityLogAlertsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -303,6 +321,7 @@ func (client ActivityLogAlertsClient) ListByResourceGroupSender(req *http.Reques azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client ActivityLogAlertsClient) ListByResourceGroupResponder(resp *http.Response) (result ActivityLogAlertList, err error) { @@ -316,6 +335,7 @@ func (client ActivityLogAlertsClient) ListByResourceGroupResponder(resp *http.Re return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListBySubscriptionID get a list of all activity log alerts in a subscription. func (client ActivityLogAlertsClient) ListBySubscriptionID(ctx context.Context) (result ActivityLogAlertList, err error) { req, err := client.ListBySubscriptionIDPreparer(ctx) @@ -339,6 +359,7 @@ func (client ActivityLogAlertsClient) ListBySubscriptionID(ctx context.Context) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListBySubscriptionIDPreparer prepares the ListBySubscriptionID request. func (client ActivityLogAlertsClient) ListBySubscriptionIDPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -358,6 +379,7 @@ func (client ActivityLogAlertsClient) ListBySubscriptionIDPreparer(ctx context.C return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListBySubscriptionIDSender sends the ListBySubscriptionID request. The method will close the // http.Response Body if it receives an error. func (client ActivityLogAlertsClient) ListBySubscriptionIDSender(req *http.Request) (*http.Response, error) { @@ -365,6 +387,7 @@ func (client ActivityLogAlertsClient) ListBySubscriptionIDSender(req *http.Reque azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListBySubscriptionIDResponder handles the response to the ListBySubscriptionID request. The method always // closes the http.Response Body. func (client ActivityLogAlertsClient) ListBySubscriptionIDResponder(resp *http.Response) (result ActivityLogAlertList, err error) { @@ -378,6 +401,7 @@ func (client ActivityLogAlertsClient) ListBySubscriptionIDResponder(resp *http.R return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Update updates an existing ActivityLogAlertResource's tags. To update other fields use the CreateOrUpdate method. // // resourceGroupName is the name of the resource group. activityLogAlertName is the name of the activity log alert. @@ -404,6 +428,7 @@ func (client ActivityLogAlertsClient) Update(ctx context.Context, resourceGroupN return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdatePreparer prepares the Update request. func (client ActivityLogAlertsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, activityLogAlertName string, activityLogAlertPatch ActivityLogAlertPatchBody) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -427,6 +452,7 @@ func (client ActivityLogAlertsClient) UpdatePreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ActivityLogAlertsClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -434,6 +460,7 @@ func (client ActivityLogAlertsClient) UpdateSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client ActivityLogAlertsClient) UpdateResponder(resp *http.Response) (result ActivityLogAlertResource, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertruleincidents.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertruleincidents.go index f3d8fc8b20ab..5a14d2e05375 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertruleincidents.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertruleincidents.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AlertRuleIncidentsClient is the monitor Management Client type AlertRuleIncidentsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewAlertRuleIncidentsClient creates an instance of the AlertRuleIncidentsClient client. func NewAlertRuleIncidentsClient(subscriptionID string) AlertRuleIncidentsClient { return NewAlertRuleIncidentsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewAlertRuleIncidentsClientWithBaseURI creates an instance of the AlertRuleIncidentsClient client. func NewAlertRuleIncidentsClientWithBaseURI(baseURI string, subscriptionID string) AlertRuleIncidentsClient { return AlertRuleIncidentsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Get gets an incident associated to an alert rule // // resourceGroupName is the name of the resource group. ruleName is the name of the rule. incidentName is the name @@ -65,6 +69,7 @@ func (client AlertRuleIncidentsClient) Get(ctx context.Context, resourceGroupNam return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetPreparer prepares the Get request. func (client AlertRuleIncidentsClient) GetPreparer(ctx context.Context, resourceGroupName string, ruleName string, incidentName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -87,6 +92,7 @@ func (client AlertRuleIncidentsClient) GetPreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client AlertRuleIncidentsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -94,6 +100,7 @@ func (client AlertRuleIncidentsClient) GetSender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client AlertRuleIncidentsClient) GetResponder(resp *http.Response) (result Incident, err error) { @@ -107,6 +114,7 @@ func (client AlertRuleIncidentsClient) GetResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByAlertRule gets a list of incidents associated to an alert rule // // resourceGroupName is the name of the resource group. ruleName is the name of the rule. @@ -132,6 +140,7 @@ func (client AlertRuleIncidentsClient) ListByAlertRule(ctx context.Context, reso return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByAlertRulePreparer prepares the ListByAlertRule request. func (client AlertRuleIncidentsClient) ListByAlertRulePreparer(ctx context.Context, resourceGroupName string, ruleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -153,6 +162,7 @@ func (client AlertRuleIncidentsClient) ListByAlertRulePreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByAlertRuleSender sends the ListByAlertRule request. The method will close the // http.Response Body if it receives an error. func (client AlertRuleIncidentsClient) ListByAlertRuleSender(req *http.Request) (*http.Response, error) { @@ -160,6 +170,7 @@ func (client AlertRuleIncidentsClient) ListByAlertRuleSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByAlertRuleResponder handles the response to the ListByAlertRule request. The method always // closes the http.Response Body. func (client AlertRuleIncidentsClient) ListByAlertRuleResponder(resp *http.Response) (result IncidentListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertrules.go index 0c1145b37220..f31713af2eaf 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertrules.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AlertRulesClient is the monitor Management Client type AlertRulesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewAlertRulesClient creates an instance of the AlertRulesClient client. func NewAlertRulesClient(subscriptionID string) AlertRulesClient { return NewAlertRulesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewAlertRulesClientWithBaseURI creates an instance of the AlertRulesClient client. func NewAlertRulesClientWithBaseURI(baseURI string, subscriptionID string) AlertRulesClient { return AlertRulesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdate creates or updates an alert rule. // // resourceGroupName is the name of the resource group. ruleName is the name of the rule. parameters is the @@ -76,6 +80,7 @@ func (client AlertRulesClient) CreateOrUpdate(ctx context.Context, resourceGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client AlertRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, ruleName string, parameters AlertRuleResource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -99,6 +104,7 @@ func (client AlertRulesClient) CreateOrUpdatePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client AlertRulesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -106,6 +112,7 @@ func (client AlertRulesClient) CreateOrUpdateSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client AlertRulesClient) CreateOrUpdateResponder(resp *http.Response) (result AlertRuleResource, err error) { @@ -119,6 +126,7 @@ func (client AlertRulesClient) CreateOrUpdateResponder(resp *http.Response) (res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Delete deletes an alert rule // // resourceGroupName is the name of the resource group. ruleName is the name of the rule. @@ -144,6 +152,7 @@ func (client AlertRulesClient) Delete(ctx context.Context, resourceGroupName str return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeletePreparer prepares the Delete request. func (client AlertRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, ruleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -165,6 +174,7 @@ func (client AlertRulesClient) DeletePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client AlertRulesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -172,6 +182,7 @@ func (client AlertRulesClient) DeleteSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client AlertRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -184,6 +195,7 @@ func (client AlertRulesClient) DeleteResponder(resp *http.Response) (result auto return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Get gets an alert rule // // resourceGroupName is the name of the resource group. ruleName is the name of the rule. @@ -209,6 +221,7 @@ func (client AlertRulesClient) Get(ctx context.Context, resourceGroupName string return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetPreparer prepares the Get request. func (client AlertRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, ruleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -230,6 +243,7 @@ func (client AlertRulesClient) GetPreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client AlertRulesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -237,6 +251,7 @@ func (client AlertRulesClient) GetSender(req *http.Request) (*http.Response, err azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client AlertRulesClient) GetResponder(resp *http.Response) (result AlertRuleResource, err error) { @@ -250,6 +265,7 @@ func (client AlertRulesClient) GetResponder(resp *http.Response) (result AlertRu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroup list the alert rules within a resource group. // // resourceGroupName is the name of the resource group. @@ -275,6 +291,7 @@ func (client AlertRulesClient) ListByResourceGroup(ctx context.Context, resource return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client AlertRulesClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -295,6 +312,7 @@ func (client AlertRulesClient) ListByResourceGroupPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client AlertRulesClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -302,6 +320,7 @@ func (client AlertRulesClient) ListByResourceGroupSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client AlertRulesClient) ListByResourceGroupResponder(resp *http.Response) (result AlertRuleResourceCollection, err error) { @@ -315,6 +334,7 @@ func (client AlertRulesClient) ListByResourceGroupResponder(resp *http.Response) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Update updates an existing AlertRuleResource. To update other fields use the CreateOrUpdate method. // // resourceGroupName is the name of the resource group. ruleName is the name of the rule. alertRulesResource is @@ -341,6 +361,7 @@ func (client AlertRulesClient) Update(ctx context.Context, resourceGroupName str return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdatePreparer prepares the Update request. func (client AlertRulesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, ruleName string, alertRulesResource AlertRuleResourcePatch) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -364,6 +385,7 @@ func (client AlertRulesClient) UpdatePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client AlertRulesClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -371,6 +393,7 @@ func (client AlertRulesClient) UpdateSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client AlertRulesClient) UpdateResponder(resp *http.Response) (result AlertRuleResource, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/autoscalesettings.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/autoscalesettings.go index d93536ada7b7..679a101c7b8e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/autoscalesettings.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/autoscalesettings.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AutoscaleSettingsClient is the monitor Management Client type AutoscaleSettingsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewAutoscaleSettingsClient creates an instance of the AutoscaleSettingsClient client. func NewAutoscaleSettingsClient(subscriptionID string) AutoscaleSettingsClient { return NewAutoscaleSettingsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewAutoscaleSettingsClientWithBaseURI creates an instance of the AutoscaleSettingsClient client. func NewAutoscaleSettingsClientWithBaseURI(baseURI string, subscriptionID string) AutoscaleSettingsClient { return AutoscaleSettingsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdate creates or updates an autoscale setting. // // resourceGroupName is the name of the resource group. autoscaleSettingName is the autoscale setting name. @@ -75,6 +79,7 @@ func (client AutoscaleSettingsClient) CreateOrUpdate(ctx context.Context, resour return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client AutoscaleSettingsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, autoscaleSettingName string, parameters AutoscaleSettingResource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -98,6 +103,7 @@ func (client AutoscaleSettingsClient) CreateOrUpdatePreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client AutoscaleSettingsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -105,6 +111,7 @@ func (client AutoscaleSettingsClient) CreateOrUpdateSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client AutoscaleSettingsClient) CreateOrUpdateResponder(resp *http.Response) (result AutoscaleSettingResource, err error) { @@ -118,6 +125,7 @@ func (client AutoscaleSettingsClient) CreateOrUpdateResponder(resp *http.Respons return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Delete deletes and autoscale setting // // resourceGroupName is the name of the resource group. autoscaleSettingName is the autoscale setting name. @@ -143,6 +151,7 @@ func (client AutoscaleSettingsClient) Delete(ctx context.Context, resourceGroupN return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeletePreparer prepares the Delete request. func (client AutoscaleSettingsClient) DeletePreparer(ctx context.Context, resourceGroupName string, autoscaleSettingName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -164,6 +173,7 @@ func (client AutoscaleSettingsClient) DeletePreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client AutoscaleSettingsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -171,6 +181,7 @@ func (client AutoscaleSettingsClient) DeleteSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client AutoscaleSettingsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -183,6 +194,7 @@ func (client AutoscaleSettingsClient) DeleteResponder(resp *http.Response) (resu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Get gets an autoscale setting // // resourceGroupName is the name of the resource group. autoscaleSettingName is the autoscale setting name. @@ -208,6 +220,7 @@ func (client AutoscaleSettingsClient) Get(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetPreparer prepares the Get request. func (client AutoscaleSettingsClient) GetPreparer(ctx context.Context, resourceGroupName string, autoscaleSettingName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -229,6 +242,7 @@ func (client AutoscaleSettingsClient) GetPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client AutoscaleSettingsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -236,6 +250,7 @@ func (client AutoscaleSettingsClient) GetSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client AutoscaleSettingsClient) GetResponder(resp *http.Response) (result AutoscaleSettingResource, err error) { @@ -249,6 +264,7 @@ func (client AutoscaleSettingsClient) GetResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroup lists the autoscale settings for a resource group // // resourceGroupName is the name of the resource group. @@ -275,6 +291,7 @@ func (client AutoscaleSettingsClient) ListByResourceGroup(ctx context.Context, r return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client AutoscaleSettingsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -295,6 +312,7 @@ func (client AutoscaleSettingsClient) ListByResourceGroupPreparer(ctx context.Co return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client AutoscaleSettingsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -302,6 +320,7 @@ func (client AutoscaleSettingsClient) ListByResourceGroupSender(req *http.Reques azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client AutoscaleSettingsClient) ListByResourceGroupResponder(resp *http.Response) (result AutoscaleSettingResourceCollection, err error) { @@ -336,12 +355,14 @@ func (client AutoscaleSettingsClient) listByResourceGroupNextResults(lastResults return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. func (client AutoscaleSettingsClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result AutoscaleSettingResourceCollectionIterator, err error) { result.page, err = client.ListByResourceGroup(ctx, resourceGroupName) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Update updates an existing AutoscaleSettingsResource. To update other fields use the CreateOrUpdate method. // // resourceGroupName is the name of the resource group. autoscaleSettingName is the autoscale setting name. @@ -368,6 +389,7 @@ func (client AutoscaleSettingsClient) Update(ctx context.Context, resourceGroupN return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdatePreparer prepares the Update request. func (client AutoscaleSettingsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, autoscaleSettingName string, autoscaleSettingResource AutoscaleSettingResourcePatch) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -391,6 +413,7 @@ func (client AutoscaleSettingsClient) UpdatePreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client AutoscaleSettingsClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -398,6 +421,7 @@ func (client AutoscaleSettingsClient) UpdateSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client AutoscaleSettingsClient) UpdateResponder(resp *http.Response) (result AutoscaleSettingResource, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/client.go index 5ed388022a2b..bf56ea6ed5e9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/client.go @@ -29,6 +29,7 @@ const ( DefaultBaseURI = "https://management.azure.com" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // BaseClient is the base client for Insights. type BaseClient struct { autorest.Client @@ -36,11 +37,13 @@ type BaseClient struct { SubscriptionID string } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // New creates an instance of the BaseClient client. func New(subscriptionID string) BaseClient { return NewWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewWithBaseURI creates an instance of the BaseClient client. func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { return BaseClient{ diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettings.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettings.go index 95ed5682be15..0655ffd3f034 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettings.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettings.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DiagnosticSettingsClient is the monitor Management Client type DiagnosticSettingsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewDiagnosticSettingsClient creates an instance of the DiagnosticSettingsClient client. func NewDiagnosticSettingsClient(subscriptionID string) DiagnosticSettingsClient { return NewDiagnosticSettingsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewDiagnosticSettingsClientWithBaseURI creates an instance of the DiagnosticSettingsClient client. func NewDiagnosticSettingsClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticSettingsClient { return DiagnosticSettingsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdate creates or updates diagnostic settings for the specified resource. // // resourceURI is the identifier of the resource. parameters is parameters supplied to the operation. name is the @@ -65,6 +69,7 @@ func (client DiagnosticSettingsClient) CreateOrUpdate(ctx context.Context, resou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DiagnosticSettingsClient) CreateOrUpdatePreparer(ctx context.Context, resourceURI string, parameters DiagnosticSettingsResource, name string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -87,6 +92,7 @@ func (client DiagnosticSettingsClient) CreateOrUpdatePreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DiagnosticSettingsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -94,6 +100,7 @@ func (client DiagnosticSettingsClient) CreateOrUpdateSender(req *http.Request) ( autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DiagnosticSettingsClient) CreateOrUpdateResponder(resp *http.Response) (result DiagnosticSettingsResource, err error) { @@ -107,6 +114,7 @@ func (client DiagnosticSettingsClient) CreateOrUpdateResponder(resp *http.Respon return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Delete deletes existing diagnostic settings for the specified resource. // // resourceURI is the identifier of the resource. name is the name of the diagnostic setting. @@ -132,6 +140,7 @@ func (client DiagnosticSettingsClient) Delete(ctx context.Context, resourceURI s return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeletePreparer prepares the Delete request. func (client DiagnosticSettingsClient) DeletePreparer(ctx context.Context, resourceURI string, name string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -152,6 +161,7 @@ func (client DiagnosticSettingsClient) DeletePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client DiagnosticSettingsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -159,6 +169,7 @@ func (client DiagnosticSettingsClient) DeleteSender(req *http.Request) (*http.Re autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client DiagnosticSettingsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -171,6 +182,7 @@ func (client DiagnosticSettingsClient) DeleteResponder(resp *http.Response) (res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Get gets the active diagnostic settings for the specified resource. // // resourceURI is the identifier of the resource. name is the name of the diagnostic setting. @@ -196,6 +208,7 @@ func (client DiagnosticSettingsClient) Get(ctx context.Context, resourceURI stri return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetPreparer prepares the Get request. func (client DiagnosticSettingsClient) GetPreparer(ctx context.Context, resourceURI string, name string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -216,6 +229,7 @@ func (client DiagnosticSettingsClient) GetPreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DiagnosticSettingsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -223,6 +237,7 @@ func (client DiagnosticSettingsClient) GetSender(req *http.Request) (*http.Respo autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DiagnosticSettingsClient) GetResponder(resp *http.Response) (result DiagnosticSettingsResource, err error) { @@ -236,6 +251,7 @@ func (client DiagnosticSettingsClient) GetResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // List gets the active diagnostic settings list for the specified resource. // // resourceURI is the identifier of the resource. @@ -261,6 +277,7 @@ func (client DiagnosticSettingsClient) List(ctx context.Context, resourceURI str return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListPreparer prepares the List request. func (client DiagnosticSettingsClient) ListPreparer(ctx context.Context, resourceURI string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -280,6 +297,7 @@ func (client DiagnosticSettingsClient) ListPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client DiagnosticSettingsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -287,6 +305,7 @@ func (client DiagnosticSettingsClient) ListSender(req *http.Request) (*http.Resp autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client DiagnosticSettingsClient) ListResponder(resp *http.Response) (result DiagnosticSettingsResourceCollection, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettingscategory.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettingscategory.go index 8862f852c9c0..a93d8a64bd4b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettingscategory.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettingscategory.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DiagnosticSettingsCategoryClient is the monitor Management Client type DiagnosticSettingsCategoryClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewDiagnosticSettingsCategoryClient creates an instance of the DiagnosticSettingsCategoryClient client. func NewDiagnosticSettingsCategoryClient(subscriptionID string) DiagnosticSettingsCategoryClient { return NewDiagnosticSettingsCategoryClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewDiagnosticSettingsCategoryClientWithBaseURI creates an instance of the DiagnosticSettingsCategoryClient client. func NewDiagnosticSettingsCategoryClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticSettingsCategoryClient { return DiagnosticSettingsCategoryClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Get gets the diagnostic settings category for the specified resource. // // resourceURI is the identifier of the resource. name is the name of the diagnostic setting. @@ -64,6 +68,7 @@ func (client DiagnosticSettingsCategoryClient) Get(ctx context.Context, resource return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetPreparer prepares the Get request. func (client DiagnosticSettingsCategoryClient) GetPreparer(ctx context.Context, resourceURI string, name string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -84,6 +89,7 @@ func (client DiagnosticSettingsCategoryClient) GetPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DiagnosticSettingsCategoryClient) GetSender(req *http.Request) (*http.Response, error) { @@ -91,6 +97,7 @@ func (client DiagnosticSettingsCategoryClient) GetSender(req *http.Request) (*ht autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DiagnosticSettingsCategoryClient) GetResponder(resp *http.Response) (result DiagnosticSettingsCategoryResource, err error) { @@ -104,6 +111,7 @@ func (client DiagnosticSettingsCategoryClient) GetResponder(resp *http.Response) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // List lists the diagnostic settings categories for the specified resource. // // resourceURI is the identifier of the resource. @@ -129,6 +137,7 @@ func (client DiagnosticSettingsCategoryClient) List(ctx context.Context, resourc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListPreparer prepares the List request. func (client DiagnosticSettingsCategoryClient) ListPreparer(ctx context.Context, resourceURI string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -148,6 +157,7 @@ func (client DiagnosticSettingsCategoryClient) ListPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client DiagnosticSettingsCategoryClient) ListSender(req *http.Request) (*http.Response, error) { @@ -155,6 +165,7 @@ func (client DiagnosticSettingsCategoryClient) ListSender(req *http.Request) (*h autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client DiagnosticSettingsCategoryClient) ListResponder(resp *http.Response) (result DiagnosticSettingsCategoryResourceCollection, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/logprofiles.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/logprofiles.go index ab273d46afa4..fa976b3f1577 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/logprofiles.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/logprofiles.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // LogProfilesClient is the monitor Management Client type LogProfilesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewLogProfilesClient creates an instance of the LogProfilesClient client. func NewLogProfilesClient(subscriptionID string) LogProfilesClient { return NewLogProfilesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewLogProfilesClientWithBaseURI creates an instance of the LogProfilesClient client. func NewLogProfilesClientWithBaseURI(baseURI string, subscriptionID string) LogProfilesClient { return LogProfilesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdate create or update a log profile in Azure Monitoring REST API. // // logProfileName is the name of the log profile. parameters is parameters supplied to the operation. @@ -79,6 +83,7 @@ func (client LogProfilesClient) CreateOrUpdate(ctx context.Context, logProfileNa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client LogProfilesClient) CreateOrUpdatePreparer(ctx context.Context, logProfileName string, parameters LogProfileResource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -101,6 +106,7 @@ func (client LogProfilesClient) CreateOrUpdatePreparer(ctx context.Context, logP return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client LogProfilesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -108,6 +114,7 @@ func (client LogProfilesClient) CreateOrUpdateSender(req *http.Request) (*http.R azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client LogProfilesClient) CreateOrUpdateResponder(resp *http.Response) (result LogProfileResource, err error) { @@ -121,6 +128,7 @@ func (client LogProfilesClient) CreateOrUpdateResponder(resp *http.Response) (re return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Delete deletes the log profile. // // logProfileName is the name of the log profile. @@ -146,6 +154,7 @@ func (client LogProfilesClient) Delete(ctx context.Context, logProfileName strin return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeletePreparer prepares the Delete request. func (client LogProfilesClient) DeletePreparer(ctx context.Context, logProfileName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -166,6 +175,7 @@ func (client LogProfilesClient) DeletePreparer(ctx context.Context, logProfileNa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client LogProfilesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -173,6 +183,7 @@ func (client LogProfilesClient) DeleteSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client LogProfilesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -185,6 +196,7 @@ func (client LogProfilesClient) DeleteResponder(resp *http.Response) (result aut return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Get gets the log profile. // // logProfileName is the name of the log profile. @@ -210,6 +222,7 @@ func (client LogProfilesClient) Get(ctx context.Context, logProfileName string) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetPreparer prepares the Get request. func (client LogProfilesClient) GetPreparer(ctx context.Context, logProfileName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -230,6 +243,7 @@ func (client LogProfilesClient) GetPreparer(ctx context.Context, logProfileName return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client LogProfilesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -237,6 +251,7 @@ func (client LogProfilesClient) GetSender(req *http.Request) (*http.Response, er azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client LogProfilesClient) GetResponder(resp *http.Response) (result LogProfileResource, err error) { @@ -250,6 +265,7 @@ func (client LogProfilesClient) GetResponder(resp *http.Response) (result LogPro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // List list the log profiles. func (client LogProfilesClient) List(ctx context.Context) (result LogProfileCollection, err error) { req, err := client.ListPreparer(ctx) @@ -273,6 +289,7 @@ func (client LogProfilesClient) List(ctx context.Context) (result LogProfileColl return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListPreparer prepares the List request. func (client LogProfilesClient) ListPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -292,6 +309,7 @@ func (client LogProfilesClient) ListPreparer(ctx context.Context) (*http.Request return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client LogProfilesClient) ListSender(req *http.Request) (*http.Response, error) { @@ -299,6 +317,7 @@ func (client LogProfilesClient) ListSender(req *http.Request) (*http.Response, e azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client LogProfilesClient) ListResponder(resp *http.Response) (result LogProfileCollection, err error) { @@ -312,6 +331,7 @@ func (client LogProfilesClient) ListResponder(resp *http.Response) (result LogPr return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Update updates an existing LogProfilesResource. To update other fields use the CreateOrUpdate method. // // logProfileName is the name of the log profile. logProfilesResource is parameters supplied to the operation. @@ -337,6 +357,7 @@ func (client LogProfilesClient) Update(ctx context.Context, logProfileName strin return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdatePreparer prepares the Update request. func (client LogProfilesClient) UpdatePreparer(ctx context.Context, logProfileName string, logProfilesResource LogProfileResourcePatch) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -359,6 +380,7 @@ func (client LogProfilesClient) UpdatePreparer(ctx context.Context, logProfileNa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client LogProfilesClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -366,6 +388,7 @@ func (client LogProfilesClient) UpdateSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client LogProfilesClient) UpdateResponder(resp *http.Response) (result LogProfileResource, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/models.go index decb179ef30c..aece5f5fa3c1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/models.go @@ -25,6 +25,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // CategoryType enumerates the values for category type. type CategoryType string @@ -35,11 +36,13 @@ const ( Metrics CategoryType = "Metrics" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleCategoryTypeValues returns an array of possible values for the CategoryType const type. func PossibleCategoryTypeValues() []CategoryType { return []CategoryType{Logs, Metrics} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ComparisonOperationType enumerates the values for comparison operation type. type ComparisonOperationType string @@ -58,11 +61,13 @@ const ( NotEquals ComparisonOperationType = "NotEquals" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleComparisonOperationTypeValues returns an array of possible values for the ComparisonOperationType const type. func PossibleComparisonOperationTypeValues() []ComparisonOperationType { return []ComparisonOperationType{Equals, GreaterThan, GreaterThanOrEqual, LessThan, LessThanOrEqual, NotEquals} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ConditionOperator enumerates the values for condition operator. type ConditionOperator string @@ -77,11 +82,13 @@ const ( ConditionOperatorLessThanOrEqual ConditionOperator = "LessThanOrEqual" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleConditionOperatorValues returns an array of possible values for the ConditionOperator const type. func PossibleConditionOperatorValues() []ConditionOperator { return []ConditionOperator{ConditionOperatorGreaterThan, ConditionOperatorGreaterThanOrEqual, ConditionOperatorLessThan, ConditionOperatorLessThanOrEqual} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MetricStatisticType enumerates the values for metric statistic type. type MetricStatisticType string @@ -96,11 +103,13 @@ const ( Sum MetricStatisticType = "Sum" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleMetricStatisticTypeValues returns an array of possible values for the MetricStatisticType const type. func PossibleMetricStatisticTypeValues() []MetricStatisticType { return []MetricStatisticType{Average, Max, Min, Sum} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // OdataType enumerates the values for odata type. type OdataType string @@ -113,11 +122,13 @@ const ( OdataTypeRuleDataSource OdataType = "RuleDataSource" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleOdataTypeValues returns an array of possible values for the OdataType const type. func PossibleOdataTypeValues() []OdataType { return []OdataType{OdataTypeMicrosoftAzureManagementInsightsModelsRuleManagementEventDataSource, OdataTypeMicrosoftAzureManagementInsightsModelsRuleMetricDataSource, OdataTypeRuleDataSource} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // OdataTypeBasicRuleAction enumerates the values for odata type basic rule action. type OdataTypeBasicRuleAction string @@ -130,11 +141,13 @@ const ( OdataTypeRuleAction OdataTypeBasicRuleAction = "RuleAction" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleOdataTypeBasicRuleActionValues returns an array of possible values for the OdataTypeBasicRuleAction const type. func PossibleOdataTypeBasicRuleActionValues() []OdataTypeBasicRuleAction { return []OdataTypeBasicRuleAction{OdataTypeMicrosoftAzureManagementInsightsModelsRuleEmailAction, OdataTypeMicrosoftAzureManagementInsightsModelsRuleWebhookAction, OdataTypeRuleAction} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // OdataTypeBasicRuleCondition enumerates the values for odata type basic rule condition. type OdataTypeBasicRuleCondition string @@ -149,11 +162,13 @@ const ( OdataTypeRuleCondition OdataTypeBasicRuleCondition = "RuleCondition" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleOdataTypeBasicRuleConditionValues returns an array of possible values for the OdataTypeBasicRuleCondition const type. func PossibleOdataTypeBasicRuleConditionValues() []OdataTypeBasicRuleCondition { return []OdataTypeBasicRuleCondition{OdataTypeMicrosoftAzureManagementInsightsModelsLocationThresholdRuleCondition, OdataTypeMicrosoftAzureManagementInsightsModelsManagementEventRuleCondition, OdataTypeMicrosoftAzureManagementInsightsModelsThresholdRuleCondition, OdataTypeRuleCondition} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ReceiverStatus enumerates the values for receiver status. type ReceiverStatus string @@ -166,11 +181,13 @@ const ( NotSpecified ReceiverStatus = "NotSpecified" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleReceiverStatusValues returns an array of possible values for the ReceiverStatus const type. func PossibleReceiverStatusValues() []ReceiverStatus { return []ReceiverStatus{Disabled, Enabled, NotSpecified} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // RecurrenceFrequency enumerates the values for recurrence frequency. type RecurrenceFrequency string @@ -193,11 +210,13 @@ const ( Year RecurrenceFrequency = "Year" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleRecurrenceFrequencyValues returns an array of possible values for the RecurrenceFrequency const type. func PossibleRecurrenceFrequencyValues() []RecurrenceFrequency { return []RecurrenceFrequency{Day, Hour, Minute, Month, None, Second, Week, Year} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ScaleDirection enumerates the values for scale direction. type ScaleDirection string @@ -210,11 +229,13 @@ const ( ScaleDirectionNone ScaleDirection = "None" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleScaleDirectionValues returns an array of possible values for the ScaleDirection const type. func PossibleScaleDirectionValues() []ScaleDirection { return []ScaleDirection{ScaleDirectionDecrease, ScaleDirectionIncrease, ScaleDirectionNone} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ScaleType enumerates the values for scale type. type ScaleType string @@ -227,11 +248,13 @@ const ( PercentChangeCount ScaleType = "PercentChangeCount" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleScaleTypeValues returns an array of possible values for the ScaleType const type. func PossibleScaleTypeValues() []ScaleType { return []ScaleType{ChangeCount, ExactCount, PercentChangeCount} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // TimeAggregationOperator enumerates the values for time aggregation operator. type TimeAggregationOperator string @@ -248,11 +271,13 @@ const ( TimeAggregationOperatorTotal TimeAggregationOperator = "Total" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleTimeAggregationOperatorValues returns an array of possible values for the TimeAggregationOperator const type. func PossibleTimeAggregationOperatorValues() []TimeAggregationOperator { return []TimeAggregationOperator{TimeAggregationOperatorAverage, TimeAggregationOperatorLast, TimeAggregationOperatorMaximum, TimeAggregationOperatorMinimum, TimeAggregationOperatorTotal} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // TimeAggregationType enumerates the values for time aggregation type. type TimeAggregationType string @@ -269,11 +294,13 @@ const ( TimeAggregationTypeTotal TimeAggregationType = "Total" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // PossibleTimeAggregationTypeValues returns an array of possible values for the TimeAggregationType const type. func PossibleTimeAggregationTypeValues() []TimeAggregationType { return []TimeAggregationType{TimeAggregationTypeAverage, TimeAggregationTypeCount, TimeAggregationTypeMaximum, TimeAggregationTypeMinimum, TimeAggregationTypeTotal} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActionGroup an Azure action group. type ActionGroup struct { // GroupShortName - The short name of the action group. This will be used in SMS messages. @@ -294,6 +321,7 @@ type ActionGroup struct { AutomationRunbookReceivers *[]AutomationRunbookReceiver `json:"automationRunbookReceivers,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActionGroupList a list of action groups. type ActionGroupList struct { autorest.Response `json:"-"` @@ -303,12 +331,14 @@ type ActionGroupList struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActionGroupPatch an Azure action group for patch operations. type ActionGroupPatch struct { // Enabled - Indicates whether this action group is enabled. If an action group is not enabled, then none of its actions will be activated. Enabled *bool `json:"enabled,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActionGroupPatchBody an action group object for the body of patch operations. type ActionGroupPatchBody struct { // Tags - Resource tags @@ -317,6 +347,7 @@ type ActionGroupPatchBody struct { *ActionGroupPatch `json:"properties,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for ActionGroupPatchBody. func (agpb ActionGroupPatchBody) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -329,6 +360,7 @@ func (agpb ActionGroupPatchBody) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for ActionGroupPatchBody struct. func (agpb *ActionGroupPatchBody) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -362,6 +394,7 @@ func (agpb *ActionGroupPatchBody) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActionGroupResource an action group resource. type ActionGroupResource struct { autorest.Response `json:"-"` @@ -379,6 +412,7 @@ type ActionGroupResource struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for ActionGroupResource. func (agr ActionGroupResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -403,6 +437,7 @@ func (agr ActionGroupResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for ActionGroupResource struct. func (agr *ActionGroupResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -472,6 +507,7 @@ func (agr *ActionGroupResource) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActivityLogAlert an Azure activity log alert. type ActivityLogAlert struct { // Scopes - A list of resourceIds that will be used as prefixes. The alert will only apply to activityLogs with resourceIds that fall under one of these prefixes. This list must include at least one item. @@ -486,6 +522,7 @@ type ActivityLogAlert struct { Description *string `json:"description,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActivityLogAlertActionGroup a pointer to an Azure Action Group. type ActivityLogAlertActionGroup struct { // ActionGroupID - The resourceId of the action group. This cannot be null or empty. @@ -494,6 +531,7 @@ type ActivityLogAlertActionGroup struct { WebhookProperties map[string]*string `json:"webhookProperties"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for ActivityLogAlertActionGroup. func (alaag ActivityLogAlertActionGroup) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -506,12 +544,14 @@ func (alaag ActivityLogAlertActionGroup) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActivityLogAlertActionList a list of activity log alert actions. type ActivityLogAlertActionList struct { // ActionGroups - The list of activity log alerts. ActionGroups *[]ActivityLogAlertActionGroup `json:"actionGroups,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActivityLogAlertAllOfCondition an Activity Log alert condition that is met when all its member conditions are // met. type ActivityLogAlertAllOfCondition struct { @@ -519,6 +559,7 @@ type ActivityLogAlertAllOfCondition struct { AllOf *[]ActivityLogAlertLeafCondition `json:"allOf,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActivityLogAlertLeafCondition an Activity Log alert condition that is met by comparing an activity log field and // value. type ActivityLogAlertLeafCondition struct { @@ -528,6 +569,7 @@ type ActivityLogAlertLeafCondition struct { Equals *string `json:"equals,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActivityLogAlertList a list of activity log alerts. type ActivityLogAlertList struct { autorest.Response `json:"-"` @@ -537,12 +579,14 @@ type ActivityLogAlertList struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActivityLogAlertPatch an Azure activity log alert for patch operations. type ActivityLogAlertPatch struct { // Enabled - Indicates whether this activity log alert is enabled. If an activity log alert is not enabled, then none of its actions will be activated. Enabled *bool `json:"enabled,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActivityLogAlertPatchBody an activity log alert object for the body of patch operations. type ActivityLogAlertPatchBody struct { // Tags - Resource tags @@ -551,6 +595,7 @@ type ActivityLogAlertPatchBody struct { *ActivityLogAlertPatch `json:"properties,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for ActivityLogAlertPatchBody. func (alapb ActivityLogAlertPatchBody) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -563,6 +608,7 @@ func (alapb ActivityLogAlertPatchBody) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for ActivityLogAlertPatchBody struct. func (alapb *ActivityLogAlertPatchBody) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -596,6 +642,7 @@ func (alapb *ActivityLogAlertPatchBody) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ActivityLogAlertResource an activity log alert resource. type ActivityLogAlertResource struct { autorest.Response `json:"-"` @@ -613,6 +660,7 @@ type ActivityLogAlertResource struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for ActivityLogAlertResource. func (alar ActivityLogAlertResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -637,6 +685,7 @@ func (alar ActivityLogAlertResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for ActivityLogAlertResource struct. func (alar *ActivityLogAlertResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -706,6 +755,7 @@ func (alar *ActivityLogAlertResource) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AlertRule an alert rule. type AlertRule struct { // Name - the name of the alert rule. @@ -722,6 +772,7 @@ type AlertRule struct { LastUpdatedTime *date.Time `json:"lastUpdatedTime,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for AlertRule struct. func (ar *AlertRule) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -789,6 +840,7 @@ func (ar *AlertRule) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AlertRuleResource the alert rule resource. type AlertRuleResource struct { autorest.Response `json:"-"` @@ -806,6 +858,7 @@ type AlertRuleResource struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for AlertRuleResource. func (arr AlertRuleResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -830,6 +883,7 @@ func (arr AlertRuleResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for AlertRuleResource struct. func (arr *AlertRuleResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -899,6 +953,7 @@ func (arr *AlertRuleResource) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AlertRuleResourceCollection represents a collection of alert rule resources. type AlertRuleResourceCollection struct { autorest.Response `json:"-"` @@ -906,6 +961,7 @@ type AlertRuleResourceCollection struct { Value *[]AlertRuleResource `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AlertRuleResourcePatch the alert rule object for patch operations. type AlertRuleResourcePatch struct { // Tags - Resource tags @@ -914,6 +970,7 @@ type AlertRuleResourcePatch struct { *AlertRule `json:"properties,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for AlertRuleResourcePatch. func (arrp AlertRuleResourcePatch) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -926,6 +983,7 @@ func (arrp AlertRuleResourcePatch) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for AlertRuleResourcePatch struct. func (arrp *AlertRuleResourcePatch) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -959,6 +1017,7 @@ func (arrp *AlertRuleResourcePatch) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AutomationRunbookReceiver the Azure Automation Runbook notification receiver. type AutomationRunbookReceiver struct { // AutomationAccountID - The Azure automation account Id which holds this runbook and authenticate to Azure resource. @@ -975,6 +1034,7 @@ type AutomationRunbookReceiver struct { ServiceURI *string `json:"serviceUri,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AutoscaleNotification autoscale notification. type AutoscaleNotification struct { // Operation - the operation associated with the notification and its value must be "scale" @@ -985,6 +1045,7 @@ type AutoscaleNotification struct { Webhooks *[]WebhookNotification `json:"webhooks,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AutoscaleProfile autoscale profile. type AutoscaleProfile struct { // Name - the name of the profile. @@ -999,6 +1060,7 @@ type AutoscaleProfile struct { Recurrence *Recurrence `json:"recurrence,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AutoscaleSetting a setting that contains all of the configuration for the automatic scaling of a resource. type AutoscaleSetting struct { // Profiles - the collection of automatic scaling profiles that specify different scaling parameters for different time periods. A maximum of 20 profiles can be specified. @@ -1013,6 +1075,7 @@ type AutoscaleSetting struct { TargetResourceURI *string `json:"targetResourceUri,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AutoscaleSettingResource the autoscale setting resource. type AutoscaleSettingResource struct { autorest.Response `json:"-"` @@ -1030,6 +1093,7 @@ type AutoscaleSettingResource struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for AutoscaleSettingResource. func (asr AutoscaleSettingResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1054,6 +1118,7 @@ func (asr AutoscaleSettingResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for AutoscaleSettingResource struct. func (asr *AutoscaleSettingResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1123,6 +1188,7 @@ func (asr *AutoscaleSettingResource) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AutoscaleSettingResourceCollection represents a collection of autoscale setting resources. type AutoscaleSettingResourceCollection struct { autorest.Response `json:"-"` @@ -1132,6 +1198,7 @@ type AutoscaleSettingResourceCollection struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AutoscaleSettingResourceCollectionIterator provides access to a complete listing of AutoscaleSettingResource // values. type AutoscaleSettingResourceCollectionIterator struct { @@ -1139,6 +1206,7 @@ type AutoscaleSettingResourceCollectionIterator struct { page AutoscaleSettingResourceCollectionPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *AutoscaleSettingResourceCollectionIterator) Next() error { @@ -1155,16 +1223,19 @@ func (iter *AutoscaleSettingResourceCollectionIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter AutoscaleSettingResourceCollectionIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Response returns the raw server response from the last page request. func (iter AutoscaleSettingResourceCollectionIterator) Response() AutoscaleSettingResourceCollection { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter AutoscaleSettingResourceCollectionIterator) Value() AutoscaleSettingResource { @@ -1174,6 +1245,7 @@ func (iter AutoscaleSettingResourceCollectionIterator) Value() AutoscaleSettingR return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // IsEmpty returns true if the ListResult contains no values. func (asrc AutoscaleSettingResourceCollection) IsEmpty() bool { return asrc.Value == nil || len(*asrc.Value) == 0 @@ -1191,12 +1263,14 @@ func (asrc AutoscaleSettingResourceCollection) autoscaleSettingResourceCollectio autorest.WithBaseURL(to.String(asrc.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AutoscaleSettingResourceCollectionPage contains a page of AutoscaleSettingResource values. type AutoscaleSettingResourceCollectionPage struct { fn func(AutoscaleSettingResourceCollection) (AutoscaleSettingResourceCollection, error) asrc AutoscaleSettingResourceCollection } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *AutoscaleSettingResourceCollectionPage) Next() error { @@ -1208,16 +1282,19 @@ func (page *AutoscaleSettingResourceCollectionPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page AutoscaleSettingResourceCollectionPage) NotDone() bool { return !page.asrc.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Response returns the raw server response from the last page request. func (page AutoscaleSettingResourceCollectionPage) Response() AutoscaleSettingResourceCollection { return page.asrc } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Values returns the slice of values for the current page or nil if there are no values. func (page AutoscaleSettingResourceCollectionPage) Values() []AutoscaleSettingResource { if page.asrc.IsEmpty() { @@ -1226,6 +1303,7 @@ func (page AutoscaleSettingResourceCollectionPage) Values() []AutoscaleSettingRe return *page.asrc.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AutoscaleSettingResourcePatch the autoscale setting object for patch operations. type AutoscaleSettingResourcePatch struct { // Tags - Resource tags @@ -1234,6 +1312,7 @@ type AutoscaleSettingResourcePatch struct { *AutoscaleSetting `json:"properties,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for AutoscaleSettingResourcePatch. func (asrp AutoscaleSettingResourcePatch) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1246,6 +1325,7 @@ func (asrp AutoscaleSettingResourcePatch) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for AutoscaleSettingResourcePatch struct. func (asrp *AutoscaleSettingResourcePatch) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1279,6 +1359,7 @@ func (asrp *AutoscaleSettingResourcePatch) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AzureAppPushReceiver the Azure mobile App push notification receiver. type AzureAppPushReceiver struct { // Name - The name of the Azure mobile app push receiver. Names must be unique across all receivers within an action group. @@ -1287,6 +1368,7 @@ type AzureAppPushReceiver struct { EmailAddress *string `json:"emailAddress,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DiagnosticSettings the diagnostic settings. type DiagnosticSettings struct { // StorageAccountID - The resource ID of the storage account to which you would like to send Diagnostic Logs. @@ -1303,12 +1385,14 @@ type DiagnosticSettings struct { WorkspaceID *string `json:"workspaceId,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DiagnosticSettingsCategory the diagnostic settings Category. type DiagnosticSettingsCategory struct { // CategoryType - The type of the diagnostic settings category. Possible values include: 'Metrics', 'Logs' CategoryType CategoryType `json:"categoryType,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DiagnosticSettingsCategoryResource the diagnostic settings category resource. type DiagnosticSettingsCategoryResource struct { autorest.Response `json:"-"` @@ -1321,6 +1405,7 @@ type DiagnosticSettingsCategoryResource struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for DiagnosticSettingsCategoryResource. func (dscr DiagnosticSettingsCategoryResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1339,6 +1424,7 @@ func (dscr DiagnosticSettingsCategoryResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for DiagnosticSettingsCategoryResource struct. func (dscr *DiagnosticSettingsCategoryResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1390,6 +1476,7 @@ func (dscr *DiagnosticSettingsCategoryResource) UnmarshalJSON(body []byte) error return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DiagnosticSettingsCategoryResourceCollection represents a collection of diagnostic setting category resources. type DiagnosticSettingsCategoryResourceCollection struct { autorest.Response `json:"-"` @@ -1397,6 +1484,7 @@ type DiagnosticSettingsCategoryResourceCollection struct { Value *[]DiagnosticSettingsCategoryResource `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DiagnosticSettingsResource the diagnostic setting resource. type DiagnosticSettingsResource struct { autorest.Response `json:"-"` @@ -1409,6 +1497,7 @@ type DiagnosticSettingsResource struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for DiagnosticSettingsResource. func (dsr DiagnosticSettingsResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1427,6 +1516,7 @@ func (dsr DiagnosticSettingsResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for DiagnosticSettingsResource struct. func (dsr *DiagnosticSettingsResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1478,6 +1568,7 @@ func (dsr *DiagnosticSettingsResource) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // DiagnosticSettingsResourceCollection represents a collection of alert rule resources. type DiagnosticSettingsResourceCollection struct { autorest.Response `json:"-"` @@ -1485,6 +1576,7 @@ type DiagnosticSettingsResourceCollection struct { Value *[]DiagnosticSettingsResource `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // EmailNotification email notification of an autoscale event. type EmailNotification struct { // SendToSubscriptionAdministrator - a value indicating whether to send email to subscription administrator. @@ -1495,6 +1587,7 @@ type EmailNotification struct { CustomEmails *[]string `json:"customEmails,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // EmailReceiver an email receiver. type EmailReceiver struct { // Name - The name of the email receiver. Names must be unique across all receivers within an action group. @@ -1505,12 +1598,14 @@ type EmailReceiver struct { Status ReceiverStatus `json:"status,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // EnableRequest describes a receiver that should be resubscribed. type EnableRequest struct { // ReceiverName - The name of the receiver to resubscribe. ReceiverName *string `json:"receiverName,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ErrorResponse describes the format of Error response. type ErrorResponse struct { // Code - Error code @@ -1519,6 +1614,7 @@ type ErrorResponse struct { Message *string `json:"message,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Incident an alert incident indicates the activation status of an alert rule. type Incident struct { autorest.Response `json:"-"` @@ -1534,6 +1630,7 @@ type Incident struct { ResolvedTime *date.Time `json:"resolvedTime,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // IncidentListResult the List incidents operation response. type IncidentListResult struct { autorest.Response `json:"-"` @@ -1541,6 +1638,7 @@ type IncidentListResult struct { Value *[]Incident `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ItsmReceiver an Itsm receiver. type ItsmReceiver struct { // Name - The name of the Itsm receiver. Names must be unique across all receivers within an action group. @@ -1555,6 +1653,7 @@ type ItsmReceiver struct { Region *string `json:"region,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // LocationThresholdRuleCondition a rule condition based on a certain number of locations failing. type LocationThresholdRuleCondition struct { // WindowSize - the period of time (in ISO 8601 duration format) that is used to monitor alert activity based on the threshold. If specified then it must be between 5 minutes and 1 day. @@ -1567,6 +1666,7 @@ type LocationThresholdRuleCondition struct { OdataType OdataTypeBasicRuleCondition `json:"odata.type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for LocationThresholdRuleCondition. func (ltrc LocationThresholdRuleCondition) MarshalJSON() ([]byte, error) { ltrc.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsLocationThresholdRuleCondition @@ -1584,31 +1684,37 @@ func (ltrc LocationThresholdRuleCondition) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsThresholdRuleCondition is the BasicRuleCondition implementation for LocationThresholdRuleCondition. func (ltrc LocationThresholdRuleCondition) AsThresholdRuleCondition() (*ThresholdRuleCondition, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsLocationThresholdRuleCondition is the BasicRuleCondition implementation for LocationThresholdRuleCondition. func (ltrc LocationThresholdRuleCondition) AsLocationThresholdRuleCondition() (*LocationThresholdRuleCondition, bool) { return <rc, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsManagementEventRuleCondition is the BasicRuleCondition implementation for LocationThresholdRuleCondition. func (ltrc LocationThresholdRuleCondition) AsManagementEventRuleCondition() (*ManagementEventRuleCondition, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleCondition is the BasicRuleCondition implementation for LocationThresholdRuleCondition. func (ltrc LocationThresholdRuleCondition) AsRuleCondition() (*RuleCondition, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsBasicRuleCondition is the BasicRuleCondition implementation for LocationThresholdRuleCondition. func (ltrc LocationThresholdRuleCondition) AsBasicRuleCondition() (BasicRuleCondition, bool) { return <rc, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for LocationThresholdRuleCondition struct. func (ltrc *LocationThresholdRuleCondition) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1659,6 +1765,7 @@ func (ltrc *LocationThresholdRuleCondition) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // LogProfileCollection represents a collection of log profiles. type LogProfileCollection struct { autorest.Response `json:"-"` @@ -1666,6 +1773,7 @@ type LogProfileCollection struct { Value *[]LogProfileResource `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // LogProfileProperties the log profile properties. type LogProfileProperties struct { // StorageAccountID - the resource id of the storage account to which you would like to send the Activity Log. @@ -1680,6 +1788,7 @@ type LogProfileProperties struct { RetentionPolicy *RetentionPolicy `json:"retentionPolicy,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // LogProfileResource the log profile resource. type LogProfileResource struct { autorest.Response `json:"-"` @@ -1697,6 +1806,7 @@ type LogProfileResource struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for LogProfileResource. func (lpr LogProfileResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1721,6 +1831,7 @@ func (lpr LogProfileResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for LogProfileResource struct. func (lpr *LogProfileResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1790,6 +1901,7 @@ func (lpr *LogProfileResource) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // LogProfileResourcePatch the log profile resource for patch operations. type LogProfileResourcePatch struct { // Tags - Resource tags @@ -1798,6 +1910,7 @@ type LogProfileResourcePatch struct { *LogProfileProperties `json:"properties,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for LogProfileResourcePatch. func (lprp LogProfileResourcePatch) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1810,6 +1923,7 @@ func (lprp LogProfileResourcePatch) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for LogProfileResourcePatch struct. func (lprp *LogProfileResourcePatch) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1843,6 +1957,7 @@ func (lprp *LogProfileResourcePatch) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // LogSettings part of MultiTenantDiagnosticSettings. Specifies the settings for a particular log. type LogSettings struct { // Category - Name of a Diagnostic Log category for a resource type this setting is applied to. To obtain the list of Diagnostic Log categories for a resource, first perform a GET diagnostic settings operation. @@ -1853,6 +1968,7 @@ type LogSettings struct { RetentionPolicy *RetentionPolicy `json:"retentionPolicy,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ManagementEventAggregationCondition how the data that is collected should be combined over time. type ManagementEventAggregationCondition struct { // Operator - the condition operator. Possible values include: 'ConditionOperatorGreaterThan', 'ConditionOperatorGreaterThanOrEqual', 'ConditionOperatorLessThan', 'ConditionOperatorLessThanOrEqual' @@ -1863,6 +1979,7 @@ type ManagementEventAggregationCondition struct { WindowSize *string `json:"windowSize,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ManagementEventRuleCondition a management event rule condition. type ManagementEventRuleCondition struct { // Aggregation - How the data that is collected should be combined over time and when the alert is activated. Note that for management event alerts aggregation is optional – if it is not provided then any event will cause the alert to activate. @@ -1873,6 +1990,7 @@ type ManagementEventRuleCondition struct { OdataType OdataTypeBasicRuleCondition `json:"odata.type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for ManagementEventRuleCondition. func (merc ManagementEventRuleCondition) MarshalJSON() ([]byte, error) { merc.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsManagementEventRuleCondition @@ -1887,31 +2005,37 @@ func (merc ManagementEventRuleCondition) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsThresholdRuleCondition is the BasicRuleCondition implementation for ManagementEventRuleCondition. func (merc ManagementEventRuleCondition) AsThresholdRuleCondition() (*ThresholdRuleCondition, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsLocationThresholdRuleCondition is the BasicRuleCondition implementation for ManagementEventRuleCondition. func (merc ManagementEventRuleCondition) AsLocationThresholdRuleCondition() (*LocationThresholdRuleCondition, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsManagementEventRuleCondition is the BasicRuleCondition implementation for ManagementEventRuleCondition. func (merc ManagementEventRuleCondition) AsManagementEventRuleCondition() (*ManagementEventRuleCondition, bool) { return &merc, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleCondition is the BasicRuleCondition implementation for ManagementEventRuleCondition. func (merc ManagementEventRuleCondition) AsRuleCondition() (*RuleCondition, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsBasicRuleCondition is the BasicRuleCondition implementation for ManagementEventRuleCondition. func (merc ManagementEventRuleCondition) AsBasicRuleCondition() (BasicRuleCondition, bool) { return &merc, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for ManagementEventRuleCondition struct. func (merc *ManagementEventRuleCondition) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1953,6 +2077,7 @@ func (merc *ManagementEventRuleCondition) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MetricSettings part of MultiTenantDiagnosticSettings. Specifies the settings for a particular metric. type MetricSettings struct { // TimeGrain - the timegrain of the metric in ISO8601 format. @@ -1965,6 +2090,7 @@ type MetricSettings struct { RetentionPolicy *RetentionPolicy `json:"retentionPolicy,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MetricTrigger the trigger that results in a scaling action. type MetricTrigger struct { // MetricName - the name of the metric that defines what the rule monitors. @@ -1985,6 +2111,7 @@ type MetricTrigger struct { Threshold *float64 `json:"threshold,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Operation microsoft Insights API operation definition. type Operation struct { // Name - Operation name: {provider}/{resource}/{operation} @@ -1993,6 +2120,7 @@ type Operation struct { Display *OperationDisplay `json:"display,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // OperationDisplay display metadata associated with the operation. type OperationDisplay struct { // Provider - Service provider: Microsoft.Insights @@ -2003,6 +2131,7 @@ type OperationDisplay struct { Operation *string `json:"operation,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // OperationListResult result of the request to list Microsoft.Insights operations. It contains a list of // operations and a URL link to get the next set of results. type OperationListResult struct { @@ -2013,6 +2142,7 @@ type OperationListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ProxyOnlyResource a proxy only azure resource object type ProxyOnlyResource struct { // ID - Azure resource Id @@ -2023,6 +2153,7 @@ type ProxyOnlyResource struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Recurrence the repeating times at which this profile begins. This element is not used if the FixedDate element // is used. type Recurrence struct { @@ -2032,6 +2163,7 @@ type Recurrence struct { Schedule *RecurrentSchedule `json:"schedule,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // RecurrentSchedule the scheduling constraints for when the profile begins. type RecurrentSchedule struct { // TimeZone - the timezone for the hours of the profile. Some examples of valid timezones are: Dateline Standard Time, UTC-11, Hawaiian Standard Time, Alaskan Standard Time, Pacific Standard Time (Mexico), Pacific Standard Time, US Mountain Standard Time, Mountain Standard Time (Mexico), Mountain Standard Time, Central America Standard Time, Central Standard Time, Central Standard Time (Mexico), Canada Central Standard Time, SA Pacific Standard Time, Eastern Standard Time, US Eastern Standard Time, Venezuela Standard Time, Paraguay Standard Time, Atlantic Standard Time, Central Brazilian Standard Time, SA Western Standard Time, Pacific SA Standard Time, Newfoundland Standard Time, E. South America Standard Time, Argentina Standard Time, SA Eastern Standard Time, Greenland Standard Time, Montevideo Standard Time, Bahia Standard Time, UTC-02, Mid-Atlantic Standard Time, Azores Standard Time, Cape Verde Standard Time, Morocco Standard Time, UTC, GMT Standard Time, Greenwich Standard Time, W. Europe Standard Time, Central Europe Standard Time, Romance Standard Time, Central European Standard Time, W. Central Africa Standard Time, Namibia Standard Time, Jordan Standard Time, GTB Standard Time, Middle East Standard Time, Egypt Standard Time, Syria Standard Time, E. Europe Standard Time, South Africa Standard Time, FLE Standard Time, Turkey Standard Time, Israel Standard Time, Kaliningrad Standard Time, Libya Standard Time, Arabic Standard Time, Arab Standard Time, Belarus Standard Time, Russian Standard Time, E. Africa Standard Time, Iran Standard Time, Arabian Standard Time, Azerbaijan Standard Time, Russia Time Zone 3, Mauritius Standard Time, Georgian Standard Time, Caucasus Standard Time, Afghanistan Standard Time, West Asia Standard Time, Ekaterinburg Standard Time, Pakistan Standard Time, India Standard Time, Sri Lanka Standard Time, Nepal Standard Time, Central Asia Standard Time, Bangladesh Standard Time, N. Central Asia Standard Time, Myanmar Standard Time, SE Asia Standard Time, North Asia Standard Time, China Standard Time, North Asia East Standard Time, Singapore Standard Time, W. Australia Standard Time, Taipei Standard Time, Ulaanbaatar Standard Time, Tokyo Standard Time, Korea Standard Time, Yakutsk Standard Time, Cen. Australia Standard Time, AUS Central Standard Time, E. Australia Standard Time, AUS Eastern Standard Time, West Pacific Standard Time, Tasmania Standard Time, Magadan Standard Time, Vladivostok Standard Time, Russia Time Zone 10, Central Pacific Standard Time, Russia Time Zone 11, New Zealand Standard Time, UTC+12, Fiji Standard Time, Kamchatka Standard Time, Tonga Standard Time, Samoa Standard Time, Line Islands Standard Time @@ -2044,6 +2176,7 @@ type RecurrentSchedule struct { Minutes *[]int32 `json:"minutes,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Resource an azure resource object type Resource struct { // ID - Azure resource Id @@ -2058,6 +2191,7 @@ type Resource struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for Resource. func (r Resource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2079,6 +2213,7 @@ func (r Resource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // RetentionPolicy specifies the retention policy for the log. type RetentionPolicy struct { // Enabled - a value indicating whether the retention policy is enabled. @@ -2087,6 +2222,7 @@ type RetentionPolicy struct { Days *int32 `json:"days,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // BasicRuleAction the action that is performed when the alert rule becomes active, and when an alert condition is // resolved. type BasicRuleAction interface { @@ -2095,6 +2231,7 @@ type BasicRuleAction interface { AsRuleAction() (*RuleAction, bool) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // RuleAction the action that is performed when the alert rule becomes active, and when an alert condition is // resolved. type RuleAction struct { @@ -2143,6 +2280,7 @@ func unmarshalBasicRuleActionArray(body []byte) ([]BasicRuleAction, error) { return raArray, nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for RuleAction. func (ra RuleAction) MarshalJSON() ([]byte, error) { ra.OdataType = OdataTypeRuleAction @@ -2153,26 +2291,31 @@ func (ra RuleAction) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleEmailAction is the BasicRuleAction implementation for RuleAction. func (ra RuleAction) AsRuleEmailAction() (*RuleEmailAction, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleWebhookAction is the BasicRuleAction implementation for RuleAction. func (ra RuleAction) AsRuleWebhookAction() (*RuleWebhookAction, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleAction is the BasicRuleAction implementation for RuleAction. func (ra RuleAction) AsRuleAction() (*RuleAction, bool) { return &ra, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsBasicRuleAction is the BasicRuleAction implementation for RuleAction. func (ra RuleAction) AsBasicRuleAction() (BasicRuleAction, bool) { return &ra, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // BasicRuleCondition the condition that results in the alert rule being activated. type BasicRuleCondition interface { AsThresholdRuleCondition() (*ThresholdRuleCondition, bool) @@ -2181,6 +2324,7 @@ type BasicRuleCondition interface { AsRuleCondition() (*RuleCondition, bool) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // RuleCondition the condition that results in the alert rule being activated. type RuleCondition struct { // DataSource - the resource from which the rule collects its data. For this type dataSource will always be of type RuleMetricDataSource. @@ -2234,6 +2378,7 @@ func unmarshalBasicRuleConditionArray(body []byte) ([]BasicRuleCondition, error) return rcArray, nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for RuleCondition. func (rc RuleCondition) MarshalJSON() ([]byte, error) { rc.OdataType = OdataTypeRuleCondition @@ -2245,31 +2390,37 @@ func (rc RuleCondition) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsThresholdRuleCondition is the BasicRuleCondition implementation for RuleCondition. func (rc RuleCondition) AsThresholdRuleCondition() (*ThresholdRuleCondition, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsLocationThresholdRuleCondition is the BasicRuleCondition implementation for RuleCondition. func (rc RuleCondition) AsLocationThresholdRuleCondition() (*LocationThresholdRuleCondition, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsManagementEventRuleCondition is the BasicRuleCondition implementation for RuleCondition. func (rc RuleCondition) AsManagementEventRuleCondition() (*ManagementEventRuleCondition, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleCondition is the BasicRuleCondition implementation for RuleCondition. func (rc RuleCondition) AsRuleCondition() (*RuleCondition, bool) { return &rc, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsBasicRuleCondition is the BasicRuleCondition implementation for RuleCondition. func (rc RuleCondition) AsBasicRuleCondition() (BasicRuleCondition, bool) { return &rc, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for RuleCondition struct. func (rc *RuleCondition) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2302,6 +2453,7 @@ func (rc *RuleCondition) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // BasicRuleDataSource the resource from which the rule collects its data. type BasicRuleDataSource interface { AsRuleMetricDataSource() (*RuleMetricDataSource, bool) @@ -2309,6 +2461,7 @@ type BasicRuleDataSource interface { AsRuleDataSource() (*RuleDataSource, bool) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // RuleDataSource the resource from which the rule collects its data. type RuleDataSource struct { // ResourceURI - the resource identifier of the resource the rule monitors. **NOTE**: this property cannot be updated for an existing rule. @@ -2358,6 +2511,7 @@ func unmarshalBasicRuleDataSourceArray(body []byte) ([]BasicRuleDataSource, erro return rdsArray, nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for RuleDataSource. func (rds RuleDataSource) MarshalJSON() ([]byte, error) { rds.OdataType = OdataTypeRuleDataSource @@ -2371,26 +2525,31 @@ func (rds RuleDataSource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleMetricDataSource is the BasicRuleDataSource implementation for RuleDataSource. func (rds RuleDataSource) AsRuleMetricDataSource() (*RuleMetricDataSource, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleManagementEventDataSource is the BasicRuleDataSource implementation for RuleDataSource. func (rds RuleDataSource) AsRuleManagementEventDataSource() (*RuleManagementEventDataSource, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleDataSource is the BasicRuleDataSource implementation for RuleDataSource. func (rds RuleDataSource) AsRuleDataSource() (*RuleDataSource, bool) { return &rds, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsBasicRuleDataSource is the BasicRuleDataSource implementation for RuleDataSource. func (rds RuleDataSource) AsBasicRuleDataSource() (BasicRuleDataSource, bool) { return &rds, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // RuleEmailAction specifies the action to send email when the rule condition is evaluated. The discriminator is // always RuleEmailAction in this case. type RuleEmailAction struct { @@ -2402,6 +2561,7 @@ type RuleEmailAction struct { OdataType OdataTypeBasicRuleAction `json:"odata.type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for RuleEmailAction. func (rea RuleEmailAction) MarshalJSON() ([]byte, error) { rea.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsRuleEmailAction @@ -2418,32 +2578,38 @@ func (rea RuleEmailAction) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleEmailAction is the BasicRuleAction implementation for RuleEmailAction. func (rea RuleEmailAction) AsRuleEmailAction() (*RuleEmailAction, bool) { return &rea, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleWebhookAction is the BasicRuleAction implementation for RuleEmailAction. func (rea RuleEmailAction) AsRuleWebhookAction() (*RuleWebhookAction, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleAction is the BasicRuleAction implementation for RuleEmailAction. func (rea RuleEmailAction) AsRuleAction() (*RuleAction, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsBasicRuleAction is the BasicRuleAction implementation for RuleEmailAction. func (rea RuleEmailAction) AsBasicRuleAction() (BasicRuleAction, bool) { return &rea, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // RuleManagementEventClaimsDataSource the claims for a rule management event data source. type RuleManagementEventClaimsDataSource struct { // EmailAddress - the email address. EmailAddress *string `json:"emailAddress,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // RuleManagementEventDataSource a rule management event data source. The discriminator fields is always // RuleManagementEventDataSource in this case. type RuleManagementEventDataSource struct { @@ -2471,6 +2637,7 @@ type RuleManagementEventDataSource struct { OdataType OdataType `json:"odata.type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for RuleManagementEventDataSource. func (rmeds RuleManagementEventDataSource) MarshalJSON() ([]byte, error) { rmeds.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsRuleManagementEventDataSource @@ -2511,26 +2678,31 @@ func (rmeds RuleManagementEventDataSource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleMetricDataSource is the BasicRuleDataSource implementation for RuleManagementEventDataSource. func (rmeds RuleManagementEventDataSource) AsRuleMetricDataSource() (*RuleMetricDataSource, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleManagementEventDataSource is the BasicRuleDataSource implementation for RuleManagementEventDataSource. func (rmeds RuleManagementEventDataSource) AsRuleManagementEventDataSource() (*RuleManagementEventDataSource, bool) { return &rmeds, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleDataSource is the BasicRuleDataSource implementation for RuleManagementEventDataSource. func (rmeds RuleManagementEventDataSource) AsRuleDataSource() (*RuleDataSource, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsBasicRuleDataSource is the BasicRuleDataSource implementation for RuleManagementEventDataSource. func (rmeds RuleManagementEventDataSource) AsBasicRuleDataSource() (BasicRuleDataSource, bool) { return &rmeds, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // RuleMetricDataSource a rule metric data source. The discriminator value is always RuleMetricDataSource in this // case. type RuleMetricDataSource struct { @@ -2542,6 +2714,7 @@ type RuleMetricDataSource struct { OdataType OdataType `json:"odata.type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for RuleMetricDataSource. func (rmds RuleMetricDataSource) MarshalJSON() ([]byte, error) { rmds.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsRuleMetricDataSource @@ -2558,26 +2731,31 @@ func (rmds RuleMetricDataSource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleMetricDataSource is the BasicRuleDataSource implementation for RuleMetricDataSource. func (rmds RuleMetricDataSource) AsRuleMetricDataSource() (*RuleMetricDataSource, bool) { return &rmds, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleManagementEventDataSource is the BasicRuleDataSource implementation for RuleMetricDataSource. func (rmds RuleMetricDataSource) AsRuleManagementEventDataSource() (*RuleManagementEventDataSource, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleDataSource is the BasicRuleDataSource implementation for RuleMetricDataSource. func (rmds RuleMetricDataSource) AsRuleDataSource() (*RuleDataSource, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsBasicRuleDataSource is the BasicRuleDataSource implementation for RuleMetricDataSource. func (rmds RuleMetricDataSource) AsBasicRuleDataSource() (BasicRuleDataSource, bool) { return &rmds, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // RuleWebhookAction specifies the action to post to service when the rule condition is evaluated. The // discriminator is always RuleWebhookAction in this case. type RuleWebhookAction struct { @@ -2589,6 +2767,7 @@ type RuleWebhookAction struct { OdataType OdataTypeBasicRuleAction `json:"odata.type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for RuleWebhookAction. func (rwa RuleWebhookAction) MarshalJSON() ([]byte, error) { rwa.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsRuleWebhookAction @@ -2605,26 +2784,31 @@ func (rwa RuleWebhookAction) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleEmailAction is the BasicRuleAction implementation for RuleWebhookAction. func (rwa RuleWebhookAction) AsRuleEmailAction() (*RuleEmailAction, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleWebhookAction is the BasicRuleAction implementation for RuleWebhookAction. func (rwa RuleWebhookAction) AsRuleWebhookAction() (*RuleWebhookAction, bool) { return &rwa, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleAction is the BasicRuleAction implementation for RuleWebhookAction. func (rwa RuleWebhookAction) AsRuleAction() (*RuleAction, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsBasicRuleAction is the BasicRuleAction implementation for RuleWebhookAction. func (rwa RuleWebhookAction) AsBasicRuleAction() (BasicRuleAction, bool) { return &rwa, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ScaleAction the parameters for the scaling action. type ScaleAction struct { // Direction - the scale direction. Whether the scaling action increases or decreases the number of instances. Possible values include: 'ScaleDirectionNone', 'ScaleDirectionIncrease', 'ScaleDirectionDecrease' @@ -2637,6 +2821,7 @@ type ScaleAction struct { Cooldown *string `json:"cooldown,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ScaleCapacity the number of instances that can be used during this profile. type ScaleCapacity struct { // Minimum - the minimum number of instances for the resource. @@ -2647,6 +2832,7 @@ type ScaleCapacity struct { Default *string `json:"default,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ScaleRule a rule that provide the triggers and parameters for the scaling action. type ScaleRule struct { // MetricTrigger - the trigger that results in a scaling action. @@ -2655,6 +2841,7 @@ type ScaleRule struct { ScaleAction *ScaleAction `json:"scaleAction,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // SmsReceiver an SMS receiver. type SmsReceiver struct { // Name - The name of the SMS receiver. Names must be unique across all receivers within an action group. @@ -2667,6 +2854,7 @@ type SmsReceiver struct { Status ReceiverStatus `json:"status,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ThresholdRuleCondition a rule condition based on a metric crossing a threshold. type ThresholdRuleCondition struct { // Operator - the operator used to compare the data and the threshold. Possible values include: 'ConditionOperatorGreaterThan', 'ConditionOperatorGreaterThanOrEqual', 'ConditionOperatorLessThan', 'ConditionOperatorLessThanOrEqual' @@ -2683,6 +2871,7 @@ type ThresholdRuleCondition struct { OdataType OdataTypeBasicRuleCondition `json:"odata.type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for ThresholdRuleCondition. func (trc ThresholdRuleCondition) MarshalJSON() ([]byte, error) { trc.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsThresholdRuleCondition @@ -2706,31 +2895,37 @@ func (trc ThresholdRuleCondition) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsThresholdRuleCondition is the BasicRuleCondition implementation for ThresholdRuleCondition. func (trc ThresholdRuleCondition) AsThresholdRuleCondition() (*ThresholdRuleCondition, bool) { return &trc, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsLocationThresholdRuleCondition is the BasicRuleCondition implementation for ThresholdRuleCondition. func (trc ThresholdRuleCondition) AsLocationThresholdRuleCondition() (*LocationThresholdRuleCondition, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsManagementEventRuleCondition is the BasicRuleCondition implementation for ThresholdRuleCondition. func (trc ThresholdRuleCondition) AsManagementEventRuleCondition() (*ManagementEventRuleCondition, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsRuleCondition is the BasicRuleCondition implementation for ThresholdRuleCondition. func (trc ThresholdRuleCondition) AsRuleCondition() (*RuleCondition, bool) { return nil, false } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // AsBasicRuleCondition is the BasicRuleCondition implementation for ThresholdRuleCondition. func (trc ThresholdRuleCondition) AsBasicRuleCondition() (BasicRuleCondition, bool) { return &trc, true } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UnmarshalJSON is the custom unmarshaler for ThresholdRuleCondition struct. func (trc *ThresholdRuleCondition) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2799,6 +2994,7 @@ func (trc *ThresholdRuleCondition) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // TimeWindow a specific date-time for the profile. type TimeWindow struct { // TimeZone - the timezone of the start and end times for the profile. Some examples of valid timezones are: Dateline Standard Time, UTC-11, Hawaiian Standard Time, Alaskan Standard Time, Pacific Standard Time (Mexico), Pacific Standard Time, US Mountain Standard Time, Mountain Standard Time (Mexico), Mountain Standard Time, Central America Standard Time, Central Standard Time, Central Standard Time (Mexico), Canada Central Standard Time, SA Pacific Standard Time, Eastern Standard Time, US Eastern Standard Time, Venezuela Standard Time, Paraguay Standard Time, Atlantic Standard Time, Central Brazilian Standard Time, SA Western Standard Time, Pacific SA Standard Time, Newfoundland Standard Time, E. South America Standard Time, Argentina Standard Time, SA Eastern Standard Time, Greenland Standard Time, Montevideo Standard Time, Bahia Standard Time, UTC-02, Mid-Atlantic Standard Time, Azores Standard Time, Cape Verde Standard Time, Morocco Standard Time, UTC, GMT Standard Time, Greenwich Standard Time, W. Europe Standard Time, Central Europe Standard Time, Romance Standard Time, Central European Standard Time, W. Central Africa Standard Time, Namibia Standard Time, Jordan Standard Time, GTB Standard Time, Middle East Standard Time, Egypt Standard Time, Syria Standard Time, E. Europe Standard Time, South Africa Standard Time, FLE Standard Time, Turkey Standard Time, Israel Standard Time, Kaliningrad Standard Time, Libya Standard Time, Arabic Standard Time, Arab Standard Time, Belarus Standard Time, Russian Standard Time, E. Africa Standard Time, Iran Standard Time, Arabian Standard Time, Azerbaijan Standard Time, Russia Time Zone 3, Mauritius Standard Time, Georgian Standard Time, Caucasus Standard Time, Afghanistan Standard Time, West Asia Standard Time, Ekaterinburg Standard Time, Pakistan Standard Time, India Standard Time, Sri Lanka Standard Time, Nepal Standard Time, Central Asia Standard Time, Bangladesh Standard Time, N. Central Asia Standard Time, Myanmar Standard Time, SE Asia Standard Time, North Asia Standard Time, China Standard Time, North Asia East Standard Time, Singapore Standard Time, W. Australia Standard Time, Taipei Standard Time, Ulaanbaatar Standard Time, Tokyo Standard Time, Korea Standard Time, Yakutsk Standard Time, Cen. Australia Standard Time, AUS Central Standard Time, E. Australia Standard Time, AUS Eastern Standard Time, West Pacific Standard Time, Tasmania Standard Time, Magadan Standard Time, Vladivostok Standard Time, Russia Time Zone 10, Central Pacific Standard Time, Russia Time Zone 11, New Zealand Standard Time, UTC+12, Fiji Standard Time, Kamchatka Standard Time, Tonga Standard Time, Samoa Standard Time, Line Islands Standard Time @@ -2809,6 +3005,7 @@ type TimeWindow struct { End *date.Time `json:"end,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // WebhookNotification webhook notification of an autoscale event. type WebhookNotification struct { // ServiceURI - the service address to receive the notification. @@ -2817,6 +3014,7 @@ type WebhookNotification struct { Properties map[string]*string `json:"properties"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // MarshalJSON is the custom marshaler for WebhookNotification. func (wn WebhookNotification) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2829,6 +3027,7 @@ func (wn WebhookNotification) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // WebhookReceiver a webhook receiver. type WebhookReceiver struct { // Name - The name of the webhook receiver. Names must be unique across all receivers within an action group. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/operations.go index bcfbfcf93b3d..0f8daa94860a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/operations.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // OperationsClient is the monitor Management Client type OperationsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewOperationsClient creates an instance of the OperationsClient client. func NewOperationsClient(subscriptionID string) OperationsClient { return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // List lists all of the available operations from Microsoft.Insights provider. func (client OperationsClient) List(ctx context.Context) (result OperationListResult, err error) { req, err := client.ListPreparer(ctx) @@ -62,6 +66,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2015-04-01" @@ -77,6 +82,7 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -84,6 +90,7 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/version.go index c33ff9d7cbc9..6b4f11815f00 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/version.go @@ -18,12 +18,13 @@ import "github.com/Azure/azure-sdk-for-go/version" // // Code generated by Microsoft (R) AutoRest Code Generator. // Changes may cause incorrect behavior and will be lost if the code is regenerated. - +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { return "Azure-SDK-For-Go/" + version.Number + " insights/2017-05-01-preview" } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Version returns the semantic version (see http://semver.org) of the client. func Version() string { return version.Number diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationgateways.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationgateways.go index b8e5d3d6a5cb..7206327b0cee 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationgateways.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationgateways.go @@ -41,9 +41,10 @@ func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID stri } // BackendHealth gets the backend health of the specified application gateway in a resource group. -// -// resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application -// gateway. expand is expands BackendAddressPool and BackendHttpSettings referenced in backend health. +// Parameters: +// resourceGroupName - the name of the resource group. +// applicationGatewayName - the name of the application gateway. +// expand - expands BackendAddressPool and BackendHttpSettings referenced in backend health. func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysBackendHealthFuture, err error) { req, err := client.BackendHealthPreparer(ctx, resourceGroupName, applicationGatewayName, expand) if err != nil { @@ -113,9 +114,10 @@ func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Respon } // CreateOrUpdate creates or updates the specified application gateway. -// -// resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application -// gateway. parameters is parameters supplied to the create or update application gateway operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// applicationGatewayName - the name of the application gateway. +// parameters - parameters supplied to the create or update application gateway operation. func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -196,9 +198,9 @@ func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Respo } // Delete deletes the specified application gateway. -// -// resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application -// gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// applicationGatewayName - the name of the application gateway. func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, applicationGatewayName) if err != nil { @@ -264,9 +266,9 @@ func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (re } // Get gets the specified application gateway. -// -// resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application -// gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// applicationGatewayName - the name of the application gateway. func (client ApplicationGatewaysClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, applicationGatewayName) if err != nil { @@ -331,8 +333,8 @@ func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (resul } // GetSslPredefinedPolicy gets Ssl predefined policy with the specified policy name. -// -// predefinedPolicyName is name of Ssl predefined policy. +// Parameters: +// predefinedPolicyName - name of Ssl predefined policy. func (client ApplicationGatewaysClient) GetSslPredefinedPolicy(ctx context.Context, predefinedPolicyName string) (result ApplicationGatewaySslPredefinedPolicy, err error) { req, err := client.GetSslPredefinedPolicyPreparer(ctx, predefinedPolicyName) if err != nil { @@ -396,8 +398,8 @@ func (client ApplicationGatewaysClient) GetSslPredefinedPolicyResponder(resp *ht } // List lists all application gateways in a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client ApplicationGatewaysClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName) @@ -793,9 +795,9 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp * } // Start starts the specified application gateway. -// -// resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application -// gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// applicationGatewayName - the name of the application gateway. func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStartFuture, err error) { req, err := client.StartPreparer(ctx, resourceGroupName, applicationGatewayName) if err != nil { @@ -861,9 +863,9 @@ func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (res } // Stop stops the specified application gateway in a resource group. -// -// resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application -// gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// applicationGatewayName - the name of the application gateway. func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStopFuture, err error) { req, err := client.StopPreparer(ctx, resourceGroupName, applicationGatewayName) if err != nil { @@ -929,9 +931,10 @@ func (client ApplicationGatewaysClient) StopResponder(resp *http.Response) (resu } // UpdateTags updates the specified application gateway tags. -// -// resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application -// gateway. parameters is parameters supplied to update application gateway tags. +// Parameters: +// resourceGroupName - the name of the resource group. +// applicationGatewayName - the name of the application gateway. +// parameters - parameters supplied to update application gateway tags. func (client ApplicationGatewaysClient) UpdateTags(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (result ApplicationGatewaysUpdateTagsFuture, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, applicationGatewayName, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationsecuritygroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationsecuritygroups.go index d363a4dd227d..133c1552c7e9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationsecuritygroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationsecuritygroups.go @@ -40,9 +40,10 @@ func NewApplicationSecurityGroupsClientWithBaseURI(baseURI string, subscriptionI } // CreateOrUpdate creates or updates an application security group. -// -// resourceGroupName is the name of the resource group. applicationSecurityGroupName is the name of the application -// security group. parameters is parameters supplied to the create or update ApplicationSecurityGroup operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// applicationSecurityGroupName - the name of the application security group. +// parameters - parameters supplied to the create or update ApplicationSecurityGroup operation. func (client ApplicationSecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (result ApplicationSecurityGroupsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, applicationSecurityGroupName, parameters) if err != nil { @@ -111,9 +112,9 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdateResponder(resp *http } // Delete deletes the specified application security group. -// -// resourceGroupName is the name of the resource group. applicationSecurityGroupName is the name of the application -// security group. +// Parameters: +// resourceGroupName - the name of the resource group. +// applicationSecurityGroupName - the name of the application security group. func (client ApplicationSecurityGroupsClient) Delete(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroupsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, applicationSecurityGroupName) if err != nil { @@ -179,9 +180,9 @@ func (client ApplicationSecurityGroupsClient) DeleteResponder(resp *http.Respons } // Get gets information about the specified application security group. -// -// resourceGroupName is the name of the resource group. applicationSecurityGroupName is the name of the application -// security group. +// Parameters: +// resourceGroupName - the name of the resource group. +// applicationSecurityGroupName - the name of the application security group. func (client ApplicationSecurityGroupsClient) Get(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroup, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, applicationSecurityGroupName) if err != nil { @@ -246,8 +247,8 @@ func (client ApplicationSecurityGroupsClient) GetResponder(resp *http.Response) } // List gets all the application security groups in a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client ApplicationSecurityGroupsClient) List(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/availableendpointservices.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/availableendpointservices.go index a7cf1080cf5a..33c9771c97c2 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/availableendpointservices.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/availableendpointservices.go @@ -40,8 +40,8 @@ func NewAvailableEndpointServicesClientWithBaseURI(baseURI string, subscriptionI } // List list what values of endpoint services are available for use. -// -// location is the location to check available endpoint services. +// Parameters: +// location - the location to check available endpoint services. func (client AvailableEndpointServicesClient) List(ctx context.Context, location string) (result EndpointServicesListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, location) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/client.go index 3c5bc3888085..3358b9975442 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/client.go @@ -54,9 +54,10 @@ func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { } // CheckDNSNameAvailability checks whether a domain name in the cloudapp.azure.com zone is available for use. -// -// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform -// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$. +// Parameters: +// location - the location of the domain name. +// domainNameLabel - the domain name to be verified. It must conform to the following regular expression: +// ^[a-z][a-z0-9-]{1,61}[a-z0-9]$. func (client BaseClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) { req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/defaultsecurityrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/defaultsecurityrules.go index 94666cae9888..6d42c7f8f666 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/defaultsecurityrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/defaultsecurityrules.go @@ -40,9 +40,10 @@ func NewDefaultSecurityRulesClientWithBaseURI(baseURI string, subscriptionID str } // Get get the specified default network security rule. -// -// resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network -// security group. defaultSecurityRuleName is the name of the default security rule. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkSecurityGroupName - the name of the network security group. +// defaultSecurityRuleName - the name of the default security rule. func (client DefaultSecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (result SecurityRule, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, defaultSecurityRuleName) if err != nil { @@ -108,9 +109,9 @@ func (client DefaultSecurityRulesClient) GetResponder(resp *http.Response) (resu } // List gets all default security rules in a network security group. -// -// resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network -// security group. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkSecurityGroupName - the name of the network security group. func (client DefaultSecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizations.go index 222ffd7f4c72..8e947afac02f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizations.go @@ -42,10 +42,12 @@ func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subsc } // CreateOrUpdate creates or updates an authorization in the specified express route circuit. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. -// authorizationName is the name of the authorization. authorizationParameters is parameters supplied to the create -// or update express route circuit authorization operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. +// authorizationName - the name of the authorization. +// authorizationParameters - parameters supplied to the create or update express route circuit authorization +// operation. func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, authorizationName, authorizationParameters) if err != nil { @@ -115,9 +117,10 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(re } // Delete deletes the specified authorization from the specified express route circuit. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. -// authorizationName is the name of the authorization. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. +// authorizationName - the name of the authorization. func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, authorizationName) if err != nil { @@ -184,9 +187,10 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http } // Get gets the specified authorization from the specified express route circuit. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. -// authorizationName is the name of the authorization. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. +// authorizationName - the name of the authorization. func (client ExpressRouteCircuitAuthorizationsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, authorizationName) if err != nil { @@ -252,8 +256,9 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Re } // List gets all authorizations in an express route circuit. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the circuit. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the circuit. func (client ExpressRouteCircuitAuthorizationsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, circuitName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitpeerings.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitpeerings.go index 991a96093a15..5813098efc78 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitpeerings.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitpeerings.go @@ -40,10 +40,11 @@ func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptio } // CreateOrUpdate creates or updates a peering in the specified express route circuits. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. -// peeringName is the name of the peering. peeringParameters is parameters supplied to the create or update express -// route circuit peering operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. +// peeringName - the name of the peering. +// peeringParameters - parameters supplied to the create or update express route circuit peering operation. func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, peeringName, peeringParameters) if err != nil { @@ -113,9 +114,10 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *ht } // Delete deletes the specified peering from the specified express route circuit. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. -// peeringName is the name of the peering. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. +// peeringName - the name of the peering. func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, peeringName) if err != nil { @@ -182,9 +184,10 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Respo } // Get gets the specified authorization from the specified express route circuit. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. -// peeringName is the name of the peering. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. +// peeringName - the name of the peering. func (client ExpressRouteCircuitPeeringsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, peeringName) if err != nil { @@ -250,8 +253,9 @@ func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response } // List gets all peerings in a specified express route circuit. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. func (client ExpressRouteCircuitPeeringsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, circuitName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuits.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuits.go index 20c4d7efee14..add90435b89d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuits.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuits.go @@ -40,9 +40,10 @@ func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID str } // CreateOrUpdate creates or updates an express route circuit. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the circuit. parameters is -// parameters supplied to the create or update express route circuit operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the circuit. +// parameters - parameters supplied to the create or update express route circuit operation. func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, parameters) if err != nil { @@ -111,8 +112,9 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Resp } // Delete deletes the specified express route circuit. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName) if err != nil { @@ -178,8 +180,9 @@ func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (r } // Get gets information about the specified express route circuit. -// -// resourceGroupName is the name of the resource group. circuitName is the name of express route circuit. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of express route circuit. func (client ExpressRouteCircuitsClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, circuitName) if err != nil { @@ -244,9 +247,10 @@ func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (resu } // GetPeeringStats gets all stats from an express route circuit in a resource group. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. -// peeringName is the name of the peering. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. +// peeringName - the name of the peering. func (client ExpressRouteCircuitsClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) { req, err := client.GetPeeringStatsPreparer(ctx, resourceGroupName, circuitName, peeringName) if err != nil { @@ -312,8 +316,9 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Res } // GetStats gets all the stats from an express route circuit in a resource group. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. func (client ExpressRouteCircuitsClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) { req, err := client.GetStatsPreparer(ctx, resourceGroupName, circuitName) if err != nil { @@ -378,8 +383,8 @@ func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response) } // List gets all the express route circuits in a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client ExpressRouteCircuitsClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName) @@ -561,9 +566,11 @@ func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (r } // ListArpTable gets the currently advertised ARP table associated with the express route circuit in a resource group. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. -// peeringName is the name of the peering. devicePath is the path of the device. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. +// peeringName - the name of the peering. +// devicePath - the path of the device. func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListArpTableFuture, err error) { req, err := client.ListArpTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath) if err != nil { @@ -633,9 +640,11 @@ func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Respon // ListRoutesTable gets the currently advertised routes table associated with the express route circuit in a resource // group. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. -// peeringName is the name of the peering. devicePath is the path of the device. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. +// peeringName - the name of the peering. +// devicePath - the path of the device. func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableFuture, err error) { req, err := client.ListRoutesTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath) if err != nil { @@ -705,9 +714,11 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Res // ListRoutesTableSummary gets the currently advertised routes table summary associated with the express route circuit // in a resource group. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit. -// peeringName is the name of the peering. devicePath is the path of the device. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the express route circuit. +// peeringName - the name of the peering. +// devicePath - the path of the device. func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) { req, err := client.ListRoutesTableSummaryPreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath) if err != nil { @@ -776,9 +787,10 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryResponder(resp *h } // UpdateTags updates an express route circuit tags. -// -// resourceGroupName is the name of the resource group. circuitName is the name of the circuit. parameters is -// parameters supplied to update express route circuit tags. +// Parameters: +// resourceGroupName - the name of the resource group. +// circuitName - the name of the circuit. +// parameters - parameters supplied to update express route circuit tags. func (client ExpressRouteCircuitsClient) UpdateTags(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (result ExpressRouteCircuitsUpdateTagsFuture, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, circuitName, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/inboundnatrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/inboundnatrules.go index 638b72c6fcc6..3820400e26e7 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/inboundnatrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/inboundnatrules.go @@ -41,10 +41,11 @@ func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string) } // CreateOrUpdate creates or updates a load balancer inbound nat rule. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. -// inboundNatRuleName is the name of the inbound nat rule. inboundNatRuleParameters is parameters supplied to the -// create or update inbound nat rule operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. +// inboundNatRuleName - the name of the inbound nat rule. +// inboundNatRuleParameters - parameters supplied to the create or update inbound nat rule operation. func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (result InboundNatRulesCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: inboundNatRuleParameters, @@ -133,9 +134,10 @@ func (client InboundNatRulesClient) CreateOrUpdateResponder(resp *http.Response) } // Delete deletes the specified load balancer inbound nat rule. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. -// inboundNatRuleName is the name of the inbound nat rule. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. +// inboundNatRuleName - the name of the inbound nat rule. func (client InboundNatRulesClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (result InboundNatRulesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName) if err != nil { @@ -202,9 +204,11 @@ func (client InboundNatRulesClient) DeleteResponder(resp *http.Response) (result } // Get gets the specified load balancer inbound nat rule. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. -// inboundNatRuleName is the name of the inbound nat rule. expand is expands referenced resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. +// inboundNatRuleName - the name of the inbound nat rule. +// expand - expands referenced resources. func (client InboundNatRulesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (result InboundNatRule, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName, expand) if err != nil { @@ -273,8 +277,9 @@ func (client InboundNatRulesClient) GetResponder(resp *http.Response) (result In } // List gets all the inbound nat rules in a load balancer. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. func (client InboundNatRulesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaceipconfigurations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaceipconfigurations.go index 2dd80011c8c5..98599a39a704 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaceipconfigurations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaceipconfigurations.go @@ -40,9 +40,10 @@ func NewInterfaceIPConfigurationsClientWithBaseURI(baseURI string, subscriptionI } // Get gets the specified network interface ip configuration. -// -// resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface. -// IPConfigurationName is the name of the ip configuration name. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkInterfaceName - the name of the network interface. +// IPConfigurationName - the name of the ip configuration name. func (client InterfaceIPConfigurationsClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (result InterfaceIPConfiguration, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, IPConfigurationName) if err != nil { @@ -108,8 +109,9 @@ func (client InterfaceIPConfigurationsClient) GetResponder(resp *http.Response) } // List get all ip configurations in a network interface -// -// resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkInterfaceName - the name of the network interface. func (client InterfaceIPConfigurationsClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, networkInterfaceName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaceloadbalancers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaceloadbalancers.go index 70ce83314ff8..1e817547c421 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaceloadbalancers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaceloadbalancers.go @@ -40,8 +40,9 @@ func NewInterfaceLoadBalancersClientWithBaseURI(baseURI string, subscriptionID s } // List list all load balancers in a network interface. -// -// resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkInterfaceName - the name of the network interface. func (client InterfaceLoadBalancersClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, networkInterfaceName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaces.go index c0618178f81e..55a0fe6d9cf4 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaces.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaces.go @@ -40,9 +40,10 @@ func NewInterfacesClientWithBaseURI(baseURI string, subscriptionID string) Inter } // CreateOrUpdate creates or updates a network interface. -// -// resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface. -// parameters is parameters supplied to the create or update network interface operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkInterfaceName - the name of the network interface. +// parameters - parameters supplied to the create or update network interface operation. func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkInterfaceName, parameters) if err != nil { @@ -111,8 +112,9 @@ func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (res } // Delete deletes the specified network interface. -// -// resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkInterfaceName - the name of the network interface. func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, networkInterfaceName) if err != nil { @@ -178,9 +180,10 @@ func (client InterfacesClient) DeleteResponder(resp *http.Response) (result auto } // Get gets information about the specified network interface. -// -// resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface. -// expand is expands referenced resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkInterfaceName - the name of the network interface. +// expand - expands referenced resources. func (client InterfacesClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, expand) if err != nil { @@ -248,8 +251,9 @@ func (client InterfacesClient) GetResponder(resp *http.Response) (result Interfa } // GetEffectiveRouteTable gets all route tables applied to a network interface. -// -// resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkInterfaceName - the name of the network interface. func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGetEffectiveRouteTableFuture, err error) { req, err := client.GetEffectiveRouteTablePreparer(ctx, resourceGroupName, networkInterfaceName) if err != nil { @@ -317,11 +321,13 @@ func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Respon // GetVirtualMachineScaleSetIPConfiguration get the specified network interface ip configuration in a virtual machine // scale set. -// -// resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual -// machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the -// network interface. IPConfigurationName is the name of the ip configuration. expand is expands referenced -// resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualMachineScaleSetName - the name of the virtual machine scale set. +// virtualmachineIndex - the virtual machine index. +// networkInterfaceName - the name of the network interface. +// IPConfigurationName - the name of the ip configuration. +// expand - expands referenced resources. func (client InterfacesClient) GetVirtualMachineScaleSetIPConfiguration(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (result InterfaceIPConfiguration, err error) { req, err := client.GetVirtualMachineScaleSetIPConfigurationPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName, expand) if err != nil { @@ -392,10 +398,12 @@ func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationResponder } // GetVirtualMachineScaleSetNetworkInterface get the specified network interface in a virtual machine scale set. -// -// resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual -// machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the -// network interface. expand is expands referenced resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualMachineScaleSetName - the name of the virtual machine scale set. +// virtualmachineIndex - the virtual machine index. +// networkInterfaceName - the name of the network interface. +// expand - expands referenced resources. func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) { req, err := client.GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand) if err != nil { @@ -465,8 +473,8 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponde } // List gets all network interfaces in a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client InterfacesClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName) @@ -648,8 +656,9 @@ func (client InterfacesClient) ListAllComplete(ctx context.Context) (result Inte } // ListEffectiveNetworkSecurityGroups gets all network security groups applied to a network interface. -// -// resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkInterfaceName - the name of the network interface. func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) { req, err := client.ListEffectiveNetworkSecurityGroupsPreparer(ctx, resourceGroupName, networkInterfaceName) if err != nil { @@ -717,10 +726,12 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp // ListVirtualMachineScaleSetIPConfigurations get the specified network interface ip configuration in a virtual machine // scale set. -// -// resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual -// machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the -// network interface. expand is expands referenced resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualMachineScaleSetName - the name of the virtual machine scale set. +// virtualmachineIndex - the virtual machine index. +// networkInterfaceName - the name of the network interface. +// expand - expands referenced resources. func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurations(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultPage, err error) { result.fn = client.listVirtualMachineScaleSetIPConfigurationsNextResults req, err := client.ListVirtualMachineScaleSetIPConfigurationsPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand) @@ -818,9 +829,9 @@ func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsComplet } // ListVirtualMachineScaleSetNetworkInterfaces gets all network interfaces in a virtual machine scale set. -// -// resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual -// machine scale set. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualMachineScaleSetName - the name of the virtual machine scale set. func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) { result.fn = client.listVirtualMachineScaleSetNetworkInterfacesNextResults req, err := client.ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName) @@ -914,9 +925,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComple // ListVirtualMachineScaleSetVMNetworkInterfaces gets information about all network interfaces in a virtual machine in // a virtual machine scale set. -// -// resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual -// machine scale set. virtualmachineIndex is the virtual machine index. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualMachineScaleSetName - the name of the virtual machine scale set. +// virtualmachineIndex - the virtual machine index. func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) { result.fn = client.listVirtualMachineScaleSetVMNetworkInterfacesNextResults req, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex) @@ -1010,9 +1022,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesComp } // UpdateTags updates a network interface tags. -// -// resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface. -// parameters is parameters supplied to update network interface tags. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkInterfaceName - the name of the network interface. +// parameters - parameters supplied to update network interface tags. func (client InterfacesClient) UpdateTags(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (result InterfacesUpdateTagsFuture, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, networkInterfaceName, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerbackendaddresspools.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerbackendaddresspools.go index ba40d22e4b06..ea449f5b7174 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerbackendaddresspools.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerbackendaddresspools.go @@ -41,9 +41,10 @@ func NewLoadBalancerBackendAddressPoolsClientWithBaseURI(baseURI string, subscri } // Get gets load balancer backend address pool. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. -// backendAddressPoolName is the name of the backend address pool. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. +// backendAddressPoolName - the name of the backend address pool. func (client LoadBalancerBackendAddressPoolsClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (result BackendAddressPool, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, backendAddressPoolName) if err != nil { @@ -109,8 +110,9 @@ func (client LoadBalancerBackendAddressPoolsClient) GetResponder(resp *http.Resp } // List gets all the load balancer backed address pools. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. func (client LoadBalancerBackendAddressPoolsClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerfrontendipconfigurations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerfrontendipconfigurations.go index 36b9abee94de..142a7f863643 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerfrontendipconfigurations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerfrontendipconfigurations.go @@ -42,9 +42,10 @@ func NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI string, su } // Get gets load balancer frontend IP configuration. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. -// frontendIPConfigurationName is the name of the frontend IP configuration. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. +// frontendIPConfigurationName - the name of the frontend IP configuration. func (client LoadBalancerFrontendIPConfigurationsClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (result FrontendIPConfiguration, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, frontendIPConfigurationName) if err != nil { @@ -110,8 +111,9 @@ func (client LoadBalancerFrontendIPConfigurationsClient) GetResponder(resp *http } // List gets all the load balancer frontend IP configurations. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. func (client LoadBalancerFrontendIPConfigurationsClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerloadbalancingrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerloadbalancingrules.go index f8ef90aaff5d..afc0d13884ab 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerloadbalancingrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerloadbalancingrules.go @@ -41,9 +41,10 @@ func NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI string, subscrip } // Get gets the specified load balancer load balancing rule. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. -// loadBalancingRuleName is the name of the load balancing rule. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. +// loadBalancingRuleName - the name of the load balancing rule. func (client LoadBalancerLoadBalancingRulesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (result LoadBalancingRule, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, loadBalancingRuleName) if err != nil { @@ -109,8 +110,9 @@ func (client LoadBalancerLoadBalancingRulesClient) GetResponder(resp *http.Respo } // List gets all the load balancing rules in a load balancer. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. func (client LoadBalancerLoadBalancingRulesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancernetworkinterfaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancernetworkinterfaces.go index 20809d284ef8..0ec6f68d0624 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancernetworkinterfaces.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancernetworkinterfaces.go @@ -41,8 +41,9 @@ func NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI string, subscript } // List gets associated load balancer network interfaces. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. func (client LoadBalancerNetworkInterfacesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerprobes.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerprobes.go index ae7ba4ebdf00..55a86c7da98f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerprobes.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancerprobes.go @@ -40,9 +40,10 @@ func NewLoadBalancerProbesClientWithBaseURI(baseURI string, subscriptionID strin } // Get gets load balancer probe. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. -// probeName is the name of the probe. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. +// probeName - the name of the probe. func (client LoadBalancerProbesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (result Probe, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, probeName) if err != nil { @@ -108,8 +109,9 @@ func (client LoadBalancerProbesClient) GetResponder(resp *http.Response) (result } // List gets all the load balancer probes. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. func (client LoadBalancerProbesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancers.go index c98266dde99c..d2706bd2bea3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancers.go @@ -40,9 +40,10 @@ func NewLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) Lo } // CreateOrUpdate creates or updates a load balancer. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. -// parameters is parameters supplied to the create or update load balancer operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. +// parameters - parameters supplied to the create or update load balancer operation. func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, loadBalancerName, parameters) if err != nil { @@ -111,8 +112,9 @@ func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) ( } // Delete deletes the specified load balancer. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName) if err != nil { @@ -178,9 +180,10 @@ func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result a } // Get gets the specified load balancer. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. expand -// is expands referenced resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. +// expand - expands referenced resources. func (client LoadBalancersClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, expand) if err != nil { @@ -248,8 +251,8 @@ func (client LoadBalancersClient) GetResponder(resp *http.Response) (result Load } // List gets all the load balancers in a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client LoadBalancersClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName) @@ -431,9 +434,10 @@ func (client LoadBalancersClient) ListAllComplete(ctx context.Context) (result L } // UpdateTags updates a load balancer tags. -// -// resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. -// parameters is parameters supplied to update load balancer tags. +// Parameters: +// resourceGroupName - the name of the resource group. +// loadBalancerName - the name of the load balancer. +// parameters - parameters supplied to update load balancer tags. func (client LoadBalancersClient) UpdateTags(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (result LoadBalancersUpdateTagsFuture, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, loadBalancerName, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/localnetworkgateways.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/localnetworkgateways.go index eb7e739d7be0..7872ca81439c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/localnetworkgateways.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/localnetworkgateways.go @@ -41,9 +41,10 @@ func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID str } // CreateOrUpdate creates or updates a local network gateway in the specified resource group. -// -// resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network -// gateway. parameters is parameters supplied to the create or update local network gateway operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// localNetworkGatewayName - the name of the local network gateway. +// parameters - parameters supplied to the create or update local network gateway operation. func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: localNetworkGatewayName, @@ -120,9 +121,9 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Resp } // Delete deletes the specified local network gateway. -// -// resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network -// gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// localNetworkGatewayName - the name of the local network gateway. func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: localNetworkGatewayName, @@ -194,9 +195,9 @@ func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (r } // Get gets the specified local network gateway in a resource group. -// -// resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network -// gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// localNetworkGatewayName - the name of the local network gateway. func (client LocalNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: localNetworkGatewayName, @@ -267,8 +268,8 @@ func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (resu } // List gets all the local network gateways in a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client LocalNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName) @@ -360,9 +361,10 @@ func (client LocalNetworkGatewaysClient) ListComplete(ctx context.Context, resou } // UpdateTags updates a local network gateway tags. -// -// resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network -// gateway. parameters is parameters supplied to update local network gateway tags. +// Parameters: +// resourceGroupName - the name of the resource group. +// localNetworkGatewayName - the name of the local network gateway. +// parameters - parameters supplied to update local network gateway tags. func (client LocalNetworkGatewaysClient) UpdateTags(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (result LocalNetworkGatewaysUpdateTagsFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: localNetworkGatewayName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/packetcaptures.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/packetcaptures.go index 5bcadba85943..36bf64892572 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/packetcaptures.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/packetcaptures.go @@ -41,10 +41,11 @@ func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) P } // Create create and start a packet capture on the specified VM. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher. -// packetCaptureName is the name of the packet capture session. parameters is parameters that define the create -// packet capture operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher. +// packetCaptureName - the name of the packet capture session. +// parameters - parameters that define the create packet capture operation. func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesCreateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -123,9 +124,10 @@ func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result } // Delete deletes the specified packet capture session. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher. -// packetCaptureName is the name of the packet capture session. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher. +// packetCaptureName - the name of the packet capture session. func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName) if err != nil { @@ -192,9 +194,10 @@ func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result } // Get gets a packet capture session by name. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher. -// packetCaptureName is the name of the packet capture session. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher. +// packetCaptureName - the name of the packet capture session. func (client PacketCapturesClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName) if err != nil { @@ -260,9 +263,10 @@ func (client PacketCapturesClient) GetResponder(resp *http.Response) (result Pac } // GetStatus query the status of a running packet capture session. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher -// resource. packetCaptureName is the name given to the packet capture session. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the Network Watcher resource. +// packetCaptureName - the name given to the packet capture session. func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGetStatusFuture, err error) { req, err := client.GetStatusPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName) if err != nil { @@ -330,9 +334,9 @@ func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (resu } // List lists all packet capture sessions within the specified resource group. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher -// resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the Network Watcher resource. func (client PacketCapturesClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) { req, err := client.ListPreparer(ctx, resourceGroupName, networkWatcherName) if err != nil { @@ -397,9 +401,10 @@ func (client PacketCapturesClient) ListResponder(resp *http.Response) (result Pa } // Stop stops a specified packet capture session. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher. -// packetCaptureName is the name of the packet capture session. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher. +// packetCaptureName - the name of the packet capture session. func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesStopFuture, err error) { req, err := client.StopPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/publicipaddresses.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/publicipaddresses.go index b86e02ead56a..301b84597169 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/publicipaddresses.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/publicipaddresses.go @@ -41,9 +41,10 @@ func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string } // CreateOrUpdate creates or updates a static or dynamic public IP address. -// -// resourceGroupName is the name of the resource group. publicIPAddressName is the name of the public IP address. -// parameters is parameters supplied to the create or update public IP address operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// publicIPAddressName - the name of the public IP address. +// parameters - parameters supplied to the create or update public IP address operation. func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -123,8 +124,9 @@ func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Respons } // Delete deletes the specified public IP address. -// -// resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet. +// Parameters: +// resourceGroupName - the name of the resource group. +// publicIPAddressName - the name of the subnet. func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, publicIPAddressName) if err != nil { @@ -190,9 +192,10 @@ func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (resu } // Get gets the specified public IP address in a specified resource group. -// -// resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet. expand is -// expands referenced resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// publicIPAddressName - the name of the subnet. +// expand - expands referenced resources. func (client PublicIPAddressesClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, publicIPAddressName, expand) if err != nil { @@ -260,11 +263,14 @@ func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result } // GetVirtualMachineScaleSetPublicIPAddress get the specified public IP address in a virtual machine scale set. -// -// resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual -// machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the -// network interface. IPConfigurationName is the name of the IP configuration. publicIPAddressName is the name of -// the public IP Address. expand is expands referenced resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualMachineScaleSetName - the name of the virtual machine scale set. +// virtualmachineIndex - the virtual machine index. +// networkInterfaceName - the name of the network interface. +// IPConfigurationName - the name of the IP configuration. +// publicIPAddressName - the name of the public IP Address. +// expand - expands referenced resources. func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) { req, err := client.GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName, publicIPAddressName, expand) if err != nil { @@ -336,8 +342,8 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressRe } // List gets all public IP addresses in a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client PublicIPAddressesClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName) @@ -520,9 +526,9 @@ func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (resu // ListVirtualMachineScaleSetPublicIPAddresses gets information about all public IP addresses on a virtual machine // scale set level. -// -// resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual -// machine scale set. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualMachineScaleSetName - the name of the virtual machine scale set. func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) { result.fn = client.listVirtualMachineScaleSetPublicIPAddressesNextResults req, err := client.ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName) @@ -616,10 +622,12 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse // ListVirtualMachineScaleSetVMPublicIPAddresses gets information about all public IP addresses in a virtual machine IP // configuration in a virtual machine scale set. -// -// resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual -// machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the network -// interface name. IPConfigurationName is the IP configuration name. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualMachineScaleSetName - the name of the virtual machine scale set. +// virtualmachineIndex - the virtual machine index. +// networkInterfaceName - the network interface name. +// IPConfigurationName - the IP configuration name. func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) { result.fn = client.listVirtualMachineScaleSetVMPublicIPAddressesNextResults req, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName) @@ -715,9 +723,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres } // UpdateTags updates public IP address tags. -// -// resourceGroupName is the name of the resource group. publicIPAddressName is the name of the public IP address. -// parameters is parameters supplied to update public IP address tags. +// Parameters: +// resourceGroupName - the name of the resource group. +// publicIPAddressName - the name of the public IP address. +// parameters - parameters supplied to update public IP address tags. func (client PublicIPAddressesClient) UpdateTags(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (result PublicIPAddressesUpdateTagsFuture, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, publicIPAddressName, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilterrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilterrules.go index c065aee2c106..152ac5e1dc52 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilterrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilterrules.go @@ -41,10 +41,11 @@ func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string) } // CreateOrUpdate creates or updates a route in the specified route filter. -// -// resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName -// is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the create or update -// route filter rule operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeFilterName - the name of the route filter. +// ruleName - the name of the route filter rule. +// routeFilterRuleParameters - parameters supplied to the create or update route filter rule operation. func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: routeFilterRuleParameters, @@ -123,9 +124,10 @@ func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response } // Delete deletes the specified rule from a route filter. -// -// resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName -// is the name of the rule. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeFilterName - the name of the route filter. +// ruleName - the name of the rule. func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName, ruleName) if err != nil { @@ -192,9 +194,10 @@ func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (resul } // Get gets the specified rule from a route filter. -// -// resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName -// is the name of the rule. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeFilterName - the name of the route filter. +// ruleName - the name of the rule. func (client RouteFilterRulesClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, ruleName) if err != nil { @@ -260,8 +263,9 @@ func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result R } // ListByRouteFilter gets all RouteFilterRules in a route filter. -// -// resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeFilterName - the name of the route filter. func (client RouteFilterRulesClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) { result.fn = client.listByRouteFilterNextResults req, err := client.ListByRouteFilterPreparer(ctx, resourceGroupName, routeFilterName) @@ -354,10 +358,11 @@ func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Conte } // Update updates a route in the specified route filter. -// -// resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName -// is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the update route -// filter rule operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeFilterName - the name of the route filter. +// ruleName - the name of the route filter rule. +// routeFilterRuleParameters - parameters supplied to the update route filter rule operation. func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesUpdateFuture, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilters.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilters.go index fbab9c77ef64..db8f0ecc1c1a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilters.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilters.go @@ -40,9 +40,10 @@ func NewRouteFiltersClientWithBaseURI(baseURI string, subscriptionID string) Rou } // CreateOrUpdate creates or updates a route filter in a specified resource group. -// -// resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. -// routeFilterParameters is parameters supplied to the create or update route filter operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeFilterName - the name of the route filter. +// routeFilterParameters - parameters supplied to the create or update route filter operation. func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters) if err != nil { @@ -111,8 +112,9 @@ func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (r } // Delete deletes the specified route filter. -// -// resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeFilterName - the name of the route filter. func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName) if err != nil { @@ -178,9 +180,10 @@ func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result au } // Get gets the specified route filter. -// -// resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. expand is -// expands referenced express route bgp peering resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeFilterName - the name of the route filter. +// expand - expands referenced express route bgp peering resources. func (client RouteFiltersClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, expand) if err != nil { @@ -338,8 +341,8 @@ func (client RouteFiltersClient) ListComplete(ctx context.Context) (result Route } // ListByResourceGroup gets all route filters in a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client RouteFiltersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) @@ -431,9 +434,10 @@ func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context } // Update updates a route filter in a specified resource group. -// -// resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. -// routeFilterParameters is parameters supplied to the update route filter operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeFilterName - the name of the route filter. +// routeFilterParameters - parameters supplied to the update route filter operation. func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersUpdateFuture, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routes.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routes.go index 15aaf8da4c0a..8d4054bd5771 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routes.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routes.go @@ -40,9 +40,11 @@ func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesCli } // CreateOrUpdate creates or updates a route in the specified route table. -// -// resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is -// the name of the route. routeParameters is parameters supplied to the create or update route operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeTableName - the name of the route table. +// routeName - the name of the route. +// routeParameters - parameters supplied to the create or update route operation. func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, routeName, routeParameters) if err != nil { @@ -112,9 +114,10 @@ func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result } // Delete deletes the specified route from a route table. -// -// resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is -// the name of the route. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeTableName - the name of the route table. +// routeName - the name of the route. func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName, routeName) if err != nil { @@ -181,9 +184,10 @@ func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest } // Get gets the specified route from a route table. -// -// resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is -// the name of the route. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeTableName - the name of the route table. +// routeName - the name of the route. func (client RoutesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, routeName) if err != nil { @@ -249,8 +253,9 @@ func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err } // List gets all routes in a route table. -// -// resourceGroupName is the name of the resource group. routeTableName is the name of the route table. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeTableName - the name of the route table. func (client RoutesClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, routeTableName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routetables.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routetables.go index 96f09cc83b87..f953d9e82224 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routetables.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routetables.go @@ -40,9 +40,10 @@ func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) Rout } // CreateOrUpdate create or updates a route table in a specified resource group. -// -// resourceGroupName is the name of the resource group. routeTableName is the name of the route table. parameters -// is parameters supplied to the create or update route table operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeTableName - the name of the route table. +// parameters - parameters supplied to the create or update route table operation. func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, parameters) if err != nil { @@ -111,8 +112,9 @@ func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (re } // Delete deletes the specified route table. -// -// resourceGroupName is the name of the resource group. routeTableName is the name of the route table. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeTableName - the name of the route table. func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName) if err != nil { @@ -178,9 +180,10 @@ func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result aut } // Get gets the specified route table. -// -// resourceGroupName is the name of the resource group. routeTableName is the name of the route table. expand is -// expands referenced resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeTableName - the name of the route table. +// expand - expands referenced resources. func (client RouteTablesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, expand) if err != nil { @@ -248,8 +251,8 @@ func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteT } // List gets all route tables in a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client RouteTablesClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName) @@ -431,9 +434,10 @@ func (client RouteTablesClient) ListAllComplete(ctx context.Context) (result Rou } // UpdateTags updates a route table tags. -// -// resourceGroupName is the name of the resource group. routeTableName is the name of the route table. parameters -// is parameters supplied to update route table tags. +// Parameters: +// resourceGroupName - the name of the resource group. +// routeTableName - the name of the route table. +// parameters - parameters supplied to update route table tags. func (client RouteTablesClient) UpdateTags(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (result RouteTablesUpdateTagsFuture, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, routeTableName, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securitygroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securitygroups.go index 45bd81d8d910..d8ab89df0dff 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securitygroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securitygroups.go @@ -40,9 +40,10 @@ func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) S } // CreateOrUpdate creates or updates a network security group in the specified resource group. -// -// resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network -// security group. parameters is parameters supplied to the create or update network security group operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkSecurityGroupName - the name of the network security group. +// parameters - parameters supplied to the create or update network security group operation. func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, parameters) if err != nil { @@ -111,9 +112,9 @@ func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response) } // Delete deletes the specified network security group. -// -// resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network -// security group. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkSecurityGroupName - the name of the network security group. func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName) if err != nil { @@ -179,9 +180,10 @@ func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result } // Get gets the specified network security group. -// -// resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network -// security group. expand is expands referenced resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkSecurityGroupName - the name of the network security group. +// expand - expands referenced resources. func (client SecurityGroupsClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, expand) if err != nil { @@ -249,8 +251,8 @@ func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result Sec } // List gets all network security groups in a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client SecurityGroupsClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName) @@ -432,9 +434,10 @@ func (client SecurityGroupsClient) ListAllComplete(ctx context.Context) (result } // UpdateTags updates a network security group tags. -// -// resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network -// security group. parameters is parameters supplied to update network security group tags. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkSecurityGroupName - the name of the network security group. +// parameters - parameters supplied to update network security group tags. func (client SecurityGroupsClient) UpdateTags(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (result SecurityGroupsUpdateTagsFuture, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, networkSecurityGroupName, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securityrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securityrules.go index 9b383fa6b263..d7489b377973 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securityrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securityrules.go @@ -40,10 +40,11 @@ func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) Se } // CreateOrUpdate creates or updates a security rule in the specified network security group. -// -// resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network -// security group. securityRuleName is the name of the security rule. securityRuleParameters is parameters supplied -// to the create or update network security rule operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkSecurityGroupName - the name of the network security group. +// securityRuleName - the name of the security rule. +// securityRuleParameters - parameters supplied to the create or update network security rule operation. func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters) if err != nil { @@ -113,9 +114,10 @@ func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) ( } // Delete deletes the specified network security rule. -// -// resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network -// security group. securityRuleName is the name of the security rule. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkSecurityGroupName - the name of the network security group. +// securityRuleName - the name of the security rule. func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName) if err != nil { @@ -182,9 +184,10 @@ func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result a } // Get get the specified network security rule. -// -// resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network -// security group. securityRuleName is the name of the security rule. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkSecurityGroupName - the name of the network security group. +// securityRuleName - the name of the security rule. func (client SecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName) if err != nil { @@ -250,9 +253,9 @@ func (client SecurityRulesClient) GetResponder(resp *http.Response) (result Secu } // List gets all security rules in a network security group. -// -// resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network -// security group. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkSecurityGroupName - the name of the network security group. func (client SecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/subnets.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/subnets.go index aff59d8d54fd..16d25635463d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/subnets.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/subnets.go @@ -40,10 +40,11 @@ func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsC } // CreateOrUpdate creates or updates a subnet in the specified virtual network. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. -// subnetName is the name of the subnet. subnetParameters is parameters supplied to the create or update subnet -// operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. +// subnetName - the name of the subnet. +// subnetParameters - parameters supplied to the create or update subnet operation. func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, subnetParameters) if err != nil { @@ -113,9 +114,10 @@ func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result } // Delete deletes the specified subnet. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. -// subnetName is the name of the subnet. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. +// subnetName - the name of the subnet. func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName) if err != nil { @@ -182,9 +184,11 @@ func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autores } // Get gets the specified subnet by virtual network and resource group. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. -// subnetName is the name of the subnet. expand is expands referenced resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. +// subnetName - the name of the subnet. +// expand - expands referenced resources. func (client SubnetsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, expand) if err != nil { @@ -253,8 +257,9 @@ func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, er } // List gets all subnets in a virtual network. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. func (client SubnetsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/usages.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/usages.go index 0fb38cab0629..356764fdb2fb 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/usages.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/usages.go @@ -41,8 +41,8 @@ func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesCli } // List list network usages for a subscription. -// -// location is the location where resource usage is queried. +// Parameters: +// location - the location where resource usage is queried. func (client UsagesClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: location, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnections.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnections.go index c1a9267b83f6..011f852f3abf 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnections.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnections.go @@ -42,10 +42,10 @@ func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscr } // CreateOrUpdate creates or updates a virtual network gateway connection in the specified resource group. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the -// virtual network gateway connection. parameters is parameters supplied to the create or update virtual network -// gateway connection operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayConnectionName - the name of the virtual network gateway connection. +// parameters - parameters supplied to the create or update virtual network gateway connection operation. func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -127,9 +127,9 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(res } // Delete deletes the specified virtual network Gateway connection. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the -// virtual network gateway connection. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayConnectionName - the name of the virtual network gateway connection. func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName) if err != nil { @@ -195,9 +195,9 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http. } // Get gets the specified virtual network gateway connection by resource group. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the -// virtual network gateway connection. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayConnectionName - the name of the virtual network gateway connection. func (client VirtualNetworkGatewayConnectionsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName) if err != nil { @@ -263,9 +263,9 @@ func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Res // GetSharedKey the Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified // virtual network gateway connection shared key through Network resource provider. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network -// gateway connection shared key name. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayConnectionName - the virtual network gateway connection shared key name. func (client VirtualNetworkGatewayConnectionsClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) { req, err := client.GetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName) if err != nil { @@ -331,8 +331,8 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp // List the List VirtualNetworkGatewayConnections operation retrieves all the virtual network gateways connections // created. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client VirtualNetworkGatewayConnectionsClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName) @@ -426,10 +426,11 @@ func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Co // ResetSharedKey the VirtualNetworkGatewayConnectionResetSharedKey operation resets the virtual network gateway // connection shared key for passed virtual network gateway connection in the specified resource group through Network // resource provider. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network -// gateway connection reset shared key Name. parameters is parameters supplied to the begin reset virtual network -// gateway connection shared key operation through network resource provider. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayConnectionName - the virtual network gateway connection reset shared key Name. +// parameters - parameters supplied to the begin reset virtual network gateway connection shared key operation +// through network resource provider. func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -509,10 +510,11 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(res // SetSharedKey the Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual network gateway connection // shared key for passed virtual network gateway connection in the specified resource group through Network resource // provider. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network -// gateway connection name. parameters is parameters supplied to the Begin Set Virtual Network Gateway connection -// Shared key operation throughNetwork resource provider. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayConnectionName - the virtual network gateway connection name. +// parameters - parameters supplied to the Begin Set Virtual Network Gateway connection Shared key operation +// throughNetwork resource provider. func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -587,10 +589,10 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyResponder(resp } // UpdateTags updates a virtual network gateway connection tags. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the -// virtual network gateway connection. parameters is parameters supplied to update virtual network gateway -// connection tags. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayConnectionName - the name of the virtual network gateway connection. +// parameters - parameters supplied to update virtual network gateway connection tags. func (client VirtualNetworkGatewayConnectionsClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (result VirtualNetworkGatewayConnectionsUpdateTagsFuture, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgateways.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgateways.go index 1d4f2672b52a..5c027ce5df59 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgateways.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgateways.go @@ -41,9 +41,10 @@ func NewVirtualNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID s } // CreateOrUpdate creates or updates a virtual network gateway in the specified resource group. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. parameters is parameters supplied to create or update virtual network gateway operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. +// parameters - parameters supplied to create or update virtual network gateway operation. func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -118,9 +119,9 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Re } // Delete deletes the specified virtual network gateway. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayName) if err != nil { @@ -187,10 +188,10 @@ func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response) // Generatevpnclientpackage generates VPN client package for P2S client of the virtual network gateway in the specified // resource group. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package -// operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. +// parameters - parameters supplied to the generate virtual network gateway VPN client package operation. func (client VirtualNetworkGatewaysClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGeneratevpnclientpackageFuture, err error) { req, err := client.GeneratevpnclientpackagePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters) if err != nil { @@ -260,10 +261,10 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(res // GenerateVpnProfile generates VPN profile for P2S client of the virtual network gateway in the specified resource // group. Used for IKEV2 and radius based authentication. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package -// operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. +// parameters - parameters supplied to the generate virtual network gateway VPN client package operation. func (client VirtualNetworkGatewaysClient) GenerateVpnProfile(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGenerateVpnProfileFuture, err error) { req, err := client.GenerateVpnProfilePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters) if err != nil { @@ -332,9 +333,9 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfileResponder(resp *htt } // Get gets the specified virtual network gateway by resource group. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. func (client VirtualNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName) if err != nil { @@ -400,9 +401,10 @@ func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (re // GetAdvertisedRoutes this operation retrieves a list of routes the virtual network gateway is advertising to the // specified peer. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. peer is the IP address of the peer +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. +// peer - the IP address of the peer func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) { req, err := client.GetAdvertisedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer) if err != nil { @@ -470,9 +472,10 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *ht } // GetBgpPeerStatus the GetBgpPeerStatus operation retrieves the status of all BGP peers. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. peer is the IP address of the peer to retrieve the status of. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. +// peer - the IP address of the peer to retrieve the status of. func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) { req, err := client.GetBgpPeerStatusPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer) if err != nil { @@ -543,9 +546,9 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http. // GetLearnedRoutes this operation retrieves a list of routes the virtual network gateway has learned, including routes // learned from BGP peers. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) { req, err := client.GetLearnedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName) if err != nil { @@ -613,9 +616,9 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http. // GetVpnProfilePackageURL gets pre-generated VPN profile for P2S client of the virtual network gateway in the // specified resource group. The profile needs to be generated first using generateVpnProfile. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURL(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGetVpnProfilePackageURLFuture, err error) { req, err := client.GetVpnProfilePackageURLPreparer(ctx, resourceGroupName, virtualNetworkGatewayName) if err != nil { @@ -682,8 +685,8 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLResponder(resp } // List gets all virtual network gateways by resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client VirtualNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName) @@ -775,9 +778,9 @@ func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, res } // ListConnections gets all the connections in a virtual network gateway. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. func (client VirtualNetworkGatewaysClient) ListConnections(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultPage, err error) { result.fn = client.listConnectionsNextResults req, err := client.ListConnectionsPreparer(ctx, resourceGroupName, virtualNetworkGatewayName) @@ -870,10 +873,11 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsComplete(ctx context.C } // Reset resets the primary of the virtual network gateway in the specified resource group. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. gatewayVip is virtual network gateway vip address supplied to the begin reset of the -// active-active feature enabled gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. +// gatewayVip - virtual network gateway vip address supplied to the begin reset of the active-active feature +// enabled gateway. func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysResetFuture, err error) { req, err := client.ResetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, gatewayVip) if err != nil { @@ -943,9 +947,9 @@ func (client VirtualNetworkGatewaysClient) ResetResponder(resp *http.Response) ( } // SupportedVpnDevices gets a xml format representation for supported vpn devices. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. func (client VirtualNetworkGatewaysClient) SupportedVpnDevices(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result String, err error) { req, err := client.SupportedVpnDevicesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName) if err != nil { @@ -1010,9 +1014,10 @@ func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesResponder(resp *ht } // UpdateTags updates a virtual network gateway tags. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual -// network gateway. parameters is parameters supplied to update virtual network gateway tags. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayName - the name of the virtual network gateway. +// parameters - parameters supplied to update virtual network gateway tags. func (client VirtualNetworkGatewaysClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (result VirtualNetworkGatewaysUpdateTagsFuture, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters) if err != nil { @@ -1081,10 +1086,11 @@ func (client VirtualNetworkGatewaysClient) UpdateTagsResponder(resp *http.Respon } // VpnDeviceConfigurationScript gets a xml format representation for vpn device configuration script. -// -// resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the -// virtual network gateway connection for which the configuration script is generated. parameters is parameters -// supplied to the generate vpn device script operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkGatewayConnectionName - the name of the virtual network gateway connection for which the +// configuration script is generated. +// parameters - parameters supplied to the generate vpn device script operation. func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScript(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (result String, err error) { req, err := client.VpnDeviceConfigurationScriptPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkpeerings.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkpeerings.go index 1f9badee0b69..47c8df88da5e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkpeerings.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkpeerings.go @@ -40,10 +40,12 @@ func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID s } // CreateOrUpdate creates or updates a peering in the specified virtual network. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. -// virtualNetworkPeeringName is the name of the peering. virtualNetworkPeeringParameters is parameters supplied to -// the create or update virtual network peering operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. +// virtualNetworkPeeringName - the name of the peering. +// virtualNetworkPeeringParameters - parameters supplied to the create or update virtual network peering +// operation. func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters) if err != nil { @@ -113,9 +115,10 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Re } // Delete deletes the specified virtual network peering. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. -// virtualNetworkPeeringName is the name of the virtual network peering. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. +// virtualNetworkPeeringName - the name of the virtual network peering. func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName) if err != nil { @@ -182,9 +185,10 @@ func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response) } // Get gets the specified virtual network peering. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. -// virtualNetworkPeeringName is the name of the virtual network peering. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. +// virtualNetworkPeeringName - the name of the virtual network peering. func (client VirtualNetworkPeeringsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName) if err != nil { @@ -250,8 +254,9 @@ func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (re } // List gets all virtual network peerings in a virtual network. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. func (client VirtualNetworkPeeringsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworks.go index e98e7155fd59..cdc9dbf334b5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworks.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworks.go @@ -40,9 +40,10 @@ func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) } // CheckIPAddressAvailability checks whether a private IP address is available for use. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. -// IPAddress is the private IP address to be verified. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. +// IPAddress - the private IP address to be verified. func (client VirtualNetworksClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) { req, err := client.CheckIPAddressAvailabilityPreparer(ctx, resourceGroupName, virtualNetworkName, IPAddress) if err != nil { @@ -110,9 +111,10 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *ht } // CreateOrUpdate creates or updates a virtual network in the specified resource group. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. -// parameters is parameters supplied to the create or update virtual network operation +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. +// parameters - parameters supplied to the create or update virtual network operation func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, parameters) if err != nil { @@ -181,8 +183,9 @@ func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response) } // Delete deletes the specified virtual network. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName) if err != nil { @@ -248,9 +251,10 @@ func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result } // Get gets the specified virtual network by resource group. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. -// expand is expands referenced resources. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. +// expand - expands referenced resources. func (client VirtualNetworksClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, expand) if err != nil { @@ -318,8 +322,8 @@ func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result Vi } // List gets all virtual networks in a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client VirtualNetworksClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName) @@ -501,8 +505,9 @@ func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result } // ListUsage lists usage stats. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. func (client VirtualNetworksClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) { result.fn = client.listUsageNextResults req, err := client.ListUsagePreparer(ctx, resourceGroupName, virtualNetworkName) @@ -595,9 +600,10 @@ func (client VirtualNetworksClient) ListUsageComplete(ctx context.Context, resou } // UpdateTags updates a virtual network tags. -// -// resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network. -// parameters is parameters supplied to update virtual network tags. +// Parameters: +// resourceGroupName - the name of the resource group. +// virtualNetworkName - the name of the virtual network. +// parameters - parameters supplied to update virtual network tags. func (client VirtualNetworksClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (result VirtualNetworksUpdateTagsFuture, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, virtualNetworkName, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/watchers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/watchers.go index e09c6dca1052..25c50de7dd11 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/watchers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/watchers.go @@ -42,9 +42,10 @@ func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) Watcher // CheckConnectivity verifies the possibility of establishing a direct TCP connection from a virtual machine to a given // endpoint including another VM or an arbitrary remote server. -// -// resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the -// network watcher resource. parameters is parameters that determine how the connectivity check will be performed. +// Parameters: +// resourceGroupName - the name of the network watcher resource group. +// networkWatcherName - the name of the network watcher resource. +// parameters - parameters that determine how the connectivity check will be performed. func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersCheckConnectivityFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -121,9 +122,10 @@ func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (re } // CreateOrUpdate creates or updates a network watcher in the specified resource group. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher. -// parameters is parameters that define the network watcher resource. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher. +// parameters - parameters that define the network watcher resource. func (client WatchersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkWatcherName, parameters) if err != nil { @@ -190,8 +192,9 @@ func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (resul } // Delete deletes the specified network watcher resource. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher. func (client WatchersClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName) if err != nil { @@ -257,8 +260,9 @@ func (client WatchersClient) DeleteResponder(resp *http.Response) (result autore } // Get gets the specified network watcher by resource group. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher. func (client WatchersClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName) if err != nil { @@ -324,9 +328,10 @@ func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher, // GetAzureReachabilityReport gets the relative latency score for internet service providers from a specified location // to Azure regions. -// -// resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the -// network watcher resource. parameters is parameters that determine Azure reachability report configuration. +// Parameters: +// resourceGroupName - the name of the network watcher resource group. +// networkWatcherName - the name of the network watcher resource. +// parameters - parameters that determine Azure reachability report configuration. func (client WatchersClient) GetAzureReachabilityReport(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (result WatchersGetAzureReachabilityReportFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -404,9 +409,10 @@ func (client WatchersClient) GetAzureReachabilityReportResponder(resp *http.Resp } // GetFlowLogStatus queries status of flow log on a specified resource. -// -// resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the -// network watcher resource. parameters is parameters that define a resource to query flow log status. +// Parameters: +// resourceGroupName - the name of the network watcher resource group. +// networkWatcherName - the name of the network watcher resource. +// parameters - parameters that define a resource to query flow log status. func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGetFlowLogStatusFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -481,9 +487,10 @@ func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (res } // GetNextHop gets the next hop from the specified VM. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher. -// parameters is parameters that define the source and destination endpoint. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher. +// parameters - parameters that define the source and destination endpoint. func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGetNextHopFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -560,9 +567,10 @@ func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result Ne } // GetTopology gets the current network topology by resource group. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher. -// parameters is parameters that define the representation of topology. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher. +// parameters - parameters that define the representation of topology. func (client WatchersClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -635,9 +643,10 @@ func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result T } // GetTroubleshooting initiate troubleshooting on a specified resource -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher -// resource. parameters is parameters that define the resource to troubleshoot. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher resource. +// parameters - parameters that define the resource to troubleshoot. func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGetTroubleshootingFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -716,9 +725,10 @@ func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (r } // GetTroubleshootingResult get the last completed troubleshooting result on a specified resource -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher -// resource. parameters is parameters that define the resource to query the troubleshooting result. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher resource. +// parameters - parameters that define the resource to query the troubleshooting result. func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGetTroubleshootingResultFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -793,9 +803,10 @@ func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Respon } // GetVMSecurityRules gets the configured and effective security group rules on the specified VM. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher. -// parameters is parameters that define the VM to check security groups for. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher. +// parameters - parameters that define the VM to check security groups for. func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGetVMSecurityRulesFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -870,8 +881,8 @@ func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (r } // List gets all network watchers by resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client WatchersClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) { req, err := client.ListPreparer(ctx, resourceGroupName) if err != nil { @@ -997,9 +1008,10 @@ func (client WatchersClient) ListAllResponder(resp *http.Response) (result Watch } // ListAvailableProviders lists all available internet service providers for a specified Azure region. -// -// resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the -// network watcher resource. parameters is parameters that scope the list of available providers. +// Parameters: +// resourceGroupName - the name of the network watcher resource group. +// networkWatcherName - the name of the network watcher resource. +// parameters - parameters that scope the list of available providers. func (client WatchersClient) ListAvailableProviders(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (result WatchersListAvailableProvidersFuture, err error) { req, err := client.ListAvailableProvidersPreparer(ctx, resourceGroupName, networkWatcherName, parameters) if err != nil { @@ -1068,9 +1080,10 @@ func (client WatchersClient) ListAvailableProvidersResponder(resp *http.Response } // SetFlowLogConfiguration configures flow log on a specified resource. -// -// resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the -// network watcher resource. parameters is parameters that define the configuration of flow log. +// Parameters: +// resourceGroupName - the name of the network watcher resource group. +// networkWatcherName - the name of the network watcher resource. +// parameters - parameters that define the configuration of flow log. func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersSetFlowLogConfigurationFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -1149,9 +1162,10 @@ func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Respons } // UpdateTags updates a network watcher tags. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher. -// parameters is parameters supplied to update network watcher tags. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher. +// parameters - parameters supplied to update network watcher tags. func (client WatchersClient) UpdateTags(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (result Watcher, err error) { req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, networkWatcherName, parameters) if err != nil { @@ -1218,9 +1232,10 @@ func (client WatchersClient) UpdateTagsResponder(resp *http.Response) (result Wa } // VerifyIPFlow verify IP flow from the specified VM to a location given the currently configured NSG rules. -// -// resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher. -// parameters is parameters that define the IP flow to be verified. +// Parameters: +// resourceGroupName - the name of the resource group. +// networkWatcherName - the name of the network watcher. +// parameters - parameters that define the IP flow to be verified. func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersVerifyIPFlowFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/client.go index 2cbc44bf4686..c771ab075150 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/client.go @@ -29,6 +29,7 @@ const ( DefaultBaseURI = "https://management.azure.com" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // BaseClient is the base client for Operationalinsights. type BaseClient struct { autorest.Client @@ -36,11 +37,13 @@ type BaseClient struct { SubscriptionID string } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // New creates an instance of the BaseClient client. func New(subscriptionID string) BaseClient { return NewWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewWithBaseURI creates an instance of the BaseClient client. func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { return BaseClient{ diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/datasources.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/datasources.go index aa4c93cd407d..342b185e2e81 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/datasources.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/datasources.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSourcesClient is the operational Insights Client type DataSourcesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewDataSourcesClient creates an instance of the DataSourcesClient client. func NewDataSourcesClient(subscriptionID string) DataSourcesClient { return NewDataSourcesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewDataSourcesClientWithBaseURI creates an instance of the DataSourcesClient client. func NewDataSourcesClientWithBaseURI(baseURI string, subscriptionID string) DataSourcesClient { return DataSourcesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdate create or update a data source. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name @@ -77,6 +81,7 @@ func (client DataSourcesClient) CreateOrUpdate(ctx context.Context, resourceGrou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DataSourcesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, workspaceName string, dataSourceName string, parameters DataSource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -101,6 +106,7 @@ func (client DataSourcesClient) CreateOrUpdatePreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DataSourcesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -108,6 +114,7 @@ func (client DataSourcesClient) CreateOrUpdateSender(req *http.Request) (*http.R azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DataSourcesClient) CreateOrUpdateResponder(resp *http.Response) (result DataSource, err error) { @@ -121,6 +128,7 @@ func (client DataSourcesClient) CreateOrUpdateResponder(resp *http.Response) (re return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Delete deletes a data source instance. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name @@ -155,6 +163,7 @@ func (client DataSourcesClient) Delete(ctx context.Context, resourceGroupName st return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeletePreparer prepares the Delete request. func (client DataSourcesClient) DeletePreparer(ctx context.Context, resourceGroupName string, workspaceName string, dataSourceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -177,6 +186,7 @@ func (client DataSourcesClient) DeletePreparer(ctx context.Context, resourceGrou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client DataSourcesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -184,6 +194,7 @@ func (client DataSourcesClient) DeleteSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client DataSourcesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -196,6 +207,7 @@ func (client DataSourcesClient) DeleteResponder(resp *http.Response) (result aut return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Get gets a datasource instance. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name @@ -230,6 +242,7 @@ func (client DataSourcesClient) Get(ctx context.Context, resourceGroupName strin return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetPreparer prepares the Get request. func (client DataSourcesClient) GetPreparer(ctx context.Context, resourceGroupName string, workspaceName string, dataSourceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -252,6 +265,7 @@ func (client DataSourcesClient) GetPreparer(ctx context.Context, resourceGroupNa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DataSourcesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -259,6 +273,7 @@ func (client DataSourcesClient) GetSender(req *http.Request) (*http.Response, er azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DataSourcesClient) GetResponder(resp *http.Response) (result DataSource, err error) { @@ -272,6 +287,7 @@ func (client DataSourcesClient) GetResponder(resp *http.Response) (result DataSo return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspace gets the first page of data source instances in a workspace with the link to the next page. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is the @@ -308,6 +324,7 @@ func (client DataSourcesClient) ListByWorkspace(ctx context.Context, resourceGro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspacePreparer prepares the ListByWorkspace request. func (client DataSourcesClient) ListByWorkspacePreparer(ctx context.Context, resourceGroupName string, workspaceName string, filter string, skiptoken string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -333,6 +350,7 @@ func (client DataSourcesClient) ListByWorkspacePreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspaceSender sends the ListByWorkspace request. The method will close the // http.Response Body if it receives an error. func (client DataSourcesClient) ListByWorkspaceSender(req *http.Request) (*http.Response, error) { @@ -340,6 +358,7 @@ func (client DataSourcesClient) ListByWorkspaceSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspaceResponder handles the response to the ListByWorkspace request. The method always // closes the http.Response Body. func (client DataSourcesClient) ListByWorkspaceResponder(resp *http.Response) (result DataSourceListResult, err error) { @@ -374,6 +393,7 @@ func (client DataSourcesClient) listByWorkspaceNextResults(lastResults DataSourc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspaceComplete enumerates all values, automatically crossing page boundaries as required. func (client DataSourcesClient) ListByWorkspaceComplete(ctx context.Context, resourceGroupName string, workspaceName string, filter string, skiptoken string) (result DataSourceListResultIterator, err error) { result.page, err = client.ListByWorkspace(ctx, resourceGroupName, workspaceName, filter, skiptoken) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/linkedservices.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/linkedservices.go index b260876d8222..fbf8bfcf8171 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/linkedservices.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/linkedservices.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // LinkedServicesClient is the operational Insights Client type LinkedServicesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewLinkedServicesClient creates an instance of the LinkedServicesClient client. func NewLinkedServicesClient(subscriptionID string) LinkedServicesClient { return NewLinkedServicesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewLinkedServicesClientWithBaseURI creates an instance of the LinkedServicesClient client. func NewLinkedServicesClientWithBaseURI(baseURI string, subscriptionID string) LinkedServicesClient { return LinkedServicesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdate create or update a linked service. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name @@ -78,6 +82,7 @@ func (client LinkedServicesClient) CreateOrUpdate(ctx context.Context, resourceG return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client LinkedServicesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, workspaceName string, linkedServiceName string, parameters LinkedService) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -102,6 +107,7 @@ func (client LinkedServicesClient) CreateOrUpdatePreparer(ctx context.Context, r return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client LinkedServicesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -109,6 +115,7 @@ func (client LinkedServicesClient) CreateOrUpdateSender(req *http.Request) (*htt azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client LinkedServicesClient) CreateOrUpdateResponder(resp *http.Response) (result LinkedService, err error) { @@ -122,6 +129,7 @@ func (client LinkedServicesClient) CreateOrUpdateResponder(resp *http.Response) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Delete deletes a linked service instance. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name @@ -157,6 +165,7 @@ func (client LinkedServicesClient) Delete(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeletePreparer prepares the Delete request. func (client LinkedServicesClient) DeletePreparer(ctx context.Context, resourceGroupName string, workspaceName string, linkedServiceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -179,6 +188,7 @@ func (client LinkedServicesClient) DeletePreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client LinkedServicesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -186,6 +196,7 @@ func (client LinkedServicesClient) DeleteSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client LinkedServicesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -198,6 +209,7 @@ func (client LinkedServicesClient) DeleteResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Get gets a linked service instance. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name @@ -233,6 +245,7 @@ func (client LinkedServicesClient) Get(ctx context.Context, resourceGroupName st return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetPreparer prepares the Get request. func (client LinkedServicesClient) GetPreparer(ctx context.Context, resourceGroupName string, workspaceName string, linkedServiceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -255,6 +268,7 @@ func (client LinkedServicesClient) GetPreparer(ctx context.Context, resourceGrou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client LinkedServicesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -262,6 +276,7 @@ func (client LinkedServicesClient) GetSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client LinkedServicesClient) GetResponder(resp *http.Response) (result LinkedService, err error) { @@ -275,6 +290,7 @@ func (client LinkedServicesClient) GetResponder(resp *http.Response) (result Lin return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspace gets the linked services instances in a workspace. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name @@ -309,6 +325,7 @@ func (client LinkedServicesClient) ListByWorkspace(ctx context.Context, resource return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspacePreparer prepares the ListByWorkspace request. func (client LinkedServicesClient) ListByWorkspacePreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -330,6 +347,7 @@ func (client LinkedServicesClient) ListByWorkspacePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspaceSender sends the ListByWorkspace request. The method will close the // http.Response Body if it receives an error. func (client LinkedServicesClient) ListByWorkspaceSender(req *http.Request) (*http.Response, error) { @@ -337,6 +355,7 @@ func (client LinkedServicesClient) ListByWorkspaceSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspaceResponder handles the response to the ListByWorkspace request. The method always // closes the http.Response Body. func (client LinkedServicesClient) ListByWorkspaceResponder(resp *http.Response) (result LinkedServiceListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go index 0b88290b2e9f..2b1707a29313 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go @@ -26,6 +26,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSourceKind enumerates the values for data source kind. type DataSourceKind string @@ -62,11 +63,13 @@ const ( WindowsPerformanceCounter DataSourceKind = "WindowsPerformanceCounter" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // PossibleDataSourceKindValues returns an array of possible values for the DataSourceKind const type. func PossibleDataSourceKindValues() []DataSourceKind { return []DataSourceKind{AzureActivityLog, ChangeTrackingCustomRegistry, ChangeTrackingDefaultPath, ChangeTrackingDefaultRegistry, ChangeTrackingPath, CustomLog, CustomLogCollection, GenericDataSource, IISLogs, LinuxPerformanceCollection, LinuxPerformanceObject, LinuxSyslog, LinuxSyslogCollection, WindowsEvent, WindowsPerformanceCounter} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // EntityStatus enumerates the values for entity status. type EntityStatus string @@ -85,17 +88,21 @@ const ( Succeeded EntityStatus = "Succeeded" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // PossibleEntityStatusValues returns an array of possible values for the EntityStatus const type. func PossibleEntityStatusValues() []EntityStatus { return []EntityStatus{Canceled, Creating, Deleting, Failed, ProvisioningAccount, Succeeded} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // SkuNameEnum enumerates the values for sku name enum. type SkuNameEnum string const ( // Free ... Free SkuNameEnum = "Free" + // PerGB2018 ... + PerGB2018 SkuNameEnum = "PerGB2018" // PerNode ... PerNode SkuNameEnum = "PerNode" // Premium ... @@ -108,11 +115,13 @@ const ( Unlimited SkuNameEnum = "Unlimited" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // PossibleSkuNameEnumValues returns an array of possible values for the SkuNameEnum const type. func PossibleSkuNameEnumValues() []SkuNameEnum { - return []SkuNameEnum{Free, PerNode, Premium, Standalone, Standard, Unlimited} + return []SkuNameEnum{Free, PerGB2018, PerNode, Premium, Standalone, Standard, Unlimited} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSource datasources under OMS Workspace. type DataSource struct { autorest.Response `json:"-"` @@ -132,6 +141,7 @@ type DataSource struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MarshalJSON is the custom marshaler for DataSource. func (ds DataSource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -157,12 +167,14 @@ func (ds DataSource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSourceFilter dataSource filter. Right now, only filter by kind is supported. type DataSourceFilter struct { // Kind - Possible values include: 'AzureActivityLog', 'ChangeTrackingPath', 'ChangeTrackingDefaultPath', 'ChangeTrackingDefaultRegistry', 'ChangeTrackingCustomRegistry', 'CustomLog', 'CustomLogCollection', 'GenericDataSource', 'IISLogs', 'LinuxPerformanceObject', 'LinuxPerformanceCollection', 'LinuxSyslog', 'LinuxSyslogCollection', 'WindowsEvent', 'WindowsPerformanceCounter' Kind DataSourceKind `json:"kind,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSourceListResult the list data source by workspace operation response. type DataSourceListResult struct { autorest.Response `json:"-"` @@ -172,12 +184,14 @@ type DataSourceListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSourceListResultIterator provides access to a complete listing of DataSource values. type DataSourceListResultIterator struct { i int page DataSourceListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *DataSourceListResultIterator) Next() error { @@ -194,16 +208,19 @@ func (iter *DataSourceListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter DataSourceListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Response returns the raw server response from the last page request. func (iter DataSourceListResultIterator) Response() DataSourceListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter DataSourceListResultIterator) Value() DataSource { @@ -213,6 +230,7 @@ func (iter DataSourceListResultIterator) Value() DataSource { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // IsEmpty returns true if the ListResult contains no values. func (dslr DataSourceListResult) IsEmpty() bool { return dslr.Value == nil || len(*dslr.Value) == 0 @@ -230,12 +248,14 @@ func (dslr DataSourceListResult) dataSourceListResultPreparer() (*http.Request, autorest.WithBaseURL(to.String(dslr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSourceListResultPage contains a page of DataSource values. type DataSourceListResultPage struct { fn func(DataSourceListResult) (DataSourceListResult, error) dslr DataSourceListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *DataSourceListResultPage) Next() error { @@ -247,16 +267,19 @@ func (page *DataSourceListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page DataSourceListResultPage) NotDone() bool { return !page.dslr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Response returns the raw server response from the last page request. func (page DataSourceListResultPage) Response() DataSourceListResult { return page.dslr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Values returns the slice of values for the current page or nil if there are no values. func (page DataSourceListResultPage) Values() []DataSource { if page.dslr.IsEmpty() { @@ -265,6 +288,7 @@ func (page DataSourceListResultPage) Values() []DataSource { return *page.dslr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // IntelligencePack intelligence Pack containing a string name and boolean indicating if it's enabled. type IntelligencePack struct { // Name - The name of the intelligence pack. @@ -275,6 +299,7 @@ type IntelligencePack struct { DisplayName *string `json:"displayName,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // LinkedService the top level Linked service resource container. type LinkedService struct { autorest.Response `json:"-"` @@ -290,6 +315,7 @@ type LinkedService struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MarshalJSON is the custom marshaler for LinkedService. func (ls LinkedService) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -311,6 +337,7 @@ func (ls LinkedService) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UnmarshalJSON is the custom unmarshaler for LinkedService struct. func (ls *LinkedService) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -371,6 +398,7 @@ func (ls *LinkedService) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // LinkedServiceListResult the list linked service operation response. type LinkedServiceListResult struct { autorest.Response `json:"-"` @@ -378,24 +406,28 @@ type LinkedServiceListResult struct { Value *[]LinkedService `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // LinkedServiceProperties linked service properties. type LinkedServiceProperties struct { // ResourceID - The resource id of the resource that will be linked to the workspace. ResourceID *string `json:"resourceId,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListIntelligencePack ... type ListIntelligencePack struct { autorest.Response `json:"-"` Value *[]IntelligencePack `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ManagementGroup a management group that is connected to a workspace type ManagementGroup struct { // ManagementGroupProperties - The properties of the management group. *ManagementGroupProperties `json:"properties,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MarshalJSON is the custom marshaler for ManagementGroup. func (mg ManagementGroup) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -405,6 +437,7 @@ func (mg ManagementGroup) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UnmarshalJSON is the custom unmarshaler for ManagementGroup struct. func (mg *ManagementGroup) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -429,6 +462,7 @@ func (mg *ManagementGroup) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ManagementGroupProperties management group properties. type ManagementGroupProperties struct { // ServerCount - The number of servers connected to the management group. @@ -449,6 +483,7 @@ type ManagementGroupProperties struct { Sku *string `json:"sku,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MetricName the name of a metric. type MetricName struct { // Value - The system name of the metric. @@ -457,6 +492,7 @@ type MetricName struct { LocalizedValue *string `json:"localizedValue,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Operation supported operation of OperationalInsights resource provider. type Operation struct { // Name - Operation name: {provider}/{resource}/{operation} @@ -465,6 +501,7 @@ type Operation struct { Display *OperationDisplay `json:"display,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // OperationDisplay display metadata associated with the operation. type OperationDisplay struct { // Provider - Service provider: Microsoft OperationsManagement. @@ -475,6 +512,7 @@ type OperationDisplay struct { Operation *string `json:"operation,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // OperationListResult result of the request to list solution operations. type OperationListResult struct { autorest.Response `json:"-"` @@ -484,12 +522,14 @@ type OperationListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // OperationListResultIterator provides access to a complete listing of Operation values. type OperationListResultIterator struct { i int page OperationListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *OperationListResultIterator) Next() error { @@ -506,16 +546,19 @@ func (iter *OperationListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter OperationListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Response returns the raw server response from the last page request. func (iter OperationListResultIterator) Response() OperationListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter OperationListResultIterator) Value() Operation { @@ -525,6 +568,7 @@ func (iter OperationListResultIterator) Value() Operation { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // IsEmpty returns true if the ListResult contains no values. func (olr OperationListResult) IsEmpty() bool { return olr.Value == nil || len(*olr.Value) == 0 @@ -542,12 +586,14 @@ func (olr OperationListResult) operationListResultPreparer() (*http.Request, err autorest.WithBaseURL(to.String(olr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // OperationListResultPage contains a page of Operation values. type OperationListResultPage struct { fn func(OperationListResult) (OperationListResult, error) olr OperationListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *OperationListResultPage) Next() error { @@ -559,16 +605,19 @@ func (page *OperationListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page OperationListResultPage) NotDone() bool { return !page.olr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Response returns the raw server response from the last page request. func (page OperationListResultPage) Response() OperationListResult { return page.olr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Values returns the slice of values for the current page or nil if there are no values. func (page OperationListResultPage) Values() []Operation { if page.olr.IsEmpty() { @@ -577,6 +626,7 @@ func (page OperationListResultPage) Values() []Operation { return *page.olr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ProxyResource common properties of proxy resource. type ProxyResource struct { // ID - Resource ID. @@ -589,6 +639,7 @@ type ProxyResource struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MarshalJSON is the custom marshaler for ProxyResource. func (pr ProxyResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -607,6 +658,7 @@ func (pr ProxyResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Resource the resource definition. type Resource struct { // ID - Resource Id @@ -621,6 +673,7 @@ type Resource struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MarshalJSON is the custom marshaler for Resource. func (r Resource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -642,6 +695,7 @@ func (r Resource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // SharedKeys the shared keys for a workspace. type SharedKeys struct { autorest.Response `json:"-"` @@ -651,12 +705,14 @@ type SharedKeys struct { SecondarySharedKey *string `json:"secondarySharedKey,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Sku the SKU (tier) of a workspace. type Sku struct { - // Name - The name of the SKU. Possible values include: 'Free', 'Standard', 'Premium', 'Unlimited', 'PerNode', 'Standalone' + // Name - The name of the SKU. Possible values include: 'Free', 'Standard', 'Premium', 'Unlimited', 'PerNode', 'PerGB2018', 'Standalone' Name SkuNameEnum `json:"name,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UsageMetric a metric describing the usage of a resource. type UsageMetric struct { // Name - The name of the metric. @@ -673,6 +729,7 @@ type UsageMetric struct { QuotaPeriod *string `json:"quotaPeriod,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Workspace the top level Workspace resource container. type Workspace struct { autorest.Response `json:"-"` @@ -692,6 +749,7 @@ type Workspace struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MarshalJSON is the custom marshaler for Workspace. func (w Workspace) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -719,6 +777,7 @@ func (w Workspace) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UnmarshalJSON is the custom unmarshaler for Workspace struct. func (w *Workspace) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -797,6 +856,7 @@ func (w *Workspace) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // WorkspaceListManagementGroupsResult the list workspace managmement groups operation response. type WorkspaceListManagementGroupsResult struct { autorest.Response `json:"-"` @@ -804,6 +864,7 @@ type WorkspaceListManagementGroupsResult struct { Value *[]ManagementGroup `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // WorkspaceListResult the list workspaces operation response. type WorkspaceListResult struct { autorest.Response `json:"-"` @@ -811,6 +872,7 @@ type WorkspaceListResult struct { Value *[]Workspace `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // WorkspaceListUsagesResult the list workspace usages operation response. type WorkspaceListUsagesResult struct { autorest.Response `json:"-"` @@ -818,6 +880,7 @@ type WorkspaceListUsagesResult struct { Value *[]UsageMetric `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // WorkspaceProperties workspace properties. type WorkspaceProperties struct { // ProvisioningState - The provisioning state of the workspace. Possible values include: 'Creating', 'Succeeded', 'Failed', 'Canceled', 'Deleting', 'ProvisioningAccount' @@ -834,6 +897,7 @@ type WorkspaceProperties struct { RetentionInDays *int32 `json:"retentionInDays,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // WorkspacesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type WorkspacesCreateOrUpdateFuture struct { @@ -841,6 +905,7 @@ type WorkspacesCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future WorkspacesCreateOrUpdateFuture) Result(client WorkspacesClient) (w Workspace, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/operations.go index 3df445e34f5f..acbf0e1e8146 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/operations.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // OperationsClient is the operational Insights Client type OperationsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewOperationsClient creates an instance of the OperationsClient client. func NewOperationsClient(subscriptionID string) OperationsClient { return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // List lists all of the available OperationalInsights Rest API operations. func (client OperationsClient) List(ctx context.Context) (result OperationListResultPage, err error) { result.fn = client.listNextResults @@ -63,6 +67,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2015-11-01-preview" @@ -78,6 +83,7 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -85,6 +91,7 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { @@ -119,6 +126,7 @@ func (client OperationsClient) listNextResults(lastResults OperationListResult) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListComplete enumerates all values, automatically crossing page boundaries as required. func (client OperationsClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) { result.page, err = client.List(ctx) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/version.go index d15046da501b..32430ea08157 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/version.go @@ -18,12 +18,13 @@ import "github.com/Azure/azure-sdk-for-go/version" // // Code generated by Microsoft (R) AutoRest Code Generator. // Changes may cause incorrect behavior and will be lost if the code is regenerated. - +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { return "Azure-SDK-For-Go/" + version.Number + " operationalinsights/2015-11-01-preview" } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Version returns the semantic version (see http://semver.org) of the client. func Version() string { return version.Number diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go index 141a5eddff9e..5a1ac4043a4d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // WorkspacesClient is the operational Insights Client type WorkspacesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewWorkspacesClient creates an instance of the WorkspacesClient client. func NewWorkspacesClient(subscriptionID string) WorkspacesClient { return NewWorkspacesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewWorkspacesClientWithBaseURI creates an instance of the WorkspacesClient client. func NewWorkspacesClientWithBaseURI(baseURI string, subscriptionID string) WorkspacesClient { return WorkspacesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdate create or update a workspace. // // resourceGroupName is the resource group name of the workspace. workspaceName is the name of the workspace. @@ -75,6 +79,7 @@ func (client WorkspacesClient) CreateOrUpdate(ctx context.Context, resourceGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client WorkspacesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, workspaceName string, parameters Workspace) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -98,6 +103,7 @@ func (client WorkspacesClient) CreateOrUpdatePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) CreateOrUpdateSender(req *http.Request) (future WorkspacesCreateOrUpdateFuture, err error) { @@ -113,6 +119,7 @@ func (client WorkspacesClient) CreateOrUpdateSender(req *http.Request) (future W return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client WorkspacesClient) CreateOrUpdateResponder(resp *http.Response) (result Workspace, err error) { @@ -126,6 +133,7 @@ func (client WorkspacesClient) CreateOrUpdateResponder(resp *http.Response) (res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Delete deletes a workspace instance. // // resourceGroupName is the resource group name of the workspace. workspaceName is name of the Log Analytics @@ -152,6 +160,7 @@ func (client WorkspacesClient) Delete(ctx context.Context, resourceGroupName str return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeletePreparer prepares the Delete request. func (client WorkspacesClient) DeletePreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -173,6 +182,7 @@ func (client WorkspacesClient) DeletePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -180,6 +190,7 @@ func (client WorkspacesClient) DeleteSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client WorkspacesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -192,6 +203,7 @@ func (client WorkspacesClient) DeleteResponder(resp *http.Response) (result auto return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DisableIntelligencePack disables an intelligence pack for a given workspace. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name @@ -226,6 +238,7 @@ func (client WorkspacesClient) DisableIntelligencePack(ctx context.Context, reso return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DisableIntelligencePackPreparer prepares the DisableIntelligencePack request. func (client WorkspacesClient) DisableIntelligencePackPreparer(ctx context.Context, resourceGroupName string, workspaceName string, intelligencePackName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -248,6 +261,7 @@ func (client WorkspacesClient) DisableIntelligencePackPreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DisableIntelligencePackSender sends the DisableIntelligencePack request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) DisableIntelligencePackSender(req *http.Request) (*http.Response, error) { @@ -255,6 +269,7 @@ func (client WorkspacesClient) DisableIntelligencePackSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DisableIntelligencePackResponder handles the response to the DisableIntelligencePack request. The method always // closes the http.Response Body. func (client WorkspacesClient) DisableIntelligencePackResponder(resp *http.Response) (result autorest.Response, err error) { @@ -267,6 +282,7 @@ func (client WorkspacesClient) DisableIntelligencePackResponder(resp *http.Respo return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // EnableIntelligencePack enables an intelligence pack for a given workspace. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name @@ -301,6 +317,7 @@ func (client WorkspacesClient) EnableIntelligencePack(ctx context.Context, resou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // EnableIntelligencePackPreparer prepares the EnableIntelligencePack request. func (client WorkspacesClient) EnableIntelligencePackPreparer(ctx context.Context, resourceGroupName string, workspaceName string, intelligencePackName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -323,6 +340,7 @@ func (client WorkspacesClient) EnableIntelligencePackPreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // EnableIntelligencePackSender sends the EnableIntelligencePack request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) EnableIntelligencePackSender(req *http.Request) (*http.Response, error) { @@ -330,6 +348,7 @@ func (client WorkspacesClient) EnableIntelligencePackSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // EnableIntelligencePackResponder handles the response to the EnableIntelligencePack request. The method always // closes the http.Response Body. func (client WorkspacesClient) EnableIntelligencePackResponder(resp *http.Response) (result autorest.Response, err error) { @@ -342,6 +361,7 @@ func (client WorkspacesClient) EnableIntelligencePackResponder(resp *http.Respon return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Get gets a workspace instance. // // resourceGroupName is the resource group name of the workspace. workspaceName is name of the Log Analytics @@ -368,6 +388,7 @@ func (client WorkspacesClient) Get(ctx context.Context, resourceGroupName string return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetPreparer prepares the Get request. func (client WorkspacesClient) GetPreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -389,6 +410,7 @@ func (client WorkspacesClient) GetPreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -396,6 +418,7 @@ func (client WorkspacesClient) GetSender(req *http.Request) (*http.Response, err azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client WorkspacesClient) GetResponder(resp *http.Response) (result Workspace, err error) { @@ -409,6 +432,7 @@ func (client WorkspacesClient) GetResponder(resp *http.Response) (result Workspa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSharedKeys gets the shared keys for a workspace. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name @@ -443,6 +467,7 @@ func (client WorkspacesClient) GetSharedKeys(ctx context.Context, resourceGroupN return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSharedKeysPreparer prepares the GetSharedKeys request. func (client WorkspacesClient) GetSharedKeysPreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -464,6 +489,7 @@ func (client WorkspacesClient) GetSharedKeysPreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSharedKeysSender sends the GetSharedKeys request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) GetSharedKeysSender(req *http.Request) (*http.Response, error) { @@ -471,6 +497,7 @@ func (client WorkspacesClient) GetSharedKeysSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSharedKeysResponder handles the response to the GetSharedKeys request. The method always // closes the http.Response Body. func (client WorkspacesClient) GetSharedKeysResponder(resp *http.Response) (result SharedKeys, err error) { @@ -484,6 +511,7 @@ func (client WorkspacesClient) GetSharedKeysResponder(resp *http.Response) (resu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // List gets the workspaces in a subscription. func (client WorkspacesClient) List(ctx context.Context) (result WorkspaceListResult, err error) { req, err := client.ListPreparer(ctx) @@ -507,6 +535,7 @@ func (client WorkspacesClient) List(ctx context.Context) (result WorkspaceListRe return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListPreparer prepares the List request. func (client WorkspacesClient) ListPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -526,6 +555,7 @@ func (client WorkspacesClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) ListSender(req *http.Request) (*http.Response, error) { @@ -533,6 +563,7 @@ func (client WorkspacesClient) ListSender(req *http.Request) (*http.Response, er azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client WorkspacesClient) ListResponder(resp *http.Response) (result WorkspaceListResult, err error) { @@ -546,6 +577,7 @@ func (client WorkspacesClient) ListResponder(resp *http.Response) (result Worksp return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByResourceGroup gets workspaces in a resource group. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. @@ -579,6 +611,7 @@ func (client WorkspacesClient) ListByResourceGroup(ctx context.Context, resource return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client WorkspacesClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -599,6 +632,7 @@ func (client WorkspacesClient) ListByResourceGroupPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -606,6 +640,7 @@ func (client WorkspacesClient) ListByResourceGroupSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client WorkspacesClient) ListByResourceGroupResponder(resp *http.Response) (result WorkspaceListResult, err error) { @@ -619,6 +654,7 @@ func (client WorkspacesClient) ListByResourceGroupResponder(resp *http.Response) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListIntelligencePacks lists all the intelligence packs possible and whether they are enabled or disabled for a given // workspace. // @@ -654,6 +690,7 @@ func (client WorkspacesClient) ListIntelligencePacks(ctx context.Context, resour return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListIntelligencePacksPreparer prepares the ListIntelligencePacks request. func (client WorkspacesClient) ListIntelligencePacksPreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -675,6 +712,7 @@ func (client WorkspacesClient) ListIntelligencePacksPreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListIntelligencePacksSender sends the ListIntelligencePacks request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) ListIntelligencePacksSender(req *http.Request) (*http.Response, error) { @@ -682,6 +720,7 @@ func (client WorkspacesClient) ListIntelligencePacksSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListIntelligencePacksResponder handles the response to the ListIntelligencePacks request. The method always // closes the http.Response Body. func (client WorkspacesClient) ListIntelligencePacksResponder(resp *http.Response) (result ListIntelligencePack, err error) { @@ -695,6 +734,7 @@ func (client WorkspacesClient) ListIntelligencePacksResponder(resp *http.Respons return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListManagementGroups gets a list of management groups connected to a workspace. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is the @@ -729,6 +769,7 @@ func (client WorkspacesClient) ListManagementGroups(ctx context.Context, resourc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListManagementGroupsPreparer prepares the ListManagementGroups request. func (client WorkspacesClient) ListManagementGroupsPreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -750,6 +791,7 @@ func (client WorkspacesClient) ListManagementGroupsPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListManagementGroupsSender sends the ListManagementGroups request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) ListManagementGroupsSender(req *http.Request) (*http.Response, error) { @@ -757,6 +799,7 @@ func (client WorkspacesClient) ListManagementGroupsSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListManagementGroupsResponder handles the response to the ListManagementGroups request. The method always // closes the http.Response Body. func (client WorkspacesClient) ListManagementGroupsResponder(resp *http.Response) (result WorkspaceListManagementGroupsResult, err error) { @@ -770,6 +813,7 @@ func (client WorkspacesClient) ListManagementGroupsResponder(resp *http.Response return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListUsages gets a list of usage metrics for a workspace. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is the @@ -804,6 +848,7 @@ func (client WorkspacesClient) ListUsages(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListUsagesPreparer prepares the ListUsages request. func (client WorkspacesClient) ListUsagesPreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -825,6 +870,7 @@ func (client WorkspacesClient) ListUsagesPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListUsagesSender sends the ListUsages request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) ListUsagesSender(req *http.Request) (*http.Response, error) { @@ -832,6 +878,7 @@ func (client WorkspacesClient) ListUsagesSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListUsagesResponder handles the response to the ListUsages request. The method always // closes the http.Response Body. func (client WorkspacesClient) ListUsagesResponder(resp *http.Response) (result WorkspaceListUsagesResult, err error) { @@ -845,6 +892,7 @@ func (client WorkspacesClient) ListUsagesResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Update updates a workspace. // // resourceGroupName is the resource group name of the workspace. workspaceName is the name of the workspace. @@ -879,6 +927,7 @@ func (client WorkspacesClient) Update(ctx context.Context, resourceGroupName str return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UpdatePreparer prepares the Update request. func (client WorkspacesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, workspaceName string, parameters Workspace) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -902,6 +951,7 @@ func (client WorkspacesClient) UpdatePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -909,6 +959,7 @@ func (client WorkspacesClient) UpdateSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client WorkspacesClient) UpdateResponder(resp *http.Response) (result Workspace, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/client.go index 819be16528c8..a8ab93f0c720 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/client.go @@ -29,6 +29,7 @@ const ( DefaultBaseURI = "https://management.azure.com" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // BaseClient is the base client for Operationsmanagement. type BaseClient struct { autorest.Client @@ -39,11 +40,13 @@ type BaseClient struct { ResourceName string } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // New creates an instance of the BaseClient client. func New(subscriptionID string, providerName string, resourceType string, resourceName string) BaseClient { return NewWithBaseURI(DefaultBaseURI, subscriptionID, providerName, resourceType, resourceName) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewWithBaseURI creates an instance of the BaseClient client. func NewWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) BaseClient { return BaseClient{ diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementassociations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementassociations.go index f998f2b803ff..209e0a50691f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementassociations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementassociations.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementAssociationsClient is the operations Management Client type ManagementAssociationsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewManagementAssociationsClient creates an instance of the ManagementAssociationsClient client. func NewManagementAssociationsClient(subscriptionID string, providerName string, resourceType string, resourceName string) ManagementAssociationsClient { return NewManagementAssociationsClientWithBaseURI(DefaultBaseURI, subscriptionID, providerName, resourceType, resourceName) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewManagementAssociationsClientWithBaseURI creates an instance of the ManagementAssociationsClient client. func NewManagementAssociationsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) ManagementAssociationsClient { return ManagementAssociationsClient{NewWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdate creates or updates the ManagementAssociation. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. @@ -78,6 +82,7 @@ func (client ManagementAssociationsClient) CreateOrUpdate(ctx context.Context, r return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ManagementAssociationsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, managementAssociationName string, parameters ManagementAssociation) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -104,6 +109,7 @@ func (client ManagementAssociationsClient) CreateOrUpdatePreparer(ctx context.Co return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ManagementAssociationsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -111,6 +117,7 @@ func (client ManagementAssociationsClient) CreateOrUpdateSender(req *http.Reques azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ManagementAssociationsClient) CreateOrUpdateResponder(resp *http.Response) (result ManagementAssociation, err error) { @@ -124,6 +131,7 @@ func (client ManagementAssociationsClient) CreateOrUpdateResponder(resp *http.Re return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Delete deletes the ManagementAssociation in the subscription. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. @@ -158,6 +166,7 @@ func (client ManagementAssociationsClient) Delete(ctx context.Context, resourceG return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeletePreparer prepares the Delete request. func (client ManagementAssociationsClient) DeletePreparer(ctx context.Context, resourceGroupName string, managementAssociationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -182,6 +191,7 @@ func (client ManagementAssociationsClient) DeletePreparer(ctx context.Context, r return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ManagementAssociationsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -189,6 +199,7 @@ func (client ManagementAssociationsClient) DeleteSender(req *http.Request) (*htt azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ManagementAssociationsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -201,6 +212,7 @@ func (client ManagementAssociationsClient) DeleteResponder(resp *http.Response) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Get retrieves the user ManagementAssociation. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. @@ -235,6 +247,7 @@ func (client ManagementAssociationsClient) Get(ctx context.Context, resourceGrou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetPreparer prepares the Get request. func (client ManagementAssociationsClient) GetPreparer(ctx context.Context, resourceGroupName string, managementAssociationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -259,6 +272,7 @@ func (client ManagementAssociationsClient) GetPreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ManagementAssociationsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -266,6 +280,7 @@ func (client ManagementAssociationsClient) GetSender(req *http.Request) (*http.R azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ManagementAssociationsClient) GetResponder(resp *http.Response) (result ManagementAssociation, err error) { @@ -279,6 +294,7 @@ func (client ManagementAssociationsClient) GetResponder(resp *http.Response) (re return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscription retrieves the ManagementAssociatons list. func (client ManagementAssociationsClient) ListBySubscription(ctx context.Context) (result ManagementAssociationPropertiesList, err error) { req, err := client.ListBySubscriptionPreparer(ctx) @@ -302,6 +318,7 @@ func (client ManagementAssociationsClient) ListBySubscription(ctx context.Contex return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionPreparer prepares the ListBySubscription request. func (client ManagementAssociationsClient) ListBySubscriptionPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -321,6 +338,7 @@ func (client ManagementAssociationsClient) ListBySubscriptionPreparer(ctx contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionSender sends the ListBySubscription request. The method will close the // http.Response Body if it receives an error. func (client ManagementAssociationsClient) ListBySubscriptionSender(req *http.Request) (*http.Response, error) { @@ -328,6 +346,7 @@ func (client ManagementAssociationsClient) ListBySubscriptionSender(req *http.Re azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionResponder handles the response to the ListBySubscription request. The method always // closes the http.Response Body. func (client ManagementAssociationsClient) ListBySubscriptionResponder(resp *http.Response) (result ManagementAssociationPropertiesList, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementconfigurations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementconfigurations.go index a12703784566..cbeb266e4e84 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementconfigurations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementconfigurations.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementConfigurationsClient is the operations Management Client type ManagementConfigurationsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewManagementConfigurationsClient creates an instance of the ManagementConfigurationsClient client. func NewManagementConfigurationsClient(subscriptionID string, providerName string, resourceType string, resourceName string) ManagementConfigurationsClient { return NewManagementConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID, providerName, resourceType, resourceName) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewManagementConfigurationsClientWithBaseURI creates an instance of the ManagementConfigurationsClient client. func NewManagementConfigurationsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) ManagementConfigurationsClient { return ManagementConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdate creates or updates the ManagementConfiguration. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. @@ -81,6 +85,7 @@ func (client ManagementConfigurationsClient) CreateOrUpdate(ctx context.Context, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ManagementConfigurationsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, managementConfigurationName string, parameters ManagementConfiguration) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -104,6 +109,7 @@ func (client ManagementConfigurationsClient) CreateOrUpdatePreparer(ctx context. return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ManagementConfigurationsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -111,6 +117,7 @@ func (client ManagementConfigurationsClient) CreateOrUpdateSender(req *http.Requ azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ManagementConfigurationsClient) CreateOrUpdateResponder(resp *http.Response) (result ManagementConfiguration, err error) { @@ -124,6 +131,7 @@ func (client ManagementConfigurationsClient) CreateOrUpdateResponder(resp *http. return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Delete deletes the ManagementConfiguration in the subscription. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. @@ -158,6 +166,7 @@ func (client ManagementConfigurationsClient) Delete(ctx context.Context, resourc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeletePreparer prepares the Delete request. func (client ManagementConfigurationsClient) DeletePreparer(ctx context.Context, resourceGroupName string, managementConfigurationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -179,6 +188,7 @@ func (client ManagementConfigurationsClient) DeletePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ManagementConfigurationsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -186,6 +196,7 @@ func (client ManagementConfigurationsClient) DeleteSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ManagementConfigurationsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -198,6 +209,7 @@ func (client ManagementConfigurationsClient) DeleteResponder(resp *http.Response return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Get retrieves the user ManagementConfiguration. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. @@ -232,6 +244,7 @@ func (client ManagementConfigurationsClient) Get(ctx context.Context, resourceGr return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetPreparer prepares the Get request. func (client ManagementConfigurationsClient) GetPreparer(ctx context.Context, resourceGroupName string, managementConfigurationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -253,6 +266,7 @@ func (client ManagementConfigurationsClient) GetPreparer(ctx context.Context, re return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ManagementConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -260,6 +274,7 @@ func (client ManagementConfigurationsClient) GetSender(req *http.Request) (*http azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ManagementConfigurationsClient) GetResponder(resp *http.Response) (result ManagementConfiguration, err error) { @@ -273,6 +288,7 @@ func (client ManagementConfigurationsClient) GetResponder(resp *http.Response) ( return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscription retrieves the ManagementConfigurations list. func (client ManagementConfigurationsClient) ListBySubscription(ctx context.Context) (result ManagementConfigurationPropertiesList, err error) { req, err := client.ListBySubscriptionPreparer(ctx) @@ -296,6 +312,7 @@ func (client ManagementConfigurationsClient) ListBySubscription(ctx context.Cont return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionPreparer prepares the ListBySubscription request. func (client ManagementConfigurationsClient) ListBySubscriptionPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -315,6 +332,7 @@ func (client ManagementConfigurationsClient) ListBySubscriptionPreparer(ctx cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionSender sends the ListBySubscription request. The method will close the // http.Response Body if it receives an error. func (client ManagementConfigurationsClient) ListBySubscriptionSender(req *http.Request) (*http.Response, error) { @@ -322,6 +340,7 @@ func (client ManagementConfigurationsClient) ListBySubscriptionSender(req *http. azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionResponder handles the response to the ListBySubscription request. The method always // closes the http.Response Body. func (client ManagementConfigurationsClient) ListBySubscriptionResponder(resp *http.Response) (result ManagementConfigurationPropertiesList, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/models.go index 34fc539c9135..e55b77ea52da 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/models.go @@ -21,6 +21,7 @@ import ( "github.com/Azure/go-autorest/autorest" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ArmTemplateParameter parameter to pass to ARM template type ArmTemplateParameter struct { // Name - name of the parameter. @@ -29,12 +30,14 @@ type ArmTemplateParameter struct { Value *string `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CodeMessageError the error body contract. type CodeMessageError struct { // Error - The error details for a failed request. Error *CodeMessageErrorError `json:"error,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CodeMessageErrorError the error details for a failed request. type CodeMessageErrorError struct { // Code - The error type. @@ -43,6 +46,7 @@ type CodeMessageErrorError struct { Message *string `json:"message,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementAssociation the container for solution. type ManagementAssociation struct { autorest.Response `json:"-"` @@ -58,6 +62,7 @@ type ManagementAssociation struct { Properties *ManagementAssociationProperties `json:"properties,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementAssociationProperties managementAssociation properties supported by the OperationsManagement resource // provider. type ManagementAssociationProperties struct { @@ -65,6 +70,7 @@ type ManagementAssociationProperties struct { ApplicationID *string `json:"applicationId,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementAssociationPropertiesList the list of ManagementAssociation response type ManagementAssociationPropertiesList struct { autorest.Response `json:"-"` @@ -72,6 +78,7 @@ type ManagementAssociationPropertiesList struct { Value *[]ManagementAssociation `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementConfiguration the container for solution. type ManagementConfiguration struct { autorest.Response `json:"-"` @@ -87,6 +94,7 @@ type ManagementConfiguration struct { Properties *ManagementConfigurationProperties `json:"properties,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementConfigurationProperties managementConfiguration properties supported by the OperationsManagement // resource provider. type ManagementConfigurationProperties struct { @@ -102,6 +110,7 @@ type ManagementConfigurationProperties struct { Template interface{} `json:"template,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementConfigurationPropertiesList the list of ManagementConfiguration response type ManagementConfigurationPropertiesList struct { autorest.Response `json:"-"` @@ -109,6 +118,7 @@ type ManagementConfigurationPropertiesList struct { Value *[]ManagementConfiguration `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Operation supported operation of OperationsManagement resource provider. type Operation struct { // Name - Operation name: {provider}/{resource}/{operation} @@ -117,6 +127,7 @@ type Operation struct { Display *OperationDisplay `json:"display,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // OperationDisplay display metadata associated with the operation. type OperationDisplay struct { // Provider - Service provider: Microsoft OperationsManagement. @@ -127,6 +138,7 @@ type OperationDisplay struct { Operation *string `json:"operation,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // OperationListResult result of the request to list solution operations. type OperationListResult struct { autorest.Response `json:"-"` @@ -134,6 +146,7 @@ type OperationListResult struct { Value *[]Operation `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Solution the container for solution. type Solution struct { autorest.Response `json:"-"` @@ -151,6 +164,7 @@ type Solution struct { Properties *SolutionProperties `json:"properties,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // SolutionPlan plan for solution object supported by the OperationsManagement resource provider. type SolutionPlan struct { // Name - name of the solution to be created. For Microsoft published solution it should be in the format of solutionType(workspaceName). SolutionType part is case sensitive. For third party solution, it can be anything. @@ -163,6 +177,7 @@ type SolutionPlan struct { Product *string `json:"product,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // SolutionProperties solution properties supported by the OperationsManagement resource provider. type SolutionProperties struct { // WorkspaceResourceID - The azure resourceId for the workspace where the solution will be deployed/enabled. @@ -175,6 +190,7 @@ type SolutionProperties struct { ReferencedResources *[]string `json:"referencedResources,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // SolutionPropertiesList the list of solution response type SolutionPropertiesList struct { autorest.Response `json:"-"` diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/operations.go index f64d685b2d26..dd78b1cb4f1f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/operations.go @@ -24,21 +24,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // OperationsClient is the operations Management Client type OperationsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewOperationsClient creates an instance of the OperationsClient client. func NewOperationsClient(subscriptionID string, providerName string, resourceType string, resourceName string) OperationsClient { return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID, providerName, resourceType, resourceName) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) OperationsClient { return OperationsClient{NewWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // List lists all of the available OperationsManagement Rest API operations. func (client OperationsClient) List(ctx context.Context) (result OperationListResult, err error) { req, err := client.ListPreparer(ctx) @@ -62,6 +66,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2015-11-01-preview" @@ -77,6 +82,7 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -84,6 +90,7 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/solutions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/solutions.go index d5ae4a51718f..3389e157f9c1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/solutions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/solutions.go @@ -25,21 +25,25 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // SolutionsClient is the operations Management Client type SolutionsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewSolutionsClient creates an instance of the SolutionsClient client. func NewSolutionsClient(subscriptionID string, providerName string, resourceType string, resourceName string) SolutionsClient { return NewSolutionsClientWithBaseURI(DefaultBaseURI, subscriptionID, providerName, resourceType, resourceName) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewSolutionsClientWithBaseURI creates an instance of the SolutionsClient client. func NewSolutionsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) SolutionsClient { return SolutionsClient{NewWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdate creates or updates the Solution. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. solutionName is user @@ -77,6 +81,7 @@ func (client SolutionsClient) CreateOrUpdate(ctx context.Context, resourceGroupN return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client SolutionsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, solutionName string, parameters Solution) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -100,6 +105,7 @@ func (client SolutionsClient) CreateOrUpdatePreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SolutionsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -107,6 +113,7 @@ func (client SolutionsClient) CreateOrUpdateSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client SolutionsClient) CreateOrUpdateResponder(resp *http.Response) (result Solution, err error) { @@ -120,6 +127,7 @@ func (client SolutionsClient) CreateOrUpdateResponder(resp *http.Response) (resu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Delete deletes the solution in the subscription. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. solutionName is user @@ -154,6 +162,7 @@ func (client SolutionsClient) Delete(ctx context.Context, resourceGroupName stri return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeletePreparer prepares the Delete request. func (client SolutionsClient) DeletePreparer(ctx context.Context, resourceGroupName string, solutionName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -175,6 +184,7 @@ func (client SolutionsClient) DeletePreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SolutionsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -182,6 +192,7 @@ func (client SolutionsClient) DeleteSender(req *http.Request) (*http.Response, e azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client SolutionsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -194,6 +205,7 @@ func (client SolutionsClient) DeleteResponder(resp *http.Response) (result autor return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Get retrieves the user solution. // // resourceGroupName is the name of the resource group to get. The name is case insensitive. solutionName is user @@ -228,6 +240,7 @@ func (client SolutionsClient) Get(ctx context.Context, resourceGroupName string, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetPreparer prepares the Get request. func (client SolutionsClient) GetPreparer(ctx context.Context, resourceGroupName string, solutionName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -249,6 +262,7 @@ func (client SolutionsClient) GetPreparer(ctx context.Context, resourceGroupName return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client SolutionsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -256,6 +270,7 @@ func (client SolutionsClient) GetSender(req *http.Request) (*http.Response, erro azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client SolutionsClient) GetResponder(resp *http.Response) (result Solution, err error) { @@ -269,6 +284,7 @@ func (client SolutionsClient) GetResponder(resp *http.Response) (result Solution return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListByResourceGroup retrieves the solution list. It will retrieve both first party and third party solutions // // resourceGroupName is the name of the resource group to get. The name is case insensitive. @@ -302,6 +318,7 @@ func (client SolutionsClient) ListByResourceGroup(ctx context.Context, resourceG return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client SolutionsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -322,6 +339,7 @@ func (client SolutionsClient) ListByResourceGroupPreparer(ctx context.Context, r return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client SolutionsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -329,6 +347,7 @@ func (client SolutionsClient) ListByResourceGroupSender(req *http.Request) (*htt azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client SolutionsClient) ListByResourceGroupResponder(resp *http.Response) (result SolutionPropertiesList, err error) { @@ -342,6 +361,7 @@ func (client SolutionsClient) ListByResourceGroupResponder(resp *http.Response) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscription retrieves the solution list. It will retrieve both first party and third party solutions func (client SolutionsClient) ListBySubscription(ctx context.Context) (result SolutionPropertiesList, err error) { req, err := client.ListBySubscriptionPreparer(ctx) @@ -365,6 +385,7 @@ func (client SolutionsClient) ListBySubscription(ctx context.Context) (result So return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionPreparer prepares the ListBySubscription request. func (client SolutionsClient) ListBySubscriptionPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -384,6 +405,7 @@ func (client SolutionsClient) ListBySubscriptionPreparer(ctx context.Context) (* return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionSender sends the ListBySubscription request. The method will close the // http.Response Body if it receives an error. func (client SolutionsClient) ListBySubscriptionSender(req *http.Request) (*http.Response, error) { @@ -391,6 +413,7 @@ func (client SolutionsClient) ListBySubscriptionSender(req *http.Request) (*http azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionResponder handles the response to the ListBySubscription request. The method always // closes the http.Response Body. func (client SolutionsClient) ListBySubscriptionResponder(resp *http.Response) (result SolutionPropertiesList, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/version.go index f33e0e91aa51..714ccbcdda6a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/version.go @@ -18,12 +18,13 @@ import "github.com/Azure/azure-sdk-for-go/version" // // Code generated by Microsoft (R) AutoRest Code Generator. // Changes may cause incorrect behavior and will be lost if the code is regenerated. - +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { return "Azure-SDK-For-Go/" + version.Number + " operationsmanagement/2015-11-01-preview" } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Version returns the semantic version (see http://semver.org) of the client. func Version() string { return version.Number diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/registeredidentities.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/registeredidentities.go index fbcb373245b1..994ec88b42b8 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/registeredidentities.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/registeredidentities.go @@ -40,9 +40,10 @@ func NewRegisteredIdentitiesClientWithBaseURI(baseURI string, subscriptionID str } // Delete unregisters the given container from your Recovery Services vault. -// -// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is -// the name of the recovery services vault. identityName is name of the protection container to unregister. +// Parameters: +// resourceGroupName - the name of the resource group where the recovery services vault is present. +// vaultName - the name of the recovery services vault. +// identityName - name of the protection container to unregister. func (client RegisteredIdentitiesClient) Delete(ctx context.Context, resourceGroupName string, vaultName string, identityName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, vaultName, identityName) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/replicationusages.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/replicationusages.go index 49a1080905de..29d3d209e2f6 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/replicationusages.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/replicationusages.go @@ -40,9 +40,9 @@ func NewReplicationUsagesClientWithBaseURI(baseURI string, subscriptionID string } // List fetches the replication usages of the vault. -// -// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is -// the name of the recovery services vault. +// Parameters: +// resourceGroupName - the name of the resource group where the recovery services vault is present. +// vaultName - the name of the recovery services vault. func (client ReplicationUsagesClient) List(ctx context.Context, resourceGroupName string, vaultName string) (result ReplicationUsageList, err error) { req, err := client.ListPreparer(ctx, resourceGroupName, vaultName) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/usages.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/usages.go index ab0ffa61edbc..985bd2a76122 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/usages.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/usages.go @@ -40,9 +40,9 @@ func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesCli } // ListByVaults fetches the usages of the vault. -// -// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is -// the name of the recovery services vault. +// Parameters: +// resourceGroupName - the name of the resource group where the recovery services vault is present. +// vaultName - the name of the recovery services vault. func (client UsagesClient) ListByVaults(ctx context.Context, resourceGroupName string, vaultName string) (result VaultUsageList, err error) { req, err := client.ListByVaultsPreparer(ctx, resourceGroupName, vaultName) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultcertificates.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultcertificates.go index 7e738045842a..8639e9abaf96 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultcertificates.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultcertificates.go @@ -40,10 +40,11 @@ func NewVaultCertificatesClientWithBaseURI(baseURI string, subscriptionID string } // Create uploads a certificate for a resource. -// -// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is -// the name of the recovery services vault. certificateName is certificate friendly name. certificateRequest is -// input parameters for uploading the vault certificate. +// Parameters: +// resourceGroupName - the name of the resource group where the recovery services vault is present. +// vaultName - the name of the recovery services vault. +// certificateName - certificate friendly name. +// certificateRequest - input parameters for uploading the vault certificate. func (client VaultCertificatesClient) Create(ctx context.Context, resourceGroupName string, vaultName string, certificateName string, certificateRequest CertificateRequest) (result VaultCertificateResponse, err error) { req, err := client.CreatePreparer(ctx, resourceGroupName, vaultName, certificateName, certificateRequest) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultextendedinfo.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultextendedinfo.go index 3ae2a6dbd95e..356f0da79765 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultextendedinfo.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaultextendedinfo.go @@ -40,9 +40,10 @@ func NewVaultExtendedInfoClientWithBaseURI(baseURI string, subscriptionID string } // CreateOrUpdate create vault extended info. -// -// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is -// the name of the recovery services vault. resourceResourceExtendedInfoDetails is details of ResourceExtendedInfo +// Parameters: +// resourceGroupName - the name of the resource group where the recovery services vault is present. +// vaultName - the name of the recovery services vault. +// resourceResourceExtendedInfoDetails - details of ResourceExtendedInfo func (client VaultExtendedInfoClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, vaultName string, resourceResourceExtendedInfoDetails VaultExtendedInfoResource) (result VaultExtendedInfoResource, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, vaultName, resourceResourceExtendedInfoDetails) if err != nil { @@ -109,9 +110,9 @@ func (client VaultExtendedInfoClient) CreateOrUpdateResponder(resp *http.Respons } // Get get the vault extended info. -// -// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is -// the name of the recovery services vault. +// Parameters: +// resourceGroupName - the name of the resource group where the recovery services vault is present. +// vaultName - the name of the recovery services vault. func (client VaultExtendedInfoClient) Get(ctx context.Context, resourceGroupName string, vaultName string) (result VaultExtendedInfoResource, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, vaultName) if err != nil { @@ -176,9 +177,10 @@ func (client VaultExtendedInfoClient) GetResponder(resp *http.Response) (result } // Update update vault extended info. -// -// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is -// the name of the recovery services vault. resourceResourceExtendedInfoDetails is details of ResourceExtendedInfo +// Parameters: +// resourceGroupName - the name of the resource group where the recovery services vault is present. +// vaultName - the name of the recovery services vault. +// resourceResourceExtendedInfoDetails - details of ResourceExtendedInfo func (client VaultExtendedInfoClient) Update(ctx context.Context, resourceGroupName string, vaultName string, resourceResourceExtendedInfoDetails VaultExtendedInfoResource) (result VaultExtendedInfoResource, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, vaultName, resourceResourceExtendedInfoDetails) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaults.go b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaults.go index 472d5877692b..64cc9d7dce75 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaults.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices/vaults.go @@ -40,9 +40,10 @@ func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsCli } // CreateOrUpdate creates or updates a Recovery Services vault. -// -// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is -// the name of the recovery services vault. vault is recovery Services Vault to be created. +// Parameters: +// resourceGroupName - the name of the resource group where the recovery services vault is present. +// vaultName - the name of the recovery services vault. +// vault - recovery Services Vault to be created. func (client VaultsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, vaultName string, vault Vault) (result Vault, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, vaultName, vault) if err != nil { @@ -109,9 +110,9 @@ func (client VaultsClient) CreateOrUpdateResponder(resp *http.Response) (result } // Delete deletes a vault. -// -// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is -// the name of the recovery services vault. +// Parameters: +// resourceGroupName - the name of the resource group where the recovery services vault is present. +// vaultName - the name of the recovery services vault. func (client VaultsClient) Delete(ctx context.Context, resourceGroupName string, vaultName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, vaultName) if err != nil { @@ -175,9 +176,9 @@ func (client VaultsClient) DeleteResponder(resp *http.Response) (result autorest } // Get get the Vault details. -// -// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is -// the name of the recovery services vault. +// Parameters: +// resourceGroupName - the name of the resource group where the recovery services vault is present. +// vaultName - the name of the recovery services vault. func (client VaultsClient) Get(ctx context.Context, resourceGroupName string, vaultName string) (result Vault, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, vaultName) if err != nil { @@ -242,8 +243,8 @@ func (client VaultsClient) GetResponder(resp *http.Response) (result Vault, err } // ListByResourceGroup retrieve a list of Vaults. -// -// resourceGroupName is the name of the resource group where the recovery services vault is present. +// Parameters: +// resourceGroupName - the name of the resource group where the recovery services vault is present. func (client VaultsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result VaultListPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) @@ -425,9 +426,10 @@ func (client VaultsClient) ListBySubscriptionIDComplete(ctx context.Context) (re } // Update updates the vault. -// -// resourceGroupName is the name of the resource group where the recovery services vault is present. vaultName is -// the name of the recovery services vault. vault is recovery Services Vault to be created. +// Parameters: +// resourceGroupName - the name of the resource group where the recovery services vault is present. +// vaultName - the name of the recovery services vault. +// vault - recovery Services Vault to be created. func (client VaultsClient) Update(ctx context.Context, resourceGroupName string, vaultName string, vault PatchVault) (result Vault, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, vaultName, vault) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/firewallrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/firewallrules.go index 6d215106efe3..7dffed644438 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/firewallrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/firewallrules.go @@ -41,10 +41,11 @@ func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) Fi } // CreateOrUpdate create or update a redis cache firewall rule -// -// resourceGroupName is the name of the resource group. cacheName is the name of the Redis cache. ruleName is the -// name of the firewall rule. parameters is parameters supplied to the create or update redis firewall rule -// operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// cacheName - the name of the Redis cache. +// ruleName - the name of the firewall rule. +// parameters - parameters supplied to the create or update redis firewall rule operation. func (client FirewallRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, cacheName string, ruleName string, parameters FirewallRuleCreateParameters) (result FirewallRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -121,9 +122,10 @@ func (client FirewallRulesClient) CreateOrUpdateResponder(resp *http.Response) ( } // Delete deletes a single firewall rule in a specified redis cache. -// -// resourceGroupName is the name of the resource group. cacheName is the name of the Redis cache. ruleName is the -// name of the firewall rule. +// Parameters: +// resourceGroupName - the name of the resource group. +// cacheName - the name of the Redis cache. +// ruleName - the name of the firewall rule. func (client FirewallRulesClient) Delete(ctx context.Context, resourceGroupName string, cacheName string, ruleName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, cacheName, ruleName) if err != nil { @@ -188,9 +190,10 @@ func (client FirewallRulesClient) DeleteResponder(resp *http.Response) (result a } // Get gets a single firewall rule in a specified redis cache. -// -// resourceGroupName is the name of the resource group. cacheName is the name of the Redis cache. ruleName is the -// name of the firewall rule. +// Parameters: +// resourceGroupName - the name of the resource group. +// cacheName - the name of the Redis cache. +// ruleName - the name of the firewall rule. func (client FirewallRulesClient) Get(ctx context.Context, resourceGroupName string, cacheName string, ruleName string) (result FirewallRule, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, cacheName, ruleName) if err != nil { @@ -256,8 +259,9 @@ func (client FirewallRulesClient) GetResponder(resp *http.Response) (result Fire } // ListByRedisResource gets all firewall rules in the specified redis cache. -// -// resourceGroupName is the name of the resource group. cacheName is the name of the Redis cache. +// Parameters: +// resourceGroupName - the name of the resource group. +// cacheName - the name of the Redis cache. func (client FirewallRulesClient) ListByRedisResource(ctx context.Context, resourceGroupName string, cacheName string) (result FirewallRuleListResultPage, err error) { result.fn = client.listByRedisResourceNextResults req, err := client.ListByRedisResourcePreparer(ctx, resourceGroupName, cacheName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/linkedserver.go b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/linkedserver.go index 3f5d7fd641c7..393872ad30ad 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/linkedserver.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/linkedserver.go @@ -41,10 +41,11 @@ func NewLinkedServerClientWithBaseURI(baseURI string, subscriptionID string) Lin } // Create adds a linked server to the Redis cache (requires Premium SKU). -// -// resourceGroupName is the name of the resource group. name is the name of the Redis cache. linkedServerName is -// the name of the linked server that is being added to the Redis cache. parameters is parameters supplied to the -// Create Linked server operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the Redis cache. +// linkedServerName - the name of the linked server that is being added to the Redis cache. +// parameters - parameters supplied to the Create Linked server operation. func (client LinkedServerClient) Create(ctx context.Context, resourceGroupName string, name string, linkedServerName string, parameters LinkedServerCreateParameters) (result LinkedServerCreateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -123,9 +124,10 @@ func (client LinkedServerClient) CreateResponder(resp *http.Response) (result Li } // Delete deletes the linked server from a redis cache (requires Premium SKU). -// -// resourceGroupName is the name of the resource group. name is the name of the redis cache. linkedServerName is -// the name of the linked server that is being added to the Redis cache. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the redis cache. +// linkedServerName - the name of the linked server that is being added to the Redis cache. func (client LinkedServerClient) Delete(ctx context.Context, resourceGroupName string, name string, linkedServerName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, name, linkedServerName) if err != nil { @@ -190,9 +192,10 @@ func (client LinkedServerClient) DeleteResponder(resp *http.Response) (result au } // Get gets the detailed information about a linked server of a redis cache (requires Premium SKU). -// -// resourceGroupName is the name of the resource group. name is the name of the redis cache. linkedServerName is -// the name of the linked server. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the redis cache. +// linkedServerName - the name of the linked server. func (client LinkedServerClient) Get(ctx context.Context, resourceGroupName string, name string, linkedServerName string) (result LinkedServerWithProperties, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, name, linkedServerName) if err != nil { @@ -258,8 +261,9 @@ func (client LinkedServerClient) GetResponder(resp *http.Response) (result Linke } // List gets the list of linked servers associated with this redis cache (requires Premium SKU). -// -// resourceGroupName is the name of the resource group. name is the name of the redis cache. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the redis cache. func (client LinkedServerClient) List(ctx context.Context, resourceGroupName string, name string) (result LinkedServerWithPropertiesListPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, resourceGroupName, name) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/models.go index 2b36a2bd83da..4e10cd26d9fa 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/models.go @@ -195,11 +195,11 @@ type AccessKeys struct { SecondaryKey *string `json:"secondaryKey,omitempty"` } -// CheckNameAvailabilityParameters parameters body to pass for name availability check. +// CheckNameAvailabilityParameters parameters body to pass for resource name availability check. type CheckNameAvailabilityParameters struct { // Name - Resource name. Name *string `json:"name,omitempty"` - // Type - Resource type. + // Type - Resource type. The only legal value of this property for checking redis cache name availability is 'Microsoft.Cache/redis'. Type *string `json:"type,omitempty"` } @@ -650,7 +650,7 @@ type FirewallRuleListResult struct { autorest.Response `json:"-"` // Value - Results of the list firewall rules operation. Value *[]FirewallRule `json:"value,omitempty"` - // NextLink - Link for next set of locations. + // NextLink - Link for next page of results. NextLink *string `json:"nextLink,omitempty"` } @@ -1123,7 +1123,7 @@ type ListResult struct { autorest.Response `json:"-"` // Value - List of Redis cache instances. Value *[]ResourceType `json:"value,omitempty"` - // NextLink - Link for next set of locations. + // NextLink - Link for next page of results. NextLink *string `json:"nextLink,omitempty"` } @@ -1434,6 +1434,108 @@ func (ps *PatchSchedule) UnmarshalJSON(body []byte) error { return nil } +// PatchScheduleListResult the response of list patch schedules Redis operation. +type PatchScheduleListResult struct { + autorest.Response `json:"-"` + // Value - Results of the list patch schedules operation. + Value *[]PatchSchedule `json:"value,omitempty"` + // NextLink - Link for next page of results. + NextLink *string `json:"nextLink,omitempty"` +} + +// PatchScheduleListResultIterator provides access to a complete listing of PatchSchedule values. +type PatchScheduleListResultIterator struct { + i int + page PatchScheduleListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *PatchScheduleListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter PatchScheduleListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter PatchScheduleListResultIterator) Response() PatchScheduleListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter PatchScheduleListResultIterator) Value() PatchSchedule { + if !iter.page.NotDone() { + return PatchSchedule{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (pslr PatchScheduleListResult) IsEmpty() bool { + return pslr.Value == nil || len(*pslr.Value) == 0 +} + +// patchScheduleListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (pslr PatchScheduleListResult) patchScheduleListResultPreparer() (*http.Request, error) { + if pslr.NextLink == nil || len(to.String(pslr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(pslr.NextLink))) +} + +// PatchScheduleListResultPage contains a page of PatchSchedule values. +type PatchScheduleListResultPage struct { + fn func(PatchScheduleListResult) (PatchScheduleListResult, error) + pslr PatchScheduleListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *PatchScheduleListResultPage) Next() error { + next, err := page.fn(page.pslr) + if err != nil { + return err + } + page.pslr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page PatchScheduleListResultPage) NotDone() bool { + return !page.pslr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page PatchScheduleListResultPage) Response() PatchScheduleListResult { + return page.pslr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page PatchScheduleListResultPage) Values() []PatchSchedule { + if page.pslr.IsEmpty() { + return nil + } + return *page.pslr.Value +} + // Properties properties of the redis cache. type Properties struct { // RedisVersion - Redis version. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/patchschedules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/patchschedules.go index f24c2b011669..09abb284ff29 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/patchschedules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/patchschedules.go @@ -41,9 +41,10 @@ func NewPatchSchedulesClientWithBaseURI(baseURI string, subscriptionID string) P } // CreateOrUpdate create or replace the patching schedule for Redis cache (requires Premium SKU). -// -// resourceGroupName is the name of the resource group. name is the name of the Redis cache. parameters is -// parameters to set the patching schedule for Redis cache. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the Redis cache. +// parameters - parameters to set the patching schedule for Redis cache. func (client PatchSchedulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, name string, parameters PatchSchedule) (result PatchSchedule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -118,8 +119,9 @@ func (client PatchSchedulesClient) CreateOrUpdateResponder(resp *http.Response) } // Delete deletes the patching schedule of a redis cache (requires Premium SKU). -// -// resourceGroupName is the name of the resource group. name is the name of the redis cache. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the redis cache. func (client PatchSchedulesClient) Delete(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, name) if err != nil { @@ -184,8 +186,9 @@ func (client PatchSchedulesClient) DeleteResponder(resp *http.Response) (result } // Get gets the patching schedule of a redis cache (requires Premium SKU). -// -// resourceGroupName is the name of the resource group. name is the name of the redis cache. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the redis cache. func (client PatchSchedulesClient) Get(ctx context.Context, resourceGroupName string, name string) (result PatchSchedule, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, name) if err != nil { @@ -249,3 +252,98 @@ func (client PatchSchedulesClient) GetResponder(resp *http.Response) (result Pat result.Response = autorest.Response{Response: resp} return } + +// ListByRedisResource gets all patch schedules in the specified redis cache (there is only one). +// Parameters: +// resourceGroupName - the name of the resource group. +// cacheName - the name of the Redis cache. +func (client PatchSchedulesClient) ListByRedisResource(ctx context.Context, resourceGroupName string, cacheName string) (result PatchScheduleListResultPage, err error) { + result.fn = client.listByRedisResourceNextResults + req, err := client.ListByRedisResourcePreparer(ctx, resourceGroupName, cacheName) + if err != nil { + err = autorest.NewErrorWithError(err, "redis.PatchSchedulesClient", "ListByRedisResource", nil, "Failure preparing request") + return + } + + resp, err := client.ListByRedisResourceSender(req) + if err != nil { + result.pslr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "redis.PatchSchedulesClient", "ListByRedisResource", resp, "Failure sending request") + return + } + + result.pslr, err = client.ListByRedisResourceResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "redis.PatchSchedulesClient", "ListByRedisResource", resp, "Failure responding to request") + } + + return +} + +// ListByRedisResourcePreparer prepares the ListByRedisResource request. +func (client PatchSchedulesClient) ListByRedisResourcePreparer(ctx context.Context, resourceGroupName string, cacheName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-03-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{cacheName}/patchSchedules", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByRedisResourceSender sends the ListByRedisResource request. The method will close the +// http.Response Body if it receives an error. +func (client PatchSchedulesClient) ListByRedisResourceSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByRedisResourceResponder handles the response to the ListByRedisResource request. The method always +// closes the http.Response Body. +func (client PatchSchedulesClient) ListByRedisResourceResponder(resp *http.Response) (result PatchScheduleListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByRedisResourceNextResults retrieves the next set of results, if any. +func (client PatchSchedulesClient) listByRedisResourceNextResults(lastResults PatchScheduleListResult) (result PatchScheduleListResult, err error) { + req, err := lastResults.patchScheduleListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "redis.PatchSchedulesClient", "listByRedisResourceNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByRedisResourceSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "redis.PatchSchedulesClient", "listByRedisResourceNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByRedisResourceResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "redis.PatchSchedulesClient", "listByRedisResourceNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByRedisResourceComplete enumerates all values, automatically crossing page boundaries as required. +func (client PatchSchedulesClient) ListByRedisResourceComplete(ctx context.Context, resourceGroupName string, cacheName string) (result PatchScheduleListResultIterator, err error) { + result.page, err = client.ListByRedisResource(ctx, resourceGroupName, cacheName) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/redis.go b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/redis.go index 888a76908d29..f92814c2b178 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/redis.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/redis.go @@ -41,9 +41,17 @@ func NewClientWithBaseURI(baseURI string, subscriptionID string) Client { } // CheckNameAvailability checks that the redis cache name is valid and is not already in use. -// -// parameters is parameters supplied to the CheckNameAvailability Redis operation. +// Parameters: +// parameters - parameters supplied to the CheckNameAvailability Redis operation. The only supported resource +// type is 'Microsoft.Cache/redis' func (client Client) CheckNameAvailability(ctx context.Context, parameters CheckNameAvailabilityParameters) (result autorest.Response, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.Name", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "parameters.Type", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { + return result, validation.NewError("redis.Client", "CheckNameAvailability", err.Error()) + } + req, err := client.CheckNameAvailabilityPreparer(ctx, parameters) if err != nil { err = autorest.NewErrorWithError(err, "redis.Client", "CheckNameAvailability", nil, "Failure preparing request") @@ -106,9 +114,10 @@ func (client Client) CheckNameAvailabilityResponder(resp *http.Response) (result } // Create create or replace (overwrite/recreate, with potential downtime) an existing Redis cache. -// -// resourceGroupName is the name of the resource group. name is the name of the Redis cache. parameters is -// parameters supplied to the Create Redis operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the Redis cache. +// parameters - parameters supplied to the Create Redis operation. func (client Client) Create(ctx context.Context, resourceGroupName string, name string, parameters CreateParameters) (result CreateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -191,8 +200,9 @@ func (client Client) CreateResponder(resp *http.Response) (result ResourceType, } // Delete deletes a Redis cache. -// -// resourceGroupName is the name of the resource group. name is the name of the Redis cache. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the Redis cache. func (client Client) Delete(ctx context.Context, resourceGroupName string, name string) (result DeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, name) if err != nil { @@ -258,9 +268,10 @@ func (client Client) DeleteResponder(resp *http.Response) (result autorest.Respo } // ExportData export data from the redis cache to blobs in a container. -// -// resourceGroupName is the name of the resource group. name is the name of the Redis cache. parameters is -// parameters for Redis export operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the Redis cache. +// parameters - parameters for Redis export operation. func (client Client) ExportData(ctx context.Context, resourceGroupName string, name string, parameters ExportRDBParameters) (result ExportDataFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -336,9 +347,10 @@ func (client Client) ExportDataResponder(resp *http.Response) (result autorest.R // ForceReboot reboot specified Redis node(s). This operation requires write permission to the cache resource. There // can be potential data loss. -// -// resourceGroupName is the name of the resource group. name is the name of the Redis cache. parameters is -// specifies which Redis node(s) to reboot. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the Redis cache. +// parameters - specifies which Redis node(s) to reboot. func (client Client) ForceReboot(ctx context.Context, resourceGroupName string, name string, parameters RebootParameters) (result ForceRebootResponse, err error) { req, err := client.ForceRebootPreparer(ctx, resourceGroupName, name, parameters) if err != nil { @@ -405,8 +417,9 @@ func (client Client) ForceRebootResponder(resp *http.Response) (result ForceRebo } // Get gets a Redis cache (resource description). -// -// resourceGroupName is the name of the resource group. name is the name of the Redis cache. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the Redis cache. func (client Client) Get(ctx context.Context, resourceGroupName string, name string) (result ResourceType, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, name) if err != nil { @@ -471,9 +484,10 @@ func (client Client) GetResponder(resp *http.Response) (result ResourceType, err } // ImportData import data into Redis cache. -// -// resourceGroupName is the name of the resource group. name is the name of the Redis cache. parameters is -// parameters for Redis import operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the Redis cache. +// parameters - parameters for Redis import operation. func (client Client) ImportData(ctx context.Context, resourceGroupName string, name string, parameters ImportRDBParameters) (result ImportDataFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -637,8 +651,8 @@ func (client Client) ListComplete(ctx context.Context) (result ListResultIterato } // ListByResourceGroup lists all Redis caches in a resource group. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client Client) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) @@ -730,8 +744,9 @@ func (client Client) ListByResourceGroupComplete(ctx context.Context, resourceGr } // ListKeys retrieve a Redis cache's access keys. This operation requires write permission to the cache resource. -// -// resourceGroupName is the name of the resource group. name is the name of the Redis cache. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the Redis cache. func (client Client) ListKeys(ctx context.Context, resourceGroupName string, name string) (result AccessKeys, err error) { req, err := client.ListKeysPreparer(ctx, resourceGroupName, name) if err != nil { @@ -796,9 +811,10 @@ func (client Client) ListKeysResponder(resp *http.Response) (result AccessKeys, } // ListUpgradeNotifications gets any upgrade notifications for a Redis cache. -// -// resourceGroupName is the name of the resource group. name is the name of the Redis cache. history is how many -// minutes in past to look for upgrade notifications +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the Redis cache. +// history - how many minutes in past to look for upgrade notifications func (client Client) ListUpgradeNotifications(ctx context.Context, resourceGroupName string, name string, history float64) (result NotificationListResponse, err error) { req, err := client.ListUpgradeNotificationsPreparer(ctx, resourceGroupName, name, history) if err != nil { @@ -864,9 +880,10 @@ func (client Client) ListUpgradeNotificationsResponder(resp *http.Response) (res } // RegenerateKey regenerate Redis cache's access keys. This operation requires write permission to the cache resource. -// -// resourceGroupName is the name of the resource group. name is the name of the Redis cache. parameters is -// specifies which key to regenerate. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the Redis cache. +// parameters - specifies which key to regenerate. func (client Client) RegenerateKey(ctx context.Context, resourceGroupName string, name string, parameters RegenerateKeyParameters) (result AccessKeys, err error) { req, err := client.RegenerateKeyPreparer(ctx, resourceGroupName, name, parameters) if err != nil { @@ -933,9 +950,10 @@ func (client Client) RegenerateKeyResponder(resp *http.Response) (result AccessK } // Update update an existing Redis cache. -// -// resourceGroupName is the name of the resource group. name is the name of the Redis cache. parameters is -// parameters supplied to the Update Redis operation. +// Parameters: +// resourceGroupName - the name of the resource group. +// name - the name of the Redis cache. +// parameters - parameters supplied to the Update Redis operation. func (client Client) Update(ctx context.Context, resourceGroupName string, name string, parameters UpdateParameters) (result ResourceType, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, name, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions/subscriptions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions/subscriptions.go index 33474add3b69..ecbd691263a4 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions/subscriptions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions/subscriptions.go @@ -42,8 +42,8 @@ func NewClientWithBaseURI(baseURI string) Client { } // Get gets details about a specified subscription. -// -// subscriptionID is the ID of the target subscription. +// Parameters: +// subscriptionID - the ID of the target subscription. func (client Client) Get(ctx context.Context, subscriptionID string) (result Subscription, err error) { req, err := client.GetPreparer(ctx, subscriptionID) if err != nil { @@ -193,8 +193,8 @@ func (client Client) ListComplete(ctx context.Context) (result ListResultIterato // ListLocations this operation provides all the locations that are available for resource providers; however, each // resource provider may support a subset of this list. -// -// subscriptionID is the ID of the target subscription. +// Parameters: +// subscriptionID - the ID of the target subscription. func (client Client) ListLocations(ctx context.Context, subscriptionID string) (result LocationListResult, err error) { req, err := client.ListLocationsPreparer(ctx, subscriptionID) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/locks/managementlocks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/locks/managementlocks.go index f5253b4c72b7..f197b767b846 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/locks/managementlocks.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/locks/managementlocks.go @@ -45,10 +45,11 @@ func NewManagementLocksClientWithBaseURI(baseURI string, subscriptionID string) // lock. To create management locks, you must have access to Microsoft.Authorization/* or // Microsoft.Authorization/locks/* actions. Of the built-in roles, only Owner and User Access Administrator are granted // those actions. -// -// resourceGroupName is the name of the resource group to lock. lockName is the lock name. The lock name can be a -// maximum of 260 characters. It cannot contain <, > %, &, :, \, ?, /, or any control characters. parameters is the -// management lock parameters. +// Parameters: +// resourceGroupName - the name of the resource group to lock. +// lockName - the lock name. The lock name can be a maximum of 260 characters. It cannot contain <, > %, &, :, +// \, ?, /, or any control characters. +// parameters - the management lock parameters. func (client ManagementLocksClient) CreateOrUpdateAtResourceGroupLevel(ctx context.Context, resourceGroupName string, lockName string, parameters ManagementLockObject) (result ManagementLockObject, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -127,12 +128,15 @@ func (client ManagementLocksClient) CreateOrUpdateAtResourceGroupLevelResponder( // CreateOrUpdateAtResourceLevel when you apply a lock at a parent scope, all child resources inherit the same lock. To // create management locks, you must have access to Microsoft.Authorization/* or Microsoft.Authorization/locks/* // actions. Of the built-in roles, only Owner and User Access Administrator are granted those actions. -// -// resourceGroupName is the name of the resource group containing the resource to lock. resourceProviderNamespace -// is the resource provider namespace of the resource to lock. parentResourcePath is the parent resource identity. -// resourceType is the resource type of the resource to lock. resourceName is the name of the resource to lock. -// lockName is the name of lock. The lock name can be a maximum of 260 characters. It cannot contain <, > %, &, :, -// \, ?, /, or any control characters. parameters is parameters for creating or updating a management lock. +// Parameters: +// resourceGroupName - the name of the resource group containing the resource to lock. +// resourceProviderNamespace - the resource provider namespace of the resource to lock. +// parentResourcePath - the parent resource identity. +// resourceType - the resource type of the resource to lock. +// resourceName - the name of the resource to lock. +// lockName - the name of lock. The lock name can be a maximum of 260 characters. It cannot contain <, > %, &, +// :, \, ?, /, or any control characters. +// parameters - parameters for creating or updating a management lock. func (client ManagementLocksClient) CreateOrUpdateAtResourceLevel(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string, lockName string, parameters ManagementLockObject) (result ManagementLockObject, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -216,9 +220,10 @@ func (client ManagementLocksClient) CreateOrUpdateAtResourceLevelResponder(resp // lock. To create management locks, you must have access to Microsoft.Authorization/* or // Microsoft.Authorization/locks/* actions. Of the built-in roles, only Owner and User Access Administrator are granted // those actions. -// -// lockName is the name of lock. The lock name can be a maximum of 260 characters. It cannot contain <, > %, &, :, -// \, ?, /, or any control characters. parameters is the management lock parameters. +// Parameters: +// lockName - the name of lock. The lock name can be a maximum of 260 characters. It cannot contain <, > %, &, +// :, \, ?, /, or any control characters. +// parameters - the management lock parameters. func (client ManagementLocksClient) CreateOrUpdateAtSubscriptionLevel(ctx context.Context, lockName string, parameters ManagementLockObject) (result ManagementLockObject, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -290,12 +295,14 @@ func (client ManagementLocksClient) CreateOrUpdateAtSubscriptionLevelResponder(r } // CreateOrUpdateByScope create or update a management lock by scope. -// -// scope is the scope for the lock. When providing a scope for the assignment, use +// Parameters: +// scope - the scope for the lock. When providing a scope for the assignment, use // '/subscriptions/{subscriptionId}' for subscriptions, // '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}' for resource groups, and // '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePathIfPresent}/{resourceType}/{resourceName}' -// for resources. lockName is the name of lock. parameters is create or update management lock parameters. +// for resources. +// lockName - the name of lock. +// parameters - create or update management lock parameters. func (client ManagementLocksClient) CreateOrUpdateByScope(ctx context.Context, scope string, lockName string, parameters ManagementLockObject) (result ManagementLockObject, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -369,8 +376,9 @@ func (client ManagementLocksClient) CreateOrUpdateByScopeResponder(resp *http.Re // DeleteAtResourceGroupLevel to delete management locks, you must have access to Microsoft.Authorization/* or // Microsoft.Authorization/locks/* actions. Of the built-in roles, only Owner and User Access Administrator are granted // those actions. -// -// resourceGroupName is the name of the resource group containing the lock. lockName is the name of lock to delete. +// Parameters: +// resourceGroupName - the name of the resource group containing the lock. +// lockName - the name of lock to delete. func (client ManagementLocksClient) DeleteAtResourceGroupLevel(ctx context.Context, resourceGroupName string, lockName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -444,12 +452,13 @@ func (client ManagementLocksClient) DeleteAtResourceGroupLevelResponder(resp *ht // DeleteAtResourceLevel to delete management locks, you must have access to Microsoft.Authorization/* or // Microsoft.Authorization/locks/* actions. Of the built-in roles, only Owner and User Access Administrator are granted // those actions. -// -// resourceGroupName is the name of the resource group containing the resource with the lock to delete. -// resourceProviderNamespace is the resource provider namespace of the resource with the lock to delete. -// parentResourcePath is the parent resource identity. resourceType is the resource type of the resource with the -// lock to delete. resourceName is the name of the resource with the lock to delete. lockName is the name of the -// lock to delete. +// Parameters: +// resourceGroupName - the name of the resource group containing the resource with the lock to delete. +// resourceProviderNamespace - the resource provider namespace of the resource with the lock to delete. +// parentResourcePath - the parent resource identity. +// resourceType - the resource type of the resource with the lock to delete. +// resourceName - the name of the resource with the lock to delete. +// lockName - the name of the lock to delete. func (client ManagementLocksClient) DeleteAtResourceLevel(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string, lockName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -527,8 +536,8 @@ func (client ManagementLocksClient) DeleteAtResourceLevelResponder(resp *http.Re // DeleteAtSubscriptionLevel to delete management locks, you must have access to Microsoft.Authorization/* or // Microsoft.Authorization/locks/* actions. Of the built-in roles, only Owner and User Access Administrator are granted // those actions. -// -// lockName is the name of lock to delete. +// Parameters: +// lockName - the name of lock to delete. func (client ManagementLocksClient) DeleteAtSubscriptionLevel(ctx context.Context, lockName string) (result autorest.Response, err error) { req, err := client.DeleteAtSubscriptionLevelPreparer(ctx, lockName) if err != nil { @@ -591,8 +600,9 @@ func (client ManagementLocksClient) DeleteAtSubscriptionLevelResponder(resp *htt } // DeleteByScope delete a management lock by scope. -// -// scope is the scope for the lock. lockName is the name of lock. +// Parameters: +// scope - the scope for the lock. +// lockName - the name of lock. func (client ManagementLocksClient) DeleteByScope(ctx context.Context, scope string, lockName string) (result autorest.Response, err error) { req, err := client.DeleteByScopePreparer(ctx, scope, lockName) if err != nil { @@ -655,8 +665,9 @@ func (client ManagementLocksClient) DeleteByScopeResponder(resp *http.Response) } // GetAtResourceGroupLevel gets a management lock at the resource group level. -// -// resourceGroupName is the name of the locked resource group. lockName is the name of the lock to get. +// Parameters: +// resourceGroupName - the name of the locked resource group. +// lockName - the name of the lock to get. func (client ManagementLocksClient) GetAtResourceGroupLevel(ctx context.Context, resourceGroupName string, lockName string) (result ManagementLockObject, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -729,11 +740,13 @@ func (client ManagementLocksClient) GetAtResourceGroupLevelResponder(resp *http. } // GetAtResourceLevel get the management lock of a resource or any level below resource. -// -// resourceGroupName is the name of the resource group. resourceProviderNamespace is the namespace of the resource -// provider. parentResourcePath is an extra path parameter needed in some services, like SQL Databases. -// resourceType is the type of the resource. resourceName is the name of the resource. lockName is the name of -// lock. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceProviderNamespace - the namespace of the resource provider. +// parentResourcePath - an extra path parameter needed in some services, like SQL Databases. +// resourceType - the type of the resource. +// resourceName - the name of the resource. +// lockName - the name of lock. func (client ManagementLocksClient) GetAtResourceLevel(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string, lockName string) (result ManagementLockObject, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -810,8 +823,8 @@ func (client ManagementLocksClient) GetAtResourceLevelResponder(resp *http.Respo } // GetAtSubscriptionLevel gets a management lock at the subscription level. -// -// lockName is the name of the lock to get. +// Parameters: +// lockName - the name of the lock to get. func (client ManagementLocksClient) GetAtSubscriptionLevel(ctx context.Context, lockName string) (result ManagementLockObject, err error) { req, err := client.GetAtSubscriptionLevelPreparer(ctx, lockName) if err != nil { @@ -875,8 +888,9 @@ func (client ManagementLocksClient) GetAtSubscriptionLevelResponder(resp *http.R } // GetByScope get a management lock by scope. -// -// scope is the scope for the lock. lockName is the name of lock. +// Parameters: +// scope - the scope for the lock. +// lockName - the name of lock. func (client ManagementLocksClient) GetByScope(ctx context.Context, scope string, lockName string) (result ManagementLockObject, err error) { req, err := client.GetByScopePreparer(ctx, scope, lockName) if err != nil { @@ -940,9 +954,9 @@ func (client ManagementLocksClient) GetByScopeResponder(resp *http.Response) (re } // ListAtResourceGroupLevel gets all the management locks for a resource group. -// -// resourceGroupName is the name of the resource group containing the locks to get. filter is the filter to apply -// on the operation. +// Parameters: +// resourceGroupName - the name of the resource group containing the locks to get. +// filter - the filter to apply on the operation. func (client ManagementLocksClient) ListAtResourceGroupLevel(ctx context.Context, resourceGroupName string, filter string) (result ManagementLockListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1045,11 +1059,14 @@ func (client ManagementLocksClient) ListAtResourceGroupLevelComplete(ctx context } // ListAtResourceLevel gets all the management locks for a resource or any level below resource. -// -// resourceGroupName is the name of the resource group containing the locked resource. The name is case -// insensitive. resourceProviderNamespace is the namespace of the resource provider. parentResourcePath is the -// parent resource identity. resourceType is the resource type of the locked resource. resourceName is the name of -// the locked resource. filter is the filter to apply on the operation. +// Parameters: +// resourceGroupName - the name of the resource group containing the locked resource. The name is case +// insensitive. +// resourceProviderNamespace - the namespace of the resource provider. +// parentResourcePath - the parent resource identity. +// resourceType - the resource type of the locked resource. +// resourceName - the name of the locked resource. +// filter - the filter to apply on the operation. func (client ManagementLocksClient) ListAtResourceLevel(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string, filter string) (result ManagementLockListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1156,8 +1173,8 @@ func (client ManagementLocksClient) ListAtResourceLevelComplete(ctx context.Cont } // ListAtSubscriptionLevel gets all the management locks for a subscription. -// -// filter is the filter to apply on the operation. +// Parameters: +// filter - the filter to apply on the operation. func (client ManagementLocksClient) ListAtSubscriptionLevel(ctx context.Context, filter string) (result ManagementLockListResultPage, err error) { result.fn = client.listAtSubscriptionLevelNextResults req, err := client.ListAtSubscriptionLevelPreparer(ctx, filter) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/assignments.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/assignments.go index 379c11663deb..decb6eeee722 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/assignments.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/assignments.go @@ -43,9 +43,10 @@ func NewAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) Assi // Create policy assignments are inherited by child resources. For example, when you apply a policy to a resource group // that policy is assigned to all resources in the group. -// -// scope is the scope of the policy assignment. policyAssignmentName is the name of the policy assignment. -// parameters is parameters for the policy assignment. +// Parameters: +// scope - the scope of the policy assignment. +// policyAssignmentName - the name of the policy assignment. +// parameters - parameters for the policy assignment. func (client AssignmentsClient) Create(ctx context.Context, scope string, policyAssignmentName string, parameters Assignment) (result Assignment, err error) { req, err := client.CreatePreparer(ctx, scope, policyAssignmentName, parameters) if err != nil { @@ -116,10 +117,10 @@ func (client AssignmentsClient) CreateResponder(resp *http.Response) (result Ass // '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and // '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' // for resources. -// -// policyAssignmentID is the ID of the policy assignment to create. Use the format -// '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'. parameters is -// parameters for policy assignment. +// Parameters: +// policyAssignmentID - the ID of the policy assignment to create. Use the format +// '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'. +// parameters - parameters for policy assignment. func (client AssignmentsClient) CreateByID(ctx context.Context, policyAssignmentID string, parameters Assignment) (result Assignment, err error) { req, err := client.CreateByIDPreparer(ctx, policyAssignmentID, parameters) if err != nil { @@ -184,9 +185,9 @@ func (client AssignmentsClient) CreateByIDResponder(resp *http.Response) (result } // Delete deletes a policy assignment. -// -// scope is the scope of the policy assignment. policyAssignmentName is the name of the policy assignment to -// delete. +// Parameters: +// scope - the scope of the policy assignment. +// policyAssignmentName - the name of the policy assignment to delete. func (client AssignmentsClient) Delete(ctx context.Context, scope string, policyAssignmentName string) (result Assignment, err error) { req, err := client.DeletePreparer(ctx, scope, policyAssignmentName) if err != nil { @@ -253,8 +254,8 @@ func (client AssignmentsClient) DeleteResponder(resp *http.Response) (result Ass // '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and // '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' // for resources. -// -// policyAssignmentID is the ID of the policy assignment to delete. Use the format +// Parameters: +// policyAssignmentID - the ID of the policy assignment to delete. Use the format // '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'. func (client AssignmentsClient) DeleteByID(ctx context.Context, policyAssignmentID string) (result Assignment, err error) { req, err := client.DeleteByIDPreparer(ctx, policyAssignmentID) @@ -318,8 +319,9 @@ func (client AssignmentsClient) DeleteByIDResponder(resp *http.Response) (result } // Get gets a policy assignment. -// -// scope is the scope of the policy assignment. policyAssignmentName is the name of the policy assignment to get. +// Parameters: +// scope - the scope of the policy assignment. +// policyAssignmentName - the name of the policy assignment to get. func (client AssignmentsClient) Get(ctx context.Context, scope string, policyAssignmentName string) (result Assignment, err error) { req, err := client.GetPreparer(ctx, scope, policyAssignmentName) if err != nil { @@ -386,8 +388,8 @@ func (client AssignmentsClient) GetResponder(resp *http.Response) (result Assign // '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and // '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' // for resources. -// -// policyAssignmentID is the ID of the policy assignment to get. Use the format +// Parameters: +// policyAssignmentID - the ID of the policy assignment to get. Use the format // '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'. func (client AssignmentsClient) GetByID(ctx context.Context, policyAssignmentID string) (result Assignment, err error) { req, err := client.GetByIDPreparer(ctx, policyAssignmentID) @@ -451,8 +453,8 @@ func (client AssignmentsClient) GetByIDResponder(resp *http.Response) (result As } // List gets all the policy assignments for a subscription. -// -// filter is the filter to apply on the operation. +// Parameters: +// filter - the filter to apply on the operation. func (client AssignmentsClient) List(ctx context.Context, filter string) (result AssignmentListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, filter) @@ -546,11 +548,13 @@ func (client AssignmentsClient) ListComplete(ctx context.Context, filter string) } // ListForResource gets policy assignments for a resource. -// -// resourceGroupName is the name of the resource group containing the resource. The name is case insensitive. -// resourceProviderNamespace is the namespace of the resource provider. parentResourcePath is the parent resource -// path. resourceType is the resource type. resourceName is the name of the resource with policy assignments. -// filter is the filter to apply on the operation. +// Parameters: +// resourceGroupName - the name of the resource group containing the resource. The name is case insensitive. +// resourceProviderNamespace - the namespace of the resource provider. +// parentResourcePath - the parent resource path. +// resourceType - the resource type. +// resourceName - the name of the resource with policy assignments. +// filter - the filter to apply on the operation. func (client AssignmentsClient) ListForResource(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string, filter string) (result AssignmentListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -657,9 +661,9 @@ func (client AssignmentsClient) ListForResourceComplete(ctx context.Context, res } // ListForResourceGroup gets policy assignments for the resource group. -// -// resourceGroupName is the name of the resource group that contains policy assignments. filter is the filter to -// apply on the operation. +// Parameters: +// resourceGroupName - the name of the resource group that contains policy assignments. +// filter - the filter to apply on the operation. func (client AssignmentsClient) ListForResourceGroup(ctx context.Context, resourceGroupName string, filter string) (result AssignmentListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/definitions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/definitions.go index ee27acc17a0a..94f5f6a2a78f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/definitions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/definitions.go @@ -41,9 +41,9 @@ func NewDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) Defi } // CreateOrUpdate creates or updates a policy definition. -// -// policyDefinitionName is the name of the policy definition to create. parameters is the policy definition -// properties. +// Parameters: +// policyDefinitionName - the name of the policy definition to create. +// parameters - the policy definition properties. func (client DefinitionsClient) CreateOrUpdate(ctx context.Context, policyDefinitionName string, parameters Definition) (result Definition, err error) { req, err := client.CreateOrUpdatePreparer(ctx, policyDefinitionName, parameters) if err != nil { @@ -109,9 +109,10 @@ func (client DefinitionsClient) CreateOrUpdateResponder(resp *http.Response) (re } // CreateOrUpdateAtManagementGroup creates or updates a policy definition at management group level. -// -// policyDefinitionName is the name of the policy definition to create. parameters is the policy definition -// properties. managementGroupID is the ID of the management group. +// Parameters: +// policyDefinitionName - the name of the policy definition to create. +// parameters - the policy definition properties. +// managementGroupID - the ID of the management group. func (client DefinitionsClient) CreateOrUpdateAtManagementGroup(ctx context.Context, policyDefinitionName string, parameters Definition, managementGroupID string) (result Definition, err error) { req, err := client.CreateOrUpdateAtManagementGroupPreparer(ctx, policyDefinitionName, parameters, managementGroupID) if err != nil { @@ -177,8 +178,8 @@ func (client DefinitionsClient) CreateOrUpdateAtManagementGroupResponder(resp *h } // Delete deletes a policy definition. -// -// policyDefinitionName is the name of the policy definition to delete. +// Parameters: +// policyDefinitionName - the name of the policy definition to delete. func (client DefinitionsClient) Delete(ctx context.Context, policyDefinitionName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, policyDefinitionName) if err != nil { @@ -241,9 +242,9 @@ func (client DefinitionsClient) DeleteResponder(resp *http.Response) (result aut } // DeleteAtManagementGroup deletes a policy definition at management group level. -// -// policyDefinitionName is the name of the policy definition to delete. managementGroupID is the ID of the -// management group. +// Parameters: +// policyDefinitionName - the name of the policy definition to delete. +// managementGroupID - the ID of the management group. func (client DefinitionsClient) DeleteAtManagementGroup(ctx context.Context, policyDefinitionName string, managementGroupID string) (result autorest.Response, err error) { req, err := client.DeleteAtManagementGroupPreparer(ctx, policyDefinitionName, managementGroupID) if err != nil { @@ -306,8 +307,8 @@ func (client DefinitionsClient) DeleteAtManagementGroupResponder(resp *http.Resp } // Get gets the policy definition. -// -// policyDefinitionName is the name of the policy definition to get. +// Parameters: +// policyDefinitionName - the name of the policy definition to get. func (client DefinitionsClient) Get(ctx context.Context, policyDefinitionName string) (result Definition, err error) { req, err := client.GetPreparer(ctx, policyDefinitionName) if err != nil { @@ -371,9 +372,9 @@ func (client DefinitionsClient) GetResponder(resp *http.Response) (result Defini } // GetAtManagementGroup gets the policy definition at management group level. -// -// policyDefinitionName is the name of the policy definition to get. managementGroupID is the ID of the management -// group. +// Parameters: +// policyDefinitionName - the name of the policy definition to get. +// managementGroupID - the ID of the management group. func (client DefinitionsClient) GetAtManagementGroup(ctx context.Context, policyDefinitionName string, managementGroupID string) (result Definition, err error) { req, err := client.GetAtManagementGroupPreparer(ctx, policyDefinitionName, managementGroupID) if err != nil { @@ -437,8 +438,8 @@ func (client DefinitionsClient) GetAtManagementGroupResponder(resp *http.Respons } // GetBuiltIn gets the built in policy definition. -// -// policyDefinitionName is the name of the built in policy definition to get. +// Parameters: +// policyDefinitionName - the name of the built in policy definition to get. func (client DefinitionsClient) GetBuiltIn(ctx context.Context, policyDefinitionName string) (result Definition, err error) { req, err := client.GetBuiltInPreparer(ctx, policyDefinitionName) if err != nil { @@ -677,8 +678,8 @@ func (client DefinitionsClient) ListBuiltInComplete(ctx context.Context) (result } // ListByManagementGroup gets all the policy definitions for a subscription at management group level. -// -// managementGroupID is the ID of the management group. +// Parameters: +// managementGroupID - the ID of the management group. func (client DefinitionsClient) ListByManagementGroup(ctx context.Context, managementGroupID string) (result DefinitionListResultPage, err error) { result.fn = client.listByManagementGroupNextResults req, err := client.ListByManagementGroupPreparer(ctx, managementGroupID) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deploymentoperations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deploymentoperations.go index 6511bc72bf5c..7ca7a807d32a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deploymentoperations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deploymentoperations.go @@ -41,9 +41,10 @@ func NewDeploymentOperationsClientWithBaseURI(baseURI string, subscriptionID str } // Get gets a deployments operation. -// -// resourceGroupName is the name of the resource group. The name is case insensitive. deploymentName is the name of -// the deployment. operationID is the ID of the operation to get. +// Parameters: +// resourceGroupName - the name of the resource group. The name is case insensitive. +// deploymentName - the name of the deployment. +// operationID - the ID of the operation to get. func (client DeploymentOperationsClient) Get(ctx context.Context, resourceGroupName string, deploymentName string, operationID string) (result DeploymentOperation, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -121,9 +122,10 @@ func (client DeploymentOperationsClient) GetResponder(resp *http.Response) (resu } // List gets all deployments operations for a deployment. -// -// resourceGroupName is the name of the resource group. The name is case insensitive. deploymentName is the name of -// the deployment with the operation to get. top is the number of results to return. +// Parameters: +// resourceGroupName - the name of the resource group. The name is case insensitive. +// deploymentName - the name of the deployment with the operation to get. +// top - the number of results to return. func (client DeploymentOperationsClient) List(ctx context.Context, resourceGroupName string, deploymentName string, top *int32) (result DeploymentOperationsListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deployments.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deployments.go index 17e338c23f45..df1779aff929 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deployments.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deployments.go @@ -43,9 +43,9 @@ func NewDeploymentsClientWithBaseURI(baseURI string, subscriptionID string) Depl // Cancel you can cancel a deployment only if the provisioningState is Accepted or Running. After the deployment is // canceled, the provisioningState is set to Canceled. Canceling a template deployment stops the currently running // template deployment and leaves the resource group partially deployed. -// -// resourceGroupName is the name of the resource group. The name is case insensitive. deploymentName is the name of -// the deployment to cancel. +// Parameters: +// resourceGroupName - the name of the resource group. The name is case insensitive. +// deploymentName - the name of the deployment to cancel. func (client DeploymentsClient) Cancel(ctx context.Context, resourceGroupName string, deploymentName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -121,9 +121,10 @@ func (client DeploymentsClient) CancelResponder(resp *http.Response) (result aut } // CheckExistence checks whether the deployment exists. -// -// resourceGroupName is the name of the resource group with the deployment to check. The name is case insensitive. -// deploymentName is the name of the deployment to check. +// Parameters: +// resourceGroupName - the name of the resource group with the deployment to check. The name is case +// insensitive. +// deploymentName - the name of the deployment to check. func (client DeploymentsClient) CheckExistence(ctx context.Context, resourceGroupName string, deploymentName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -199,10 +200,11 @@ func (client DeploymentsClient) CheckExistenceResponder(resp *http.Response) (re } // CreateOrUpdate you can provide the template and parameters directly in the request or link to JSON files. -// -// resourceGroupName is the name of the resource group to deploy the resources to. The name is case insensitive. -// The resource group must already exist. deploymentName is the name of the deployment. parameters is additional -// parameters supplied to the operation. +// Parameters: +// resourceGroupName - the name of the resource group to deploy the resources to. The name is case insensitive. +// The resource group must already exist. +// deploymentName - the name of the deployment. +// parameters - additional parameters supplied to the operation. func (client DeploymentsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, deploymentName string, parameters Deployment) (result DeploymentsCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -296,9 +298,10 @@ func (client DeploymentsClient) CreateOrUpdateResponder(resp *http.Response) (re // process is running, a call to the URI in the Location header returns a status of 202. When the process finishes, the // URI in the Location header returns a status of 204 on success. If the asynchronous request failed, the URI in the // Location header returns an error-level status code. -// -// resourceGroupName is the name of the resource group with the deployment to delete. The name is case insensitive. -// deploymentName is the name of the deployment to delete. +// Parameters: +// resourceGroupName - the name of the resource group with the deployment to delete. The name is case +// insensitive. +// deploymentName - the name of the deployment to delete. func (client DeploymentsClient) Delete(ctx context.Context, resourceGroupName string, deploymentName string) (result DeploymentsDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -376,9 +379,9 @@ func (client DeploymentsClient) DeleteResponder(resp *http.Response) (result aut } // ExportTemplate exports the template used for specified deployment. -// -// resourceGroupName is the name of the resource group. The name is case insensitive. deploymentName is the name of -// the deployment from which to get the template. +// Parameters: +// resourceGroupName - the name of the resource group. The name is case insensitive. +// deploymentName - the name of the deployment from which to get the template. func (client DeploymentsClient) ExportTemplate(ctx context.Context, resourceGroupName string, deploymentName string) (result DeploymentExportResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -455,9 +458,9 @@ func (client DeploymentsClient) ExportTemplateResponder(resp *http.Response) (re } // Get gets a deployment. -// -// resourceGroupName is the name of the resource group. The name is case insensitive. deploymentName is the name of -// the deployment to get. +// Parameters: +// resourceGroupName - the name of the resource group. The name is case insensitive. +// deploymentName - the name of the deployment to get. func (client DeploymentsClient) Get(ctx context.Context, resourceGroupName string, deploymentName string) (result DeploymentExtended, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -534,10 +537,12 @@ func (client DeploymentsClient) GetResponder(resp *http.Response) (result Deploy } // ListByResourceGroup get all the deployments for a resource group. -// -// resourceGroupName is the name of the resource group with the deployments to get. The name is case insensitive. -// filter is the filter to apply on the operation. For example, you can use $filter=provisioningState eq '{state}'. -// top is the number of results to get. If null is passed, returns all deployments. +// Parameters: +// resourceGroupName - the name of the resource group with the deployments to get. The name is case +// insensitive. +// filter - the filter to apply on the operation. For example, you can use $filter=provisioningState eq +// '{state}'. +// top - the number of results to get. If null is passed, returns all deployments. func (client DeploymentsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string, filter string, top *int32) (result DeploymentListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -644,9 +649,11 @@ func (client DeploymentsClient) ListByResourceGroupComplete(ctx context.Context, // Validate validates whether the specified template is syntactically correct and will be accepted by Azure Resource // Manager.. -// -// resourceGroupName is the name of the resource group the template will be deployed to. The name is case -// insensitive. deploymentName is the name of the deployment. parameters is parameters to validate. +// Parameters: +// resourceGroupName - the name of the resource group the template will be deployed to. The name is case +// insensitive. +// deploymentName - the name of the deployment. +// parameters - parameters to validate. func (client DeploymentsClient) Validate(ctx context.Context, resourceGroupName string, deploymentName string, parameters Deployment) (result DeploymentValidateResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/groups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/groups.go index 519ba3ada919..ad361bc9d3c2 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/groups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/groups.go @@ -41,8 +41,8 @@ func NewGroupsClientWithBaseURI(baseURI string, subscriptionID string) GroupsCli } // CheckExistence checks whether a resource group exists. -// -// resourceGroupName is the name of the resource group to check. The name is case insensitive. +// Parameters: +// resourceGroupName - the name of the resource group to check. The name is case insensitive. func (client GroupsClient) CheckExistence(ctx context.Context, resourceGroupName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -113,9 +113,9 @@ func (client GroupsClient) CheckExistenceResponder(resp *http.Response) (result } // CreateOrUpdate creates or updates a resource group. -// -// resourceGroupName is the name of the resource group to create or update. parameters is parameters supplied to -// the create or update a resource group. +// Parameters: +// resourceGroupName - the name of the resource group to create or update. +// parameters - parameters supplied to the create or update a resource group. func (client GroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, parameters Group) (result Group, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -192,8 +192,8 @@ func (client GroupsClient) CreateOrUpdateResponder(resp *http.Response) (result // Delete when you delete a resource group, all of its resources are also deleted. Deleting a resource group deletes // all of its template deployments and currently stored operations. -// -// resourceGroupName is the name of the resource group to delete. The name is case insensitive. +// Parameters: +// resourceGroupName - the name of the resource group to delete. The name is case insensitive. func (client GroupsClient) Delete(ctx context.Context, resourceGroupName string) (result GroupsDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -266,9 +266,9 @@ func (client GroupsClient) DeleteResponder(resp *http.Response) (result autorest } // ExportTemplate captures the specified resource group as a template. -// -// resourceGroupName is the name of the resource group to export as a template. parameters is parameters for -// exporting the template. +// Parameters: +// resourceGroupName - the name of the resource group to export as a template. +// parameters - parameters for exporting the template. func (client GroupsClient) ExportTemplate(ctx context.Context, resourceGroupName string, parameters ExportTemplateRequest) (result GroupExportResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -342,8 +342,8 @@ func (client GroupsClient) ExportTemplateResponder(resp *http.Response) (result } // Get gets a resource group. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. func (client GroupsClient) Get(ctx context.Context, resourceGroupName string) (result Group, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -415,9 +415,9 @@ func (client GroupsClient) GetResponder(resp *http.Response) (result Group, err } // List gets all the resource groups for a subscription. -// -// filter is the filter to apply on the operation. top is the number of results to return. If null is passed, -// returns all resource groups. +// Parameters: +// filter - the filter to apply on the operation. +// top - the number of results to return. If null is passed, returns all resource groups. func (client GroupsClient) List(ctx context.Context, filter string, top *int32) (result GroupListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, filter, top) @@ -515,9 +515,9 @@ func (client GroupsClient) ListComplete(ctx context.Context, filter string, top // Update resource groups can be updated through a simple PATCH operation to a group address. The format of the request // is the same as that for creating a resource group. If a field is unspecified, the current value is retained. -// -// resourceGroupName is the name of the resource group to update. The name is case insensitive. parameters is -// parameters supplied to update a resource group. +// Parameters: +// resourceGroupName - the name of the resource group to update. The name is case insensitive. +// parameters - parameters supplied to update a resource group. func (client GroupsClient) Update(ctx context.Context, resourceGroupName string, parameters GroupPatchable) (result Group, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/providers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/providers.go index 8a744050e1db..d1b998cf59e3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/providers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/providers.go @@ -40,9 +40,10 @@ func NewProvidersClientWithBaseURI(baseURI string, subscriptionID string) Provid } // Get gets the specified resource provider. -// -// resourceProviderNamespace is the namespace of the resource provider. expand is the $expand query parameter. For -// example, to include property aliases in response, use $expand=resourceTypes/aliases. +// Parameters: +// resourceProviderNamespace - the namespace of the resource provider. +// expand - the $expand query parameter. For example, to include property aliases in response, use +// $expand=resourceTypes/aliases. func (client ProvidersClient) Get(ctx context.Context, resourceProviderNamespace string, expand string) (result Provider, err error) { req, err := client.GetPreparer(ctx, resourceProviderNamespace, expand) if err != nil { @@ -109,10 +110,11 @@ func (client ProvidersClient) GetResponder(resp *http.Response) (result Provider } // List gets all resource providers for a subscription. -// -// top is the number of results to return. If null is passed returns all deployments. expand is the properties to -// include in the results. For example, use &$expand=metadata in the query string to retrieve resource provider -// metadata. To include property aliases in response, use $expand=resourceTypes/aliases. +// Parameters: +// top - the number of results to return. If null is passed returns all deployments. +// expand - the properties to include in the results. For example, use &$expand=metadata in the query string to +// retrieve resource provider metadata. To include property aliases in response, use +// $expand=resourceTypes/aliases. func (client ProvidersClient) List(ctx context.Context, top *int32, expand string) (result ProviderListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, top, expand) @@ -209,8 +211,8 @@ func (client ProvidersClient) ListComplete(ctx context.Context, top *int32, expa } // Register registers a subscription with a resource provider. -// -// resourceProviderNamespace is the namespace of the resource provider to register. +// Parameters: +// resourceProviderNamespace - the namespace of the resource provider to register. func (client ProvidersClient) Register(ctx context.Context, resourceProviderNamespace string) (result Provider, err error) { req, err := client.RegisterPreparer(ctx, resourceProviderNamespace) if err != nil { @@ -274,8 +276,8 @@ func (client ProvidersClient) RegisterResponder(resp *http.Response) (result Pro } // Unregister unregisters a subscription from a resource provider. -// -// resourceProviderNamespace is the namespace of the resource provider to unregister. +// Parameters: +// resourceProviderNamespace - the namespace of the resource provider to unregister. func (client ProvidersClient) Unregister(ctx context.Context, resourceProviderNamespace string) (result Provider, err error) { req, err := client.UnregisterPreparer(ctx, resourceProviderNamespace) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/resources.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/resources.go index 1e6765e3f2c5..5ea79e2684d3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/resources.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/resources.go @@ -41,11 +41,13 @@ func NewClientWithBaseURI(baseURI string, subscriptionID string) Client { } // CheckExistence checks whether a resource exists. -// -// resourceGroupName is the name of the resource group containing the resource to check. The name is case -// insensitive. resourceProviderNamespace is the resource provider of the resource to check. parentResourcePath is -// the parent resource identity. resourceType is the resource type. resourceName is the name of the resource to -// check whether it exists. +// Parameters: +// resourceGroupName - the name of the resource group containing the resource to check. The name is case +// insensitive. +// resourceProviderNamespace - the resource provider of the resource to check. +// parentResourcePath - the parent resource identity. +// resourceType - the resource type. +// resourceName - the name of the resource to check whether it exists. func (client Client) CheckExistence(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -120,8 +122,8 @@ func (client Client) CheckExistenceResponder(resp *http.Response) (result autore } // CheckExistenceByID checks by ID whether a resource exists. -// -// resourceID is the fully qualified ID of the resource, including the resource name and resource type. Use the +// Parameters: +// resourceID - the fully qualified ID of the resource, including the resource name and resource type. Use the // format, // /subscriptions/{guid}/resourceGroups/{resource-group-name}/{resource-provider-namespace}/{resource-type}/{resource-name} func (client Client) CheckExistenceByID(ctx context.Context, resourceID string) (result autorest.Response, err error) { @@ -185,11 +187,13 @@ func (client Client) CheckExistenceByIDResponder(resp *http.Response) (result au } // CreateOrUpdate creates a resource. -// -// resourceGroupName is the name of the resource group for the resource. The name is case insensitive. -// resourceProviderNamespace is the namespace of the resource provider. parentResourcePath is the parent resource -// identity. resourceType is the resource type of the resource to create. resourceName is the name of the resource -// to create. parameters is parameters for creating or updating the resource. +// Parameters: +// resourceGroupName - the name of the resource group for the resource. The name is case insensitive. +// resourceProviderNamespace - the namespace of the resource provider. +// parentResourcePath - the parent resource identity. +// resourceType - the resource type of the resource to create. +// resourceName - the name of the resource to create. +// parameters - parameters for creating or updating the resource. func (client Client) CreateOrUpdate(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string, parameters GenericResource) (result CreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -272,11 +276,11 @@ func (client Client) CreateOrUpdateResponder(resp *http.Response) (result Generi } // CreateOrUpdateByID create a resource by ID. -// -// resourceID is the fully qualified ID of the resource, including the resource name and resource type. Use the +// Parameters: +// resourceID - the fully qualified ID of the resource, including the resource name and resource type. Use the // format, // /subscriptions/{guid}/resourceGroups/{resource-group-name}/{resource-provider-namespace}/{resource-type}/{resource-name} -// parameters is create or update resource parameters. +// parameters - create or update resource parameters. func (client Client) CreateOrUpdateByID(ctx context.Context, resourceID string, parameters GenericResource) (result CreateOrUpdateByIDFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -350,10 +354,13 @@ func (client Client) CreateOrUpdateByIDResponder(resp *http.Response) (result Ge } // Delete deletes a resource. -// -// resourceGroupName is the name of the resource group that contains the resource to delete. The name is case -// insensitive. resourceProviderNamespace is the namespace of the resource provider. parentResourcePath is the -// parent resource identity. resourceType is the resource type. resourceName is the name of the resource to delete. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource to delete. The name is case +// insensitive. +// resourceProviderNamespace - the namespace of the resource provider. +// parentResourcePath - the parent resource identity. +// resourceType - the resource type. +// resourceName - the name of the resource to delete. func (client Client) Delete(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string) (result DeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -430,8 +437,8 @@ func (client Client) DeleteResponder(resp *http.Response) (result autorest.Respo } // DeleteByID deletes a resource by ID. -// -// resourceID is the fully qualified ID of the resource, including the resource name and resource type. Use the +// Parameters: +// resourceID - the fully qualified ID of the resource, including the resource name and resource type. Use the // format, // /subscriptions/{guid}/resourceGroups/{resource-group-name}/{resource-provider-namespace}/{resource-type}/{resource-name} func (client Client) DeleteByID(ctx context.Context, resourceID string) (result DeleteByIDFuture, err error) { @@ -497,11 +504,13 @@ func (client Client) DeleteByIDResponder(resp *http.Response) (result autorest.R } // Get gets a resource. -// -// resourceGroupName is the name of the resource group containing the resource to get. The name is case -// insensitive. resourceProviderNamespace is the namespace of the resource provider. parentResourcePath is the -// parent resource identity. resourceType is the resource type of the resource. resourceName is the name of the -// resource to get. +// Parameters: +// resourceGroupName - the name of the resource group containing the resource to get. The name is case +// insensitive. +// resourceProviderNamespace - the namespace of the resource provider. +// parentResourcePath - the parent resource identity. +// resourceType - the resource type of the resource. +// resourceName - the name of the resource to get. func (client Client) Get(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string) (result GenericResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -577,8 +586,8 @@ func (client Client) GetResponder(resp *http.Response) (result GenericResource, } // GetByID gets a resource by ID. -// -// resourceID is the fully qualified ID of the resource, including the resource name and resource type. Use the +// Parameters: +// resourceID - the fully qualified ID of the resource, including the resource name and resource type. Use the // format, // /subscriptions/{guid}/resourceGroups/{resource-group-name}/{resource-provider-namespace}/{resource-type}/{resource-name} func (client Client) GetByID(ctx context.Context, resourceID string) (result GenericResource, err error) { @@ -643,9 +652,10 @@ func (client Client) GetByIDResponder(resp *http.Response) (result GenericResour } // List get all the resources in a subscription. -// -// filter is the filter to apply on the operation. expand is the $expand query parameter. top is the number of -// results to return. If null is passed, returns all resource groups. +// Parameters: +// filter - the filter to apply on the operation. +// expand - the $expand query parameter. +// top - the number of results to return. If null is passed, returns all resource groups. func (client Client) List(ctx context.Context, filter string, expand string, top *int32) (result ListResultPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, filter, expand, top) @@ -745,10 +755,11 @@ func (client Client) ListComplete(ctx context.Context, filter string, expand str } // ListByResourceGroup get all the resources for a resource group. -// -// resourceGroupName is the resource group with the resources to get. filter is the filter to apply on the -// operation. expand is the $expand query parameter top is the number of results to return. If null is passed, -// returns all resources. +// Parameters: +// resourceGroupName - the resource group with the resources to get. +// filter - the filter to apply on the operation. +// expand - the $expand query parameter +// top - the number of results to return. If null is passed, returns all resources. func (client Client) ListByResourceGroup(ctx context.Context, resourceGroupName string, filter string, expand string, top *int32) (result ListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -859,9 +870,9 @@ func (client Client) ListByResourceGroupComplete(ctx context.Context, resourceGr // MoveResources the resources to move must be in the same source resource group. The target resource group may be in a // different subscription. When moving resources, both the source group and the target group are locked for the // duration of the operation. Write and delete operations are blocked on the groups until the move completes. -// -// sourceResourceGroupName is the name of the resource group containing the resources to move. parameters is -// parameters for moving resources. +// Parameters: +// sourceResourceGroupName - the name of the resource group containing the resources to move. +// parameters - parameters for moving resources. func (client Client) MoveResources(ctx context.Context, sourceResourceGroupName string, parameters MoveInfo) (result MoveResourcesFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: sourceResourceGroupName, @@ -936,11 +947,13 @@ func (client Client) MoveResourcesResponder(resp *http.Response) (result autores } // Update updates a resource. -// -// resourceGroupName is the name of the resource group for the resource. The name is case insensitive. -// resourceProviderNamespace is the namespace of the resource provider. parentResourcePath is the parent resource -// identity. resourceType is the resource type of the resource to update. resourceName is the name of the resource -// to update. parameters is parameters for updating the resource. +// Parameters: +// resourceGroupName - the name of the resource group for the resource. The name is case insensitive. +// resourceProviderNamespace - the namespace of the resource provider. +// parentResourcePath - the parent resource identity. +// resourceType - the resource type of the resource to update. +// resourceName - the name of the resource to update. +// parameters - parameters for updating the resource. func (client Client) Update(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string, parameters GenericResource) (result UpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1020,11 +1033,11 @@ func (client Client) UpdateResponder(resp *http.Response) (result GenericResourc } // UpdateByID updates a resource by ID. -// -// resourceID is the fully qualified ID of the resource, including the resource name and resource type. Use the +// Parameters: +// resourceID - the fully qualified ID of the resource, including the resource name and resource type. Use the // format, // /subscriptions/{guid}/resourceGroups/{resource-group-name}/{resource-provider-namespace}/{resource-type}/{resource-name} -// parameters is update resource parameters. +// parameters - update resource parameters. func (client Client) UpdateByID(ctx context.Context, resourceID string, parameters GenericResource) (result UpdateByIDFuture, err error) { req, err := client.UpdateByIDPreparer(ctx, resourceID, parameters) if err != nil { @@ -1095,9 +1108,9 @@ func (client Client) UpdateByIDResponder(resp *http.Response) (result GenericRes // subscription. If validation succeeds, it returns HTTP response code 204 (no content). If validation fails, it // returns HTTP response code 409 (Conflict) with an error message. Retrieve the URL in the Location header value to // check the result of the long-running operation. -// -// sourceResourceGroupName is the name of the resource group containing the resources to validate for move. -// parameters is parameters for moving resources. +// Parameters: +// sourceResourceGroupName - the name of the resource group containing the resources to validate for move. +// parameters - parameters for moving resources. func (client Client) ValidateMoveResources(ctx context.Context, sourceResourceGroupName string, parameters MoveInfo) (result ValidateMoveResourcesFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: sourceResourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/tags.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/tags.go index 0a43a24a9bfa..f692f8027fcb 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/tags.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/tags.go @@ -41,8 +41,8 @@ func NewTagsClientWithBaseURI(baseURI string, subscriptionID string) TagsClient // CreateOrUpdate the tag name can have a maximum of 512 characters and is case insensitive. Tag names created by Azure // have prefixes of microsoft, azure, or windows. You cannot create tags with one of these prefixes. -// -// tagName is the name of the tag to create. +// Parameters: +// tagName - the name of the tag to create. func (client TagsClient) CreateOrUpdate(ctx context.Context, tagName string) (result TagDetails, err error) { req, err := client.CreateOrUpdatePreparer(ctx, tagName) if err != nil { @@ -106,8 +106,9 @@ func (client TagsClient) CreateOrUpdateResponder(resp *http.Response) (result Ta } // CreateOrUpdateValue creates a tag value. The name of the tag must already exist. -// -// tagName is the name of the tag. tagValue is the value of the tag to create. +// Parameters: +// tagName - the name of the tag. +// tagValue - the value of the tag to create. func (client TagsClient) CreateOrUpdateValue(ctx context.Context, tagName string, tagValue string) (result TagValue, err error) { req, err := client.CreateOrUpdateValuePreparer(ctx, tagName, tagValue) if err != nil { @@ -172,8 +173,8 @@ func (client TagsClient) CreateOrUpdateValueResponder(resp *http.Response) (resu } // Delete you must remove all values from a resource tag before you can delete it. -// -// tagName is the name of the tag. +// Parameters: +// tagName - the name of the tag. func (client TagsClient) Delete(ctx context.Context, tagName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, tagName) if err != nil { @@ -236,8 +237,9 @@ func (client TagsClient) DeleteResponder(resp *http.Response) (result autorest.R } // DeleteValue deletes a tag value. -// -// tagName is the name of the tag. tagValue is the value of the tag to delete. +// Parameters: +// tagName - the name of the tag. +// tagValue - the value of the tag to delete. func (client TagsClient) DeleteValue(ctx context.Context, tagName string, tagValue string) (result autorest.Response, err error) { req, err := client.DeleteValuePreparer(ctx, tagName, tagValue) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/jobcollections.go b/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/jobcollections.go index e3ed75145b22..70ea9c497f39 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/jobcollections.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/jobcollections.go @@ -40,9 +40,10 @@ func NewJobCollectionsClientWithBaseURI(baseURI string, subscriptionID string) J } // CreateOrUpdate provisions a new job collection or updates an existing job collection. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. jobCollection is the -// job collection definition. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. +// jobCollection - the job collection definition. func (client JobCollectionsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, jobCollectionName string, jobCollection JobCollectionDefinition) (result JobCollectionDefinition, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, jobCollectionName, jobCollection) if err != nil { @@ -109,8 +110,9 @@ func (client JobCollectionsClient) CreateOrUpdateResponder(resp *http.Response) } // Delete deletes a job collection. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. func (client JobCollectionsClient) Delete(ctx context.Context, resourceGroupName string, jobCollectionName string) (result JobCollectionsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, jobCollectionName) if err != nil { @@ -176,8 +178,9 @@ func (client JobCollectionsClient) DeleteResponder(resp *http.Response) (result } // Disable disables all of the jobs in the job collection. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. func (client JobCollectionsClient) Disable(ctx context.Context, resourceGroupName string, jobCollectionName string) (result JobCollectionsDisableFuture, err error) { req, err := client.DisablePreparer(ctx, resourceGroupName, jobCollectionName) if err != nil { @@ -243,8 +246,9 @@ func (client JobCollectionsClient) DisableResponder(resp *http.Response) (result } // Enable enables all of the jobs in the job collection. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. func (client JobCollectionsClient) Enable(ctx context.Context, resourceGroupName string, jobCollectionName string) (result JobCollectionsEnableFuture, err error) { req, err := client.EnablePreparer(ctx, resourceGroupName, jobCollectionName) if err != nil { @@ -310,8 +314,9 @@ func (client JobCollectionsClient) EnableResponder(resp *http.Response) (result } // Get gets a job collection. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. func (client JobCollectionsClient) Get(ctx context.Context, resourceGroupName string, jobCollectionName string) (result JobCollectionDefinition, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, jobCollectionName) if err != nil { @@ -376,8 +381,8 @@ func (client JobCollectionsClient) GetResponder(resp *http.Response) (result Job } // ListByResourceGroup gets all job collections under specified resource group. -// -// resourceGroupName is the resource group name. +// Parameters: +// resourceGroupName - the resource group name. func (client JobCollectionsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result JobCollectionListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) @@ -559,9 +564,10 @@ func (client JobCollectionsClient) ListBySubscriptionComplete(ctx context.Contex } // Patch patches an existing job collection. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. jobCollection is the -// job collection definition. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. +// jobCollection - the job collection definition. func (client JobCollectionsClient) Patch(ctx context.Context, resourceGroupName string, jobCollectionName string, jobCollection JobCollectionDefinition) (result JobCollectionDefinition, err error) { req, err := client.PatchPreparer(ctx, resourceGroupName, jobCollectionName, jobCollection) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/jobs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/jobs.go index 67d942e755fb..047ea31ca27c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/jobs.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/jobs.go @@ -41,9 +41,11 @@ func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient } // CreateOrUpdate provisions a new job or updates an existing job. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. jobName is the job -// name. job is the job definition. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. +// jobName - the job name. +// job - the job definition. func (client JobsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, jobCollectionName string, jobName string, job JobDefinition) (result JobDefinition, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, jobCollectionName, jobName, job) if err != nil { @@ -111,9 +113,10 @@ func (client JobsClient) CreateOrUpdateResponder(resp *http.Response) (result Jo } // Delete deletes a job. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. jobName is the job -// name. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. +// jobName - the job name. func (client JobsClient) Delete(ctx context.Context, resourceGroupName string, jobCollectionName string, jobName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, jobCollectionName, jobName) if err != nil { @@ -178,9 +181,10 @@ func (client JobsClient) DeleteResponder(resp *http.Response) (result autorest.R } // Get gets a job. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. jobName is the job -// name. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. +// jobName - the job name. func (client JobsClient) Get(ctx context.Context, resourceGroupName string, jobCollectionName string, jobName string) (result JobDefinition, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, jobCollectionName, jobName) if err != nil { @@ -246,10 +250,12 @@ func (client JobsClient) GetResponder(resp *http.Response) (result JobDefinition } // List lists all jobs under the specified job collection. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. top is the number of -// jobs to request, in the of range of [1..100]. skip is the (0-based) index of the job history list from which to -// begin requesting entries. filter is the filter to apply on the job state. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. +// top - the number of jobs to request, in the of range of [1..100]. +// skip - the (0-based) index of the job history list from which to begin requesting entries. +// filter - the filter to apply on the job state. func (client JobsClient) List(ctx context.Context, resourceGroupName string, jobCollectionName string, top *int32, skip *int32, filter string) (result JobListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: top, @@ -360,10 +366,13 @@ func (client JobsClient) ListComplete(ctx context.Context, resourceGroupName str } // ListJobHistory lists job history. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. jobName is the job -// name. top is the number of job history to request, in the of range of [1..100]. skip is the (0-based) index of -// the job history list from which to begin requesting entries. filter is the filter to apply on the job state. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. +// jobName - the job name. +// top - the number of job history to request, in the of range of [1..100]. +// skip - the (0-based) index of the job history list from which to begin requesting entries. +// filter - the filter to apply on the job state. func (client JobsClient) ListJobHistory(ctx context.Context, resourceGroupName string, jobCollectionName string, jobName string, top *int32, skip *int32, filter string) (result JobHistoryListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: top, @@ -475,9 +484,11 @@ func (client JobsClient) ListJobHistoryComplete(ctx context.Context, resourceGro } // Patch patches an existing job. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. jobName is the job -// name. job is the job definition. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. +// jobName - the job name. +// job - the job definition. func (client JobsClient) Patch(ctx context.Context, resourceGroupName string, jobCollectionName string, jobName string, job JobDefinition) (result JobDefinition, err error) { req, err := client.PatchPreparer(ctx, resourceGroupName, jobCollectionName, jobName, job) if err != nil { @@ -545,9 +556,10 @@ func (client JobsClient) PatchResponder(resp *http.Response) (result JobDefiniti } // Run runs a job. -// -// resourceGroupName is the resource group name. jobCollectionName is the job collection name. jobName is the job -// name. +// Parameters: +// resourceGroupName - the resource group name. +// jobCollectionName - the job collection name. +// jobName - the job name. func (client JobsClient) Run(ctx context.Context, resourceGroupName string, jobCollectionName string, jobName string) (result autorest.Response, err error) { req, err := client.RunPreparer(ctx, resourceGroupName, jobCollectionName, jobName) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/adminkeys.go b/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/adminkeys.go index 44a870417c91..fe8147dfd28c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/adminkeys.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/adminkeys.go @@ -41,11 +41,12 @@ func NewAdminKeysClientWithBaseURI(baseURI string, subscriptionID string) AdminK } // Get gets the primary and secondary admin API keys for the specified Azure Search service. -// -// resourceGroupName is the name of the resource group within the current subscription. You can obtain this value -// from the Azure Resource Manager API or the portal. searchServiceName is the name of the Azure Search service -// associated with the specified resource group. clientRequestID is a client-generated GUID value that identifies -// this request. If specified, this will be included in response information as a way to track the request. +// Parameters: +// resourceGroupName - the name of the resource group within the current subscription. You can obtain this +// value from the Azure Resource Manager API or the portal. +// searchServiceName - the name of the Azure Search service associated with the specified resource group. +// clientRequestID - a client-generated GUID value that identifies this request. If specified, this will be +// included in response information as a way to track the request. func (client AdminKeysClient) Get(ctx context.Context, resourceGroupName string, searchServiceName string, clientRequestID *uuid.UUID) (result AdminKeyResult, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, searchServiceName, clientRequestID) if err != nil { @@ -114,12 +115,13 @@ func (client AdminKeysClient) GetResponder(resp *http.Response) (result AdminKey } // Regenerate regenerates either the primary or secondary admin API key. You can only regenerate one key at a time. -// -// resourceGroupName is the name of the resource group within the current subscription. You can obtain this value -// from the Azure Resource Manager API or the portal. searchServiceName is the name of the Azure Search service -// associated with the specified resource group. keyKind is specifies which key to regenerate. Valid values include -// 'primary' and 'secondary'. clientRequestID is a client-generated GUID value that identifies this request. If -// specified, this will be included in response information as a way to track the request. +// Parameters: +// resourceGroupName - the name of the resource group within the current subscription. You can obtain this +// value from the Azure Resource Manager API or the portal. +// searchServiceName - the name of the Azure Search service associated with the specified resource group. +// keyKind - specifies which key to regenerate. Valid values include 'primary' and 'secondary'. +// clientRequestID - a client-generated GUID value that identifies this request. If specified, this will be +// included in response information as a way to track the request. func (client AdminKeysClient) Regenerate(ctx context.Context, resourceGroupName string, searchServiceName string, keyKind AdminKeyKind, clientRequestID *uuid.UUID) (result AdminKeyResult, err error) { req, err := client.RegeneratePreparer(ctx, resourceGroupName, searchServiceName, keyKind, clientRequestID) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/querykeys.go b/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/querykeys.go index f997840bd21a..f775a92175dc 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/querykeys.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/querykeys.go @@ -41,12 +41,13 @@ func NewQueryKeysClientWithBaseURI(baseURI string, subscriptionID string) QueryK } // Create generates a new query key for the specified Search service. You can create up to 50 query keys per service. -// -// resourceGroupName is the name of the resource group within the current subscription. You can obtain this value -// from the Azure Resource Manager API or the portal. searchServiceName is the name of the Azure Search service -// associated with the specified resource group. name is the name of the new query API key. clientRequestID is a -// client-generated GUID value that identifies this request. If specified, this will be included in response -// information as a way to track the request. +// Parameters: +// resourceGroupName - the name of the resource group within the current subscription. You can obtain this +// value from the Azure Resource Manager API or the portal. +// searchServiceName - the name of the Azure Search service associated with the specified resource group. +// name - the name of the new query API key. +// clientRequestID - a client-generated GUID value that identifies this request. If specified, this will be +// included in response information as a way to track the request. func (client QueryKeysClient) Create(ctx context.Context, resourceGroupName string, searchServiceName string, name string, clientRequestID *uuid.UUID) (result QueryKey, err error) { req, err := client.CreatePreparer(ctx, resourceGroupName, searchServiceName, name, clientRequestID) if err != nil { @@ -117,12 +118,13 @@ func (client QueryKeysClient) CreateResponder(resp *http.Response) (result Query // Delete deletes the specified query key. Unlike admin keys, query keys are not regenerated. The process for // regenerating a query key is to delete and then recreate it. -// -// resourceGroupName is the name of the resource group within the current subscription. You can obtain this value -// from the Azure Resource Manager API or the portal. searchServiceName is the name of the Azure Search service -// associated with the specified resource group. key is the query key to be deleted. Query keys are identified by -// value, not by name. clientRequestID is a client-generated GUID value that identifies this request. If specified, -// this will be included in response information as a way to track the request. +// Parameters: +// resourceGroupName - the name of the resource group within the current subscription. You can obtain this +// value from the Azure Resource Manager API or the portal. +// searchServiceName - the name of the Azure Search service associated with the specified resource group. +// key - the query key to be deleted. Query keys are identified by value, not by name. +// clientRequestID - a client-generated GUID value that identifies this request. If specified, this will be +// included in response information as a way to track the request. func (client QueryKeysClient) Delete(ctx context.Context, resourceGroupName string, searchServiceName string, key string, clientRequestID *uuid.UUID) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, searchServiceName, key, clientRequestID) if err != nil { @@ -191,11 +193,12 @@ func (client QueryKeysClient) DeleteResponder(resp *http.Response) (result autor } // ListBySearchService returns the list of query API keys for the given Azure Search service. -// -// resourceGroupName is the name of the resource group within the current subscription. You can obtain this value -// from the Azure Resource Manager API or the portal. searchServiceName is the name of the Azure Search service -// associated with the specified resource group. clientRequestID is a client-generated GUID value that identifies -// this request. If specified, this will be included in response information as a way to track the request. +// Parameters: +// resourceGroupName - the name of the resource group within the current subscription. You can obtain this +// value from the Azure Resource Manager API or the portal. +// searchServiceName - the name of the Azure Search service associated with the specified resource group. +// clientRequestID - a client-generated GUID value that identifies this request. If specified, this will be +// included in response information as a way to track the request. func (client QueryKeysClient) ListBySearchService(ctx context.Context, resourceGroupName string, searchServiceName string, clientRequestID *uuid.UUID) (result ListQueryKeysResult, err error) { req, err := client.ListBySearchServicePreparer(ctx, resourceGroupName, searchServiceName, clientRequestID) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/services.go b/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/services.go index 23b70cf2cce6..b7f1d5bd363e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/services.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/services.go @@ -43,10 +43,10 @@ func NewServicesClientWithBaseURI(baseURI string, subscriptionID string) Service // CheckNameAvailability checks whether or not the given Search service name is available for use. Search service names // must be globally unique since they are part of the service URI (https://.search.windows.net). -// -// checkNameAvailabilityInput is the resource name and type to check. clientRequestID is a client-generated GUID -// value that identifies this request. If specified, this will be included in response information as a way to -// track the request. +// Parameters: +// checkNameAvailabilityInput - the resource name and type to check. +// clientRequestID - a client-generated GUID value that identifies this request. If specified, this will be +// included in response information as a way to track the request. func (client ServicesClient) CheckNameAvailability(ctx context.Context, checkNameAvailabilityInput CheckNameAvailabilityInput, clientRequestID *uuid.UUID) (result CheckNameAvailabilityOutput, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: checkNameAvailabilityInput, @@ -123,16 +123,17 @@ func (client ServicesClient) CheckNameAvailabilityResponder(resp *http.Response) // CreateOrUpdate creates or updates a Search service in the given resource group. If the Search service already // exists, all properties will be updated with the given values. -// -// resourceGroupName is the name of the resource group within the current subscription. You can obtain this value -// from the Azure Resource Manager API or the portal. searchServiceName is the name of the Azure Search service to -// create or update. Search service names must only contain lowercase letters, digits or dashes, cannot use dash as -// the first two or last one characters, cannot contain consecutive dashes, and must be between 2 and 60 characters -// in length. Search service names must be globally unique since they are part of the service URI -// (https://.search.windows.net). You cannot change the service name after the service is created. service is -// the definition of the Search service to create or update. clientRequestID is a client-generated GUID value that -// identifies this request. If specified, this will be included in response information as a way to track the -// request. +// Parameters: +// resourceGroupName - the name of the resource group within the current subscription. You can obtain this +// value from the Azure Resource Manager API or the portal. +// searchServiceName - the name of the Azure Search service to create or update. Search service names must only +// contain lowercase letters, digits or dashes, cannot use dash as the first two or last one characters, cannot +// contain consecutive dashes, and must be between 2 and 60 characters in length. Search service names must be +// globally unique since they are part of the service URI (https://.search.windows.net). You cannot +// change the service name after the service is created. +// service - the definition of the Search service to create or update. +// clientRequestID - a client-generated GUID value that identifies this request. If specified, this will be +// included in response information as a way to track the request. func (client ServicesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, searchServiceName string, service Service, clientRequestID *uuid.UUID) (result ServicesCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: service, @@ -220,11 +221,12 @@ func (client ServicesClient) CreateOrUpdateResponder(resp *http.Response) (resul } // Delete deletes a Search service in the given resource group, along with its associated resources. -// -// resourceGroupName is the name of the resource group within the current subscription. You can obtain this value -// from the Azure Resource Manager API or the portal. searchServiceName is the name of the Azure Search service -// associated with the specified resource group. clientRequestID is a client-generated GUID value that identifies -// this request. If specified, this will be included in response information as a way to track the request. +// Parameters: +// resourceGroupName - the name of the resource group within the current subscription. You can obtain this +// value from the Azure Resource Manager API or the portal. +// searchServiceName - the name of the Azure Search service associated with the specified resource group. +// clientRequestID - a client-generated GUID value that identifies this request. If specified, this will be +// included in response information as a way to track the request. func (client ServicesClient) Delete(ctx context.Context, resourceGroupName string, searchServiceName string, clientRequestID *uuid.UUID) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, searchServiceName, clientRequestID) if err != nil { @@ -292,11 +294,12 @@ func (client ServicesClient) DeleteResponder(resp *http.Response) (result autore } // Get gets the Search service with the given name in the given resource group. -// -// resourceGroupName is the name of the resource group within the current subscription. You can obtain this value -// from the Azure Resource Manager API or the portal. searchServiceName is the name of the Azure Search service -// associated with the specified resource group. clientRequestID is a client-generated GUID value that identifies -// this request. If specified, this will be included in response information as a way to track the request. +// Parameters: +// resourceGroupName - the name of the resource group within the current subscription. You can obtain this +// value from the Azure Resource Manager API or the portal. +// searchServiceName - the name of the Azure Search service associated with the specified resource group. +// clientRequestID - a client-generated GUID value that identifies this request. If specified, this will be +// included in response information as a way to track the request. func (client ServicesClient) Get(ctx context.Context, resourceGroupName string, searchServiceName string, clientRequestID *uuid.UUID) (result Service, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, searchServiceName, clientRequestID) if err != nil { @@ -365,11 +368,11 @@ func (client ServicesClient) GetResponder(resp *http.Response) (result Service, } // ListByResourceGroup gets a list of all Search services in the given resource group. -// -// resourceGroupName is the name of the resource group within the current subscription. You can obtain this value -// from the Azure Resource Manager API or the portal. clientRequestID is a client-generated GUID value that -// identifies this request. If specified, this will be included in response information as a way to track the -// request. +// Parameters: +// resourceGroupName - the name of the resource group within the current subscription. You can obtain this +// value from the Azure Resource Manager API or the portal. +// clientRequestID - a client-generated GUID value that identifies this request. If specified, this will be +// included in response information as a way to track the request. func (client ServicesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string, clientRequestID *uuid.UUID) (result ServiceListResult, err error) { req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName, clientRequestID) if err != nil { @@ -437,12 +440,13 @@ func (client ServicesClient) ListByResourceGroupResponder(resp *http.Response) ( } // Update updates an existing Search service in the given resource group. -// -// resourceGroupName is the name of the resource group within the current subscription. You can obtain this value -// from the Azure Resource Manager API or the portal. searchServiceName is the name of the Azure Search service to -// update. service is the definition of the Search service to update. clientRequestID is a client-generated GUID -// value that identifies this request. If specified, this will be included in response information as a way to -// track the request. +// Parameters: +// resourceGroupName - the name of the resource group within the current subscription. You can obtain this +// value from the Azure Resource Manager API or the portal. +// searchServiceName - the name of the Azure Search service to update. +// service - the definition of the Search service to update. +// clientRequestID - a client-generated GUID value that identifies this request. If specified, this will be +// included in response information as a way to track the request. func (client ServicesClient) Update(ctx context.Context, resourceGroupName string, searchServiceName string, service Service, clientRequestID *uuid.UUID) (result Service, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, searchServiceName, service, clientRequestID) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/disasterrecoveryconfigs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/disasterrecoveryconfigs.go index 385acea7ea44..5c5ea8b847e3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/disasterrecoveryconfigs.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/disasterrecoveryconfigs.go @@ -42,9 +42,10 @@ func NewDisasterRecoveryConfigsClientWithBaseURI(baseURI string, subscriptionID // BreakPairing this operation disables the Disaster Recovery and stops replicating changes from primary to secondary // namespaces -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name alias is the Disaster Recovery configuration name +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// alias - the Disaster Recovery configuration name func (client DisasterRecoveryConfigsClient) BreakPairing(ctx context.Context, resourceGroupName string, namespaceName string, alias string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -122,9 +123,10 @@ func (client DisasterRecoveryConfigsClient) BreakPairingResponder(resp *http.Res } // CheckNameAvailabilityMethod check the give namespace name availability. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name parameters is parameters to check availability of the given namespace name +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// parameters - parameters to check availability of the given namespace name func (client DisasterRecoveryConfigsClient) CheckNameAvailabilityMethod(ctx context.Context, resourceGroupName string, namespaceName string, parameters CheckNameAvailability) (result CheckNameAvailabilityResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -203,10 +205,11 @@ func (client DisasterRecoveryConfigsClient) CheckNameAvailabilityMethodResponder } // CreateOrUpdate creates or updates a new Alias(Disaster Recovery configuration) -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name alias is the Disaster Recovery configuration name parameters is parameters required to create an -// Alias(Disaster Recovery configuration) +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// alias - the Disaster Recovery configuration name +// parameters - parameters required to create an Alias(Disaster Recovery configuration) func (client DisasterRecoveryConfigsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, alias string, parameters ArmDisasterRecovery) (result ArmDisasterRecovery, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -287,9 +290,10 @@ func (client DisasterRecoveryConfigsClient) CreateOrUpdateResponder(resp *http.R } // Delete deletes an Alias(Disaster Recovery configuration) -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name alias is the Disaster Recovery configuration name +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// alias - the Disaster Recovery configuration name func (client DisasterRecoveryConfigsClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string, alias string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -367,9 +371,10 @@ func (client DisasterRecoveryConfigsClient) DeleteResponder(resp *http.Response) } // FailOver envokes GEO DR failover and reconfigure the alias to point to the secondary namespace -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name alias is the Disaster Recovery configuration name +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// alias - the Disaster Recovery configuration name func (client DisasterRecoveryConfigsClient) FailOver(ctx context.Context, resourceGroupName string, namespaceName string, alias string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -447,9 +452,10 @@ func (client DisasterRecoveryConfigsClient) FailOverResponder(resp *http.Respons } // Get retrieves Alias(Disaster Recovery configuration) for primary or secondary namespace -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name alias is the Disaster Recovery configuration name +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// alias - the Disaster Recovery configuration name func (client DisasterRecoveryConfigsClient) Get(ctx context.Context, resourceGroupName string, namespaceName string, alias string) (result ArmDisasterRecovery, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -528,9 +534,11 @@ func (client DisasterRecoveryConfigsClient) GetResponder(resp *http.Response) (r } // GetAuthorizationRule gets an authorization rule for a namespace by rule name. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name alias is the Disaster Recovery configuration name authorizationRuleName is the authorizationrule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// alias - the Disaster Recovery configuration name +// authorizationRuleName - the authorizationrule name. func (client DisasterRecoveryConfigsClient) GetAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, alias string, authorizationRuleName string) (result SBAuthorizationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -613,9 +621,9 @@ func (client DisasterRecoveryConfigsClient) GetAuthorizationRuleResponder(resp * } // List gets all Alias(Disaster Recovery configurations) -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name func (client DisasterRecoveryConfigsClient) List(ctx context.Context, resourceGroupName string, namespaceName string) (result ArmDisasterRecoveryListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -718,9 +726,10 @@ func (client DisasterRecoveryConfigsClient) ListComplete(ctx context.Context, re } // ListAuthorizationRules gets the authorization rules for a namespace. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name alias is the Disaster Recovery configuration name +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// alias - the Disaster Recovery configuration name func (client DisasterRecoveryConfigsClient) ListAuthorizationRules(ctx context.Context, resourceGroupName string, namespaceName string, alias string) (result SBAuthorizationRuleListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -827,9 +836,11 @@ func (client DisasterRecoveryConfigsClient) ListAuthorizationRulesComplete(ctx c } // ListKeys gets the primary and secondary connection strings for the namespace. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name alias is the Disaster Recovery configuration name authorizationRuleName is the authorizationrule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// alias - the Disaster Recovery configuration name +// authorizationRuleName - the authorizationrule name. func (client DisasterRecoveryConfigsClient) ListKeys(ctx context.Context, resourceGroupName string, namespaceName string, alias string, authorizationRuleName string) (result AccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/eventhubs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/eventhubs.go index c1cabbfc1027..c0b9ea632162 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/eventhubs.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/eventhubs.go @@ -41,9 +41,9 @@ func NewEventHubsClientWithBaseURI(baseURI string, subscriptionID string) EventH } // ListByNamespace gets all the Event Hubs in a service bus Namespace. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name func (client EventHubsClient) ListByNamespace(ctx context.Context, resourceGroupName string, namespaceName string) (result EventHubListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/migrationconfigs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/migrationconfigs.go new file mode 100644 index 000000000000..cb865975dfda --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/migrationconfigs.go @@ -0,0 +1,546 @@ +package servicebus + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// MigrationConfigsClient is the azure Service Bus client +type MigrationConfigsClient struct { + BaseClient +} + +// NewMigrationConfigsClient creates an instance of the MigrationConfigsClient client. +func NewMigrationConfigsClient(subscriptionID string) MigrationConfigsClient { + return NewMigrationConfigsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewMigrationConfigsClientWithBaseURI creates an instance of the MigrationConfigsClient client. +func NewMigrationConfigsClientWithBaseURI(baseURI string, subscriptionID string) MigrationConfigsClient { + return MigrationConfigsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CompleteMigration this operation Completes Migration of entities by pointing the connection strings to Premium +// namespace and any enties created after the operation will be under Premium Namespace. CompleteMigration operation +// will fail when entity migration is in-progress. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +func (client MigrationConfigsClient) CompleteMigration(ctx context.Context, resourceGroupName string, namespaceName string) (result autorest.Response, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + return result, validation.NewError("servicebus.MigrationConfigsClient", "CompleteMigration", err.Error()) + } + + req, err := client.CompleteMigrationPreparer(ctx, resourceGroupName, namespaceName) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "CompleteMigration", nil, "Failure preparing request") + return + } + + resp, err := client.CompleteMigrationSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "CompleteMigration", resp, "Failure sending request") + return + } + + result, err = client.CompleteMigrationResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "CompleteMigration", resp, "Failure responding to request") + } + + return +} + +// CompleteMigrationPreparer prepares the CompleteMigration request. +func (client MigrationConfigsClient) CompleteMigrationPreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "configName": autorest.Encode("path", "$default"), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/migrationConfigurations/{configName}/upgrade", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CompleteMigrationSender sends the CompleteMigration request. The method will close the +// http.Response Body if it receives an error. +func (client MigrationConfigsClient) CompleteMigrationSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CompleteMigrationResponder handles the response to the CompleteMigration request. The method always +// closes the http.Response Body. +func (client MigrationConfigsClient) CompleteMigrationResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// CreateAndStartMigration creates Migration configuration and starts migration of enties from Standard to Premium +// namespace +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// parameters - parameters required to create Migration Configuration +func (client MigrationConfigsClient) CreateAndStartMigration(ctx context.Context, resourceGroupName string, namespaceName string, parameters MigrationConfigProperties) (result MigrationConfigsCreateAndStartMigrationFuture, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.MigrationConfigPropertiesProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.MigrationConfigPropertiesProperties.TargetNamespace", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "parameters.MigrationConfigPropertiesProperties.PostMigrationName", Name: validation.Null, Rule: true, Chain: nil}, + }}}}}); err != nil { + return result, validation.NewError("servicebus.MigrationConfigsClient", "CreateAndStartMigration", err.Error()) + } + + req, err := client.CreateAndStartMigrationPreparer(ctx, resourceGroupName, namespaceName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "CreateAndStartMigration", nil, "Failure preparing request") + return + } + + result, err = client.CreateAndStartMigrationSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "CreateAndStartMigration", result.Response(), "Failure sending request") + return + } + + return +} + +// CreateAndStartMigrationPreparer prepares the CreateAndStartMigration request. +func (client MigrationConfigsClient) CreateAndStartMigrationPreparer(ctx context.Context, resourceGroupName string, namespaceName string, parameters MigrationConfigProperties) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "configName": autorest.Encode("path", "$default"), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/migrationConfigurations/{configName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateAndStartMigrationSender sends the CreateAndStartMigration request. The method will close the +// http.Response Body if it receives an error. +func (client MigrationConfigsClient) CreateAndStartMigrationSender(req *http.Request) (future MigrationConfigsCreateAndStartMigrationFuture, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + return +} + +// CreateAndStartMigrationResponder handles the response to the CreateAndStartMigration request. The method always +// closes the http.Response Body. +func (client MigrationConfigsClient) CreateAndStartMigrationResponder(resp *http.Response) (result MigrationConfigProperties, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes a MigrationConfiguration +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +func (client MigrationConfigsClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string) (result autorest.Response, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + return result, validation.NewError("servicebus.MigrationConfigsClient", "Delete", err.Error()) + } + + req, err := client.DeletePreparer(ctx, resourceGroupName, namespaceName) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client MigrationConfigsClient) DeletePreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "configName": autorest.Encode("path", "$default"), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/migrationConfigurations/{configName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client MigrationConfigsClient) DeleteSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client MigrationConfigsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get retrieves Migration Config +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +func (client MigrationConfigsClient) Get(ctx context.Context, resourceGroupName string, namespaceName string) (result MigrationConfigProperties, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + return result, validation.NewError("servicebus.MigrationConfigsClient", "Get", err.Error()) + } + + req, err := client.GetPreparer(ctx, resourceGroupName, namespaceName) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client MigrationConfigsClient) GetPreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "configName": autorest.Encode("path", "$default"), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/migrationConfigurations/{configName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client MigrationConfigsClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client MigrationConfigsClient) GetResponder(resp *http.Response) (result MigrationConfigProperties, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// List gets all migrationConfigurations +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +func (client MigrationConfigsClient) List(ctx context.Context, resourceGroupName string, namespaceName string) (result MigrationConfigListResultPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + return result, validation.NewError("servicebus.MigrationConfigsClient", "List", err.Error()) + } + + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx, resourceGroupName, namespaceName) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.mclr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "List", resp, "Failure sending request") + return + } + + result.mclr, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client MigrationConfigsClient) ListPreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/migrationConfigurations", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client MigrationConfigsClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client MigrationConfigsClient) ListResponder(resp *http.Response) (result MigrationConfigListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client MigrationConfigsClient) listNextResults(lastResults MigrationConfigListResult) (result MigrationConfigListResult, err error) { + req, err := lastResults.migrationConfigListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client MigrationConfigsClient) ListComplete(ctx context.Context, resourceGroupName string, namespaceName string) (result MigrationConfigListResultIterator, err error) { + result.page, err = client.List(ctx, resourceGroupName, namespaceName) + return +} + +// Revert this operation reverts Migration +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +func (client MigrationConfigsClient) Revert(ctx context.Context, resourceGroupName string, namespaceName string) (result autorest.Response, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + return result, validation.NewError("servicebus.MigrationConfigsClient", "Revert", err.Error()) + } + + req, err := client.RevertPreparer(ctx, resourceGroupName, namespaceName) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "Revert", nil, "Failure preparing request") + return + } + + resp, err := client.RevertSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "Revert", resp, "Failure sending request") + return + } + + result, err = client.RevertResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsClient", "Revert", resp, "Failure responding to request") + } + + return +} + +// RevertPreparer prepares the Revert request. +func (client MigrationConfigsClient) RevertPreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "configName": autorest.Encode("path", "$default"), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/migrationConfigurations/{configName}/revert", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// RevertSender sends the Revert request. The method will close the +// http.Response Body if it receives an error. +func (client MigrationConfigsClient) RevertSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// RevertResponder handles the response to the Revert request. The method always +// closes the http.Response Body. +func (client MigrationConfigsClient) RevertResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/models.go index 9ea717acc832..11fb5f557b47 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/models.go @@ -820,6 +820,249 @@ type MessageCountDetails struct { TransferDeadLetterMessageCount *int64 `json:"transferDeadLetterMessageCount,omitempty"` } +// MigrationConfigListResult the result of the List migrationConfigurations operation. +type MigrationConfigListResult struct { + autorest.Response `json:"-"` + // Value - List of Migration Configs + Value *[]MigrationConfigProperties `json:"value,omitempty"` + // NextLink - Link to the next set of results. Not empty if Value contains incomplete list of migrationConfigurations + NextLink *string `json:"nextLink,omitempty"` +} + +// MigrationConfigListResultIterator provides access to a complete listing of MigrationConfigProperties values. +type MigrationConfigListResultIterator struct { + i int + page MigrationConfigListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *MigrationConfigListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter MigrationConfigListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter MigrationConfigListResultIterator) Response() MigrationConfigListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter MigrationConfigListResultIterator) Value() MigrationConfigProperties { + if !iter.page.NotDone() { + return MigrationConfigProperties{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (mclr MigrationConfigListResult) IsEmpty() bool { + return mclr.Value == nil || len(*mclr.Value) == 0 +} + +// migrationConfigListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (mclr MigrationConfigListResult) migrationConfigListResultPreparer() (*http.Request, error) { + if mclr.NextLink == nil || len(to.String(mclr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(mclr.NextLink))) +} + +// MigrationConfigListResultPage contains a page of MigrationConfigProperties values. +type MigrationConfigListResultPage struct { + fn func(MigrationConfigListResult) (MigrationConfigListResult, error) + mclr MigrationConfigListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *MigrationConfigListResultPage) Next() error { + next, err := page.fn(page.mclr) + if err != nil { + return err + } + page.mclr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page MigrationConfigListResultPage) NotDone() bool { + return !page.mclr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page MigrationConfigListResultPage) Response() MigrationConfigListResult { + return page.mclr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page MigrationConfigListResultPage) Values() []MigrationConfigProperties { + if page.mclr.IsEmpty() { + return nil + } + return *page.mclr.Value +} + +// MigrationConfigProperties single item in List or Get Migration Config operation +type MigrationConfigProperties struct { + autorest.Response `json:"-"` + // MigrationConfigPropertiesProperties - Properties required to the Create Migration Configuration + *MigrationConfigPropertiesProperties `json:"properties,omitempty"` + // ID - Resource Id + ID *string `json:"id,omitempty"` + // Name - Resource name + Name *string `json:"name,omitempty"` + // Type - Resource type + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrationConfigProperties. +func (mcp MigrationConfigProperties) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if mcp.MigrationConfigPropertiesProperties != nil { + objectMap["properties"] = mcp.MigrationConfigPropertiesProperties + } + if mcp.ID != nil { + objectMap["id"] = mcp.ID + } + if mcp.Name != nil { + objectMap["name"] = mcp.Name + } + if mcp.Type != nil { + objectMap["type"] = mcp.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for MigrationConfigProperties struct. +func (mcp *MigrationConfigProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var migrationConfigPropertiesProperties MigrationConfigPropertiesProperties + err = json.Unmarshal(*v, &migrationConfigPropertiesProperties) + if err != nil { + return err + } + mcp.MigrationConfigPropertiesProperties = &migrationConfigPropertiesProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + mcp.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + mcp.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + mcp.Type = &typeVar + } + } + } + + return nil +} + +// MigrationConfigPropertiesProperties properties required to the Create Migration Configuration +type MigrationConfigPropertiesProperties struct { + // ProvisioningState - Provisioning state of Migration Configuration + ProvisioningState *string `json:"provisioningState,omitempty"` + // TargetNamespace - Existing premium Namespace ARM Id name which has no entities, will be used for migration + TargetNamespace *string `json:"targetNamespace,omitempty"` + // PostMigrationName - Name to access Standard Namespace after migration + PostMigrationName *string `json:"postMigrationName,omitempty"` +} + +// MigrationConfigsCreateAndStartMigrationFuture an abstraction for monitoring and retrieving the results of a +// long-running operation. +type MigrationConfigsCreateAndStartMigrationFuture struct { + azure.Future + req *http.Request +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future MigrationConfigsCreateAndStartMigrationFuture) Result(client MigrationConfigsClient) (mcp MigrationConfigProperties, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsCreateAndStartMigrationFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + return mcp, azure.NewAsyncOpIncompleteError("servicebus.MigrationConfigsCreateAndStartMigrationFuture") + } + if future.PollingMethod() == azure.PollingLocation { + mcp, err = client.CreateAndStartMigrationResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsCreateAndStartMigrationFuture", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsCreateAndStartMigrationFuture", "Result", resp, "Failure sending request") + return + } + mcp, err = client.CreateAndStartMigrationResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsCreateAndStartMigrationFuture", "Result", resp, "Failure responding to request") + } + return +} + // NamespacesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type NamespacesCreateOrUpdateFuture struct { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/namespaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/namespaces.go index 9ccdc5e617c5..6ff40a7ffb13 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/namespaces.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/namespaces.go @@ -41,8 +41,8 @@ func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) Names } // CheckNameAvailabilityMethod check the give namespace name availability. -// -// parameters is parameters to check availability of the given namespace name +// Parameters: +// parameters - parameters to check availability of the given namespace name func (client NamespacesClient) CheckNameAvailabilityMethod(ctx context.Context, parameters CheckNameAvailability) (result CheckNameAvailabilityResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -114,9 +114,10 @@ func (client NamespacesClient) CheckNameAvailabilityMethodResponder(resp *http.R // CreateOrUpdate creates or updates a service namespace. Once created, this namespace's resource manifest is // immutable. This operation is idempotent. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name. parameters is parameters supplied to create a namespace resource. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name. +// parameters - parameters supplied to create a namespace resource. func (client NamespacesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, parameters SBNamespace) (result NamespacesCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -192,9 +193,11 @@ func (client NamespacesClient) CreateOrUpdateResponder(resp *http.Response) (res } // CreateOrUpdateAuthorizationRule creates or updates an authorization rule for a namespace. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name authorizationRuleName is the authorizationrule name. parameters is the shared access authorization rule. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// authorizationRuleName - the authorizationrule name. +// parameters - the shared access authorization rule. func (client NamespacesClient) CreateOrUpdateAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string, parameters SBAuthorizationRule) (result SBAuthorizationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -278,9 +281,9 @@ func (client NamespacesClient) CreateOrUpdateAuthorizationRuleResponder(resp *ht } // Delete deletes an existing namespace. This operation also removes all associated resources under the namespace. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name func (client NamespacesClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string) (result NamespacesDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -356,9 +359,10 @@ func (client NamespacesClient) DeleteResponder(resp *http.Response) (result auto } // DeleteAuthorizationRule deletes a namespace authorization rule. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name authorizationRuleName is the authorizationrule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// authorizationRuleName - the authorizationrule name. func (client NamespacesClient) DeleteAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -436,9 +440,9 @@ func (client NamespacesClient) DeleteAuthorizationRuleResponder(resp *http.Respo } // Get gets a description for the specified namespace. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name func (client NamespacesClient) Get(ctx context.Context, resourceGroupName string, namespaceName string) (result SBNamespace, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -513,9 +517,10 @@ func (client NamespacesClient) GetResponder(resp *http.Response) (result SBNames } // GetAuthorizationRule gets an authorization rule for a namespace by rule name. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name authorizationRuleName is the authorizationrule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// authorizationRuleName - the authorizationrule name. func (client NamespacesClient) GetAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string) (result SBAuthorizationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -684,9 +689,9 @@ func (client NamespacesClient) ListComplete(ctx context.Context) (result SBNames } // ListAuthorizationRules gets the authorization rules for a namespace. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name func (client NamespacesClient) ListAuthorizationRules(ctx context.Context, resourceGroupName string, namespaceName string) (result SBAuthorizationRuleListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -789,8 +794,8 @@ func (client NamespacesClient) ListAuthorizationRulesComplete(ctx context.Contex } // ListByResourceGroup gets the available namespaces within a resource group. -// -// resourceGroupName is name of the Resource group within the Azure subscription. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. func (client NamespacesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result SBNamespaceListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -889,9 +894,10 @@ func (client NamespacesClient) ListByResourceGroupComplete(ctx context.Context, } // ListKeys gets the primary and secondary connection strings for the namespace. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name authorizationRuleName is the authorizationrule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// authorizationRuleName - the authorizationrule name. func (client NamespacesClient) ListKeys(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string) (result AccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -970,10 +976,11 @@ func (client NamespacesClient) ListKeysResponder(resp *http.Response) (result Ac } // RegenerateKeys regenerates the primary or secondary connection strings for the namespace. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name authorizationRuleName is the authorizationrule name. parameters is parameters supplied to regenerate the -// authorization rule. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// authorizationRuleName - the authorizationrule name. +// parameters - parameters supplied to regenerate the authorization rule. func (client NamespacesClient) RegenerateKeys(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string, parameters RegenerateAccessKeyParameters) (result AccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1055,9 +1062,10 @@ func (client NamespacesClient) RegenerateKeysResponder(resp *http.Response) (res // Update updates a service namespace. Once created, this namespace's resource manifest is immutable. This operation is // idempotent. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name parameters is parameters supplied to update a namespace resource. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// parameters - parameters supplied to update a namespace resource. func (client NamespacesClient) Update(ctx context.Context, resourceGroupName string, namespaceName string, parameters SBNamespaceUpdateParameters) (result SBNamespace, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/queues.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/queues.go index 99c25e9dbd98..63588cc1144b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/queues.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/queues.go @@ -41,9 +41,11 @@ func NewQueuesClientWithBaseURI(baseURI string, subscriptionID string) QueuesCli } // CreateOrUpdate creates or updates a Service Bus queue. This operation is idempotent. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name queueName is the queue name. parameters is parameters supplied to create or update a queue resource. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// queueName - the queue name. +// parameters - parameters supplied to create or update a queue resource. func (client QueuesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, queueName string, parameters SBQueue) (result SBQueue, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -123,10 +125,12 @@ func (client QueuesClient) CreateOrUpdateResponder(resp *http.Response) (result } // CreateOrUpdateAuthorizationRule creates an authorization rule for a queue. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name queueName is the queue name. authorizationRuleName is the authorizationrule name. parameters is the shared -// access authorization rule. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// queueName - the queue name. +// authorizationRuleName - the authorizationrule name. +// parameters - the shared access authorization rule. func (client QueuesClient) CreateOrUpdateAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, queueName string, authorizationRuleName string, parameters SBAuthorizationRule) (result SBAuthorizationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -213,9 +217,10 @@ func (client QueuesClient) CreateOrUpdateAuthorizationRuleResponder(resp *http.R } // Delete deletes a queue from the specified namespace in a resource group. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name queueName is the queue name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// queueName - the queue name. func (client QueuesClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string, queueName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -292,9 +297,11 @@ func (client QueuesClient) DeleteResponder(resp *http.Response) (result autorest } // DeleteAuthorizationRule deletes a queue authorization rule. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name queueName is the queue name. authorizationRuleName is the authorizationrule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// queueName - the queue name. +// authorizationRuleName - the authorizationrule name. func (client QueuesClient) DeleteAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, queueName string, authorizationRuleName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -375,9 +382,10 @@ func (client QueuesClient) DeleteAuthorizationRuleResponder(resp *http.Response) } // Get returns a description for the specified queue. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name queueName is the queue name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// queueName - the queue name. func (client QueuesClient) Get(ctx context.Context, resourceGroupName string, namespaceName string, queueName string) (result SBQueue, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -455,9 +463,11 @@ func (client QueuesClient) GetResponder(resp *http.Response) (result SBQueue, er } // GetAuthorizationRule gets an authorization rule for a queue by rule name. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name queueName is the queue name. authorizationRuleName is the authorizationrule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// queueName - the queue name. +// authorizationRuleName - the authorizationrule name. func (client QueuesClient) GetAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, queueName string, authorizationRuleName string) (result SBAuthorizationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -539,9 +549,10 @@ func (client QueuesClient) GetAuthorizationRuleResponder(resp *http.Response) (r } // ListAuthorizationRules gets all authorization rules for a queue. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name queueName is the queue name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// queueName - the queue name. func (client QueuesClient) ListAuthorizationRules(ctx context.Context, resourceGroupName string, namespaceName string, queueName string) (result SBAuthorizationRuleListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -647,22 +658,36 @@ func (client QueuesClient) ListAuthorizationRulesComplete(ctx context.Context, r } // ListByNamespace gets the queues within a namespace. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name -func (client QueuesClient) ListByNamespace(ctx context.Context, resourceGroupName string, namespaceName string) (result SBQueueListResultPage, err error) { +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// skip - skip is only used if a previous operation returned a partial result. If a previous response contains +// a nextLink element, the value of the nextLink element will include a skip parameter that specifies a +// starting point to use for subsequent calls. +// top - may be used to limit the number of results to the most recent N usageDetails. +func (client QueuesClient) ListByNamespace(ctx context.Context, resourceGroupName string, namespaceName string, skip *int32, top *int32) (result SBQueueListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: namespaceName, Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, - {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: skip, + Constraints: []validation.Constraint{{Target: "skip", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil}, + {Target: "skip", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}, + }}}}, + {TargetValue: top, + Constraints: []validation.Constraint{{Target: "top", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil}, + {Target: "top", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}, + }}}}}); err != nil { return result, validation.NewError("servicebus.QueuesClient", "ListByNamespace", err.Error()) } result.fn = client.listByNamespaceNextResults - req, err := client.ListByNamespacePreparer(ctx, resourceGroupName, namespaceName) + req, err := client.ListByNamespacePreparer(ctx, resourceGroupName, namespaceName, skip, top) if err != nil { err = autorest.NewErrorWithError(err, "servicebus.QueuesClient", "ListByNamespace", nil, "Failure preparing request") return @@ -684,7 +709,7 @@ func (client QueuesClient) ListByNamespace(ctx context.Context, resourceGroupNam } // ListByNamespacePreparer prepares the ListByNamespace request. -func (client QueuesClient) ListByNamespacePreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { +func (client QueuesClient) ListByNamespacePreparer(ctx context.Context, resourceGroupName string, namespaceName string, skip *int32, top *int32) (*http.Request, error) { pathParameters := map[string]interface{}{ "namespaceName": autorest.Encode("path", namespaceName), "resourceGroupName": autorest.Encode("path", resourceGroupName), @@ -695,6 +720,12 @@ func (client QueuesClient) ListByNamespacePreparer(ctx context.Context, resource queryParameters := map[string]interface{}{ "api-version": APIVersion, } + if skip != nil { + queryParameters["$skip"] = autorest.Encode("query", *skip) + } + if top != nil { + queryParameters["$top"] = autorest.Encode("query", *top) + } preparer := autorest.CreatePreparer( autorest.AsGet(), @@ -746,15 +777,17 @@ func (client QueuesClient) listByNamespaceNextResults(lastResults SBQueueListRes } // ListByNamespaceComplete enumerates all values, automatically crossing page boundaries as required. -func (client QueuesClient) ListByNamespaceComplete(ctx context.Context, resourceGroupName string, namespaceName string) (result SBQueueListResultIterator, err error) { - result.page, err = client.ListByNamespace(ctx, resourceGroupName, namespaceName) +func (client QueuesClient) ListByNamespaceComplete(ctx context.Context, resourceGroupName string, namespaceName string, skip *int32, top *int32) (result SBQueueListResultIterator, err error) { + result.page, err = client.ListByNamespace(ctx, resourceGroupName, namespaceName, skip, top) return } // ListKeys primary and secondary connection strings to the queue. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name queueName is the queue name. authorizationRuleName is the authorizationrule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// queueName - the queue name. +// authorizationRuleName - the authorizationrule name. func (client QueuesClient) ListKeys(ctx context.Context, resourceGroupName string, namespaceName string, queueName string, authorizationRuleName string) (result AccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -836,10 +869,12 @@ func (client QueuesClient) ListKeysResponder(resp *http.Response) (result Access } // RegenerateKeys regenerates the primary or secondary connection strings to the queue. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name queueName is the queue name. authorizationRuleName is the authorizationrule name. parameters is parameters -// supplied to regenerate the authorization rule. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// queueName - the queue name. +// authorizationRuleName - the authorizationrule name. +// parameters - parameters supplied to regenerate the authorization rule. func (client QueuesClient) RegenerateKeys(ctx context.Context, resourceGroupName string, namespaceName string, queueName string, authorizationRuleName string, parameters RegenerateAccessKeyParameters) (result AccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/regions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/regions.go index cacff1f5f776..ac86b2c6d748 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/regions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/regions.go @@ -41,8 +41,8 @@ func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsC } // ListBySku gets the available Regions for a given sku -// -// sku is the sku type. +// Parameters: +// sku - the sku type. func (client RegionsClient) ListBySku(ctx context.Context, sku string) (result PremiumMessagingRegionsListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: sku, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/rules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/rules.go index 6a6892fb8afe..ecd6ca245c25 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/rules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/rules.go @@ -41,10 +41,13 @@ func NewRulesClientWithBaseURI(baseURI string, subscriptionID string) RulesClien } // CreateOrUpdate creates a new rule and updates an existing rule -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. subscriptionName is the subscription name. ruleName is the rule name. -// parameters is parameters supplied to create a rule. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// subscriptionName - the subscription name. +// ruleName - the rule name. +// parameters - parameters supplied to create a rule. func (client RulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, subscriptionName string, ruleName string, parameters Rule) (result Rule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -132,9 +135,12 @@ func (client RulesClient) CreateOrUpdateResponder(resp *http.Response) (result R } // Delete deletes an existing rule. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. subscriptionName is the subscription name. ruleName is the rule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// subscriptionName - the subscription name. +// ruleName - the rule name. func (client RulesClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, subscriptionName string, ruleName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -219,9 +225,12 @@ func (client RulesClient) DeleteResponder(resp *http.Response) (result autorest. } // Get retrieves the description for the specified rule. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. subscriptionName is the subscription name. ruleName is the rule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// subscriptionName - the subscription name. +// ruleName - the rule name. func (client RulesClient) Get(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, subscriptionName string, ruleName string) (result Rule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -307,10 +316,16 @@ func (client RulesClient) GetResponder(resp *http.Response) (result Rule, err er } // ListBySubscriptions list all the rules within given topic-subscription -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. subscriptionName is the subscription name. -func (client RulesClient) ListBySubscriptions(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, subscriptionName string) (result RuleListResultPage, err error) { +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// subscriptionName - the subscription name. +// skip - skip is only used if a previous operation returned a partial result. If a previous response contains +// a nextLink element, the value of the nextLink element will include a skip parameter that specifies a +// starting point to use for subsequent calls. +// top - may be used to limit the number of results to the most recent N usageDetails. +func (client RulesClient) ListBySubscriptions(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, subscriptionName string, skip *int32, top *int32) (result RuleListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, @@ -322,12 +337,22 @@ func (client RulesClient) ListBySubscriptions(ctx context.Context, resourceGroup Constraints: []validation.Constraint{{Target: "topicName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: subscriptionName, Constraints: []validation.Constraint{{Target: "subscriptionName", Name: validation.MaxLength, Rule: 50, Chain: nil}, - {Target: "subscriptionName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + {Target: "subscriptionName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: skip, + Constraints: []validation.Constraint{{Target: "skip", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil}, + {Target: "skip", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}, + }}}}, + {TargetValue: top, + Constraints: []validation.Constraint{{Target: "top", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil}, + {Target: "top", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}, + }}}}}); err != nil { return result, validation.NewError("servicebus.RulesClient", "ListBySubscriptions", err.Error()) } result.fn = client.listBySubscriptionsNextResults - req, err := client.ListBySubscriptionsPreparer(ctx, resourceGroupName, namespaceName, topicName, subscriptionName) + req, err := client.ListBySubscriptionsPreparer(ctx, resourceGroupName, namespaceName, topicName, subscriptionName, skip, top) if err != nil { err = autorest.NewErrorWithError(err, "servicebus.RulesClient", "ListBySubscriptions", nil, "Failure preparing request") return @@ -349,7 +374,7 @@ func (client RulesClient) ListBySubscriptions(ctx context.Context, resourceGroup } // ListBySubscriptionsPreparer prepares the ListBySubscriptions request. -func (client RulesClient) ListBySubscriptionsPreparer(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, subscriptionName string) (*http.Request, error) { +func (client RulesClient) ListBySubscriptionsPreparer(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, subscriptionName string, skip *int32, top *int32) (*http.Request, error) { pathParameters := map[string]interface{}{ "namespaceName": autorest.Encode("path", namespaceName), "resourceGroupName": autorest.Encode("path", resourceGroupName), @@ -362,6 +387,12 @@ func (client RulesClient) ListBySubscriptionsPreparer(ctx context.Context, resou queryParameters := map[string]interface{}{ "api-version": APIVersion, } + if skip != nil { + queryParameters["$skip"] = autorest.Encode("query", *skip) + } + if top != nil { + queryParameters["$top"] = autorest.Encode("query", *top) + } preparer := autorest.CreatePreparer( autorest.AsGet(), @@ -413,7 +444,7 @@ func (client RulesClient) listBySubscriptionsNextResults(lastResults RuleListRes } // ListBySubscriptionsComplete enumerates all values, automatically crossing page boundaries as required. -func (client RulesClient) ListBySubscriptionsComplete(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, subscriptionName string) (result RuleListResultIterator, err error) { - result.page, err = client.ListBySubscriptions(ctx, resourceGroupName, namespaceName, topicName, subscriptionName) +func (client RulesClient) ListBySubscriptionsComplete(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, subscriptionName string, skip *int32, top *int32) (result RuleListResultIterator, err error) { + result.page, err = client.ListBySubscriptions(ctx, resourceGroupName, namespaceName, topicName, subscriptionName, skip, top) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/subscriptions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/subscriptions.go index 7e6fd5a4ae08..c0b63ff12988 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/subscriptions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/subscriptions.go @@ -41,10 +41,12 @@ func NewSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) Su } // CreateOrUpdate creates a topic subscription. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. subscriptionName is the subscription name. parameters is parameters supplied -// to create a subscription resource. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// subscriptionName - the subscription name. +// parameters - parameters supplied to create a subscription resource. func (client SubscriptionsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, subscriptionName string, parameters SBSubscription) (result SBSubscription, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -128,9 +130,11 @@ func (client SubscriptionsClient) CreateOrUpdateResponder(resp *http.Response) ( } // Delete deletes a subscription from the specified topic. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. subscriptionName is the subscription name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// subscriptionName - the subscription name. func (client SubscriptionsClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, subscriptionName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -211,9 +215,11 @@ func (client SubscriptionsClient) DeleteResponder(resp *http.Response) (result a } // Get returns a subscription description for the specified topic. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. subscriptionName is the subscription name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// subscriptionName - the subscription name. func (client SubscriptionsClient) Get(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, subscriptionName string) (result SBSubscription, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -295,10 +301,15 @@ func (client SubscriptionsClient) GetResponder(resp *http.Response) (result SBSu } // ListByTopic list all the subscriptions under a specified topic. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. -func (client SubscriptionsClient) ListByTopic(ctx context.Context, resourceGroupName string, namespaceName string, topicName string) (result SBSubscriptionListResultPage, err error) { +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// skip - skip is only used if a previous operation returned a partial result. If a previous response contains +// a nextLink element, the value of the nextLink element will include a skip parameter that specifies a +// starting point to use for subsequent calls. +// top - may be used to limit the number of results to the most recent N usageDetails. +func (client SubscriptionsClient) ListByTopic(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, skip *int32, top *int32) (result SBSubscriptionListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, @@ -307,12 +318,22 @@ func (client SubscriptionsClient) ListByTopic(ctx context.Context, resourceGroup Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: topicName, - Constraints: []validation.Constraint{{Target: "topicName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + Constraints: []validation.Constraint{{Target: "topicName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: skip, + Constraints: []validation.Constraint{{Target: "skip", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil}, + {Target: "skip", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}, + }}}}, + {TargetValue: top, + Constraints: []validation.Constraint{{Target: "top", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil}, + {Target: "top", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}, + }}}}}); err != nil { return result, validation.NewError("servicebus.SubscriptionsClient", "ListByTopic", err.Error()) } result.fn = client.listByTopicNextResults - req, err := client.ListByTopicPreparer(ctx, resourceGroupName, namespaceName, topicName) + req, err := client.ListByTopicPreparer(ctx, resourceGroupName, namespaceName, topicName, skip, top) if err != nil { err = autorest.NewErrorWithError(err, "servicebus.SubscriptionsClient", "ListByTopic", nil, "Failure preparing request") return @@ -334,7 +355,7 @@ func (client SubscriptionsClient) ListByTopic(ctx context.Context, resourceGroup } // ListByTopicPreparer prepares the ListByTopic request. -func (client SubscriptionsClient) ListByTopicPreparer(ctx context.Context, resourceGroupName string, namespaceName string, topicName string) (*http.Request, error) { +func (client SubscriptionsClient) ListByTopicPreparer(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, skip *int32, top *int32) (*http.Request, error) { pathParameters := map[string]interface{}{ "namespaceName": autorest.Encode("path", namespaceName), "resourceGroupName": autorest.Encode("path", resourceGroupName), @@ -346,6 +367,12 @@ func (client SubscriptionsClient) ListByTopicPreparer(ctx context.Context, resou queryParameters := map[string]interface{}{ "api-version": APIVersion, } + if skip != nil { + queryParameters["$skip"] = autorest.Encode("query", *skip) + } + if top != nil { + queryParameters["$top"] = autorest.Encode("query", *top) + } preparer := autorest.CreatePreparer( autorest.AsGet(), @@ -397,7 +424,7 @@ func (client SubscriptionsClient) listByTopicNextResults(lastResults SBSubscript } // ListByTopicComplete enumerates all values, automatically crossing page boundaries as required. -func (client SubscriptionsClient) ListByTopicComplete(ctx context.Context, resourceGroupName string, namespaceName string, topicName string) (result SBSubscriptionListResultIterator, err error) { - result.page, err = client.ListByTopic(ctx, resourceGroupName, namespaceName, topicName) +func (client SubscriptionsClient) ListByTopicComplete(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, skip *int32, top *int32) (result SBSubscriptionListResultIterator, err error) { + result.page, err = client.ListByTopic(ctx, resourceGroupName, namespaceName, topicName, skip, top) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/topics.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/topics.go index 32fa0fd7d6d9..85b93c8219f1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/topics.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/topics.go @@ -41,9 +41,11 @@ func NewTopicsClientWithBaseURI(baseURI string, subscriptionID string) TopicsCli } // CreateOrUpdate creates a topic in the specified namespace. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. parameters is parameters supplied to create a topic resource. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// parameters - parameters supplied to create a topic resource. func (client TopicsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, parameters SBTopic) (result SBTopic, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -123,10 +125,12 @@ func (client TopicsClient) CreateOrUpdateResponder(resp *http.Response) (result } // CreateOrUpdateAuthorizationRule creates an authorizatio rule for the specified topic. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. authorizationRuleName is the authorizationrule name. parameters is the shared -// access authorization rule. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// authorizationRuleName - the authorizationrule name. +// parameters - the shared access authorization rule. func (client TopicsClient) CreateOrUpdateAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, authorizationRuleName string, parameters SBAuthorizationRule) (result SBAuthorizationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -213,9 +217,10 @@ func (client TopicsClient) CreateOrUpdateAuthorizationRuleResponder(resp *http.R } // Delete deletes a topic from the specified namespace and resource group. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. func (client TopicsClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string, topicName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -292,9 +297,11 @@ func (client TopicsClient) DeleteResponder(resp *http.Response) (result autorest } // DeleteAuthorizationRule deletes a topic authorization rule. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. authorizationRuleName is the authorizationrule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// authorizationRuleName - the authorizationrule name. func (client TopicsClient) DeleteAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, authorizationRuleName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -375,9 +382,10 @@ func (client TopicsClient) DeleteAuthorizationRuleResponder(resp *http.Response) } // Get returns a description for the specified topic. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. func (client TopicsClient) Get(ctx context.Context, resourceGroupName string, namespaceName string, topicName string) (result SBTopic, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -455,9 +463,11 @@ func (client TopicsClient) GetResponder(resp *http.Response) (result SBTopic, er } // GetAuthorizationRule returns the specified authorization rule. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. authorizationRuleName is the authorizationrule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// authorizationRuleName - the authorizationrule name. func (client TopicsClient) GetAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, authorizationRuleName string) (result SBAuthorizationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -539,9 +549,10 @@ func (client TopicsClient) GetAuthorizationRuleResponder(resp *http.Response) (r } // ListAuthorizationRules gets authorization rules for a topic. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. func (client TopicsClient) ListAuthorizationRules(ctx context.Context, resourceGroupName string, namespaceName string, topicName string) (result SBAuthorizationRuleListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -647,22 +658,36 @@ func (client TopicsClient) ListAuthorizationRulesComplete(ctx context.Context, r } // ListByNamespace gets all the topics in a namespace. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name -func (client TopicsClient) ListByNamespace(ctx context.Context, resourceGroupName string, namespaceName string) (result SBTopicListResultPage, err error) { +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// skip - skip is only used if a previous operation returned a partial result. If a previous response contains +// a nextLink element, the value of the nextLink element will include a skip parameter that specifies a +// starting point to use for subsequent calls. +// top - may be used to limit the number of results to the most recent N usageDetails. +func (client TopicsClient) ListByNamespace(ctx context.Context, resourceGroupName string, namespaceName string, skip *int32, top *int32) (result SBTopicListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: namespaceName, Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, - {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: skip, + Constraints: []validation.Constraint{{Target: "skip", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil}, + {Target: "skip", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}, + }}}}, + {TargetValue: top, + Constraints: []validation.Constraint{{Target: "top", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil}, + {Target: "top", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}, + }}}}}); err != nil { return result, validation.NewError("servicebus.TopicsClient", "ListByNamespace", err.Error()) } result.fn = client.listByNamespaceNextResults - req, err := client.ListByNamespacePreparer(ctx, resourceGroupName, namespaceName) + req, err := client.ListByNamespacePreparer(ctx, resourceGroupName, namespaceName, skip, top) if err != nil { err = autorest.NewErrorWithError(err, "servicebus.TopicsClient", "ListByNamespace", nil, "Failure preparing request") return @@ -684,7 +709,7 @@ func (client TopicsClient) ListByNamespace(ctx context.Context, resourceGroupNam } // ListByNamespacePreparer prepares the ListByNamespace request. -func (client TopicsClient) ListByNamespacePreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { +func (client TopicsClient) ListByNamespacePreparer(ctx context.Context, resourceGroupName string, namespaceName string, skip *int32, top *int32) (*http.Request, error) { pathParameters := map[string]interface{}{ "namespaceName": autorest.Encode("path", namespaceName), "resourceGroupName": autorest.Encode("path", resourceGroupName), @@ -695,6 +720,12 @@ func (client TopicsClient) ListByNamespacePreparer(ctx context.Context, resource queryParameters := map[string]interface{}{ "api-version": APIVersion, } + if skip != nil { + queryParameters["$skip"] = autorest.Encode("query", *skip) + } + if top != nil { + queryParameters["$top"] = autorest.Encode("query", *top) + } preparer := autorest.CreatePreparer( autorest.AsGet(), @@ -746,15 +777,17 @@ func (client TopicsClient) listByNamespaceNextResults(lastResults SBTopicListRes } // ListByNamespaceComplete enumerates all values, automatically crossing page boundaries as required. -func (client TopicsClient) ListByNamespaceComplete(ctx context.Context, resourceGroupName string, namespaceName string) (result SBTopicListResultIterator, err error) { - result.page, err = client.ListByNamespace(ctx, resourceGroupName, namespaceName) +func (client TopicsClient) ListByNamespaceComplete(ctx context.Context, resourceGroupName string, namespaceName string, skip *int32, top *int32) (result SBTopicListResultIterator, err error) { + result.page, err = client.ListByNamespace(ctx, resourceGroupName, namespaceName, skip, top) return } // ListKeys gets the primary and secondary connection strings for the topic. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. authorizationRuleName is the authorizationrule name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// authorizationRuleName - the authorizationrule name. func (client TopicsClient) ListKeys(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, authorizationRuleName string) (result AccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -836,10 +869,12 @@ func (client TopicsClient) ListKeysResponder(resp *http.Response) (result Access } // RegenerateKeys regenerates primary or secondary connection strings for the topic. -// -// resourceGroupName is name of the Resource group within the Azure subscription. namespaceName is the namespace -// name topicName is the topic name. authorizationRuleName is the authorizationrule name. parameters is parameters -// supplied to regenerate the authorization rule. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// topicName - the topic name. +// authorizationRuleName - the authorizationrule name. +// parameters - parameters supplied to regenerate the authorization rule. func (client TopicsClient) RegenerateKeys(ctx context.Context, resourceGroupName string, namespaceName string, topicName string, authorizationRuleName string, parameters RegenerateAccessKeyParameters) (result AccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go index 0d976685371b..31557e2a2a52 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go @@ -25,6 +25,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionPoliciesClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -32,17 +33,20 @@ type BackupLongTermRetentionPoliciesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewBackupLongTermRetentionPoliciesClient creates an instance of the BackupLongTermRetentionPoliciesClient client. func NewBackupLongTermRetentionPoliciesClient(subscriptionID string) BackupLongTermRetentionPoliciesClient { return NewBackupLongTermRetentionPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewBackupLongTermRetentionPoliciesClientWithBaseURI creates an instance of the BackupLongTermRetentionPoliciesClient // client. func NewBackupLongTermRetentionPoliciesClientWithBaseURI(baseURI string, subscriptionID string) BackupLongTermRetentionPoliciesClient { return BackupLongTermRetentionPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a database backup long term retention policy // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -71,6 +75,7 @@ func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdate(ctx context.C return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters BackupLongTermRetentionPolicy) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -96,6 +101,7 @@ func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdatePreparer(ctx c return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdateSender(req *http.Request) (future BackupLongTermRetentionPoliciesCreateOrUpdateFuture, err error) { @@ -111,6 +117,7 @@ func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdateSender(req *ht return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result BackupLongTermRetentionPolicy, err error) { @@ -124,6 +131,7 @@ func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdateResponder(resp return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get returns a database backup long term retention policy // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -151,6 +159,7 @@ func (client BackupLongTermRetentionPoliciesClient) Get(ctx context.Context, res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client BackupLongTermRetentionPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -174,6 +183,7 @@ func (client BackupLongTermRetentionPoliciesClient) GetPreparer(ctx context.Cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -181,6 +191,7 @@ func (client BackupLongTermRetentionPoliciesClient) GetSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client BackupLongTermRetentionPoliciesClient) GetResponder(resp *http.Response) (result BackupLongTermRetentionPolicy, err error) { @@ -194,6 +205,7 @@ func (client BackupLongTermRetentionPoliciesClient) GetResponder(resp *http.Resp return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase returns a database backup long term retention policy // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -221,6 +233,7 @@ func (client BackupLongTermRetentionPoliciesClient) ListByDatabase(ctx context.C return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client BackupLongTermRetentionPoliciesClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -243,6 +256,7 @@ func (client BackupLongTermRetentionPoliciesClient) ListByDatabasePreparer(ctx c return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionPoliciesClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -250,6 +264,7 @@ func (client BackupLongTermRetentionPoliciesClient) ListByDatabaseSender(req *ht azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client BackupLongTermRetentionPoliciesClient) ListByDatabaseResponder(resp *http.Response) (result BackupLongTermRetentionPolicyListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go index 1a67bbc0210c..0f79b0981d15 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go @@ -25,6 +25,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionVaultsClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -32,17 +33,20 @@ type BackupLongTermRetentionVaultsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewBackupLongTermRetentionVaultsClient creates an instance of the BackupLongTermRetentionVaultsClient client. func NewBackupLongTermRetentionVaultsClient(subscriptionID string) BackupLongTermRetentionVaultsClient { return NewBackupLongTermRetentionVaultsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewBackupLongTermRetentionVaultsClientWithBaseURI creates an instance of the BackupLongTermRetentionVaultsClient // client. func NewBackupLongTermRetentionVaultsClientWithBaseURI(baseURI string, subscriptionID string) BackupLongTermRetentionVaultsClient { return BackupLongTermRetentionVaultsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate updates a server backup long term retention vault // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -71,6 +75,7 @@ func (client BackupLongTermRetentionVaultsClient) CreateOrUpdate(ctx context.Con return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client BackupLongTermRetentionVaultsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters BackupLongTermRetentionVault) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,6 +100,7 @@ func (client BackupLongTermRetentionVaultsClient) CreateOrUpdatePreparer(ctx con return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionVaultsClient) CreateOrUpdateSender(req *http.Request) (future BackupLongTermRetentionVaultsCreateOrUpdateFuture, err error) { @@ -110,6 +116,7 @@ func (client BackupLongTermRetentionVaultsClient) CreateOrUpdateSender(req *http return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client BackupLongTermRetentionVaultsClient) CreateOrUpdateResponder(resp *http.Response) (result BackupLongTermRetentionVault, err error) { @@ -123,6 +130,7 @@ func (client BackupLongTermRetentionVaultsClient) CreateOrUpdateResponder(resp * return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a server backup long term retention vault // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -149,6 +157,7 @@ func (client BackupLongTermRetentionVaultsClient) Get(ctx context.Context, resou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client BackupLongTermRetentionVaultsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -171,6 +180,7 @@ func (client BackupLongTermRetentionVaultsClient) GetPreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionVaultsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -178,6 +188,7 @@ func (client BackupLongTermRetentionVaultsClient) GetSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client BackupLongTermRetentionVaultsClient) GetResponder(resp *http.Response) (result BackupLongTermRetentionVault, err error) { @@ -191,6 +202,7 @@ func (client BackupLongTermRetentionVaultsClient) GetResponder(resp *http.Respon return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets server backup long term retention vaults in a server // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -217,6 +229,7 @@ func (client BackupLongTermRetentionVaultsClient) ListByServer(ctx context.Conte return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client BackupLongTermRetentionVaultsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -238,6 +251,7 @@ func (client BackupLongTermRetentionVaultsClient) ListByServerPreparer(ctx conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionVaultsClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -245,6 +259,7 @@ func (client BackupLongTermRetentionVaultsClient) ListByServerSender(req *http.R azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client BackupLongTermRetentionVaultsClient) ListByServerResponder(resp *http.Response) (result BackupLongTermRetentionVaultListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/capabilities.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/capabilities.go index cc587af8e212..9e478bec88d5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/capabilities.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/capabilities.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CapabilitiesClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -31,16 +32,19 @@ type CapabilitiesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewCapabilitiesClient creates an instance of the CapabilitiesClient client. func NewCapabilitiesClient(subscriptionID string) CapabilitiesClient { return NewCapabilitiesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewCapabilitiesClientWithBaseURI creates an instance of the CapabilitiesClient client. func NewCapabilitiesClientWithBaseURI(baseURI string, subscriptionID string) CapabilitiesClient { return CapabilitiesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocation gets the subscription capabilities available for the specified location. // // locationName is the location name whose capabilities are retrieved. @@ -66,6 +70,7 @@ func (client CapabilitiesClient) ListByLocation(ctx context.Context, locationNam return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationPreparer prepares the ListByLocation request. func (client CapabilitiesClient) ListByLocationPreparer(ctx context.Context, locationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -86,6 +91,7 @@ func (client CapabilitiesClient) ListByLocationPreparer(ctx context.Context, loc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationSender sends the ListByLocation request. The method will close the // http.Response Body if it receives an error. func (client CapabilitiesClient) ListByLocationSender(req *http.Request) (*http.Response, error) { @@ -93,6 +99,7 @@ func (client CapabilitiesClient) ListByLocationSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationResponder handles the response to the ListByLocation request. The method always // closes the http.Response Body. func (client CapabilitiesClient) ListByLocationResponder(resp *http.Response) (result LocationCapabilities, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/client.go index 40ec57b36bab..3bb66c3c5b2a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/client.go @@ -30,6 +30,7 @@ const ( DefaultBaseURI = "https://management.azure.com" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BaseClient is the base client for Sql. type BaseClient struct { autorest.Client @@ -37,11 +38,13 @@ type BaseClient struct { SubscriptionID string } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // New creates an instance of the BaseClient client. func New(subscriptionID string) BaseClient { return NewWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewWithBaseURI creates an instance of the BaseClient client. func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { return BaseClient{ diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go index 8770fc0e82a9..9202465200b9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseBlobAuditingPoliciesClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -31,17 +32,20 @@ type DatabaseBlobAuditingPoliciesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabaseBlobAuditingPoliciesClient creates an instance of the DatabaseBlobAuditingPoliciesClient client. func NewDatabaseBlobAuditingPoliciesClient(subscriptionID string) DatabaseBlobAuditingPoliciesClient { return NewDatabaseBlobAuditingPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabaseBlobAuditingPoliciesClientWithBaseURI creates an instance of the DatabaseBlobAuditingPoliciesClient // client. func NewDatabaseBlobAuditingPoliciesClientWithBaseURI(baseURI string, subscriptionID string) DatabaseBlobAuditingPoliciesClient { return DatabaseBlobAuditingPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a database's blob auditing policy. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -70,6 +74,7 @@ func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdate(ctx context.Cont return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DatabaseBlobAuditingPolicy) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,6 +100,7 @@ func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdatePreparer(ctx cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -102,6 +108,7 @@ func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdateSender(req *http. azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result DatabaseBlobAuditingPolicy, err error) { @@ -115,6 +122,7 @@ func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdateResponder(resp *h return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database's blob auditing policy. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -142,6 +150,7 @@ func (client DatabaseBlobAuditingPoliciesClient) Get(ctx context.Context, resour return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client DatabaseBlobAuditingPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -165,6 +174,7 @@ func (client DatabaseBlobAuditingPoliciesClient) GetPreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DatabaseBlobAuditingPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -172,6 +182,7 @@ func (client DatabaseBlobAuditingPoliciesClient) GetSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DatabaseBlobAuditingPoliciesClient) GetResponder(resp *http.Response) (result DatabaseBlobAuditingPolicy, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databases.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databases.go index 164f6b989b2a..06581bab7ca9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databases.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databases.go @@ -25,6 +25,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -32,16 +33,19 @@ type DatabasesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabasesClient creates an instance of the DatabasesClient client. func NewDatabasesClient(subscriptionID string) DatabasesClient { return NewDatabasesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabasesClientWithBaseURI creates an instance of the DatabasesClient client. func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient { return DatabasesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateImportOperation creates an import operation that imports a bacpac into an existing database. The existing // database must be empty. // @@ -71,6 +75,7 @@ func (client DatabasesClient) CreateImportOperation(ctx context.Context, resourc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateImportOperationPreparer prepares the CreateImportOperation request. func (client DatabasesClient) CreateImportOperationPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters ImportExtensionRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -96,6 +101,7 @@ func (client DatabasesClient) CreateImportOperationPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateImportOperationSender sends the CreateImportOperation request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) CreateImportOperationSender(req *http.Request) (future DatabasesCreateImportOperationFuture, err error) { @@ -111,6 +117,7 @@ func (client DatabasesClient) CreateImportOperationSender(req *http.Request) (fu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateImportOperationResponder handles the response to the CreateImportOperation request. The method always // closes the http.Response Body. func (client DatabasesClient) CreateImportOperationResponder(resp *http.Response) (result ImportExportResponse, err error) { @@ -124,6 +131,7 @@ func (client DatabasesClient) CreateImportOperationResponder(resp *http.Response return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates a new database or updates an existing database. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -146,6 +154,7 @@ func (client DatabasesClient) CreateOrUpdate(ctx context.Context, resourceGroupN return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DatabasesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters Database) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -170,6 +179,7 @@ func (client DatabasesClient) CreateOrUpdatePreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) CreateOrUpdateSender(req *http.Request) (future DatabasesCreateOrUpdateFuture, err error) { @@ -185,6 +195,7 @@ func (client DatabasesClient) CreateOrUpdateSender(req *http.Request) (future Da return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DatabasesClient) CreateOrUpdateResponder(resp *http.Response) (result Database, err error) { @@ -198,6 +209,7 @@ func (client DatabasesClient) CreateOrUpdateResponder(resp *http.Response) (resu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a database. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -225,6 +237,7 @@ func (client DatabasesClient) Delete(ctx context.Context, resourceGroupName stri return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client DatabasesClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -247,6 +260,7 @@ func (client DatabasesClient) DeletePreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -254,6 +268,7 @@ func (client DatabasesClient) DeleteSender(req *http.Request) (*http.Response, e azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client DatabasesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -266,6 +281,7 @@ func (client DatabasesClient) DeleteResponder(resp *http.Response) (result autor return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Export exports a database to a bacpac. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -296,6 +312,7 @@ func (client DatabasesClient) Export(ctx context.Context, resourceGroupName stri return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ExportPreparer prepares the Export request. func (client DatabasesClient) ExportPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters ExportRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -320,6 +337,7 @@ func (client DatabasesClient) ExportPreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ExportSender sends the Export request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ExportSender(req *http.Request) (future DatabasesExportFuture, err error) { @@ -335,6 +353,7 @@ func (client DatabasesClient) ExportSender(req *http.Request) (future DatabasesE return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ExportResponder handles the response to the Export request. The method always // closes the http.Response Body. func (client DatabasesClient) ExportResponder(resp *http.Response) (result ImportExportResponse, err error) { @@ -348,6 +367,7 @@ func (client DatabasesClient) ExportResponder(resp *http.Response) (result Impor return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -376,6 +396,7 @@ func (client DatabasesClient) Get(ctx context.Context, resourceGroupName string, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client DatabasesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, expand string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -401,6 +422,7 @@ func (client DatabasesClient) GetPreparer(ctx context.Context, resourceGroupName return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -408,6 +430,7 @@ func (client DatabasesClient) GetSender(req *http.Request) (*http.Response, erro azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DatabasesClient) GetResponder(resp *http.Response) (result Database, err error) { @@ -421,6 +444,7 @@ func (client DatabasesClient) GetResponder(resp *http.Response) (result Database return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByElasticPool gets a database inside of an elastic pool. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -448,6 +472,7 @@ func (client DatabasesClient) GetByElasticPool(ctx context.Context, resourceGrou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByElasticPoolPreparer prepares the GetByElasticPool request. func (client DatabasesClient) GetByElasticPoolPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -471,6 +496,7 @@ func (client DatabasesClient) GetByElasticPoolPreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByElasticPoolSender sends the GetByElasticPool request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) GetByElasticPoolSender(req *http.Request) (*http.Response, error) { @@ -478,6 +504,7 @@ func (client DatabasesClient) GetByElasticPoolSender(req *http.Request) (*http.R azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByElasticPoolResponder handles the response to the GetByElasticPool request. The method always // closes the http.Response Body. func (client DatabasesClient) GetByElasticPoolResponder(resp *http.Response) (result Database, err error) { @@ -491,6 +518,7 @@ func (client DatabasesClient) GetByElasticPoolResponder(resp *http.Response) (re return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByRecommendedElasticPool gets a database inside of a recommented elastic pool. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -518,6 +546,7 @@ func (client DatabasesClient) GetByRecommendedElasticPool(ctx context.Context, r return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByRecommendedElasticPoolPreparer prepares the GetByRecommendedElasticPool request. func (client DatabasesClient) GetByRecommendedElasticPoolPreparer(ctx context.Context, resourceGroupName string, serverName string, recommendedElasticPoolName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -541,6 +570,7 @@ func (client DatabasesClient) GetByRecommendedElasticPoolPreparer(ctx context.Co return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByRecommendedElasticPoolSender sends the GetByRecommendedElasticPool request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) GetByRecommendedElasticPoolSender(req *http.Request) (*http.Response, error) { @@ -548,6 +578,7 @@ func (client DatabasesClient) GetByRecommendedElasticPoolSender(req *http.Reques azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByRecommendedElasticPoolResponder handles the response to the GetByRecommendedElasticPool request. The method always // closes the http.Response Body. func (client DatabasesClient) GetByRecommendedElasticPoolResponder(resp *http.Response) (result Database, err error) { @@ -561,6 +592,7 @@ func (client DatabasesClient) GetByRecommendedElasticPoolResponder(resp *http.Re return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Import imports a bacpac into a new database. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -589,6 +621,7 @@ func (client DatabasesClient) Import(ctx context.Context, resourceGroupName stri return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportPreparer prepares the Import request. func (client DatabasesClient) ImportPreparer(ctx context.Context, resourceGroupName string, serverName string, parameters ImportRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -612,6 +645,7 @@ func (client DatabasesClient) ImportPreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportSender sends the Import request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ImportSender(req *http.Request) (future DatabasesImportFuture, err error) { @@ -627,6 +661,7 @@ func (client DatabasesClient) ImportSender(req *http.Request) (future DatabasesI return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportResponder handles the response to the Import request. The method always // closes the http.Response Body. func (client DatabasesClient) ImportResponder(resp *http.Response) (result ImportExportResponse, err error) { @@ -640,6 +675,7 @@ func (client DatabasesClient) ImportResponder(resp *http.Response) (result Impor return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPool returns a list of databases in an elastic pool. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -667,6 +703,7 @@ func (client DatabasesClient) ListByElasticPool(ctx context.Context, resourceGro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolPreparer prepares the ListByElasticPool request. func (client DatabasesClient) ListByElasticPoolPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -689,6 +726,7 @@ func (client DatabasesClient) ListByElasticPoolPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolSender sends the ListByElasticPool request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ListByElasticPoolSender(req *http.Request) (*http.Response, error) { @@ -696,6 +734,7 @@ func (client DatabasesClient) ListByElasticPoolSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolResponder handles the response to the ListByElasticPool request. The method always // closes the http.Response Body. func (client DatabasesClient) ListByElasticPoolResponder(resp *http.Response) (result DatabaseListResult, err error) { @@ -709,6 +748,7 @@ func (client DatabasesClient) ListByElasticPoolResponder(resp *http.Response) (r return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByRecommendedElasticPool returns a list of databases inside a recommented elastic pool. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -736,6 +776,7 @@ func (client DatabasesClient) ListByRecommendedElasticPool(ctx context.Context, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByRecommendedElasticPoolPreparer prepares the ListByRecommendedElasticPool request. func (client DatabasesClient) ListByRecommendedElasticPoolPreparer(ctx context.Context, resourceGroupName string, serverName string, recommendedElasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -758,6 +799,7 @@ func (client DatabasesClient) ListByRecommendedElasticPoolPreparer(ctx context.C return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByRecommendedElasticPoolSender sends the ListByRecommendedElasticPool request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ListByRecommendedElasticPoolSender(req *http.Request) (*http.Response, error) { @@ -765,6 +807,7 @@ func (client DatabasesClient) ListByRecommendedElasticPoolSender(req *http.Reque azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByRecommendedElasticPoolResponder handles the response to the ListByRecommendedElasticPool request. The method always // closes the http.Response Body. func (client DatabasesClient) ListByRecommendedElasticPoolResponder(resp *http.Response) (result DatabaseListResult, err error) { @@ -778,6 +821,7 @@ func (client DatabasesClient) ListByRecommendedElasticPoolResponder(resp *http.R return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer returns a list of databases in a server. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -806,6 +850,7 @@ func (client DatabasesClient) ListByServer(ctx context.Context, resourceGroupNam return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client DatabasesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string, expand string, filter string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -833,6 +878,7 @@ func (client DatabasesClient) ListByServerPreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -840,6 +886,7 @@ func (client DatabasesClient) ListByServerSender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client DatabasesClient) ListByServerResponder(resp *http.Response) (result DatabaseListResult, err error) { @@ -853,6 +900,7 @@ func (client DatabasesClient) ListByServerResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitions returns database metric definitions. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -880,6 +928,7 @@ func (client DatabasesClient) ListMetricDefinitions(ctx context.Context, resourc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitionsPreparer prepares the ListMetricDefinitions request. func (client DatabasesClient) ListMetricDefinitionsPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -902,6 +951,7 @@ func (client DatabasesClient) ListMetricDefinitionsPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitionsSender sends the ListMetricDefinitions request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ListMetricDefinitionsSender(req *http.Request) (*http.Response, error) { @@ -909,6 +959,7 @@ func (client DatabasesClient) ListMetricDefinitionsSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitionsResponder handles the response to the ListMetricDefinitions request. The method always // closes the http.Response Body. func (client DatabasesClient) ListMetricDefinitionsResponder(resp *http.Response) (result MetricDefinitionListResult, err error) { @@ -922,6 +973,7 @@ func (client DatabasesClient) ListMetricDefinitionsResponder(resp *http.Response return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetrics returns database metrics. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -949,6 +1001,7 @@ func (client DatabasesClient) ListMetrics(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricsPreparer prepares the ListMetrics request. func (client DatabasesClient) ListMetricsPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, filter string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -972,6 +1025,7 @@ func (client DatabasesClient) ListMetricsPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricsSender sends the ListMetrics request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ListMetricsSender(req *http.Request) (*http.Response, error) { @@ -979,6 +1033,7 @@ func (client DatabasesClient) ListMetricsSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricsResponder handles the response to the ListMetrics request. The method always // closes the http.Response Body. func (client DatabasesClient) ListMetricsResponder(resp *http.Response) (result MetricListResult, err error) { @@ -992,6 +1047,7 @@ func (client DatabasesClient) ListMetricsResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Pause pauses a data warehouse. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -1013,6 +1069,7 @@ func (client DatabasesClient) Pause(ctx context.Context, resourceGroupName strin return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PausePreparer prepares the Pause request. func (client DatabasesClient) PausePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -1035,6 +1092,7 @@ func (client DatabasesClient) PausePreparer(ctx context.Context, resourceGroupNa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PauseSender sends the Pause request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) PauseSender(req *http.Request) (future DatabasesPauseFuture, err error) { @@ -1050,6 +1108,7 @@ func (client DatabasesClient) PauseSender(req *http.Request) (future DatabasesPa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PauseResponder handles the response to the Pause request. The method always // closes the http.Response Body. func (client DatabasesClient) PauseResponder(resp *http.Response) (result autorest.Response, err error) { @@ -1062,6 +1121,7 @@ func (client DatabasesClient) PauseResponder(resp *http.Response) (result autore return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Resume resumes a data warehouse. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -1083,6 +1143,7 @@ func (client DatabasesClient) Resume(ctx context.Context, resourceGroupName stri return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ResumePreparer prepares the Resume request. func (client DatabasesClient) ResumePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -1105,6 +1166,7 @@ func (client DatabasesClient) ResumePreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ResumeSender sends the Resume request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ResumeSender(req *http.Request) (future DatabasesResumeFuture, err error) { @@ -1120,6 +1182,7 @@ func (client DatabasesClient) ResumeSender(req *http.Request) (future DatabasesR return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ResumeResponder handles the response to the Resume request. The method always // closes the http.Response Body. func (client DatabasesClient) ResumeResponder(resp *http.Response) (result autorest.Response, err error) { @@ -1132,6 +1195,7 @@ func (client DatabasesClient) ResumeResponder(resp *http.Response) (result autor return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Update updates an existing database. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -1153,6 +1217,7 @@ func (client DatabasesClient) Update(ctx context.Context, resourceGroupName stri return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdatePreparer prepares the Update request. func (client DatabasesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DatabaseUpdate) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -1177,6 +1242,7 @@ func (client DatabasesClient) UpdatePreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) UpdateSender(req *http.Request) (future DatabasesUpdateFuture, err error) { @@ -1192,6 +1258,7 @@ func (client DatabasesClient) UpdateSender(req *http.Request) (future DatabasesU return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client DatabasesClient) UpdateResponder(resp *http.Response) (result Database, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databasethreatdetectionpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databasethreatdetectionpolicies.go index fdb9dee3f2c9..73bc6a5dfdef 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databasethreatdetectionpolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databasethreatdetectionpolicies.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseThreatDetectionPoliciesClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -31,17 +32,20 @@ type DatabaseThreatDetectionPoliciesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabaseThreatDetectionPoliciesClient creates an instance of the DatabaseThreatDetectionPoliciesClient client. func NewDatabaseThreatDetectionPoliciesClient(subscriptionID string) DatabaseThreatDetectionPoliciesClient { return NewDatabaseThreatDetectionPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabaseThreatDetectionPoliciesClientWithBaseURI creates an instance of the DatabaseThreatDetectionPoliciesClient // client. func NewDatabaseThreatDetectionPoliciesClientWithBaseURI(baseURI string, subscriptionID string) DatabaseThreatDetectionPoliciesClient { return DatabaseThreatDetectionPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a database's threat detection policy. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -70,6 +74,7 @@ func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdate(ctx context.C return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DatabaseSecurityAlertPolicy) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,6 +100,7 @@ func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdatePreparer(ctx c return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -102,6 +108,7 @@ func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdateSender(req *ht azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result DatabaseSecurityAlertPolicy, err error) { @@ -115,6 +122,7 @@ func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdateResponder(resp return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database's threat detection policy. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -142,6 +150,7 @@ func (client DatabaseThreatDetectionPoliciesClient) Get(ctx context.Context, res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client DatabaseThreatDetectionPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -165,6 +174,7 @@ func (client DatabaseThreatDetectionPoliciesClient) GetPreparer(ctx context.Cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DatabaseThreatDetectionPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -172,6 +182,7 @@ func (client DatabaseThreatDetectionPoliciesClient) GetSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DatabaseThreatDetectionPoliciesClient) GetResponder(resp *http.Response) (result DatabaseSecurityAlertPolicy, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseusages.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseusages.go index 2d531bfa202a..3cbb944e1814 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseusages.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseusages.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseUsagesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -31,16 +32,19 @@ type DatabaseUsagesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabaseUsagesClient creates an instance of the DatabaseUsagesClient client. func NewDatabaseUsagesClient(subscriptionID string) DatabaseUsagesClient { return NewDatabaseUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabaseUsagesClientWithBaseURI creates an instance of the DatabaseUsagesClient client. func NewDatabaseUsagesClientWithBaseURI(baseURI string, subscriptionID string) DatabaseUsagesClient { return DatabaseUsagesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase returns database usages. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -68,6 +72,7 @@ func (client DatabaseUsagesClient) ListByDatabase(ctx context.Context, resourceG return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client DatabaseUsagesClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -90,6 +95,7 @@ func (client DatabaseUsagesClient) ListByDatabasePreparer(ctx context.Context, r return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client DatabaseUsagesClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -97,6 +103,7 @@ func (client DatabaseUsagesClient) ListByDatabaseSender(req *http.Request) (*htt azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client DatabaseUsagesClient) ListByDatabaseResponder(resp *http.Response) (result DatabaseUsageListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingpolicies.go index d462b4be078f..82a0a7000069 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingpolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingpolicies.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingPoliciesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -31,16 +32,19 @@ type DataMaskingPoliciesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDataMaskingPoliciesClient creates an instance of the DataMaskingPoliciesClient client. func NewDataMaskingPoliciesClient(subscriptionID string) DataMaskingPoliciesClient { return NewDataMaskingPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDataMaskingPoliciesClientWithBaseURI creates an instance of the DataMaskingPoliciesClient client. func NewDataMaskingPoliciesClientWithBaseURI(baseURI string, subscriptionID string) DataMaskingPoliciesClient { return DataMaskingPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a database data masking policy // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -68,6 +72,7 @@ func (client DataMaskingPoliciesClient) CreateOrUpdate(ctx context.Context, reso return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DataMaskingPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DataMaskingPolicy) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -93,6 +98,7 @@ func (client DataMaskingPoliciesClient) CreateOrUpdatePreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DataMaskingPoliciesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -100,6 +106,7 @@ func (client DataMaskingPoliciesClient) CreateOrUpdateSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DataMaskingPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result DataMaskingPolicy, err error) { @@ -113,6 +120,7 @@ func (client DataMaskingPoliciesClient) CreateOrUpdateResponder(resp *http.Respo return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database data masking policy. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -140,6 +148,7 @@ func (client DataMaskingPoliciesClient) Get(ctx context.Context, resourceGroupNa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client DataMaskingPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -163,6 +172,7 @@ func (client DataMaskingPoliciesClient) GetPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DataMaskingPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -170,6 +180,7 @@ func (client DataMaskingPoliciesClient) GetSender(req *http.Request) (*http.Resp azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DataMaskingPoliciesClient) GetResponder(resp *http.Response) (result DataMaskingPolicy, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingrules.go index 5eb74d5df714..0b8b90df4056 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingrules.go @@ -25,6 +25,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingRulesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,16 +33,19 @@ type DataMaskingRulesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDataMaskingRulesClient creates an instance of the DataMaskingRulesClient client. func NewDataMaskingRulesClient(subscriptionID string) DataMaskingRulesClient { return NewDataMaskingRulesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDataMaskingRulesClientWithBaseURI creates an instance of the DataMaskingRulesClient client. func NewDataMaskingRulesClientWithBaseURI(baseURI string, subscriptionID string) DataMaskingRulesClient { return DataMaskingRulesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a database data masking rule. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -80,6 +84,7 @@ func (client DataMaskingRulesClient) CreateOrUpdate(ctx context.Context, resourc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DataMaskingRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, dataMaskingRuleName string, parameters DataMaskingRule) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -106,6 +111,7 @@ func (client DataMaskingRulesClient) CreateOrUpdatePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DataMaskingRulesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -113,6 +119,7 @@ func (client DataMaskingRulesClient) CreateOrUpdateSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DataMaskingRulesClient) CreateOrUpdateResponder(resp *http.Response) (result DataMaskingRule, err error) { @@ -126,6 +133,7 @@ func (client DataMaskingRulesClient) CreateOrUpdateResponder(resp *http.Response return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase gets a list of database data masking rules. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -153,6 +161,7 @@ func (client DataMaskingRulesClient) ListByDatabase(ctx context.Context, resourc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client DataMaskingRulesClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -176,6 +185,7 @@ func (client DataMaskingRulesClient) ListByDatabasePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client DataMaskingRulesClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -183,6 +193,7 @@ func (client DataMaskingRulesClient) ListByDatabaseSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client DataMaskingRulesClient) ListByDatabaseResponder(resp *http.Response) (result DataMaskingRuleListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpoolactivities.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpoolactivities.go index 207c81fcc0b2..3b493028d779 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpoolactivities.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpoolactivities.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolActivitiesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -31,16 +32,19 @@ type ElasticPoolActivitiesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewElasticPoolActivitiesClient creates an instance of the ElasticPoolActivitiesClient client. func NewElasticPoolActivitiesClient(subscriptionID string) ElasticPoolActivitiesClient { return NewElasticPoolActivitiesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewElasticPoolActivitiesClientWithBaseURI creates an instance of the ElasticPoolActivitiesClient client. func NewElasticPoolActivitiesClientWithBaseURI(baseURI string, subscriptionID string) ElasticPoolActivitiesClient { return ElasticPoolActivitiesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPool returns elastic pool activities. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -68,6 +72,7 @@ func (client ElasticPoolActivitiesClient) ListByElasticPool(ctx context.Context, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolPreparer prepares the ListByElasticPool request. func (client ElasticPoolActivitiesClient) ListByElasticPoolPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -90,6 +95,7 @@ func (client ElasticPoolActivitiesClient) ListByElasticPoolPreparer(ctx context. return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolSender sends the ListByElasticPool request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolActivitiesClient) ListByElasticPoolSender(req *http.Request) (*http.Response, error) { @@ -97,6 +103,7 @@ func (client ElasticPoolActivitiesClient) ListByElasticPoolSender(req *http.Requ azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolResponder handles the response to the ListByElasticPool request. The method always // closes the http.Response Body. func (client ElasticPoolActivitiesClient) ListByElasticPoolResponder(resp *http.Response) (result ElasticPoolActivityListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpooldatabaseactivities.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpooldatabaseactivities.go index ce30d93c6839..1b1d28e0cfcd 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpooldatabaseactivities.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpooldatabaseactivities.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolDatabaseActivitiesClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -31,17 +32,20 @@ type ElasticPoolDatabaseActivitiesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewElasticPoolDatabaseActivitiesClient creates an instance of the ElasticPoolDatabaseActivitiesClient client. func NewElasticPoolDatabaseActivitiesClient(subscriptionID string) ElasticPoolDatabaseActivitiesClient { return NewElasticPoolDatabaseActivitiesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewElasticPoolDatabaseActivitiesClientWithBaseURI creates an instance of the ElasticPoolDatabaseActivitiesClient // client. func NewElasticPoolDatabaseActivitiesClientWithBaseURI(baseURI string, subscriptionID string) ElasticPoolDatabaseActivitiesClient { return ElasticPoolDatabaseActivitiesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPool returns activity on databases inside of an elastic pool. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -69,6 +73,7 @@ func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPool(ctx context. return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolPreparer prepares the ListByElasticPool request. func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPoolPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -91,6 +96,7 @@ func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPoolPreparer(ctx return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolSender sends the ListByElasticPool request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPoolSender(req *http.Request) (*http.Response, error) { @@ -98,6 +104,7 @@ func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPoolSender(req *h azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolResponder handles the response to the ListByElasticPool request. The method always // closes the http.Response Body. func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPoolResponder(resp *http.Response) (result ElasticPoolDatabaseActivityListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpools.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpools.go index c56f6a3e5738..d4cb52a2e526 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpools.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpools.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolsClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -31,16 +32,19 @@ type ElasticPoolsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewElasticPoolsClient creates an instance of the ElasticPoolsClient client. func NewElasticPoolsClient(subscriptionID string) ElasticPoolsClient { return NewElasticPoolsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewElasticPoolsClientWithBaseURI creates an instance of the ElasticPoolsClient client. func NewElasticPoolsClientWithBaseURI(baseURI string, subscriptionID string) ElasticPoolsClient { return ElasticPoolsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates a new elastic pool or updates an existing elastic pool. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -63,6 +67,7 @@ func (client ElasticPoolsClient) CreateOrUpdate(ctx context.Context, resourceGro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ElasticPoolsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string, parameters ElasticPool) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -87,6 +92,7 @@ func (client ElasticPoolsClient) CreateOrUpdatePreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) CreateOrUpdateSender(req *http.Request) (future ElasticPoolsCreateOrUpdateFuture, err error) { @@ -102,6 +108,7 @@ func (client ElasticPoolsClient) CreateOrUpdateSender(req *http.Request) (future return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) CreateOrUpdateResponder(resp *http.Response) (result ElasticPool, err error) { @@ -115,6 +122,7 @@ func (client ElasticPoolsClient) CreateOrUpdateResponder(resp *http.Response) (r return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes the elastic pool. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -142,6 +150,7 @@ func (client ElasticPoolsClient) Delete(ctx context.Context, resourceGroupName s return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client ElasticPoolsClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -164,6 +173,7 @@ func (client ElasticPoolsClient) DeletePreparer(ctx context.Context, resourceGro return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -171,6 +181,7 @@ func (client ElasticPoolsClient) DeleteSender(req *http.Request) (*http.Response azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -183,6 +194,7 @@ func (client ElasticPoolsClient) DeleteResponder(resp *http.Response) (result au return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets an elastic pool. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -210,6 +222,7 @@ func (client ElasticPoolsClient) Get(ctx context.Context, resourceGroupName stri return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ElasticPoolsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -232,6 +245,7 @@ func (client ElasticPoolsClient) GetPreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -239,6 +253,7 @@ func (client ElasticPoolsClient) GetSender(req *http.Request) (*http.Response, e azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) GetResponder(resp *http.Response) (result ElasticPool, err error) { @@ -252,6 +267,7 @@ func (client ElasticPoolsClient) GetResponder(resp *http.Response) (result Elast return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer returns a list of elastic pools in a server. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -278,6 +294,7 @@ func (client ElasticPoolsClient) ListByServer(ctx context.Context, resourceGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client ElasticPoolsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -299,6 +316,7 @@ func (client ElasticPoolsClient) ListByServerPreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -306,6 +324,7 @@ func (client ElasticPoolsClient) ListByServerSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) ListByServerResponder(resp *http.Response) (result ElasticPoolListResult, err error) { @@ -319,6 +338,7 @@ func (client ElasticPoolsClient) ListByServerResponder(resp *http.Response) (res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitions returns elastic pool metric definitions. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -346,6 +366,7 @@ func (client ElasticPoolsClient) ListMetricDefinitions(ctx context.Context, reso return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitionsPreparer prepares the ListMetricDefinitions request. func (client ElasticPoolsClient) ListMetricDefinitionsPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -368,6 +389,7 @@ func (client ElasticPoolsClient) ListMetricDefinitionsPreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitionsSender sends the ListMetricDefinitions request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) ListMetricDefinitionsSender(req *http.Request) (*http.Response, error) { @@ -375,6 +397,7 @@ func (client ElasticPoolsClient) ListMetricDefinitionsSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitionsResponder handles the response to the ListMetricDefinitions request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) ListMetricDefinitionsResponder(resp *http.Response) (result MetricDefinitionListResult, err error) { @@ -388,6 +411,7 @@ func (client ElasticPoolsClient) ListMetricDefinitionsResponder(resp *http.Respo return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetrics returns elastic pool metrics. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -415,6 +439,7 @@ func (client ElasticPoolsClient) ListMetrics(ctx context.Context, resourceGroupN return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricsPreparer prepares the ListMetrics request. func (client ElasticPoolsClient) ListMetricsPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string, filter string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -438,6 +463,7 @@ func (client ElasticPoolsClient) ListMetricsPreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricsSender sends the ListMetrics request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) ListMetricsSender(req *http.Request) (*http.Response, error) { @@ -445,6 +471,7 @@ func (client ElasticPoolsClient) ListMetricsSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricsResponder handles the response to the ListMetrics request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) ListMetricsResponder(resp *http.Response) (result MetricListResult, err error) { @@ -458,6 +485,7 @@ func (client ElasticPoolsClient) ListMetricsResponder(resp *http.Response) (resu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Update updates an existing elastic pool. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -479,6 +507,7 @@ func (client ElasticPoolsClient) Update(ctx context.Context, resourceGroupName s return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdatePreparer prepares the Update request. func (client ElasticPoolsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string, parameters ElasticPoolUpdate) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -503,6 +532,7 @@ func (client ElasticPoolsClient) UpdatePreparer(ctx context.Context, resourceGro return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) UpdateSender(req *http.Request) (future ElasticPoolsUpdateFuture, err error) { @@ -518,6 +548,7 @@ func (client ElasticPoolsClient) UpdateSender(req *http.Request) (future Elastic return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) UpdateResponder(resp *http.Response) (result ElasticPool, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go index 6f96e37ce1fc..dd8349e7399a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtectorsClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -31,16 +32,19 @@ type EncryptionProtectorsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewEncryptionProtectorsClient creates an instance of the EncryptionProtectorsClient client. func NewEncryptionProtectorsClient(subscriptionID string) EncryptionProtectorsClient { return NewEncryptionProtectorsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewEncryptionProtectorsClientWithBaseURI creates an instance of the EncryptionProtectorsClient client. func NewEncryptionProtectorsClientWithBaseURI(baseURI string, subscriptionID string) EncryptionProtectorsClient { return EncryptionProtectorsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate updates an existing encryption protector. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -62,6 +66,7 @@ func (client EncryptionProtectorsClient) CreateOrUpdate(ctx context.Context, res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client EncryptionProtectorsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters EncryptionProtector) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -86,6 +91,7 @@ func (client EncryptionProtectorsClient) CreateOrUpdatePreparer(ctx context.Cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client EncryptionProtectorsClient) CreateOrUpdateSender(req *http.Request) (future EncryptionProtectorsCreateOrUpdateFuture, err error) { @@ -101,6 +107,7 @@ func (client EncryptionProtectorsClient) CreateOrUpdateSender(req *http.Request) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client EncryptionProtectorsClient) CreateOrUpdateResponder(resp *http.Response) (result EncryptionProtector, err error) { @@ -114,6 +121,7 @@ func (client EncryptionProtectorsClient) CreateOrUpdateResponder(resp *http.Resp return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a server encryption protector. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -140,6 +148,7 @@ func (client EncryptionProtectorsClient) Get(ctx context.Context, resourceGroupN return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client EncryptionProtectorsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -162,6 +171,7 @@ func (client EncryptionProtectorsClient) GetPreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client EncryptionProtectorsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -169,6 +179,7 @@ func (client EncryptionProtectorsClient) GetSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client EncryptionProtectorsClient) GetResponder(resp *http.Response) (result EncryptionProtector, err error) { @@ -182,6 +193,7 @@ func (client EncryptionProtectorsClient) GetResponder(resp *http.Response) (resu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets a list of server encryption protectors // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -209,6 +221,7 @@ func (client EncryptionProtectorsClient) ListByServer(ctx context.Context, resou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client EncryptionProtectorsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -230,6 +243,7 @@ func (client EncryptionProtectorsClient) ListByServerPreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client EncryptionProtectorsClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -237,6 +251,7 @@ func (client EncryptionProtectorsClient) ListByServerSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client EncryptionProtectorsClient) ListByServerResponder(resp *http.Response) (result EncryptionProtectorListResult, err error) { @@ -271,6 +286,7 @@ func (client EncryptionProtectorsClient) listByServerNextResults(lastResults Enc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerComplete enumerates all values, automatically crossing page boundaries as required. func (client EncryptionProtectorsClient) ListByServerComplete(ctx context.Context, resourceGroupName string, serverName string) (result EncryptionProtectorListResultIterator, err error) { result.page, err = client.ListByServer(ctx, resourceGroupName, serverName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/failovergroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/failovergroups.go index 06b0ae818b14..0768049eb37d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/failovergroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/failovergroups.go @@ -25,6 +25,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupsClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,16 +33,19 @@ type FailoverGroupsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewFailoverGroupsClient creates an instance of the FailoverGroupsClient client. func NewFailoverGroupsClient(subscriptionID string) FailoverGroupsClient { return NewFailoverGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewFailoverGroupsClientWithBaseURI creates an instance of the FailoverGroupsClient client. func NewFailoverGroupsClientWithBaseURI(baseURI string, subscriptionID string) FailoverGroupsClient { return FailoverGroupsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a failover group. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -72,6 +76,7 @@ func (client FailoverGroupsClient) CreateOrUpdate(ctx context.Context, resourceG return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client FailoverGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string, parameters FailoverGroup) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -96,6 +101,7 @@ func (client FailoverGroupsClient) CreateOrUpdatePreparer(ctx context.Context, r return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) CreateOrUpdateSender(req *http.Request) (future FailoverGroupsCreateOrUpdateFuture, err error) { @@ -111,6 +117,7 @@ func (client FailoverGroupsClient) CreateOrUpdateSender(req *http.Request) (futu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result FailoverGroup, err error) { @@ -124,6 +131,7 @@ func (client FailoverGroupsClient) CreateOrUpdateResponder(resp *http.Response) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a failover group. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -145,6 +153,7 @@ func (client FailoverGroupsClient) Delete(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client FailoverGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -167,6 +176,7 @@ func (client FailoverGroupsClient) DeletePreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) DeleteSender(req *http.Request) (future FailoverGroupsDeleteFuture, err error) { @@ -182,6 +192,7 @@ func (client FailoverGroupsClient) DeleteSender(req *http.Request) (future Failo return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -194,6 +205,7 @@ func (client FailoverGroupsClient) DeleteResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Failover fails over from the current primary server to this server. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -215,6 +227,7 @@ func (client FailoverGroupsClient) Failover(ctx context.Context, resourceGroupNa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverPreparer prepares the Failover request. func (client FailoverGroupsClient) FailoverPreparer(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -237,6 +250,7 @@ func (client FailoverGroupsClient) FailoverPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverSender sends the Failover request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) FailoverSender(req *http.Request) (future FailoverGroupsFailoverFuture, err error) { @@ -252,6 +266,7 @@ func (client FailoverGroupsClient) FailoverSender(req *http.Request) (future Fai return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverResponder handles the response to the Failover request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) FailoverResponder(resp *http.Response) (result FailoverGroup, err error) { @@ -265,6 +280,7 @@ func (client FailoverGroupsClient) FailoverResponder(resp *http.Response) (resul return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ForceFailoverAllowDataLoss fails over from the current primary server to this server. This operation might result in // data loss. // @@ -287,6 +303,7 @@ func (client FailoverGroupsClient) ForceFailoverAllowDataLoss(ctx context.Contex return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ForceFailoverAllowDataLossPreparer prepares the ForceFailoverAllowDataLoss request. func (client FailoverGroupsClient) ForceFailoverAllowDataLossPreparer(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -309,6 +326,7 @@ func (client FailoverGroupsClient) ForceFailoverAllowDataLossPreparer(ctx contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ForceFailoverAllowDataLossSender sends the ForceFailoverAllowDataLoss request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) ForceFailoverAllowDataLossSender(req *http.Request) (future FailoverGroupsForceFailoverAllowDataLossFuture, err error) { @@ -324,6 +342,7 @@ func (client FailoverGroupsClient) ForceFailoverAllowDataLossSender(req *http.Re return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ForceFailoverAllowDataLossResponder handles the response to the ForceFailoverAllowDataLoss request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) ForceFailoverAllowDataLossResponder(resp *http.Response) (result FailoverGroup, err error) { @@ -337,6 +356,7 @@ func (client FailoverGroupsClient) ForceFailoverAllowDataLossResponder(resp *htt return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a failover group. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -364,6 +384,7 @@ func (client FailoverGroupsClient) Get(ctx context.Context, resourceGroupName st return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client FailoverGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -386,6 +407,7 @@ func (client FailoverGroupsClient) GetPreparer(ctx context.Context, resourceGrou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -393,6 +415,7 @@ func (client FailoverGroupsClient) GetSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) GetResponder(resp *http.Response) (result FailoverGroup, err error) { @@ -406,6 +429,7 @@ func (client FailoverGroupsClient) GetResponder(resp *http.Response) (result Fai return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer lists the failover groups in a server. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -434,6 +458,7 @@ func (client FailoverGroupsClient) ListByServer(ctx context.Context, resourceGro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client FailoverGroupsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -455,6 +480,7 @@ func (client FailoverGroupsClient) ListByServerPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -462,6 +488,7 @@ func (client FailoverGroupsClient) ListByServerSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) ListByServerResponder(resp *http.Response) (result FailoverGroupListResult, err error) { @@ -496,12 +523,14 @@ func (client FailoverGroupsClient) listByServerNextResults(lastResults FailoverG return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerComplete enumerates all values, automatically crossing page boundaries as required. func (client FailoverGroupsClient) ListByServerComplete(ctx context.Context, resourceGroupName string, serverName string) (result FailoverGroupListResultIterator, err error) { result.page, err = client.ListByServer(ctx, resourceGroupName, serverName) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Update updates a failover group. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -523,6 +552,7 @@ func (client FailoverGroupsClient) Update(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdatePreparer prepares the Update request. func (client FailoverGroupsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string, parameters FailoverGroupUpdate) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -547,6 +577,7 @@ func (client FailoverGroupsClient) UpdatePreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) UpdateSender(req *http.Request) (future FailoverGroupsUpdateFuture, err error) { @@ -562,6 +593,7 @@ func (client FailoverGroupsClient) UpdateSender(req *http.Request) (future Failo return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) UpdateResponder(resp *http.Response) (result FailoverGroup, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/firewallrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/firewallrules.go index 39889599b694..6ddb67e969e0 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/firewallrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/firewallrules.go @@ -25,6 +25,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FirewallRulesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,16 +33,19 @@ type FirewallRulesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewFirewallRulesClient creates an instance of the FirewallRulesClient client. func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient { return NewFirewallRulesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewFirewallRulesClientWithBaseURI creates an instance of the FirewallRulesClient client. func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient { return FirewallRulesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a firewall rule. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -78,6 +82,7 @@ func (client FirewallRulesClient) CreateOrUpdate(ctx context.Context, resourceGr return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client FirewallRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string, parameters FirewallRule) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -102,6 +107,7 @@ func (client FirewallRulesClient) CreateOrUpdatePreparer(ctx context.Context, re return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client FirewallRulesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -109,6 +115,7 @@ func (client FirewallRulesClient) CreateOrUpdateSender(req *http.Request) (*http azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client FirewallRulesClient) CreateOrUpdateResponder(resp *http.Response) (result FirewallRule, err error) { @@ -122,6 +129,7 @@ func (client FirewallRulesClient) CreateOrUpdateResponder(resp *http.Response) ( return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a firewall rule. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -149,6 +157,7 @@ func (client FirewallRulesClient) Delete(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client FirewallRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -171,6 +180,7 @@ func (client FirewallRulesClient) DeletePreparer(ctx context.Context, resourceGr return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client FirewallRulesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -178,6 +188,7 @@ func (client FirewallRulesClient) DeleteSender(req *http.Request) (*http.Respons azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client FirewallRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -190,6 +201,7 @@ func (client FirewallRulesClient) DeleteResponder(resp *http.Response) (result a return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a firewall rule. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -217,6 +229,7 @@ func (client FirewallRulesClient) Get(ctx context.Context, resourceGroupName str return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client FirewallRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -239,6 +252,7 @@ func (client FirewallRulesClient) GetPreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client FirewallRulesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -246,6 +260,7 @@ func (client FirewallRulesClient) GetSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client FirewallRulesClient) GetResponder(resp *http.Response) (result FirewallRule, err error) { @@ -259,6 +274,7 @@ func (client FirewallRulesClient) GetResponder(resp *http.Response) (result Fire return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer returns a list of firewall rules. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -285,6 +301,7 @@ func (client FirewallRulesClient) ListByServer(ctx context.Context, resourceGrou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client FirewallRulesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -306,6 +323,7 @@ func (client FirewallRulesClient) ListByServerPreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client FirewallRulesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -313,6 +331,7 @@ func (client FirewallRulesClient) ListByServerSender(req *http.Request) (*http.R azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client FirewallRulesClient) ListByServerResponder(resp *http.Response) (result FirewallRuleListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/geobackuppolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/geobackuppolicies.go index fc98307265c5..83e4f2688266 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/geobackuppolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/geobackuppolicies.go @@ -25,6 +25,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GeoBackupPoliciesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,16 +33,19 @@ type GeoBackupPoliciesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewGeoBackupPoliciesClient creates an instance of the GeoBackupPoliciesClient client. func NewGeoBackupPoliciesClient(subscriptionID string) GeoBackupPoliciesClient { return NewGeoBackupPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewGeoBackupPoliciesClientWithBaseURI creates an instance of the GeoBackupPoliciesClient client. func NewGeoBackupPoliciesClientWithBaseURI(baseURI string, subscriptionID string) GeoBackupPoliciesClient { return GeoBackupPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate updates a database geo backup policy. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -75,6 +79,7 @@ func (client GeoBackupPoliciesClient) CreateOrUpdate(ctx context.Context, resour return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client GeoBackupPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters GeoBackupPolicy) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -100,6 +105,7 @@ func (client GeoBackupPoliciesClient) CreateOrUpdatePreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client GeoBackupPoliciesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -107,6 +113,7 @@ func (client GeoBackupPoliciesClient) CreateOrUpdateSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client GeoBackupPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result GeoBackupPolicy, err error) { @@ -120,6 +127,7 @@ func (client GeoBackupPoliciesClient) CreateOrUpdateResponder(resp *http.Respons return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a geo backup policy. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -147,6 +155,7 @@ func (client GeoBackupPoliciesClient) Get(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client GeoBackupPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -170,6 +179,7 @@ func (client GeoBackupPoliciesClient) GetPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client GeoBackupPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -177,6 +187,7 @@ func (client GeoBackupPoliciesClient) GetSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client GeoBackupPoliciesClient) GetResponder(resp *http.Response) (result GeoBackupPolicy, err error) { @@ -190,6 +201,7 @@ func (client GeoBackupPoliciesClient) GetResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase returns a list of geo backup policies. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -217,6 +229,7 @@ func (client GeoBackupPoliciesClient) ListByDatabase(ctx context.Context, resour return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client GeoBackupPoliciesClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -239,6 +252,7 @@ func (client GeoBackupPoliciesClient) ListByDatabasePreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client GeoBackupPoliciesClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -246,6 +260,7 @@ func (client GeoBackupPoliciesClient) ListByDatabaseSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client GeoBackupPoliciesClient) ListByDatabaseResponder(resp *http.Response) (result GeoBackupPolicyListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/models.go index 1d14c39e10f3..595240bbddea 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/models.go @@ -27,6 +27,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // AuthenticationType enumerates the values for authentication type. type AuthenticationType string @@ -37,11 +38,13 @@ const ( SQL AuthenticationType = "SQL" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleAuthenticationTypeValues returns an array of possible values for the AuthenticationType const type. func PossibleAuthenticationTypeValues() []AuthenticationType { return []AuthenticationType{ADPassword, SQL} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionPolicyState enumerates the values for backup long term retention policy state. type BackupLongTermRetentionPolicyState string @@ -52,11 +55,13 @@ const ( Enabled BackupLongTermRetentionPolicyState = "Enabled" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleBackupLongTermRetentionPolicyStateValues returns an array of possible values for the BackupLongTermRetentionPolicyState const type. func PossibleBackupLongTermRetentionPolicyStateValues() []BackupLongTermRetentionPolicyState { return []BackupLongTermRetentionPolicyState{Disabled, Enabled} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BlobAuditingPolicyState enumerates the values for blob auditing policy state. type BlobAuditingPolicyState string @@ -67,11 +72,13 @@ const ( BlobAuditingPolicyStateEnabled BlobAuditingPolicyState = "Enabled" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleBlobAuditingPolicyStateValues returns an array of possible values for the BlobAuditingPolicyState const type. func PossibleBlobAuditingPolicyStateValues() []BlobAuditingPolicyState { return []BlobAuditingPolicyState{BlobAuditingPolicyStateDisabled, BlobAuditingPolicyStateEnabled} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CapabilityStatus enumerates the values for capability status. type CapabilityStatus string @@ -86,11 +93,13 @@ const ( CapabilityStatusVisible CapabilityStatus = "Visible" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleCapabilityStatusValues returns an array of possible values for the CapabilityStatus const type. func PossibleCapabilityStatusValues() []CapabilityStatus { return []CapabilityStatus{CapabilityStatusAvailable, CapabilityStatusDefault, CapabilityStatusDisabled, CapabilityStatusVisible} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailabilityReason enumerates the values for check name availability reason. type CheckNameAvailabilityReason string @@ -101,11 +110,13 @@ const ( Invalid CheckNameAvailabilityReason = "Invalid" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleCheckNameAvailabilityReasonValues returns an array of possible values for the CheckNameAvailabilityReason const type. func PossibleCheckNameAvailabilityReasonValues() []CheckNameAvailabilityReason { return []CheckNameAvailabilityReason{AlreadyExists, Invalid} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateMode enumerates the values for create mode. type CreateMode string @@ -128,11 +139,13 @@ const ( RestoreLongTermRetentionBackup CreateMode = "RestoreLongTermRetentionBackup" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleCreateModeValues returns an array of possible values for the CreateMode const type. func PossibleCreateModeValues() []CreateMode { return []CreateMode{Copy, Default, NonReadableSecondary, OnlineSecondary, PointInTimeRestore, Recovery, Restore, RestoreLongTermRetentionBackup} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseEdition enumerates the values for database edition. type DatabaseEdition string @@ -161,11 +174,13 @@ const ( Web DatabaseEdition = "Web" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleDatabaseEditionValues returns an array of possible values for the DatabaseEdition const type. func PossibleDatabaseEditionValues() []DatabaseEdition { return []DatabaseEdition{Basic, Business, DataWarehouse, Free, Premium, PremiumRS, Standard, Stretch, System, System2, Web} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingFunction enumerates the values for data masking function. type DataMaskingFunction string @@ -184,11 +199,13 @@ const ( DataMaskingFunctionText DataMaskingFunction = "Text" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleDataMaskingFunctionValues returns an array of possible values for the DataMaskingFunction const type. func PossibleDataMaskingFunctionValues() []DataMaskingFunction { return []DataMaskingFunction{DataMaskingFunctionCCN, DataMaskingFunctionDefault, DataMaskingFunctionEmail, DataMaskingFunctionNumber, DataMaskingFunctionSSN, DataMaskingFunctionText} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingRuleState enumerates the values for data masking rule state. type DataMaskingRuleState string @@ -199,11 +216,13 @@ const ( DataMaskingRuleStateEnabled DataMaskingRuleState = "Enabled" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleDataMaskingRuleStateValues returns an array of possible values for the DataMaskingRuleState const type. func PossibleDataMaskingRuleStateValues() []DataMaskingRuleState { return []DataMaskingRuleState{DataMaskingRuleStateDisabled, DataMaskingRuleStateEnabled} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingState enumerates the values for data masking state. type DataMaskingState string @@ -214,11 +233,13 @@ const ( DataMaskingStateEnabled DataMaskingState = "Enabled" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleDataMaskingStateValues returns an array of possible values for the DataMaskingState const type. func PossibleDataMaskingStateValues() []DataMaskingState { return []DataMaskingState{DataMaskingStateDisabled, DataMaskingStateEnabled} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolEdition enumerates the values for elastic pool edition. type ElasticPoolEdition string @@ -231,11 +252,13 @@ const ( ElasticPoolEditionStandard ElasticPoolEdition = "Standard" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleElasticPoolEditionValues returns an array of possible values for the ElasticPoolEdition const type. func PossibleElasticPoolEditionValues() []ElasticPoolEdition { return []ElasticPoolEdition{ElasticPoolEditionBasic, ElasticPoolEditionPremium, ElasticPoolEditionStandard} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolState enumerates the values for elastic pool state. type ElasticPoolState string @@ -248,11 +271,13 @@ const ( ElasticPoolStateReady ElasticPoolState = "Ready" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleElasticPoolStateValues returns an array of possible values for the ElasticPoolState const type. func PossibleElasticPoolStateValues() []ElasticPoolState { return []ElasticPoolState{ElasticPoolStateCreating, ElasticPoolStateDisabled, ElasticPoolStateReady} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupReplicationRole enumerates the values for failover group replication role. type FailoverGroupReplicationRole string @@ -263,11 +288,13 @@ const ( Secondary FailoverGroupReplicationRole = "Secondary" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleFailoverGroupReplicationRoleValues returns an array of possible values for the FailoverGroupReplicationRole const type. func PossibleFailoverGroupReplicationRoleValues() []FailoverGroupReplicationRole { return []FailoverGroupReplicationRole{Primary, Secondary} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GeoBackupPolicyState enumerates the values for geo backup policy state. type GeoBackupPolicyState string @@ -278,11 +305,13 @@ const ( GeoBackupPolicyStateEnabled GeoBackupPolicyState = "Enabled" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleGeoBackupPolicyStateValues returns an array of possible values for the GeoBackupPolicyState const type. func PossibleGeoBackupPolicyStateValues() []GeoBackupPolicyState { return []GeoBackupPolicyState{GeoBackupPolicyStateDisabled, GeoBackupPolicyStateEnabled} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IdentityType enumerates the values for identity type. type IdentityType string @@ -291,11 +320,13 @@ const ( SystemAssigned IdentityType = "SystemAssigned" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleIdentityTypeValues returns an array of possible values for the IdentityType const type. func PossibleIdentityTypeValues() []IdentityType { return []IdentityType{SystemAssigned} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MaxSizeUnits enumerates the values for max size units. type MaxSizeUnits string @@ -310,11 +341,13 @@ const ( Terabytes MaxSizeUnits = "Terabytes" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleMaxSizeUnitsValues returns an array of possible values for the MaxSizeUnits const type. func PossibleMaxSizeUnitsValues() []MaxSizeUnits { return []MaxSizeUnits{Gigabytes, Megabytes, Petabytes, Terabytes} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationOrigin enumerates the values for operation origin. type OperationOrigin string @@ -325,11 +358,13 @@ const ( OperationOriginUser OperationOrigin = "user" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleOperationOriginValues returns an array of possible values for the OperationOrigin const type. func PossibleOperationOriginValues() []OperationOrigin { return []OperationOrigin{OperationOriginSystem, OperationOriginUser} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PerformanceLevelUnit enumerates the values for performance level unit. type PerformanceLevelUnit string @@ -338,11 +373,13 @@ const ( DTU PerformanceLevelUnit = "DTU" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossiblePerformanceLevelUnitValues returns an array of possible values for the PerformanceLevelUnit const type. func PossiblePerformanceLevelUnitValues() []PerformanceLevelUnit { return []PerformanceLevelUnit{DTU} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PrimaryAggregationType enumerates the values for primary aggregation type. type PrimaryAggregationType string @@ -361,11 +398,13 @@ const ( Total PrimaryAggregationType = "Total" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossiblePrimaryAggregationTypeValues returns an array of possible values for the PrimaryAggregationType const type. func PossiblePrimaryAggregationTypeValues() []PrimaryAggregationType { return []PrimaryAggregationType{Average, Count, Maximum, Minimum, None, Total} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReadOnlyEndpointFailoverPolicy enumerates the values for read only endpoint failover policy. type ReadOnlyEndpointFailoverPolicy string @@ -376,11 +415,13 @@ const ( ReadOnlyEndpointFailoverPolicyEnabled ReadOnlyEndpointFailoverPolicy = "Enabled" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleReadOnlyEndpointFailoverPolicyValues returns an array of possible values for the ReadOnlyEndpointFailoverPolicy const type. func PossibleReadOnlyEndpointFailoverPolicyValues() []ReadOnlyEndpointFailoverPolicy { return []ReadOnlyEndpointFailoverPolicy{ReadOnlyEndpointFailoverPolicyDisabled, ReadOnlyEndpointFailoverPolicyEnabled} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReadScale enumerates the values for read scale. type ReadScale string @@ -391,11 +432,13 @@ const ( ReadScaleEnabled ReadScale = "Enabled" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleReadScaleValues returns an array of possible values for the ReadScale const type. func PossibleReadScaleValues() []ReadScale { return []ReadScale{ReadScaleDisabled, ReadScaleEnabled} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReadWriteEndpointFailoverPolicy enumerates the values for read write endpoint failover policy. type ReadWriteEndpointFailoverPolicy string @@ -406,11 +449,13 @@ const ( Manual ReadWriteEndpointFailoverPolicy = "Manual" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleReadWriteEndpointFailoverPolicyValues returns an array of possible values for the ReadWriteEndpointFailoverPolicy const type. func PossibleReadWriteEndpointFailoverPolicyValues() []ReadWriteEndpointFailoverPolicy { return []ReadWriteEndpointFailoverPolicy{Automatic, Manual} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecommendedIndexAction enumerates the values for recommended index action. type RecommendedIndexAction string @@ -423,11 +468,13 @@ const ( Rebuild RecommendedIndexAction = "Rebuild" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleRecommendedIndexActionValues returns an array of possible values for the RecommendedIndexAction const type. func PossibleRecommendedIndexActionValues() []RecommendedIndexAction { return []RecommendedIndexAction{Create, Drop, Rebuild} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecommendedIndexState enumerates the values for recommended index state. type RecommendedIndexState string @@ -456,11 +503,13 @@ const ( Verifying RecommendedIndexState = "Verifying" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleRecommendedIndexStateValues returns an array of possible values for the RecommendedIndexState const type. func PossibleRecommendedIndexStateValues() []RecommendedIndexState { return []RecommendedIndexState{Active, Blocked, Executing, Expired, Ignored, Pending, PendingRevert, Reverted, Reverting, Success, Verifying} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecommendedIndexType enumerates the values for recommended index type. type RecommendedIndexType string @@ -475,11 +524,13 @@ const ( NONCLUSTERED RecommendedIndexType = "NONCLUSTERED" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleRecommendedIndexTypeValues returns an array of possible values for the RecommendedIndexType const type. func PossibleRecommendedIndexTypeValues() []RecommendedIndexType { return []RecommendedIndexType{CLUSTERED, CLUSTEREDCOLUMNSTORE, COLUMNSTORE, NONCLUSTERED} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationRole enumerates the values for replication role. type ReplicationRole string @@ -496,11 +547,13 @@ const ( ReplicationRoleSource ReplicationRole = "Source" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleReplicationRoleValues returns an array of possible values for the ReplicationRole const type. func PossibleReplicationRoleValues() []ReplicationRole { return []ReplicationRole{ReplicationRoleCopy, ReplicationRoleNonReadableSecondary, ReplicationRolePrimary, ReplicationRoleSecondary, ReplicationRoleSource} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationState enumerates the values for replication state. type ReplicationState string @@ -515,11 +568,13 @@ const ( SUSPENDED ReplicationState = "SUSPENDED" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleReplicationStateValues returns an array of possible values for the ReplicationState const type. func PossibleReplicationStateValues() []ReplicationState { return []ReplicationState{CATCHUP, PENDING, SEEDING, SUSPENDED} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorePointType enumerates the values for restore point type. type RestorePointType string @@ -530,11 +585,13 @@ const ( DISCRETE RestorePointType = "DISCRETE" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleRestorePointTypeValues returns an array of possible values for the RestorePointType const type. func PossibleRestorePointTypeValues() []RestorePointType { return []RestorePointType{CONTINUOUS, DISCRETE} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SampleName enumerates the values for sample name. type SampleName string @@ -543,11 +600,13 @@ const ( AdventureWorksLT SampleName = "AdventureWorksLT" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSampleNameValues returns an array of possible values for the SampleName const type. func PossibleSampleNameValues() []SampleName { return []SampleName{AdventureWorksLT} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SecurityAlertPolicyEmailAccountAdmins enumerates the values for security alert policy email account admins. type SecurityAlertPolicyEmailAccountAdmins string @@ -558,11 +617,13 @@ const ( SecurityAlertPolicyEmailAccountAdminsEnabled SecurityAlertPolicyEmailAccountAdmins = "Enabled" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSecurityAlertPolicyEmailAccountAdminsValues returns an array of possible values for the SecurityAlertPolicyEmailAccountAdmins const type. func PossibleSecurityAlertPolicyEmailAccountAdminsValues() []SecurityAlertPolicyEmailAccountAdmins { return []SecurityAlertPolicyEmailAccountAdmins{SecurityAlertPolicyEmailAccountAdminsDisabled, SecurityAlertPolicyEmailAccountAdminsEnabled} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SecurityAlertPolicyState enumerates the values for security alert policy state. type SecurityAlertPolicyState string @@ -575,11 +636,13 @@ const ( SecurityAlertPolicyStateNew SecurityAlertPolicyState = "New" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSecurityAlertPolicyStateValues returns an array of possible values for the SecurityAlertPolicyState const type. func PossibleSecurityAlertPolicyStateValues() []SecurityAlertPolicyState { return []SecurityAlertPolicyState{SecurityAlertPolicyStateDisabled, SecurityAlertPolicyStateEnabled, SecurityAlertPolicyStateNew} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SecurityAlertPolicyUseServerDefault enumerates the values for security alert policy use server default. type SecurityAlertPolicyUseServerDefault string @@ -590,11 +653,13 @@ const ( SecurityAlertPolicyUseServerDefaultEnabled SecurityAlertPolicyUseServerDefault = "Enabled" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSecurityAlertPolicyUseServerDefaultValues returns an array of possible values for the SecurityAlertPolicyUseServerDefault const type. func PossibleSecurityAlertPolicyUseServerDefaultValues() []SecurityAlertPolicyUseServerDefault { return []SecurityAlertPolicyUseServerDefault{SecurityAlertPolicyUseServerDefaultDisabled, SecurityAlertPolicyUseServerDefaultEnabled} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerConnectionType enumerates the values for server connection type. type ServerConnectionType string @@ -607,11 +672,13 @@ const ( ServerConnectionTypeRedirect ServerConnectionType = "Redirect" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleServerConnectionTypeValues returns an array of possible values for the ServerConnectionType const type. func PossibleServerConnectionTypeValues() []ServerConnectionType { return []ServerConnectionType{ServerConnectionTypeDefault, ServerConnectionTypeProxy, ServerConnectionTypeRedirect} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeyType enumerates the values for server key type. type ServerKeyType string @@ -622,11 +689,13 @@ const ( ServiceManaged ServerKeyType = "ServiceManaged" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleServerKeyTypeValues returns an array of possible values for the ServerKeyType const type. func PossibleServerKeyTypeValues() []ServerKeyType { return []ServerKeyType{AzureKeyVault, ServiceManaged} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceObjectiveName enumerates the values for service objective name. type ServiceObjectiveName string @@ -763,11 +832,13 @@ const ( ServiceObjectiveNameSystem4L ServiceObjectiveName = "System4L" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleServiceObjectiveNameValues returns an array of possible values for the ServiceObjectiveName const type. func PossibleServiceObjectiveNameValues() []ServiceObjectiveName { return []ServiceObjectiveName{ServiceObjectiveNameBasic, ServiceObjectiveNameDS100, ServiceObjectiveNameDS1000, ServiceObjectiveNameDS1200, ServiceObjectiveNameDS1500, ServiceObjectiveNameDS200, ServiceObjectiveNameDS2000, ServiceObjectiveNameDS300, ServiceObjectiveNameDS400, ServiceObjectiveNameDS500, ServiceObjectiveNameDS600, ServiceObjectiveNameDW100, ServiceObjectiveNameDW1000, ServiceObjectiveNameDW10000c, ServiceObjectiveNameDW1000c, ServiceObjectiveNameDW1200, ServiceObjectiveNameDW1500, ServiceObjectiveNameDW15000c, ServiceObjectiveNameDW1500c, ServiceObjectiveNameDW200, ServiceObjectiveNameDW2000, ServiceObjectiveNameDW2000c, ServiceObjectiveNameDW2500c, ServiceObjectiveNameDW300, ServiceObjectiveNameDW3000, ServiceObjectiveNameDW30000c, ServiceObjectiveNameDW3000c, ServiceObjectiveNameDW400, ServiceObjectiveNameDW500, ServiceObjectiveNameDW5000c, ServiceObjectiveNameDW600, ServiceObjectiveNameDW6000, ServiceObjectiveNameDW6000c, ServiceObjectiveNameDW7500c, ServiceObjectiveNameElasticPool, ServiceObjectiveNameFree, ServiceObjectiveNameP1, ServiceObjectiveNameP11, ServiceObjectiveNameP15, ServiceObjectiveNameP2, ServiceObjectiveNameP3, ServiceObjectiveNameP4, ServiceObjectiveNameP6, ServiceObjectiveNamePRS1, ServiceObjectiveNamePRS2, ServiceObjectiveNamePRS4, ServiceObjectiveNamePRS6, ServiceObjectiveNameS0, ServiceObjectiveNameS1, ServiceObjectiveNameS12, ServiceObjectiveNameS2, ServiceObjectiveNameS3, ServiceObjectiveNameS4, ServiceObjectiveNameS6, ServiceObjectiveNameS7, ServiceObjectiveNameS9, ServiceObjectiveNameSystem, ServiceObjectiveNameSystem0, ServiceObjectiveNameSystem1, ServiceObjectiveNameSystem2, ServiceObjectiveNameSystem2L, ServiceObjectiveNameSystem3, ServiceObjectiveNameSystem3L, ServiceObjectiveNameSystem4, ServiceObjectiveNameSystem4L} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // StorageKeyType enumerates the values for storage key type. type StorageKeyType string @@ -778,11 +849,13 @@ const ( StorageAccessKey StorageKeyType = "StorageAccessKey" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleStorageKeyTypeValues returns an array of possible values for the StorageKeyType const type. func PossibleStorageKeyTypeValues() []StorageKeyType { return []StorageKeyType{SharedAccessKey, StorageAccessKey} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentState enumerates the values for sync agent state. type SyncAgentState string @@ -795,11 +868,13 @@ const ( Online SyncAgentState = "Online" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncAgentStateValues returns an array of possible values for the SyncAgentState const type. func PossibleSyncAgentStateValues() []SyncAgentState { return []SyncAgentState{NeverConnected, Offline, Online} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncConflictResolutionPolicy enumerates the values for sync conflict resolution policy. type SyncConflictResolutionPolicy string @@ -810,11 +885,13 @@ const ( MemberWin SyncConflictResolutionPolicy = "MemberWin" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncConflictResolutionPolicyValues returns an array of possible values for the SyncConflictResolutionPolicy const type. func PossibleSyncConflictResolutionPolicyValues() []SyncConflictResolutionPolicy { return []SyncConflictResolutionPolicy{HubWin, MemberWin} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncDirection enumerates the values for sync direction. type SyncDirection string @@ -827,11 +904,13 @@ const ( OneWayMemberToHub SyncDirection = "OneWayMemberToHub" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncDirectionValues returns an array of possible values for the SyncDirection const type. func PossibleSyncDirectionValues() []SyncDirection { return []SyncDirection{Bidirectional, OneWayHubToMember, OneWayMemberToHub} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupLogType enumerates the values for sync group log type. type SyncGroupLogType string @@ -846,11 +925,13 @@ const ( SyncGroupLogTypeWarning SyncGroupLogType = "Warning" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncGroupLogTypeValues returns an array of possible values for the SyncGroupLogType const type. func PossibleSyncGroupLogTypeValues() []SyncGroupLogType { return []SyncGroupLogType{SyncGroupLogTypeAll, SyncGroupLogTypeError, SyncGroupLogTypeSuccess, SyncGroupLogTypeWarning} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupState enumerates the values for sync group state. type SyncGroupState string @@ -867,11 +948,13 @@ const ( Warning SyncGroupState = "Warning" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncGroupStateValues returns an array of possible values for the SyncGroupState const type. func PossibleSyncGroupStateValues() []SyncGroupState { return []SyncGroupState{Error, Good, NotReady, Progressing, Warning} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMemberDbType enumerates the values for sync member db type. type SyncMemberDbType string @@ -882,11 +965,13 @@ const ( SQLServerDatabase SyncMemberDbType = "SqlServerDatabase" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncMemberDbTypeValues returns an array of possible values for the SyncMemberDbType const type. func PossibleSyncMemberDbTypeValues() []SyncMemberDbType { return []SyncMemberDbType{AzureSQLDatabase, SQLServerDatabase} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMemberState enumerates the values for sync member state. type SyncMemberState string @@ -929,11 +1014,13 @@ const ( UnReprovisioned SyncMemberState = "UnReprovisioned" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncMemberStateValues returns an array of possible values for the SyncMemberState const type. func PossibleSyncMemberStateValues() []SyncMemberState { return []SyncMemberState{DeProvisioned, DeProvisionFailed, DeProvisioning, DisabledBackupRestore, DisabledTombstoneCleanup, Provisioned, ProvisionFailed, Provisioning, ReprovisionFailed, Reprovisioning, SyncCancelled, SyncCancelling, SyncFailed, SyncInProgress, SyncSucceeded, SyncSucceededWithWarnings, UnProvisioned, UnReprovisioned} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionActivityStatus enumerates the values for transparent data encryption activity // status. type TransparentDataEncryptionActivityStatus string @@ -945,11 +1032,13 @@ const ( Encrypting TransparentDataEncryptionActivityStatus = "Encrypting" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleTransparentDataEncryptionActivityStatusValues returns an array of possible values for the TransparentDataEncryptionActivityStatus const type. func PossibleTransparentDataEncryptionActivityStatusValues() []TransparentDataEncryptionActivityStatus { return []TransparentDataEncryptionActivityStatus{Decrypting, Encrypting} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionStatus enumerates the values for transparent data encryption status. type TransparentDataEncryptionStatus string @@ -960,11 +1049,13 @@ const ( TransparentDataEncryptionStatusEnabled TransparentDataEncryptionStatus = "Enabled" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleTransparentDataEncryptionStatusValues returns an array of possible values for the TransparentDataEncryptionStatus const type. func PossibleTransparentDataEncryptionStatusValues() []TransparentDataEncryptionStatus { return []TransparentDataEncryptionStatus{TransparentDataEncryptionStatusDisabled, TransparentDataEncryptionStatusEnabled} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnitDefinitionType enumerates the values for unit definition type. type UnitDefinitionType string @@ -983,11 +1074,13 @@ const ( UnitDefinitionTypeSeconds UnitDefinitionType = "Seconds" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleUnitDefinitionTypeValues returns an array of possible values for the UnitDefinitionType const type. func PossibleUnitDefinitionTypeValues() []UnitDefinitionType { return []UnitDefinitionType{UnitDefinitionTypeBytes, UnitDefinitionTypeBytesPerSecond, UnitDefinitionTypeCount, UnitDefinitionTypeCountPerSecond, UnitDefinitionTypePercent, UnitDefinitionTypeSeconds} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnitType enumerates the values for unit type. type UnitType string @@ -1006,11 +1099,13 @@ const ( UnitTypeSeconds UnitType = "seconds" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleUnitTypeValues returns an array of possible values for the UnitType const type. func PossibleUnitTypeValues() []UnitType { return []UnitType{UnitTypeBytes, UnitTypeBytesPerSecond, UnitTypeCount, UnitTypeCountPerSecond, UnitTypePercent, UnitTypeSeconds} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRuleState enumerates the values for virtual network rule state. type VirtualNetworkRuleState string @@ -1027,11 +1122,13 @@ const ( Unknown VirtualNetworkRuleState = "Unknown" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleVirtualNetworkRuleStateValues returns an array of possible values for the VirtualNetworkRuleState const type. func PossibleVirtualNetworkRuleStateValues() []VirtualNetworkRuleState { return []VirtualNetworkRuleState{Deleting, Initializing, InProgress, Ready, Unknown} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionPoliciesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of // a long-running operation. type BackupLongTermRetentionPoliciesCreateOrUpdateFuture struct { @@ -1039,6 +1136,7 @@ type BackupLongTermRetentionPoliciesCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future BackupLongTermRetentionPoliciesCreateOrUpdateFuture) Result(client BackupLongTermRetentionPoliciesClient) (bltrp BackupLongTermRetentionPolicy, err error) { @@ -1081,6 +1179,7 @@ func (future BackupLongTermRetentionPoliciesCreateOrUpdateFuture) Result(client return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionPolicy a backup long term retention policy type BackupLongTermRetentionPolicy struct { autorest.Response `json:"-"` @@ -1096,6 +1195,7 @@ type BackupLongTermRetentionPolicy struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for BackupLongTermRetentionPolicy. func (bltrp BackupLongTermRetentionPolicy) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1117,6 +1217,7 @@ func (bltrp BackupLongTermRetentionPolicy) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for BackupLongTermRetentionPolicy struct. func (bltrp *BackupLongTermRetentionPolicy) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1177,6 +1278,7 @@ func (bltrp *BackupLongTermRetentionPolicy) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionPolicyListResult represents the response to a list long-term retention policies request. type BackupLongTermRetentionPolicyListResult struct { autorest.Response `json:"-"` @@ -1184,6 +1286,7 @@ type BackupLongTermRetentionPolicyListResult struct { Value *[]BackupLongTermRetentionPolicy `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionPolicyProperties the properties of a backup long term retention policy type BackupLongTermRetentionPolicyProperties struct { // State - The status of the backup long term retention policy. Possible values include: 'Disabled', 'Enabled' @@ -1192,6 +1295,7 @@ type BackupLongTermRetentionPolicyProperties struct { RecoveryServicesBackupPolicyResourceID *string `json:"recoveryServicesBackupPolicyResourceId,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionVault a backup long term retention vault type BackupLongTermRetentionVault struct { autorest.Response `json:"-"` @@ -1207,6 +1311,7 @@ type BackupLongTermRetentionVault struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for BackupLongTermRetentionVault. func (bltrv BackupLongTermRetentionVault) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1228,6 +1333,7 @@ func (bltrv BackupLongTermRetentionVault) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for BackupLongTermRetentionVault struct. func (bltrv *BackupLongTermRetentionVault) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1288,6 +1394,7 @@ func (bltrv *BackupLongTermRetentionVault) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionVaultListResult represents the response to a list vaults request. type BackupLongTermRetentionVaultListResult struct { autorest.Response `json:"-"` @@ -1295,12 +1402,14 @@ type BackupLongTermRetentionVaultListResult struct { Value *[]BackupLongTermRetentionVault `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionVaultProperties the properties of a backup long term retention vault. type BackupLongTermRetentionVaultProperties struct { // RecoveryServicesVaultResourceID - The azure recovery services vault resource id RecoveryServicesVaultResourceID *string `json:"recoveryServicesVaultResourceId,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionVaultsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type BackupLongTermRetentionVaultsCreateOrUpdateFuture struct { @@ -1308,6 +1417,7 @@ type BackupLongTermRetentionVaultsCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future BackupLongTermRetentionVaultsCreateOrUpdateFuture) Result(client BackupLongTermRetentionVaultsClient) (bltrv BackupLongTermRetentionVault, err error) { @@ -1350,6 +1460,7 @@ func (future BackupLongTermRetentionVaultsCreateOrUpdateFuture) Result(client Ba return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailabilityRequest a request to check whether the specified name for a resource is available. type CheckNameAvailabilityRequest struct { // Name - The name whose availability is to be checked. @@ -1358,6 +1469,7 @@ type CheckNameAvailabilityRequest struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailabilityResponse a response indicating whether the specified name for a resource is available. type CheckNameAvailabilityResponse struct { autorest.Response `json:"-"` @@ -1371,6 +1483,7 @@ type CheckNameAvailabilityResponse struct { Reason CheckNameAvailabilityReason `json:"reason,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Database represents a database. type Database struct { autorest.Response `json:"-"` @@ -1390,6 +1503,7 @@ type Database struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for Database. func (d Database) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1417,6 +1531,7 @@ func (d Database) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for Database struct. func (d *Database) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1495,6 +1610,7 @@ func (d *Database) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseBlobAuditingPolicy a database blob auditing policy. type DatabaseBlobAuditingPolicy struct { autorest.Response `json:"-"` @@ -1510,6 +1626,7 @@ type DatabaseBlobAuditingPolicy struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for DatabaseBlobAuditingPolicy. func (dbap DatabaseBlobAuditingPolicy) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1531,6 +1648,7 @@ func (dbap DatabaseBlobAuditingPolicy) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for DatabaseBlobAuditingPolicy struct. func (dbap *DatabaseBlobAuditingPolicy) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1591,6 +1709,7 @@ func (dbap *DatabaseBlobAuditingPolicy) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseBlobAuditingPolicyProperties properties of a database blob auditing policy. type DatabaseBlobAuditingPolicyProperties struct { // State - Specifies the state of the policy. If state is Enabled, storageEndpoint and storageAccountAccessKey are required. Possible values include: 'BlobAuditingPolicyStateEnabled', 'BlobAuditingPolicyStateDisabled' @@ -1609,6 +1728,7 @@ type DatabaseBlobAuditingPolicyProperties struct { IsStorageSecondaryKeyInUse *bool `json:"isStorageSecondaryKeyInUse,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseListResult represents the response to a list database request. type DatabaseListResult struct { autorest.Response `json:"-"` @@ -1616,6 +1736,7 @@ type DatabaseListResult struct { Value *[]Database `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseProperties represents the properties of a database. type DatabaseProperties struct { // Collation - The collation of the database. If createMode is not Default, this value is ignored. @@ -1680,6 +1801,7 @@ type DatabaseProperties struct { ZoneRedundant *bool `json:"zoneRedundant,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesCreateImportOperationFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type DatabasesCreateImportOperationFuture struct { @@ -1687,6 +1809,7 @@ type DatabasesCreateImportOperationFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesCreateImportOperationFuture) Result(client DatabasesClient) (ier ImportExportResponse, err error) { @@ -1729,6 +1852,7 @@ func (future DatabasesCreateImportOperationFuture) Result(client DatabasesClient return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type DatabasesCreateOrUpdateFuture struct { @@ -1736,6 +1860,7 @@ type DatabasesCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Database, err error) { @@ -1778,6 +1903,7 @@ func (future DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Da return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseSecurityAlertPolicy contains information about a database Threat Detection policy. type DatabaseSecurityAlertPolicy struct { autorest.Response `json:"-"` @@ -1795,6 +1921,7 @@ type DatabaseSecurityAlertPolicy struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for DatabaseSecurityAlertPolicy. func (dsap DatabaseSecurityAlertPolicy) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1819,6 +1946,7 @@ func (dsap DatabaseSecurityAlertPolicy) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for DatabaseSecurityAlertPolicy struct. func (dsap *DatabaseSecurityAlertPolicy) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1888,6 +2016,7 @@ func (dsap *DatabaseSecurityAlertPolicy) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseSecurityAlertPolicyProperties properties for a database Threat Detection policy. type DatabaseSecurityAlertPolicyProperties struct { // State - Specifies the state of the policy. If state is Enabled, storageEndpoint and storageAccountAccessKey are required. Possible values include: 'SecurityAlertPolicyStateNew', 'SecurityAlertPolicyStateEnabled', 'SecurityAlertPolicyStateDisabled' @@ -1908,12 +2037,14 @@ type DatabaseSecurityAlertPolicyProperties struct { UseServerDefault SecurityAlertPolicyUseServerDefault `json:"useServerDefault,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesExportFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesExportFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesExportFuture) Result(client DatabasesClient) (ier ImportExportResponse, err error) { @@ -1956,12 +2087,14 @@ func (future DatabasesExportFuture) Result(client DatabasesClient) (ier ImportEx return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesImportFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesImportFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesImportFuture) Result(client DatabasesClient) (ier ImportExportResponse, err error) { @@ -2004,12 +2137,14 @@ func (future DatabasesImportFuture) Result(client DatabasesClient) (ier ImportEx return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesPauseFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesPauseFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesPauseFuture) Result(client DatabasesClient) (ar autorest.Response, err error) { @@ -2052,12 +2187,14 @@ func (future DatabasesPauseFuture) Result(client DatabasesClient) (ar autorest.R return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesResumeFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesResumeFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesResumeFuture) Result(client DatabasesClient) (ar autorest.Response, err error) { @@ -2100,12 +2237,14 @@ func (future DatabasesResumeFuture) Result(client DatabasesClient) (ar autorest. return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesUpdateFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesUpdateFuture) Result(client DatabasesClient) (d Database, err error) { @@ -2148,6 +2287,7 @@ func (future DatabasesUpdateFuture) Result(client DatabasesClient) (d Database, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseUpdate represents a database update. type DatabaseUpdate struct { // Tags - Resource tags. @@ -2162,6 +2302,7 @@ type DatabaseUpdate struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for DatabaseUpdate. func (du DatabaseUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2183,6 +2324,7 @@ func (du DatabaseUpdate) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for DatabaseUpdate struct. func (du *DatabaseUpdate) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2243,6 +2385,7 @@ func (du *DatabaseUpdate) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseUsage the database usages. type DatabaseUsage struct { // Name - The name of the usage metric. @@ -2261,6 +2404,7 @@ type DatabaseUsage struct { NextResetTime *date.Time `json:"nextResetTime,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseUsageListResult the response to a list database metrics request. type DatabaseUsageListResult struct { autorest.Response `json:"-"` @@ -2268,6 +2412,7 @@ type DatabaseUsageListResult struct { Value *[]DatabaseUsage `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingPolicy represents a database data masking policy. type DataMaskingPolicy struct { autorest.Response `json:"-"` @@ -2285,6 +2430,7 @@ type DataMaskingPolicy struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for DataMaskingPolicy. func (dmp DataMaskingPolicy) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2309,6 +2455,7 @@ func (dmp DataMaskingPolicy) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for DataMaskingPolicy struct. func (dmp *DataMaskingPolicy) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2378,6 +2525,7 @@ func (dmp *DataMaskingPolicy) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingPolicyProperties the properties of a database data masking policy. type DataMaskingPolicyProperties struct { // DataMaskingState - The state of the data masking policy. Possible values include: 'DataMaskingStateDisabled', 'DataMaskingStateEnabled' @@ -2390,6 +2538,7 @@ type DataMaskingPolicyProperties struct { MaskingLevel *string `json:"maskingLevel,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingRule represents a database data masking rule. type DataMaskingRule struct { autorest.Response `json:"-"` @@ -2407,6 +2556,7 @@ type DataMaskingRule struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for DataMaskingRule. func (dmr DataMaskingRule) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2431,6 +2581,7 @@ func (dmr DataMaskingRule) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for DataMaskingRule struct. func (dmr *DataMaskingRule) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2500,6 +2651,7 @@ func (dmr *DataMaskingRule) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingRuleListResult the response to a list data masking rules request. type DataMaskingRuleListResult struct { autorest.Response `json:"-"` @@ -2507,6 +2659,7 @@ type DataMaskingRuleListResult struct { Value *[]DataMaskingRule `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingRuleProperties the properties of a database data masking rule. type DataMaskingRuleProperties struct { // ID - The rule Id. @@ -2535,6 +2688,7 @@ type DataMaskingRuleProperties struct { ReplacementString *string `json:"replacementString,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EditionCapability the edition capability. type EditionCapability struct { // Name - The database edition name. @@ -2547,6 +2701,7 @@ type EditionCapability struct { Reason *string `json:"reason,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPool represents a database elastic pool. type ElasticPool struct { autorest.Response `json:"-"` @@ -2566,6 +2721,7 @@ type ElasticPool struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ElasticPool. func (ep ElasticPool) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2593,6 +2749,7 @@ func (ep ElasticPool) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ElasticPool struct. func (ep *ElasticPool) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2671,6 +2828,7 @@ func (ep *ElasticPool) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolActivity represents the activity on an elastic pool. type ElasticPoolActivity struct { // Location - The geo-location where the resource lives @@ -2685,6 +2843,7 @@ type ElasticPoolActivity struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ElasticPoolActivity. func (epa ElasticPoolActivity) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2706,6 +2865,7 @@ func (epa ElasticPoolActivity) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ElasticPoolActivity struct. func (epa *ElasticPoolActivity) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2766,6 +2926,7 @@ func (epa *ElasticPoolActivity) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolActivityListResult represents the response to a list elastic pool activity request. type ElasticPoolActivityListResult struct { autorest.Response `json:"-"` @@ -2773,6 +2934,7 @@ type ElasticPoolActivityListResult struct { Value *[]ElasticPoolActivity `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolActivityProperties represents the properties of an elastic pool. type ElasticPoolActivityProperties struct { // EndTime - The time the operation finished (ISO8601 format). @@ -2817,6 +2979,7 @@ type ElasticPoolActivityProperties struct { RequestedDtuGuarantee *int32 `json:"requestedDtuGuarantee,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolDatabaseActivity represents the activity on an elastic pool. type ElasticPoolDatabaseActivity struct { // Location - The geo-location where the resource lives @@ -2831,6 +2994,7 @@ type ElasticPoolDatabaseActivity struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ElasticPoolDatabaseActivity. func (epda ElasticPoolDatabaseActivity) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2852,6 +3016,7 @@ func (epda ElasticPoolDatabaseActivity) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ElasticPoolDatabaseActivity struct. func (epda *ElasticPoolDatabaseActivity) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2912,6 +3077,7 @@ func (epda *ElasticPoolDatabaseActivity) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolDatabaseActivityListResult represents the response to a list elastic pool database activity request. type ElasticPoolDatabaseActivityListResult struct { autorest.Response `json:"-"` @@ -2919,6 +3085,7 @@ type ElasticPoolDatabaseActivityListResult struct { Value *[]ElasticPoolDatabaseActivity `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolDatabaseActivityProperties represents the properties of an elastic pool database activity. type ElasticPoolDatabaseActivityProperties struct { // DatabaseName - The database name. @@ -2953,6 +3120,7 @@ type ElasticPoolDatabaseActivityProperties struct { State *string `json:"state,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolDtuCapability the Elastic Pool DTU capability. type ElasticPoolDtuCapability struct { // Limit - The DTU limit for the pool. @@ -2973,6 +3141,7 @@ type ElasticPoolDtuCapability struct { Reason *string `json:"reason,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolEditionCapability the elastic pool edition capability. type ElasticPoolEditionCapability struct { // Name - The elastic pool edition name. @@ -2985,6 +3154,7 @@ type ElasticPoolEditionCapability struct { Reason *string `json:"reason,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolListResult represents the response to a list elastic pool request. type ElasticPoolListResult struct { autorest.Response `json:"-"` @@ -2992,6 +3162,7 @@ type ElasticPoolListResult struct { Value *[]ElasticPool `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolPerDatabaseMaxDtuCapability the max per-database DTU capability. type ElasticPoolPerDatabaseMaxDtuCapability struct { // Limit - The maximum DTUs per database. @@ -3004,6 +3175,7 @@ type ElasticPoolPerDatabaseMaxDtuCapability struct { Reason *string `json:"reason,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolPerDatabaseMinDtuCapability the minimum per-database DTU capability. type ElasticPoolPerDatabaseMinDtuCapability struct { // Limit - The minimum DTUs per database. @@ -3014,6 +3186,7 @@ type ElasticPoolPerDatabaseMinDtuCapability struct { Reason *string `json:"reason,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolProperties represents the properties of an elastic pool. type ElasticPoolProperties struct { // CreationDate - The creation date of the elastic pool (ISO8601 format). @@ -3034,6 +3207,7 @@ type ElasticPoolProperties struct { ZoneRedundant *bool `json:"zoneRedundant,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ElasticPoolsCreateOrUpdateFuture struct { @@ -3041,6 +3215,7 @@ type ElasticPoolsCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ElasticPoolsCreateOrUpdateFuture) Result(client ElasticPoolsClient) (ep ElasticPool, err error) { @@ -3083,12 +3258,14 @@ func (future ElasticPoolsCreateOrUpdateFuture) Result(client ElasticPoolsClient) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ElasticPoolsUpdateFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ElasticPoolsUpdateFuture) Result(client ElasticPoolsClient) (ep ElasticPool, err error) { @@ -3131,6 +3308,7 @@ func (future ElasticPoolsUpdateFuture) Result(client ElasticPoolsClient) (ep Ela return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolUpdate represents an elastic pool update. type ElasticPoolUpdate struct { // Tags - Resource tags. @@ -3145,6 +3323,7 @@ type ElasticPoolUpdate struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ElasticPoolUpdate. func (epu ElasticPoolUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -3166,6 +3345,7 @@ func (epu ElasticPoolUpdate) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ElasticPoolUpdate struct. func (epu *ElasticPoolUpdate) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -3226,6 +3406,7 @@ func (epu *ElasticPoolUpdate) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtector the server encryption protector. type EncryptionProtector struct { autorest.Response `json:"-"` @@ -3243,6 +3424,7 @@ type EncryptionProtector struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for EncryptionProtector. func (ep EncryptionProtector) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -3267,6 +3449,7 @@ func (ep EncryptionProtector) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for EncryptionProtector struct. func (ep *EncryptionProtector) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -3336,6 +3519,7 @@ func (ep *EncryptionProtector) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtectorListResult a list of server encryption protectors. type EncryptionProtectorListResult struct { autorest.Response `json:"-"` @@ -3345,12 +3529,14 @@ type EncryptionProtectorListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtectorListResultIterator provides access to a complete listing of EncryptionProtector values. type EncryptionProtectorListResultIterator struct { i int page EncryptionProtectorListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *EncryptionProtectorListResultIterator) Next() error { @@ -3367,16 +3553,19 @@ func (iter *EncryptionProtectorListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter EncryptionProtectorListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter EncryptionProtectorListResultIterator) Response() EncryptionProtectorListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter EncryptionProtectorListResultIterator) Value() EncryptionProtector { @@ -3386,6 +3575,7 @@ func (iter EncryptionProtectorListResultIterator) Value() EncryptionProtector { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (eplr EncryptionProtectorListResult) IsEmpty() bool { return eplr.Value == nil || len(*eplr.Value) == 0 @@ -3403,12 +3593,14 @@ func (eplr EncryptionProtectorListResult) encryptionProtectorListResultPreparer( autorest.WithBaseURL(to.String(eplr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtectorListResultPage contains a page of EncryptionProtector values. type EncryptionProtectorListResultPage struct { fn func(EncryptionProtectorListResult) (EncryptionProtectorListResult, error) eplr EncryptionProtectorListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *EncryptionProtectorListResultPage) Next() error { @@ -3420,16 +3612,19 @@ func (page *EncryptionProtectorListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page EncryptionProtectorListResultPage) NotDone() bool { return !page.eplr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page EncryptionProtectorListResultPage) Response() EncryptionProtectorListResult { return page.eplr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page EncryptionProtectorListResultPage) Values() []EncryptionProtector { if page.eplr.IsEmpty() { @@ -3438,6 +3633,7 @@ func (page EncryptionProtectorListResultPage) Values() []EncryptionProtector { return *page.eplr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtectorProperties properties for an encryption protector execution. type EncryptionProtectorProperties struct { // Subregion - Subregion of the encryption protector. @@ -3452,6 +3648,7 @@ type EncryptionProtectorProperties struct { Thumbprint *string `json:"thumbprint,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtectorsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type EncryptionProtectorsCreateOrUpdateFuture struct { @@ -3459,6 +3656,7 @@ type EncryptionProtectorsCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future EncryptionProtectorsCreateOrUpdateFuture) Result(client EncryptionProtectorsClient) (ep EncryptionProtector, err error) { @@ -3501,6 +3699,7 @@ func (future EncryptionProtectorsCreateOrUpdateFuture) Result(client EncryptionP return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ExportRequest export database parameters. type ExportRequest struct { // StorageKeyType - The type of the storage key to use. Possible values include: 'StorageAccessKey', 'SharedAccessKey' @@ -3517,6 +3716,7 @@ type ExportRequest struct { AuthenticationType AuthenticationType `json:"authenticationType,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroup a failover group. type FailoverGroup struct { autorest.Response `json:"-"` @@ -3534,6 +3734,7 @@ type FailoverGroup struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for FailoverGroup. func (fg FailoverGroup) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -3558,6 +3759,7 @@ func (fg FailoverGroup) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for FailoverGroup struct. func (fg *FailoverGroup) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -3627,6 +3829,7 @@ func (fg *FailoverGroup) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupListResult a list of failover groups. type FailoverGroupListResult struct { autorest.Response `json:"-"` @@ -3636,12 +3839,14 @@ type FailoverGroupListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupListResultIterator provides access to a complete listing of FailoverGroup values. type FailoverGroupListResultIterator struct { i int page FailoverGroupListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *FailoverGroupListResultIterator) Next() error { @@ -3658,16 +3863,19 @@ func (iter *FailoverGroupListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter FailoverGroupListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter FailoverGroupListResultIterator) Response() FailoverGroupListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter FailoverGroupListResultIterator) Value() FailoverGroup { @@ -3677,6 +3885,7 @@ func (iter FailoverGroupListResultIterator) Value() FailoverGroup { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (fglr FailoverGroupListResult) IsEmpty() bool { return fglr.Value == nil || len(*fglr.Value) == 0 @@ -3694,12 +3903,14 @@ func (fglr FailoverGroupListResult) failoverGroupListResultPreparer() (*http.Req autorest.WithBaseURL(to.String(fglr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupListResultPage contains a page of FailoverGroup values. type FailoverGroupListResultPage struct { fn func(FailoverGroupListResult) (FailoverGroupListResult, error) fglr FailoverGroupListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *FailoverGroupListResultPage) Next() error { @@ -3711,16 +3922,19 @@ func (page *FailoverGroupListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page FailoverGroupListResultPage) NotDone() bool { return !page.fglr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page FailoverGroupListResultPage) Response() FailoverGroupListResult { return page.fglr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page FailoverGroupListResultPage) Values() []FailoverGroup { if page.fglr.IsEmpty() { @@ -3729,6 +3943,7 @@ func (page FailoverGroupListResultPage) Values() []FailoverGroup { return *page.fglr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupProperties properties of a failover group. type FailoverGroupProperties struct { // ReadWriteEndpoint - Read-write endpoint of the failover group instance. @@ -3745,12 +3960,14 @@ type FailoverGroupProperties struct { Databases *[]string `json:"databases,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupReadOnlyEndpoint read-only endpoint of the failover group instance. type FailoverGroupReadOnlyEndpoint struct { // FailoverPolicy - Failover policy of the read-only endpoint for the failover group. Possible values include: 'ReadOnlyEndpointFailoverPolicyDisabled', 'ReadOnlyEndpointFailoverPolicyEnabled' FailoverPolicy ReadOnlyEndpointFailoverPolicy `json:"failoverPolicy,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupReadWriteEndpoint read-write endpoint of the failover group instance. type FailoverGroupReadWriteEndpoint struct { // FailoverPolicy - Failover policy of the read-write endpoint for the failover group. If failoverPolicy is Automatic then failoverWithDataLossGracePeriodMinutes is required. Possible values include: 'Manual', 'Automatic' @@ -3759,6 +3976,7 @@ type FailoverGroupReadWriteEndpoint struct { FailoverWithDataLossGracePeriodMinutes *int32 `json:"failoverWithDataLossGracePeriodMinutes,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type FailoverGroupsCreateOrUpdateFuture struct { @@ -3766,6 +3984,7 @@ type FailoverGroupsCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future FailoverGroupsCreateOrUpdateFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { @@ -3808,12 +4027,14 @@ func (future FailoverGroupsCreateOrUpdateFuture) Result(client FailoverGroupsCli return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type FailoverGroupsDeleteFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future FailoverGroupsDeleteFuture) Result(client FailoverGroupsClient) (ar autorest.Response, err error) { @@ -3856,6 +4077,7 @@ func (future FailoverGroupsDeleteFuture) Result(client FailoverGroupsClient) (ar return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupsFailoverFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type FailoverGroupsFailoverFuture struct { @@ -3863,6 +4085,7 @@ type FailoverGroupsFailoverFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future FailoverGroupsFailoverFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { @@ -3905,6 +4128,7 @@ func (future FailoverGroupsFailoverFuture) Result(client FailoverGroupsClient) ( return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupsForceFailoverAllowDataLossFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type FailoverGroupsForceFailoverAllowDataLossFuture struct { @@ -3912,6 +4136,7 @@ type FailoverGroupsForceFailoverAllowDataLossFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future FailoverGroupsForceFailoverAllowDataLossFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { @@ -3954,12 +4179,14 @@ func (future FailoverGroupsForceFailoverAllowDataLossFuture) Result(client Failo return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type FailoverGroupsUpdateFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future FailoverGroupsUpdateFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { @@ -4002,6 +4229,7 @@ func (future FailoverGroupsUpdateFuture) Result(client FailoverGroupsClient) (fg return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupUpdate a failover group update request. type FailoverGroupUpdate struct { // FailoverGroupUpdateProperties - Resource properties. @@ -4010,6 +4238,7 @@ type FailoverGroupUpdate struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for FailoverGroupUpdate. func (fgu FailoverGroupUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4022,6 +4251,7 @@ func (fgu FailoverGroupUpdate) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for FailoverGroupUpdate struct. func (fgu *FailoverGroupUpdate) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -4055,6 +4285,7 @@ func (fgu *FailoverGroupUpdate) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupUpdateProperties properties of a failover group update. type FailoverGroupUpdateProperties struct { // ReadWriteEndpoint - Read-write endpoint of the failover group instance. @@ -4065,6 +4296,7 @@ type FailoverGroupUpdateProperties struct { Databases *[]string `json:"databases,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FirewallRule represents a server firewall rule. type FirewallRule struct { autorest.Response `json:"-"` @@ -4082,6 +4314,7 @@ type FirewallRule struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for FirewallRule. func (fr FirewallRule) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4106,6 +4339,7 @@ func (fr FirewallRule) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for FirewallRule struct. func (fr *FirewallRule) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -4175,6 +4409,7 @@ func (fr *FirewallRule) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FirewallRuleListResult represents the response to a List Firewall Rules request. type FirewallRuleListResult struct { autorest.Response `json:"-"` @@ -4182,6 +4417,7 @@ type FirewallRuleListResult struct { Value *[]FirewallRule `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FirewallRuleProperties represents the properties of a server firewall rule. type FirewallRuleProperties struct { // StartIPAddress - The start IP address of the firewall rule. Must be IPv4 format. Use value '0.0.0.0' to represent all Azure-internal IP addresses. @@ -4190,6 +4426,7 @@ type FirewallRuleProperties struct { EndIPAddress *string `json:"endIpAddress,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GeoBackupPolicy a database geo backup policy. type GeoBackupPolicy struct { autorest.Response `json:"-"` @@ -4207,6 +4444,7 @@ type GeoBackupPolicy struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for GeoBackupPolicy. func (gbp GeoBackupPolicy) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4231,6 +4469,7 @@ func (gbp GeoBackupPolicy) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for GeoBackupPolicy struct. func (gbp *GeoBackupPolicy) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -4300,6 +4539,7 @@ func (gbp *GeoBackupPolicy) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GeoBackupPolicyListResult the response to a list geo backup policies request. type GeoBackupPolicyListResult struct { autorest.Response `json:"-"` @@ -4307,6 +4547,7 @@ type GeoBackupPolicyListResult struct { Value *[]GeoBackupPolicy `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GeoBackupPolicyProperties the properties of the geo backup policy. type GeoBackupPolicyProperties struct { // State - The state of the geo backup policy. Possible values include: 'GeoBackupPolicyStateDisabled', 'GeoBackupPolicyStateEnabled' @@ -4315,6 +4556,7 @@ type GeoBackupPolicyProperties struct { StorageType *string `json:"storageType,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportExportResponse response for Import/Export Get operation. type ImportExportResponse struct { autorest.Response `json:"-"` @@ -4328,6 +4570,7 @@ type ImportExportResponse struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ImportExportResponse. func (ier ImportExportResponse) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4346,6 +4589,7 @@ func (ier ImportExportResponse) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ImportExportResponse struct. func (ier *ImportExportResponse) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -4397,6 +4641,7 @@ func (ier *ImportExportResponse) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportExportResponseProperties response for Import/Export Status operation. type ImportExportResponseProperties struct { // RequestType - The request type of the operation. @@ -4419,6 +4664,7 @@ type ImportExportResponseProperties struct { ErrorMessage *string `json:"errorMessage,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportExtensionProperties represents the properties for an import operation type ImportExtensionProperties struct { // OperationMode - The type of import operation being performed. This is always Import. @@ -4437,6 +4683,7 @@ type ImportExtensionProperties struct { AuthenticationType AuthenticationType `json:"authenticationType,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportExtensionRequest import database parameters. type ImportExtensionRequest struct { // Name - The name of the extension. @@ -4447,6 +4694,7 @@ type ImportExtensionRequest struct { *ImportExtensionProperties `json:"properties,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ImportExtensionRequest. func (ier ImportExtensionRequest) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4462,6 +4710,7 @@ func (ier ImportExtensionRequest) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ImportExtensionRequest struct. func (ier *ImportExtensionRequest) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -4504,6 +4753,7 @@ func (ier *ImportExtensionRequest) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportRequest import database parameters. type ImportRequest struct { // DatabaseName - The name of the database to import. @@ -4528,6 +4778,7 @@ type ImportRequest struct { AuthenticationType AuthenticationType `json:"authenticationType,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // LocationCapabilities the location capability. type LocationCapabilities struct { autorest.Response `json:"-"` @@ -4541,6 +4792,7 @@ type LocationCapabilities struct { Reason *string `json:"reason,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MaxSizeCapability the maximum size capability. type MaxSizeCapability struct { // Limit - The maximum size limit (see 'unit' for the units). @@ -4553,6 +4805,7 @@ type MaxSizeCapability struct { Reason *string `json:"reason,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Metric database metrics. type Metric struct { // StartTime - The start time for the metric (ISO-8601 format). @@ -4569,6 +4822,7 @@ type Metric struct { MetricValues *[]MetricValue `json:"metricValues,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MetricAvailability a metric availability value. type MetricAvailability struct { // Retention - The length of retention for the database metric. @@ -4577,6 +4831,7 @@ type MetricAvailability struct { TimeGrain *string `json:"timeGrain,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MetricDefinition a database metric definition. type MetricDefinition struct { // Name - The name information for the metric. @@ -4591,6 +4846,7 @@ type MetricDefinition struct { MetricAvailabilities *[]MetricAvailability `json:"metricAvailabilities,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MetricDefinitionListResult the response to a list database metric definitions request. type MetricDefinitionListResult struct { autorest.Response `json:"-"` @@ -4598,6 +4854,7 @@ type MetricDefinitionListResult struct { Value *[]MetricDefinition `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MetricListResult the response to a list database metrics request. type MetricListResult struct { autorest.Response `json:"-"` @@ -4605,6 +4862,7 @@ type MetricListResult struct { Value *[]Metric `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MetricName a database metric name. type MetricName struct { // Value - The name of the database metric. @@ -4613,6 +4871,7 @@ type MetricName struct { LocalizedValue *string `json:"localizedValue,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MetricValue represents database metrics. type MetricValue struct { // Count - The number of values for the metric. @@ -4629,6 +4888,7 @@ type MetricValue struct { Total *float64 `json:"total,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Operation SQL REST API operation definition. type Operation struct { // Name - The name of the operation being performed on this particular object. @@ -4641,6 +4901,7 @@ type Operation struct { Properties map[string]interface{} `json:"properties"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for Operation. func (o Operation) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4659,6 +4920,7 @@ func (o Operation) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationDisplay display metadata associated with the operation. type OperationDisplay struct { // Provider - The localized friendly form of the resource provider name. @@ -4671,6 +4933,7 @@ type OperationDisplay struct { Description *string `json:"description,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationImpact the impact of an operation, both in absolute and relative terms. type OperationImpact struct { // Name - The name of the impact dimension. @@ -4683,6 +4946,7 @@ type OperationImpact struct { ChangeValueRelative *float64 `json:"changeValueRelative,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationListResult result of the request to list SQL operations. type OperationListResult struct { autorest.Response `json:"-"` @@ -4692,12 +4956,14 @@ type OperationListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationListResultIterator provides access to a complete listing of Operation values. type OperationListResultIterator struct { i int page OperationListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *OperationListResultIterator) Next() error { @@ -4714,16 +4980,19 @@ func (iter *OperationListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter OperationListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter OperationListResultIterator) Response() OperationListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter OperationListResultIterator) Value() Operation { @@ -4733,6 +5002,7 @@ func (iter OperationListResultIterator) Value() Operation { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (olr OperationListResult) IsEmpty() bool { return olr.Value == nil || len(*olr.Value) == 0 @@ -4750,12 +5020,14 @@ func (olr OperationListResult) operationListResultPreparer() (*http.Request, err autorest.WithBaseURL(to.String(olr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationListResultPage contains a page of Operation values. type OperationListResultPage struct { fn func(OperationListResult) (OperationListResult, error) olr OperationListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *OperationListResultPage) Next() error { @@ -4767,16 +5039,19 @@ func (page *OperationListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page OperationListResultPage) NotDone() bool { return !page.olr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page OperationListResultPage) Response() OperationListResult { return page.olr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page OperationListResultPage) Values() []Operation { if page.olr.IsEmpty() { @@ -4785,6 +5060,7 @@ func (page OperationListResultPage) Values() []Operation { return *page.olr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PartnerInfo partner server information for the failover group. type PartnerInfo struct { // ID - Resource identifier of the partner server. @@ -4795,6 +5071,7 @@ type PartnerInfo struct { ReplicationRole FailoverGroupReplicationRole `json:"replicationRole,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PerformanceLevelCapability the performance level capability. type PerformanceLevelCapability struct { // Value - Performance level value. @@ -4803,6 +5080,7 @@ type PerformanceLevelCapability struct { Unit PerformanceLevelUnit `json:"unit,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ProxyResource ARM proxy resource. type ProxyResource struct { // ID - Resource ID. @@ -4813,139 +5091,7 @@ type ProxyResource struct { Type *string `json:"type,omitempty"` } -// RecommendedElasticPool represents a recommented elastic pool. -type RecommendedElasticPool struct { - autorest.Response `json:"-"` - // RecommendedElasticPoolProperties - The properites representing the resource. - *RecommendedElasticPoolProperties `json:"properties,omitempty"` - // ID - Resource ID. - ID *string `json:"id,omitempty"` - // Name - Resource name. - Name *string `json:"name,omitempty"` - // Type - Resource type. - Type *string `json:"type,omitempty"` -} - -// MarshalJSON is the custom marshaler for RecommendedElasticPool. -func (rep RecommendedElasticPool) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]interface{}) - if rep.RecommendedElasticPoolProperties != nil { - objectMap["properties"] = rep.RecommendedElasticPoolProperties - } - if rep.ID != nil { - objectMap["id"] = rep.ID - } - if rep.Name != nil { - objectMap["name"] = rep.Name - } - if rep.Type != nil { - objectMap["type"] = rep.Type - } - return json.Marshal(objectMap) -} - -// UnmarshalJSON is the custom unmarshaler for RecommendedElasticPool struct. -func (rep *RecommendedElasticPool) UnmarshalJSON(body []byte) error { - var m map[string]*json.RawMessage - err := json.Unmarshal(body, &m) - if err != nil { - return err - } - for k, v := range m { - switch k { - case "properties": - if v != nil { - var recommendedElasticPoolProperties RecommendedElasticPoolProperties - err = json.Unmarshal(*v, &recommendedElasticPoolProperties) - if err != nil { - return err - } - rep.RecommendedElasticPoolProperties = &recommendedElasticPoolProperties - } - case "id": - if v != nil { - var ID string - err = json.Unmarshal(*v, &ID) - if err != nil { - return err - } - rep.ID = &ID - } - case "name": - if v != nil { - var name string - err = json.Unmarshal(*v, &name) - if err != nil { - return err - } - rep.Name = &name - } - case "type": - if v != nil { - var typeVar string - err = json.Unmarshal(*v, &typeVar) - if err != nil { - return err - } - rep.Type = &typeVar - } - } - } - - return nil -} - -// RecommendedElasticPoolListMetricsResult represents the response to a list recommended elastic pool metrics -// request. -type RecommendedElasticPoolListMetricsResult struct { - autorest.Response `json:"-"` - // Value - The list of recommended elastic pools metrics. - Value *[]RecommendedElasticPoolMetric `json:"value,omitempty"` -} - -// RecommendedElasticPoolListResult represents the response to a list recommended elastic pool request. -type RecommendedElasticPoolListResult struct { - autorest.Response `json:"-"` - // Value - The list of recommended elastic pools hosted in the server. - Value *[]RecommendedElasticPool `json:"value,omitempty"` -} - -// RecommendedElasticPoolMetric represents recommended elastic pool metric. -type RecommendedElasticPoolMetric struct { - // DateTime - The time of metric (ISO8601 format). - DateTime *date.Time `json:"dateTime,omitempty"` - // Dtu - Gets or sets the DTUs (Database Transaction Units). See https://azure.microsoft.com/documentation/articles/sql-database-what-is-a-dtu/ - Dtu *float64 `json:"dtu,omitempty"` - // SizeGB - Gets or sets size in gigabytes. - SizeGB *float64 `json:"sizeGB,omitempty"` -} - -// RecommendedElasticPoolProperties represents the properties of a recommented elastic pool. -type RecommendedElasticPoolProperties struct { - // DatabaseEdition - The edition of the recommended elastic pool. The ElasticPoolEdition enumeration contains all the valid editions. Possible values include: 'ElasticPoolEditionBasic', 'ElasticPoolEditionStandard', 'ElasticPoolEditionPremium' - DatabaseEdition ElasticPoolEdition `json:"databaseEdition,omitempty"` - // Dtu - The DTU for the recommended elastic pool. - Dtu *float64 `json:"dtu,omitempty"` - // DatabaseDtuMin - The minimum DTU for the database. - DatabaseDtuMin *float64 `json:"databaseDtuMin,omitempty"` - // DatabaseDtuMax - The maximum DTU for the database. - DatabaseDtuMax *float64 `json:"databaseDtuMax,omitempty"` - // StorageMB - Gets storage size in megabytes. - StorageMB *float64 `json:"storageMB,omitempty"` - // ObservationPeriodStart - The observation period start (ISO8601 format). - ObservationPeriodStart *date.Time `json:"observationPeriodStart,omitempty"` - // ObservationPeriodEnd - The observation period start (ISO8601 format). - ObservationPeriodEnd *date.Time `json:"observationPeriodEnd,omitempty"` - // MaxObservedDtu - Gets maximum observed DTU. - MaxObservedDtu *float64 `json:"maxObservedDtu,omitempty"` - // MaxObservedStorageMB - Gets maximum observed storage in megabytes. - MaxObservedStorageMB *float64 `json:"maxObservedStorageMB,omitempty"` - // Databases - The list of databases in this pool. Expanded property - Databases *[]Database `json:"databases,omitempty"` - // Metrics - The list of databases housed in the server. Expanded property - Metrics *[]RecommendedElasticPoolMetric `json:"metrics,omitempty"` -} - +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecommendedIndex represents a database recommended index. type RecommendedIndex struct { // RecommendedIndexProperties - The properties representing the resource. @@ -4958,6 +5104,7 @@ type RecommendedIndex struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for RecommendedIndex. func (ri RecommendedIndex) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4976,6 +5123,7 @@ func (ri RecommendedIndex) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for RecommendedIndex struct. func (ri *RecommendedIndex) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5027,6 +5175,7 @@ func (ri *RecommendedIndex) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecommendedIndexProperties represents the properties of a database recommended index. type RecommendedIndexProperties struct { // Action - The proposed index action. You can create a missing index, drop an unused index, or rebuild an existing index to improve its performance. Possible values include: 'Create', 'Drop', 'Rebuild' @@ -5055,6 +5204,7 @@ type RecommendedIndexProperties struct { ReportedImpact *[]OperationImpact `json:"reportedImpact,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecoverableDatabase a recoverable database type RecoverableDatabase struct { autorest.Response `json:"-"` @@ -5068,6 +5218,7 @@ type RecoverableDatabase struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for RecoverableDatabase. func (rd RecoverableDatabase) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5086,6 +5237,7 @@ func (rd RecoverableDatabase) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for RecoverableDatabase struct. func (rd *RecoverableDatabase) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5137,6 +5289,7 @@ func (rd *RecoverableDatabase) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecoverableDatabaseListResult the response to a list recoverable databases request type RecoverableDatabaseListResult struct { autorest.Response `json:"-"` @@ -5144,6 +5297,7 @@ type RecoverableDatabaseListResult struct { Value *[]RecoverableDatabase `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecoverableDatabaseProperties the properties of a recoverable database type RecoverableDatabaseProperties struct { // Edition - The edition of the database @@ -5156,6 +5310,7 @@ type RecoverableDatabaseProperties struct { LastAvailableBackupDate *date.Time `json:"lastAvailableBackupDate,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationLink represents a database replication link. type ReplicationLink struct { autorest.Response `json:"-"` @@ -5171,6 +5326,7 @@ type ReplicationLink struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ReplicationLink. func (rl ReplicationLink) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5192,6 +5348,7 @@ func (rl ReplicationLink) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ReplicationLink struct. func (rl *ReplicationLink) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5252,6 +5409,7 @@ func (rl *ReplicationLink) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationLinkListResult represents the response to a List database replication link request. type ReplicationLinkListResult struct { autorest.Response `json:"-"` @@ -5259,6 +5417,7 @@ type ReplicationLinkListResult struct { Value *[]ReplicationLink `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationLinkProperties represents the properties of a database replication link. type ReplicationLinkProperties struct { // IsTerminationAllowed - Legacy value indicating whether termination is allowed. Currently always returns true. @@ -5283,6 +5442,7 @@ type ReplicationLinkProperties struct { ReplicationState ReplicationState `json:"replicationState,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationLinksFailoverAllowDataLossFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type ReplicationLinksFailoverAllowDataLossFuture struct { @@ -5290,6 +5450,7 @@ type ReplicationLinksFailoverAllowDataLossFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ReplicationLinksFailoverAllowDataLossFuture) Result(client ReplicationLinksClient) (ar autorest.Response, err error) { @@ -5332,6 +5493,7 @@ func (future ReplicationLinksFailoverAllowDataLossFuture) Result(client Replicat return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationLinksFailoverFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ReplicationLinksFailoverFuture struct { @@ -5339,6 +5501,7 @@ type ReplicationLinksFailoverFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ReplicationLinksFailoverFuture) Result(client ReplicationLinksClient) (ar autorest.Response, err error) { @@ -5381,6 +5544,7 @@ func (future ReplicationLinksFailoverFuture) Result(client ReplicationLinksClien return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Resource ARM resource. type Resource struct { // ID - Resource ID. @@ -5391,6 +5555,7 @@ type Resource struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ResourceIdentity azure Active Directory identity configuration for a resource. type ResourceIdentity struct { // PrincipalID - The Azure Active Directory principal id. @@ -5401,6 +5566,7 @@ type ResourceIdentity struct { TenantID *uuid.UUID `json:"tenantId,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorableDroppedDatabase a restorable dropped database type RestorableDroppedDatabase struct { autorest.Response `json:"-"` @@ -5416,6 +5582,7 @@ type RestorableDroppedDatabase struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for RestorableDroppedDatabase. func (rdd RestorableDroppedDatabase) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5437,6 +5604,7 @@ func (rdd RestorableDroppedDatabase) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for RestorableDroppedDatabase struct. func (rdd *RestorableDroppedDatabase) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5497,6 +5665,7 @@ func (rdd *RestorableDroppedDatabase) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorableDroppedDatabaseListResult the response to a list restorable dropped databases request type RestorableDroppedDatabaseListResult struct { autorest.Response `json:"-"` @@ -5504,6 +5673,7 @@ type RestorableDroppedDatabaseListResult struct { Value *[]RestorableDroppedDatabase `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorableDroppedDatabaseProperties the properties of a restorable dropped database type RestorableDroppedDatabaseProperties struct { // DatabaseName - The name of the database @@ -5524,6 +5694,7 @@ type RestorableDroppedDatabaseProperties struct { EarliestRestoreDate *date.Time `json:"earliestRestoreDate,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorePoint a database restore point. type RestorePoint struct { // RestorePointProperties - The properties of the restore point. @@ -5536,6 +5707,7 @@ type RestorePoint struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for RestorePoint. func (rp RestorePoint) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5554,6 +5726,7 @@ func (rp RestorePoint) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for RestorePoint struct. func (rp *RestorePoint) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5605,6 +5778,7 @@ func (rp *RestorePoint) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorePointListResult the response to a list database restore points request. type RestorePointListResult struct { autorest.Response `json:"-"` @@ -5612,6 +5786,7 @@ type RestorePointListResult struct { Value *[]RestorePoint `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorePointProperties represents the properties of a database restore point. type RestorePointProperties struct { // RestorePointType - The restore point type of the database restore point. Possible values include: 'DISCRETE', 'CONTINUOUS' @@ -5622,6 +5797,7 @@ type RestorePointProperties struct { EarliestRestoreDate *date.Time `json:"earliestRestoreDate,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Server an Azure SQL Database server. type Server struct { autorest.Response `json:"-"` @@ -5643,6 +5819,7 @@ type Server struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for Server. func (s Server) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5673,6 +5850,7 @@ func (s Server) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for Server struct. func (s *Server) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5760,6 +5938,7 @@ func (s *Server) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerAdministratorListResult the response to a list Active Directory Administrators request. type ServerAdministratorListResult struct { autorest.Response `json:"-"` @@ -5767,6 +5946,7 @@ type ServerAdministratorListResult struct { Value *[]ServerAzureADAdministrator `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerAdministratorProperties the properties of an server Administrator. type ServerAdministratorProperties struct { // AdministratorType - The type of administrator. @@ -5779,6 +5959,7 @@ type ServerAdministratorProperties struct { TenantID *uuid.UUID `json:"tenantId,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerAzureADAdministrator an server Active Directory Administrator. type ServerAzureADAdministrator struct { autorest.Response `json:"-"` @@ -5792,6 +5973,7 @@ type ServerAzureADAdministrator struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServerAzureADAdministrator. func (saaa ServerAzureADAdministrator) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5810,6 +5992,7 @@ func (saaa ServerAzureADAdministrator) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServerAzureADAdministrator struct. func (saaa *ServerAzureADAdministrator) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5861,6 +6044,7 @@ func (saaa *ServerAzureADAdministrator) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerAzureADAdministratorsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type ServerAzureADAdministratorsCreateOrUpdateFuture struct { @@ -5868,6 +6052,7 @@ type ServerAzureADAdministratorsCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServerAzureADAdministratorsCreateOrUpdateFuture) Result(client ServerAzureADAdministratorsClient) (saaa ServerAzureADAdministrator, err error) { @@ -5910,6 +6095,7 @@ func (future ServerAzureADAdministratorsCreateOrUpdateFuture) Result(client Serv return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerAzureADAdministratorsDeleteFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type ServerAzureADAdministratorsDeleteFuture struct { @@ -5917,6 +6103,7 @@ type ServerAzureADAdministratorsDeleteFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServerAzureADAdministratorsDeleteFuture) Result(client ServerAzureADAdministratorsClient) (saaa ServerAzureADAdministrator, err error) { @@ -5959,6 +6146,7 @@ func (future ServerAzureADAdministratorsDeleteFuture) Result(client ServerAzureA return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerCommunicationLink server communication link. type ServerCommunicationLink struct { autorest.Response `json:"-"` @@ -5976,6 +6164,7 @@ type ServerCommunicationLink struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServerCommunicationLink. func (scl ServerCommunicationLink) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -6000,6 +6189,7 @@ func (scl ServerCommunicationLink) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServerCommunicationLink struct. func (scl *ServerCommunicationLink) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -6069,6 +6259,7 @@ func (scl *ServerCommunicationLink) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerCommunicationLinkListResult a list of server communication links. type ServerCommunicationLinkListResult struct { autorest.Response `json:"-"` @@ -6076,6 +6267,7 @@ type ServerCommunicationLinkListResult struct { Value *[]ServerCommunicationLink `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerCommunicationLinkProperties the properties of a server communication link. type ServerCommunicationLinkProperties struct { // State - The state. @@ -6084,6 +6276,7 @@ type ServerCommunicationLinkProperties struct { PartnerServer *string `json:"partnerServer,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerCommunicationLinksCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type ServerCommunicationLinksCreateOrUpdateFuture struct { @@ -6091,6 +6284,7 @@ type ServerCommunicationLinksCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServerCommunicationLinksCreateOrUpdateFuture) Result(client ServerCommunicationLinksClient) (scl ServerCommunicationLink, err error) { @@ -6133,6 +6327,7 @@ func (future ServerCommunicationLinksCreateOrUpdateFuture) Result(client ServerC return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerConnectionPolicy a server secure connection policy. type ServerConnectionPolicy struct { autorest.Response `json:"-"` @@ -6150,6 +6345,7 @@ type ServerConnectionPolicy struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServerConnectionPolicy. func (scp ServerConnectionPolicy) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -6174,6 +6370,7 @@ func (scp ServerConnectionPolicy) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServerConnectionPolicy struct. func (scp *ServerConnectionPolicy) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -6243,12 +6440,14 @@ func (scp *ServerConnectionPolicy) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerConnectionPolicyProperties the properties of a server secure connection policy. type ServerConnectionPolicyProperties struct { // ConnectionType - The server connection type. Possible values include: 'ServerConnectionTypeDefault', 'ServerConnectionTypeProxy', 'ServerConnectionTypeRedirect' ConnectionType ServerConnectionType `json:"connectionType,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKey a server key. type ServerKey struct { autorest.Response `json:"-"` @@ -6266,6 +6465,7 @@ type ServerKey struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServerKey. func (sk ServerKey) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -6290,6 +6490,7 @@ func (sk ServerKey) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServerKey struct. func (sk *ServerKey) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -6359,6 +6560,7 @@ func (sk *ServerKey) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeyListResult a list of server keys. type ServerKeyListResult struct { autorest.Response `json:"-"` @@ -6368,12 +6570,14 @@ type ServerKeyListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeyListResultIterator provides access to a complete listing of ServerKey values. type ServerKeyListResultIterator struct { i int page ServerKeyListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *ServerKeyListResultIterator) Next() error { @@ -6390,16 +6594,19 @@ func (iter *ServerKeyListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter ServerKeyListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter ServerKeyListResultIterator) Response() ServerKeyListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter ServerKeyListResultIterator) Value() ServerKey { @@ -6409,6 +6616,7 @@ func (iter ServerKeyListResultIterator) Value() ServerKey { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (sklr ServerKeyListResult) IsEmpty() bool { return sklr.Value == nil || len(*sklr.Value) == 0 @@ -6426,12 +6634,14 @@ func (sklr ServerKeyListResult) serverKeyListResultPreparer() (*http.Request, er autorest.WithBaseURL(to.String(sklr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeyListResultPage contains a page of ServerKey values. type ServerKeyListResultPage struct { fn func(ServerKeyListResult) (ServerKeyListResult, error) sklr ServerKeyListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *ServerKeyListResultPage) Next() error { @@ -6443,16 +6653,19 @@ func (page *ServerKeyListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page ServerKeyListResultPage) NotDone() bool { return !page.sklr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page ServerKeyListResultPage) Response() ServerKeyListResult { return page.sklr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page ServerKeyListResultPage) Values() []ServerKey { if page.sklr.IsEmpty() { @@ -6461,6 +6674,7 @@ func (page ServerKeyListResultPage) Values() []ServerKey { return *page.sklr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeyProperties properties for a server key execution. type ServerKeyProperties struct { // Subregion - Subregion of the server key. @@ -6475,6 +6689,7 @@ type ServerKeyProperties struct { CreationDate *date.Time `json:"creationDate,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ServerKeysCreateOrUpdateFuture struct { @@ -6482,6 +6697,7 @@ type ServerKeysCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServerKeysCreateOrUpdateFuture) Result(client ServerKeysClient) (sk ServerKey, err error) { @@ -6524,12 +6740,14 @@ func (future ServerKeysCreateOrUpdateFuture) Result(client ServerKeysClient) (sk return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServerKeysDeleteFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServerKeysDeleteFuture) Result(client ServerKeysClient) (ar autorest.Response, err error) { @@ -6572,6 +6790,7 @@ func (future ServerKeysDeleteFuture) Result(client ServerKeysClient) (ar autores return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerListResult a list of servers. type ServerListResult struct { autorest.Response `json:"-"` @@ -6581,12 +6800,14 @@ type ServerListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerListResultIterator provides access to a complete listing of Server values. type ServerListResultIterator struct { i int page ServerListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *ServerListResultIterator) Next() error { @@ -6603,16 +6824,19 @@ func (iter *ServerListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter ServerListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter ServerListResultIterator) Response() ServerListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter ServerListResultIterator) Value() Server { @@ -6622,6 +6846,7 @@ func (iter ServerListResultIterator) Value() Server { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (slr ServerListResult) IsEmpty() bool { return slr.Value == nil || len(*slr.Value) == 0 @@ -6639,12 +6864,14 @@ func (slr ServerListResult) serverListResultPreparer() (*http.Request, error) { autorest.WithBaseURL(to.String(slr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerListResultPage contains a page of Server values. type ServerListResultPage struct { fn func(ServerListResult) (ServerListResult, error) slr ServerListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *ServerListResultPage) Next() error { @@ -6656,16 +6883,19 @@ func (page *ServerListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page ServerListResultPage) NotDone() bool { return !page.slr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page ServerListResultPage) Response() ServerListResult { return page.slr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page ServerListResultPage) Values() []Server { if page.slr.IsEmpty() { @@ -6674,6 +6904,7 @@ func (page ServerListResultPage) Values() []Server { return *page.slr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerProperties the properties of a server. type ServerProperties struct { // AdministratorLogin - Administrator username for the server. Once created it cannot be changed. @@ -6688,6 +6919,7 @@ type ServerProperties struct { FullyQualifiedDomainName *string `json:"fullyQualifiedDomainName,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ServersCreateOrUpdateFuture struct { @@ -6695,6 +6927,7 @@ type ServersCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServersCreateOrUpdateFuture) Result(client ServersClient) (s Server, err error) { @@ -6737,12 +6970,14 @@ func (future ServersCreateOrUpdateFuture) Result(client ServersClient) (s Server return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServersDeleteFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServersDeleteFuture) Result(client ServersClient) (ar autorest.Response, err error) { @@ -6785,12 +7020,14 @@ func (future ServersDeleteFuture) Result(client ServersClient) (ar autorest.Resp return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServersUpdateFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServersUpdateFuture) Result(client ServersClient) (s Server, err error) { @@ -6833,6 +7070,7 @@ func (future ServersUpdateFuture) Result(client ServersClient) (s Server, err er return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerUpdate an update request for an Azure SQL Database server. type ServerUpdate struct { // ServerProperties - Resource properties. @@ -6841,6 +7079,7 @@ type ServerUpdate struct { Tags map[string]*string `json:"tags"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServerUpdate. func (su ServerUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -6853,6 +7092,7 @@ func (su ServerUpdate) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServerUpdate struct. func (su *ServerUpdate) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -6886,6 +7126,7 @@ func (su *ServerUpdate) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerUsage represents server metrics. type ServerUsage struct { // Name - Name of the server usage metric. @@ -6904,6 +7145,7 @@ type ServerUsage struct { NextResetTime *date.Time `json:"nextResetTime,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerUsageListResult represents the response to a list server metrics request. type ServerUsageListResult struct { autorest.Response `json:"-"` @@ -6911,6 +7153,7 @@ type ServerUsageListResult struct { Value *[]ServerUsage `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerVersionCapability the server capability type ServerVersionCapability struct { // Name - The server version name. @@ -6925,6 +7168,7 @@ type ServerVersionCapability struct { Reason *string `json:"reason,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceLevelObjectiveCapability the service objectives capability. type ServiceLevelObjectiveCapability struct { // ID - The unique ID of the service objective. @@ -6943,6 +7187,7 @@ type ServiceLevelObjectiveCapability struct { Reason *string `json:"reason,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceObjective represents a database service objective. type ServiceObjective struct { autorest.Response `json:"-"` @@ -6956,6 +7201,7 @@ type ServiceObjective struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServiceObjective. func (so ServiceObjective) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -6974,6 +7220,7 @@ func (so ServiceObjective) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServiceObjective struct. func (so *ServiceObjective) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -7025,6 +7272,7 @@ func (so *ServiceObjective) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceObjectiveListResult represents the response to a get database service objectives request. type ServiceObjectiveListResult struct { autorest.Response `json:"-"` @@ -7032,6 +7280,7 @@ type ServiceObjectiveListResult struct { Value *[]ServiceObjective `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceObjectiveProperties represents the properties of a database service objective. type ServiceObjectiveProperties struct { // ServiceObjectiveName - The name for the service objective. @@ -7046,6 +7295,7 @@ type ServiceObjectiveProperties struct { Enabled *bool `json:"enabled,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceTierAdvisor represents a Service Tier Advisor. type ServiceTierAdvisor struct { autorest.Response `json:"-"` @@ -7059,6 +7309,7 @@ type ServiceTierAdvisor struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServiceTierAdvisor. func (sta ServiceTierAdvisor) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -7077,6 +7328,7 @@ func (sta ServiceTierAdvisor) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServiceTierAdvisor struct. func (sta *ServiceTierAdvisor) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -7128,6 +7380,7 @@ func (sta *ServiceTierAdvisor) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceTierAdvisorListResult represents the response to a list service tier advisor request. type ServiceTierAdvisorListResult struct { autorest.Response `json:"-"` @@ -7135,6 +7388,7 @@ type ServiceTierAdvisorListResult struct { Value *[]ServiceTierAdvisor `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceTierAdvisorProperties represents the properties of a Service Tier Advisor. type ServiceTierAdvisorProperties struct { // ObservationPeriodStart - The observation period start (ISO8601 format). @@ -7177,6 +7431,7 @@ type ServiceTierAdvisorProperties struct { Confidence *float64 `json:"confidence,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SloUsageMetric a Slo Usage Metric. type SloUsageMetric struct { // ServiceLevelObjective - The serviceLevelObjective for SLO usage metric. Possible values include: 'ServiceObjectiveNameSystem', 'ServiceObjectiveNameSystem0', 'ServiceObjectiveNameSystem1', 'ServiceObjectiveNameSystem2', 'ServiceObjectiveNameSystem3', 'ServiceObjectiveNameSystem4', 'ServiceObjectiveNameSystem2L', 'ServiceObjectiveNameSystem3L', 'ServiceObjectiveNameSystem4L', 'ServiceObjectiveNameFree', 'ServiceObjectiveNameBasic', 'ServiceObjectiveNameS0', 'ServiceObjectiveNameS1', 'ServiceObjectiveNameS2', 'ServiceObjectiveNameS3', 'ServiceObjectiveNameS4', 'ServiceObjectiveNameS6', 'ServiceObjectiveNameS7', 'ServiceObjectiveNameS9', 'ServiceObjectiveNameS12', 'ServiceObjectiveNameP1', 'ServiceObjectiveNameP2', 'ServiceObjectiveNameP3', 'ServiceObjectiveNameP4', 'ServiceObjectiveNameP6', 'ServiceObjectiveNameP11', 'ServiceObjectiveNameP15', 'ServiceObjectiveNamePRS1', 'ServiceObjectiveNamePRS2', 'ServiceObjectiveNamePRS4', 'ServiceObjectiveNamePRS6', 'ServiceObjectiveNameDW100', 'ServiceObjectiveNameDW200', 'ServiceObjectiveNameDW300', 'ServiceObjectiveNameDW400', 'ServiceObjectiveNameDW500', 'ServiceObjectiveNameDW600', 'ServiceObjectiveNameDW1000', 'ServiceObjectiveNameDW1200', 'ServiceObjectiveNameDW1000c', 'ServiceObjectiveNameDW1500', 'ServiceObjectiveNameDW1500c', 'ServiceObjectiveNameDW2000', 'ServiceObjectiveNameDW2000c', 'ServiceObjectiveNameDW3000', 'ServiceObjectiveNameDW2500c', 'ServiceObjectiveNameDW3000c', 'ServiceObjectiveNameDW6000', 'ServiceObjectiveNameDW5000c', 'ServiceObjectiveNameDW6000c', 'ServiceObjectiveNameDW7500c', 'ServiceObjectiveNameDW10000c', 'ServiceObjectiveNameDW15000c', 'ServiceObjectiveNameDW30000c', 'ServiceObjectiveNameDS100', 'ServiceObjectiveNameDS200', 'ServiceObjectiveNameDS300', 'ServiceObjectiveNameDS400', 'ServiceObjectiveNameDS500', 'ServiceObjectiveNameDS600', 'ServiceObjectiveNameDS1000', 'ServiceObjectiveNameDS1200', 'ServiceObjectiveNameDS1500', 'ServiceObjectiveNameDS2000', 'ServiceObjectiveNameElasticPool' @@ -7187,6 +7442,7 @@ type SloUsageMetric struct { InRangeTimeRatio *float64 `json:"inRangeTimeRatio,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SubscriptionUsage usage Metric of a Subscription in a Location. type SubscriptionUsage struct { autorest.Response `json:"-"` @@ -7200,6 +7456,7 @@ type SubscriptionUsage struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for SubscriptionUsage. func (su SubscriptionUsage) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -7218,6 +7475,7 @@ func (su SubscriptionUsage) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for SubscriptionUsage struct. func (su *SubscriptionUsage) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -7269,6 +7527,7 @@ func (su *SubscriptionUsage) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SubscriptionUsageListResult a list of subscription usage metrics in a location. type SubscriptionUsageListResult struct { autorest.Response `json:"-"` @@ -7278,12 +7537,14 @@ type SubscriptionUsageListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SubscriptionUsageListResultIterator provides access to a complete listing of SubscriptionUsage values. type SubscriptionUsageListResultIterator struct { i int page SubscriptionUsageListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SubscriptionUsageListResultIterator) Next() error { @@ -7300,16 +7561,19 @@ func (iter *SubscriptionUsageListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SubscriptionUsageListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SubscriptionUsageListResultIterator) Response() SubscriptionUsageListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SubscriptionUsageListResultIterator) Value() SubscriptionUsage { @@ -7319,6 +7583,7 @@ func (iter SubscriptionUsageListResultIterator) Value() SubscriptionUsage { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (sulr SubscriptionUsageListResult) IsEmpty() bool { return sulr.Value == nil || len(*sulr.Value) == 0 @@ -7336,12 +7601,14 @@ func (sulr SubscriptionUsageListResult) subscriptionUsageListResultPreparer() (* autorest.WithBaseURL(to.String(sulr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SubscriptionUsageListResultPage contains a page of SubscriptionUsage values. type SubscriptionUsageListResultPage struct { fn func(SubscriptionUsageListResult) (SubscriptionUsageListResult, error) sulr SubscriptionUsageListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SubscriptionUsageListResultPage) Next() error { @@ -7353,16 +7620,19 @@ func (page *SubscriptionUsageListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SubscriptionUsageListResultPage) NotDone() bool { return !page.sulr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SubscriptionUsageListResultPage) Response() SubscriptionUsageListResult { return page.sulr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SubscriptionUsageListResultPage) Values() []SubscriptionUsage { if page.sulr.IsEmpty() { @@ -7371,6 +7641,7 @@ func (page SubscriptionUsageListResultPage) Values() []SubscriptionUsage { return *page.sulr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SubscriptionUsageProperties properties of a subscription usage. type SubscriptionUsageProperties struct { // DisplayName - User-readable name of the metric. @@ -7383,6 +7654,7 @@ type SubscriptionUsageProperties struct { Unit *string `json:"unit,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgent an Azure SQL Database sync agent. type SyncAgent struct { autorest.Response `json:"-"` @@ -7396,6 +7668,7 @@ type SyncAgent struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for SyncAgent. func (sa SyncAgent) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -7414,6 +7687,7 @@ func (sa SyncAgent) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for SyncAgent struct. func (sa *SyncAgent) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -7465,6 +7739,7 @@ func (sa *SyncAgent) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentKeyProperties properties of an Azure SQL Database sync agent key. type SyncAgentKeyProperties struct { autorest.Response `json:"-"` @@ -7472,6 +7747,7 @@ type SyncAgentKeyProperties struct { SyncAgentKey *string `json:"syncAgentKey,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentLinkedDatabase an Azure SQL Database sync agent linked database. type SyncAgentLinkedDatabase struct { // SyncAgentLinkedDatabaseProperties - Resource properties. @@ -7484,6 +7760,7 @@ type SyncAgentLinkedDatabase struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for SyncAgentLinkedDatabase. func (sald SyncAgentLinkedDatabase) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -7502,6 +7779,7 @@ func (sald SyncAgentLinkedDatabase) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for SyncAgentLinkedDatabase struct. func (sald *SyncAgentLinkedDatabase) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -7553,6 +7831,7 @@ func (sald *SyncAgentLinkedDatabase) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentLinkedDatabaseListResult a list of sync agent linked databases. type SyncAgentLinkedDatabaseListResult struct { autorest.Response `json:"-"` @@ -7562,6 +7841,7 @@ type SyncAgentLinkedDatabaseListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentLinkedDatabaseListResultIterator provides access to a complete listing of SyncAgentLinkedDatabase // values. type SyncAgentLinkedDatabaseListResultIterator struct { @@ -7569,6 +7849,7 @@ type SyncAgentLinkedDatabaseListResultIterator struct { page SyncAgentLinkedDatabaseListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncAgentLinkedDatabaseListResultIterator) Next() error { @@ -7585,16 +7866,19 @@ func (iter *SyncAgentLinkedDatabaseListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncAgentLinkedDatabaseListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncAgentLinkedDatabaseListResultIterator) Response() SyncAgentLinkedDatabaseListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncAgentLinkedDatabaseListResultIterator) Value() SyncAgentLinkedDatabase { @@ -7604,6 +7888,7 @@ func (iter SyncAgentLinkedDatabaseListResultIterator) Value() SyncAgentLinkedDat return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (saldlr SyncAgentLinkedDatabaseListResult) IsEmpty() bool { return saldlr.Value == nil || len(*saldlr.Value) == 0 @@ -7621,12 +7906,14 @@ func (saldlr SyncAgentLinkedDatabaseListResult) syncAgentLinkedDatabaseListResul autorest.WithBaseURL(to.String(saldlr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentLinkedDatabaseListResultPage contains a page of SyncAgentLinkedDatabase values. type SyncAgentLinkedDatabaseListResultPage struct { fn func(SyncAgentLinkedDatabaseListResult) (SyncAgentLinkedDatabaseListResult, error) saldlr SyncAgentLinkedDatabaseListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncAgentLinkedDatabaseListResultPage) Next() error { @@ -7638,16 +7925,19 @@ func (page *SyncAgentLinkedDatabaseListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncAgentLinkedDatabaseListResultPage) NotDone() bool { return !page.saldlr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncAgentLinkedDatabaseListResultPage) Response() SyncAgentLinkedDatabaseListResult { return page.saldlr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncAgentLinkedDatabaseListResultPage) Values() []SyncAgentLinkedDatabase { if page.saldlr.IsEmpty() { @@ -7656,6 +7946,7 @@ func (page SyncAgentLinkedDatabaseListResultPage) Values() []SyncAgentLinkedData return *page.saldlr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentLinkedDatabaseProperties properties of an Azure SQL Database sync agent linked database. type SyncAgentLinkedDatabaseProperties struct { // DatabaseType - Type of the sync agent linked database. Possible values include: 'AzureSQLDatabase', 'SQLServerDatabase' @@ -7672,6 +7963,7 @@ type SyncAgentLinkedDatabaseProperties struct { UserName *string `json:"userName,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentListResult a list of sync agents. type SyncAgentListResult struct { autorest.Response `json:"-"` @@ -7681,12 +7973,14 @@ type SyncAgentListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentListResultIterator provides access to a complete listing of SyncAgent values. type SyncAgentListResultIterator struct { i int page SyncAgentListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncAgentListResultIterator) Next() error { @@ -7703,16 +7997,19 @@ func (iter *SyncAgentListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncAgentListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncAgentListResultIterator) Response() SyncAgentListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncAgentListResultIterator) Value() SyncAgent { @@ -7722,6 +8019,7 @@ func (iter SyncAgentListResultIterator) Value() SyncAgent { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (salr SyncAgentListResult) IsEmpty() bool { return salr.Value == nil || len(*salr.Value) == 0 @@ -7739,12 +8037,14 @@ func (salr SyncAgentListResult) syncAgentListResultPreparer() (*http.Request, er autorest.WithBaseURL(to.String(salr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentListResultPage contains a page of SyncAgent values. type SyncAgentListResultPage struct { fn func(SyncAgentListResult) (SyncAgentListResult, error) salr SyncAgentListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncAgentListResultPage) Next() error { @@ -7756,16 +8056,19 @@ func (page *SyncAgentListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncAgentListResultPage) NotDone() bool { return !page.salr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncAgentListResultPage) Response() SyncAgentListResult { return page.salr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncAgentListResultPage) Values() []SyncAgent { if page.salr.IsEmpty() { @@ -7774,6 +8077,7 @@ func (page SyncAgentListResultPage) Values() []SyncAgent { return *page.salr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentProperties properties of an Azure SQL Database sync agent. type SyncAgentProperties struct { // Name - Name of the sync agent. @@ -7792,6 +8096,7 @@ type SyncAgentProperties struct { Version *string `json:"version,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type SyncAgentsCreateOrUpdateFuture struct { @@ -7799,6 +8104,7 @@ type SyncAgentsCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncAgentsCreateOrUpdateFuture) Result(client SyncAgentsClient) (sa SyncAgent, err error) { @@ -7841,12 +8147,14 @@ func (future SyncAgentsCreateOrUpdateFuture) Result(client SyncAgentsClient) (sa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncAgentsDeleteFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncAgentsDeleteFuture) Result(client SyncAgentsClient) (ar autorest.Response, err error) { @@ -7889,6 +8197,7 @@ func (future SyncAgentsDeleteFuture) Result(client SyncAgentsClient) (ar autores return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncDatabaseIDListResult a list of sync database ID properties. type SyncDatabaseIDListResult struct { autorest.Response `json:"-"` @@ -7898,12 +8207,14 @@ type SyncDatabaseIDListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncDatabaseIDListResultIterator provides access to a complete listing of SyncDatabaseIDProperties values. type SyncDatabaseIDListResultIterator struct { i int page SyncDatabaseIDListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncDatabaseIDListResultIterator) Next() error { @@ -7920,16 +8231,19 @@ func (iter *SyncDatabaseIDListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncDatabaseIDListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncDatabaseIDListResultIterator) Response() SyncDatabaseIDListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncDatabaseIDListResultIterator) Value() SyncDatabaseIDProperties { @@ -7939,6 +8253,7 @@ func (iter SyncDatabaseIDListResultIterator) Value() SyncDatabaseIDProperties { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (sdilr SyncDatabaseIDListResult) IsEmpty() bool { return sdilr.Value == nil || len(*sdilr.Value) == 0 @@ -7956,12 +8271,14 @@ func (sdilr SyncDatabaseIDListResult) syncDatabaseIDListResultPreparer() (*http. autorest.WithBaseURL(to.String(sdilr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncDatabaseIDListResultPage contains a page of SyncDatabaseIDProperties values. type SyncDatabaseIDListResultPage struct { fn func(SyncDatabaseIDListResult) (SyncDatabaseIDListResult, error) sdilr SyncDatabaseIDListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncDatabaseIDListResultPage) Next() error { @@ -7973,16 +8290,19 @@ func (page *SyncDatabaseIDListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncDatabaseIDListResultPage) NotDone() bool { return !page.sdilr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncDatabaseIDListResultPage) Response() SyncDatabaseIDListResult { return page.sdilr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncDatabaseIDListResultPage) Values() []SyncDatabaseIDProperties { if page.sdilr.IsEmpty() { @@ -7991,12 +8311,14 @@ func (page SyncDatabaseIDListResultPage) Values() []SyncDatabaseIDProperties { return *page.sdilr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncDatabaseIDProperties properties of the sync database id. type SyncDatabaseIDProperties struct { // ID - ARM resource id of sync database. ID *string `json:"id,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncFullSchemaProperties properties of the database full schema. type SyncFullSchemaProperties struct { // Tables - List of tables in the database full schema. @@ -8005,6 +8327,7 @@ type SyncFullSchemaProperties struct { LastUpdateTime *date.Time `json:"lastUpdateTime,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncFullSchemaPropertiesListResult a list of sync schema properties. type SyncFullSchemaPropertiesListResult struct { autorest.Response `json:"-"` @@ -8014,6 +8337,7 @@ type SyncFullSchemaPropertiesListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncFullSchemaPropertiesListResultIterator provides access to a complete listing of SyncFullSchemaProperties // values. type SyncFullSchemaPropertiesListResultIterator struct { @@ -8021,6 +8345,7 @@ type SyncFullSchemaPropertiesListResultIterator struct { page SyncFullSchemaPropertiesListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncFullSchemaPropertiesListResultIterator) Next() error { @@ -8037,16 +8362,19 @@ func (iter *SyncFullSchemaPropertiesListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncFullSchemaPropertiesListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncFullSchemaPropertiesListResultIterator) Response() SyncFullSchemaPropertiesListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncFullSchemaPropertiesListResultIterator) Value() SyncFullSchemaProperties { @@ -8056,6 +8384,7 @@ func (iter SyncFullSchemaPropertiesListResultIterator) Value() SyncFullSchemaPro return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (sfsplr SyncFullSchemaPropertiesListResult) IsEmpty() bool { return sfsplr.Value == nil || len(*sfsplr.Value) == 0 @@ -8073,12 +8402,14 @@ func (sfsplr SyncFullSchemaPropertiesListResult) syncFullSchemaPropertiesListRes autorest.WithBaseURL(to.String(sfsplr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncFullSchemaPropertiesListResultPage contains a page of SyncFullSchemaProperties values. type SyncFullSchemaPropertiesListResultPage struct { fn func(SyncFullSchemaPropertiesListResult) (SyncFullSchemaPropertiesListResult, error) sfsplr SyncFullSchemaPropertiesListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncFullSchemaPropertiesListResultPage) Next() error { @@ -8090,16 +8421,19 @@ func (page *SyncFullSchemaPropertiesListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncFullSchemaPropertiesListResultPage) NotDone() bool { return !page.sfsplr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncFullSchemaPropertiesListResultPage) Response() SyncFullSchemaPropertiesListResult { return page.sfsplr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncFullSchemaPropertiesListResultPage) Values() []SyncFullSchemaProperties { if page.sfsplr.IsEmpty() { @@ -8108,6 +8442,7 @@ func (page SyncFullSchemaPropertiesListResultPage) Values() []SyncFullSchemaProp return *page.sfsplr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncFullSchemaTable properties of the table in the database full schema. type SyncFullSchemaTable struct { // Columns - List of columns in the table of database full schema. @@ -8122,6 +8457,7 @@ type SyncFullSchemaTable struct { QuotedName *string `json:"quotedName,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncFullSchemaTableColumn properties of the column in the table of database full schema. type SyncFullSchemaTableColumn struct { // DataSize - Data size of the column. @@ -8140,6 +8476,7 @@ type SyncFullSchemaTableColumn struct { QuotedName *string `json:"quotedName,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroup an Azure SQL Database sync group. type SyncGroup struct { autorest.Response `json:"-"` @@ -8153,6 +8490,7 @@ type SyncGroup struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for SyncGroup. func (sg SyncGroup) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -8171,6 +8509,7 @@ func (sg SyncGroup) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for SyncGroup struct. func (sg *SyncGroup) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -8222,6 +8561,7 @@ func (sg *SyncGroup) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupListResult a list of sync groups. type SyncGroupListResult struct { autorest.Response `json:"-"` @@ -8231,12 +8571,14 @@ type SyncGroupListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupListResultIterator provides access to a complete listing of SyncGroup values. type SyncGroupListResultIterator struct { i int page SyncGroupListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncGroupListResultIterator) Next() error { @@ -8253,16 +8595,19 @@ func (iter *SyncGroupListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncGroupListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncGroupListResultIterator) Response() SyncGroupListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncGroupListResultIterator) Value() SyncGroup { @@ -8272,6 +8617,7 @@ func (iter SyncGroupListResultIterator) Value() SyncGroup { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (sglr SyncGroupListResult) IsEmpty() bool { return sglr.Value == nil || len(*sglr.Value) == 0 @@ -8289,12 +8635,14 @@ func (sglr SyncGroupListResult) syncGroupListResultPreparer() (*http.Request, er autorest.WithBaseURL(to.String(sglr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupListResultPage contains a page of SyncGroup values. type SyncGroupListResultPage struct { fn func(SyncGroupListResult) (SyncGroupListResult, error) sglr SyncGroupListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncGroupListResultPage) Next() error { @@ -8306,16 +8654,19 @@ func (page *SyncGroupListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncGroupListResultPage) NotDone() bool { return !page.sglr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncGroupListResultPage) Response() SyncGroupListResult { return page.sglr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncGroupListResultPage) Values() []SyncGroup { if page.sglr.IsEmpty() { @@ -8324,6 +8675,7 @@ func (page SyncGroupListResultPage) Values() []SyncGroup { return *page.sglr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupLogListResult a list of sync group log properties. type SyncGroupLogListResult struct { autorest.Response `json:"-"` @@ -8333,12 +8685,14 @@ type SyncGroupLogListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupLogListResultIterator provides access to a complete listing of SyncGroupLogProperties values. type SyncGroupLogListResultIterator struct { i int page SyncGroupLogListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncGroupLogListResultIterator) Next() error { @@ -8355,16 +8709,19 @@ func (iter *SyncGroupLogListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncGroupLogListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncGroupLogListResultIterator) Response() SyncGroupLogListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncGroupLogListResultIterator) Value() SyncGroupLogProperties { @@ -8374,6 +8731,7 @@ func (iter SyncGroupLogListResultIterator) Value() SyncGroupLogProperties { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (sgllr SyncGroupLogListResult) IsEmpty() bool { return sgllr.Value == nil || len(*sgllr.Value) == 0 @@ -8391,12 +8749,14 @@ func (sgllr SyncGroupLogListResult) syncGroupLogListResultPreparer() (*http.Requ autorest.WithBaseURL(to.String(sgllr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupLogListResultPage contains a page of SyncGroupLogProperties values. type SyncGroupLogListResultPage struct { fn func(SyncGroupLogListResult) (SyncGroupLogListResult, error) sgllr SyncGroupLogListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncGroupLogListResultPage) Next() error { @@ -8408,16 +8768,19 @@ func (page *SyncGroupLogListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncGroupLogListResultPage) NotDone() bool { return !page.sgllr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncGroupLogListResultPage) Response() SyncGroupLogListResult { return page.sgllr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncGroupLogListResultPage) Values() []SyncGroupLogProperties { if page.sgllr.IsEmpty() { @@ -8426,6 +8789,7 @@ func (page SyncGroupLogListResultPage) Values() []SyncGroupLogProperties { return *page.sgllr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupLogProperties properties of an Azure SQL Database sync group log. type SyncGroupLogProperties struct { // Timestamp - Timestamp of the sync group log. @@ -8442,6 +8806,7 @@ type SyncGroupLogProperties struct { OperationStatus *string `json:"operationStatus,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupProperties properties of a sync group. type SyncGroupProperties struct { // Interval - Sync interval of the sync group. @@ -8462,6 +8827,7 @@ type SyncGroupProperties struct { Schema *SyncGroupSchema `json:"schema,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupSchema properties of sync group schema. type SyncGroupSchema struct { // Tables - List of tables in sync group schema. @@ -8470,6 +8836,7 @@ type SyncGroupSchema struct { MasterSyncMemberName *string `json:"masterSyncMemberName,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupSchemaTable properties of table in sync group schema. type SyncGroupSchemaTable struct { // Columns - List of columns in sync group schema. @@ -8478,6 +8845,7 @@ type SyncGroupSchemaTable struct { QuotedName *string `json:"quotedName,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupSchemaTableColumn properties of column in sync group table. type SyncGroupSchemaTableColumn struct { // QuotedName - Quoted name of sync group table column. @@ -8488,6 +8856,7 @@ type SyncGroupSchemaTableColumn struct { DataType *string `json:"dataType,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type SyncGroupsCreateOrUpdateFuture struct { @@ -8495,6 +8864,7 @@ type SyncGroupsCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncGroupsCreateOrUpdateFuture) Result(client SyncGroupsClient) (sg SyncGroup, err error) { @@ -8537,12 +8907,14 @@ func (future SyncGroupsCreateOrUpdateFuture) Result(client SyncGroupsClient) (sg return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncGroupsDeleteFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncGroupsDeleteFuture) Result(client SyncGroupsClient) (ar autorest.Response, err error) { @@ -8585,6 +8957,7 @@ func (future SyncGroupsDeleteFuture) Result(client SyncGroupsClient) (ar autores return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupsRefreshHubSchemaFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type SyncGroupsRefreshHubSchemaFuture struct { @@ -8592,6 +8965,7 @@ type SyncGroupsRefreshHubSchemaFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncGroupsRefreshHubSchemaFuture) Result(client SyncGroupsClient) (ar autorest.Response, err error) { @@ -8634,12 +9008,14 @@ func (future SyncGroupsRefreshHubSchemaFuture) Result(client SyncGroupsClient) ( return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncGroupsUpdateFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncGroupsUpdateFuture) Result(client SyncGroupsClient) (sg SyncGroup, err error) { @@ -8682,6 +9058,7 @@ func (future SyncGroupsUpdateFuture) Result(client SyncGroupsClient) (sg SyncGro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMember an Azure SQL Database sync member. type SyncMember struct { autorest.Response `json:"-"` @@ -8695,6 +9072,7 @@ type SyncMember struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for SyncMember. func (sm SyncMember) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -8713,6 +9091,7 @@ func (sm SyncMember) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for SyncMember struct. func (sm *SyncMember) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -8764,6 +9143,7 @@ func (sm *SyncMember) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMemberListResult a list of Azure SQL Database sync members. type SyncMemberListResult struct { autorest.Response `json:"-"` @@ -8773,12 +9153,14 @@ type SyncMemberListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMemberListResultIterator provides access to a complete listing of SyncMember values. type SyncMemberListResultIterator struct { i int page SyncMemberListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncMemberListResultIterator) Next() error { @@ -8795,16 +9177,19 @@ func (iter *SyncMemberListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncMemberListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncMemberListResultIterator) Response() SyncMemberListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncMemberListResultIterator) Value() SyncMember { @@ -8814,6 +9199,7 @@ func (iter SyncMemberListResultIterator) Value() SyncMember { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (smlr SyncMemberListResult) IsEmpty() bool { return smlr.Value == nil || len(*smlr.Value) == 0 @@ -8831,12 +9217,14 @@ func (smlr SyncMemberListResult) syncMemberListResultPreparer() (*http.Request, autorest.WithBaseURL(to.String(smlr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMemberListResultPage contains a page of SyncMember values. type SyncMemberListResultPage struct { fn func(SyncMemberListResult) (SyncMemberListResult, error) smlr SyncMemberListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncMemberListResultPage) Next() error { @@ -8848,16 +9236,19 @@ func (page *SyncMemberListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncMemberListResultPage) NotDone() bool { return !page.smlr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncMemberListResultPage) Response() SyncMemberListResult { return page.smlr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncMemberListResultPage) Values() []SyncMember { if page.smlr.IsEmpty() { @@ -8866,6 +9257,7 @@ func (page SyncMemberListResultPage) Values() []SyncMember { return *page.smlr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMemberProperties properties of a sync member. type SyncMemberProperties struct { // DatabaseType - Database type of the sync member. Possible values include: 'AzureSQLDatabase', 'SQLServerDatabase' @@ -8888,6 +9280,7 @@ type SyncMemberProperties struct { SyncState SyncMemberState `json:"syncState,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMembersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type SyncMembersCreateOrUpdateFuture struct { @@ -8895,6 +9288,7 @@ type SyncMembersCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncMembersCreateOrUpdateFuture) Result(client SyncMembersClient) (sm SyncMember, err error) { @@ -8937,12 +9331,14 @@ func (future SyncMembersCreateOrUpdateFuture) Result(client SyncMembersClient) ( return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMembersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncMembersDeleteFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncMembersDeleteFuture) Result(client SyncMembersClient) (ar autorest.Response, err error) { @@ -8985,6 +9381,7 @@ func (future SyncMembersDeleteFuture) Result(client SyncMembersClient) (ar autor return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMembersRefreshMemberSchemaFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type SyncMembersRefreshMemberSchemaFuture struct { @@ -8992,6 +9389,7 @@ type SyncMembersRefreshMemberSchemaFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncMembersRefreshMemberSchemaFuture) Result(client SyncMembersClient) (ar autorest.Response, err error) { @@ -9034,12 +9432,14 @@ func (future SyncMembersRefreshMemberSchemaFuture) Result(client SyncMembersClie return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMembersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncMembersUpdateFuture struct { azure.Future req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncMembersUpdateFuture) Result(client SyncMembersClient) (sm SyncMember, err error) { @@ -9082,6 +9482,7 @@ func (future SyncMembersUpdateFuture) Result(client SyncMembersClient) (sm SyncM return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TrackedResource ARM tracked top level resource. type TrackedResource struct { // Tags - Resource tags. @@ -9096,6 +9497,7 @@ type TrackedResource struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for TrackedResource. func (tr TrackedResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -9117,6 +9519,7 @@ func (tr TrackedResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryption represents a database transparent data encryption configuration. type TransparentDataEncryption struct { autorest.Response `json:"-"` @@ -9132,6 +9535,7 @@ type TransparentDataEncryption struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for TransparentDataEncryption. func (tde TransparentDataEncryption) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -9153,6 +9557,7 @@ func (tde TransparentDataEncryption) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for TransparentDataEncryption struct. func (tde *TransparentDataEncryption) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -9213,6 +9618,7 @@ func (tde *TransparentDataEncryption) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionActivity represents a database transparent data encryption Scan. type TransparentDataEncryptionActivity struct { // Location - Resource location. @@ -9227,6 +9633,7 @@ type TransparentDataEncryptionActivity struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for TransparentDataEncryptionActivity. func (tdea TransparentDataEncryptionActivity) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -9248,6 +9655,7 @@ func (tdea TransparentDataEncryptionActivity) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for TransparentDataEncryptionActivity struct. func (tdea *TransparentDataEncryptionActivity) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -9308,6 +9716,7 @@ func (tdea *TransparentDataEncryptionActivity) UnmarshalJSON(body []byte) error return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionActivityListResult represents the response to a list database transparent data // encryption activity request. type TransparentDataEncryptionActivityListResult struct { @@ -9316,6 +9725,7 @@ type TransparentDataEncryptionActivityListResult struct { Value *[]TransparentDataEncryptionActivity `json:"value,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionActivityProperties represents the properties of a database transparent data encryption // Scan. type TransparentDataEncryptionActivityProperties struct { @@ -9325,12 +9735,14 @@ type TransparentDataEncryptionActivityProperties struct { PercentComplete *float64 `json:"percentComplete,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionProperties represents the properties of a database transparent data encryption. type TransparentDataEncryptionProperties struct { // Status - The status of the database transparent data encryption. Possible values include: 'TransparentDataEncryptionStatusEnabled', 'TransparentDataEncryptionStatusDisabled' Status TransparentDataEncryptionStatus `json:"status,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRule a virtual network rule. type VirtualNetworkRule struct { autorest.Response `json:"-"` @@ -9344,6 +9756,7 @@ type VirtualNetworkRule struct { Type *string `json:"type,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for VirtualNetworkRule. func (vnr VirtualNetworkRule) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -9362,6 +9775,7 @@ func (vnr VirtualNetworkRule) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for VirtualNetworkRule struct. func (vnr *VirtualNetworkRule) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -9413,6 +9827,7 @@ func (vnr *VirtualNetworkRule) UnmarshalJSON(body []byte) error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRuleListResult a list of virtual network rules. type VirtualNetworkRuleListResult struct { autorest.Response `json:"-"` @@ -9422,12 +9837,14 @@ type VirtualNetworkRuleListResult struct { NextLink *string `json:"nextLink,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRuleListResultIterator provides access to a complete listing of VirtualNetworkRule values. type VirtualNetworkRuleListResultIterator struct { i int page VirtualNetworkRuleListResultPage } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *VirtualNetworkRuleListResultIterator) Next() error { @@ -9444,16 +9861,19 @@ func (iter *VirtualNetworkRuleListResultIterator) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter VirtualNetworkRuleListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter VirtualNetworkRuleListResultIterator) Response() VirtualNetworkRuleListResult { return iter.page.Response() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter VirtualNetworkRuleListResultIterator) Value() VirtualNetworkRule { @@ -9463,6 +9883,7 @@ func (iter VirtualNetworkRuleListResultIterator) Value() VirtualNetworkRule { return iter.page.Values()[iter.i] } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (vnrlr VirtualNetworkRuleListResult) IsEmpty() bool { return vnrlr.Value == nil || len(*vnrlr.Value) == 0 @@ -9480,12 +9901,14 @@ func (vnrlr VirtualNetworkRuleListResult) virtualNetworkRuleListResultPreparer() autorest.WithBaseURL(to.String(vnrlr.NextLink))) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRuleListResultPage contains a page of VirtualNetworkRule values. type VirtualNetworkRuleListResultPage struct { fn func(VirtualNetworkRuleListResult) (VirtualNetworkRuleListResult, error) vnrlr VirtualNetworkRuleListResult } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *VirtualNetworkRuleListResultPage) Next() error { @@ -9497,16 +9920,19 @@ func (page *VirtualNetworkRuleListResultPage) Next() error { return nil } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page VirtualNetworkRuleListResultPage) NotDone() bool { return !page.vnrlr.IsEmpty() } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page VirtualNetworkRuleListResultPage) Response() VirtualNetworkRuleListResult { return page.vnrlr } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page VirtualNetworkRuleListResultPage) Values() []VirtualNetworkRule { if page.vnrlr.IsEmpty() { @@ -9515,6 +9941,7 @@ func (page VirtualNetworkRuleListResultPage) Values() []VirtualNetworkRule { return *page.vnrlr.Value } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRuleProperties properties of a virtual network rule. type VirtualNetworkRuleProperties struct { // VirtualNetworkSubnetID - The ARM resource id of the virtual network subnet. @@ -9525,6 +9952,7 @@ type VirtualNetworkRuleProperties struct { State VirtualNetworkRuleState `json:"state,omitempty"` } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type VirtualNetworkRulesCreateOrUpdateFuture struct { @@ -9532,6 +9960,7 @@ type VirtualNetworkRulesCreateOrUpdateFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future VirtualNetworkRulesCreateOrUpdateFuture) Result(client VirtualNetworkRulesClient) (vnr VirtualNetworkRule, err error) { @@ -9574,6 +10003,7 @@ func (future VirtualNetworkRulesCreateOrUpdateFuture) Result(client VirtualNetwo return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type VirtualNetworkRulesDeleteFuture struct { @@ -9581,6 +10011,7 @@ type VirtualNetworkRulesDeleteFuture struct { req *http.Request } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future VirtualNetworkRulesDeleteFuture) Result(client VirtualNetworkRulesClient) (ar autorest.Response, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/operations.go index d5c11bcff4cd..1046841acd85 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/operations.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationsClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -31,16 +32,19 @@ type OperationsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewOperationsClient creates an instance of the OperationsClient client. func NewOperationsClient(subscriptionID string) OperationsClient { return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // List lists all of the available SQL Rest API operations. func (client OperationsClient) List(ctx context.Context) (result OperationListResultPage, err error) { result.fn = client.listNextResults @@ -65,6 +69,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2015-05-01-preview" @@ -80,6 +85,7 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -87,6 +93,7 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { @@ -121,6 +128,7 @@ func (client OperationsClient) listNextResults(lastResults OperationListResult) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListComplete enumerates all values, automatically crossing page boundaries as required. func (client OperationsClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) { result.page, err = client.List(ctx) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/recommendedelasticpools.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/recommendedelasticpools.go deleted file mode 100644 index 477ef5119e90..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/recommendedelasticpools.go +++ /dev/null @@ -1,247 +0,0 @@ -package sql - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "context" - "github.com/Azure/go-autorest/autorest" - "github.com/Azure/go-autorest/autorest/azure" - "net/http" -) - -// RecommendedElasticPoolsClient is the the Azure SQL Database management API provides a RESTful set of web services -// that interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, -// update, and delete databases. -type RecommendedElasticPoolsClient struct { - BaseClient -} - -// NewRecommendedElasticPoolsClient creates an instance of the RecommendedElasticPoolsClient client. -func NewRecommendedElasticPoolsClient(subscriptionID string) RecommendedElasticPoolsClient { - return NewRecommendedElasticPoolsClientWithBaseURI(DefaultBaseURI, subscriptionID) -} - -// NewRecommendedElasticPoolsClientWithBaseURI creates an instance of the RecommendedElasticPoolsClient client. -func NewRecommendedElasticPoolsClientWithBaseURI(baseURI string, subscriptionID string) RecommendedElasticPoolsClient { - return RecommendedElasticPoolsClient{NewWithBaseURI(baseURI, subscriptionID)} -} - -// Get gets a recommented elastic pool. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. recommendedElasticPoolName -// is the name of the recommended elastic pool to be retrieved. -func (client RecommendedElasticPoolsClient) Get(ctx context.Context, resourceGroupName string, serverName string, recommendedElasticPoolName string) (result RecommendedElasticPool, err error) { - req, err := client.GetPreparer(ctx, resourceGroupName, serverName, recommendedElasticPoolName) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.RecommendedElasticPoolsClient", "Get", nil, "Failure preparing request") - return - } - - resp, err := client.GetSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "sql.RecommendedElasticPoolsClient", "Get", resp, "Failure sending request") - return - } - - result, err = client.GetResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.RecommendedElasticPoolsClient", "Get", resp, "Failure responding to request") - } - - return -} - -// GetPreparer prepares the Get request. -func (client RecommendedElasticPoolsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, recommendedElasticPoolName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "recommendedElasticPoolName": autorest.Encode("path", recommendedElasticPoolName), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "serverName": autorest.Encode("path", serverName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2014-04-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/recommendedElasticPools/{recommendedElasticPoolName}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// GetSender sends the Get request. The method will close the -// http.Response Body if it receives an error. -func (client RecommendedElasticPoolsClient) GetSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// GetResponder handles the response to the Get request. The method always -// closes the http.Response Body. -func (client RecommendedElasticPoolsClient) GetResponder(resp *http.Response) (result RecommendedElasticPool, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// ListByServer returns recommended elastic pools. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. -func (client RecommendedElasticPoolsClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result RecommendedElasticPoolListResult, err error) { - req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.RecommendedElasticPoolsClient", "ListByServer", nil, "Failure preparing request") - return - } - - resp, err := client.ListByServerSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "sql.RecommendedElasticPoolsClient", "ListByServer", resp, "Failure sending request") - return - } - - result, err = client.ListByServerResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.RecommendedElasticPoolsClient", "ListByServer", resp, "Failure responding to request") - } - - return -} - -// ListByServerPreparer prepares the ListByServer request. -func (client RecommendedElasticPoolsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "serverName": autorest.Encode("path", serverName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2014-04-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/recommendedElasticPools", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListByServerSender sends the ListByServer request. The method will close the -// http.Response Body if it receives an error. -func (client RecommendedElasticPoolsClient) ListByServerSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// ListByServerResponder handles the response to the ListByServer request. The method always -// closes the http.Response Body. -func (client RecommendedElasticPoolsClient) ListByServerResponder(resp *http.Response) (result RecommendedElasticPoolListResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// ListMetrics returns recommented elastic pool metrics. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. recommendedElasticPoolName -// is the name of the recommended elastic pool to be retrieved. -func (client RecommendedElasticPoolsClient) ListMetrics(ctx context.Context, resourceGroupName string, serverName string, recommendedElasticPoolName string) (result RecommendedElasticPoolListMetricsResult, err error) { - req, err := client.ListMetricsPreparer(ctx, resourceGroupName, serverName, recommendedElasticPoolName) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.RecommendedElasticPoolsClient", "ListMetrics", nil, "Failure preparing request") - return - } - - resp, err := client.ListMetricsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "sql.RecommendedElasticPoolsClient", "ListMetrics", resp, "Failure sending request") - return - } - - result, err = client.ListMetricsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.RecommendedElasticPoolsClient", "ListMetrics", resp, "Failure responding to request") - } - - return -} - -// ListMetricsPreparer prepares the ListMetrics request. -func (client RecommendedElasticPoolsClient) ListMetricsPreparer(ctx context.Context, resourceGroupName string, serverName string, recommendedElasticPoolName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "recommendedElasticPoolName": autorest.Encode("path", recommendedElasticPoolName), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "serverName": autorest.Encode("path", serverName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2014-04-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/recommendedElasticPools/{recommendedElasticPoolName}/metrics", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListMetricsSender sends the ListMetrics request. The method will close the -// http.Response Body if it receives an error. -func (client RecommendedElasticPoolsClient) ListMetricsSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// ListMetricsResponder handles the response to the ListMetrics request. The method always -// closes the http.Response Body. -func (client RecommendedElasticPoolsClient) ListMetricsResponder(resp *http.Response) (result RecommendedElasticPoolListMetricsResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/recoverabledatabases.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/recoverabledatabases.go index 54ac2e72645f..fa6c48773d27 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/recoverabledatabases.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/recoverabledatabases.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecoverableDatabasesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -31,16 +32,19 @@ type RecoverableDatabasesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewRecoverableDatabasesClient creates an instance of the RecoverableDatabasesClient client. func NewRecoverableDatabasesClient(subscriptionID string) RecoverableDatabasesClient { return NewRecoverableDatabasesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewRecoverableDatabasesClientWithBaseURI creates an instance of the RecoverableDatabasesClient client. func NewRecoverableDatabasesClientWithBaseURI(baseURI string, subscriptionID string) RecoverableDatabasesClient { return RecoverableDatabasesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a recoverable database, which is a resource representing a database's geo backup // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -68,6 +72,7 @@ func (client RecoverableDatabasesClient) Get(ctx context.Context, resourceGroupN return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client RecoverableDatabasesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -90,6 +95,7 @@ func (client RecoverableDatabasesClient) GetPreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client RecoverableDatabasesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -97,6 +103,7 @@ func (client RecoverableDatabasesClient) GetSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client RecoverableDatabasesClient) GetResponder(resp *http.Response) (result RecoverableDatabase, err error) { @@ -110,6 +117,7 @@ func (client RecoverableDatabasesClient) GetResponder(resp *http.Response) (resu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets a list of recoverable databases // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -136,6 +144,7 @@ func (client RecoverableDatabasesClient) ListByServer(ctx context.Context, resou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client RecoverableDatabasesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -157,6 +166,7 @@ func (client RecoverableDatabasesClient) ListByServerPreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client RecoverableDatabasesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -164,6 +174,7 @@ func (client RecoverableDatabasesClient) ListByServerSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client RecoverableDatabasesClient) ListByServerResponder(resp *http.Response) (result RecoverableDatabaseListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go index ad939db52788..f0a91edca87d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationLinksClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -31,16 +32,19 @@ type ReplicationLinksClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewReplicationLinksClient creates an instance of the ReplicationLinksClient client. func NewReplicationLinksClient(subscriptionID string) ReplicationLinksClient { return NewReplicationLinksClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewReplicationLinksClientWithBaseURI creates an instance of the ReplicationLinksClient client. func NewReplicationLinksClientWithBaseURI(baseURI string, subscriptionID string) ReplicationLinksClient { return ReplicationLinksClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a database replication link. Cannot be done during failover. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -69,6 +73,7 @@ func (client ReplicationLinksClient) Delete(ctx context.Context, resourceGroupNa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client ReplicationLinksClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, linkID string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -92,6 +97,7 @@ func (client ReplicationLinksClient) DeletePreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ReplicationLinksClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -99,6 +105,7 @@ func (client ReplicationLinksClient) DeleteSender(req *http.Request) (*http.Resp azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ReplicationLinksClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -111,6 +118,7 @@ func (client ReplicationLinksClient) DeleteResponder(resp *http.Response) (resul return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Failover sets which replica database is primary by failing over from the current primary replica database. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -133,6 +141,7 @@ func (client ReplicationLinksClient) Failover(ctx context.Context, resourceGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverPreparer prepares the Failover request. func (client ReplicationLinksClient) FailoverPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, linkID string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -156,6 +165,7 @@ func (client ReplicationLinksClient) FailoverPreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverSender sends the Failover request. The method will close the // http.Response Body if it receives an error. func (client ReplicationLinksClient) FailoverSender(req *http.Request) (future ReplicationLinksFailoverFuture, err error) { @@ -171,6 +181,7 @@ func (client ReplicationLinksClient) FailoverSender(req *http.Request) (future R return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverResponder handles the response to the Failover request. The method always // closes the http.Response Body. func (client ReplicationLinksClient) FailoverResponder(resp *http.Response) (result autorest.Response, err error) { @@ -183,6 +194,7 @@ func (client ReplicationLinksClient) FailoverResponder(resp *http.Response) (res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverAllowDataLoss sets which replica database is primary by failing over from the current primary replica // database. This operation might result in data loss. // @@ -206,6 +218,7 @@ func (client ReplicationLinksClient) FailoverAllowDataLoss(ctx context.Context, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverAllowDataLossPreparer prepares the FailoverAllowDataLoss request. func (client ReplicationLinksClient) FailoverAllowDataLossPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, linkID string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -229,6 +242,7 @@ func (client ReplicationLinksClient) FailoverAllowDataLossPreparer(ctx context.C return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverAllowDataLossSender sends the FailoverAllowDataLoss request. The method will close the // http.Response Body if it receives an error. func (client ReplicationLinksClient) FailoverAllowDataLossSender(req *http.Request) (future ReplicationLinksFailoverAllowDataLossFuture, err error) { @@ -244,6 +258,7 @@ func (client ReplicationLinksClient) FailoverAllowDataLossSender(req *http.Reque return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverAllowDataLossResponder handles the response to the FailoverAllowDataLoss request. The method always // closes the http.Response Body. func (client ReplicationLinksClient) FailoverAllowDataLossResponder(resp *http.Response) (result autorest.Response, err error) { @@ -256,6 +271,7 @@ func (client ReplicationLinksClient) FailoverAllowDataLossResponder(resp *http.R return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database replication link. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -283,6 +299,7 @@ func (client ReplicationLinksClient) Get(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ReplicationLinksClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, linkID string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -306,6 +323,7 @@ func (client ReplicationLinksClient) GetPreparer(ctx context.Context, resourceGr return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ReplicationLinksClient) GetSender(req *http.Request) (*http.Response, error) { @@ -313,6 +331,7 @@ func (client ReplicationLinksClient) GetSender(req *http.Request) (*http.Respons azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ReplicationLinksClient) GetResponder(resp *http.Response) (result ReplicationLink, err error) { @@ -326,6 +345,7 @@ func (client ReplicationLinksClient) GetResponder(resp *http.Response) (result R return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase lists a database's replication links. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -353,6 +373,7 @@ func (client ReplicationLinksClient) ListByDatabase(ctx context.Context, resourc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client ReplicationLinksClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -375,6 +396,7 @@ func (client ReplicationLinksClient) ListByDatabasePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client ReplicationLinksClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -382,6 +404,7 @@ func (client ReplicationLinksClient) ListByDatabaseSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client ReplicationLinksClient) ListByDatabaseResponder(resp *http.Response) (result ReplicationLinkListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorabledroppeddatabases.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorabledroppeddatabases.go index f8813b6301f5..9e8d1b610aa5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorabledroppeddatabases.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorabledroppeddatabases.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorableDroppedDatabasesClient is the the Azure SQL Database management API provides a RESTful set of web services // that interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, // update, and delete databases. @@ -31,16 +32,19 @@ type RestorableDroppedDatabasesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewRestorableDroppedDatabasesClient creates an instance of the RestorableDroppedDatabasesClient client. func NewRestorableDroppedDatabasesClient(subscriptionID string) RestorableDroppedDatabasesClient { return NewRestorableDroppedDatabasesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewRestorableDroppedDatabasesClientWithBaseURI creates an instance of the RestorableDroppedDatabasesClient client. func NewRestorableDroppedDatabasesClientWithBaseURI(baseURI string, subscriptionID string) RestorableDroppedDatabasesClient { return RestorableDroppedDatabasesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a deleted database that can be restored // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -69,6 +73,7 @@ func (client RestorableDroppedDatabasesClient) Get(ctx context.Context, resource return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client RestorableDroppedDatabasesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, restorableDroppededDatabaseID string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -91,6 +96,7 @@ func (client RestorableDroppedDatabasesClient) GetPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client RestorableDroppedDatabasesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -98,6 +104,7 @@ func (client RestorableDroppedDatabasesClient) GetSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client RestorableDroppedDatabasesClient) GetResponder(resp *http.Response) (result RestorableDroppedDatabase, err error) { @@ -111,6 +118,7 @@ func (client RestorableDroppedDatabasesClient) GetResponder(resp *http.Response) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets a list of deleted databases that can be restored // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -137,6 +145,7 @@ func (client RestorableDroppedDatabasesClient) ListByServer(ctx context.Context, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client RestorableDroppedDatabasesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -158,6 +167,7 @@ func (client RestorableDroppedDatabasesClient) ListByServerPreparer(ctx context. return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client RestorableDroppedDatabasesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -165,6 +175,7 @@ func (client RestorableDroppedDatabasesClient) ListByServerSender(req *http.Requ azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client RestorableDroppedDatabasesClient) ListByServerResponder(resp *http.Response) (result RestorableDroppedDatabaseListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorepoints.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorepoints.go index b76f8b09a4d9..7e739f47d45d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorepoints.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorepoints.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorePointsClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -31,16 +32,19 @@ type RestorePointsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewRestorePointsClient creates an instance of the RestorePointsClient client. func NewRestorePointsClient(subscriptionID string) RestorePointsClient { return NewRestorePointsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewRestorePointsClientWithBaseURI creates an instance of the RestorePointsClient client. func NewRestorePointsClientWithBaseURI(baseURI string, subscriptionID string) RestorePointsClient { return RestorePointsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase gets a list of database restore points. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -68,6 +72,7 @@ func (client RestorePointsClient) ListByDatabase(ctx context.Context, resourceGr return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client RestorePointsClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -90,6 +95,7 @@ func (client RestorePointsClient) ListByDatabasePreparer(ctx context.Context, re return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client RestorePointsClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -97,6 +103,7 @@ func (client RestorePointsClient) ListByDatabaseSender(req *http.Request) (*http azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client RestorePointsClient) ListByDatabaseResponder(resp *http.Response) (result RestorePointListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go index ebdf54805877..d69f7e421260 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go @@ -25,6 +25,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerAzureADAdministratorsClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -32,16 +33,19 @@ type ServerAzureADAdministratorsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerAzureADAdministratorsClient creates an instance of the ServerAzureADAdministratorsClient client. func NewServerAzureADAdministratorsClient(subscriptionID string) ServerAzureADAdministratorsClient { return NewServerAzureADAdministratorsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerAzureADAdministratorsClientWithBaseURI creates an instance of the ServerAzureADAdministratorsClient client. func NewServerAzureADAdministratorsClientWithBaseURI(baseURI string, subscriptionID string) ServerAzureADAdministratorsClient { return ServerAzureADAdministratorsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates a new Server Active Directory Administrator or updates an existing server Active Directory // Administrator. // @@ -75,6 +79,7 @@ func (client ServerAzureADAdministratorsClient) CreateOrUpdate(ctx context.Conte return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ServerAzureADAdministratorsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, properties ServerAzureADAdministrator) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -99,6 +104,7 @@ func (client ServerAzureADAdministratorsClient) CreateOrUpdatePreparer(ctx conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServerAzureADAdministratorsClient) CreateOrUpdateSender(req *http.Request) (future ServerAzureADAdministratorsCreateOrUpdateFuture, err error) { @@ -114,6 +120,7 @@ func (client ServerAzureADAdministratorsClient) CreateOrUpdateSender(req *http.R return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ServerAzureADAdministratorsClient) CreateOrUpdateResponder(resp *http.Response) (result ServerAzureADAdministrator, err error) { @@ -127,6 +134,7 @@ func (client ServerAzureADAdministratorsClient) CreateOrUpdateResponder(resp *ht return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes an existing server Active Directory Administrator. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -147,6 +155,7 @@ func (client ServerAzureADAdministratorsClient) Delete(ctx context.Context, reso return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client ServerAzureADAdministratorsClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -169,6 +178,7 @@ func (client ServerAzureADAdministratorsClient) DeletePreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServerAzureADAdministratorsClient) DeleteSender(req *http.Request) (future ServerAzureADAdministratorsDeleteFuture, err error) { @@ -184,6 +194,7 @@ func (client ServerAzureADAdministratorsClient) DeleteSender(req *http.Request) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ServerAzureADAdministratorsClient) DeleteResponder(resp *http.Response) (result ServerAzureADAdministrator, err error) { @@ -197,6 +208,7 @@ func (client ServerAzureADAdministratorsClient) DeleteResponder(resp *http.Respo return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get returns an server Administrator. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -223,6 +235,7 @@ func (client ServerAzureADAdministratorsClient) Get(ctx context.Context, resourc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServerAzureADAdministratorsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -245,6 +258,7 @@ func (client ServerAzureADAdministratorsClient) GetPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServerAzureADAdministratorsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -252,6 +266,7 @@ func (client ServerAzureADAdministratorsClient) GetSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServerAzureADAdministratorsClient) GetResponder(resp *http.Response) (result ServerAzureADAdministrator, err error) { @@ -265,6 +280,7 @@ func (client ServerAzureADAdministratorsClient) GetResponder(resp *http.Response return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer returns a list of server Administrators. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -291,6 +307,7 @@ func (client ServerAzureADAdministratorsClient) ListByServer(ctx context.Context return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client ServerAzureADAdministratorsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -312,6 +329,7 @@ func (client ServerAzureADAdministratorsClient) ListByServerPreparer(ctx context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client ServerAzureADAdministratorsClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -319,6 +337,7 @@ func (client ServerAzureADAdministratorsClient) ListByServerSender(req *http.Req azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client ServerAzureADAdministratorsClient) ListByServerResponder(resp *http.Response) (result ServerAdministratorListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go index cb2a1fdd2420..9015acb14e3e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go @@ -25,6 +25,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerCommunicationLinksClient is the the Azure SQL Database management API provides a RESTful set of web services // that interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, // update, and delete databases. @@ -32,16 +33,19 @@ type ServerCommunicationLinksClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerCommunicationLinksClient creates an instance of the ServerCommunicationLinksClient client. func NewServerCommunicationLinksClient(subscriptionID string) ServerCommunicationLinksClient { return NewServerCommunicationLinksClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerCommunicationLinksClientWithBaseURI creates an instance of the ServerCommunicationLinksClient client. func NewServerCommunicationLinksClientWithBaseURI(baseURI string, subscriptionID string) ServerCommunicationLinksClient { return ServerCommunicationLinksClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates a server communication link. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -71,6 +75,7 @@ func (client ServerCommunicationLinksClient) CreateOrUpdate(ctx context.Context, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ServerCommunicationLinksClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, communicationLinkName string, parameters ServerCommunicationLink) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,6 +100,7 @@ func (client ServerCommunicationLinksClient) CreateOrUpdatePreparer(ctx context. return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServerCommunicationLinksClient) CreateOrUpdateSender(req *http.Request) (future ServerCommunicationLinksCreateOrUpdateFuture, err error) { @@ -110,6 +116,7 @@ func (client ServerCommunicationLinksClient) CreateOrUpdateSender(req *http.Requ return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ServerCommunicationLinksClient) CreateOrUpdateResponder(resp *http.Response) (result ServerCommunicationLink, err error) { @@ -123,6 +130,7 @@ func (client ServerCommunicationLinksClient) CreateOrUpdateResponder(resp *http. return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a server communication link. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -150,6 +158,7 @@ func (client ServerCommunicationLinksClient) Delete(ctx context.Context, resourc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client ServerCommunicationLinksClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, communicationLinkName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -172,6 +181,7 @@ func (client ServerCommunicationLinksClient) DeletePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServerCommunicationLinksClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -179,6 +189,7 @@ func (client ServerCommunicationLinksClient) DeleteSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ServerCommunicationLinksClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -191,6 +202,7 @@ func (client ServerCommunicationLinksClient) DeleteResponder(resp *http.Response return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get returns a server communication link. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -218,6 +230,7 @@ func (client ServerCommunicationLinksClient) Get(ctx context.Context, resourceGr return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServerCommunicationLinksClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, communicationLinkName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -240,6 +253,7 @@ func (client ServerCommunicationLinksClient) GetPreparer(ctx context.Context, re return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServerCommunicationLinksClient) GetSender(req *http.Request) (*http.Response, error) { @@ -247,6 +261,7 @@ func (client ServerCommunicationLinksClient) GetSender(req *http.Request) (*http azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServerCommunicationLinksClient) GetResponder(resp *http.Response) (result ServerCommunicationLink, err error) { @@ -260,6 +275,7 @@ func (client ServerCommunicationLinksClient) GetResponder(resp *http.Response) ( return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets a list of server communication links. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -286,6 +302,7 @@ func (client ServerCommunicationLinksClient) ListByServer(ctx context.Context, r return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client ServerCommunicationLinksClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -307,6 +324,7 @@ func (client ServerCommunicationLinksClient) ListByServerPreparer(ctx context.Co return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client ServerCommunicationLinksClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -314,6 +332,7 @@ func (client ServerCommunicationLinksClient) ListByServerSender(req *http.Reques azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client ServerCommunicationLinksClient) ListByServerResponder(resp *http.Response) (result ServerCommunicationLinkListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverconnectionpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverconnectionpolicies.go index 1c02e43b9664..c4e22b61f964 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverconnectionpolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverconnectionpolicies.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerConnectionPoliciesClient is the the Azure SQL Database management API provides a RESTful set of web services // that interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, // update, and delete databases. @@ -31,16 +32,19 @@ type ServerConnectionPoliciesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerConnectionPoliciesClient creates an instance of the ServerConnectionPoliciesClient client. func NewServerConnectionPoliciesClient(subscriptionID string) ServerConnectionPoliciesClient { return NewServerConnectionPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerConnectionPoliciesClientWithBaseURI creates an instance of the ServerConnectionPoliciesClient client. func NewServerConnectionPoliciesClientWithBaseURI(baseURI string, subscriptionID string) ServerConnectionPoliciesClient { return ServerConnectionPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates the server's connection policy. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -68,6 +72,7 @@ func (client ServerConnectionPoliciesClient) CreateOrUpdate(ctx context.Context, return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ServerConnectionPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters ServerConnectionPolicy) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -92,6 +97,7 @@ func (client ServerConnectionPoliciesClient) CreateOrUpdatePreparer(ctx context. return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServerConnectionPoliciesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -99,6 +105,7 @@ func (client ServerConnectionPoliciesClient) CreateOrUpdateSender(req *http.Requ azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ServerConnectionPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result ServerConnectionPolicy, err error) { @@ -112,6 +119,7 @@ func (client ServerConnectionPoliciesClient) CreateOrUpdateResponder(resp *http. return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets the server's secure connection policy. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -138,6 +146,7 @@ func (client ServerConnectionPoliciesClient) Get(ctx context.Context, resourceGr return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServerConnectionPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -160,6 +169,7 @@ func (client ServerConnectionPoliciesClient) GetPreparer(ctx context.Context, re return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServerConnectionPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -167,6 +177,7 @@ func (client ServerConnectionPoliciesClient) GetSender(req *http.Request) (*http azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServerConnectionPoliciesClient) GetResponder(resp *http.Response) (result ServerConnectionPolicy, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverkeys.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverkeys.go index 1808980a453e..3401aac55ef3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverkeys.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverkeys.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeysClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -31,16 +32,19 @@ type ServerKeysClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerKeysClient creates an instance of the ServerKeysClient client. func NewServerKeysClient(subscriptionID string) ServerKeysClient { return NewServerKeysClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerKeysClientWithBaseURI creates an instance of the ServerKeysClient client. func NewServerKeysClientWithBaseURI(baseURI string, subscriptionID string) ServerKeysClient { return ServerKeysClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a server key. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -66,6 +70,7 @@ func (client ServerKeysClient) CreateOrUpdate(ctx context.Context, resourceGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ServerKeysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, keyName string, parameters ServerKey) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -90,6 +95,7 @@ func (client ServerKeysClient) CreateOrUpdatePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServerKeysClient) CreateOrUpdateSender(req *http.Request) (future ServerKeysCreateOrUpdateFuture, err error) { @@ -105,6 +111,7 @@ func (client ServerKeysClient) CreateOrUpdateSender(req *http.Request) (future S return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ServerKeysClient) CreateOrUpdateResponder(resp *http.Response) (result ServerKey, err error) { @@ -118,6 +125,7 @@ func (client ServerKeysClient) CreateOrUpdateResponder(resp *http.Response) (res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes the server key with the given name. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -139,6 +147,7 @@ func (client ServerKeysClient) Delete(ctx context.Context, resourceGroupName str return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client ServerKeysClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, keyName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -161,6 +170,7 @@ func (client ServerKeysClient) DeletePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServerKeysClient) DeleteSender(req *http.Request) (future ServerKeysDeleteFuture, err error) { @@ -176,6 +186,7 @@ func (client ServerKeysClient) DeleteSender(req *http.Request) (future ServerKey return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ServerKeysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -188,6 +199,7 @@ func (client ServerKeysClient) DeleteResponder(resp *http.Response) (result auto return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a server key. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -215,6 +227,7 @@ func (client ServerKeysClient) Get(ctx context.Context, resourceGroupName string return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServerKeysClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, keyName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -237,6 +250,7 @@ func (client ServerKeysClient) GetPreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServerKeysClient) GetSender(req *http.Request) (*http.Response, error) { @@ -244,6 +258,7 @@ func (client ServerKeysClient) GetSender(req *http.Request) (*http.Response, err azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServerKeysClient) GetResponder(resp *http.Response) (result ServerKey, err error) { @@ -257,6 +272,7 @@ func (client ServerKeysClient) GetResponder(resp *http.Response) (result ServerK return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets a list of server keys. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -284,6 +300,7 @@ func (client ServerKeysClient) ListByServer(ctx context.Context, resourceGroupNa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client ServerKeysClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -305,6 +322,7 @@ func (client ServerKeysClient) ListByServerPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client ServerKeysClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -312,6 +330,7 @@ func (client ServerKeysClient) ListByServerSender(req *http.Request) (*http.Resp azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client ServerKeysClient) ListByServerResponder(resp *http.Response) (result ServerKeyListResult, err error) { @@ -346,6 +365,7 @@ func (client ServerKeysClient) listByServerNextResults(lastResults ServerKeyList return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerComplete enumerates all values, automatically crossing page boundaries as required. func (client ServerKeysClient) ListByServerComplete(ctx context.Context, resourceGroupName string, serverName string) (result ServerKeyListResultIterator, err error) { result.page, err = client.ListByServer(ctx, resourceGroupName, serverName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servers.go index 9fe738737cea..c1316c41332c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servers.go @@ -25,6 +25,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServersClient is the the Azure SQL Database management API provides a RESTful set of web services that interact with // Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and delete // databases. @@ -32,16 +33,19 @@ type ServersClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServersClient creates an instance of the ServersClient client. func NewServersClient(subscriptionID string) ServersClient { return NewServersClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServersClientWithBaseURI creates an instance of the ServersClient client. func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient { return ServersClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailability determines whether a resource can be created with the specified name. // // parameters is the parameters to request for name availability. @@ -74,6 +78,7 @@ func (client ServersClient) CheckNameAvailability(ctx context.Context, parameter return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailabilityPreparer prepares the CheckNameAvailability request. func (client ServersClient) CheckNameAvailabilityPreparer(ctx context.Context, parameters CheckNameAvailabilityRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,6 +100,7 @@ func (client ServersClient) CheckNameAvailabilityPreparer(ctx context.Context, p return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailabilitySender sends the CheckNameAvailability request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) CheckNameAvailabilitySender(req *http.Request) (*http.Response, error) { @@ -102,6 +108,7 @@ func (client ServersClient) CheckNameAvailabilitySender(req *http.Request) (*htt azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailabilityResponder handles the response to the CheckNameAvailability request. The method always // closes the http.Response Body. func (client ServersClient) CheckNameAvailabilityResponder(resp *http.Response) (result CheckNameAvailabilityResponse, err error) { @@ -115,6 +122,7 @@ func (client ServersClient) CheckNameAvailabilityResponder(resp *http.Response) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a server. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -136,6 +144,7 @@ func (client ServersClient) CreateOrUpdate(ctx context.Context, resourceGroupNam return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ServersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters Server) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -159,6 +168,7 @@ func (client ServersClient) CreateOrUpdatePreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) CreateOrUpdateSender(req *http.Request) (future ServersCreateOrUpdateFuture, err error) { @@ -174,6 +184,7 @@ func (client ServersClient) CreateOrUpdateSender(req *http.Request) (future Serv return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ServersClient) CreateOrUpdateResponder(resp *http.Response) (result Server, err error) { @@ -187,6 +198,7 @@ func (client ServersClient) CreateOrUpdateResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a server. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -207,6 +219,7 @@ func (client ServersClient) Delete(ctx context.Context, resourceGroupName string return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client ServersClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -228,6 +241,7 @@ func (client ServersClient) DeletePreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) DeleteSender(req *http.Request) (future ServersDeleteFuture, err error) { @@ -243,6 +257,7 @@ func (client ServersClient) DeleteSender(req *http.Request) (future ServersDelet return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ServersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -255,6 +270,7 @@ func (client ServersClient) DeleteResponder(resp *http.Response) (result autores return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a server. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -281,6 +297,7 @@ func (client ServersClient) Get(ctx context.Context, resourceGroupName string, s return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServersClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -302,6 +319,7 @@ func (client ServersClient) GetPreparer(ctx context.Context, resourceGroupName s return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) GetSender(req *http.Request) (*http.Response, error) { @@ -309,6 +327,7 @@ func (client ServersClient) GetSender(req *http.Request) (*http.Response, error) azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServersClient) GetResponder(resp *http.Response) (result Server, err error) { @@ -322,6 +341,7 @@ func (client ServersClient) GetResponder(resp *http.Response) (result Server, er return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // List gets a list of all servers in the subscription. func (client ServersClient) List(ctx context.Context) (result ServerListResultPage, err error) { result.fn = client.listNextResults @@ -346,6 +366,7 @@ func (client ServersClient) List(ctx context.Context) (result ServerListResultPa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListPreparer prepares the List request. func (client ServersClient) ListPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -365,6 +386,7 @@ func (client ServersClient) ListPreparer(ctx context.Context) (*http.Request, er return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) ListSender(req *http.Request) (*http.Response, error) { @@ -372,6 +394,7 @@ func (client ServersClient) ListSender(req *http.Request) (*http.Response, error azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client ServersClient) ListResponder(resp *http.Response) (result ServerListResult, err error) { @@ -406,12 +429,14 @@ func (client ServersClient) listNextResults(lastResults ServerListResult) (resul return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListComplete enumerates all values, automatically crossing page boundaries as required. func (client ServersClient) ListComplete(ctx context.Context) (result ServerListResultIterator, err error) { result.page, err = client.List(ctx) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByResourceGroup gets a list of servers in a resource groups. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -439,6 +464,7 @@ func (client ServersClient) ListByResourceGroup(ctx context.Context, resourceGro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client ServersClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -459,6 +485,7 @@ func (client ServersClient) ListByResourceGroupPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -466,6 +493,7 @@ func (client ServersClient) ListByResourceGroupSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client ServersClient) ListByResourceGroupResponder(resp *http.Response) (result ServerListResult, err error) { @@ -500,12 +528,14 @@ func (client ServersClient) listByResourceGroupNextResults(lastResults ServerLis return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. func (client ServersClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result ServerListResultIterator, err error) { result.page, err = client.ListByResourceGroup(ctx, resourceGroupName) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Update updates a server. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -527,6 +557,7 @@ func (client ServersClient) Update(ctx context.Context, resourceGroupName string return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdatePreparer prepares the Update request. func (client ServersClient) UpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters ServerUpdate) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -550,6 +581,7 @@ func (client ServersClient) UpdatePreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) UpdateSender(req *http.Request) (future ServersUpdateFuture, err error) { @@ -565,6 +597,7 @@ func (client ServersClient) UpdateSender(req *http.Request) (future ServersUpdat return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client ServersClient) UpdateResponder(resp *http.Response) (result Server, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverusages.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverusages.go index 327be0cd0973..6aa3e2dad006 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverusages.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverusages.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerUsagesClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -31,16 +32,19 @@ type ServerUsagesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerUsagesClient creates an instance of the ServerUsagesClient client. func NewServerUsagesClient(subscriptionID string) ServerUsagesClient { return NewServerUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerUsagesClientWithBaseURI creates an instance of the ServerUsagesClient client. func NewServerUsagesClientWithBaseURI(baseURI string, subscriptionID string) ServerUsagesClient { return ServerUsagesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer returns server usages. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -67,6 +71,7 @@ func (client ServerUsagesClient) ListByServer(ctx context.Context, resourceGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client ServerUsagesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -88,6 +93,7 @@ func (client ServerUsagesClient) ListByServerPreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client ServerUsagesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -95,6 +101,7 @@ func (client ServerUsagesClient) ListByServerSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client ServerUsagesClient) ListByServerResponder(resp *http.Response) (result ServerUsageListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serviceobjectives.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serviceobjectives.go index 4dd06885c982..b66790523cb8 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serviceobjectives.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serviceobjectives.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceObjectivesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -31,16 +32,19 @@ type ServiceObjectivesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServiceObjectivesClient creates an instance of the ServiceObjectivesClient client. func NewServiceObjectivesClient(subscriptionID string) ServiceObjectivesClient { return NewServiceObjectivesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServiceObjectivesClientWithBaseURI creates an instance of the ServiceObjectivesClient client. func NewServiceObjectivesClientWithBaseURI(baseURI string, subscriptionID string) ServiceObjectivesClient { return ServiceObjectivesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database service objective. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -68,6 +72,7 @@ func (client ServiceObjectivesClient) Get(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServiceObjectivesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, serviceObjectiveName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -90,6 +95,7 @@ func (client ServiceObjectivesClient) GetPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServiceObjectivesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -97,6 +103,7 @@ func (client ServiceObjectivesClient) GetSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServiceObjectivesClient) GetResponder(resp *http.Response) (result ServiceObjective, err error) { @@ -110,6 +117,7 @@ func (client ServiceObjectivesClient) GetResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer returns database service objectives. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -136,6 +144,7 @@ func (client ServiceObjectivesClient) ListByServer(ctx context.Context, resource return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client ServiceObjectivesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -157,6 +166,7 @@ func (client ServiceObjectivesClient) ListByServerPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client ServiceObjectivesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -164,6 +174,7 @@ func (client ServiceObjectivesClient) ListByServerSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client ServiceObjectivesClient) ListByServerResponder(resp *http.Response) (result ServiceObjectiveListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servicetieradvisors.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servicetieradvisors.go index 581028cdec75..55cede01c08d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servicetieradvisors.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servicetieradvisors.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceTierAdvisorsClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -31,16 +32,19 @@ type ServiceTierAdvisorsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServiceTierAdvisorsClient creates an instance of the ServiceTierAdvisorsClient client. func NewServiceTierAdvisorsClient(subscriptionID string) ServiceTierAdvisorsClient { return NewServiceTierAdvisorsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServiceTierAdvisorsClientWithBaseURI creates an instance of the ServiceTierAdvisorsClient client. func NewServiceTierAdvisorsClientWithBaseURI(baseURI string, subscriptionID string) ServiceTierAdvisorsClient { return ServiceTierAdvisorsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a service tier advisor. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -68,6 +72,7 @@ func (client ServiceTierAdvisorsClient) Get(ctx context.Context, resourceGroupNa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServiceTierAdvisorsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, serviceTierAdvisorName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -91,6 +96,7 @@ func (client ServiceTierAdvisorsClient) GetPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServiceTierAdvisorsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -98,6 +104,7 @@ func (client ServiceTierAdvisorsClient) GetSender(req *http.Request) (*http.Resp azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServiceTierAdvisorsClient) GetResponder(resp *http.Response) (result ServiceTierAdvisor, err error) { @@ -111,6 +118,7 @@ func (client ServiceTierAdvisorsClient) GetResponder(resp *http.Response) (resul return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase returns service tier advisors for specified database. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -138,6 +146,7 @@ func (client ServiceTierAdvisorsClient) ListByDatabase(ctx context.Context, reso return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client ServiceTierAdvisorsClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -160,6 +169,7 @@ func (client ServiceTierAdvisorsClient) ListByDatabasePreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client ServiceTierAdvisorsClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -167,6 +177,7 @@ func (client ServiceTierAdvisorsClient) ListByDatabaseSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client ServiceTierAdvisorsClient) ListByDatabaseResponder(resp *http.Response) (result ServiceTierAdvisorListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/subscriptionusages.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/subscriptionusages.go index 6c014306f539..ee985d4b9975 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/subscriptionusages.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/subscriptionusages.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SubscriptionUsagesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -31,16 +32,19 @@ type SubscriptionUsagesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSubscriptionUsagesClient creates an instance of the SubscriptionUsagesClient client. func NewSubscriptionUsagesClient(subscriptionID string) SubscriptionUsagesClient { return NewSubscriptionUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSubscriptionUsagesClientWithBaseURI creates an instance of the SubscriptionUsagesClient client. func NewSubscriptionUsagesClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionUsagesClient { return SubscriptionUsagesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a subscription usage metric. // // locationName is the name of the region where the resource is located. usageName is name of usage metric to @@ -67,6 +71,7 @@ func (client SubscriptionUsagesClient) Get(ctx context.Context, locationName str return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client SubscriptionUsagesClient) GetPreparer(ctx context.Context, locationName string, usageName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -88,6 +93,7 @@ func (client SubscriptionUsagesClient) GetPreparer(ctx context.Context, location return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client SubscriptionUsagesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -95,6 +101,7 @@ func (client SubscriptionUsagesClient) GetSender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client SubscriptionUsagesClient) GetResponder(resp *http.Response) (result SubscriptionUsage, err error) { @@ -108,6 +115,7 @@ func (client SubscriptionUsagesClient) GetResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocation gets all subscription usage metrics in a given location. // // locationName is the name of the region where the resource is located. @@ -134,6 +142,7 @@ func (client SubscriptionUsagesClient) ListByLocation(ctx context.Context, locat return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationPreparer prepares the ListByLocation request. func (client SubscriptionUsagesClient) ListByLocationPreparer(ctx context.Context, locationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -154,6 +163,7 @@ func (client SubscriptionUsagesClient) ListByLocationPreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationSender sends the ListByLocation request. The method will close the // http.Response Body if it receives an error. func (client SubscriptionUsagesClient) ListByLocationSender(req *http.Request) (*http.Response, error) { @@ -161,6 +171,7 @@ func (client SubscriptionUsagesClient) ListByLocationSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationResponder handles the response to the ListByLocation request. The method always // closes the http.Response Body. func (client SubscriptionUsagesClient) ListByLocationResponder(resp *http.Response) (result SubscriptionUsageListResult, err error) { @@ -195,6 +206,7 @@ func (client SubscriptionUsagesClient) listByLocationNextResults(lastResults Sub return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationComplete enumerates all values, automatically crossing page boundaries as required. func (client SubscriptionUsagesClient) ListByLocationComplete(ctx context.Context, locationName string) (result SubscriptionUsageListResultIterator, err error) { result.page, err = client.ListByLocation(ctx, locationName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncagents.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncagents.go index 97ebdca602ea..33b7c5246705 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncagents.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncagents.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentsClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -31,16 +32,19 @@ type SyncAgentsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSyncAgentsClient creates an instance of the SyncAgentsClient client. func NewSyncAgentsClient(subscriptionID string) SyncAgentsClient { return NewSyncAgentsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSyncAgentsClientWithBaseURI creates an instance of the SyncAgentsClient client. func NewSyncAgentsClientWithBaseURI(baseURI string, subscriptionID string) SyncAgentsClient { return SyncAgentsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a sync agent. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -62,6 +66,7 @@ func (client SyncAgentsClient) CreateOrUpdate(ctx context.Context, resourceGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client SyncAgentsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string, parameters SyncAgent) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -86,6 +91,7 @@ func (client SyncAgentsClient) CreateOrUpdatePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) CreateOrUpdateSender(req *http.Request) (future SyncAgentsCreateOrUpdateFuture, err error) { @@ -101,6 +107,7 @@ func (client SyncAgentsClient) CreateOrUpdateSender(req *http.Request) (future S return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client SyncAgentsClient) CreateOrUpdateResponder(resp *http.Response) (result SyncAgent, err error) { @@ -114,6 +121,7 @@ func (client SyncAgentsClient) CreateOrUpdateResponder(resp *http.Response) (res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a sync agent. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -135,6 +143,7 @@ func (client SyncAgentsClient) Delete(ctx context.Context, resourceGroupName str return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client SyncAgentsClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -157,6 +166,7 @@ func (client SyncAgentsClient) DeletePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) DeleteSender(req *http.Request) (future SyncAgentsDeleteFuture, err error) { @@ -172,6 +182,7 @@ func (client SyncAgentsClient) DeleteSender(req *http.Request) (future SyncAgent return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client SyncAgentsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -184,6 +195,7 @@ func (client SyncAgentsClient) DeleteResponder(resp *http.Response) (result auto return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GenerateKey generates a sync agent key. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -211,6 +223,7 @@ func (client SyncAgentsClient) GenerateKey(ctx context.Context, resourceGroupNam return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GenerateKeyPreparer prepares the GenerateKey request. func (client SyncAgentsClient) GenerateKeyPreparer(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -233,6 +246,7 @@ func (client SyncAgentsClient) GenerateKeyPreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GenerateKeySender sends the GenerateKey request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) GenerateKeySender(req *http.Request) (*http.Response, error) { @@ -240,6 +254,7 @@ func (client SyncAgentsClient) GenerateKeySender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GenerateKeyResponder handles the response to the GenerateKey request. The method always // closes the http.Response Body. func (client SyncAgentsClient) GenerateKeyResponder(resp *http.Response) (result SyncAgentKeyProperties, err error) { @@ -253,6 +268,7 @@ func (client SyncAgentsClient) GenerateKeyResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a sync agent. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -280,6 +296,7 @@ func (client SyncAgentsClient) Get(ctx context.Context, resourceGroupName string return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client SyncAgentsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -302,6 +319,7 @@ func (client SyncAgentsClient) GetPreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -309,6 +327,7 @@ func (client SyncAgentsClient) GetSender(req *http.Request) (*http.Response, err azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client SyncAgentsClient) GetResponder(resp *http.Response) (result SyncAgent, err error) { @@ -322,6 +341,7 @@ func (client SyncAgentsClient) GetResponder(resp *http.Response) (result SyncAge return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer lists sync agents in a server. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -350,6 +370,7 @@ func (client SyncAgentsClient) ListByServer(ctx context.Context, resourceGroupNa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client SyncAgentsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -371,6 +392,7 @@ func (client SyncAgentsClient) ListByServerPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -378,6 +400,7 @@ func (client SyncAgentsClient) ListByServerSender(req *http.Request) (*http.Resp azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client SyncAgentsClient) ListByServerResponder(resp *http.Response) (result SyncAgentListResult, err error) { @@ -412,12 +435,14 @@ func (client SyncAgentsClient) listByServerNextResults(lastResults SyncAgentList return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncAgentsClient) ListByServerComplete(ctx context.Context, resourceGroupName string, serverName string) (result SyncAgentListResultIterator, err error) { result.page, err = client.ListByServer(ctx, resourceGroupName, serverName) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLinkedDatabases lists databases linked to a sync agent. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -446,6 +471,7 @@ func (client SyncAgentsClient) ListLinkedDatabases(ctx context.Context, resource return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLinkedDatabasesPreparer prepares the ListLinkedDatabases request. func (client SyncAgentsClient) ListLinkedDatabasesPreparer(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -468,6 +494,7 @@ func (client SyncAgentsClient) ListLinkedDatabasesPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLinkedDatabasesSender sends the ListLinkedDatabases request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) ListLinkedDatabasesSender(req *http.Request) (*http.Response, error) { @@ -475,6 +502,7 @@ func (client SyncAgentsClient) ListLinkedDatabasesSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLinkedDatabasesResponder handles the response to the ListLinkedDatabases request. The method always // closes the http.Response Body. func (client SyncAgentsClient) ListLinkedDatabasesResponder(resp *http.Response) (result SyncAgentLinkedDatabaseListResult, err error) { @@ -509,6 +537,7 @@ func (client SyncAgentsClient) listLinkedDatabasesNextResults(lastResults SyncAg return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLinkedDatabasesComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncAgentsClient) ListLinkedDatabasesComplete(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (result SyncAgentLinkedDatabaseListResultIterator, err error) { result.page, err = client.ListLinkedDatabases(ctx, resourceGroupName, serverName, syncAgentName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncgroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncgroups.go index b08ba72a70d1..79dec2b50874 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncgroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncgroups.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupsClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -31,16 +32,19 @@ type SyncGroupsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSyncGroupsClient creates an instance of the SyncGroupsClient client. func NewSyncGroupsClient(subscriptionID string) SyncGroupsClient { return NewSyncGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSyncGroupsClientWithBaseURI creates an instance of the SyncGroupsClient client. func NewSyncGroupsClientWithBaseURI(baseURI string, subscriptionID string) SyncGroupsClient { return SyncGroupsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CancelSync cancels a sync group synchronization. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -68,6 +72,7 @@ func (client SyncGroupsClient) CancelSync(ctx context.Context, resourceGroupName return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CancelSyncPreparer prepares the CancelSync request. func (client SyncGroupsClient) CancelSyncPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -91,6 +96,7 @@ func (client SyncGroupsClient) CancelSyncPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CancelSyncSender sends the CancelSync request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) CancelSyncSender(req *http.Request) (*http.Response, error) { @@ -98,6 +104,7 @@ func (client SyncGroupsClient) CancelSyncSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CancelSyncResponder handles the response to the CancelSync request. The method always // closes the http.Response Body. func (client SyncGroupsClient) CancelSyncResponder(resp *http.Response) (result autorest.Response, err error) { @@ -110,6 +117,7 @@ func (client SyncGroupsClient) CancelSyncResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a sync group. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -132,6 +140,7 @@ func (client SyncGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client SyncGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, parameters SyncGroup) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -157,6 +166,7 @@ func (client SyncGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) CreateOrUpdateSender(req *http.Request) (future SyncGroupsCreateOrUpdateFuture, err error) { @@ -172,6 +182,7 @@ func (client SyncGroupsClient) CreateOrUpdateSender(req *http.Request) (future S return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client SyncGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result SyncGroup, err error) { @@ -185,6 +196,7 @@ func (client SyncGroupsClient) CreateOrUpdateResponder(resp *http.Response) (res return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a sync group. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -206,6 +218,7 @@ func (client SyncGroupsClient) Delete(ctx context.Context, resourceGroupName str return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client SyncGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -229,6 +242,7 @@ func (client SyncGroupsClient) DeletePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) DeleteSender(req *http.Request) (future SyncGroupsDeleteFuture, err error) { @@ -244,6 +258,7 @@ func (client SyncGroupsClient) DeleteSender(req *http.Request) (future SyncGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client SyncGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -256,6 +271,7 @@ func (client SyncGroupsClient) DeleteResponder(resp *http.Response) (result auto return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a sync group. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -283,6 +299,7 @@ func (client SyncGroupsClient) Get(ctx context.Context, resourceGroupName string return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client SyncGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -306,6 +323,7 @@ func (client SyncGroupsClient) GetPreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -313,6 +331,7 @@ func (client SyncGroupsClient) GetSender(req *http.Request) (*http.Response, err azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client SyncGroupsClient) GetResponder(resp *http.Response) (result SyncGroup, err error) { @@ -326,6 +345,7 @@ func (client SyncGroupsClient) GetResponder(resp *http.Response) (result SyncGro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase lists sync groups under a hub database. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -354,6 +374,7 @@ func (client SyncGroupsClient) ListByDatabase(ctx context.Context, resourceGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client SyncGroupsClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -376,6 +397,7 @@ func (client SyncGroupsClient) ListByDatabasePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -383,6 +405,7 @@ func (client SyncGroupsClient) ListByDatabaseSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client SyncGroupsClient) ListByDatabaseResponder(resp *http.Response) (result SyncGroupListResult, err error) { @@ -417,12 +440,14 @@ func (client SyncGroupsClient) listByDatabaseNextResults(lastResults SyncGroupLi return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncGroupsClient) ListByDatabaseComplete(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result SyncGroupListResultIterator, err error) { result.page, err = client.ListByDatabase(ctx, resourceGroupName, serverName, databaseName) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListHubSchemas gets a collection of hub database schemas. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -451,6 +476,7 @@ func (client SyncGroupsClient) ListHubSchemas(ctx context.Context, resourceGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListHubSchemasPreparer prepares the ListHubSchemas request. func (client SyncGroupsClient) ListHubSchemasPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -474,6 +500,7 @@ func (client SyncGroupsClient) ListHubSchemasPreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListHubSchemasSender sends the ListHubSchemas request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) ListHubSchemasSender(req *http.Request) (*http.Response, error) { @@ -481,6 +508,7 @@ func (client SyncGroupsClient) ListHubSchemasSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListHubSchemasResponder handles the response to the ListHubSchemas request. The method always // closes the http.Response Body. func (client SyncGroupsClient) ListHubSchemasResponder(resp *http.Response) (result SyncFullSchemaPropertiesListResult, err error) { @@ -515,12 +543,14 @@ func (client SyncGroupsClient) listHubSchemasNextResults(lastResults SyncFullSch return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListHubSchemasComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncGroupsClient) ListHubSchemasComplete(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (result SyncFullSchemaPropertiesListResultIterator, err error) { result.page, err = client.ListHubSchemas(ctx, resourceGroupName, serverName, databaseName, syncGroupName) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLogs gets a collection of sync group logs. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -551,6 +581,7 @@ func (client SyncGroupsClient) ListLogs(ctx context.Context, resourceGroupName s return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLogsPreparer prepares the ListLogs request. func (client SyncGroupsClient) ListLogsPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, startTime string, endTime string, typeParameter string, continuationToken string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -580,6 +611,7 @@ func (client SyncGroupsClient) ListLogsPreparer(ctx context.Context, resourceGro return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLogsSender sends the ListLogs request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) ListLogsSender(req *http.Request) (*http.Response, error) { @@ -587,6 +619,7 @@ func (client SyncGroupsClient) ListLogsSender(req *http.Request) (*http.Response azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLogsResponder handles the response to the ListLogs request. The method always // closes the http.Response Body. func (client SyncGroupsClient) ListLogsResponder(resp *http.Response) (result SyncGroupLogListResult, err error) { @@ -621,12 +654,14 @@ func (client SyncGroupsClient) listLogsNextResults(lastResults SyncGroupLogListR return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLogsComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncGroupsClient) ListLogsComplete(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, startTime string, endTime string, typeParameter string, continuationToken string) (result SyncGroupLogListResultIterator, err error) { result.page, err = client.ListLogs(ctx, resourceGroupName, serverName, databaseName, syncGroupName, startTime, endTime, typeParameter, continuationToken) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSyncDatabaseIds gets a collection of sync database ids. // // locationName is the name of the region where the resource is located. @@ -653,6 +688,7 @@ func (client SyncGroupsClient) ListSyncDatabaseIds(ctx context.Context, location return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSyncDatabaseIdsPreparer prepares the ListSyncDatabaseIds request. func (client SyncGroupsClient) ListSyncDatabaseIdsPreparer(ctx context.Context, locationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -673,6 +709,7 @@ func (client SyncGroupsClient) ListSyncDatabaseIdsPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSyncDatabaseIdsSender sends the ListSyncDatabaseIds request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) ListSyncDatabaseIdsSender(req *http.Request) (*http.Response, error) { @@ -680,6 +717,7 @@ func (client SyncGroupsClient) ListSyncDatabaseIdsSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSyncDatabaseIdsResponder handles the response to the ListSyncDatabaseIds request. The method always // closes the http.Response Body. func (client SyncGroupsClient) ListSyncDatabaseIdsResponder(resp *http.Response) (result SyncDatabaseIDListResult, err error) { @@ -714,12 +752,14 @@ func (client SyncGroupsClient) listSyncDatabaseIdsNextResults(lastResults SyncDa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSyncDatabaseIdsComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncGroupsClient) ListSyncDatabaseIdsComplete(ctx context.Context, locationName string) (result SyncDatabaseIDListResultIterator, err error) { result.page, err = client.ListSyncDatabaseIds(ctx, locationName) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshHubSchema refreshes a hub database schema. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -741,6 +781,7 @@ func (client SyncGroupsClient) RefreshHubSchema(ctx context.Context, resourceGro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshHubSchemaPreparer prepares the RefreshHubSchema request. func (client SyncGroupsClient) RefreshHubSchemaPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -764,6 +805,7 @@ func (client SyncGroupsClient) RefreshHubSchemaPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshHubSchemaSender sends the RefreshHubSchema request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) RefreshHubSchemaSender(req *http.Request) (future SyncGroupsRefreshHubSchemaFuture, err error) { @@ -779,6 +821,7 @@ func (client SyncGroupsClient) RefreshHubSchemaSender(req *http.Request) (future return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshHubSchemaResponder handles the response to the RefreshHubSchema request. The method always // closes the http.Response Body. func (client SyncGroupsClient) RefreshHubSchemaResponder(resp *http.Response) (result autorest.Response, err error) { @@ -791,6 +834,7 @@ func (client SyncGroupsClient) RefreshHubSchemaResponder(resp *http.Response) (r return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TriggerSync triggers a sync group synchronization. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -818,6 +862,7 @@ func (client SyncGroupsClient) TriggerSync(ctx context.Context, resourceGroupNam return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TriggerSyncPreparer prepares the TriggerSync request. func (client SyncGroupsClient) TriggerSyncPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -841,6 +886,7 @@ func (client SyncGroupsClient) TriggerSyncPreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TriggerSyncSender sends the TriggerSync request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) TriggerSyncSender(req *http.Request) (*http.Response, error) { @@ -848,6 +894,7 @@ func (client SyncGroupsClient) TriggerSyncSender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TriggerSyncResponder handles the response to the TriggerSync request. The method always // closes the http.Response Body. func (client SyncGroupsClient) TriggerSyncResponder(resp *http.Response) (result autorest.Response, err error) { @@ -860,6 +907,7 @@ func (client SyncGroupsClient) TriggerSyncResponder(resp *http.Response) (result return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Update updates a sync group. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -882,6 +930,7 @@ func (client SyncGroupsClient) Update(ctx context.Context, resourceGroupName str return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdatePreparer prepares the Update request. func (client SyncGroupsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, parameters SyncGroup) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -907,6 +956,7 @@ func (client SyncGroupsClient) UpdatePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) UpdateSender(req *http.Request) (future SyncGroupsUpdateFuture, err error) { @@ -922,6 +972,7 @@ func (client SyncGroupsClient) UpdateSender(req *http.Request) (future SyncGroup return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client SyncGroupsClient) UpdateResponder(resp *http.Response) (result SyncGroup, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncmembers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncmembers.go index 57554de42517..9b29ee128362 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncmembers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncmembers.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMembersClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -31,16 +32,19 @@ type SyncMembersClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSyncMembersClient creates an instance of the SyncMembersClient client. func NewSyncMembersClient(subscriptionID string) SyncMembersClient { return NewSyncMembersClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSyncMembersClientWithBaseURI creates an instance of the SyncMembersClient client. func NewSyncMembersClientWithBaseURI(baseURI string, subscriptionID string) SyncMembersClient { return SyncMembersClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a sync member. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -64,6 +68,7 @@ func (client SyncMembersClient) CreateOrUpdate(ctx context.Context, resourceGrou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client SyncMembersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string, parameters SyncMember) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -90,6 +95,7 @@ func (client SyncMembersClient) CreateOrUpdatePreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) CreateOrUpdateSender(req *http.Request) (future SyncMembersCreateOrUpdateFuture, err error) { @@ -105,6 +111,7 @@ func (client SyncMembersClient) CreateOrUpdateSender(req *http.Request) (future return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client SyncMembersClient) CreateOrUpdateResponder(resp *http.Response) (result SyncMember, err error) { @@ -118,6 +125,7 @@ func (client SyncMembersClient) CreateOrUpdateResponder(resp *http.Response) (re return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a sync member. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -140,6 +148,7 @@ func (client SyncMembersClient) Delete(ctx context.Context, resourceGroupName st return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client SyncMembersClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -164,6 +173,7 @@ func (client SyncMembersClient) DeletePreparer(ctx context.Context, resourceGrou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) DeleteSender(req *http.Request) (future SyncMembersDeleteFuture, err error) { @@ -179,6 +189,7 @@ func (client SyncMembersClient) DeleteSender(req *http.Request) (future SyncMemb return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client SyncMembersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -191,6 +202,7 @@ func (client SyncMembersClient) DeleteResponder(resp *http.Response) (result aut return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a sync member. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -219,6 +231,7 @@ func (client SyncMembersClient) Get(ctx context.Context, resourceGroupName strin return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client SyncMembersClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -243,6 +256,7 @@ func (client SyncMembersClient) GetPreparer(ctx context.Context, resourceGroupNa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) GetSender(req *http.Request) (*http.Response, error) { @@ -250,6 +264,7 @@ func (client SyncMembersClient) GetSender(req *http.Request) (*http.Response, er azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client SyncMembersClient) GetResponder(resp *http.Response) (result SyncMember, err error) { @@ -263,6 +278,7 @@ func (client SyncMembersClient) GetResponder(resp *http.Response) (result SyncMe return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListBySyncGroup lists sync members in the given sync group. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -291,6 +307,7 @@ func (client SyncMembersClient) ListBySyncGroup(ctx context.Context, resourceGro return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListBySyncGroupPreparer prepares the ListBySyncGroup request. func (client SyncMembersClient) ListBySyncGroupPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -314,6 +331,7 @@ func (client SyncMembersClient) ListBySyncGroupPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListBySyncGroupSender sends the ListBySyncGroup request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) ListBySyncGroupSender(req *http.Request) (*http.Response, error) { @@ -321,6 +339,7 @@ func (client SyncMembersClient) ListBySyncGroupSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListBySyncGroupResponder handles the response to the ListBySyncGroup request. The method always // closes the http.Response Body. func (client SyncMembersClient) ListBySyncGroupResponder(resp *http.Response) (result SyncMemberListResult, err error) { @@ -355,12 +374,14 @@ func (client SyncMembersClient) listBySyncGroupNextResults(lastResults SyncMembe return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListBySyncGroupComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncMembersClient) ListBySyncGroupComplete(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (result SyncMemberListResultIterator, err error) { result.page, err = client.ListBySyncGroup(ctx, resourceGroupName, serverName, databaseName, syncGroupName) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMemberSchemas gets a sync member database schema. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -390,6 +411,7 @@ func (client SyncMembersClient) ListMemberSchemas(ctx context.Context, resourceG return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMemberSchemasPreparer prepares the ListMemberSchemas request. func (client SyncMembersClient) ListMemberSchemasPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -414,6 +436,7 @@ func (client SyncMembersClient) ListMemberSchemasPreparer(ctx context.Context, r return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMemberSchemasSender sends the ListMemberSchemas request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) ListMemberSchemasSender(req *http.Request) (*http.Response, error) { @@ -421,6 +444,7 @@ func (client SyncMembersClient) ListMemberSchemasSender(req *http.Request) (*htt azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMemberSchemasResponder handles the response to the ListMemberSchemas request. The method always // closes the http.Response Body. func (client SyncMembersClient) ListMemberSchemasResponder(resp *http.Response) (result SyncFullSchemaPropertiesListResult, err error) { @@ -455,12 +479,14 @@ func (client SyncMembersClient) listMemberSchemasNextResults(lastResults SyncFul return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMemberSchemasComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncMembersClient) ListMemberSchemasComplete(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (result SyncFullSchemaPropertiesListResultIterator, err error) { result.page, err = client.ListMemberSchemas(ctx, resourceGroupName, serverName, databaseName, syncGroupName, syncMemberName) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshMemberSchema refreshes a sync member database schema. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -483,6 +509,7 @@ func (client SyncMembersClient) RefreshMemberSchema(ctx context.Context, resourc return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshMemberSchemaPreparer prepares the RefreshMemberSchema request. func (client SyncMembersClient) RefreshMemberSchemaPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -507,6 +534,7 @@ func (client SyncMembersClient) RefreshMemberSchemaPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshMemberSchemaSender sends the RefreshMemberSchema request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) RefreshMemberSchemaSender(req *http.Request) (future SyncMembersRefreshMemberSchemaFuture, err error) { @@ -522,6 +550,7 @@ func (client SyncMembersClient) RefreshMemberSchemaSender(req *http.Request) (fu return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshMemberSchemaResponder handles the response to the RefreshMemberSchema request. The method always // closes the http.Response Body. func (client SyncMembersClient) RefreshMemberSchemaResponder(resp *http.Response) (result autorest.Response, err error) { @@ -534,6 +563,7 @@ func (client SyncMembersClient) RefreshMemberSchemaResponder(resp *http.Response return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Update updates an existing sync member. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -557,6 +587,7 @@ func (client SyncMembersClient) Update(ctx context.Context, resourceGroupName st return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdatePreparer prepares the Update request. func (client SyncMembersClient) UpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string, parameters SyncMember) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -583,6 +614,7 @@ func (client SyncMembersClient) UpdatePreparer(ctx context.Context, resourceGrou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) UpdateSender(req *http.Request) (future SyncMembersUpdateFuture, err error) { @@ -598,6 +630,7 @@ func (client SyncMembersClient) UpdateSender(req *http.Request) (future SyncMemb return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client SyncMembersClient) UpdateResponder(resp *http.Response) (result SyncMember, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptionactivities.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptionactivities.go index 818a30dddf7c..d39006a3f60c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptionactivities.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptionactivities.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionActivitiesClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -31,18 +32,21 @@ type TransparentDataEncryptionActivitiesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewTransparentDataEncryptionActivitiesClient creates an instance of the TransparentDataEncryptionActivitiesClient // client. func NewTransparentDataEncryptionActivitiesClient(subscriptionID string) TransparentDataEncryptionActivitiesClient { return NewTransparentDataEncryptionActivitiesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewTransparentDataEncryptionActivitiesClientWithBaseURI creates an instance of the // TransparentDataEncryptionActivitiesClient client. func NewTransparentDataEncryptionActivitiesClientWithBaseURI(baseURI string, subscriptionID string) TransparentDataEncryptionActivitiesClient { return TransparentDataEncryptionActivitiesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByConfiguration returns a database's transparent data encryption operation result. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -70,6 +74,7 @@ func (client TransparentDataEncryptionActivitiesClient) ListByConfiguration(ctx return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByConfigurationPreparer prepares the ListByConfiguration request. func (client TransparentDataEncryptionActivitiesClient) ListByConfigurationPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -93,6 +98,7 @@ func (client TransparentDataEncryptionActivitiesClient) ListByConfigurationPrepa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByConfigurationSender sends the ListByConfiguration request. The method will close the // http.Response Body if it receives an error. func (client TransparentDataEncryptionActivitiesClient) ListByConfigurationSender(req *http.Request) (*http.Response, error) { @@ -100,6 +106,7 @@ func (client TransparentDataEncryptionActivitiesClient) ListByConfigurationSende azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByConfigurationResponder handles the response to the ListByConfiguration request. The method always // closes the http.Response Body. func (client TransparentDataEncryptionActivitiesClient) ListByConfigurationResponder(resp *http.Response) (result TransparentDataEncryptionActivityListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptions.go index 87c20526f6ad..8e6448c75734 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptions.go @@ -24,6 +24,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionsClient is the the Azure SQL Database management API provides a RESTful set of web services // that interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, // update, and delete databases. @@ -31,16 +32,19 @@ type TransparentDataEncryptionsClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewTransparentDataEncryptionsClient creates an instance of the TransparentDataEncryptionsClient client. func NewTransparentDataEncryptionsClient(subscriptionID string) TransparentDataEncryptionsClient { return NewTransparentDataEncryptionsClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewTransparentDataEncryptionsClientWithBaseURI creates an instance of the TransparentDataEncryptionsClient client. func NewTransparentDataEncryptionsClientWithBaseURI(baseURI string, subscriptionID string) TransparentDataEncryptionsClient { return TransparentDataEncryptionsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a database's transparent data encryption configuration. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -69,6 +73,7 @@ func (client TransparentDataEncryptionsClient) CreateOrUpdate(ctx context.Contex return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client TransparentDataEncryptionsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters TransparentDataEncryption) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -94,6 +99,7 @@ func (client TransparentDataEncryptionsClient) CreateOrUpdatePreparer(ctx contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client TransparentDataEncryptionsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -101,6 +107,7 @@ func (client TransparentDataEncryptionsClient) CreateOrUpdateSender(req *http.Re azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client TransparentDataEncryptionsClient) CreateOrUpdateResponder(resp *http.Response) (result TransparentDataEncryption, err error) { @@ -114,6 +121,7 @@ func (client TransparentDataEncryptionsClient) CreateOrUpdateResponder(resp *htt return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database's transparent data encryption configuration. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -141,6 +149,7 @@ func (client TransparentDataEncryptionsClient) Get(ctx context.Context, resource return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client TransparentDataEncryptionsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -164,6 +173,7 @@ func (client TransparentDataEncryptionsClient) GetPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client TransparentDataEncryptionsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -171,6 +181,7 @@ func (client TransparentDataEncryptionsClient) GetSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client TransparentDataEncryptionsClient) GetResponder(resp *http.Response) (result TransparentDataEncryption, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/version.go index 21b61983166e..1403fb37098c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/version.go @@ -18,12 +18,13 @@ import "github.com/Azure/azure-sdk-for-go/version" // // Code generated by Microsoft (R) AutoRest Code Generator. // Changes may cause incorrect behavior and will be lost if the code is regenerated. - +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { return "Azure-SDK-For-Go/" + version.Number + " sql/2015-05-01-preview" } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Version returns the semantic version (see http://semver.org) of the client. func Version() string { return version.Number diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go index 336c296db9ff..172f2b3a90b8 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go @@ -25,6 +25,7 @@ import ( "net/http" ) +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRulesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,16 +33,19 @@ type VirtualNetworkRulesClient struct { BaseClient } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewVirtualNetworkRulesClient creates an instance of the VirtualNetworkRulesClient client. func NewVirtualNetworkRulesClient(subscriptionID string) VirtualNetworkRulesClient { return NewVirtualNetworkRulesClientWithBaseURI(DefaultBaseURI, subscriptionID) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewVirtualNetworkRulesClientWithBaseURI creates an instance of the VirtualNetworkRulesClient client. func NewVirtualNetworkRulesClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkRulesClient { return VirtualNetworkRulesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates an existing virtual network rule. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -70,6 +74,7 @@ func (client VirtualNetworkRulesClient) CreateOrUpdate(ctx context.Context, reso return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client VirtualNetworkRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string, parameters VirtualNetworkRule) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -94,6 +99,7 @@ func (client VirtualNetworkRulesClient) CreateOrUpdatePreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkRulesClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkRulesCreateOrUpdateFuture, err error) { @@ -109,6 +115,7 @@ func (client VirtualNetworkRulesClient) CreateOrUpdateSender(req *http.Request) return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client VirtualNetworkRulesClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkRule, err error) { @@ -122,6 +129,7 @@ func (client VirtualNetworkRulesClient) CreateOrUpdateResponder(resp *http.Respo return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes the virtual network rule with the given name. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -143,6 +151,7 @@ func (client VirtualNetworkRulesClient) Delete(ctx context.Context, resourceGrou return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client VirtualNetworkRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -165,6 +174,7 @@ func (client VirtualNetworkRulesClient) DeletePreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkRulesClient) DeleteSender(req *http.Request) (future VirtualNetworkRulesDeleteFuture, err error) { @@ -180,6 +190,7 @@ func (client VirtualNetworkRulesClient) DeleteSender(req *http.Request) (future return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client VirtualNetworkRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -192,6 +203,7 @@ func (client VirtualNetworkRulesClient) DeleteResponder(resp *http.Response) (re return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a virtual network rule. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -219,6 +231,7 @@ func (client VirtualNetworkRulesClient) Get(ctx context.Context, resourceGroupNa return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client VirtualNetworkRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -241,6 +254,7 @@ func (client VirtualNetworkRulesClient) GetPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkRulesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -248,6 +262,7 @@ func (client VirtualNetworkRulesClient) GetSender(req *http.Request) (*http.Resp azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client VirtualNetworkRulesClient) GetResponder(resp *http.Response) (result VirtualNetworkRule, err error) { @@ -261,6 +276,7 @@ func (client VirtualNetworkRulesClient) GetResponder(resp *http.Response) (resul return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets a list of virtual network rules in a server. // // resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from @@ -288,6 +304,7 @@ func (client VirtualNetworkRulesClient) ListByServer(ctx context.Context, resour return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client VirtualNetworkRulesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -309,6 +326,7 @@ func (client VirtualNetworkRulesClient) ListByServerPreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkRulesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -316,6 +334,7 @@ func (client VirtualNetworkRulesClient) ListByServerSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client VirtualNetworkRulesClient) ListByServerResponder(resp *http.Response) (result VirtualNetworkRuleListResult, err error) { @@ -350,6 +369,7 @@ func (client VirtualNetworkRulesClient) listByServerNextResults(lastResults Virt return } +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerComplete enumerates all values, automatically crossing page boundaries as required. func (client VirtualNetworkRulesClient) ListByServerComplete(ctx context.Context, resourceGroupName string, serverName string) (result VirtualNetworkRuleListResultIterator, err error) { result.page, err = client.ListByServer(ctx, resourceGroupName, serverName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage/accounts.go b/vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage/accounts.go index d5913cdefb7e..c1ffd6b6e035 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage/accounts.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage/accounts.go @@ -41,9 +41,9 @@ func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) Account } // CheckNameAvailability checks that the storage account name is valid and is not already in use. -// -// accountName is the name of the storage account within the specified resource group. Storage account names must -// be between 3 and 24 characters in length and use numbers and lower-case letters only. +// Parameters: +// accountName - the name of the storage account within the specified resource group. Storage account names +// must be between 3 and 24 characters in length and use numbers and lower-case letters only. func (client AccountsClient) CheckNameAvailability(ctx context.Context, accountName AccountCheckNameAvailabilityParameters) (result CheckNameAvailabilityResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: accountName, @@ -118,11 +118,12 @@ func (client AccountsClient) CheckNameAvailabilityResponder(resp *http.Response) // and a subsequent create request is issued with different properties, the account properties will be updated. If an // account is already created and a subsequent create or update request is issued with the exact same set of // properties, the request will succeed. -// -// resourceGroupName is the name of the resource group within the user's subscription. The name is case -// insensitive. accountName is the name of the storage account within the specified resource group. Storage account -// names must be between 3 and 24 characters in length and use numbers and lower-case letters only. parameters is -// the parameters to provide for the created account. +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. The name is case +// insensitive. +// accountName - the name of the storage account within the specified resource group. Storage account names +// must be between 3 and 24 characters in length and use numbers and lower-case letters only. +// parameters - the parameters to provide for the created account. func (client AccountsClient) Create(ctx context.Context, resourceGroupName string, accountName string, parameters AccountCreateParameters) (result AccountsCreateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -211,10 +212,11 @@ func (client AccountsClient) CreateResponder(resp *http.Response) (result Accoun } // Delete deletes a storage account in Microsoft Azure. -// -// resourceGroupName is the name of the resource group within the user's subscription. The name is case -// insensitive. accountName is the name of the storage account within the specified resource group. Storage account -// names must be between 3 and 24 characters in length and use numbers and lower-case letters only. +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. The name is case +// insensitive. +// accountName - the name of the storage account within the specified resource group. Storage account names +// must be between 3 and 24 characters in length and use numbers and lower-case letters only. func (client AccountsClient) Delete(ctx context.Context, resourceGroupName string, accountName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -290,10 +292,11 @@ func (client AccountsClient) DeleteResponder(resp *http.Response) (result autore // GetProperties returns the properties for the specified storage account including but not limited to name, SKU name, // location, and account status. The ListKeys operation should be used to retrieve storage keys. -// -// resourceGroupName is the name of the resource group within the user's subscription. The name is case -// insensitive. accountName is the name of the storage account within the specified resource group. Storage account -// names must be between 3 and 24 characters in length and use numbers and lower-case letters only. +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. The name is case +// insensitive. +// accountName - the name of the storage account within the specified resource group. Storage account names +// must be between 3 and 24 characters in length and use numbers and lower-case letters only. func (client AccountsClient) GetProperties(ctx context.Context, resourceGroupName string, accountName string) (result Account, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -432,11 +435,12 @@ func (client AccountsClient) ListResponder(resp *http.Response) (result AccountL } // ListAccountSAS list SAS credentials of a storage account. -// -// resourceGroupName is the name of the resource group within the user's subscription. The name is case -// insensitive. accountName is the name of the storage account within the specified resource group. Storage account -// names must be between 3 and 24 characters in length and use numbers and lower-case letters only. parameters is -// the parameters to provide to list SAS credentials for the storage account. +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. The name is case +// insensitive. +// accountName - the name of the storage account within the specified resource group. Storage account names +// must be between 3 and 24 characters in length and use numbers and lower-case letters only. +// parameters - the parameters to provide to list SAS credentials for the storage account. func (client AccountsClient) ListAccountSAS(ctx context.Context, resourceGroupName string, accountName string, parameters AccountSasParameters) (result ListAccountSasResponse, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -517,8 +521,8 @@ func (client AccountsClient) ListAccountSASResponder(resp *http.Response) (resul // ListByResourceGroup lists all the storage accounts available under the given resource group. Note that storage keys // are not returned; use the ListKeys operation for this. -// -// resourceGroupName is the name of the resource group within the user's subscription. The name is case +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. The name is case // insensitive. func (client AccountsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result AccountListResult, err error) { if err := validation.Validate([]validation.Validation{ @@ -591,10 +595,11 @@ func (client AccountsClient) ListByResourceGroupResponder(resp *http.Response) ( } // ListKeys lists the access keys for the specified storage account. -// -// resourceGroupName is the name of the resource group within the user's subscription. The name is case -// insensitive. accountName is the name of the storage account within the specified resource group. Storage account -// names must be between 3 and 24 characters in length and use numbers and lower-case letters only. +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. The name is case +// insensitive. +// accountName - the name of the storage account within the specified resource group. Storage account names +// must be between 3 and 24 characters in length and use numbers and lower-case letters only. func (client AccountsClient) ListKeys(ctx context.Context, resourceGroupName string, accountName string) (result AccountListKeysResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -670,11 +675,12 @@ func (client AccountsClient) ListKeysResponder(resp *http.Response) (result Acco } // ListServiceSAS list service SAS credentials of a specific resource. -// -// resourceGroupName is the name of the resource group within the user's subscription. The name is case -// insensitive. accountName is the name of the storage account within the specified resource group. Storage account -// names must be between 3 and 24 characters in length and use numbers and lower-case letters only. parameters is -// the parameters to provide to list service SAS credentials. +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. The name is case +// insensitive. +// accountName - the name of the storage account within the specified resource group. Storage account names +// must be between 3 and 24 characters in length and use numbers and lower-case letters only. +// parameters - the parameters to provide to list service SAS credentials. func (client AccountsClient) ListServiceSAS(ctx context.Context, resourceGroupName string, accountName string, parameters ServiceSasParameters) (result ListServiceSasResponse, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -756,11 +762,12 @@ func (client AccountsClient) ListServiceSASResponder(resp *http.Response) (resul } // RegenerateKey regenerates one of the access keys for the specified storage account. -// -// resourceGroupName is the name of the resource group within the user's subscription. The name is case -// insensitive. accountName is the name of the storage account within the specified resource group. Storage account -// names must be between 3 and 24 characters in length and use numbers and lower-case letters only. regenerateKey -// is specifies name of the key which should be regenerated -- key1 or key2. +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. The name is case +// insensitive. +// accountName - the name of the storage account within the specified resource group. Storage account names +// must be between 3 and 24 characters in length and use numbers and lower-case letters only. +// regenerateKey - specifies name of the key which should be regenerated -- key1 or key2. func (client AccountsClient) RegenerateKey(ctx context.Context, resourceGroupName string, accountName string, regenerateKey AccountRegenerateKeyParameters) (result AccountListKeysResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -845,11 +852,12 @@ func (client AccountsClient) RegenerateKeyResponder(resp *http.Response) (result // must be cleared/unregistered before a new value can be set. The update of multiple properties is supported. This // call does not change the storage keys for the account. If you want to change the storage account keys, use the // regenerate keys operation. The location and name of the storage account cannot be changed after creation. -// -// resourceGroupName is the name of the resource group within the user's subscription. The name is case -// insensitive. accountName is the name of the storage account within the specified resource group. Storage account -// names must be between 3 and 24 characters in length and use numbers and lower-case letters only. parameters is -// the parameters to provide for the updated account. +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. The name is case +// insensitive. +// accountName - the name of the storage account within the specified resource group. Storage account names +// must be between 3 and 24 characters in length and use numbers and lower-case letters only. +// parameters - the parameters to provide for the updated account. func (client AccountsClient) Update(ctx context.Context, resourceGroupName string, accountName string, parameters AccountUpdateParameters) (result Account, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-05-01/trafficmanager/endpoints.go b/vendor/github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-05-01/trafficmanager/endpoints.go index ae3713ca7dae..70b882df4e2b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-05-01/trafficmanager/endpoints.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-05-01/trafficmanager/endpoints.go @@ -40,11 +40,13 @@ func NewEndpointsClientWithBaseURI(baseURI string, subscriptionID string) Endpoi } // CreateOrUpdate create or update a Traffic Manager endpoint. -// -// resourceGroupName is the name of the resource group containing the Traffic Manager endpoint to be created or -// updated. profileName is the name of the Traffic Manager profile. endpointType is the type of the Traffic Manager -// endpoint to be created or updated. endpointName is the name of the Traffic Manager endpoint to be created or -// updated. parameters is the Traffic Manager endpoint parameters supplied to the CreateOrUpdate operation. +// Parameters: +// resourceGroupName - the name of the resource group containing the Traffic Manager endpoint to be created or +// updated. +// profileName - the name of the Traffic Manager profile. +// endpointType - the type of the Traffic Manager endpoint to be created or updated. +// endpointName - the name of the Traffic Manager endpoint to be created or updated. +// parameters - the Traffic Manager endpoint parameters supplied to the CreateOrUpdate operation. func (client EndpointsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, profileName string, endpointType string, endpointName string, parameters Endpoint) (result Endpoint, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, profileName, endpointType, endpointName, parameters) if err != nil { @@ -113,10 +115,11 @@ func (client EndpointsClient) CreateOrUpdateResponder(resp *http.Response) (resu } // Delete deletes a Traffic Manager endpoint. -// -// resourceGroupName is the name of the resource group containing the Traffic Manager endpoint to be deleted. -// profileName is the name of the Traffic Manager profile. endpointType is the type of the Traffic Manager endpoint -// to be deleted. endpointName is the name of the Traffic Manager endpoint to be deleted. +// Parameters: +// resourceGroupName - the name of the resource group containing the Traffic Manager endpoint to be deleted. +// profileName - the name of the Traffic Manager profile. +// endpointType - the type of the Traffic Manager endpoint to be deleted. +// endpointName - the name of the Traffic Manager endpoint to be deleted. func (client EndpointsClient) Delete(ctx context.Context, resourceGroupName string, profileName string, endpointType string, endpointName string) (result DeleteOperationResult, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, profileName, endpointType, endpointName) if err != nil { @@ -183,10 +186,11 @@ func (client EndpointsClient) DeleteResponder(resp *http.Response) (result Delet } // Get gets a Traffic Manager endpoint. -// -// resourceGroupName is the name of the resource group containing the Traffic Manager endpoint. profileName is the -// name of the Traffic Manager profile. endpointType is the type of the Traffic Manager endpoint. endpointName is -// the name of the Traffic Manager endpoint. +// Parameters: +// resourceGroupName - the name of the resource group containing the Traffic Manager endpoint. +// profileName - the name of the Traffic Manager profile. +// endpointType - the type of the Traffic Manager endpoint. +// endpointName - the name of the Traffic Manager endpoint. func (client EndpointsClient) Get(ctx context.Context, resourceGroupName string, profileName string, endpointType string, endpointName string) (result Endpoint, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, profileName, endpointType, endpointName) if err != nil { @@ -253,11 +257,12 @@ func (client EndpointsClient) GetResponder(resp *http.Response) (result Endpoint } // Update update a Traffic Manager endpoint. -// -// resourceGroupName is the name of the resource group containing the Traffic Manager endpoint to be updated. -// profileName is the name of the Traffic Manager profile. endpointType is the type of the Traffic Manager endpoint -// to be updated. endpointName is the name of the Traffic Manager endpoint to be updated. parameters is the Traffic -// Manager endpoint parameters supplied to the Update operation. +// Parameters: +// resourceGroupName - the name of the resource group containing the Traffic Manager endpoint to be updated. +// profileName - the name of the Traffic Manager profile. +// endpointType - the type of the Traffic Manager endpoint to be updated. +// endpointName - the name of the Traffic Manager endpoint to be updated. +// parameters - the Traffic Manager endpoint parameters supplied to the Update operation. func (client EndpointsClient) Update(ctx context.Context, resourceGroupName string, profileName string, endpointType string, endpointName string, parameters Endpoint) (result Endpoint, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, profileName, endpointType, endpointName, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-05-01/trafficmanager/profiles.go b/vendor/github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-05-01/trafficmanager/profiles.go index e074287cac5e..81bb459236ef 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-05-01/trafficmanager/profiles.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-05-01/trafficmanager/profiles.go @@ -40,8 +40,9 @@ func NewProfilesClientWithBaseURI(baseURI string, subscriptionID string) Profile } // CheckTrafficManagerRelativeDNSNameAvailability checks the availability of a Traffic Manager Relative DNS name. -// -// parameters is the Traffic Manager name parameters supplied to the CheckTrafficManagerNameAvailability operation. +// Parameters: +// parameters - the Traffic Manager name parameters supplied to the CheckTrafficManagerNameAvailability +// operation. func (client ProfilesClient) CheckTrafficManagerRelativeDNSNameAvailability(ctx context.Context, parameters CheckTrafficManagerRelativeDNSNameAvailabilityParameters) (result NameAvailability, err error) { req, err := client.CheckTrafficManagerRelativeDNSNameAvailabilityPreparer(ctx, parameters) if err != nil { @@ -102,10 +103,10 @@ func (client ProfilesClient) CheckTrafficManagerRelativeDNSNameAvailabilityRespo } // CreateOrUpdate create or update a Traffic Manager profile. -// -// resourceGroupName is the name of the resource group containing the Traffic Manager profile. profileName is the -// name of the Traffic Manager profile. parameters is the Traffic Manager profile parameters supplied to the -// CreateOrUpdate operation. +// Parameters: +// resourceGroupName - the name of the resource group containing the Traffic Manager profile. +// profileName - the name of the Traffic Manager profile. +// parameters - the Traffic Manager profile parameters supplied to the CreateOrUpdate operation. func (client ProfilesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, profileName string, parameters Profile) (result Profile, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, profileName, parameters) if err != nil { @@ -172,9 +173,9 @@ func (client ProfilesClient) CreateOrUpdateResponder(resp *http.Response) (resul } // Delete deletes a Traffic Manager profile. -// -// resourceGroupName is the name of the resource group containing the Traffic Manager profile to be deleted. -// profileName is the name of the Traffic Manager profile to be deleted. +// Parameters: +// resourceGroupName - the name of the resource group containing the Traffic Manager profile to be deleted. +// profileName - the name of the Traffic Manager profile to be deleted. func (client ProfilesClient) Delete(ctx context.Context, resourceGroupName string, profileName string) (result DeleteOperationResult, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, profileName) if err != nil { @@ -239,9 +240,9 @@ func (client ProfilesClient) DeleteResponder(resp *http.Response) (result Delete } // Get gets a Traffic Manager profile. -// -// resourceGroupName is the name of the resource group containing the Traffic Manager profile. profileName is the -// name of the Traffic Manager profile. +// Parameters: +// resourceGroupName - the name of the resource group containing the Traffic Manager profile. +// profileName - the name of the Traffic Manager profile. func (client ProfilesClient) Get(ctx context.Context, resourceGroupName string, profileName string) (result Profile, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, profileName) if err != nil { @@ -306,8 +307,8 @@ func (client ProfilesClient) GetResponder(resp *http.Response) (result Profile, } // ListByResourceGroup lists all Traffic Manager profiles within a resource group. -// -// resourceGroupName is the name of the resource group containing the Traffic Manager profiles to be listed. +// Parameters: +// resourceGroupName - the name of the resource group containing the Traffic Manager profiles to be listed. func (client ProfilesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ProfileListResult, err error) { req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) if err != nil { @@ -433,10 +434,10 @@ func (client ProfilesClient) ListBySubscriptionResponder(resp *http.Response) (r } // Update update a Traffic Manager profile. -// -// resourceGroupName is the name of the resource group containing the Traffic Manager profile. profileName is the -// name of the Traffic Manager profile. parameters is the Traffic Manager profile parameters supplied to the Update -// operation. +// Parameters: +// resourceGroupName - the name of the resource group containing the Traffic Manager profile. +// profileName - the name of the Traffic Manager profile. +// parameters - the Traffic Manager profile parameters supplied to the Update operation. func (client ProfilesClient) Update(ctx context.Context, resourceGroupName string, profileName string, parameters Profile) (result Profile, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, profileName, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/apps.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/apps.go index 1159b5edb59f..f79664516a72 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/apps.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/apps.go @@ -41,9 +41,11 @@ func NewAppsClientWithBaseURI(baseURI string, subscriptionID string) AppsClient } // AddPremierAddOn updates a named add-on of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// premierAddOnName is add-on name. premierAddOn is a JSON representation of the edited premier add-on. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// premierAddOnName - add-on name. +// premierAddOn - a JSON representation of the edited premier add-on. func (client AppsClient) AddPremierAddOn(ctx context.Context, resourceGroupName string, name string, premierAddOnName string, premierAddOn PremierAddOn) (result PremierAddOn, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -119,11 +121,13 @@ func (client AppsClient) AddPremierAddOnResponder(resp *http.Response) (result P } // AddPremierAddOnSlot updates a named add-on of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// premierAddOnName is add-on name. premierAddOn is a JSON representation of the edited premier add-on. slot is -// name of the deployment slot. If a slot is not specified, the API will update the named add-on for the production -// slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// premierAddOnName - add-on name. +// premierAddOn - a JSON representation of the edited premier add-on. +// slot - name of the deployment slot. If a slot is not specified, the API will update the named add-on for the +// production slot. func (client AppsClient) AddPremierAddOnSlot(ctx context.Context, resourceGroupName string, name string, premierAddOnName string, premierAddOn PremierAddOn, slot string) (result PremierAddOn, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -200,9 +204,10 @@ func (client AppsClient) AddPremierAddOnSlotResponder(resp *http.Response) (resu } // AnalyzeCustomHostname analyze a custom hostname. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. hostName -// is custom hostname. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// hostName - custom hostname. func (client AppsClient) AnalyzeCustomHostname(ctx context.Context, resourceGroupName string, name string, hostName string) (result CustomHostnameAnalysisResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -278,9 +283,11 @@ func (client AppsClient) AnalyzeCustomHostnameResponder(resp *http.Response) (re } // AnalyzeCustomHostnameSlot analyze a custom hostname. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. hostName is custom hostname. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. +// hostName - custom hostname. func (client AppsClient) AnalyzeCustomHostnameSlot(ctx context.Context, resourceGroupName string, name string, slot string, hostName string) (result CustomHostnameAnalysisResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -357,9 +364,10 @@ func (client AppsClient) AnalyzeCustomHostnameSlotResponder(resp *http.Response) } // ApplySlotConfigToProduction applies the configuration settings from the target slot onto the current slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// slotSwapEntity is JSON object that contains the target slot name. See example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slotSwapEntity - JSON object that contains the target slot name. See example. func (client AppsClient) ApplySlotConfigToProduction(ctx context.Context, resourceGroupName string, name string, slotSwapEntity CsmSlotEntity) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -436,10 +444,11 @@ func (client AppsClient) ApplySlotConfigToProductionResponder(resp *http.Respons } // ApplySlotConfigurationSlot applies the configuration settings from the target slot onto the current slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// slotSwapEntity is JSON object that contains the target slot name. See example. slot is name of the source slot. -// If a slot is not specified, the production slot is used as the source slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slotSwapEntity - JSON object that contains the target slot name. See example. +// slot - name of the source slot. If a slot is not specified, the production slot is used as the source slot. func (client AppsClient) ApplySlotConfigurationSlot(ctx context.Context, resourceGroupName string, name string, slotSwapEntity CsmSlotEntity, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -517,9 +526,10 @@ func (client AppsClient) ApplySlotConfigurationSlotResponder(resp *http.Response } // Backup creates a backup of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. request -// is backup configuration. You can use the JSON response from the POST action as input here. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// request - backup configuration. You can use the JSON response from the POST action as input here. func (client AppsClient) Backup(ctx context.Context, resourceGroupName string, name string, request BackupRequest) (result BackupItem, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -604,10 +614,12 @@ func (client AppsClient) BackupResponder(resp *http.Response) (result BackupItem } // BackupSlot creates a backup of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. request -// is backup configuration. You can use the JSON response from the POST action as input here. slot is name of the -// deployment slot. If a slot is not specified, the API will create a backup for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// request - backup configuration. You can use the JSON response from the POST action as input here. +// slot - name of the deployment slot. If a slot is not specified, the API will create a backup for the +// production slot. func (client AppsClient) BackupSlot(ctx context.Context, resourceGroupName string, name string, request BackupRequest, slot string) (result BackupItem, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -693,9 +705,11 @@ func (client AppsClient) BackupSlotResponder(resp *http.Response) (result Backup } // CreateDeployment create a deployment for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. ID is ID -// of an existing deployment. deployment is deployment details. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// ID - ID of an existing deployment. +// deployment - deployment details. func (client AppsClient) CreateDeployment(ctx context.Context, resourceGroupName string, name string, ID string, deployment Deployment) (result Deployment, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -771,10 +785,13 @@ func (client AppsClient) CreateDeploymentResponder(resp *http.Response) (result } // CreateDeploymentSlot create a deployment for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. ID is ID -// of an existing deployment. slot is name of the deployment slot. If a slot is not specified, the API creates a -// deployment for the production slot. deployment is deployment details. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// ID - ID of an existing deployment. +// slot - name of the deployment slot. If a slot is not specified, the API creates a deployment for the +// production slot. +// deployment - deployment details. func (client AppsClient) CreateDeploymentSlot(ctx context.Context, resourceGroupName string, name string, ID string, slot string, deployment Deployment) (result Deployment, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -851,9 +868,11 @@ func (client AppsClient) CreateDeploymentSlotResponder(resp *http.Response) (res } // CreateFunction create function for web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. functionName -// is function name. functionEnvelope is function details. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// functionName - function name. +// functionEnvelope - function details. func (client AppsClient) CreateFunction(ctx context.Context, resourceGroupName string, name string, functionName string, functionEnvelope FunctionEnvelope) (result AppsCreateFunctionFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -931,10 +950,13 @@ func (client AppsClient) CreateFunctionResponder(resp *http.Response) (result Fu } // CreateInstanceFunctionSlot create function for web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. functionName -// is function name. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment -// for the production slot. functionEnvelope is function details. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// functionName - function name. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. +// functionEnvelope - function details. func (client AppsClient) CreateInstanceFunctionSlot(ctx context.Context, resourceGroupName string, name string, functionName string, slot string, functionEnvelope FunctionEnvelope) (result AppsCreateInstanceFunctionSlotFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1013,9 +1035,11 @@ func (client AppsClient) CreateInstanceFunctionSlotResponder(resp *http.Response } // CreateInstanceMSDeployOperation invoke the MSDeploy web app extension. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. -// instanceID is ID of web app instance. mSDeploy is details of MSDeploy operation +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// instanceID - ID of web app instance. +// mSDeploy - details of MSDeploy operation func (client AppsClient) CreateInstanceMSDeployOperation(ctx context.Context, resourceGroupName string, name string, instanceID string, mSDeploy MSDeploy) (result AppsCreateInstanceMSDeployOperationFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1093,10 +1117,12 @@ func (client AppsClient) CreateInstanceMSDeployOperationResponder(resp *http.Res } // CreateInstanceMSDeployOperationSlot invoke the MSDeploy web app extension. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. instanceID is ID of web app -// instance. mSDeploy is details of MSDeploy operation +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. +// instanceID - ID of web app instance. +// mSDeploy - details of MSDeploy operation func (client AppsClient) CreateInstanceMSDeployOperationSlot(ctx context.Context, resourceGroupName string, name string, slot string, instanceID string, mSDeploy MSDeploy) (result AppsCreateInstanceMSDeployOperationSlotFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1175,9 +1201,10 @@ func (client AppsClient) CreateInstanceMSDeployOperationSlotResponder(resp *http } // CreateMSDeployOperation invoke the MSDeploy web app extension. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. mSDeploy -// is details of MSDeploy operation +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// mSDeploy - details of MSDeploy operation func (client AppsClient) CreateMSDeployOperation(ctx context.Context, resourceGroupName string, name string, mSDeploy MSDeploy) (result AppsCreateMSDeployOperationFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1254,10 +1281,11 @@ func (client AppsClient) CreateMSDeployOperationResponder(resp *http.Response) ( } // CreateMSDeployOperationSlot invoke the MSDeploy web app extension. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. mSDeploy is details of MSDeploy -// operation +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. +// mSDeploy - details of MSDeploy operation func (client AppsClient) CreateMSDeployOperationSlot(ctx context.Context, resourceGroupName string, name string, slot string, mSDeploy MSDeploy) (result AppsCreateMSDeployOperationSlotFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1335,10 +1363,11 @@ func (client AppsClient) CreateMSDeployOperationSlotResponder(resp *http.Respons } // CreateOrUpdate creates a new web, mobile, or API app in an existing resource group, or updates an existing app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is unique name of the app to -// create or update. To create or update a deployment slot, use the {slot} parameter. siteEnvelope is a JSON -// representation of the app properties. See example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - unique name of the app to create or update. To create or update a deployment slot, use the {slot} +// parameter. +// siteEnvelope - a JSON representation of the app properties. See example. func (client AppsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, name string, siteEnvelope Site) (result AppsCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1430,9 +1459,10 @@ func (client AppsClient) CreateOrUpdateResponder(resp *http.Response) (result Si } // CreateOrUpdateConfiguration updates the configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// siteConfig is JSON representation of a SiteConfig object. See example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// siteConfig - JSON representation of a SiteConfig object. See example. func (client AppsClient) CreateOrUpdateConfiguration(ctx context.Context, resourceGroupName string, name string, siteConfig SiteConfigResource) (result SiteConfigResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1514,10 +1544,12 @@ func (client AppsClient) CreateOrUpdateConfigurationResponder(resp *http.Respons } // CreateOrUpdateConfigurationSlot updates the configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// siteConfig is JSON representation of a SiteConfig object. See example. slot is name of the deployment slot. If a -// slot is not specified, the API will update configuration for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// siteConfig - JSON representation of a SiteConfig object. See example. +// slot - name of the deployment slot. If a slot is not specified, the API will update configuration for the +// production slot. func (client AppsClient) CreateOrUpdateConfigurationSlot(ctx context.Context, resourceGroupName string, name string, siteConfig SiteConfigResource, slot string) (result SiteConfigResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1601,10 +1633,11 @@ func (client AppsClient) CreateOrUpdateConfigurationSlotResponder(resp *http.Res // CreateOrUpdateDomainOwnershipIdentifier creates a domain ownership identifier for web app, or updates an existing // ownership identifier. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// domainOwnershipIdentifierName is name of domain ownership identifier. domainOwnershipIdentifier is a JSON -// representation of the domain ownership properties. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// domainOwnershipIdentifierName - name of domain ownership identifier. +// domainOwnershipIdentifier - a JSON representation of the domain ownership properties. func (client AppsClient) CreateOrUpdateDomainOwnershipIdentifier(ctx context.Context, resourceGroupName string, name string, domainOwnershipIdentifierName string, domainOwnershipIdentifier Identifier) (result Identifier, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1681,11 +1714,13 @@ func (client AppsClient) CreateOrUpdateDomainOwnershipIdentifierResponder(resp * // CreateOrUpdateDomainOwnershipIdentifierSlot creates a domain ownership identifier for web app, or updates an // existing ownership identifier. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// domainOwnershipIdentifierName is name of domain ownership identifier. domainOwnershipIdentifier is a JSON -// representation of the domain ownership properties. slot is name of the deployment slot. If a slot is not -// specified, the API will delete the binding for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// domainOwnershipIdentifierName - name of domain ownership identifier. +// domainOwnershipIdentifier - a JSON representation of the domain ownership properties. +// slot - name of the deployment slot. If a slot is not specified, the API will delete the binding for the +// production slot. func (client AppsClient) CreateOrUpdateDomainOwnershipIdentifierSlot(ctx context.Context, resourceGroupName string, name string, domainOwnershipIdentifierName string, domainOwnershipIdentifier Identifier, slot string) (result Identifier, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1762,10 +1797,11 @@ func (client AppsClient) CreateOrUpdateDomainOwnershipIdentifierSlotResponder(re } // CreateOrUpdateHostNameBinding creates a hostname binding for an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. hostName -// is hostname in the hostname binding. hostNameBinding is binding details. This is the JSON representation of a -// HostNameBinding object. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// hostName - hostname in the hostname binding. +// hostNameBinding - binding details. This is the JSON representation of a HostNameBinding object. func (client AppsClient) CreateOrUpdateHostNameBinding(ctx context.Context, resourceGroupName string, name string, hostName string, hostNameBinding HostNameBinding) (result HostNameBinding, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1841,11 +1877,13 @@ func (client AppsClient) CreateOrUpdateHostNameBindingResponder(resp *http.Respo } // CreateOrUpdateHostNameBindingSlot creates a hostname binding for an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. hostName -// is hostname in the hostname binding. hostNameBinding is binding details. This is the JSON representation of a -// HostNameBinding object. slot is name of the deployment slot. If a slot is not specified, the API will create a -// binding for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// hostName - hostname in the hostname binding. +// hostNameBinding - binding details. This is the JSON representation of a HostNameBinding object. +// slot - name of the deployment slot. If a slot is not specified, the API will create a binding for the +// production slot. func (client AppsClient) CreateOrUpdateHostNameBindingSlot(ctx context.Context, resourceGroupName string, name string, hostName string, hostNameBinding HostNameBinding, slot string) (result HostNameBinding, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1922,10 +1960,12 @@ func (client AppsClient) CreateOrUpdateHostNameBindingSlotResponder(resp *http.R } // CreateOrUpdateHybridConnection creates a new Hybrid Connection using a Service Bus relay. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// namespaceName is the namespace for this hybrid connection. relayName is the relay name for this hybrid -// connection. connectionEnvelope is the details of the hybrid connection. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// namespaceName - the namespace for this hybrid connection. +// relayName - the relay name for this hybrid connection. +// connectionEnvelope - the details of the hybrid connection. func (client AppsClient) CreateOrUpdateHybridConnection(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string, connectionEnvelope HybridConnection) (result HybridConnection, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2002,11 +2042,13 @@ func (client AppsClient) CreateOrUpdateHybridConnectionResponder(resp *http.Resp } // CreateOrUpdateHybridConnectionSlot creates a new Hybrid Connection using a Service Bus relay. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// namespaceName is the namespace for this hybrid connection. relayName is the relay name for this hybrid -// connection. connectionEnvelope is the details of the hybrid connection. slot is the name of the slot for the web -// app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// namespaceName - the namespace for this hybrid connection. +// relayName - the relay name for this hybrid connection. +// connectionEnvelope - the details of the hybrid connection. +// slot - the name of the slot for the web app. func (client AppsClient) CreateOrUpdateHybridConnectionSlot(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string, connectionEnvelope HybridConnection, slot string) (result HybridConnection, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2084,10 +2126,12 @@ func (client AppsClient) CreateOrUpdateHybridConnectionSlotResponder(resp *http. } // CreateOrUpdatePublicCertificate creates a hostname binding for an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// publicCertificateName is public certificate name. publicCertificate is public certificate details. This is the -// JSON representation of a PublicCertificate object. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// publicCertificateName - public certificate name. +// publicCertificate - public certificate details. This is the JSON representation of a PublicCertificate +// object. func (client AppsClient) CreateOrUpdatePublicCertificate(ctx context.Context, resourceGroupName string, name string, publicCertificateName string, publicCertificate PublicCertificate) (result PublicCertificate, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2163,11 +2207,14 @@ func (client AppsClient) CreateOrUpdatePublicCertificateResponder(resp *http.Res } // CreateOrUpdatePublicCertificateSlot creates a hostname binding for an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// publicCertificateName is public certificate name. publicCertificate is public certificate details. This is the -// JSON representation of a PublicCertificate object. slot is name of the deployment slot. If a slot is not -// specified, the API will create a binding for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// publicCertificateName - public certificate name. +// publicCertificate - public certificate details. This is the JSON representation of a PublicCertificate +// object. +// slot - name of the deployment slot. If a slot is not specified, the API will create a binding for the +// production slot. func (client AppsClient) CreateOrUpdatePublicCertificateSlot(ctx context.Context, resourceGroupName string, name string, publicCertificateName string, publicCertificate PublicCertificate, slot string) (result PublicCertificate, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2245,10 +2292,11 @@ func (client AppsClient) CreateOrUpdatePublicCertificateSlotResponder(resp *http // CreateOrUpdateRelayServiceConnection creates a new hybrid connection configuration (PUT), or updates an existing one // (PATCH). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// entityName is name of the hybrid connection configuration. connectionEnvelope is details of the hybrid -// connection configuration. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// entityName - name of the hybrid connection configuration. +// connectionEnvelope - details of the hybrid connection configuration. func (client AppsClient) CreateOrUpdateRelayServiceConnection(ctx context.Context, resourceGroupName string, name string, entityName string, connectionEnvelope RelayServiceConnectionEntity) (result RelayServiceConnectionEntity, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2325,11 +2373,13 @@ func (client AppsClient) CreateOrUpdateRelayServiceConnectionResponder(resp *htt // CreateOrUpdateRelayServiceConnectionSlot creates a new hybrid connection configuration (PUT), or updates an existing // one (PATCH). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// entityName is name of the hybrid connection configuration. connectionEnvelope is details of the hybrid -// connection configuration. slot is name of the deployment slot. If a slot is not specified, the API will create -// or update a hybrid connection for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// entityName - name of the hybrid connection configuration. +// connectionEnvelope - details of the hybrid connection configuration. +// slot - name of the deployment slot. If a slot is not specified, the API will create or update a hybrid +// connection for the production slot. func (client AppsClient) CreateOrUpdateRelayServiceConnectionSlot(ctx context.Context, resourceGroupName string, name string, entityName string, connectionEnvelope RelayServiceConnectionEntity, slot string) (result RelayServiceConnectionEntity, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2406,15 +2456,19 @@ func (client AppsClient) CreateOrUpdateRelayServiceConnectionSlotResponder(resp } // CreateOrUpdateSlot creates a new web, mobile, or API app in an existing resource group, or updates an existing app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is unique name of the app to -// create or update. To create or update a deployment slot, use the {slot} parameter. siteEnvelope is a JSON -// representation of the app properties. See example. slot is name of the deployment slot to create or update. By -// default, this API attempts to create or modify the production slot. skipDNSRegistration is if true web app -// hostname is not registered with DNS on creation. This parameter is -// only used for app creation. skipCustomDomainVerification is if true, custom (non *.azurewebsites.net) domains -// associated with web app are not verified. forceDNSRegistration is if true, web app hostname is force registered -// with DNS. TTLInSeconds is time to live in seconds for web app's default domain name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - unique name of the app to create or update. To create or update a deployment slot, use the {slot} +// parameter. +// siteEnvelope - a JSON representation of the app properties. See example. +// slot - name of the deployment slot to create or update. By default, this API attempts to create or modify +// the production slot. +// skipDNSRegistration - if true web app hostname is not registered with DNS on creation. This parameter is +// only used for app creation. +// skipCustomDomainVerification - if true, custom (non *.azurewebsites.net) domains associated with web app are +// not verified. +// forceDNSRegistration - if true, web app hostname is force registered with DNS. +// TTLInSeconds - time to live in seconds for web app's default domain name. func (client AppsClient) CreateOrUpdateSlot(ctx context.Context, resourceGroupName string, name string, siteEnvelope Site, slot string, skipDNSRegistration *bool, skipCustomDomainVerification *bool, forceDNSRegistration *bool, TTLInSeconds string) (result AppsCreateOrUpdateSlotFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2519,9 +2573,10 @@ func (client AppsClient) CreateOrUpdateSlotResponder(resp *http.Response) (resul } // CreateOrUpdateSourceControl updates the source control configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// siteSourceControl is JSON representation of a SiteSourceControl object. See example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// siteSourceControl - JSON representation of a SiteSourceControl object. See example. func (client AppsClient) CreateOrUpdateSourceControl(ctx context.Context, resourceGroupName string, name string, siteSourceControl SiteSourceControl) (result AppsCreateOrUpdateSourceControlFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2580,7 +2635,7 @@ func (client AppsClient) CreateOrUpdateSourceControlSender(req *http.Request) (f return } err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) return } @@ -2590,7 +2645,7 @@ func (client AppsClient) CreateOrUpdateSourceControlResponder(resp *http.Respons err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} @@ -2598,11 +2653,12 @@ func (client AppsClient) CreateOrUpdateSourceControlResponder(resp *http.Respons } // CreateOrUpdateSourceControlSlot updates the source control configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// siteSourceControl is JSON representation of a SiteSourceControl object. See example. slot is name of the -// deployment slot. If a slot is not specified, the API will update the source control configuration for the -// production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// siteSourceControl - JSON representation of a SiteSourceControl object. See example. +// slot - name of the deployment slot. If a slot is not specified, the API will update the source control +// configuration for the production slot. func (client AppsClient) CreateOrUpdateSourceControlSlot(ctx context.Context, resourceGroupName string, name string, siteSourceControl SiteSourceControl, slot string) (result AppsCreateOrUpdateSourceControlSlotFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2662,7 +2718,7 @@ func (client AppsClient) CreateOrUpdateSourceControlSlotSender(req *http.Request return } err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) return } @@ -2672,7 +2728,7 @@ func (client AppsClient) CreateOrUpdateSourceControlSlotResponder(resp *http.Res err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} @@ -2681,10 +2737,11 @@ func (client AppsClient) CreateOrUpdateSourceControlSlotResponder(resp *http.Res // CreateOrUpdateVnetConnection adds a Virtual Network connection to an app or slot (PUT) or updates the connection // properties (PATCH). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of an existing Virtual Network. connectionEnvelope is properties of the Virtual Network connection. See -// example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of an existing Virtual Network. +// connectionEnvelope - properties of the Virtual Network connection. See example. func (client AppsClient) CreateOrUpdateVnetConnection(ctx context.Context, resourceGroupName string, name string, vnetName string, connectionEnvelope VnetInfo) (result VnetInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2760,10 +2817,12 @@ func (client AppsClient) CreateOrUpdateVnetConnectionResponder(resp *http.Respon } // CreateOrUpdateVnetConnectionGateway adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of the Virtual Network. gatewayName is name of the gateway. Currently, the only supported string is -// "primary". connectionEnvelope is the properties to update this gateway with. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of the Virtual Network. +// gatewayName - name of the gateway. Currently, the only supported string is "primary". +// connectionEnvelope - the properties to update this gateway with. func (client AppsClient) CreateOrUpdateVnetConnectionGateway(ctx context.Context, resourceGroupName string, name string, vnetName string, gatewayName string, connectionEnvelope VnetGateway) (result VnetGateway, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2843,12 +2902,14 @@ func (client AppsClient) CreateOrUpdateVnetConnectionGatewayResponder(resp *http } // CreateOrUpdateVnetConnectionGatewaySlot adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of the Virtual Network. gatewayName is name of the gateway. Currently, the only supported string is -// "primary". connectionEnvelope is the properties to update this gateway with. slot is name of the deployment -// slot. If a slot is not specified, the API will add or update a gateway for the production slot's Virtual -// Network. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of the Virtual Network. +// gatewayName - name of the gateway. Currently, the only supported string is "primary". +// connectionEnvelope - the properties to update this gateway with. +// slot - name of the deployment slot. If a slot is not specified, the API will add or update a gateway for the +// production slot's Virtual Network. func (client AppsClient) CreateOrUpdateVnetConnectionGatewaySlot(ctx context.Context, resourceGroupName string, name string, vnetName string, gatewayName string, connectionEnvelope VnetGateway, slot string) (result VnetGateway, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2930,11 +2991,13 @@ func (client AppsClient) CreateOrUpdateVnetConnectionGatewaySlotResponder(resp * // CreateOrUpdateVnetConnectionSlot adds a Virtual Network connection to an app or slot (PUT) or updates the connection // properties (PATCH). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of an existing Virtual Network. connectionEnvelope is properties of the Virtual Network connection. See -// example. slot is name of the deployment slot. If a slot is not specified, the API will add or update connections -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of an existing Virtual Network. +// connectionEnvelope - properties of the Virtual Network connection. See example. +// slot - name of the deployment slot. If a slot is not specified, the API will add or update connections for +// the production slot. func (client AppsClient) CreateOrUpdateVnetConnectionSlot(ctx context.Context, resourceGroupName string, name string, vnetName string, connectionEnvelope VnetInfo, slot string) (result VnetInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3011,11 +3074,12 @@ func (client AppsClient) CreateOrUpdateVnetConnectionSlotResponder(resp *http.Re } // Delete deletes a web, mobile, or API app, or one of the deployment slots. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app to -// delete. deleteMetrics is if true, web app metrics are also deleted. deleteEmptyServerFarm is specify true if the -// App Service plan will be empty after app deletion and you want to delete the empty App Service plan. By default, -// the empty App Service plan is not deleted. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app to delete. +// deleteMetrics - if true, web app metrics are also deleted. +// deleteEmptyServerFarm - specify true if the App Service plan will be empty after app deletion and you want +// to delete the empty App Service plan. By default, the empty App Service plan is not deleted. func (client AppsClient) Delete(ctx context.Context, resourceGroupName string, name string, deleteMetrics *bool, deleteEmptyServerFarm *bool) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3093,9 +3157,10 @@ func (client AppsClient) DeleteResponder(resp *http.Response) (result autorest.R } // DeleteBackup deletes a backup of an app by its ID. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. backupID -// is ID of the backup. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// backupID - ID of the backup. func (client AppsClient) DeleteBackup(ctx context.Context, resourceGroupName string, name string, backupID string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3168,8 +3233,9 @@ func (client AppsClient) DeleteBackupResponder(resp *http.Response) (result auto } // DeleteBackupConfiguration deletes the backup configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) DeleteBackupConfiguration(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3241,10 +3307,11 @@ func (client AppsClient) DeleteBackupConfigurationResponder(resp *http.Response) } // DeleteBackupConfigurationSlot deletes the backup configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will delete the backup configuration for the -// production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will delete the backup configuration +// for the production slot. func (client AppsClient) DeleteBackupConfigurationSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3317,10 +3384,12 @@ func (client AppsClient) DeleteBackupConfigurationSlotResponder(resp *http.Respo } // DeleteBackupSlot deletes a backup of an app by its ID. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. backupID -// is ID of the backup. slot is name of the deployment slot. If a slot is not specified, the API will delete a -// backup of the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// backupID - ID of the backup. +// slot - name of the deployment slot. If a slot is not specified, the API will delete a backup of the +// production slot. func (client AppsClient) DeleteBackupSlot(ctx context.Context, resourceGroupName string, name string, backupID string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3394,9 +3463,10 @@ func (client AppsClient) DeleteBackupSlotResponder(resp *http.Response) (result } // DeleteContinuousWebJob delete a continuous web job by its ID for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. func (client AppsClient) DeleteContinuousWebJob(ctx context.Context, resourceGroupName string, name string, webJobName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3469,10 +3539,12 @@ func (client AppsClient) DeleteContinuousWebJobResponder(resp *http.Response) (r } // DeleteContinuousWebJobSlot delete a continuous web job by its ID for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) DeleteContinuousWebJobSlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3546,9 +3618,10 @@ func (client AppsClient) DeleteContinuousWebJobSlotResponder(resp *http.Response } // DeleteDeployment delete a deployment by its ID for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. ID is -// deployment ID. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// ID - deployment ID. func (client AppsClient) DeleteDeployment(ctx context.Context, resourceGroupName string, name string, ID string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3621,10 +3694,12 @@ func (client AppsClient) DeleteDeploymentResponder(resp *http.Response) (result } // DeleteDeploymentSlot delete a deployment by its ID for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. ID is -// deployment ID. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment for -// the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// ID - deployment ID. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) DeleteDeploymentSlot(ctx context.Context, resourceGroupName string, name string, ID string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3698,9 +3773,10 @@ func (client AppsClient) DeleteDeploymentSlotResponder(resp *http.Response) (res } // DeleteDomainOwnershipIdentifier deletes a domain ownership identifier for a web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// domainOwnershipIdentifierName is name of domain ownership identifier. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// domainOwnershipIdentifierName - name of domain ownership identifier. func (client AppsClient) DeleteDomainOwnershipIdentifier(ctx context.Context, resourceGroupName string, name string, domainOwnershipIdentifierName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3773,10 +3849,12 @@ func (client AppsClient) DeleteDomainOwnershipIdentifierResponder(resp *http.Res } // DeleteDomainOwnershipIdentifierSlot deletes a domain ownership identifier for a web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// domainOwnershipIdentifierName is name of domain ownership identifier. slot is name of the deployment slot. If a -// slot is not specified, the API will delete the binding for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// domainOwnershipIdentifierName - name of domain ownership identifier. +// slot - name of the deployment slot. If a slot is not specified, the API will delete the binding for the +// production slot. func (client AppsClient) DeleteDomainOwnershipIdentifierSlot(ctx context.Context, resourceGroupName string, name string, domainOwnershipIdentifierName string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3850,9 +3928,10 @@ func (client AppsClient) DeleteDomainOwnershipIdentifierSlotResponder(resp *http } // DeleteFunction delete a function for web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. functionName -// is function name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// functionName - function name. func (client AppsClient) DeleteFunction(ctx context.Context, resourceGroupName string, name string, functionName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3925,9 +4004,10 @@ func (client AppsClient) DeleteFunctionResponder(resp *http.Response) (result au } // DeleteHostNameBinding deletes a hostname binding for an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. hostName -// is hostname in the hostname binding. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// hostName - hostname in the hostname binding. func (client AppsClient) DeleteHostNameBinding(ctx context.Context, resourceGroupName string, name string, hostName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -4000,10 +4080,12 @@ func (client AppsClient) DeleteHostNameBindingResponder(resp *http.Response) (re } // DeleteHostNameBindingSlot deletes a hostname binding for an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will delete the binding for the production -// slot. hostName is hostname in the hostname binding. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will delete the binding for the +// production slot. +// hostName - hostname in the hostname binding. func (client AppsClient) DeleteHostNameBindingSlot(ctx context.Context, resourceGroupName string, name string, slot string, hostName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -4077,10 +4159,11 @@ func (client AppsClient) DeleteHostNameBindingSlotResponder(resp *http.Response) } // DeleteHybridConnection removes a Hybrid Connection from this site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// namespaceName is the namespace for this hybrid connection. relayName is the relay name for this hybrid -// connection. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// namespaceName - the namespace for this hybrid connection. +// relayName - the relay name for this hybrid connection. func (client AppsClient) DeleteHybridConnection(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -4154,10 +4237,12 @@ func (client AppsClient) DeleteHybridConnectionResponder(resp *http.Response) (r } // DeleteHybridConnectionSlot removes a Hybrid Connection from this site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// namespaceName is the namespace for this hybrid connection. relayName is the relay name for this hybrid -// connection. slot is the name of the slot for the web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// namespaceName - the namespace for this hybrid connection. +// relayName - the relay name for this hybrid connection. +// slot - the name of the slot for the web app. func (client AppsClient) DeleteHybridConnectionSlot(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -4232,10 +4317,12 @@ func (client AppsClient) DeleteHybridConnectionSlotResponder(resp *http.Response } // DeleteInstanceFunctionSlot delete a function for web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. functionName -// is function name. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// functionName - function name. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) DeleteInstanceFunctionSlot(ctx context.Context, resourceGroupName string, name string, functionName string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -4310,9 +4397,11 @@ func (client AppsClient) DeleteInstanceFunctionSlotResponder(resp *http.Response // DeleteInstanceProcess terminate a process by its ID for a web site, or a deployment slot, or specific scaled-out // instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. instanceID is ID of a specific scaled-out instance. This is the value of the name property in the JSON +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON // response from "GET api/sites/{siteName}/instances". func (client AppsClient) DeleteInstanceProcess(ctx context.Context, resourceGroupName string, name string, processID string, instanceID string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ @@ -4388,11 +4477,14 @@ func (client AppsClient) DeleteInstanceProcessResponder(resp *http.Response) (re // DeleteInstanceProcessSlot terminate a process by its ID for a web site, or a deployment slot, or specific scaled-out // instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. slot is name of the deployment slot. If a slot is not specified, the API returns deployments for the -// production slot. instanceID is ID of a specific scaled-out instance. This is the value of the name property in -// the JSON response from "GET api/sites/{siteName}/instances". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON +// response from "GET api/sites/{siteName}/instances". func (client AppsClient) DeleteInstanceProcessSlot(ctx context.Context, resourceGroupName string, name string, processID string, slot string, instanceID string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -4467,9 +4559,10 @@ func (client AppsClient) DeleteInstanceProcessSlotResponder(resp *http.Response) } // DeletePremierAddOn delete a premier add-on from an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// premierAddOnName is add-on name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// premierAddOnName - add-on name. func (client AppsClient) DeletePremierAddOn(ctx context.Context, resourceGroupName string, name string, premierAddOnName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -4542,10 +4635,12 @@ func (client AppsClient) DeletePremierAddOnResponder(resp *http.Response) (resul } // DeletePremierAddOnSlot delete a premier add-on from an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// premierAddOnName is add-on name. slot is name of the deployment slot. If a slot is not specified, the API will -// delete the named add-on for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// premierAddOnName - add-on name. +// slot - name of the deployment slot. If a slot is not specified, the API will delete the named add-on for the +// production slot. func (client AppsClient) DeletePremierAddOnSlot(ctx context.Context, resourceGroupName string, name string, premierAddOnName string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -4620,9 +4715,10 @@ func (client AppsClient) DeletePremierAddOnSlotResponder(resp *http.Response) (r // DeleteProcess terminate a process by its ID for a web site, or a deployment slot, or specific scaled-out instance in // a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. func (client AppsClient) DeleteProcess(ctx context.Context, resourceGroupName string, name string, processID string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -4696,9 +4792,11 @@ func (client AppsClient) DeleteProcessResponder(resp *http.Response) (result aut // DeleteProcessSlot terminate a process by its ID for a web site, or a deployment slot, or specific scaled-out // instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. slot is name of the deployment slot. If a slot is not specified, the API returns deployments for the +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the // production slot. func (client AppsClient) DeleteProcessSlot(ctx context.Context, resourceGroupName string, name string, processID string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ @@ -4773,9 +4871,10 @@ func (client AppsClient) DeleteProcessSlotResponder(resp *http.Response) (result } // DeletePublicCertificate deletes a hostname binding for an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// publicCertificateName is public certificate name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// publicCertificateName - public certificate name. func (client AppsClient) DeletePublicCertificate(ctx context.Context, resourceGroupName string, name string, publicCertificateName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -4848,10 +4947,12 @@ func (client AppsClient) DeletePublicCertificateResponder(resp *http.Response) ( } // DeletePublicCertificateSlot deletes a hostname binding for an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will delete the binding for the production -// slot. publicCertificateName is public certificate name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will delete the binding for the +// production slot. +// publicCertificateName - public certificate name. func (client AppsClient) DeletePublicCertificateSlot(ctx context.Context, resourceGroupName string, name string, slot string, publicCertificateName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -4925,9 +5026,10 @@ func (client AppsClient) DeletePublicCertificateSlotResponder(resp *http.Respons } // DeleteRelayServiceConnection deletes a relay service connection by its name. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// entityName is name of the hybrid connection configuration. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// entityName - name of the hybrid connection configuration. func (client AppsClient) DeleteRelayServiceConnection(ctx context.Context, resourceGroupName string, name string, entityName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5000,10 +5102,12 @@ func (client AppsClient) DeleteRelayServiceConnectionResponder(resp *http.Respon } // DeleteRelayServiceConnectionSlot deletes a relay service connection by its name. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// entityName is name of the hybrid connection configuration. slot is name of the deployment slot. If a slot is not -// specified, the API will delete a hybrid connection for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// entityName - name of the hybrid connection configuration. +// slot - name of the deployment slot. If a slot is not specified, the API will delete a hybrid connection for +// the production slot. func (client AppsClient) DeleteRelayServiceConnectionSlot(ctx context.Context, resourceGroupName string, name string, entityName string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5077,9 +5181,10 @@ func (client AppsClient) DeleteRelayServiceConnectionSlotResponder(resp *http.Re } // DeleteSiteExtension remove a site extension from a web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. -// siteExtensionID is site extension name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// siteExtensionID - site extension name. func (client AppsClient) DeleteSiteExtension(ctx context.Context, resourceGroupName string, name string, siteExtensionID string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5152,10 +5257,12 @@ func (client AppsClient) DeleteSiteExtensionResponder(resp *http.Response) (resu } // DeleteSiteExtensionSlot remove a site extension from a web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. -// siteExtensionID is site extension name. slot is name of the deployment slot. If a slot is not specified, the API -// deletes a deployment for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// siteExtensionID - site extension name. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) DeleteSiteExtensionSlot(ctx context.Context, resourceGroupName string, name string, siteExtensionID string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5229,12 +5336,14 @@ func (client AppsClient) DeleteSiteExtensionSlotResponder(resp *http.Response) ( } // DeleteSlot deletes a web, mobile, or API app, or one of the deployment slots. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app to -// delete. slot is name of the deployment slot to delete. By default, the API deletes the production slot. -// deleteMetrics is if true, web app metrics are also deleted. deleteEmptyServerFarm is specify true if the App -// Service plan will be empty after app deletion and you want to delete the empty App Service plan. By default, the -// empty App Service plan is not deleted. skipDNSRegistration is if true, DNS registration is skipped. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app to delete. +// slot - name of the deployment slot to delete. By default, the API deletes the production slot. +// deleteMetrics - if true, web app metrics are also deleted. +// deleteEmptyServerFarm - specify true if the App Service plan will be empty after app deletion and you want +// to delete the empty App Service plan. By default, the empty App Service plan is not deleted. +// skipDNSRegistration - if true, DNS registration is skipped. func (client AppsClient) DeleteSlot(ctx context.Context, resourceGroupName string, name string, slot string, deleteMetrics *bool, deleteEmptyServerFarm *bool, skipDNSRegistration *bool) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5316,8 +5425,9 @@ func (client AppsClient) DeleteSlotResponder(resp *http.Response) (result autore } // DeleteSourceControl deletes the source control configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) DeleteSourceControl(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5389,10 +5499,11 @@ func (client AppsClient) DeleteSourceControlResponder(resp *http.Response) (resu } // DeleteSourceControlSlot deletes the source control configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will delete the source control configuration -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will delete the source control +// configuration for the production slot. func (client AppsClient) DeleteSourceControlSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5465,9 +5576,10 @@ func (client AppsClient) DeleteSourceControlSlotResponder(resp *http.Response) ( } // DeleteTriggeredWebJob delete a triggered web job by its ID for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. func (client AppsClient) DeleteTriggeredWebJob(ctx context.Context, resourceGroupName string, name string, webJobName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5540,10 +5652,12 @@ func (client AppsClient) DeleteTriggeredWebJobResponder(resp *http.Response) (re } // DeleteTriggeredWebJobSlot delete a triggered web job by its ID for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) DeleteTriggeredWebJobSlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5617,9 +5731,10 @@ func (client AppsClient) DeleteTriggeredWebJobSlotResponder(resp *http.Response) } // DeleteVnetConnection deletes a connection from an app (or deployment slot to a named virtual network. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of the virtual network. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of the virtual network. func (client AppsClient) DeleteVnetConnection(ctx context.Context, resourceGroupName string, name string, vnetName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5692,10 +5807,12 @@ func (client AppsClient) DeleteVnetConnectionResponder(resp *http.Response) (res } // DeleteVnetConnectionSlot deletes a connection from an app (or deployment slot to a named virtual network. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of the virtual network. slot is name of the deployment slot. If a slot is not specified, the API will -// delete the connection for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of the virtual network. +// slot - name of the deployment slot. If a slot is not specified, the API will delete the connection for the +// production slot. func (client AppsClient) DeleteVnetConnectionSlot(ctx context.Context, resourceGroupName string, name string, vnetName string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5769,9 +5886,10 @@ func (client AppsClient) DeleteVnetConnectionSlotResponder(resp *http.Response) } // DiscoverRestore discovers an existing app backup that can be restored from a blob in Azure storage. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. request -// is a RestoreRequest object that includes Azure storage URL and blog name for discovery of backup. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// request - a RestoreRequest object that includes Azure storage URL and blog name for discovery of backup. func (client AppsClient) DiscoverRestore(ctx context.Context, resourceGroupName string, name string, request RestoreRequest) (result RestoreRequest, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5851,10 +5969,12 @@ func (client AppsClient) DiscoverRestoreResponder(resp *http.Response) (result R } // DiscoverRestoreSlot discovers an existing app backup that can be restored from a blob in Azure storage. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. request -// is a RestoreRequest object that includes Azure storage URL and blog name for discovery of backup. slot is name -// of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// request - a RestoreRequest object that includes Azure storage URL and blog name for discovery of backup. +// slot - name of the deployment slot. If a slot is not specified, the API will perform discovery for the +// production slot. func (client AppsClient) DiscoverRestoreSlot(ctx context.Context, resourceGroupName string, name string, request RestoreRequest, slot string) (result RestoreRequest, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -5935,8 +6055,9 @@ func (client AppsClient) DiscoverRestoreSlotResponder(resp *http.Response) (resu } // GenerateNewSitePublishingPassword generates a new publishing password for an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) GenerateNewSitePublishingPassword(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6009,10 +6130,11 @@ func (client AppsClient) GenerateNewSitePublishingPasswordResponder(resp *http.R // GenerateNewSitePublishingPasswordSlot generates a new publishing password for an app (or deployment slot, if // specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API generate a new publishing password for the -// production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API generate a new publishing password +// for the production slot. func (client AppsClient) GenerateNewSitePublishingPasswordSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6085,8 +6207,9 @@ func (client AppsClient) GenerateNewSitePublishingPasswordSlotResponder(resp *ht } // Get gets the details of a web, mobile, or API app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) Get(ctx context.Context, resourceGroupName string, name string) (result Site, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6159,8 +6282,9 @@ func (client AppsClient) GetResponder(resp *http.Response) (result Site, err err } // GetAuthSettings gets the Authentication/Authorization settings of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) GetAuthSettings(ctx context.Context, resourceGroupName string, name string) (result SiteAuthSettings, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6233,9 +6357,11 @@ func (client AppsClient) GetAuthSettingsResponder(resp *http.Response) (result S } // GetAuthSettingsSlot gets the Authentication/Authorization settings of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get the settings for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get the settings for the +// production slot. func (client AppsClient) GetAuthSettingsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result SiteAuthSettings, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6309,8 +6435,9 @@ func (client AppsClient) GetAuthSettingsSlotResponder(resp *http.Response) (resu } // GetBackupConfiguration gets the backup configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) GetBackupConfiguration(ctx context.Context, resourceGroupName string, name string) (result BackupRequest, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6383,10 +6510,11 @@ func (client AppsClient) GetBackupConfigurationResponder(resp *http.Response) (r } // GetBackupConfigurationSlot gets the backup configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get the backup configuration for the -// production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get the backup configuration +// for the production slot. func (client AppsClient) GetBackupConfigurationSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result BackupRequest, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6460,9 +6588,10 @@ func (client AppsClient) GetBackupConfigurationSlotResponder(resp *http.Response } // GetBackupStatus gets a backup of an app by its ID. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. backupID -// is ID of the backup. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// backupID - ID of the backup. func (client AppsClient) GetBackupStatus(ctx context.Context, resourceGroupName string, name string, backupID string) (result BackupItem, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6536,10 +6665,12 @@ func (client AppsClient) GetBackupStatusResponder(resp *http.Response) (result B } // GetBackupStatusSlot gets a backup of an app by its ID. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. backupID -// is ID of the backup. slot is name of the deployment slot. If a slot is not specified, the API will get a backup -// of the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// backupID - ID of the backup. +// slot - name of the deployment slot. If a slot is not specified, the API will get a backup of the production +// slot. func (client AppsClient) GetBackupStatusSlot(ctx context.Context, resourceGroupName string, name string, backupID string, slot string) (result BackupItem, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6615,8 +6746,9 @@ func (client AppsClient) GetBackupStatusSlotResponder(resp *http.Response) (resu // GetConfiguration gets the configuration of an app, such as platform version and bitness, default documents, virtual // applications, Always On, etc. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) GetConfiguration(ctx context.Context, resourceGroupName string, name string) (result SiteConfigResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6690,10 +6822,11 @@ func (client AppsClient) GetConfigurationResponder(resp *http.Response) (result // GetConfigurationSlot gets the configuration of an app, such as platform version and bitness, default documents, // virtual applications, Always On, etc. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will return configuration for the production -// slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will return configuration for the +// production slot. func (client AppsClient) GetConfigurationSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result SiteConfigResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6767,9 +6900,10 @@ func (client AppsClient) GetConfigurationSlotResponder(resp *http.Response) (res } // GetConfigurationSnapshot gets a snapshot of the configuration of an app at a previous point in time. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// snapshotID is the ID of the snapshot to read. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// snapshotID - the ID of the snapshot to read. func (client AppsClient) GetConfigurationSnapshot(ctx context.Context, resourceGroupName string, name string, snapshotID string) (result SiteConfigResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6843,10 +6977,12 @@ func (client AppsClient) GetConfigurationSnapshotResponder(resp *http.Response) } // GetConfigurationSnapshotSlot gets a snapshot of the configuration of an app at a previous point in time. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// snapshotID is the ID of the snapshot to read. slot is name of the deployment slot. If a slot is not specified, -// the API will return configuration for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// snapshotID - the ID of the snapshot to read. +// slot - name of the deployment slot. If a slot is not specified, the API will return configuration for the +// production slot. func (client AppsClient) GetConfigurationSnapshotSlot(ctx context.Context, resourceGroupName string, name string, snapshotID string, slot string) (result SiteConfigResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6921,9 +7057,10 @@ func (client AppsClient) GetConfigurationSnapshotSlotResponder(resp *http.Respon } // GetContinuousWebJob gets a continuous web job by its ID for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. func (client AppsClient) GetContinuousWebJob(ctx context.Context, resourceGroupName string, name string, webJobName string) (result ContinuousWebJob, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -6997,10 +7134,12 @@ func (client AppsClient) GetContinuousWebJobResponder(resp *http.Response) (resu } // GetContinuousWebJobSlot gets a continuous web job by its ID for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) GetContinuousWebJobSlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result ContinuousWebJob, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7075,9 +7214,10 @@ func (client AppsClient) GetContinuousWebJobSlotResponder(resp *http.Response) ( } // GetDeployment get a deployment by its ID for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. ID is -// deployment ID. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// ID - deployment ID. func (client AppsClient) GetDeployment(ctx context.Context, resourceGroupName string, name string, ID string) (result Deployment, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7151,10 +7291,12 @@ func (client AppsClient) GetDeploymentResponder(resp *http.Response) (result Dep } // GetDeploymentSlot get a deployment by its ID for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. ID is -// deployment ID. slot is name of the deployment slot. If a slot is not specified, the API gets a deployment for -// the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// ID - deployment ID. +// slot - name of the deployment slot. If a slot is not specified, the API gets a deployment for the production +// slot. func (client AppsClient) GetDeploymentSlot(ctx context.Context, resourceGroupName string, name string, ID string, slot string) (result Deployment, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7229,8 +7371,9 @@ func (client AppsClient) GetDeploymentSlotResponder(resp *http.Response) (result } // GetDiagnosticLogsConfiguration gets the logging configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) GetDiagnosticLogsConfiguration(ctx context.Context, resourceGroupName string, name string) (result SiteLogsConfig, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7303,10 +7446,11 @@ func (client AppsClient) GetDiagnosticLogsConfigurationResponder(resp *http.Resp } // GetDiagnosticLogsConfigurationSlot gets the logging configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get the logging configuration for the -// production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get the logging configuration +// for the production slot. func (client AppsClient) GetDiagnosticLogsConfigurationSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result SiteLogsConfig, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7380,9 +7524,10 @@ func (client AppsClient) GetDiagnosticLogsConfigurationSlotResponder(resp *http. } // GetDomainOwnershipIdentifier get domain ownership identifier for web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// domainOwnershipIdentifierName is name of domain ownership identifier. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// domainOwnershipIdentifierName - name of domain ownership identifier. func (client AppsClient) GetDomainOwnershipIdentifier(ctx context.Context, resourceGroupName string, name string, domainOwnershipIdentifierName string) (result Identifier, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7456,10 +7601,12 @@ func (client AppsClient) GetDomainOwnershipIdentifierResponder(resp *http.Respon } // GetDomainOwnershipIdentifierSlot get domain ownership identifier for web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// domainOwnershipIdentifierName is name of domain ownership identifier. slot is name of the deployment slot. If a -// slot is not specified, the API will delete the binding for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// domainOwnershipIdentifierName - name of domain ownership identifier. +// slot - name of the deployment slot. If a slot is not specified, the API will delete the binding for the +// production slot. func (client AppsClient) GetDomainOwnershipIdentifierSlot(ctx context.Context, resourceGroupName string, name string, domainOwnershipIdentifierName string, slot string) (result Identifier, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7534,9 +7681,10 @@ func (client AppsClient) GetDomainOwnershipIdentifierSlotResponder(resp *http.Re } // GetFunction get function information by its ID for web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. functionName -// is function name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// functionName - function name. func (client AppsClient) GetFunction(ctx context.Context, resourceGroupName string, name string, functionName string) (result FunctionEnvelope, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7610,8 +7758,9 @@ func (client AppsClient) GetFunctionResponder(resp *http.Response) (result Funct } // GetFunctionsAdminToken fetch a short lived token that can be exchanged for a master key. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. func (client AppsClient) GetFunctionsAdminToken(ctx context.Context, resourceGroupName string, name string) (result String, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7684,9 +7833,10 @@ func (client AppsClient) GetFunctionsAdminTokenResponder(resp *http.Response) (r } // GetFunctionsAdminTokenSlot fetch a short lived token that can be exchanged for a master key. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. func (client AppsClient) GetFunctionsAdminTokenSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result String, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7760,9 +7910,10 @@ func (client AppsClient) GetFunctionsAdminTokenSlotResponder(resp *http.Response } // GetHostNameBinding get the named hostname binding for an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. hostName -// is hostname in the hostname binding. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// hostName - hostname in the hostname binding. func (client AppsClient) GetHostNameBinding(ctx context.Context, resourceGroupName string, name string, hostName string) (result HostNameBinding, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7836,10 +7987,12 @@ func (client AppsClient) GetHostNameBindingResponder(resp *http.Response) (resul } // GetHostNameBindingSlot get the named hostname binding for an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API the named binding for the production slot. -// hostName is hostname in the hostname binding. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API the named binding for the production +// slot. +// hostName - hostname in the hostname binding. func (client AppsClient) GetHostNameBindingSlot(ctx context.Context, resourceGroupName string, name string, slot string, hostName string) (result HostNameBinding, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7914,10 +8067,11 @@ func (client AppsClient) GetHostNameBindingSlotResponder(resp *http.Response) (r } // GetHybridConnection retrieves a specific Service Bus Hybrid Connection used by this Web App. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// namespaceName is the namespace for this hybrid connection. relayName is the relay name for this hybrid -// connection. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// namespaceName - the namespace for this hybrid connection. +// relayName - the relay name for this hybrid connection. func (client AppsClient) GetHybridConnection(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string) (result HybridConnection, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -7992,10 +8146,12 @@ func (client AppsClient) GetHybridConnectionResponder(resp *http.Response) (resu } // GetHybridConnectionSlot retrieves a specific Service Bus Hybrid Connection used by this Web App. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// namespaceName is the namespace for this hybrid connection. relayName is the relay name for this hybrid -// connection. slot is the name of the slot for the web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// namespaceName - the namespace for this hybrid connection. +// relayName - the relay name for this hybrid connection. +// slot - the name of the slot for the web app. func (client AppsClient) GetHybridConnectionSlot(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string, slot string) (result HybridConnection, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -8071,10 +8227,12 @@ func (client AppsClient) GetHybridConnectionSlotResponder(resp *http.Response) ( } // GetInstanceFunctionSlot get function information by its ID for web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. functionName -// is function name. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// functionName - function name. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) GetInstanceFunctionSlot(ctx context.Context, resourceGroupName string, name string, functionName string, slot string) (result FunctionEnvelope, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -8149,9 +8307,10 @@ func (client AppsClient) GetInstanceFunctionSlotResponder(resp *http.Response) ( } // GetInstanceMSDeployLog get the MSDeploy Log for the last MSDeploy operation. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. -// instanceID is ID of web app instance. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// instanceID - ID of web app instance. func (client AppsClient) GetInstanceMSDeployLog(ctx context.Context, resourceGroupName string, name string, instanceID string) (result MSDeployLog, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -8225,10 +8384,11 @@ func (client AppsClient) GetInstanceMSDeployLogResponder(resp *http.Response) (r } // GetInstanceMSDeployLogSlot get the MSDeploy Log for the last MSDeploy operation. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. instanceID is ID of web app -// instance. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. +// instanceID - ID of web app instance. func (client AppsClient) GetInstanceMSDeployLogSlot(ctx context.Context, resourceGroupName string, name string, slot string, instanceID string) (result MSDeployLog, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -8303,9 +8463,10 @@ func (client AppsClient) GetInstanceMSDeployLogSlotResponder(resp *http.Response } // GetInstanceMsDeployStatus get the status of the last MSDeploy operation. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. -// instanceID is ID of web app instance. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// instanceID - ID of web app instance. func (client AppsClient) GetInstanceMsDeployStatus(ctx context.Context, resourceGroupName string, name string, instanceID string) (result MSDeployStatus, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -8379,10 +8540,11 @@ func (client AppsClient) GetInstanceMsDeployStatusResponder(resp *http.Response) } // GetInstanceMsDeployStatusSlot get the status of the last MSDeploy operation. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. instanceID is ID of web app -// instance. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. +// instanceID - ID of web app instance. func (client AppsClient) GetInstanceMsDeployStatusSlot(ctx context.Context, resourceGroupName string, name string, slot string, instanceID string) (result MSDeployStatus, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -8457,9 +8619,11 @@ func (client AppsClient) GetInstanceMsDeployStatusSlotResponder(resp *http.Respo } // GetInstanceProcess get process information by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. instanceID is ID of a specific scaled-out instance. This is the value of the name property in the JSON +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON // response from "GET api/sites/{siteName}/instances". func (client AppsClient) GetInstanceProcess(ctx context.Context, resourceGroupName string, name string, processID string, instanceID string) (result ProcessInfo, err error) { if err := validation.Validate([]validation.Validation{ @@ -8535,9 +8699,11 @@ func (client AppsClient) GetInstanceProcessResponder(resp *http.Response) (resul } // GetInstanceProcessDump get a memory dump of a process by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. instanceID is ID of a specific scaled-out instance. This is the value of the name property in the JSON +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON // response from "GET api/sites/{siteName}/instances". func (client AppsClient) GetInstanceProcessDump(ctx context.Context, resourceGroupName string, name string, processID string, instanceID string) (result ReadCloser, err error) { if err := validation.Validate([]validation.Validation{ @@ -8613,11 +8779,14 @@ func (client AppsClient) GetInstanceProcessDumpResponder(resp *http.Response) (r // GetInstanceProcessDumpSlot get a memory dump of a process by its ID for a specific scaled-out instance in a web // site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. slot is name of the deployment slot. If a slot is not specified, the API returns deployments for the -// production slot. instanceID is ID of a specific scaled-out instance. This is the value of the name property in -// the JSON response from "GET api/sites/{siteName}/instances". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON +// response from "GET api/sites/{siteName}/instances". func (client AppsClient) GetInstanceProcessDumpSlot(ctx context.Context, resourceGroupName string, name string, processID string, slot string, instanceID string) (result ReadCloser, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -8692,10 +8861,13 @@ func (client AppsClient) GetInstanceProcessDumpSlotResponder(resp *http.Response } // GetInstanceProcessModule get process information by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. baseAddress is module base address. instanceID is ID of a specific scaled-out instance. This is the value -// of the name property in the JSON response from "GET api/sites/{siteName}/instances". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// baseAddress - module base address. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON +// response from "GET api/sites/{siteName}/instances". func (client AppsClient) GetInstanceProcessModule(ctx context.Context, resourceGroupName string, name string, processID string, baseAddress string, instanceID string) (result ProcessModuleInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -8771,11 +8943,15 @@ func (client AppsClient) GetInstanceProcessModuleResponder(resp *http.Response) } // GetInstanceProcessModuleSlot get process information by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. baseAddress is module base address. slot is name of the deployment slot. If a slot is not specified, the -// API returns deployments for the production slot. instanceID is ID of a specific scaled-out instance. This is the -// value of the name property in the JSON response from "GET api/sites/{siteName}/instances". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// baseAddress - module base address. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON +// response from "GET api/sites/{siteName}/instances". func (client AppsClient) GetInstanceProcessModuleSlot(ctx context.Context, resourceGroupName string, name string, processID string, baseAddress string, slot string, instanceID string) (result ProcessModuleInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -8852,11 +9028,14 @@ func (client AppsClient) GetInstanceProcessModuleSlotResponder(resp *http.Respon } // GetInstanceProcessSlot get process information by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. slot is name of the deployment slot. If a slot is not specified, the API returns deployments for the -// production slot. instanceID is ID of a specific scaled-out instance. This is the value of the name property in -// the JSON response from "GET api/sites/{siteName}/instances". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON +// response from "GET api/sites/{siteName}/instances". func (client AppsClient) GetInstanceProcessSlot(ctx context.Context, resourceGroupName string, name string, processID string, slot string, instanceID string) (result ProcessInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -8933,10 +9112,13 @@ func (client AppsClient) GetInstanceProcessSlotResponder(resp *http.Response) (r // GetInstanceProcessThread get thread information by Thread ID for a specific process, in a specific scaled-out // instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. threadID is tID. instanceID is ID of a specific scaled-out instance. This is the value of the name property -// in the JSON response from "GET api/sites/{siteName}/instances". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// threadID - tID. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON +// response from "GET api/sites/{siteName}/instances". func (client AppsClient) GetInstanceProcessThread(ctx context.Context, resourceGroupName string, name string, processID string, threadID string, instanceID string) (result ProcessThreadInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -9013,11 +9195,15 @@ func (client AppsClient) GetInstanceProcessThreadResponder(resp *http.Response) // GetInstanceProcessThreadSlot get thread information by Thread ID for a specific process, in a specific scaled-out // instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. threadID is tID. slot is name of the deployment slot. If a slot is not specified, the API returns -// deployments for the production slot. instanceID is ID of a specific scaled-out instance. This is the value of -// the name property in the JSON response from "GET api/sites/{siteName}/instances". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// threadID - tID. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON +// response from "GET api/sites/{siteName}/instances". func (client AppsClient) GetInstanceProcessThreadSlot(ctx context.Context, resourceGroupName string, name string, processID string, threadID string, slot string, instanceID string) (result ProcessThreadInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -9095,8 +9281,9 @@ func (client AppsClient) GetInstanceProcessThreadSlotResponder(resp *http.Respon // GetMigrateMySQLStatus returns the status of MySql in app migration, if one is active, and whether or not MySql in // app is enabled -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. func (client AppsClient) GetMigrateMySQLStatus(ctx context.Context, resourceGroupName string, name string) (result MigrateMySQLStatus, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -9170,9 +9357,10 @@ func (client AppsClient) GetMigrateMySQLStatusResponder(resp *http.Response) (re // GetMigrateMySQLStatusSlot returns the status of MySql in app migration, if one is active, and whether or not MySql // in app is enabled -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of the deployment slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of the deployment slot. func (client AppsClient) GetMigrateMySQLStatusSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result MigrateMySQLStatus, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -9246,8 +9434,9 @@ func (client AppsClient) GetMigrateMySQLStatusSlotResponder(resp *http.Response) } // GetMSDeployLog get the MSDeploy Log for the last MSDeploy operation. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. func (client AppsClient) GetMSDeployLog(ctx context.Context, resourceGroupName string, name string) (result MSDeployLog, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -9320,9 +9509,10 @@ func (client AppsClient) GetMSDeployLogResponder(resp *http.Response) (result MS } // GetMSDeployLogSlot get the MSDeploy Log for the last MSDeploy operation. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. func (client AppsClient) GetMSDeployLogSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result MSDeployLog, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -9396,8 +9586,9 @@ func (client AppsClient) GetMSDeployLogSlotResponder(resp *http.Response) (resul } // GetMSDeployStatus get the status of the last MSDeploy operation. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. func (client AppsClient) GetMSDeployStatus(ctx context.Context, resourceGroupName string, name string) (result MSDeployStatus, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -9470,9 +9661,10 @@ func (client AppsClient) GetMSDeployStatusResponder(resp *http.Response) (result } // GetMSDeployStatusSlot get the status of the last MSDeploy operation. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. func (client AppsClient) GetMSDeployStatusSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result MSDeployStatus, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -9546,9 +9738,10 @@ func (client AppsClient) GetMSDeployStatusSlotResponder(resp *http.Response) (re } // GetPremierAddOn gets a named add-on of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// premierAddOnName is add-on name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// premierAddOnName - add-on name. func (client AppsClient) GetPremierAddOn(ctx context.Context, resourceGroupName string, name string, premierAddOnName string) (result PremierAddOn, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -9622,10 +9815,12 @@ func (client AppsClient) GetPremierAddOnResponder(resp *http.Response) (result P } // GetPremierAddOnSlot gets a named add-on of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// premierAddOnName is add-on name. slot is name of the deployment slot. If a slot is not specified, the API will -// get the named add-on for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// premierAddOnName - add-on name. +// slot - name of the deployment slot. If a slot is not specified, the API will get the named add-on for the +// production slot. func (client AppsClient) GetPremierAddOnSlot(ctx context.Context, resourceGroupName string, name string, premierAddOnName string, slot string) (result PremierAddOn, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -9700,9 +9895,10 @@ func (client AppsClient) GetPremierAddOnSlotResponder(resp *http.Response) (resu } // GetProcess get process information by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. func (client AppsClient) GetProcess(ctx context.Context, resourceGroupName string, name string, processID string) (result ProcessInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -9776,9 +9972,10 @@ func (client AppsClient) GetProcessResponder(resp *http.Response) (result Proces } // GetProcessDump get a memory dump of a process by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. func (client AppsClient) GetProcessDump(ctx context.Context, resourceGroupName string, name string, processID string) (result ReadCloser, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -9851,9 +10048,11 @@ func (client AppsClient) GetProcessDumpResponder(resp *http.Response) (result Re } // GetProcessDumpSlot get a memory dump of a process by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. slot is name of the deployment slot. If a slot is not specified, the API returns deployments for the +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the // production slot. func (client AppsClient) GetProcessDumpSlot(ctx context.Context, resourceGroupName string, name string, processID string, slot string) (result ReadCloser, err error) { if err := validation.Validate([]validation.Validation{ @@ -9928,9 +10127,11 @@ func (client AppsClient) GetProcessDumpSlotResponder(resp *http.Response) (resul } // GetProcessModule get process information by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. baseAddress is module base address. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// baseAddress - module base address. func (client AppsClient) GetProcessModule(ctx context.Context, resourceGroupName string, name string, processID string, baseAddress string) (result ProcessModuleInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -10005,10 +10206,13 @@ func (client AppsClient) GetProcessModuleResponder(resp *http.Response) (result } // GetProcessModuleSlot get process information by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. baseAddress is module base address. slot is name of the deployment slot. If a slot is not specified, the -// API returns deployments for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// baseAddress - module base address. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. func (client AppsClient) GetProcessModuleSlot(ctx context.Context, resourceGroupName string, name string, processID string, baseAddress string, slot string) (result ProcessModuleInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -10084,9 +10288,11 @@ func (client AppsClient) GetProcessModuleSlotResponder(resp *http.Response) (res } // GetProcessSlot get process information by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. slot is name of the deployment slot. If a slot is not specified, the API returns deployments for the +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the // production slot. func (client AppsClient) GetProcessSlot(ctx context.Context, resourceGroupName string, name string, processID string, slot string) (result ProcessInfo, err error) { if err := validation.Validate([]validation.Validation{ @@ -10163,9 +10369,11 @@ func (client AppsClient) GetProcessSlotResponder(resp *http.Response) (result Pr // GetProcessThread get thread information by Thread ID for a specific process, in a specific scaled-out instance in a // web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. threadID is tID. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// threadID - tID. func (client AppsClient) GetProcessThread(ctx context.Context, resourceGroupName string, name string, processID string, threadID string) (result ProcessThreadInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -10241,10 +10449,13 @@ func (client AppsClient) GetProcessThreadResponder(resp *http.Response) (result // GetProcessThreadSlot get thread information by Thread ID for a specific process, in a specific scaled-out instance // in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. threadID is tID. slot is name of the deployment slot. If a slot is not specified, the API returns -// deployments for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// threadID - tID. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. func (client AppsClient) GetProcessThreadSlot(ctx context.Context, resourceGroupName string, name string, processID string, threadID string, slot string) (result ProcessThreadInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -10320,9 +10531,10 @@ func (client AppsClient) GetProcessThreadSlotResponder(resp *http.Response) (res } // GetPublicCertificate get the named public certificate for an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// publicCertificateName is public certificate name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// publicCertificateName - public certificate name. func (client AppsClient) GetPublicCertificate(ctx context.Context, resourceGroupName string, name string, publicCertificateName string) (result PublicCertificate, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -10396,10 +10608,12 @@ func (client AppsClient) GetPublicCertificateResponder(resp *http.Response) (res } // GetPublicCertificateSlot get the named public certificate for an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API the named binding for the production slot. -// publicCertificateName is public certificate name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API the named binding for the production +// slot. +// publicCertificateName - public certificate name. func (client AppsClient) GetPublicCertificateSlot(ctx context.Context, resourceGroupName string, name string, slot string, publicCertificateName string) (result PublicCertificate, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -10474,9 +10688,10 @@ func (client AppsClient) GetPublicCertificateSlotResponder(resp *http.Response) } // GetRelayServiceConnection gets a hybrid connection configuration by its name. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// entityName is name of the hybrid connection. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// entityName - name of the hybrid connection. func (client AppsClient) GetRelayServiceConnection(ctx context.Context, resourceGroupName string, name string, entityName string) (result RelayServiceConnectionEntity, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -10550,10 +10765,12 @@ func (client AppsClient) GetRelayServiceConnectionResponder(resp *http.Response) } // GetRelayServiceConnectionSlot gets a hybrid connection configuration by its name. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// entityName is name of the hybrid connection. slot is name of the deployment slot. If a slot is not specified, -// the API will get a hybrid connection for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// entityName - name of the hybrid connection. +// slot - name of the deployment slot. If a slot is not specified, the API will get a hybrid connection for the +// production slot. func (client AppsClient) GetRelayServiceConnectionSlot(ctx context.Context, resourceGroupName string, name string, entityName string, slot string) (result RelayServiceConnectionEntity, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -10628,9 +10845,10 @@ func (client AppsClient) GetRelayServiceConnectionSlotResponder(resp *http.Respo } // GetSiteExtension get site extension information by its ID for a web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. -// siteExtensionID is site extension name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// siteExtensionID - site extension name. func (client AppsClient) GetSiteExtension(ctx context.Context, resourceGroupName string, name string, siteExtensionID string) (result SiteExtensionInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -10704,10 +10922,12 @@ func (client AppsClient) GetSiteExtensionResponder(resp *http.Response) (result } // GetSiteExtensionSlot get site extension information by its ID for a web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. -// siteExtensionID is site extension name. slot is name of the deployment slot. If a slot is not specified, the API -// deletes a deployment for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// siteExtensionID - site extension name. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) GetSiteExtensionSlot(ctx context.Context, resourceGroupName string, name string, siteExtensionID string, slot string) (result SiteExtensionInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -10782,8 +11002,9 @@ func (client AppsClient) GetSiteExtensionSlotResponder(resp *http.Response) (res } // GetSitePhpErrorLogFlag gets web app's event logs. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. func (client AppsClient) GetSitePhpErrorLogFlag(ctx context.Context, resourceGroupName string, name string) (result SitePhpErrorLogFlag, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -10856,9 +11077,10 @@ func (client AppsClient) GetSitePhpErrorLogFlagResponder(resp *http.Response) (r } // GetSitePhpErrorLogFlagSlot gets web app's event logs. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. func (client AppsClient) GetSitePhpErrorLogFlagSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result SitePhpErrorLogFlag, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -10932,9 +11154,10 @@ func (client AppsClient) GetSitePhpErrorLogFlagSlotResponder(resp *http.Response } // GetSlot gets the details of a web, mobile, or API app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. By default, this API returns the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. By default, this API returns the production slot. func (client AppsClient) GetSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result Site, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -11008,8 +11231,9 @@ func (client AppsClient) GetSlotResponder(resp *http.Response) (result Site, err } // GetSourceControl gets the source control configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) GetSourceControl(ctx context.Context, resourceGroupName string, name string) (result SiteSourceControl, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -11074,7 +11298,7 @@ func (client AppsClient) GetSourceControlResponder(resp *http.Response) (result err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} @@ -11082,10 +11306,11 @@ func (client AppsClient) GetSourceControlResponder(resp *http.Response) (result } // GetSourceControlSlot gets the source control configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get the source control configuration for -// the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get the source control +// configuration for the production slot. func (client AppsClient) GetSourceControlSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result SiteSourceControl, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -11151,7 +11376,7 @@ func (client AppsClient) GetSourceControlSlotResponder(resp *http.Response) (res err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} @@ -11159,9 +11384,10 @@ func (client AppsClient) GetSourceControlSlotResponder(resp *http.Response) (res } // GetTriggeredWebJob gets a triggered web job by its ID for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. func (client AppsClient) GetTriggeredWebJob(ctx context.Context, resourceGroupName string, name string, webJobName string) (result TriggeredWebJob, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -11235,9 +11461,11 @@ func (client AppsClient) GetTriggeredWebJobResponder(resp *http.Response) (resul } // GetTriggeredWebJobHistory gets a triggered web job's history by its ID for an app, , or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. ID is history ID. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. +// ID - history ID. func (client AppsClient) GetTriggeredWebJobHistory(ctx context.Context, resourceGroupName string, name string, webJobName string, ID string) (result TriggeredJobHistory, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -11312,10 +11540,13 @@ func (client AppsClient) GetTriggeredWebJobHistoryResponder(resp *http.Response) } // GetTriggeredWebJobHistorySlot gets a triggered web job's history by its ID for an app, , or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. ID is history ID. slot is name of the deployment slot. If a slot is not specified, the API -// deletes a deployment for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. +// ID - history ID. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) GetTriggeredWebJobHistorySlot(ctx context.Context, resourceGroupName string, name string, webJobName string, ID string, slot string) (result TriggeredJobHistory, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -11391,10 +11622,12 @@ func (client AppsClient) GetTriggeredWebJobHistorySlotResponder(resp *http.Respo } // GetTriggeredWebJobSlot gets a triggered web job by its ID for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) GetTriggeredWebJobSlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result TriggeredWebJob, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -11469,9 +11702,10 @@ func (client AppsClient) GetTriggeredWebJobSlotResponder(resp *http.Response) (r } // GetVnetConnection gets a virtual network the app (or deployment slot) is connected to by name. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of the virtual network. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of the virtual network. func (client AppsClient) GetVnetConnection(ctx context.Context, resourceGroupName string, name string, vnetName string) (result VnetInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -11545,10 +11779,11 @@ func (client AppsClient) GetVnetConnectionResponder(resp *http.Response) (result } // GetVnetConnectionGateway gets an app's Virtual Network gateway. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of the Virtual Network. gatewayName is name of the gateway. Currently, the only supported string is -// "primary". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of the Virtual Network. +// gatewayName - name of the gateway. Currently, the only supported string is "primary". func (client AppsClient) GetVnetConnectionGateway(ctx context.Context, resourceGroupName string, name string, vnetName string, gatewayName string) (result VnetGateway, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -11623,10 +11858,12 @@ func (client AppsClient) GetVnetConnectionGatewayResponder(resp *http.Response) } // GetVnetConnectionGatewaySlot gets an app's Virtual Network gateway. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of the Virtual Network. gatewayName is name of the gateway. Currently, the only supported string is -// "primary". slot is name of the deployment slot. If a slot is not specified, the API will get a gateway for the +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of the Virtual Network. +// gatewayName - name of the gateway. Currently, the only supported string is "primary". +// slot - name of the deployment slot. If a slot is not specified, the API will get a gateway for the // production slot's Virtual Network. func (client AppsClient) GetVnetConnectionGatewaySlot(ctx context.Context, resourceGroupName string, name string, vnetName string, gatewayName string, slot string) (result VnetGateway, err error) { if err := validation.Validate([]validation.Validation{ @@ -11703,10 +11940,12 @@ func (client AppsClient) GetVnetConnectionGatewaySlotResponder(resp *http.Respon } // GetVnetConnectionSlot gets a virtual network the app (or deployment slot) is connected to by name. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of the virtual network. slot is name of the deployment slot. If a slot is not specified, the API will -// get the named virtual network for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of the virtual network. +// slot - name of the deployment slot. If a slot is not specified, the API will get the named virtual network +// for the production slot. func (client AppsClient) GetVnetConnectionSlot(ctx context.Context, resourceGroupName string, name string, vnetName string, slot string) (result VnetInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -11781,9 +12020,10 @@ func (client AppsClient) GetVnetConnectionSlotResponder(resp *http.Response) (re } // GetWebJob get webjob information for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of the web job. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of the web job. func (client AppsClient) GetWebJob(ctx context.Context, resourceGroupName string, name string, webJobName string) (result Job, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -11857,10 +12097,12 @@ func (client AppsClient) GetWebJobResponder(resp *http.Response) (result Job, er } // GetWebJobSlot get webjob information for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of the web job. slot is name of the deployment slot. If a slot is not specified, the API returns -// deployments for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of the web job. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. func (client AppsClient) GetWebJobSlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result Job, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -11935,8 +12177,9 @@ func (client AppsClient) GetWebJobSlotResponder(resp *http.Response) (result Job } // GetWebSiteContainerLogs gets the last lines of docker logs for the given site -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. func (client AppsClient) GetWebSiteContainerLogs(ctx context.Context, resourceGroupName string, name string) (result ReadCloser, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -12008,9 +12251,10 @@ func (client AppsClient) GetWebSiteContainerLogsResponder(resp *http.Response) ( } // GetWebSiteContainerLogsSlot gets the last lines of docker logs for the given site -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. func (client AppsClient) GetWebSiteContainerLogsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result ReadCloser, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -12083,8 +12327,9 @@ func (client AppsClient) GetWebSiteContainerLogsSlotResponder(resp *http.Respons } // GetWebSiteContainerLogsZip gets the ZIP archived docker log files for the given site -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. func (client AppsClient) GetWebSiteContainerLogsZip(ctx context.Context, resourceGroupName string, name string) (result ReadCloser, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -12156,9 +12401,10 @@ func (client AppsClient) GetWebSiteContainerLogsZipResponder(resp *http.Response } // GetWebSiteContainerLogsZipSlot gets the ZIP archived docker log files for the given site -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. func (client AppsClient) GetWebSiteContainerLogsZipSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result ReadCloser, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -12231,9 +12477,10 @@ func (client AppsClient) GetWebSiteContainerLogsZipSlotResponder(resp *http.Resp } // InstallSiteExtension install site extension on a web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. -// siteExtensionID is site extension name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// siteExtensionID - site extension name. func (client AppsClient) InstallSiteExtension(ctx context.Context, resourceGroupName string, name string, siteExtensionID string) (result AppsInstallSiteExtensionFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -12309,10 +12556,12 @@ func (client AppsClient) InstallSiteExtensionResponder(resp *http.Response) (res } // InstallSiteExtensionSlot install site extension on a web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. -// siteExtensionID is site extension name. slot is name of the deployment slot. If a slot is not specified, the API -// deletes a deployment for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// siteExtensionID - site extension name. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) InstallSiteExtensionSlot(ctx context.Context, resourceGroupName string, name string, siteExtensionID string, slot string) (result AppsInstallSiteExtensionSlotFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -12389,8 +12638,9 @@ func (client AppsClient) InstallSiteExtensionSlotResponder(resp *http.Response) } // IsCloneable shows whether an app can be cloned to another resource group or subscription. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) IsCloneable(ctx context.Context, resourceGroupName string, name string) (result SiteCloneability, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -12463,9 +12713,10 @@ func (client AppsClient) IsCloneableResponder(resp *http.Response) (result SiteC } // IsCloneableSlot shows whether an app can be cloned to another resource group or subscription. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. By default, this API returns information on the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. By default, this API returns information on the production slot. func (client AppsClient) IsCloneableSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result SiteCloneability, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -12629,8 +12880,9 @@ func (client AppsClient) ListComplete(ctx context.Context) (result AppCollection } // ListApplicationSettings gets the application settings of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListApplicationSettings(ctx context.Context, resourceGroupName string, name string) (result StringDictionary, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -12703,10 +12955,11 @@ func (client AppsClient) ListApplicationSettingsResponder(resp *http.Response) ( } // ListApplicationSettingsSlot gets the application settings of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get the application settings for the -// production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get the application settings +// for the production slot. func (client AppsClient) ListApplicationSettingsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result StringDictionary, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -12780,8 +13033,9 @@ func (client AppsClient) ListApplicationSettingsSlotResponder(resp *http.Respons } // ListBackups gets existing backups of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListBackups(ctx context.Context, resourceGroupName string, name string) (result BackupItemCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -12882,9 +13136,11 @@ func (client AppsClient) ListBackupsComplete(ctx context.Context, resourceGroupN } // ListBackupsSlot gets existing backups of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get backups of the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get backups of the production +// slot. func (client AppsClient) ListBackupsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result BackupItemCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -12988,9 +13244,11 @@ func (client AppsClient) ListBackupsSlotComplete(ctx context.Context, resourceGr // ListBackupStatusSecrets gets status of a web app backup that may be in progress, including secrets associated with // the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is // passed in the request body. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. backupID -// is ID of backup. request is information on backup request. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// backupID - ID of backup. +// request - information on backup request. func (client AppsClient) ListBackupStatusSecrets(ctx context.Context, resourceGroupName string, name string, backupID string, request BackupRequest) (result BackupItem, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -13078,10 +13336,12 @@ func (client AppsClient) ListBackupStatusSecretsResponder(resp *http.Response) ( // ListBackupStatusSecretsSlot gets status of a web app backup that may be in progress, including secrets associated // with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new // URL is passed in the request body. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. backupID -// is ID of backup. request is information on backup request. slot is name of web app slot. If not specified then -// will default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// backupID - ID of backup. +// request - information on backup request. +// slot - name of web app slot. If not specified then will default to production slot. func (client AppsClient) ListBackupStatusSecretsSlot(ctx context.Context, resourceGroupName string, name string, backupID string, request BackupRequest, slot string) (result BackupItem, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -13168,10 +13428,10 @@ func (client AppsClient) ListBackupStatusSecretsSlotResponder(resp *http.Respons } // ListByResourceGroup gets all web, mobile, and API apps in the specified resource group. -// -// resourceGroupName is name of the resource group to which the resource belongs. includeSlots is specify -// true to include deployment slots in results. The default is false, which only gives you the -// production slot of all apps. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// includeSlots - specify true to include deployment slots in results. The default is false, +// which only gives you the production slot of all apps. func (client AppsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string, includeSlots *bool) (result AppCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -13274,8 +13534,9 @@ func (client AppsClient) ListByResourceGroupComplete(ctx context.Context, resour } // ListConfigurations list the configurations of an app -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListConfigurations(ctx context.Context, resourceGroupName string, name string) (result SiteConfigResourceCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -13377,8 +13638,9 @@ func (client AppsClient) ListConfigurationsComplete(ctx context.Context, resourc // ListConfigurationSnapshotInfo gets a list of web app configuration snapshots identifiers. Each element of the list // contains a timestamp and the ID of the snapshot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListConfigurationSnapshotInfo(ctx context.Context, resourceGroupName string, name string) (result SiteConfigurationSnapshotInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -13480,10 +13742,11 @@ func (client AppsClient) ListConfigurationSnapshotInfoComplete(ctx context.Conte // ListConfigurationSnapshotInfoSlot gets a list of web app configuration snapshots identifiers. Each element of the // list contains a timestamp and the ID of the snapshot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will return configuration for the production -// slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will return configuration for the +// production slot. func (client AppsClient) ListConfigurationSnapshotInfoSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result SiteConfigurationSnapshotInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -13585,10 +13848,11 @@ func (client AppsClient) ListConfigurationSnapshotInfoSlotComplete(ctx context.C } // ListConfigurationsSlot list the configurations of an app -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will return configuration for the production -// slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will return configuration for the +// production slot. func (client AppsClient) ListConfigurationsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result SiteConfigResourceCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -13690,8 +13954,9 @@ func (client AppsClient) ListConfigurationsSlotComplete(ctx context.Context, res } // ListConnectionStrings gets the connection strings of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListConnectionStrings(ctx context.Context, resourceGroupName string, name string) (result ConnectionStringDictionary, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -13764,10 +14029,11 @@ func (client AppsClient) ListConnectionStringsResponder(resp *http.Response) (re } // ListConnectionStringsSlot gets the connection strings of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get the connection settings for the -// production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get the connection settings for +// the production slot. func (client AppsClient) ListConnectionStringsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result ConnectionStringDictionary, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -13841,8 +14107,9 @@ func (client AppsClient) ListConnectionStringsSlotResponder(resp *http.Response) } // ListContinuousWebJobs list continuous web jobs for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. func (client AppsClient) ListContinuousWebJobs(ctx context.Context, resourceGroupName string, name string) (result ContinuousWebJobCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -13943,9 +14210,11 @@ func (client AppsClient) ListContinuousWebJobsComplete(ctx context.Context, reso } // ListContinuousWebJobsSlot list continuous web jobs for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. slot is name -// of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) ListContinuousWebJobsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result ContinuousWebJobCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -14047,9 +14316,10 @@ func (client AppsClient) ListContinuousWebJobsSlotComplete(ctx context.Context, } // ListDeploymentLog list deployment log for specific deployment for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. ID is -// the ID of a specific deployment. This is the value of the name property in the JSON response from "GET +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// ID - the ID of a specific deployment. This is the value of the name property in the JSON response from "GET // /api/sites/{siteName}/deployments". func (client AppsClient) ListDeploymentLog(ctx context.Context, resourceGroupName string, name string, ID string) (result Deployment, err error) { if err := validation.Validate([]validation.Validation{ @@ -14124,11 +14394,13 @@ func (client AppsClient) ListDeploymentLogResponder(resp *http.Response) (result } // ListDeploymentLogSlot list deployment log for specific deployment for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. ID is -// the ID of a specific deployment. This is the value of the name property in the JSON response from "GET -// /api/sites/{siteName}/deployments". slot is name of the deployment slot. If a slot is not specified, the API -// returns deployments for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// ID - the ID of a specific deployment. This is the value of the name property in the JSON response from "GET +// /api/sites/{siteName}/deployments". +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. func (client AppsClient) ListDeploymentLogSlot(ctx context.Context, resourceGroupName string, name string, ID string, slot string) (result Deployment, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -14203,8 +14475,9 @@ func (client AppsClient) ListDeploymentLogSlotResponder(resp *http.Response) (re } // ListDeployments list deployments for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListDeployments(ctx context.Context, resourceGroupName string, name string) (result DeploymentCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -14305,9 +14578,11 @@ func (client AppsClient) ListDeploymentsComplete(ctx context.Context, resourceGr } // ListDeploymentsSlot list deployments for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. func (client AppsClient) ListDeploymentsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result DeploymentCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -14409,8 +14684,9 @@ func (client AppsClient) ListDeploymentsSlotComplete(ctx context.Context, resour } // ListDomainOwnershipIdentifiers lists ownership identifiers for domain associated with web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListDomainOwnershipIdentifiers(ctx context.Context, resourceGroupName string, name string) (result IdentifierCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -14511,10 +14787,11 @@ func (client AppsClient) ListDomainOwnershipIdentifiersComplete(ctx context.Cont } // ListDomainOwnershipIdentifiersSlot lists ownership identifiers for domain associated with web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will delete the binding for the production -// slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will delete the binding for the +// production slot. func (client AppsClient) ListDomainOwnershipIdentifiersSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result IdentifierCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -14616,8 +14893,9 @@ func (client AppsClient) ListDomainOwnershipIdentifiersSlotComplete(ctx context. } // ListFunctions list the functions for a web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. func (client AppsClient) ListFunctions(ctx context.Context, resourceGroupName string, name string) (result FunctionEnvelopeCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -14718,9 +14996,10 @@ func (client AppsClient) ListFunctionsComplete(ctx context.Context, resourceGrou } // ListFunctionSecrets get function secrets for a function in a web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. functionName -// is function name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// functionName - function name. func (client AppsClient) ListFunctionSecrets(ctx context.Context, resourceGroupName string, name string, functionName string) (result FunctionSecrets, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -14794,10 +15073,12 @@ func (client AppsClient) ListFunctionSecretsResponder(resp *http.Response) (resu } // ListFunctionSecretsSlot get function secrets for a function in a web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. functionName -// is function name. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// functionName - function name. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) ListFunctionSecretsSlot(ctx context.Context, resourceGroupName string, name string, functionName string, slot string) (result FunctionSecrets, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -14872,8 +15153,9 @@ func (client AppsClient) ListFunctionSecretsSlotResponder(resp *http.Response) ( } // ListHostNameBindings get hostname bindings for an app or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListHostNameBindings(ctx context.Context, resourceGroupName string, name string) (result HostNameBindingCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -14974,9 +15256,11 @@ func (client AppsClient) ListHostNameBindingsComplete(ctx context.Context, resou } // ListHostNameBindingsSlot get hostname bindings for an app or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API gets hostname bindings for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API gets hostname bindings for the +// production slot. func (client AppsClient) ListHostNameBindingsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result HostNameBindingCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -15078,10 +15362,11 @@ func (client AppsClient) ListHostNameBindingsSlotComplete(ctx context.Context, r } // ListHybridConnectionKeys gets the send key name and value for a Hybrid Connection. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// namespaceName is the namespace for this hybrid connection. relayName is the relay name for this hybrid -// connection. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// namespaceName - the namespace for this hybrid connection. +// relayName - the relay name for this hybrid connection. func (client AppsClient) ListHybridConnectionKeys(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string) (result HybridConnectionKey, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -15156,10 +15441,12 @@ func (client AppsClient) ListHybridConnectionKeysResponder(resp *http.Response) } // ListHybridConnectionKeysSlot gets the send key name and value for a Hybrid Connection. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// namespaceName is the namespace for this hybrid connection. relayName is the relay name for this hybrid -// connection. slot is the name of the slot for the web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// namespaceName - the namespace for this hybrid connection. +// relayName - the relay name for this hybrid connection. +// slot - the name of the slot for the web app. func (client AppsClient) ListHybridConnectionKeysSlot(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string, slot string) (result HybridConnectionKey, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -15235,8 +15522,9 @@ func (client AppsClient) ListHybridConnectionKeysSlotResponder(resp *http.Respon } // ListHybridConnections retrieves all Service Bus Hybrid Connections used by this Web App. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. func (client AppsClient) ListHybridConnections(ctx context.Context, resourceGroupName string, name string) (result HybridConnection, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -15309,9 +15597,10 @@ func (client AppsClient) ListHybridConnectionsResponder(resp *http.Response) (re } // ListHybridConnectionsSlot retrieves all Service Bus Hybrid Connections used by this Web App. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// slot is the name of the slot for the web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// slot - the name of the slot for the web app. func (client AppsClient) ListHybridConnectionsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result HybridConnection, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -15385,9 +15674,11 @@ func (client AppsClient) ListHybridConnectionsSlotResponder(resp *http.Response) } // ListInstanceFunctionsSlot list the functions for a web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. slot is name -// of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) ListInstanceFunctionsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result FunctionEnvelopeCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -15489,8 +15780,9 @@ func (client AppsClient) ListInstanceFunctionsSlotComplete(ctx context.Context, } // ListInstanceIdentifiers gets all scale-out instances of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListInstanceIdentifiers(ctx context.Context, resourceGroupName string, name string) (result AppInstanceCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -15591,9 +15883,10 @@ func (client AppsClient) ListInstanceIdentifiersComplete(ctx context.Context, re } // ListInstanceIdentifiersSlot gets all scale-out instances of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API gets the production slot instances. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API gets the production slot instances. func (client AppsClient) ListInstanceIdentifiersSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result AppInstanceCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -15696,10 +15989,11 @@ func (client AppsClient) ListInstanceIdentifiersSlotComplete(ctx context.Context // ListInstanceProcesses get list of processes for a web site, or a deployment slot, or for a specific scaled-out // instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. instanceID is -// ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET -// api/sites/{siteName}/instances". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON +// response from "GET api/sites/{siteName}/instances". func (client AppsClient) ListInstanceProcesses(ctx context.Context, resourceGroupName string, name string, instanceID string) (result ProcessInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -15802,11 +16096,13 @@ func (client AppsClient) ListInstanceProcessesComplete(ctx context.Context, reso // ListInstanceProcessesSlot get list of processes for a web site, or a deployment slot, or for a specific scaled-out // instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. slot is name -// of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. -// instanceID is ID of a specific scaled-out instance. This is the value of the name property in the JSON response -// from "GET api/sites/{siteName}/instances". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON +// response from "GET api/sites/{siteName}/instances". func (client AppsClient) ListInstanceProcessesSlot(ctx context.Context, resourceGroupName string, name string, slot string, instanceID string) (result ProcessInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -15910,9 +16206,11 @@ func (client AppsClient) ListInstanceProcessesSlotComplete(ctx context.Context, // ListInstanceProcessModules list module information for a process by its ID for a specific scaled-out instance in a // web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. instanceID is ID of a specific scaled-out instance. This is the value of the name property in the JSON +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON // response from "GET api/sites/{siteName}/instances". func (client AppsClient) ListInstanceProcessModules(ctx context.Context, resourceGroupName string, name string, processID string, instanceID string) (result ProcessModuleInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ @@ -16017,11 +16315,14 @@ func (client AppsClient) ListInstanceProcessModulesComplete(ctx context.Context, // ListInstanceProcessModulesSlot list module information for a process by its ID for a specific scaled-out instance in // a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. slot is name of the deployment slot. If a slot is not specified, the API returns deployments for the -// production slot. instanceID is ID of a specific scaled-out instance. This is the value of the name property in -// the JSON response from "GET api/sites/{siteName}/instances". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON +// response from "GET api/sites/{siteName}/instances". func (client AppsClient) ListInstanceProcessModulesSlot(ctx context.Context, resourceGroupName string, name string, processID string, slot string, instanceID string) (result ProcessModuleInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -16125,9 +16426,11 @@ func (client AppsClient) ListInstanceProcessModulesSlotComplete(ctx context.Cont } // ListInstanceProcessThreads list the threads in a process by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. instanceID is ID of a specific scaled-out instance. This is the value of the name property in the JSON +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON // response from "GET api/sites/{siteName}/instances". func (client AppsClient) ListInstanceProcessThreads(ctx context.Context, resourceGroupName string, name string, processID string, instanceID string) (result ProcessThreadInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ @@ -16232,11 +16535,14 @@ func (client AppsClient) ListInstanceProcessThreadsComplete(ctx context.Context, // ListInstanceProcessThreadsSlot list the threads in a process by its ID for a specific scaled-out instance in a web // site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. slot is name of the deployment slot. If a slot is not specified, the API returns deployments for the -// production slot. instanceID is ID of a specific scaled-out instance. This is the value of the name property in -// the JSON response from "GET api/sites/{siteName}/instances". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. +// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON +// response from "GET api/sites/{siteName}/instances". func (client AppsClient) ListInstanceProcessThreadsSlot(ctx context.Context, resourceGroupName string, name string, processID string, slot string, instanceID string) (result ProcessThreadInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -16340,8 +16646,9 @@ func (client AppsClient) ListInstanceProcessThreadsSlotComplete(ctx context.Cont } // ListMetadata gets the metadata of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListMetadata(ctx context.Context, resourceGroupName string, name string) (result StringDictionary, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -16414,9 +16721,11 @@ func (client AppsClient) ListMetadataResponder(resp *http.Response) (result Stri } // ListMetadataSlot gets the metadata of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get the metadata for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get the metadata for the +// production slot. func (client AppsClient) ListMetadataSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result StringDictionary, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -16490,8 +16799,9 @@ func (client AppsClient) ListMetadataSlotResponder(resp *http.Response) (result } // ListMetricDefinitions gets all metric definitions of an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListMetricDefinitions(ctx context.Context, resourceGroupName string, name string) (result ResourceMetricDefinitionCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -16592,10 +16902,11 @@ func (client AppsClient) ListMetricDefinitionsComplete(ctx context.Context, reso } // ListMetricDefinitionsSlot gets all metric definitions of an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get metric definitions of the production -// slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get metric definitions of the +// production slot. func (client AppsClient) ListMetricDefinitionsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result ResourceMetricDefinitionCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -16697,12 +17008,13 @@ func (client AppsClient) ListMetricDefinitionsSlotComplete(ctx context.Context, } // ListMetrics gets performance metrics of an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. details -// is specify "true" to include metric details in the response. It is "false" by default. filter is return only -// metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or -// name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and -// timeGrain eq duration'[Hour|Minute|Day]'. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// details - specify "true" to include metric details in the response. It is "false" by default. +// filter - return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value +// eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq +// '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. func (client AppsClient) ListMetrics(ctx context.Context, resourceGroupName string, name string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -16809,13 +17121,15 @@ func (client AppsClient) ListMetricsComplete(ctx context.Context, resourceGroupN } // ListMetricsSlot gets performance metrics of an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot. -// details is specify "true" to include metric details in the response. It is "false" by default. filter is return -// only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or -// name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and -// timeGrain eq duration'[Hour|Minute|Day]'. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get metrics of the production +// slot. +// details - specify "true" to include metric details in the response. It is "false" by default. +// filter - return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value +// eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq +// '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. func (client AppsClient) ListMetricsSlot(ctx context.Context, resourceGroupName string, name string, slot string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -16923,9 +17237,10 @@ func (client AppsClient) ListMetricsSlotComplete(ctx context.Context, resourceGr } // ListNetworkFeatures gets all network features used by the app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. view is -// the type of view. This can either be "summary" or "detailed". +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// view - the type of view. This can either be "summary" or "detailed". func (client AppsClient) ListNetworkFeatures(ctx context.Context, resourceGroupName string, name string, view string) (result NetworkFeatures, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -16999,10 +17314,12 @@ func (client AppsClient) ListNetworkFeaturesResponder(resp *http.Response) (resu } // ListNetworkFeaturesSlot gets all network features used by the app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. view is -// the type of view. This can either be "summary" or "detailed". slot is name of the deployment slot. If a slot is -// not specified, the API will get network features for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// view - the type of view. This can either be "summary" or "detailed". +// slot - name of the deployment slot. If a slot is not specified, the API will get network features for the +// production slot. func (client AppsClient) ListNetworkFeaturesSlot(ctx context.Context, resourceGroupName string, name string, view string, slot string) (result NetworkFeatures, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -17077,9 +17394,10 @@ func (client AppsClient) ListNetworkFeaturesSlotResponder(resp *http.Response) ( } // ListPerfMonCounters gets perfmon counters for web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. filter -// is return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: // $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq // duration'[Hour|Minute|Day]'. func (client AppsClient) ListPerfMonCounters(ctx context.Context, resourceGroupName string, name string, filter string) (result PerfMonCounterCollectionPage, err error) { @@ -17185,11 +17503,13 @@ func (client AppsClient) ListPerfMonCountersComplete(ctx context.Context, resour } // ListPerfMonCountersSlot gets perfmon counters for web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. filter is return only -// usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq -// '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. +// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: +// $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq +// duration'[Hour|Minute|Day]'. func (client AppsClient) ListPerfMonCountersSlot(ctx context.Context, resourceGroupName string, name string, slot string, filter string) (result PerfMonCounterCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -17294,8 +17614,9 @@ func (client AppsClient) ListPerfMonCountersSlotComplete(ctx context.Context, re } // ListPremierAddOns gets the premier add-ons of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListPremierAddOns(ctx context.Context, resourceGroupName string, name string) (result PremierAddOn, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -17368,10 +17689,11 @@ func (client AppsClient) ListPremierAddOnsResponder(resp *http.Response) (result } // ListPremierAddOnsSlot gets the premier add-ons of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get the premier add-ons for the production -// slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get the premier add-ons for the +// production slot. func (client AppsClient) ListPremierAddOnsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result PremierAddOn, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -17446,8 +17768,9 @@ func (client AppsClient) ListPremierAddOnsSlotResponder(resp *http.Response) (re // ListProcesses get list of processes for a web site, or a deployment slot, or for a specific scaled-out instance in a // web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. func (client AppsClient) ListProcesses(ctx context.Context, resourceGroupName string, name string) (result ProcessInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -17549,9 +17872,11 @@ func (client AppsClient) ListProcessesComplete(ctx context.Context, resourceGrou // ListProcessesSlot get list of processes for a web site, or a deployment slot, or for a specific scaled-out instance // in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. slot is name -// of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. func (client AppsClient) ListProcessesSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result ProcessInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -17653,9 +17978,10 @@ func (client AppsClient) ListProcessesSlotComplete(ctx context.Context, resource } // ListProcessModules list module information for a process by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. func (client AppsClient) ListProcessModules(ctx context.Context, resourceGroupName string, name string, processID string) (result ProcessModuleInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -17758,9 +18084,11 @@ func (client AppsClient) ListProcessModulesComplete(ctx context.Context, resourc // ListProcessModulesSlot list module information for a process by its ID for a specific scaled-out instance in a web // site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. slot is name of the deployment slot. If a slot is not specified, the API returns deployments for the +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the // production slot. func (client AppsClient) ListProcessModulesSlot(ctx context.Context, resourceGroupName string, name string, processID string, slot string) (result ProcessModuleInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ @@ -17864,9 +18192,10 @@ func (client AppsClient) ListProcessModulesSlotComplete(ctx context.Context, res } // ListProcessThreads list the threads in a process by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. func (client AppsClient) ListProcessThreads(ctx context.Context, resourceGroupName string, name string, processID string) (result ProcessThreadInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -17968,9 +18297,11 @@ func (client AppsClient) ListProcessThreadsComplete(ctx context.Context, resourc } // ListProcessThreadsSlot list the threads in a process by its ID for a specific scaled-out instance in a web site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. processID is -// pID. slot is name of the deployment slot. If a slot is not specified, the API returns deployments for the +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// processID - pID. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the // production slot. func (client AppsClient) ListProcessThreadsSlot(ctx context.Context, resourceGroupName string, name string, processID string, slot string) (result ProcessThreadInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ @@ -18074,8 +18405,9 @@ func (client AppsClient) ListProcessThreadsSlotComplete(ctx context.Context, res } // ListPublicCertificates get public certificates for an app or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListPublicCertificates(ctx context.Context, resourceGroupName string, name string) (result PublicCertificateCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -18176,9 +18508,11 @@ func (client AppsClient) ListPublicCertificatesComplete(ctx context.Context, res } // ListPublicCertificatesSlot get public certificates for an app or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API gets hostname bindings for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API gets hostname bindings for the +// production slot. func (client AppsClient) ListPublicCertificatesSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result PublicCertificateCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -18280,8 +18614,9 @@ func (client AppsClient) ListPublicCertificatesSlotComplete(ctx context.Context, } // ListPublishingCredentials gets the Git/FTP publishing credentials of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListPublishingCredentials(ctx context.Context, resourceGroupName string, name string) (result AppsListPublishingCredentialsFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -18356,10 +18691,11 @@ func (client AppsClient) ListPublishingCredentialsResponder(resp *http.Response) } // ListPublishingCredentialsSlot gets the Git/FTP publishing credentials of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get the publishing credentials for the -// production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get the publishing credentials +// for the production slot. func (client AppsClient) ListPublishingCredentialsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result AppsListPublishingCredentialsSlotFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -18435,9 +18771,10 @@ func (client AppsClient) ListPublishingCredentialsSlotResponder(resp *http.Respo } // ListPublishingProfileXMLWithSecrets gets the publishing profile for an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// publishingProfileOptions is specifies publishingProfileOptions for publishing profile. For example, use +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// publishingProfileOptions - specifies publishingProfileOptions for publishing profile. For example, use // {"format": "FileZilla3"} to get a FileZilla publishing profile. func (client AppsClient) ListPublishingProfileXMLWithSecrets(ctx context.Context, resourceGroupName string, name string, publishingProfileOptions CsmPublishingProfileOptions) (result ReadCloser, err error) { if err := validation.Validate([]validation.Validation{ @@ -18512,11 +18849,13 @@ func (client AppsClient) ListPublishingProfileXMLWithSecretsResponder(resp *http } // ListPublishingProfileXMLWithSecretsSlot gets the publishing profile for an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// publishingProfileOptions is specifies publishingProfileOptions for publishing profile. For example, use -// {"format": "FileZilla3"} to get a FileZilla publishing profile. slot is name of the deployment slot. If a slot -// is not specified, the API will get the publishing profile for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// publishingProfileOptions - specifies publishingProfileOptions for publishing profile. For example, use +// {"format": "FileZilla3"} to get a FileZilla publishing profile. +// slot - name of the deployment slot. If a slot is not specified, the API will get the publishing profile for +// the production slot. func (client AppsClient) ListPublishingProfileXMLWithSecretsSlot(ctx context.Context, resourceGroupName string, name string, publishingProfileOptions CsmPublishingProfileOptions, slot string) (result ReadCloser, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -18591,8 +18930,9 @@ func (client AppsClient) ListPublishingProfileXMLWithSecretsSlotResponder(resp * } // ListRelayServiceConnections gets hybrid connections configured for an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListRelayServiceConnections(ctx context.Context, resourceGroupName string, name string) (result RelayServiceConnectionEntity, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -18665,10 +19005,11 @@ func (client AppsClient) ListRelayServiceConnectionsResponder(resp *http.Respons } // ListRelayServiceConnectionsSlot gets hybrid connections configured for an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get hybrid connections for the production -// slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get hybrid connections for the +// production slot. func (client AppsClient) ListRelayServiceConnectionsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result RelayServiceConnectionEntity, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -18742,8 +19083,9 @@ func (client AppsClient) ListRelayServiceConnectionsSlotResponder(resp *http.Res } // ListSiteExtensions get list of siteextensions for a web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. func (client AppsClient) ListSiteExtensions(ctx context.Context, resourceGroupName string, name string) (result SiteExtensionInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -18844,9 +19186,11 @@ func (client AppsClient) ListSiteExtensionsComplete(ctx context.Context, resourc } // ListSiteExtensionsSlot get list of siteextensions for a web site, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. slot is name -// of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) ListSiteExtensionsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result SiteExtensionInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -18948,8 +19292,9 @@ func (client AppsClient) ListSiteExtensionsSlotComplete(ctx context.Context, res } // ListSitePushSettings gets the Push settings associated with web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. func (client AppsClient) ListSitePushSettings(ctx context.Context, resourceGroupName string, name string) (result PushSettings, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -19022,9 +19367,10 @@ func (client AppsClient) ListSitePushSettingsResponder(resp *http.Response) (res } // ListSitePushSettingsSlot gets the Push settings associated with web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. func (client AppsClient) ListSitePushSettingsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result PushSettings, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -19099,8 +19445,9 @@ func (client AppsClient) ListSitePushSettingsSlotResponder(resp *http.Response) // ListSlotConfigurationNames gets the names of app settings and connection strings that stick to the slot (not // swapped). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListSlotConfigurationNames(ctx context.Context, resourceGroupName string, name string) (result SlotConfigNamesResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -19173,9 +19520,10 @@ func (client AppsClient) ListSlotConfigurationNamesResponder(resp *http.Response } // ListSlotDifferencesFromProduction get the difference in configuration settings between two web app slots. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// slotSwapEntity is JSON object that contains the target slot name. See example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slotSwapEntity - JSON object that contains the target slot name. See example. func (client AppsClient) ListSlotDifferencesFromProduction(ctx context.Context, resourceGroupName string, name string, slotSwapEntity CsmSlotEntity) (result SlotDifferenceCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -19281,10 +19629,11 @@ func (client AppsClient) ListSlotDifferencesFromProductionComplete(ctx context.C } // ListSlotDifferencesSlot get the difference in configuration settings between two web app slots. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// slotSwapEntity is JSON object that contains the target slot name. See example. slot is name of the source slot. -// If a slot is not specified, the production slot is used as the source slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slotSwapEntity - JSON object that contains the target slot name. See example. +// slot - name of the source slot. If a slot is not specified, the production slot is used as the source slot. func (client AppsClient) ListSlotDifferencesSlot(ctx context.Context, resourceGroupName string, name string, slotSwapEntity CsmSlotEntity, slot string) (result SlotDifferenceCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -19391,8 +19740,9 @@ func (client AppsClient) ListSlotDifferencesSlotComplete(ctx context.Context, re } // ListSlots gets an app's deployment slots. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListSlots(ctx context.Context, resourceGroupName string, name string) (result AppCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -19493,8 +19843,9 @@ func (client AppsClient) ListSlotsComplete(ctx context.Context, resourceGroupNam } // ListSnapshots returns all Snapshots to the user. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is website Name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - website Name. func (client AppsClient) ListSnapshots(ctx context.Context, resourceGroupName string, name string) (result SnapshotCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -19595,9 +19946,10 @@ func (client AppsClient) ListSnapshotsComplete(ctx context.Context, resourceGrou } // ListSnapshotsSlot returns all Snapshots to the user. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is website Name. slot is -// website Slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - website Name. +// slot - website Slot. func (client AppsClient) ListSnapshotsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result SnapshotCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -19699,8 +20051,9 @@ func (client AppsClient) ListSnapshotsSlotComplete(ctx context.Context, resource } // ListSyncFunctionTriggers this is to allow calling via powershell and ARM template. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListSyncFunctionTriggers(ctx context.Context, resourceGroupName string, name string) (result FunctionSecrets, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -19773,9 +20126,11 @@ func (client AppsClient) ListSyncFunctionTriggersResponder(resp *http.Response) } // ListSyncFunctionTriggersSlot this is to allow calling via powershell and ARM template. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will restore a backup of the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will restore a backup of the +// production slot. func (client AppsClient) ListSyncFunctionTriggersSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result FunctionSecrets, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -19849,9 +20204,10 @@ func (client AppsClient) ListSyncFunctionTriggersSlotResponder(resp *http.Respon } // ListTriggeredWebJobHistory list a triggered web job's history for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. func (client AppsClient) ListTriggeredWebJobHistory(ctx context.Context, resourceGroupName string, name string, webJobName string) (result TriggeredJobHistoryCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -19953,10 +20309,12 @@ func (client AppsClient) ListTriggeredWebJobHistoryComplete(ctx context.Context, } // ListTriggeredWebJobHistorySlot list a triggered web job's history for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) ListTriggeredWebJobHistorySlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result TriggeredJobHistoryCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -20059,8 +20417,9 @@ func (client AppsClient) ListTriggeredWebJobHistorySlotComplete(ctx context.Cont } // ListTriggeredWebJobs list triggered web jobs for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. func (client AppsClient) ListTriggeredWebJobs(ctx context.Context, resourceGroupName string, name string) (result TriggeredWebJobCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -20161,9 +20520,11 @@ func (client AppsClient) ListTriggeredWebJobsComplete(ctx context.Context, resou } // ListTriggeredWebJobsSlot list triggered web jobs for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. slot is name -// of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) ListTriggeredWebJobsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result TriggeredWebJobCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -20265,11 +20626,12 @@ func (client AppsClient) ListTriggeredWebJobsSlotComplete(ctx context.Context, r } // ListUsages gets the quota usage information of an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. filter -// is return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq -// 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq -// '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// filter - return only information specified in the filter (using OData syntax). For example: +// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and +// endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. func (client AppsClient) ListUsages(ctx context.Context, resourceGroupName string, name string, filter string) (result CsmUsageQuotaCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -20373,12 +20735,14 @@ func (client AppsClient) ListUsagesComplete(ctx context.Context, resourceGroupNa } // ListUsagesSlot gets the quota usage information of an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get quota information of the production -// slot. filter is return only information specified in the filter (using OData syntax). For example: -// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime -// eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get quota information of the +// production slot. +// filter - return only information specified in the filter (using OData syntax). For example: +// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and +// endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. func (client AppsClient) ListUsagesSlot(ctx context.Context, resourceGroupName string, name string, slot string, filter string) (result CsmUsageQuotaCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -20483,8 +20847,9 @@ func (client AppsClient) ListUsagesSlotComplete(ctx context.Context, resourceGro } // ListVnetConnections gets the virtual networks the app (or deployment slot) is connected to. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ListVnetConnections(ctx context.Context, resourceGroupName string, name string) (result ListVnetInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -20557,10 +20922,11 @@ func (client AppsClient) ListVnetConnectionsResponder(resp *http.Response) (resu } // ListVnetConnectionsSlot gets the virtual networks the app (or deployment slot) is connected to. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will get virtual network connections for the -// production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get virtual network connections +// for the production slot. func (client AppsClient) ListVnetConnectionsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result ListVnetInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -20634,8 +21000,9 @@ func (client AppsClient) ListVnetConnectionsSlotResponder(resp *http.Response) ( } // ListWebJobs list webjobs for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. func (client AppsClient) ListWebJobs(ctx context.Context, resourceGroupName string, name string) (result JobCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -20736,9 +21103,11 @@ func (client AppsClient) ListWebJobsComplete(ctx context.Context, resourceGroupN } // ListWebJobsSlot list webjobs for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. slot is name -// of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the +// production slot. func (client AppsClient) ListWebJobsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result JobCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -20840,9 +21209,10 @@ func (client AppsClient) ListWebJobsSlotComplete(ctx context.Context, resourceGr } // MigrateMySQL migrates a local (in-app) MySql database to a remote MySql database. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. -// migrationRequestEnvelope is mySql migration options. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// migrationRequestEnvelope - mySql migration options. func (client AppsClient) MigrateMySQL(ctx context.Context, resourceGroupName string, name string, migrationRequestEnvelope MigrateMySQLRequest) (result AppsMigrateMySQLFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -20922,9 +21292,11 @@ func (client AppsClient) MigrateMySQLResponder(resp *http.Response) (result Oper } // MigrateStorage restores a web app. -// -// subscriptionName is azure subscription. resourceGroupName is name of the resource group to which the resource -// belongs. name is name of web app. migrationOptions is migration migrationOptions. +// Parameters: +// subscriptionName - azure subscription. +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// migrationOptions - migration migrationOptions. func (client AppsClient) MigrateStorage(ctx context.Context, subscriptionName string, resourceGroupName string, name string, migrationOptions StorageMigrationOptions) (result AppsMigrateStorageFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -21007,9 +21379,10 @@ func (client AppsClient) MigrateStorageResponder(resp *http.Response) (result St } // Recover recovers a web app to a previous snapshot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. -// recoveryEntity is snapshot data used for web app recovery. Snapshot information can be obtained by calling +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// recoveryEntity - snapshot data used for web app recovery. Snapshot information can be obtained by calling // GetDeletedSites or GetSiteSnapshots API. func (client AppsClient) Recover(ctx context.Context, resourceGroupName string, name string, recoveryEntity SnapshotRecoveryRequest) (result AppsRecoverFuture, err error) { if err := validation.Validate([]validation.Validation{ @@ -21089,9 +21462,10 @@ func (client AppsClient) RecoverResponder(resp *http.Response) (result autorest. } // RecoverSiteConfigurationSnapshot reverts the configuration of an app to a previous snapshot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// snapshotID is the ID of the snapshot to read. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// snapshotID - the ID of the snapshot to read. func (client AppsClient) RecoverSiteConfigurationSnapshot(ctx context.Context, resourceGroupName string, name string, snapshotID string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -21164,10 +21538,12 @@ func (client AppsClient) RecoverSiteConfigurationSnapshotResponder(resp *http.Re } // RecoverSiteConfigurationSnapshotSlot reverts the configuration of an app to a previous snapshot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// snapshotID is the ID of the snapshot to read. slot is name of the deployment slot. If a slot is not specified, -// the API will return configuration for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// snapshotID - the ID of the snapshot to read. +// slot - name of the deployment slot. If a slot is not specified, the API will return configuration for the +// production slot. func (client AppsClient) RecoverSiteConfigurationSnapshotSlot(ctx context.Context, resourceGroupName string, name string, snapshotID string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -21241,11 +21617,12 @@ func (client AppsClient) RecoverSiteConfigurationSnapshotSlotResponder(resp *htt } // RecoverSlot recovers a web app to a previous snapshot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. -// recoveryEntity is snapshot data used for web app recovery. Snapshot information can be obtained by calling -// GetDeletedSites or GetSiteSnapshots API. slot is name of web app slot. If not specified then will default to -// production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// recoveryEntity - snapshot data used for web app recovery. Snapshot information can be obtained by calling +// GetDeletedSites or GetSiteSnapshots API. +// slot - name of web app slot. If not specified then will default to production slot. func (client AppsClient) RecoverSlot(ctx context.Context, resourceGroupName string, name string, recoveryEntity SnapshotRecoveryRequest, slot string) (result AppsRecoverSlotFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -21326,8 +21703,9 @@ func (client AppsClient) RecoverSlotResponder(resp *http.Response) (result autor // ResetProductionSlotConfig resets the configuration settings of the current slot if they were previously modified by // calling the API with POST. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) ResetProductionSlotConfig(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -21400,10 +21778,11 @@ func (client AppsClient) ResetProductionSlotConfigResponder(resp *http.Response) // ResetSlotConfigurationSlot resets the configuration settings of the current slot if they were previously modified by // calling the API with POST. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API resets configuration settings for the -// production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API resets configuration settings for +// the production slot. func (client AppsClient) ResetSlotConfigurationSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -21476,11 +21855,13 @@ func (client AppsClient) ResetSlotConfigurationSlotResponder(resp *http.Response } // Restart restarts an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// softRestart is specify true to apply the configuration settings and restarts the app only if necessary. By -// default, the API always restarts and reprovisions the app. synchronous is specify true to block until the app is -// restarted. By default, it is set to false, and the API responds immediately (asynchronous). +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// softRestart - specify true to apply the configuration settings and restarts the app only if necessary. By +// default, the API always restarts and reprovisions the app. +// synchronous - specify true to block until the app is restarted. By default, it is set to false, and the API +// responds immediately (asynchronous). func (client AppsClient) Restart(ctx context.Context, resourceGroupName string, name string, softRestart *bool, synchronous *bool) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -21558,12 +21939,14 @@ func (client AppsClient) RestartResponder(resp *http.Response) (result autorest. } // RestartSlot restarts an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will restart the production slot. softRestart -// is specify true to apply the configuration settings and restarts the app only if necessary. By default, the API -// always restarts and reprovisions the app. synchronous is specify true to block until the app is restarted. By -// default, it is set to false, and the API responds immediately (asynchronous). +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will restart the production slot. +// softRestart - specify true to apply the configuration settings and restarts the app only if necessary. By +// default, the API always restarts and reprovisions the app. +// synchronous - specify true to block until the app is restarted. By default, it is set to false, and the API +// responds immediately (asynchronous). func (client AppsClient) RestartSlot(ctx context.Context, resourceGroupName string, name string, slot string, softRestart *bool, synchronous *bool) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -21642,9 +22025,11 @@ func (client AppsClient) RestartSlotResponder(resp *http.Response) (result autor } // Restore restores a specific backup to another app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. backupID -// is ID of the backup. request is information on restore request . +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// backupID - ID of the backup. +// request - information on restore request . func (client AppsClient) Restore(ctx context.Context, resourceGroupName string, name string, backupID string, request RestoreRequest) (result AppsRestoreFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -21727,10 +22112,13 @@ func (client AppsClient) RestoreResponder(resp *http.Response) (result RestoreRe } // RestoreSlot restores a specific backup to another app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. backupID -// is ID of the backup. request is information on restore request . slot is name of the deployment slot. If a slot -// is not specified, the API will restore a backup of the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// backupID - ID of the backup. +// request - information on restore request . +// slot - name of the deployment slot. If a slot is not specified, the API will restore a backup of the +// production slot. func (client AppsClient) RestoreSlot(ctx context.Context, resourceGroupName string, name string, backupID string, request RestoreRequest, slot string) (result AppsRestoreSlotFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -21814,9 +22202,10 @@ func (client AppsClient) RestoreSlotResponder(resp *http.Response) (result Resto } // RunTriggeredWebJob run a triggered web job for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. func (client AppsClient) RunTriggeredWebJob(ctx context.Context, resourceGroupName string, name string, webJobName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -21889,10 +22278,12 @@ func (client AppsClient) RunTriggeredWebJobResponder(resp *http.Response) (resul } // RunTriggeredWebJobSlot run a triggered web job for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) RunTriggeredWebJobSlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -21966,8 +22357,9 @@ func (client AppsClient) RunTriggeredWebJobSlotResponder(resp *http.Response) (r } // Start starts an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) Start(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22039,9 +22431,10 @@ func (client AppsClient) StartResponder(resp *http.Response) (result autorest.Re } // StartContinuousWebJob start a continuous web job for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. func (client AppsClient) StartContinuousWebJob(ctx context.Context, resourceGroupName string, name string, webJobName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22114,10 +22507,12 @@ func (client AppsClient) StartContinuousWebJobResponder(resp *http.Response) (re } // StartContinuousWebJobSlot start a continuous web job for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) StartContinuousWebJobSlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22191,9 +22586,10 @@ func (client AppsClient) StartContinuousWebJobSlotResponder(resp *http.Response) } // StartSlot starts an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will start the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will start the production slot. func (client AppsClient) StartSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22266,10 +22662,12 @@ func (client AppsClient) StartSlotResponder(resp *http.Response) (result autores } // StartWebSiteNetworkTrace start capturing network packets for the site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// durationInSeconds is the duration to keep capturing in seconds. maxFrameLength is the maximum frame length in -// bytes (Optional). sasURL is the Blob URL to store capture file. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// durationInSeconds - the duration to keep capturing in seconds. +// maxFrameLength - the maximum frame length in bytes (Optional). +// sasURL - the Blob URL to store capture file. func (client AppsClient) StartWebSiteNetworkTrace(ctx context.Context, resourceGroupName string, name string, durationInSeconds *int32, maxFrameLength *int32, sasURL string) (result String, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22351,10 +22749,13 @@ func (client AppsClient) StartWebSiteNetworkTraceResponder(resp *http.Response) } // StartWebSiteNetworkTraceSlot start capturing network packets for the site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// slot is the name of the slot for this web app. durationInSeconds is the duration to keep capturing in seconds. -// maxFrameLength is the maximum frame length in bytes (Optional). sasURL is the Blob URL to store capture file. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// slot - the name of the slot for this web app. +// durationInSeconds - the duration to keep capturing in seconds. +// maxFrameLength - the maximum frame length in bytes (Optional). +// sasURL - the Blob URL to store capture file. func (client AppsClient) StartWebSiteNetworkTraceSlot(ctx context.Context, resourceGroupName string, name string, slot string, durationInSeconds *int32, maxFrameLength *int32, sasURL string) (result String, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22437,8 +22838,9 @@ func (client AppsClient) StartWebSiteNetworkTraceSlotResponder(resp *http.Respon } // Stop stops an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) Stop(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22510,9 +22912,10 @@ func (client AppsClient) StopResponder(resp *http.Response) (result autorest.Res } // StopContinuousWebJob stop a continuous web job for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. func (client AppsClient) StopContinuousWebJob(ctx context.Context, resourceGroupName string, name string, webJobName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22585,10 +22988,12 @@ func (client AppsClient) StopContinuousWebJobResponder(resp *http.Response) (res } // StopContinuousWebJobSlot stop a continuous web job for an app, or a deployment slot. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is site name. webJobName is -// name of Web Job. slot is name of the deployment slot. If a slot is not specified, the API deletes a deployment -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site name. +// webJobName - name of Web Job. +// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the +// production slot. func (client AppsClient) StopContinuousWebJobSlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22662,9 +23067,10 @@ func (client AppsClient) StopContinuousWebJobSlotResponder(resp *http.Response) } // StopSlot stops an app (or deployment slot, if specified). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will stop the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will stop the production slot. func (client AppsClient) StopSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22737,8 +23143,9 @@ func (client AppsClient) StopSlotResponder(resp *http.Response) (result autorest } // StopWebSiteNetworkTrace stop ongoing capturing network packets for the site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. func (client AppsClient) StopWebSiteNetworkTrace(ctx context.Context, resourceGroupName string, name string) (result String, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22811,9 +23218,10 @@ func (client AppsClient) StopWebSiteNetworkTraceResponder(resp *http.Response) ( } // StopWebSiteNetworkTraceSlot stop ongoing capturing network packets for the site. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// slot is the name of the slot for this web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// slot - the name of the slot for this web app. func (client AppsClient) StopWebSiteNetworkTraceSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result String, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22887,10 +23295,11 @@ func (client AppsClient) StopWebSiteNetworkTraceSlotResponder(resp *http.Respons } // SwapSlotSlot swaps two deployment slots of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// slotSwapEntity is JSON object that contains the target slot name. See example. slot is name of the source slot. -// If a slot is not specified, the production slot is used as the source slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slotSwapEntity - JSON object that contains the target slot name. See example. +// slot - name of the source slot. If a slot is not specified, the production slot is used as the source slot. func (client AppsClient) SwapSlotSlot(ctx context.Context, resourceGroupName string, name string, slotSwapEntity CsmSlotEntity, slot string) (result AppsSwapSlotSlotFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -22970,9 +23379,10 @@ func (client AppsClient) SwapSlotSlotResponder(resp *http.Response) (result auto } // SwapSlotWithProduction swaps two deployment slots of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// slotSwapEntity is JSON object that contains the target slot name. See example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slotSwapEntity - JSON object that contains the target slot name. See example. func (client AppsClient) SwapSlotWithProduction(ctx context.Context, resourceGroupName string, name string, slotSwapEntity CsmSlotEntity) (result AppsSwapSlotWithProductionFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23051,8 +23461,9 @@ func (client AppsClient) SwapSlotWithProductionResponder(resp *http.Response) (r } // SyncFunctionTriggers syncs function trigger metadata to the scale controller -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. func (client AppsClient) SyncFunctionTriggers(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23124,9 +23535,11 @@ func (client AppsClient) SyncFunctionTriggersResponder(resp *http.Response) (res } // SyncFunctionTriggersSlot syncs function trigger metadata to the scale controller -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. slot is -// name of the deployment slot. If a slot is not specified, the API will restore a backup of the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will restore a backup of the +// production slot. func (client AppsClient) SyncFunctionTriggersSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23199,8 +23612,9 @@ func (client AppsClient) SyncFunctionTriggersSlotResponder(resp *http.Response) } // SyncRepository sync web app repository. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. func (client AppsClient) SyncRepository(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23272,9 +23686,10 @@ func (client AppsClient) SyncRepositoryResponder(resp *http.Response) (result au } // SyncRepositorySlot sync web app repository. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. func (client AppsClient) SyncRepositorySlot(ctx context.Context, resourceGroupName string, name string, slot string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23347,10 +23762,11 @@ func (client AppsClient) SyncRepositorySlotResponder(resp *http.Response) (resul } // Update creates a new web, mobile, or API app in an existing resource group, or updates an existing app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is unique name of the app to -// create or update. To create or update a deployment slot, use the {slot} parameter. siteEnvelope is a JSON -// representation of the app properties. See example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - unique name of the app to create or update. To create or update a deployment slot, use the {slot} +// parameter. +// siteEnvelope - a JSON representation of the app properties. See example. func (client AppsClient) Update(ctx context.Context, resourceGroupName string, name string, siteEnvelope SitePatchResource) (result Site, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23425,9 +23841,10 @@ func (client AppsClient) UpdateResponder(resp *http.Response) (result Site, err } // UpdateApplicationSettings replaces the application settings of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// appSettings is application settings of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// appSettings - application settings of the app. func (client AppsClient) UpdateApplicationSettings(ctx context.Context, resourceGroupName string, name string, appSettings StringDictionary) (result StringDictionary, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23502,10 +23919,12 @@ func (client AppsClient) UpdateApplicationSettingsResponder(resp *http.Response) } // UpdateApplicationSettingsSlot replaces the application settings of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// appSettings is application settings of the app. slot is name of the deployment slot. If a slot is not specified, -// the API will update the application settings for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// appSettings - application settings of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will update the application settings +// for the production slot. func (client AppsClient) UpdateApplicationSettingsSlot(ctx context.Context, resourceGroupName string, name string, appSettings StringDictionary, slot string) (result StringDictionary, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23581,9 +24000,10 @@ func (client AppsClient) UpdateApplicationSettingsSlotResponder(resp *http.Respo } // UpdateAuthSettings updates the Authentication / Authorization settings associated with web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. -// siteAuthSettings is auth settings associated with web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// siteAuthSettings - auth settings associated with web app. func (client AppsClient) UpdateAuthSettings(ctx context.Context, resourceGroupName string, name string, siteAuthSettings SiteAuthSettings) (result SiteAuthSettings, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23658,10 +24078,11 @@ func (client AppsClient) UpdateAuthSettingsResponder(resp *http.Response) (resul } // UpdateAuthSettingsSlot updates the Authentication / Authorization settings associated with web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. -// siteAuthSettings is auth settings associated with web app. slot is name of web app slot. If not specified then -// will default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// siteAuthSettings - auth settings associated with web app. +// slot - name of web app slot. If not specified then will default to production slot. func (client AppsClient) UpdateAuthSettingsSlot(ctx context.Context, resourceGroupName string, name string, siteAuthSettings SiteAuthSettings, slot string) (result SiteAuthSettings, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23737,9 +24158,10 @@ func (client AppsClient) UpdateAuthSettingsSlotResponder(resp *http.Response) (r } // UpdateBackupConfiguration updates the backup configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. request -// is edited backup configuration. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// request - edited backup configuration. func (client AppsClient) UpdateBackupConfiguration(ctx context.Context, resourceGroupName string, name string, request BackupRequest) (result BackupRequest, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23824,10 +24246,12 @@ func (client AppsClient) UpdateBackupConfigurationResponder(resp *http.Response) } // UpdateBackupConfigurationSlot updates the backup configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. request -// is edited backup configuration. slot is name of the deployment slot. If a slot is not specified, the API will -// update the backup configuration for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// request - edited backup configuration. +// slot - name of the deployment slot. If a slot is not specified, the API will update the backup configuration +// for the production slot. func (client AppsClient) UpdateBackupConfigurationSlot(ctx context.Context, resourceGroupName string, name string, request BackupRequest, slot string) (result BackupRequest, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23913,9 +24337,10 @@ func (client AppsClient) UpdateBackupConfigurationSlotResponder(resp *http.Respo } // UpdateConfiguration updates the configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// siteConfig is JSON representation of a SiteConfig object. See example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// siteConfig - JSON representation of a SiteConfig object. See example. func (client AppsClient) UpdateConfiguration(ctx context.Context, resourceGroupName string, name string, siteConfig SiteConfigResource) (result SiteConfigResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -23990,10 +24415,12 @@ func (client AppsClient) UpdateConfigurationResponder(resp *http.Response) (resu } // UpdateConfigurationSlot updates the configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// siteConfig is JSON representation of a SiteConfig object. See example. slot is name of the deployment slot. If a -// slot is not specified, the API will update configuration for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// siteConfig - JSON representation of a SiteConfig object. See example. +// slot - name of the deployment slot. If a slot is not specified, the API will update configuration for the +// production slot. func (client AppsClient) UpdateConfigurationSlot(ctx context.Context, resourceGroupName string, name string, siteConfig SiteConfigResource, slot string) (result SiteConfigResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -24069,9 +24496,10 @@ func (client AppsClient) UpdateConfigurationSlotResponder(resp *http.Response) ( } // UpdateConnectionStrings replaces the connection strings of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// connectionStrings is connection strings of the app or deployment slot. See example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// connectionStrings - connection strings of the app or deployment slot. See example. func (client AppsClient) UpdateConnectionStrings(ctx context.Context, resourceGroupName string, name string, connectionStrings ConnectionStringDictionary) (result ConnectionStringDictionary, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -24146,11 +24574,12 @@ func (client AppsClient) UpdateConnectionStringsResponder(resp *http.Response) ( } // UpdateConnectionStringsSlot replaces the connection strings of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// connectionStrings is connection strings of the app or deployment slot. See example. slot is name of the -// deployment slot. If a slot is not specified, the API will update the connection settings for the production -// slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// connectionStrings - connection strings of the app or deployment slot. See example. +// slot - name of the deployment slot. If a slot is not specified, the API will update the connection settings +// for the production slot. func (client AppsClient) UpdateConnectionStringsSlot(ctx context.Context, resourceGroupName string, name string, connectionStrings ConnectionStringDictionary, slot string) (result ConnectionStringDictionary, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -24226,9 +24655,10 @@ func (client AppsClient) UpdateConnectionStringsSlotResponder(resp *http.Respons } // UpdateDiagnosticLogsConfig updates the logging configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// siteLogsConfig is a SiteLogsConfig JSON object that contains the logging configuration to change in the +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// siteLogsConfig - a SiteLogsConfig JSON object that contains the logging configuration to change in the // "properties" property. func (client AppsClient) UpdateDiagnosticLogsConfig(ctx context.Context, resourceGroupName string, name string, siteLogsConfig SiteLogsConfig) (result SiteLogsConfig, err error) { if err := validation.Validate([]validation.Validation{ @@ -24319,11 +24749,13 @@ func (client AppsClient) UpdateDiagnosticLogsConfigResponder(resp *http.Response } // UpdateDiagnosticLogsConfigSlot updates the logging configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// siteLogsConfig is a SiteLogsConfig JSON object that contains the logging configuration to change in the -// "properties" property. slot is name of the deployment slot. If a slot is not specified, the API will update the -// logging configuration for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// siteLogsConfig - a SiteLogsConfig JSON object that contains the logging configuration to change in the +// "properties" property. +// slot - name of the deployment slot. If a slot is not specified, the API will update the logging +// configuration for the production slot. func (client AppsClient) UpdateDiagnosticLogsConfigSlot(ctx context.Context, resourceGroupName string, name string, siteLogsConfig SiteLogsConfig, slot string) (result SiteLogsConfig, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -24415,10 +24847,11 @@ func (client AppsClient) UpdateDiagnosticLogsConfigSlotResponder(resp *http.Resp // UpdateDomainOwnershipIdentifier creates a domain ownership identifier for web app, or updates an existing ownership // identifier. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// domainOwnershipIdentifierName is name of domain ownership identifier. domainOwnershipIdentifier is a JSON -// representation of the domain ownership properties. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// domainOwnershipIdentifierName - name of domain ownership identifier. +// domainOwnershipIdentifier - a JSON representation of the domain ownership properties. func (client AppsClient) UpdateDomainOwnershipIdentifier(ctx context.Context, resourceGroupName string, name string, domainOwnershipIdentifierName string, domainOwnershipIdentifier Identifier) (result Identifier, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -24495,11 +24928,13 @@ func (client AppsClient) UpdateDomainOwnershipIdentifierResponder(resp *http.Res // UpdateDomainOwnershipIdentifierSlot creates a domain ownership identifier for web app, or updates an existing // ownership identifier. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// domainOwnershipIdentifierName is name of domain ownership identifier. domainOwnershipIdentifier is a JSON -// representation of the domain ownership properties. slot is name of the deployment slot. If a slot is not -// specified, the API will delete the binding for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// domainOwnershipIdentifierName - name of domain ownership identifier. +// domainOwnershipIdentifier - a JSON representation of the domain ownership properties. +// slot - name of the deployment slot. If a slot is not specified, the API will delete the binding for the +// production slot. func (client AppsClient) UpdateDomainOwnershipIdentifierSlot(ctx context.Context, resourceGroupName string, name string, domainOwnershipIdentifierName string, domainOwnershipIdentifier Identifier, slot string) (result Identifier, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -24576,10 +25011,12 @@ func (client AppsClient) UpdateDomainOwnershipIdentifierSlotResponder(resp *http } // UpdateHybridConnection creates a new Hybrid Connection using a Service Bus relay. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// namespaceName is the namespace for this hybrid connection. relayName is the relay name for this hybrid -// connection. connectionEnvelope is the details of the hybrid connection. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// namespaceName - the namespace for this hybrid connection. +// relayName - the relay name for this hybrid connection. +// connectionEnvelope - the details of the hybrid connection. func (client AppsClient) UpdateHybridConnection(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string, connectionEnvelope HybridConnection) (result HybridConnection, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -24656,11 +25093,13 @@ func (client AppsClient) UpdateHybridConnectionResponder(resp *http.Response) (r } // UpdateHybridConnectionSlot creates a new Hybrid Connection using a Service Bus relay. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is the name of the web app. -// namespaceName is the namespace for this hybrid connection. relayName is the relay name for this hybrid -// connection. connectionEnvelope is the details of the hybrid connection. slot is the name of the slot for the web -// app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - the name of the web app. +// namespaceName - the namespace for this hybrid connection. +// relayName - the relay name for this hybrid connection. +// connectionEnvelope - the details of the hybrid connection. +// slot - the name of the slot for the web app. func (client AppsClient) UpdateHybridConnectionSlot(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string, connectionEnvelope HybridConnection, slot string) (result HybridConnection, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -24738,9 +25177,10 @@ func (client AppsClient) UpdateHybridConnectionSlotResponder(resp *http.Response } // UpdateMetadata replaces the metadata of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. metadata -// is edited metadata of the app or deployment slot. See example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// metadata - edited metadata of the app or deployment slot. See example. func (client AppsClient) UpdateMetadata(ctx context.Context, resourceGroupName string, name string, metadata StringDictionary) (result StringDictionary, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -24815,10 +25255,12 @@ func (client AppsClient) UpdateMetadataResponder(resp *http.Response) (result St } // UpdateMetadataSlot replaces the metadata of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. metadata -// is edited metadata of the app or deployment slot. See example. slot is name of the deployment slot. If a slot is -// not specified, the API will update the metadata for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// metadata - edited metadata of the app or deployment slot. See example. +// slot - name of the deployment slot. If a slot is not specified, the API will update the metadata for the +// production slot. func (client AppsClient) UpdateMetadataSlot(ctx context.Context, resourceGroupName string, name string, metadata StringDictionary, slot string) (result StringDictionary, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -24895,10 +25337,11 @@ func (client AppsClient) UpdateMetadataSlotResponder(resp *http.Response) (resul // UpdateRelayServiceConnection creates a new hybrid connection configuration (PUT), or updates an existing one // (PATCH). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// entityName is name of the hybrid connection configuration. connectionEnvelope is details of the hybrid -// connection configuration. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// entityName - name of the hybrid connection configuration. +// connectionEnvelope - details of the hybrid connection configuration. func (client AppsClient) UpdateRelayServiceConnection(ctx context.Context, resourceGroupName string, name string, entityName string, connectionEnvelope RelayServiceConnectionEntity) (result RelayServiceConnectionEntity, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -24975,11 +25418,13 @@ func (client AppsClient) UpdateRelayServiceConnectionResponder(resp *http.Respon // UpdateRelayServiceConnectionSlot creates a new hybrid connection configuration (PUT), or updates an existing one // (PATCH). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// entityName is name of the hybrid connection configuration. connectionEnvelope is details of the hybrid -// connection configuration. slot is name of the deployment slot. If a slot is not specified, the API will create -// or update a hybrid connection for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// entityName - name of the hybrid connection configuration. +// connectionEnvelope - details of the hybrid connection configuration. +// slot - name of the deployment slot. If a slot is not specified, the API will create or update a hybrid +// connection for the production slot. func (client AppsClient) UpdateRelayServiceConnectionSlot(ctx context.Context, resourceGroupName string, name string, entityName string, connectionEnvelope RelayServiceConnectionEntity, slot string) (result RelayServiceConnectionEntity, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -25056,9 +25501,10 @@ func (client AppsClient) UpdateRelayServiceConnectionSlotResponder(resp *http.Re } // UpdateSitePushSettings updates the Push settings associated with web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. -// pushSettings is push settings associated with web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// pushSettings - push settings associated with web app. func (client AppsClient) UpdateSitePushSettings(ctx context.Context, resourceGroupName string, name string, pushSettings PushSettings) (result PushSettings, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -25136,10 +25582,11 @@ func (client AppsClient) UpdateSitePushSettingsResponder(resp *http.Response) (r } // UpdateSitePushSettingsSlot updates the Push settings associated with web app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. -// pushSettings is push settings associated with web app. slot is name of web app slot. If not specified then will -// default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// pushSettings - push settings associated with web app. +// slot - name of web app slot. If not specified then will default to production slot. func (client AppsClient) UpdateSitePushSettingsSlot(ctx context.Context, resourceGroupName string, name string, pushSettings PushSettings, slot string) (result PushSettings, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -25218,15 +25665,19 @@ func (client AppsClient) UpdateSitePushSettingsSlotResponder(resp *http.Response } // UpdateSlot creates a new web, mobile, or API app in an existing resource group, or updates an existing app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is unique name of the app to -// create or update. To create or update a deployment slot, use the {slot} parameter. siteEnvelope is a JSON -// representation of the app properties. See example. slot is name of the deployment slot to create or update. By -// default, this API attempts to create or modify the production slot. skipDNSRegistration is if true web app -// hostname is not registered with DNS on creation. This parameter is -// only used for app creation. skipCustomDomainVerification is if true, custom (non *.azurewebsites.net) domains -// associated with web app are not verified. forceDNSRegistration is if true, web app hostname is force registered -// with DNS. TTLInSeconds is time to live in seconds for web app's default domain name. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - unique name of the app to create or update. To create or update a deployment slot, use the {slot} +// parameter. +// siteEnvelope - a JSON representation of the app properties. See example. +// slot - name of the deployment slot to create or update. By default, this API attempts to create or modify +// the production slot. +// skipDNSRegistration - if true web app hostname is not registered with DNS on creation. This parameter is +// only used for app creation. +// skipCustomDomainVerification - if true, custom (non *.azurewebsites.net) domains associated with web app are +// not verified. +// forceDNSRegistration - if true, web app hostname is force registered with DNS. +// TTLInSeconds - time to live in seconds for web app's default domain name. func (client AppsClient) UpdateSlot(ctx context.Context, resourceGroupName string, name string, siteEnvelope SitePatchResource, slot string, skipDNSRegistration *bool, skipCustomDomainVerification *bool, forceDNSRegistration *bool, TTLInSeconds string) (result Site, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -25315,9 +25766,10 @@ func (client AppsClient) UpdateSlotResponder(resp *http.Response) (result Site, // UpdateSlotConfigurationNames updates the names of application settings and connection string that remain with the // slot during swap operation. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// slotConfigNames is names of application settings and connection strings. See example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slotConfigNames - names of application settings and connection strings. See example. func (client AppsClient) UpdateSlotConfigurationNames(ctx context.Context, resourceGroupName string, name string, slotConfigNames SlotConfigNamesResource) (result SlotConfigNamesResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -25392,9 +25844,10 @@ func (client AppsClient) UpdateSlotConfigurationNamesResponder(resp *http.Respon } // UpdateSourceControl updates the source control configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// siteSourceControl is JSON representation of a SiteSourceControl object. See example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// siteSourceControl - JSON representation of a SiteSourceControl object. See example. func (client AppsClient) UpdateSourceControl(ctx context.Context, resourceGroupName string, name string, siteSourceControl SiteSourceControl) (result SiteSourceControl, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -25469,11 +25922,12 @@ func (client AppsClient) UpdateSourceControlResponder(resp *http.Response) (resu } // UpdateSourceControlSlot updates the source control configuration of an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. -// siteSourceControl is JSON representation of a SiteSourceControl object. See example. slot is name of the -// deployment slot. If a slot is not specified, the API will update the source control configuration for the -// production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// siteSourceControl - JSON representation of a SiteSourceControl object. See example. +// slot - name of the deployment slot. If a slot is not specified, the API will update the source control +// configuration for the production slot. func (client AppsClient) UpdateSourceControlSlot(ctx context.Context, resourceGroupName string, name string, siteSourceControl SiteSourceControl, slot string) (result SiteSourceControl, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -25550,10 +26004,11 @@ func (client AppsClient) UpdateSourceControlSlotResponder(resp *http.Response) ( // UpdateVnetConnection adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties // (PATCH). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of an existing Virtual Network. connectionEnvelope is properties of the Virtual Network connection. See -// example. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of an existing Virtual Network. +// connectionEnvelope - properties of the Virtual Network connection. See example. func (client AppsClient) UpdateVnetConnection(ctx context.Context, resourceGroupName string, name string, vnetName string, connectionEnvelope VnetInfo) (result VnetInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -25629,10 +26084,12 @@ func (client AppsClient) UpdateVnetConnectionResponder(resp *http.Response) (res } // UpdateVnetConnectionGateway adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of the Virtual Network. gatewayName is name of the gateway. Currently, the only supported string is -// "primary". connectionEnvelope is the properties to update this gateway with. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of the Virtual Network. +// gatewayName - name of the gateway. Currently, the only supported string is "primary". +// connectionEnvelope - the properties to update this gateway with. func (client AppsClient) UpdateVnetConnectionGateway(ctx context.Context, resourceGroupName string, name string, vnetName string, gatewayName string, connectionEnvelope VnetGateway) (result VnetGateway, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -25709,12 +26166,14 @@ func (client AppsClient) UpdateVnetConnectionGatewayResponder(resp *http.Respons } // UpdateVnetConnectionGatewaySlot adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of the Virtual Network. gatewayName is name of the gateway. Currently, the only supported string is -// "primary". connectionEnvelope is the properties to update this gateway with. slot is name of the deployment -// slot. If a slot is not specified, the API will add or update a gateway for the production slot's Virtual -// Network. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of the Virtual Network. +// gatewayName - name of the gateway. Currently, the only supported string is "primary". +// connectionEnvelope - the properties to update this gateway with. +// slot - name of the deployment slot. If a slot is not specified, the API will add or update a gateway for the +// production slot's Virtual Network. func (client AppsClient) UpdateVnetConnectionGatewaySlot(ctx context.Context, resourceGroupName string, name string, vnetName string, gatewayName string, connectionEnvelope VnetGateway, slot string) (result VnetGateway, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -25793,11 +26252,13 @@ func (client AppsClient) UpdateVnetConnectionGatewaySlotResponder(resp *http.Res // UpdateVnetConnectionSlot adds a Virtual Network connection to an app or slot (PUT) or updates the connection // properties (PATCH). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the app. vnetName -// is name of an existing Virtual Network. connectionEnvelope is properties of the Virtual Network connection. See -// example. slot is name of the deployment slot. If a slot is not specified, the API will add or update connections -// for the production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// vnetName - name of an existing Virtual Network. +// connectionEnvelope - properties of the Virtual Network connection. See example. +// slot - name of the deployment slot. If a slot is not specified, the API will add or update connections for +// the production slot. func (client AppsClient) UpdateVnetConnectionSlot(ctx context.Context, resourceGroupName string, name string, vnetName string, connectionEnvelope VnetInfo, slot string) (result VnetInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appservicecertificateorders.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appservicecertificateorders.go index 0b5bf9189be5..f78fcb530c1b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appservicecertificateorders.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appservicecertificateorders.go @@ -41,9 +41,10 @@ func NewAppServiceCertificateOrdersClientWithBaseURI(baseURI string, subscriptio } // CreateOrUpdate create or update a certificate purchase order. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. certificateDistinguishedName is distinguished name to to use for the certificate order. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. +// certificateDistinguishedName - distinguished name to to use for the certificate order. func (client AppServiceCertificateOrdersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, certificateOrderName string, certificateDistinguishedName AppServiceCertificateOrder) (result AppServiceCertificateOrdersCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -127,10 +128,11 @@ func (client AppServiceCertificateOrdersClient) CreateOrUpdateResponder(resp *ht } // CreateOrUpdateCertificate creates or updates a certificate and associates with key vault secret. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. name is name of the certificate. keyVaultCertificate is key vault certificate resource -// Id. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. +// name - name of the certificate. +// keyVaultCertificate - key vault certificate resource Id. func (client AppServiceCertificateOrdersClient) CreateOrUpdateCertificate(ctx context.Context, resourceGroupName string, certificateOrderName string, name string, keyVaultCertificate AppServiceCertificateResource) (result AppServiceCertificateOrdersCreateOrUpdateCertificateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -208,9 +210,9 @@ func (client AppServiceCertificateOrdersClient) CreateOrUpdateCertificateRespond } // Delete delete an existing certificate order. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. func (client AppServiceCertificateOrdersClient) Delete(ctx context.Context, resourceGroupName string, certificateOrderName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -282,9 +284,10 @@ func (client AppServiceCertificateOrdersClient) DeleteResponder(resp *http.Respo } // DeleteCertificate delete the certificate associated with a certificate order. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. name is name of the certificate. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. +// name - name of the certificate. func (client AppServiceCertificateOrdersClient) DeleteCertificate(ctx context.Context, resourceGroupName string, certificateOrderName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -357,9 +360,9 @@ func (client AppServiceCertificateOrdersClient) DeleteCertificateResponder(resp } // Get get a certificate order. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order.. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order.. func (client AppServiceCertificateOrdersClient) Get(ctx context.Context, resourceGroupName string, certificateOrderName string) (result AppServiceCertificateOrder, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -432,9 +435,10 @@ func (client AppServiceCertificateOrdersClient) GetResponder(resp *http.Response } // GetCertificate get the certificate associated with a certificate order. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. name is name of the certificate. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. +// name - name of the certificate. func (client AppServiceCertificateOrdersClient) GetCertificate(ctx context.Context, resourceGroupName string, certificateOrderName string, name string) (result AppServiceCertificateResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -598,8 +602,8 @@ func (client AppServiceCertificateOrdersClient) ListComplete(ctx context.Context } // ListByResourceGroup get certificate orders in a resource group. -// -// resourceGroupName is name of the resource group to which the resource belongs. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. func (client AppServiceCertificateOrdersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result AppServiceCertificateOrderCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -699,9 +703,9 @@ func (client AppServiceCertificateOrdersClient) ListByResourceGroupComplete(ctx } // ListCertificates list all certificates associated with a certificate order. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. func (client AppServiceCertificateOrdersClient) ListCertificates(ctx context.Context, resourceGroupName string, certificateOrderName string) (result AppServiceCertificateCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -802,9 +806,10 @@ func (client AppServiceCertificateOrdersClient) ListCertificatesComplete(ctx con } // Reissue reissue an existing certificate order. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. reissueCertificateOrderRequest is parameters for the reissue. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. +// reissueCertificateOrderRequest - parameters for the reissue. func (client AppServiceCertificateOrdersClient) Reissue(ctx context.Context, resourceGroupName string, certificateOrderName string, reissueCertificateOrderRequest ReissueCertificateOrderRequest) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -878,9 +883,10 @@ func (client AppServiceCertificateOrdersClient) ReissueResponder(resp *http.Resp } // Renew renew an existing certificate order. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. renewCertificateOrderRequest is renew parameters +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. +// renewCertificateOrderRequest - renew parameters func (client AppServiceCertificateOrdersClient) Renew(ctx context.Context, resourceGroupName string, certificateOrderName string, renewCertificateOrderRequest RenewCertificateOrderRequest) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -954,9 +960,9 @@ func (client AppServiceCertificateOrdersClient) RenewResponder(resp *http.Respon } // ResendEmail resend certificate email. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. func (client AppServiceCertificateOrdersClient) ResendEmail(ctx context.Context, resourceGroupName string, certificateOrderName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1028,9 +1034,10 @@ func (client AppServiceCertificateOrdersClient) ResendEmailResponder(resp *http. } // ResendRequestEmails verify domain ownership for this certificate order. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. nameIdentifier is email address +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. +// nameIdentifier - email address func (client AppServiceCertificateOrdersClient) ResendRequestEmails(ctx context.Context, resourceGroupName string, certificateOrderName string, nameIdentifier NameIdentifier) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1104,9 +1111,9 @@ func (client AppServiceCertificateOrdersClient) ResendRequestEmailsResponder(res } // RetrieveCertificateActions retrieve the list of certificate actions. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the certificate -// order. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the certificate order. func (client AppServiceCertificateOrdersClient) RetrieveCertificateActions(ctx context.Context, resourceGroupName string, name string) (result ListCertificateOrderAction, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1179,9 +1186,9 @@ func (client AppServiceCertificateOrdersClient) RetrieveCertificateActionsRespon } // RetrieveCertificateEmailHistory retrieve email history. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the certificate -// order. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the certificate order. func (client AppServiceCertificateOrdersClient) RetrieveCertificateEmailHistory(ctx context.Context, resourceGroupName string, name string) (result ListCertificateEmail, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1254,9 +1261,10 @@ func (client AppServiceCertificateOrdersClient) RetrieveCertificateEmailHistoryR } // RetrieveSiteSeal verify domain ownership for this certificate order. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. siteSealRequest is site seal request. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. +// siteSealRequest - site seal request. func (client AppServiceCertificateOrdersClient) RetrieveSiteSeal(ctx context.Context, resourceGroupName string, certificateOrderName string, siteSealRequest SiteSealRequest) (result SiteSeal, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1331,9 +1339,10 @@ func (client AppServiceCertificateOrdersClient) RetrieveSiteSealResponder(resp * } // Update create or update a certificate purchase order. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. certificateDistinguishedName is distinguished name to to use for the certificate order. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. +// certificateDistinguishedName - distinguished name to to use for the certificate order. func (client AppServiceCertificateOrdersClient) Update(ctx context.Context, resourceGroupName string, certificateOrderName string, certificateDistinguishedName AppServiceCertificateOrderPatchResource) (result AppServiceCertificateOrder, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1408,10 +1417,11 @@ func (client AppServiceCertificateOrdersClient) UpdateResponder(resp *http.Respo } // UpdateCertificate creates or updates a certificate and associates with key vault secret. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. name is name of the certificate. keyVaultCertificate is key vault certificate resource -// Id. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. +// name - name of the certificate. +// keyVaultCertificate - key vault certificate resource Id. func (client AppServiceCertificateOrdersClient) UpdateCertificate(ctx context.Context, resourceGroupName string, certificateOrderName string, name string, keyVaultCertificate AppServiceCertificatePatchResource) (result AppServiceCertificateResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1487,8 +1497,8 @@ func (client AppServiceCertificateOrdersClient) UpdateCertificateResponder(resp } // ValidatePurchaseInformation validate information for a certificate order. -// -// appServiceCertificateOrder is information for a certificate order. +// Parameters: +// appServiceCertificateOrder - information for a certificate order. func (client AppServiceCertificateOrdersClient) ValidatePurchaseInformation(ctx context.Context, appServiceCertificateOrder AppServiceCertificateOrder) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: appServiceCertificateOrder, @@ -1563,9 +1573,9 @@ func (client AppServiceCertificateOrdersClient) ValidatePurchaseInformationRespo } // VerifyDomainOwnership verify domain ownership for this certificate order. -// -// resourceGroupName is name of the resource group to which the resource belongs. certificateOrderName is name of -// the certificate order. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// certificateOrderName - name of the certificate order. func (client AppServiceCertificateOrdersClient) VerifyDomainOwnership(ctx context.Context, resourceGroupName string, certificateOrderName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceenvironments.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceenvironments.go index 18b0ea55e371..94aaabefff5d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceenvironments.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceenvironments.go @@ -41,9 +41,10 @@ func NewAppServiceEnvironmentsClientWithBaseURI(baseURI string, subscriptionID s } // CreateOrUpdate create or update an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. hostingEnvironmentEnvelope is configuration details of the App Service Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// hostingEnvironmentEnvelope - configuration details of the App Service Environment. func (client AppServiceEnvironmentsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, name string, hostingEnvironmentEnvelope AppServiceEnvironmentResource) (result AppServiceEnvironmentsCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -127,9 +128,10 @@ func (client AppServiceEnvironmentsClient) CreateOrUpdateResponder(resp *http.Re } // CreateOrUpdateMultiRolePool create or update a multi-role pool. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. multiRolePoolEnvelope is properties of the multi-role pool. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// multiRolePoolEnvelope - properties of the multi-role pool. func (client AppServiceEnvironmentsClient) CreateOrUpdateMultiRolePool(ctx context.Context, resourceGroupName string, name string, multiRolePoolEnvelope WorkerPoolResource) (result AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -206,9 +208,11 @@ func (client AppServiceEnvironmentsClient) CreateOrUpdateMultiRolePoolResponder( } // CreateOrUpdateWorkerPool create or update a worker pool. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. workerPoolName is name of the worker pool. workerPoolEnvelope is properties of the worker pool. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// workerPoolName - name of the worker pool. +// workerPoolEnvelope - properties of the worker pool. func (client AppServiceEnvironmentsClient) CreateOrUpdateWorkerPool(ctx context.Context, resourceGroupName string, name string, workerPoolName string, workerPoolEnvelope WorkerPoolResource) (result AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -286,10 +290,11 @@ func (client AppServiceEnvironmentsClient) CreateOrUpdateWorkerPoolResponder(res } // Delete delete an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. forceDelete is specify true to force the deletion even if the App Service Environment -// contains resources. The default is false. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// forceDelete - specify true to force the deletion even if the App Service Environment contains +// resources. The default is false. func (client AppServiceEnvironmentsClient) Delete(ctx context.Context, resourceGroupName string, name string, forceDelete *bool) (result AppServiceEnvironmentsDeleteFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -366,9 +371,9 @@ func (client AppServiceEnvironmentsClient) DeleteResponder(resp *http.Response) } // Get get the properties of an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) Get(ctx context.Context, resourceGroupName string, name string) (result AppServiceEnvironmentResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -441,9 +446,10 @@ func (client AppServiceEnvironmentsClient) GetResponder(resp *http.Response) (re } // GetDiagnosticsItem get a diagnostics item for an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. diagnosticsName is name of the diagnostics item. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// diagnosticsName - name of the diagnostics item. func (client AppServiceEnvironmentsClient) GetDiagnosticsItem(ctx context.Context, resourceGroupName string, name string, diagnosticsName string) (result HostingEnvironmentDiagnostics, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -517,9 +523,9 @@ func (client AppServiceEnvironmentsClient) GetDiagnosticsItemResponder(resp *htt } // GetMultiRolePool get properties of a multi-role pool. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) GetMultiRolePool(ctx context.Context, resourceGroupName string, name string) (result WorkerPoolResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -592,9 +598,10 @@ func (client AppServiceEnvironmentsClient) GetMultiRolePoolResponder(resp *http. } // GetWorkerPool get properties of a worker pool. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. workerPoolName is name of the worker pool. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// workerPoolName - name of the worker pool. func (client AppServiceEnvironmentsClient) GetWorkerPool(ctx context.Context, resourceGroupName string, name string, workerPoolName string) (result WorkerPoolResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -758,9 +765,9 @@ func (client AppServiceEnvironmentsClient) ListComplete(ctx context.Context) (re } // ListAppServicePlans get all App Service plans in an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) ListAppServicePlans(ctx context.Context, resourceGroupName string, name string) (result AppServicePlanCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -861,8 +868,8 @@ func (client AppServiceEnvironmentsClient) ListAppServicePlansComplete(ctx conte } // ListByResourceGroup get all App Service Environments in a resource group. -// -// resourceGroupName is name of the resource group to which the resource belongs. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. func (client AppServiceEnvironmentsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result AppServiceEnvironmentCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -962,9 +969,9 @@ func (client AppServiceEnvironmentsClient) ListByResourceGroupComplete(ctx conte } // ListCapacities get the used, available, and total worker capacity an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) ListCapacities(ctx context.Context, resourceGroupName string, name string) (result StampCapacityCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1065,9 +1072,9 @@ func (client AppServiceEnvironmentsClient) ListCapacitiesComplete(ctx context.Co } // ListDiagnostics get diagnostic information for an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) ListDiagnostics(ctx context.Context, resourceGroupName string, name string) (result ListHostingEnvironmentDiagnostics, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1140,9 +1147,9 @@ func (client AppServiceEnvironmentsClient) ListDiagnosticsResponder(resp *http.R } // ListMetricDefinitions get global metric definitions of an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) ListMetricDefinitions(ctx context.Context, resourceGroupName string, name string) (result MetricDefinition, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1215,12 +1222,13 @@ func (client AppServiceEnvironmentsClient) ListMetricDefinitionsResponder(resp * } // ListMetrics get global metrics of an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. details is specify true to include instance details. The default is -// false. filter is return only usages/metrics specified in the filter. Filter conforms to odata -// syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq -// '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// details - specify true to include instance details. The default is false. +// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: +// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and +// endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. func (client AppServiceEnvironmentsClient) ListMetrics(ctx context.Context, resourceGroupName string, name string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1327,9 +1335,9 @@ func (client AppServiceEnvironmentsClient) ListMetricsComplete(ctx context.Conte } // ListMultiRoleMetricDefinitions get metric definitions for a multi-role pool of an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitions(ctx context.Context, resourceGroupName string, name string) (result ResourceMetricDefinitionCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1430,13 +1438,16 @@ func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitionsComplet } // ListMultiRoleMetrics get metrics for a multi-role pool of an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. startTime is beginning time of the metrics query. endTime is end time of the metrics query. -// timeGrain is time granularity of the metrics query. details is specify true to include instance -// details. The default is false. filter is return only usages/metrics specified in the filter. Filter -// conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq -// '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// startTime - beginning time of the metrics query. +// endTime - end time of the metrics query. +// timeGrain - time granularity of the metrics query. +// details - specify true to include instance details. The default is false. +// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: +// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and +// endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. func (client AppServiceEnvironmentsClient) ListMultiRoleMetrics(ctx context.Context, resourceGroupName string, name string, startTime string, endTime string, timeGrain string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1553,9 +1564,10 @@ func (client AppServiceEnvironmentsClient) ListMultiRoleMetricsComplete(ctx cont // ListMultiRolePoolInstanceMetricDefinitions get metric definitions for a specific instance of a multi-role pool of an // App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. instance is name of the instance in the multi-role pool. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// instance - name of the instance in the multi-role pool. func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricDefinitions(ctx context.Context, resourceGroupName string, name string, instance string) (result ResourceMetricDefinitionCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1658,10 +1670,11 @@ func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricDefini // ListMultiRolePoolInstanceMetrics get metrics for a specific instance of a multi-role pool of an App Service // Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. instance is name of the instance in the multi-role pool. details is specify true to -// include instance details. The default is false. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// instance - name of the instance in the multi-role pool. +// details - specify true to include instance details. The default is false. func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetrics(ctx context.Context, resourceGroupName string, name string, instance string, details *bool) (result ResourceMetricCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1713,7 +1726,7 @@ func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricsPrepa preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}metrics", pathParameters), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}/metrics", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } @@ -1766,9 +1779,9 @@ func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricsCompl } // ListMultiRolePools get all multi-role pools. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) ListMultiRolePools(ctx context.Context, resourceGroupName string, name string) (result WorkerPoolCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1869,9 +1882,9 @@ func (client AppServiceEnvironmentsClient) ListMultiRolePoolsComplete(ctx contex } // ListMultiRolePoolSkus get available SKUs for scaling a multi-role pool. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) ListMultiRolePoolSkus(ctx context.Context, resourceGroupName string, name string) (result SkuInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1972,9 +1985,9 @@ func (client AppServiceEnvironmentsClient) ListMultiRolePoolSkusComplete(ctx con } // ListMultiRoleUsages get usage metrics for a multi-role pool of an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) ListMultiRoleUsages(ctx context.Context, resourceGroupName string, name string) (result UsageCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2075,9 +2088,9 @@ func (client AppServiceEnvironmentsClient) ListMultiRoleUsagesComplete(ctx conte } // ListOperations list all currently running operations on the App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) ListOperations(ctx context.Context, resourceGroupName string, name string) (result ListOperation, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2150,11 +2163,12 @@ func (client AppServiceEnvironmentsClient) ListOperationsResponder(resp *http.Re } // ListUsages get global usage metrics of an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. filter is return only usages/metrics specified in the filter. Filter conforms to odata syntax. -// Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' -// and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: +// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and +// endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. func (client AppServiceEnvironmentsClient) ListUsages(ctx context.Context, resourceGroupName string, name string, filter string) (result CsmUsageQuotaCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2258,9 +2272,9 @@ func (client AppServiceEnvironmentsClient) ListUsagesComplete(ctx context.Contex } // ListVips get IP addresses assigned to an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) ListVips(ctx context.Context, resourceGroupName string, name string) (result AddressResponse, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2333,9 +2347,10 @@ func (client AppServiceEnvironmentsClient) ListVipsResponder(resp *http.Response } // ListWebApps get all apps in an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. propertiesToInclude is comma separated list of app properties to include. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// propertiesToInclude - comma separated list of app properties to include. func (client AppServiceEnvironmentsClient) ListWebApps(ctx context.Context, resourceGroupName string, name string, propertiesToInclude string) (result AppCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2439,9 +2454,10 @@ func (client AppServiceEnvironmentsClient) ListWebAppsComplete(ctx context.Conte } // ListWebWorkerMetricDefinitions get metric definitions for a worker pool of an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. workerPoolName is name of the worker pool. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// workerPoolName - name of the worker pool. func (client AppServiceEnvironmentsClient) ListWebWorkerMetricDefinitions(ctx context.Context, resourceGroupName string, name string, workerPoolName string) (result ResourceMetricDefinitionCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2543,12 +2559,14 @@ func (client AppServiceEnvironmentsClient) ListWebWorkerMetricDefinitionsComplet } // ListWebWorkerMetrics get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. workerPoolName is name of worker pool details is specify true to include instance -// details. The default is false. filter is return only usages/metrics specified in the filter. Filter -// conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq -// '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// workerPoolName - name of worker pool +// details - specify true to include instance details. The default is false. +// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: +// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and +// endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. func (client AppServiceEnvironmentsClient) ListWebWorkerMetrics(ctx context.Context, resourceGroupName string, name string, workerPoolName string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2656,9 +2674,10 @@ func (client AppServiceEnvironmentsClient) ListWebWorkerMetricsComplete(ctx cont } // ListWebWorkerUsages get usage metrics for a worker pool of an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. workerPoolName is name of the worker pool. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// workerPoolName - name of the worker pool. func (client AppServiceEnvironmentsClient) ListWebWorkerUsages(ctx context.Context, resourceGroupName string, name string, workerPoolName string) (result UsageCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2761,9 +2780,11 @@ func (client AppServiceEnvironmentsClient) ListWebWorkerUsagesComplete(ctx conte // ListWorkerPoolInstanceMetricDefinitions get metric definitions for a specific instance of a worker pool of an App // Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. workerPoolName is name of the worker pool. instance is name of the instance in the worker pool. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// workerPoolName - name of the worker pool. +// instance - name of the instance in the worker pool. func (client AppServiceEnvironmentsClient) ListWorkerPoolInstanceMetricDefinitions(ctx context.Context, resourceGroupName string, name string, workerPoolName string, instance string) (result ResourceMetricDefinitionCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2866,13 +2887,15 @@ func (client AppServiceEnvironmentsClient) ListWorkerPoolInstanceMetricDefinitio } // ListWorkerPoolInstanceMetrics get metrics for a specific instance of a worker pool of an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. workerPoolName is name of the worker pool. instance is name of the instance in the worker pool. -// details is specify true to include instance details. The default is false. filter is -// return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: -// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime -// eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// workerPoolName - name of the worker pool. +// instance - name of the instance in the worker pool. +// details - specify true to include instance details. The default is false. +// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: +// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and +// endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. func (client AppServiceEnvironmentsClient) ListWorkerPoolInstanceMetrics(ctx context.Context, resourceGroupName string, name string, workerPoolName string, instance string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2928,7 +2951,7 @@ func (client AppServiceEnvironmentsClient) ListWorkerPoolInstanceMetricsPreparer preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/instances/{instance}metrics", pathParameters), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/instances/{instance}/metrics", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } @@ -2981,9 +3004,9 @@ func (client AppServiceEnvironmentsClient) ListWorkerPoolInstanceMetricsComplete } // ListWorkerPools get all worker pools of an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) ListWorkerPools(ctx context.Context, resourceGroupName string, name string) (result WorkerPoolCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3084,9 +3107,10 @@ func (client AppServiceEnvironmentsClient) ListWorkerPoolsComplete(ctx context.C } // ListWorkerPoolSkus get available SKUs for scaling a worker pool. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. workerPoolName is name of the worker pool. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// workerPoolName - name of the worker pool. func (client AppServiceEnvironmentsClient) ListWorkerPoolSkus(ctx context.Context, resourceGroupName string, name string, workerPoolName string) (result SkuInfoCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3188,9 +3212,9 @@ func (client AppServiceEnvironmentsClient) ListWorkerPoolSkusComplete(ctx contex } // Reboot reboot all machines in an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) Reboot(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3262,9 +3286,9 @@ func (client AppServiceEnvironmentsClient) RebootResponder(resp *http.Response) } // Resume resume an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) Resume(ctx context.Context, resourceGroupName string, name string) (result AppServiceEnvironmentsResumeFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3372,9 +3396,9 @@ func (client AppServiceEnvironmentsClient) ResumeComplete(ctx context.Context, r } // Suspend suspend an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. func (client AppServiceEnvironmentsClient) Suspend(ctx context.Context, resourceGroupName string, name string) (result AppServiceEnvironmentsSuspendFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3482,9 +3506,10 @@ func (client AppServiceEnvironmentsClient) SuspendComplete(ctx context.Context, } // Update create or update an App Service Environment. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. hostingEnvironmentEnvelope is configuration details of the App Service Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// hostingEnvironmentEnvelope - configuration details of the App Service Environment. func (client AppServiceEnvironmentsClient) Update(ctx context.Context, resourceGroupName string, name string, hostingEnvironmentEnvelope AppServiceEnvironmentPatchResource) (result AppServiceEnvironmentResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3559,9 +3584,10 @@ func (client AppServiceEnvironmentsClient) UpdateResponder(resp *http.Response) } // UpdateMultiRolePool create or update a multi-role pool. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. multiRolePoolEnvelope is properties of the multi-role pool. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// multiRolePoolEnvelope - properties of the multi-role pool. func (client AppServiceEnvironmentsClient) UpdateMultiRolePool(ctx context.Context, resourceGroupName string, name string, multiRolePoolEnvelope WorkerPoolResource) (result WorkerPoolResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -3636,9 +3662,11 @@ func (client AppServiceEnvironmentsClient) UpdateMultiRolePoolResponder(resp *ht } // UpdateWorkerPool create or update a worker pool. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// Environment. workerPoolName is name of the worker pool. workerPoolEnvelope is properties of the worker pool. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +// workerPoolName - name of the worker pool. +// workerPoolEnvelope - properties of the worker pool. func (client AppServiceEnvironmentsClient) UpdateWorkerPool(ctx context.Context, resourceGroupName string, name string, workerPoolName string, workerPoolEnvelope WorkerPoolResource) (result WorkerPoolResource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceplans.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceplans.go index 90381448fde8..626581873c2f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceplans.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceplans.go @@ -41,9 +41,10 @@ func NewAppServicePlansClientWithBaseURI(baseURI string, subscriptionID string) } // CreateOrUpdate creates or updates an App Service Plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. appServicePlan is details of the App Service plan. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// appServicePlan - details of the App Service plan. func (client AppServicePlansClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, name string, appServicePlan AppServicePlan) (result AppServicePlansCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -123,10 +124,12 @@ func (client AppServicePlansClient) CreateOrUpdateResponder(resp *http.Response) } // CreateOrUpdateVnetRoute create or update a Virtual Network route in an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. vnetName is name of the Virtual Network. routeName is name of the Virtual Network route. route is -// definition of the Virtual Network route. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// vnetName - name of the Virtual Network. +// routeName - name of the Virtual Network route. +// route - definition of the Virtual Network route. func (client AppServicePlansClient) CreateOrUpdateVnetRoute(ctx context.Context, resourceGroupName string, name string, vnetName string, routeName string, route VnetRoute) (result VnetRoute, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -203,9 +206,9 @@ func (client AppServicePlansClient) CreateOrUpdateVnetRouteResponder(resp *http. } // Delete delete an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. func (client AppServicePlansClient) Delete(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -277,9 +280,11 @@ func (client AppServicePlansClient) DeleteResponder(resp *http.Response) (result } // DeleteHybridConnection delete a Hybrid Connection in use in an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. namespaceName is name of the Service Bus namespace. relayName is name of the Service Bus relay. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// namespaceName - name of the Service Bus namespace. +// relayName - name of the Service Bus relay. func (client AppServicePlansClient) DeleteHybridConnection(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -353,9 +358,11 @@ func (client AppServicePlansClient) DeleteHybridConnectionResponder(resp *http.R } // DeleteVnetRoute delete a Virtual Network route in an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. vnetName is name of the Virtual Network. routeName is name of the Virtual Network route. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// vnetName - name of the Virtual Network. +// routeName - name of the Virtual Network route. func (client AppServicePlansClient) DeleteVnetRoute(ctx context.Context, resourceGroupName string, name string, vnetName string, routeName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -429,9 +436,9 @@ func (client AppServicePlansClient) DeleteVnetRouteResponder(resp *http.Response } // Get get an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. func (client AppServicePlansClient) Get(ctx context.Context, resourceGroupName string, name string) (result AppServicePlan, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -504,9 +511,11 @@ func (client AppServicePlansClient) GetResponder(resp *http.Response) (result Ap } // GetHybridConnection retrieve a Hybrid Connection in use in an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. namespaceName is name of the Service Bus namespace. relayName is name of the Service Bus relay. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// namespaceName - name of the Service Bus namespace. +// relayName - name of the Service Bus relay. func (client AppServicePlansClient) GetHybridConnection(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string) (result HybridConnection, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -581,9 +590,9 @@ func (client AppServicePlansClient) GetHybridConnectionResponder(resp *http.Resp } // GetHybridConnectionPlanLimit get the maximum number of Hybrid Connections allowed in an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. func (client AppServicePlansClient) GetHybridConnectionPlanLimit(ctx context.Context, resourceGroupName string, name string) (result HybridConnectionLimits, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -656,9 +665,11 @@ func (client AppServicePlansClient) GetHybridConnectionPlanLimitResponder(resp * } // GetRouteForVnet get a Virtual Network route in an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. vnetName is name of the Virtual Network. routeName is name of the Virtual Network route. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// vnetName - name of the Virtual Network. +// routeName - name of the Virtual Network route. func (client AppServicePlansClient) GetRouteForVnet(ctx context.Context, resourceGroupName string, name string, vnetName string, routeName string) (result ListVnetRoute, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -733,8 +744,9 @@ func (client AppServicePlansClient) GetRouteForVnetResponder(resp *http.Response } // GetServerFarmSkus gets all selectable sku's for a given App Service Plan -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of App Service Plan +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of App Service Plan func (client AppServicePlansClient) GetServerFarmSkus(ctx context.Context, resourceGroupName string, name string) (result SetObject, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -807,9 +819,10 @@ func (client AppServicePlansClient) GetServerFarmSkusResponder(resp *http.Respon } // GetVnetFromServerFarm get a Virtual Network associated with an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. vnetName is name of the Virtual Network. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// vnetName - name of the Virtual Network. func (client AppServicePlansClient) GetVnetFromServerFarm(ctx context.Context, resourceGroupName string, name string, vnetName string) (result VnetInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -883,10 +896,11 @@ func (client AppServicePlansClient) GetVnetFromServerFarmResponder(resp *http.Re } // GetVnetGateway get a Virtual Network gateway. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. vnetName is name of the Virtual Network. gatewayName is name of the gateway. Only the 'primary' gateway is -// supported. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// vnetName - name of the Virtual Network. +// gatewayName - name of the gateway. Only the 'primary' gateway is supported. func (client AppServicePlansClient) GetVnetGateway(ctx context.Context, resourceGroupName string, name string, vnetName string, gatewayName string) (result VnetGateway, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -961,8 +975,8 @@ func (client AppServicePlansClient) GetVnetGatewayResponder(resp *http.Response) } // List get all App Service plans for a subcription. -// -// detailed is specify true to return all App Service plan properties. The default is +// Parameters: +// detailed - specify true to return all App Service plan properties. The default is // false, which returns a subset of the properties. // Retrieval of all properties may increase the API latency. func (client AppServicePlansClient) List(ctx context.Context, detailed *bool) (result AppServicePlanCollectionPage, err error) { @@ -1058,8 +1072,8 @@ func (client AppServicePlansClient) ListComplete(ctx context.Context, detailed * } // ListByResourceGroup get all App Service plans in a resource group. -// -// resourceGroupName is name of the resource group to which the resource belongs. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. func (client AppServicePlansClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result AppServicePlanCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1159,9 +1173,9 @@ func (client AppServicePlansClient) ListByResourceGroupComplete(ctx context.Cont } // ListCapabilities list all capabilities of an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. func (client AppServicePlansClient) ListCapabilities(ctx context.Context, resourceGroupName string, name string) (result ListCapability, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1234,9 +1248,11 @@ func (client AppServicePlansClient) ListCapabilitiesResponder(resp *http.Respons } // ListHybridConnectionKeys get the send key name and value of a Hybrid Connection. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. namespaceName is the name of the Service Bus namespace. relayName is the name of the Service Bus relay. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// namespaceName - the name of the Service Bus namespace. +// relayName - the name of the Service Bus relay. func (client AppServicePlansClient) ListHybridConnectionKeys(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string) (result HybridConnectionKey, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1311,9 +1327,9 @@ func (client AppServicePlansClient) ListHybridConnectionKeysResponder(resp *http } // ListHybridConnections retrieve all Hybrid Connections in use in an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. func (client AppServicePlansClient) ListHybridConnections(ctx context.Context, resourceGroupName string, name string) (result HybridConnectionCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1414,9 +1430,9 @@ func (client AppServicePlansClient) ListHybridConnectionsComplete(ctx context.Co } // ListMetricDefintions get metrics that can be queried for an App Service plan, and their definitions. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. func (client AppServicePlansClient) ListMetricDefintions(ctx context.Context, resourceGroupName string, name string) (result ResourceMetricDefinitionCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1517,12 +1533,13 @@ func (client AppServicePlansClient) ListMetricDefintionsComplete(ctx context.Con } // ListMetrics get metrics for an App Serice plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. details is specify true to include instance details. The default is false. -// filter is return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: -// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime -// eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// details - specify true to include instance details. The default is false. +// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: +// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and +// endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. func (client AppServicePlansClient) ListMetrics(ctx context.Context, resourceGroupName string, name string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1629,9 +1646,10 @@ func (client AppServicePlansClient) ListMetricsComplete(ctx context.Context, res } // ListRoutesForVnet get all routes that are associated with a Virtual Network in an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. vnetName is name of the Virtual Network. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// vnetName - name of the Virtual Network. func (client AppServicePlansClient) ListRoutesForVnet(ctx context.Context, resourceGroupName string, name string, vnetName string) (result ListVnetRoute, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1705,9 +1723,10 @@ func (client AppServicePlansClient) ListRoutesForVnetResponder(resp *http.Respon } // ListUsages gets server farm usage information -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of App Service Plan -// filter is return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of App Service Plan +// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: // $filter=(name.value eq 'Metric1' or name.value eq 'Metric2'). func (client AppServicePlansClient) ListUsages(ctx context.Context, resourceGroupName string, name string, filter string) (result CsmUsageQuotaCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ @@ -1812,9 +1831,9 @@ func (client AppServicePlansClient) ListUsagesComplete(ctx context.Context, reso } // ListVnets get all Virtual Networks associated with an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. func (client AppServicePlansClient) ListVnets(ctx context.Context, resourceGroupName string, name string) (result ListVnetInfo, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1887,12 +1906,14 @@ func (client AppServicePlansClient) ListVnetsResponder(resp *http.Response) (res } // ListWebApps get all apps associated with an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. skipToken is skip to a web app in the list of webapps associated with app service plan. If specified, the +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// skipToken - skip to a web app in the list of webapps associated with app service plan. If specified, the // resulting list will contain web apps starting from (including) the skipToken. Otherwise, the resulting list -// contains web apps from the start of the list filter is supported filter: $filter=state eq running. Returns only -// web apps that are currently running top is list page size. If specified, results are paged. +// contains web apps from the start of the list +// filter - supported filter: $filter=state eq running. Returns only web apps that are currently running +// top - list page size. If specified, results are paged. func (client AppServicePlansClient) ListWebApps(ctx context.Context, resourceGroupName string, name string, skipToken string, filter string, top string) (result AppCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2002,10 +2023,11 @@ func (client AppServicePlansClient) ListWebAppsComplete(ctx context.Context, res } // ListWebAppsByHybridConnection get all apps that use a Hybrid Connection in an App Service Plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. namespaceName is name of the Hybrid Connection namespace. relayName is name of the Hybrid Connection -// relay. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// namespaceName - name of the Hybrid Connection namespace. +// relayName - name of the Hybrid Connection relay. func (client AppServicePlansClient) ListWebAppsByHybridConnection(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string) (result ResourceCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2108,9 +2130,10 @@ func (client AppServicePlansClient) ListWebAppsByHybridConnectionComplete(ctx co } // RebootWorker reboot a worker machine in an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. workerName is name of worker machine, which typically starts with RD. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// workerName - name of worker machine, which typically starts with RD. func (client AppServicePlansClient) RebootWorker(ctx context.Context, resourceGroupName string, name string, workerName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2183,10 +2206,11 @@ func (client AppServicePlansClient) RebootWorkerResponder(resp *http.Response) ( } // RestartWebApps restart all apps in an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. softRestart is specify true to performa a soft restart, applies the configuration settings -// and restarts the apps if necessary. The default is false, which always restarts and reprovisions +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// softRestart - specify true to performa a soft restart, applies the configuration settings and +// restarts the apps if necessary. The default is false, which always restarts and reprovisions // the apps func (client AppServicePlansClient) RestartWebApps(ctx context.Context, resourceGroupName string, name string, softRestart *bool) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ @@ -2262,9 +2286,10 @@ func (client AppServicePlansClient) RestartWebAppsResponder(resp *http.Response) } // Update creates or updates an App Service Plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. appServicePlan is details of the App Service plan. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// appServicePlan - details of the App Service plan. func (client AppServicePlansClient) Update(ctx context.Context, resourceGroupName string, name string, appServicePlan AppServicePlanPatchResource) (result AppServicePlan, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2339,10 +2364,12 @@ func (client AppServicePlansClient) UpdateResponder(resp *http.Response) (result } // UpdateVnetGateway update a Virtual Network gateway. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. vnetName is name of the Virtual Network. gatewayName is name of the gateway. Only the 'primary' gateway is -// supported. connectionEnvelope is definition of the gateway. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// vnetName - name of the Virtual Network. +// gatewayName - name of the gateway. Only the 'primary' gateway is supported. +// connectionEnvelope - definition of the gateway. func (client AppServicePlansClient) UpdateVnetGateway(ctx context.Context, resourceGroupName string, name string, vnetName string, gatewayName string, connectionEnvelope VnetGateway) (result VnetGateway, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -2422,10 +2449,12 @@ func (client AppServicePlansClient) UpdateVnetGatewayResponder(resp *http.Respon } // UpdateVnetRoute create or update a Virtual Network route in an App Service plan. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the App Service -// plan. vnetName is name of the Virtual Network. routeName is name of the Virtual Network route. route is -// definition of the Virtual Network route. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service plan. +// vnetName - name of the Virtual Network. +// routeName - name of the Virtual Network route. +// route - definition of the Virtual Network route. func (client AppServicePlansClient) UpdateVnetRoute(ctx context.Context, resourceGroupName string, name string, vnetName string, routeName string, route VnetRoute) (result VnetRoute, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/billingmeters.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/billingmeters.go new file mode 100644 index 000000000000..6faf85f87a6d --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/billingmeters.go @@ -0,0 +1,135 @@ +package web + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// BillingMetersClient is the webSite Management Client +type BillingMetersClient struct { + BaseClient +} + +// NewBillingMetersClient creates an instance of the BillingMetersClient client. +func NewBillingMetersClient(subscriptionID string) BillingMetersClient { + return NewBillingMetersClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewBillingMetersClientWithBaseURI creates an instance of the BillingMetersClient client. +func NewBillingMetersClientWithBaseURI(baseURI string, subscriptionID string) BillingMetersClient { + return BillingMetersClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// List gets a list of meters for a given location. +// Parameters: +// billingLocation - azure Location of billable resource +func (client BillingMetersClient) List(ctx context.Context, billingLocation string) (result BillingMeterCollectionPage, err error) { + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx, billingLocation) + if err != nil { + err = autorest.NewErrorWithError(err, "web.BillingMetersClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.bmc.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.BillingMetersClient", "List", resp, "Failure sending request") + return + } + + result.bmc, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.BillingMetersClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client BillingMetersClient) ListPreparer(ctx context.Context, billingLocation string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-03-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(billingLocation) > 0 { + queryParameters["billingLocation"] = autorest.Encode("query", billingLocation) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Web/billingMeters", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client BillingMetersClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client BillingMetersClient) ListResponder(resp *http.Response) (result BillingMeterCollection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client BillingMetersClient) listNextResults(lastResults BillingMeterCollection) (result BillingMeterCollection, err error) { + req, err := lastResults.billingMeterCollectionPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "web.BillingMetersClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "web.BillingMetersClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.BillingMetersClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client BillingMetersClient) ListComplete(ctx context.Context, billingLocation string) (result BillingMeterCollectionIterator, err error) { + result.page, err = client.List(ctx, billingLocation) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/certificates.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/certificates.go index ffbb268e5bce..b7e822898a84 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/certificates.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/certificates.go @@ -41,9 +41,10 @@ func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) Cer } // CreateOrUpdate create or update a certificate. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the certificate. -// certificateEnvelope is details of certificate, if it exists already. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the certificate. +// certificateEnvelope - details of certificate, if it exists already. func (client CertificatesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, name string, certificateEnvelope Certificate) (result Certificate, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -121,8 +122,9 @@ func (client CertificatesClient) CreateOrUpdateResponder(resp *http.Response) (r } // Delete delete a certificate. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the certificate. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the certificate. func (client CertificatesClient) Delete(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -194,8 +196,9 @@ func (client CertificatesClient) DeleteResponder(resp *http.Response) (result au } // Get get a certificate. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the certificate. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the certificate. func (client CertificatesClient) Get(ctx context.Context, resourceGroupName string, name string) (result Certificate, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -358,8 +361,8 @@ func (client CertificatesClient) ListComplete(ctx context.Context) (result Certi } // ListByResourceGroup get all certificates in a resource group. -// -// resourceGroupName is name of the resource group to which the resource belongs. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. func (client CertificatesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result CertificateCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -459,9 +462,10 @@ func (client CertificatesClient) ListByResourceGroupComplete(ctx context.Context } // Update create or update a certificate. -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of the certificate. -// certificateEnvelope is details of certificate, if it exists already. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the certificate. +// certificateEnvelope - details of certificate, if it exists already. func (client CertificatesClient) Update(ctx context.Context, resourceGroupName string, name string, certificateEnvelope CertificatePatchResource) (result Certificate, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/client.go index 5ffbc0ea8684..e8eb3b213a79 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/client.go @@ -55,8 +55,8 @@ func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { } // CheckNameAvailability check if a resource name is available. -// -// request is name availability request. +// Parameters: +// request - name availability request. func (client BaseClient) CheckNameAvailability(ctx context.Context, request ResourceNameAvailabilityRequest) (result ResourceNameAvailability, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: request, @@ -185,8 +185,8 @@ func (client BaseClient) GetPublishingUserResponder(resp *http.Response) (result } // GetSourceControl gets source control token -// -// sourceControlType is type of source control +// Parameters: +// sourceControlType - type of source control func (client BaseClient) GetSourceControl(ctx context.Context, sourceControlType string) (result SourceControl, err error) { req, err := client.GetSourceControlPreparer(ctx, sourceControlType) if err != nil { @@ -311,9 +311,10 @@ func (client BaseClient) GetSubscriptionDeploymentLocationsResponder(resp *http. } // ListGeoRegions get a list of available geographical regions. -// -// sku is name of SKU used to filter the regions. linuxWorkersEnabled is specify true if you want to -// filter to only regions that support Linux workers. +// Parameters: +// sku - name of SKU used to filter the regions. +// linuxWorkersEnabled - specify true if you want to filter to only regions that support Linux +// workers. func (client BaseClient) ListGeoRegions(ctx context.Context, sku SkuName, linuxWorkersEnabled *bool) (result GeoRegionCollectionPage, err error) { result.fn = client.listGeoRegionsNextResults req, err := client.ListGeoRegionsPreparer(ctx, sku, linuxWorkersEnabled) @@ -500,8 +501,8 @@ func (client BaseClient) ListPremierAddOnOffersComplete(ctx context.Context) (re } // ListSiteIdentifiersAssignedToHostName list all apps that are assigned to a hostname. -// -// nameIdentifier is hostname information. +// Parameters: +// nameIdentifier - hostname information. func (client BaseClient) ListSiteIdentifiersAssignedToHostName(ctx context.Context, nameIdentifier NameIdentifier) (result IdentifierCollectionPage, err error) { result.fn = client.listSiteIdentifiersAssignedToHostNameNextResults req, err := client.ListSiteIdentifiersAssignedToHostNamePreparer(ctx, nameIdentifier) @@ -742,9 +743,9 @@ func (client BaseClient) ListSourceControlsComplete(ctx context.Context) (result } // Move move resources between resource groups. -// -// resourceGroupName is name of the resource group to which the resource belongs. moveResourceEnvelope is object -// that represents the resource to move. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// moveResourceEnvelope - object that represents the resource to move. func (client BaseClient) Move(ctx context.Context, resourceGroupName string, moveResourceEnvelope CsmMoveResourceEnvelope) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -823,8 +824,8 @@ func (client BaseClient) MoveResponder(resp *http.Response) (result autorest.Res } // UpdatePublishingUser updates publishing user -// -// userDetails is details of publishing user +// Parameters: +// userDetails - details of publishing user func (client BaseClient) UpdatePublishingUser(ctx context.Context, userDetails User) (result User, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: userDetails, @@ -892,8 +893,9 @@ func (client BaseClient) UpdatePublishingUserResponder(resp *http.Response) (res } // UpdateSourceControl updates source control token -// -// sourceControlType is type of source control requestMessage is source control token information +// Parameters: +// sourceControlType - type of source control +// requestMessage - source control token information func (client BaseClient) UpdateSourceControl(ctx context.Context, sourceControlType string, requestMessage SourceControl) (result SourceControl, err error) { req, err := client.UpdateSourceControlPreparer(ctx, sourceControlType, requestMessage) if err != nil { @@ -958,9 +960,9 @@ func (client BaseClient) UpdateSourceControlResponder(resp *http.Response) (resu } // Validate validate if a resource can be created. -// -// resourceGroupName is name of the resource group to which the resource belongs. validateRequest is request with -// the resources to validate. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// validateRequest - request with the resources to validate. func (client BaseClient) Validate(ctx context.Context, resourceGroupName string, validateRequest ValidateRequest) (result ValidateResponse, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1041,9 +1043,9 @@ func (client BaseClient) ValidateResponder(resp *http.Response) (result Validate } // ValidateMove validate whether a resource can be moved. -// -// resourceGroupName is name of the resource group to which the resource belongs. moveResourceEnvelope is object -// that represents the resource to move. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// moveResourceEnvelope - object that represents the resource to move. func (client BaseClient) ValidateMove(ctx context.Context, resourceGroupName string, moveResourceEnvelope CsmMoveResourceEnvelope) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1123,8 +1125,8 @@ func (client BaseClient) ValidateMoveResponder(resp *http.Response) (result auto // VerifyHostingEnvironmentVnet verifies if this VNET is compatible with an App Service Environment by analyzing the // Network Security Group rules. -// -// parameters is VNET information +// Parameters: +// parameters - VNET information func (client BaseClient) VerifyHostingEnvironmentVnet(ctx context.Context, parameters VnetParameters) (result VnetValidationFailureDetails, err error) { req, err := client.VerifyHostingEnvironmentVnetPreparer(ctx, parameters) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/diagnostics.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/diagnostics.go index a51eb02051b6..96f3869dd7f6 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/diagnostics.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/diagnostics.go @@ -42,10 +42,14 @@ func NewDiagnosticsClientWithBaseURI(baseURI string, subscriptionID string) Diag } // ExecuteSiteAnalysis execute Analysis -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// diagnosticCategory is category Name analysisName is analysis Resource Name startTime is start Time endTime is -// end Time timeGrain is time Grain +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// diagnosticCategory - category Name +// analysisName - analysis Resource Name +// startTime - start Time +// endTime - end Time +// timeGrain - time Grain func (client DiagnosticsClient) ExecuteSiteAnalysis(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, analysisName string, startTime *date.Time, endTime *date.Time, timeGrain string) (result DiagnosticAnalysis, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -131,10 +135,15 @@ func (client DiagnosticsClient) ExecuteSiteAnalysisResponder(resp *http.Response } // ExecuteSiteAnalysisSlot execute Analysis -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// diagnosticCategory is category Name analysisName is analysis Resource Name slot is slot Name startTime is start -// Time endTime is end Time timeGrain is time Grain +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// diagnosticCategory - category Name +// analysisName - analysis Resource Name +// slot - slot Name +// startTime - start Time +// endTime - end Time +// timeGrain - time Grain func (client DiagnosticsClient) ExecuteSiteAnalysisSlot(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, analysisName string, slot string, startTime *date.Time, endTime *date.Time, timeGrain string) (result DiagnosticAnalysis, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -221,10 +230,14 @@ func (client DiagnosticsClient) ExecuteSiteAnalysisSlotResponder(resp *http.Resp } // ExecuteSiteDetector execute Detector -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// detectorName is detector Resource Name diagnosticCategory is category Name startTime is start Time endTime is -// end Time timeGrain is time Grain +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// detectorName - detector Resource Name +// diagnosticCategory - category Name +// startTime - start Time +// endTime - end Time +// timeGrain - time Grain func (client DiagnosticsClient) ExecuteSiteDetector(ctx context.Context, resourceGroupName string, siteName string, detectorName string, diagnosticCategory string, startTime *date.Time, endTime *date.Time, timeGrain string) (result DiagnosticDetectorResponse, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -310,10 +323,15 @@ func (client DiagnosticsClient) ExecuteSiteDetectorResponder(resp *http.Response } // ExecuteSiteDetectorSlot execute Detector -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// detectorName is detector Resource Name diagnosticCategory is category Name slot is slot Name startTime is start -// Time endTime is end Time timeGrain is time Grain +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// detectorName - detector Resource Name +// diagnosticCategory - category Name +// slot - slot Name +// startTime - start Time +// endTime - end Time +// timeGrain - time Grain func (client DiagnosticsClient) ExecuteSiteDetectorSlot(ctx context.Context, resourceGroupName string, siteName string, detectorName string, diagnosticCategory string, slot string, startTime *date.Time, endTime *date.Time, timeGrain string) (result DiagnosticDetectorResponse, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -399,10 +417,103 @@ func (client DiagnosticsClient) ExecuteSiteDetectorSlotResponder(resp *http.Resp return } +// GetHostingEnvironmentDetectorResponse get Hosting Environment Detector Response +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - app Service Environment Name +// detectorName - detector Resource Name +// startTime - start Time +// endTime - end Time +// timeGrain - time Grain +func (client DiagnosticsClient) GetHostingEnvironmentDetectorResponse(ctx context.Context, resourceGroupName string, name string, detectorName string, startTime *date.Time, endTime *date.Time, timeGrain string) (result DetectorResponse, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}, + {TargetValue: timeGrain, + Constraints: []validation.Constraint{{Target: "timeGrain", Name: validation.Pattern, Rule: `PT[1-9][0-9]+[SMH]`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.DiagnosticsClient", "GetHostingEnvironmentDetectorResponse", err.Error()) + } + + req, err := client.GetHostingEnvironmentDetectorResponsePreparer(ctx, resourceGroupName, name, detectorName, startTime, endTime, timeGrain) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetHostingEnvironmentDetectorResponse", nil, "Failure preparing request") + return + } + + resp, err := client.GetHostingEnvironmentDetectorResponseSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetHostingEnvironmentDetectorResponse", resp, "Failure sending request") + return + } + + result, err = client.GetHostingEnvironmentDetectorResponseResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetHostingEnvironmentDetectorResponse", resp, "Failure responding to request") + } + + return +} + +// GetHostingEnvironmentDetectorResponsePreparer prepares the GetHostingEnvironmentDetectorResponse request. +func (client DiagnosticsClient) GetHostingEnvironmentDetectorResponsePreparer(ctx context.Context, resourceGroupName string, name string, detectorName string, startTime *date.Time, endTime *date.Time, timeGrain string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "detectorName": autorest.Encode("path", detectorName), + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-03-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if startTime != nil { + queryParameters["startTime"] = autorest.Encode("query", *startTime) + } + if endTime != nil { + queryParameters["endTime"] = autorest.Encode("query", *endTime) + } + if len(timeGrain) > 0 { + queryParameters["timeGrain"] = autorest.Encode("query", timeGrain) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/detectors/{detectorName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetHostingEnvironmentDetectorResponseSender sends the GetHostingEnvironmentDetectorResponse request. The method will close the +// http.Response Body if it receives an error. +func (client DiagnosticsClient) GetHostingEnvironmentDetectorResponseSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetHostingEnvironmentDetectorResponseResponder handles the response to the GetHostingEnvironmentDetectorResponse request. The method always +// closes the http.Response Body. +func (client DiagnosticsClient) GetHostingEnvironmentDetectorResponseResponder(resp *http.Response) (result DetectorResponse, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + // GetSiteAnalysis get Site Analysis -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// diagnosticCategory is diagnostic Category analysisName is analysis Name +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// diagnosticCategory - diagnostic Category +// analysisName - analysis Name func (client DiagnosticsClient) GetSiteAnalysis(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, analysisName string) (result DiagnosticAnalysis, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -477,9 +588,12 @@ func (client DiagnosticsClient) GetSiteAnalysisResponder(resp *http.Response) (r } // GetSiteAnalysisSlot get Site Analysis -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// diagnosticCategory is diagnostic Category analysisName is analysis Name slot is slot - optional +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// diagnosticCategory - diagnostic Category +// analysisName - analysis Name +// slot - slot - optional func (client DiagnosticsClient) GetSiteAnalysisSlot(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, analysisName string, slot string) (result DiagnosticAnalysis, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -555,9 +669,11 @@ func (client DiagnosticsClient) GetSiteAnalysisSlotResponder(resp *http.Response } // GetSiteDetector get Detector -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// diagnosticCategory is diagnostic Category detectorName is detector Name +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// diagnosticCategory - diagnostic Category +// detectorName - detector Name func (client DiagnosticsClient) GetSiteDetector(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, detectorName string) (result DiagnosticDetectorCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -659,10 +775,197 @@ func (client DiagnosticsClient) GetSiteDetectorComplete(ctx context.Context, res return } +// GetSiteDetectorResponse get site detector response +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// detectorName - detector Resource Name +// startTime - start Time +// endTime - end Time +// timeGrain - time Grain +func (client DiagnosticsClient) GetSiteDetectorResponse(ctx context.Context, resourceGroupName string, siteName string, detectorName string, startTime *date.Time, endTime *date.Time, timeGrain string) (result DetectorResponse, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}, + {TargetValue: timeGrain, + Constraints: []validation.Constraint{{Target: "timeGrain", Name: validation.Pattern, Rule: `PT[1-9][0-9]+[SMH]`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.DiagnosticsClient", "GetSiteDetectorResponse", err.Error()) + } + + req, err := client.GetSiteDetectorResponsePreparer(ctx, resourceGroupName, siteName, detectorName, startTime, endTime, timeGrain) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetSiteDetectorResponse", nil, "Failure preparing request") + return + } + + resp, err := client.GetSiteDetectorResponseSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetSiteDetectorResponse", resp, "Failure sending request") + return + } + + result, err = client.GetSiteDetectorResponseResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetSiteDetectorResponse", resp, "Failure responding to request") + } + + return +} + +// GetSiteDetectorResponsePreparer prepares the GetSiteDetectorResponse request. +func (client DiagnosticsClient) GetSiteDetectorResponsePreparer(ctx context.Context, resourceGroupName string, siteName string, detectorName string, startTime *date.Time, endTime *date.Time, timeGrain string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "detectorName": autorest.Encode("path", detectorName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "siteName": autorest.Encode("path", siteName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-03-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if startTime != nil { + queryParameters["startTime"] = autorest.Encode("query", *startTime) + } + if endTime != nil { + queryParameters["endTime"] = autorest.Encode("query", *endTime) + } + if len(timeGrain) > 0 { + queryParameters["timeGrain"] = autorest.Encode("query", timeGrain) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/detectors/{detectorName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSiteDetectorResponseSender sends the GetSiteDetectorResponse request. The method will close the +// http.Response Body if it receives an error. +func (client DiagnosticsClient) GetSiteDetectorResponseSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetSiteDetectorResponseResponder handles the response to the GetSiteDetectorResponse request. The method always +// closes the http.Response Body. +func (client DiagnosticsClient) GetSiteDetectorResponseResponder(resp *http.Response) (result DetectorResponse, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetSiteDetectorResponseSlot get site detector response +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// detectorName - detector Resource Name +// slot - slot Name +// startTime - start Time +// endTime - end Time +// timeGrain - time Grain +func (client DiagnosticsClient) GetSiteDetectorResponseSlot(ctx context.Context, resourceGroupName string, siteName string, detectorName string, slot string, startTime *date.Time, endTime *date.Time, timeGrain string) (result DetectorResponse, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}, + {TargetValue: timeGrain, + Constraints: []validation.Constraint{{Target: "timeGrain", Name: validation.Pattern, Rule: `PT[1-9][0-9]+[SMH]`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.DiagnosticsClient", "GetSiteDetectorResponseSlot", err.Error()) + } + + req, err := client.GetSiteDetectorResponseSlotPreparer(ctx, resourceGroupName, siteName, detectorName, slot, startTime, endTime, timeGrain) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetSiteDetectorResponseSlot", nil, "Failure preparing request") + return + } + + resp, err := client.GetSiteDetectorResponseSlotSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetSiteDetectorResponseSlot", resp, "Failure sending request") + return + } + + result, err = client.GetSiteDetectorResponseSlotResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetSiteDetectorResponseSlot", resp, "Failure responding to request") + } + + return +} + +// GetSiteDetectorResponseSlotPreparer prepares the GetSiteDetectorResponseSlot request. +func (client DiagnosticsClient) GetSiteDetectorResponseSlotPreparer(ctx context.Context, resourceGroupName string, siteName string, detectorName string, slot string, startTime *date.Time, endTime *date.Time, timeGrain string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "detectorName": autorest.Encode("path", detectorName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "siteName": autorest.Encode("path", siteName), + "slot": autorest.Encode("path", slot), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-03-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if startTime != nil { + queryParameters["startTime"] = autorest.Encode("query", *startTime) + } + if endTime != nil { + queryParameters["endTime"] = autorest.Encode("query", *endTime) + } + if len(timeGrain) > 0 { + queryParameters["timeGrain"] = autorest.Encode("query", timeGrain) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slot}/detectors/{detectorName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSiteDetectorResponseSlotSender sends the GetSiteDetectorResponseSlot request. The method will close the +// http.Response Body if it receives an error. +func (client DiagnosticsClient) GetSiteDetectorResponseSlotSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetSiteDetectorResponseSlotResponder handles the response to the GetSiteDetectorResponseSlot request. The method always +// closes the http.Response Body. +func (client DiagnosticsClient) GetSiteDetectorResponseSlotResponder(resp *http.Response) (result DetectorResponse, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + // GetSiteDetectorSlot get Detector -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// diagnosticCategory is diagnostic Category detectorName is detector Name slot is slot Name +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// diagnosticCategory - diagnostic Category +// detectorName - detector Name +// slot - slot Name func (client DiagnosticsClient) GetSiteDetectorSlot(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, detectorName string, slot string) (result DiagnosticDetectorCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -766,9 +1069,10 @@ func (client DiagnosticsClient) GetSiteDetectorSlotComplete(ctx context.Context, } // GetSiteDiagnosticCategory get Diagnostics Category -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// diagnosticCategory is diagnostic Category +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// diagnosticCategory - diagnostic Category func (client DiagnosticsClient) GetSiteDiagnosticCategory(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string) (result DiagnosticCategory, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -842,9 +1146,11 @@ func (client DiagnosticsClient) GetSiteDiagnosticCategoryResponder(resp *http.Re } // GetSiteDiagnosticCategorySlot get Diagnostics Category -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// diagnosticCategory is diagnostic Category slot is slot Name +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// diagnosticCategory - diagnostic Category +// slot - slot Name func (client DiagnosticsClient) GetSiteDiagnosticCategorySlot(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, slot string) (result DiagnosticCategory, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -918,10 +1224,114 @@ func (client DiagnosticsClient) GetSiteDiagnosticCategorySlotResponder(resp *htt return } +// ListHostingEnvironmentDetectorResponses list Hosting Environment Detector Responses +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - site Name +func (client DiagnosticsClient) ListHostingEnvironmentDetectorResponses(ctx context.Context, resourceGroupName string, name string) (result DetectorResponseCollectionPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.DiagnosticsClient", "ListHostingEnvironmentDetectorResponses", err.Error()) + } + + result.fn = client.listHostingEnvironmentDetectorResponsesNextResults + req, err := client.ListHostingEnvironmentDetectorResponsesPreparer(ctx, resourceGroupName, name) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "ListHostingEnvironmentDetectorResponses", nil, "Failure preparing request") + return + } + + resp, err := client.ListHostingEnvironmentDetectorResponsesSender(req) + if err != nil { + result.drc.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "ListHostingEnvironmentDetectorResponses", resp, "Failure sending request") + return + } + + result.drc, err = client.ListHostingEnvironmentDetectorResponsesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "ListHostingEnvironmentDetectorResponses", resp, "Failure responding to request") + } + + return +} + +// ListHostingEnvironmentDetectorResponsesPreparer prepares the ListHostingEnvironmentDetectorResponses request. +func (client DiagnosticsClient) ListHostingEnvironmentDetectorResponsesPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-03-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/detectors", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListHostingEnvironmentDetectorResponsesSender sends the ListHostingEnvironmentDetectorResponses request. The method will close the +// http.Response Body if it receives an error. +func (client DiagnosticsClient) ListHostingEnvironmentDetectorResponsesSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListHostingEnvironmentDetectorResponsesResponder handles the response to the ListHostingEnvironmentDetectorResponses request. The method always +// closes the http.Response Body. +func (client DiagnosticsClient) ListHostingEnvironmentDetectorResponsesResponder(resp *http.Response) (result DetectorResponseCollection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listHostingEnvironmentDetectorResponsesNextResults retrieves the next set of results, if any. +func (client DiagnosticsClient) listHostingEnvironmentDetectorResponsesNextResults(lastResults DetectorResponseCollection) (result DetectorResponseCollection, err error) { + req, err := lastResults.detectorResponseCollectionPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "web.DiagnosticsClient", "listHostingEnvironmentDetectorResponsesNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListHostingEnvironmentDetectorResponsesSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "web.DiagnosticsClient", "listHostingEnvironmentDetectorResponsesNextResults", resp, "Failure sending next results request") + } + result, err = client.ListHostingEnvironmentDetectorResponsesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "listHostingEnvironmentDetectorResponsesNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListHostingEnvironmentDetectorResponsesComplete enumerates all values, automatically crossing page boundaries as required. +func (client DiagnosticsClient) ListHostingEnvironmentDetectorResponsesComplete(ctx context.Context, resourceGroupName string, name string) (result DetectorResponseCollectionIterator, err error) { + result.page, err = client.ListHostingEnvironmentDetectorResponses(ctx, resourceGroupName, name) + return +} + // ListSiteAnalyses get Site Analyses -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// diagnosticCategory is diagnostic Category +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// diagnosticCategory - diagnostic Category func (client DiagnosticsClient) ListSiteAnalyses(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string) (result DiagnosticAnalysisCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1023,9 +1433,11 @@ func (client DiagnosticsClient) ListSiteAnalysesComplete(ctx context.Context, re } // ListSiteAnalysesSlot get Site Analyses -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// diagnosticCategory is diagnostic Category slot is slot Name +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// diagnosticCategory - diagnostic Category +// slot - slot Name func (client DiagnosticsClient) ListSiteAnalysesSlot(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, slot string) (result DiagnosticAnalysisCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1127,10 +1539,219 @@ func (client DiagnosticsClient) ListSiteAnalysesSlotComplete(ctx context.Context return } +// ListSiteDetectorResponses list Site Detector Responses +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +func (client DiagnosticsClient) ListSiteDetectorResponses(ctx context.Context, resourceGroupName string, siteName string) (result DetectorResponseCollectionPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.DiagnosticsClient", "ListSiteDetectorResponses", err.Error()) + } + + result.fn = client.listSiteDetectorResponsesNextResults + req, err := client.ListSiteDetectorResponsesPreparer(ctx, resourceGroupName, siteName) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "ListSiteDetectorResponses", nil, "Failure preparing request") + return + } + + resp, err := client.ListSiteDetectorResponsesSender(req) + if err != nil { + result.drc.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "ListSiteDetectorResponses", resp, "Failure sending request") + return + } + + result.drc, err = client.ListSiteDetectorResponsesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "ListSiteDetectorResponses", resp, "Failure responding to request") + } + + return +} + +// ListSiteDetectorResponsesPreparer prepares the ListSiteDetectorResponses request. +func (client DiagnosticsClient) ListSiteDetectorResponsesPreparer(ctx context.Context, resourceGroupName string, siteName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "siteName": autorest.Encode("path", siteName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-03-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/detectors", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSiteDetectorResponsesSender sends the ListSiteDetectorResponses request. The method will close the +// http.Response Body if it receives an error. +func (client DiagnosticsClient) ListSiteDetectorResponsesSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListSiteDetectorResponsesResponder handles the response to the ListSiteDetectorResponses request. The method always +// closes the http.Response Body. +func (client DiagnosticsClient) ListSiteDetectorResponsesResponder(resp *http.Response) (result DetectorResponseCollection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listSiteDetectorResponsesNextResults retrieves the next set of results, if any. +func (client DiagnosticsClient) listSiteDetectorResponsesNextResults(lastResults DetectorResponseCollection) (result DetectorResponseCollection, err error) { + req, err := lastResults.detectorResponseCollectionPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "web.DiagnosticsClient", "listSiteDetectorResponsesNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSiteDetectorResponsesSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "web.DiagnosticsClient", "listSiteDetectorResponsesNextResults", resp, "Failure sending next results request") + } + result, err = client.ListSiteDetectorResponsesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "listSiteDetectorResponsesNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListSiteDetectorResponsesComplete enumerates all values, automatically crossing page boundaries as required. +func (client DiagnosticsClient) ListSiteDetectorResponsesComplete(ctx context.Context, resourceGroupName string, siteName string) (result DetectorResponseCollectionIterator, err error) { + result.page, err = client.ListSiteDetectorResponses(ctx, resourceGroupName, siteName) + return +} + +// ListSiteDetectorResponsesSlot list Site Detector Responses +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// slot - slot Name +func (client DiagnosticsClient) ListSiteDetectorResponsesSlot(ctx context.Context, resourceGroupName string, siteName string, slot string) (result DetectorResponseCollectionPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.DiagnosticsClient", "ListSiteDetectorResponsesSlot", err.Error()) + } + + result.fn = client.listSiteDetectorResponsesSlotNextResults + req, err := client.ListSiteDetectorResponsesSlotPreparer(ctx, resourceGroupName, siteName, slot) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "ListSiteDetectorResponsesSlot", nil, "Failure preparing request") + return + } + + resp, err := client.ListSiteDetectorResponsesSlotSender(req) + if err != nil { + result.drc.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "ListSiteDetectorResponsesSlot", resp, "Failure sending request") + return + } + + result.drc, err = client.ListSiteDetectorResponsesSlotResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "ListSiteDetectorResponsesSlot", resp, "Failure responding to request") + } + + return +} + +// ListSiteDetectorResponsesSlotPreparer prepares the ListSiteDetectorResponsesSlot request. +func (client DiagnosticsClient) ListSiteDetectorResponsesSlotPreparer(ctx context.Context, resourceGroupName string, siteName string, slot string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "siteName": autorest.Encode("path", siteName), + "slot": autorest.Encode("path", slot), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-03-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slot}/detectors", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSiteDetectorResponsesSlotSender sends the ListSiteDetectorResponsesSlot request. The method will close the +// http.Response Body if it receives an error. +func (client DiagnosticsClient) ListSiteDetectorResponsesSlotSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListSiteDetectorResponsesSlotResponder handles the response to the ListSiteDetectorResponsesSlot request. The method always +// closes the http.Response Body. +func (client DiagnosticsClient) ListSiteDetectorResponsesSlotResponder(resp *http.Response) (result DetectorResponseCollection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listSiteDetectorResponsesSlotNextResults retrieves the next set of results, if any. +func (client DiagnosticsClient) listSiteDetectorResponsesSlotNextResults(lastResults DetectorResponseCollection) (result DetectorResponseCollection, err error) { + req, err := lastResults.detectorResponseCollectionPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "web.DiagnosticsClient", "listSiteDetectorResponsesSlotNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSiteDetectorResponsesSlotSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "web.DiagnosticsClient", "listSiteDetectorResponsesSlotNextResults", resp, "Failure sending next results request") + } + result, err = client.ListSiteDetectorResponsesSlotResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "listSiteDetectorResponsesSlotNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListSiteDetectorResponsesSlotComplete enumerates all values, automatically crossing page boundaries as required. +func (client DiagnosticsClient) ListSiteDetectorResponsesSlotComplete(ctx context.Context, resourceGroupName string, siteName string, slot string) (result DetectorResponseCollectionIterator, err error) { + result.page, err = client.ListSiteDetectorResponsesSlot(ctx, resourceGroupName, siteName, slot) + return +} + // ListSiteDetectors get Detectors -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// diagnosticCategory is diagnostic Category +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// diagnosticCategory - diagnostic Category func (client DiagnosticsClient) ListSiteDetectors(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string) (result DiagnosticDetectorCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1232,9 +1853,11 @@ func (client DiagnosticsClient) ListSiteDetectorsComplete(ctx context.Context, r } // ListSiteDetectorsSlot get Detectors -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name -// diagnosticCategory is diagnostic Category slot is slot Name +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// diagnosticCategory - diagnostic Category +// slot - slot Name func (client DiagnosticsClient) ListSiteDetectorsSlot(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, slot string) (result DiagnosticDetectorCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1337,8 +1960,9 @@ func (client DiagnosticsClient) ListSiteDetectorsSlotComplete(ctx context.Contex } // ListSiteDiagnosticCategories get Diagnostics Categories -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name func (client DiagnosticsClient) ListSiteDiagnosticCategories(ctx context.Context, resourceGroupName string, siteName string) (result DiagnosticCategoryCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1439,9 +2063,10 @@ func (client DiagnosticsClient) ListSiteDiagnosticCategoriesComplete(ctx context } // ListSiteDiagnosticCategoriesSlot get Diagnostics Categories -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site Name slot is -// slot Name +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site Name +// slot - slot Name func (client DiagnosticsClient) ListSiteDiagnosticCategoriesSlot(ctx context.Context, resourceGroupName string, siteName string, slot string) (result DiagnosticCategoryCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/domains.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/domains.go index 1948f6711a7a..6ddd2a46f378 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/domains.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/domains.go @@ -41,8 +41,8 @@ func NewDomainsClientWithBaseURI(baseURI string, subscriptionID string) DomainsC } // CheckAvailability check if a domain is available for registration. -// -// identifier is name of the domain. +// Parameters: +// identifier - name of the domain. func (client DomainsClient) CheckAvailability(ctx context.Context, identifier NameIdentifier) (result DomainAvailablilityCheckResult, err error) { req, err := client.CheckAvailabilityPreparer(ctx, identifier) if err != nil { @@ -107,9 +107,10 @@ func (client DomainsClient) CheckAvailabilityResponder(resp *http.Response) (res } // CreateOrUpdate creates or updates a domain. -// -// resourceGroupName is name of the resource group to which the resource belongs. domainName is name of the domain. -// domain is domain registration information. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// domainName - name of the domain. +// domain - domain registration information. func (client DomainsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, domainName string, domain Domain) (result DomainsCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -245,10 +246,11 @@ func (client DomainsClient) CreateOrUpdateResponder(resp *http.Response) (result // CreateOrUpdateOwnershipIdentifier creates an ownership identifier for a domain or updates identifier details for an // existing identifer -// -// resourceGroupName is name of the resource group to which the resource belongs. domainName is name of domain. -// name is name of identifier. domainOwnershipIdentifier is a JSON representation of the domain ownership -// properties. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// domainName - name of domain. +// name - name of identifier. +// domainOwnershipIdentifier - a JSON representation of the domain ownership properties. func (client DomainsClient) CreateOrUpdateOwnershipIdentifier(ctx context.Context, resourceGroupName string, domainName string, name string, domainOwnershipIdentifier DomainOwnershipIdentifier) (result DomainOwnershipIdentifier, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -324,9 +326,10 @@ func (client DomainsClient) CreateOrUpdateOwnershipIdentifierResponder(resp *htt } // Delete delete a domain. -// -// resourceGroupName is name of the resource group to which the resource belongs. domainName is name of the domain. -// forceHardDeleteDomain is specify true to delete the domain immediately. The default is +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// domainName - name of the domain. +// forceHardDeleteDomain - specify true to delete the domain immediately. The default is // false which deletes the domain after 24 hours. func (client DomainsClient) Delete(ctx context.Context, resourceGroupName string, domainName string, forceHardDeleteDomain *bool) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ @@ -402,9 +405,10 @@ func (client DomainsClient) DeleteResponder(resp *http.Response) (result autores } // DeleteOwnershipIdentifier delete ownership identifier for domain -// -// resourceGroupName is name of the resource group to which the resource belongs. domainName is name of domain. -// name is name of identifier. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// domainName - name of domain. +// name - name of identifier. func (client DomainsClient) DeleteOwnershipIdentifier(ctx context.Context, resourceGroupName string, domainName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -477,8 +481,9 @@ func (client DomainsClient) DeleteOwnershipIdentifierResponder(resp *http.Respon } // Get get a domain. -// -// resourceGroupName is name of the resource group to which the resource belongs. domainName is name of the domain. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// domainName - name of the domain. func (client DomainsClient) Get(ctx context.Context, resourceGroupName string, domainName string) (result Domain, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -613,9 +618,10 @@ func (client DomainsClient) GetControlCenterSsoRequestResponder(resp *http.Respo } // GetOwnershipIdentifier get ownership identifier for domain -// -// resourceGroupName is name of the resource group to which the resource belongs. domainName is name of domain. -// name is name of identifier. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// domainName - name of domain. +// name - name of identifier. func (client DomainsClient) GetOwnershipIdentifier(ctx context.Context, resourceGroupName string, domainName string, name string) (result DomainOwnershipIdentifier, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -779,8 +785,8 @@ func (client DomainsClient) ListComplete(ctx context.Context) (result DomainColl } // ListByResourceGroup get all domains in a resource group. -// -// resourceGroupName is name of the resource group to which the resource belongs. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. func (client DomainsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result DomainCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -880,8 +886,9 @@ func (client DomainsClient) ListByResourceGroupComplete(ctx context.Context, res } // ListOwnershipIdentifiers lists domain ownership identifiers. -// -// resourceGroupName is name of the resource group to which the resource belongs. domainName is name of domain. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// domainName - name of domain. func (client DomainsClient) ListOwnershipIdentifiers(ctx context.Context, resourceGroupName string, domainName string) (result DomainOwnershipIdentifierCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -982,8 +989,8 @@ func (client DomainsClient) ListOwnershipIdentifiersComplete(ctx context.Context } // ListRecommendations get domain name recommendations based on keywords. -// -// parameters is search parameters for domain name recommendations. +// Parameters: +// parameters - search parameters for domain name recommendations. func (client DomainsClient) ListRecommendations(ctx context.Context, parameters DomainRecommendationSearchParameters) (result NameIdentifierCollectionPage, err error) { result.fn = client.listRecommendationsNextResults req, err := client.ListRecommendationsPreparer(ctx, parameters) @@ -1076,8 +1083,9 @@ func (client DomainsClient) ListRecommendationsComplete(ctx context.Context, par } // Renew renew a domain. -// -// resourceGroupName is name of the resource group to which the resource belongs. domainName is name of the domain. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// domainName - name of the domain. func (client DomainsClient) Renew(ctx context.Context, resourceGroupName string, domainName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1149,9 +1157,10 @@ func (client DomainsClient) RenewResponder(resp *http.Response) (result autorest } // Update creates or updates a domain. -// -// resourceGroupName is name of the resource group to which the resource belongs. domainName is name of the domain. -// domain is domain registration information. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// domainName - name of the domain. +// domain - domain registration information. func (client DomainsClient) Update(ctx context.Context, resourceGroupName string, domainName string, domain DomainPatchResource) (result Domain, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -1229,10 +1238,11 @@ func (client DomainsClient) UpdateResponder(resp *http.Response) (result Domain, // UpdateOwnershipIdentifier creates an ownership identifier for a domain or updates identifier details for an existing // identifer -// -// resourceGroupName is name of the resource group to which the resource belongs. domainName is name of domain. -// name is name of identifier. domainOwnershipIdentifier is a JSON representation of the domain ownership -// properties. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// domainName - name of domain. +// name - name of identifier. +// domainOwnershipIdentifier - a JSON representation of the domain ownership properties. func (client DomainsClient) UpdateOwnershipIdentifier(ctx context.Context, resourceGroupName string, domainName string, name string, domainOwnershipIdentifier DomainOwnershipIdentifier) (result DomainOwnershipIdentifier, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/models.go index b807de3a1208..5572b29f4fde 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/models.go @@ -892,6 +892,25 @@ func PossiblePublishingProfileFormatValues() []PublishingProfileFormat { return []PublishingProfileFormat{FileZilla3, Ftp, WebDeploy} } +// RenderingType enumerates the values for rendering type. +type RenderingType string + +const ( + // NoGraph ... + NoGraph RenderingType = "NoGraph" + // Table ... + Table RenderingType = "Table" + // TimeSeries ... + TimeSeries RenderingType = "TimeSeries" + // TimeSeriesPerInstance ... + TimeSeriesPerInstance RenderingType = "TimeSeriesPerInstance" +) + +// PossibleRenderingTypeValues returns an array of possible values for the RenderingType const type. +func PossibleRenderingTypeValues() []RenderingType { + return []RenderingType{NoGraph, Table, TimeSeries, TimeSeriesPerInstance} +} + // ResourceScopeType enumerates the values for resource scope type. type ResourceScopeType string @@ -5408,6 +5427,218 @@ type BackupSchedule struct { LastExecutionTime *date.Time `json:"lastExecutionTime,omitempty"` } +// BillingMeter app Service billing entity that contains information about meter which the Azure billing system +// utilizes to charge users for services. +type BillingMeter struct { + // BillingMeterProperties - BillingMeter resource specific properties + *BillingMeterProperties `json:"properties,omitempty"` + // ID - Resource Id. + ID *string `json:"id,omitempty"` + // Name - Resource Name. + Name *string `json:"name,omitempty"` + // Kind - Kind of resource. + Kind *string `json:"kind,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for BillingMeter. +func (bm BillingMeter) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if bm.BillingMeterProperties != nil { + objectMap["properties"] = bm.BillingMeterProperties + } + if bm.ID != nil { + objectMap["id"] = bm.ID + } + if bm.Name != nil { + objectMap["name"] = bm.Name + } + if bm.Kind != nil { + objectMap["kind"] = bm.Kind + } + if bm.Type != nil { + objectMap["type"] = bm.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for BillingMeter struct. +func (bm *BillingMeter) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var billingMeterProperties BillingMeterProperties + err = json.Unmarshal(*v, &billingMeterProperties) + if err != nil { + return err + } + bm.BillingMeterProperties = &billingMeterProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + bm.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + bm.Name = &name + } + case "kind": + if v != nil { + var kind string + err = json.Unmarshal(*v, &kind) + if err != nil { + return err + } + bm.Kind = &kind + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + bm.Type = &typeVar + } + } + } + + return nil +} + +// BillingMeterCollection collection of Billing Meters +type BillingMeterCollection struct { + autorest.Response `json:"-"` + // Value - Collection of Billing Meters. + Value *[]BillingMeter `json:"value,omitempty"` + // NextLink - Link to next page of resources. + NextLink *string `json:"nextLink,omitempty"` +} + +// BillingMeterCollectionIterator provides access to a complete listing of BillingMeter values. +type BillingMeterCollectionIterator struct { + i int + page BillingMeterCollectionPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *BillingMeterCollectionIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter BillingMeterCollectionIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter BillingMeterCollectionIterator) Response() BillingMeterCollection { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter BillingMeterCollectionIterator) Value() BillingMeter { + if !iter.page.NotDone() { + return BillingMeter{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (bmc BillingMeterCollection) IsEmpty() bool { + return bmc.Value == nil || len(*bmc.Value) == 0 +} + +// billingMeterCollectionPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (bmc BillingMeterCollection) billingMeterCollectionPreparer() (*http.Request, error) { + if bmc.NextLink == nil || len(to.String(bmc.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(bmc.NextLink))) +} + +// BillingMeterCollectionPage contains a page of BillingMeter values. +type BillingMeterCollectionPage struct { + fn func(BillingMeterCollection) (BillingMeterCollection, error) + bmc BillingMeterCollection +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *BillingMeterCollectionPage) Next() error { + next, err := page.fn(page.bmc) + if err != nil { + return err + } + page.bmc = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page BillingMeterCollectionPage) NotDone() bool { + return !page.bmc.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page BillingMeterCollectionPage) Response() BillingMeterCollection { + return page.bmc +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page BillingMeterCollectionPage) Values() []BillingMeter { + if page.bmc.IsEmpty() { + return nil + } + return *page.bmc.Value +} + +// BillingMeterProperties billingMeter resource specific properties +type BillingMeterProperties struct { + // MeterID - Meter GUID onboarded in Commerce + MeterID *string `json:"meterId,omitempty"` + // BillingLocation - Azure Location of billable resource + BillingLocation *string `json:"billingLocation,omitempty"` + // ShortName - Short Name from App Service Azure pricing Page + ShortName *string `json:"shortName,omitempty"` + // FriendlyName - Friendly name of the meter + FriendlyName *string `json:"friendlyName,omitempty"` + // ResourceType - App Service resource type meter used for + ResourceType *string `json:"resourceType,omitempty"` +} + // Capability describes the capabilities/features allowed for a specific SKU. type Capability struct { // Name - Name of the SKU capability. @@ -6878,6 +7109,26 @@ type DataSource struct { DataSourceURI *[]NameValuePair `json:"dataSourceUri,omitempty"` } +// DataTableResponseColumn column definition +type DataTableResponseColumn struct { + // ColumnName - Name of the column + ColumnName *string `json:"columnName,omitempty"` + // DataType - Data type which looks like 'String' or 'Int32'. + DataType *string `json:"dataType,omitempty"` + // ColumnType - Column Type + ColumnType *string `json:"columnType,omitempty"` +} + +// DataTableResponseObject data Table which defines columns and raw row values +type DataTableResponseObject struct { + // TableName - Name of the table + TableName *string `json:"tableName,omitempty"` + // Columns - List of columns with data types + Columns *[]DataTableResponseColumn `json:"columns,omitempty"` + // Rows - Raw row values + Rows *[][]string `json:"rows,omitempty"` +} + // DefaultErrorResponse app Service error response. type DefaultErrorResponse struct { // Error - Error model. @@ -7386,6 +7637,224 @@ type DetectorDefinitionProperties struct { IsEnabled *bool `json:"isEnabled,omitempty"` } +// DetectorInfo definition of Detector +type DetectorInfo struct { + // Description - Short description of the detector and its purpose + Description *string `json:"description,omitempty"` + // Category - Support Category + Category *string `json:"category,omitempty"` + // SubCategory - Support Sub Category + SubCategory *string `json:"subCategory,omitempty"` + // SupportTopicID - Support Topic Id + SupportTopicID *string `json:"supportTopicId,omitempty"` +} + +// DetectorResponse class representing Response from Detector +type DetectorResponse struct { + autorest.Response `json:"-"` + // DetectorResponseProperties - DetectorResponse resource specific properties + *DetectorResponseProperties `json:"properties,omitempty"` + // ID - Resource Id. + ID *string `json:"id,omitempty"` + // Name - Resource Name. + Name *string `json:"name,omitempty"` + // Kind - Kind of resource. + Kind *string `json:"kind,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for DetectorResponse. +func (dr DetectorResponse) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if dr.DetectorResponseProperties != nil { + objectMap["properties"] = dr.DetectorResponseProperties + } + if dr.ID != nil { + objectMap["id"] = dr.ID + } + if dr.Name != nil { + objectMap["name"] = dr.Name + } + if dr.Kind != nil { + objectMap["kind"] = dr.Kind + } + if dr.Type != nil { + objectMap["type"] = dr.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for DetectorResponse struct. +func (dr *DetectorResponse) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var detectorResponseProperties DetectorResponseProperties + err = json.Unmarshal(*v, &detectorResponseProperties) + if err != nil { + return err + } + dr.DetectorResponseProperties = &detectorResponseProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + dr.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + dr.Name = &name + } + case "kind": + if v != nil { + var kind string + err = json.Unmarshal(*v, &kind) + if err != nil { + return err + } + dr.Kind = &kind + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + dr.Type = &typeVar + } + } + } + + return nil +} + +// DetectorResponseCollection collection of detector responses +type DetectorResponseCollection struct { + autorest.Response `json:"-"` + // Value - Collection of resources. + Value *[]DetectorResponse `json:"value,omitempty"` + // NextLink - Link to next page of resources. + NextLink *string `json:"nextLink,omitempty"` +} + +// DetectorResponseCollectionIterator provides access to a complete listing of DetectorResponse values. +type DetectorResponseCollectionIterator struct { + i int + page DetectorResponseCollectionPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *DetectorResponseCollectionIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter DetectorResponseCollectionIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter DetectorResponseCollectionIterator) Response() DetectorResponseCollection { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter DetectorResponseCollectionIterator) Value() DetectorResponse { + if !iter.page.NotDone() { + return DetectorResponse{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (drc DetectorResponseCollection) IsEmpty() bool { + return drc.Value == nil || len(*drc.Value) == 0 +} + +// detectorResponseCollectionPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (drc DetectorResponseCollection) detectorResponseCollectionPreparer() (*http.Request, error) { + if drc.NextLink == nil || len(to.String(drc.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(drc.NextLink))) +} + +// DetectorResponseCollectionPage contains a page of DetectorResponse values. +type DetectorResponseCollectionPage struct { + fn func(DetectorResponseCollection) (DetectorResponseCollection, error) + drc DetectorResponseCollection +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *DetectorResponseCollectionPage) Next() error { + next, err := page.fn(page.drc) + if err != nil { + return err + } + page.drc = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page DetectorResponseCollectionPage) NotDone() bool { + return !page.drc.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page DetectorResponseCollectionPage) Response() DetectorResponseCollection { + return page.drc +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page DetectorResponseCollectionPage) Values() []DetectorResponse { + if page.drc.IsEmpty() { + return nil + } + return *page.drc.Value +} + +// DetectorResponseProperties detectorResponse resource specific properties +type DetectorResponseProperties struct { + // Metadata - metadata for the detector + Metadata *DetectorInfo `json:"metadata,omitempty"` + // Dataset - Data Set + Dataset *[]DiagnosticData `json:"dataset,omitempty"` +} + // DiagnosticAnalysis class representing a diagnostic analysis done on an application type DiagnosticAnalysis struct { autorest.Response `json:"-"` @@ -7802,6 +8271,14 @@ type DiagnosticCategoryProperties struct { Description *string `json:"description,omitempty"` } +// DiagnosticData set of data with rendering instructions +type DiagnosticData struct { + // Table - Data in table form + Table *DataTableResponseObject `json:"table,omitempty"` + // RenderingProperties - Properties that describe how the table should be rendered + RenderingProperties *Rendering `json:"renderingProperties,omitempty"` +} + // DiagnosticDetectorCollection collection of Diagnostic Detectors type DiagnosticDetectorCollection struct { autorest.Response `json:"-"` @@ -13951,6 +14428,16 @@ type RelayServiceConnectionEntityProperties struct { BiztalkURI *string `json:"biztalkUri,omitempty"` } +// Rendering instructions for rendering the data +type Rendering struct { + // RenderingType - Rendering Type. Possible values include: 'NoGraph', 'Table', 'TimeSeries', 'TimeSeriesPerInstance' + RenderingType RenderingType `json:"renderingType,omitempty"` + // Title - Title of data + Title *string `json:"title,omitempty"` + // Description - Description of the data that will help it be interpreted + Description *string `json:"description,omitempty"` +} + // RenewCertificateOrderRequest class representing certificate renew request. type RenewCertificateOrderRequest struct { // RenewCertificateOrderRequestProperties - RenewCertificateOrderRequest resource specific properties diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/provider.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/provider.go index a42542e877be..fd67d05fc997 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/provider.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/provider.go @@ -40,8 +40,6 @@ func NewProviderClientWithBaseURI(baseURI string, subscriptionID string) Provide } // GetAvailableStacks get available application frameworks and their versions -// -// osTypeSelected is func (client ProviderClient) GetAvailableStacks(ctx context.Context, osTypeSelected string) (result ApplicationStackCollectionPage, err error) { result.fn = client.getAvailableStacksNextResults req, err := client.GetAvailableStacksPreparer(ctx, osTypeSelected) @@ -131,8 +129,6 @@ func (client ProviderClient) GetAvailableStacksComplete(ctx context.Context, osT } // GetAvailableStacksOnPrem get available application frameworks and their versions -// -// osTypeSelected is func (client ProviderClient) GetAvailableStacksOnPrem(ctx context.Context, osTypeSelected string) (result ApplicationStackCollectionPage, err error) { result.fn = client.getAvailableStacksOnPremNextResults req, err := client.GetAvailableStacksOnPremPreparer(ctx, osTypeSelected) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/recommendations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/recommendations.go index eda8421f6d0a..2ab446458422 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/recommendations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/recommendations.go @@ -41,8 +41,9 @@ func NewRecommendationsClientWithBaseURI(baseURI string, subscriptionID string) } // DisableAllForWebApp disable all recommendations for an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - name of the app. func (client RecommendationsClient) DisableAllForWebApp(ctx context.Context, resourceGroupName string, siteName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -114,9 +115,10 @@ func (client RecommendationsClient) DisableAllForWebAppResponder(resp *http.Resp } // DisableRecommendationForSite disables the specific rule for a web site permanently. -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is site name name is -// rule name +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - site name +// name - rule name func (client RecommendationsClient) DisableRecommendationForSite(ctx context.Context, resourceGroupName string, siteName string, name string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -190,8 +192,8 @@ func (client RecommendationsClient) DisableRecommendationForSiteResponder(resp * // DisableRecommendationForSubscription disables the specified rule so it will not apply to a subscription in the // future. -// -// name is rule name +// Parameters: +// name - rule name func (client RecommendationsClient) DisableRecommendationForSubscription(ctx context.Context, name string) (result autorest.Response, err error) { req, err := client.DisableRecommendationForSubscriptionPreparer(ctx, name) if err != nil { @@ -254,11 +256,13 @@ func (client RecommendationsClient) DisableRecommendationForSubscriptionResponde } // GetRuleDetailsByWebApp get a recommendation rule for an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is name of the app. name -// is name of the recommendation. updateSeen is specify true to update the last-seen timestamp of the -// recommendation object. recommendationID is the GUID of the recommedation object if you query an expired one. You -// don't need to specify it to query an active entry. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - name of the app. +// name - name of the recommendation. +// updateSeen - specify true to update the last-seen timestamp of the recommendation object. +// recommendationID - the GUID of the recommedation object if you query an expired one. You don't need to +// specify it to query an active entry. func (client RecommendationsClient) GetRuleDetailsByWebApp(ctx context.Context, resourceGroupName string, siteName string, name string, updateSeen *bool, recommendationID string) (result RecommendationRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -338,11 +342,12 @@ func (client RecommendationsClient) GetRuleDetailsByWebAppResponder(resp *http.R } // List list all recommendations for a subscription. -// -// featured is specify true to return only the most critical recommendations. The default is -// false, which returns all recommendations. filter is filter is specified by using OData syntax. -// Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and -// endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D] +// Parameters: +// featured - specify true to return only the most critical recommendations. The default is +// false, which returns all recommendations. +// filter - filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq +// 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain +// eq duration'[PT1H|PT1M|P1D] func (client RecommendationsClient) List(ctx context.Context, featured *bool, filter string) (result RecommendationCollectionPage, err error) { result.fn = client.listNextResults req, err := client.ListPreparer(ctx, featured, filter) @@ -439,11 +444,12 @@ func (client RecommendationsClient) ListComplete(ctx context.Context, featured * } // ListHistoryForWebApp get past recommendations for an app, optionally specified by the time range. -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is name of the app. -// filter is filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq -// 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq -// duration'[PT1H|PT1M|P1D] +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - name of the app. +// filter - filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq +// 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain +// eq duration'[PT1H|PT1M|P1D] func (client RecommendationsClient) ListHistoryForWebApp(ctx context.Context, resourceGroupName string, siteName string, filter string) (result RecommendationCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -547,11 +553,13 @@ func (client RecommendationsClient) ListHistoryForWebAppComplete(ctx context.Con } // ListRecommendedRulesForWebApp get all recommendations for an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is name of the app. -// featured is specify true to return only the most critical recommendations. The default is -// false, which returns all recommendations. filter is return only channels specified in the filter. -// Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - name of the app. +// featured - specify true to return only the most critical recommendations. The default is +// false, which returns all recommendations. +// filter - return only channels specified in the filter. Filter is specified by using OData syntax. Example: +// $filter=channels eq 'Api' or channel eq 'Notification' func (client RecommendationsClient) ListRecommendedRulesForWebApp(ctx context.Context, resourceGroupName string, siteName string, featured *bool, filter string) (result RecommendationCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -719,8 +727,9 @@ func (client RecommendationsClient) ResetAllFiltersResponder(resp *http.Response } // ResetAllFiltersForWebApp reset all recommendation opt-out settings for an app. -// -// resourceGroupName is name of the resource group to which the resource belongs. siteName is name of the app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// siteName - name of the app. func (client RecommendationsClient) ResetAllFiltersForWebApp(ctx context.Context, resourceGroupName string, siteName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/resourcehealthmetadata.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/resourcehealthmetadata.go index c930970814da..470858066d8d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/resourcehealthmetadata.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/resourcehealthmetadata.go @@ -41,8 +41,9 @@ func NewResourceHealthMetadataClientWithBaseURI(baseURI string, subscriptionID s } // GetBySite gets the category of ResourceHealthMetadata to use for the given site -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app func (client ResourceHealthMetadataClient) GetBySite(ctx context.Context, resourceGroupName string, name string) (result ResourceHealthMetadata, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -115,9 +116,10 @@ func (client ResourceHealthMetadataClient) GetBySiteResponder(resp *http.Respons } // GetBySiteSlot gets the category of ResourceHealthMetadata to use for the given site -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app slot is -// name of web app slot. If not specified then will default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app +// slot - name of web app slot. If not specified then will default to production slot. func (client ResourceHealthMetadataClient) GetBySiteSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result ResourceHealthMetadata, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -281,8 +283,8 @@ func (client ResourceHealthMetadataClient) ListComplete(ctx context.Context) (re } // ListByResourceGroup list all ResourceHealthMetadata for all sites in the resource group in the subscription. -// -// resourceGroupName is name of the resource group to which the resource belongs. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. func (client ResourceHealthMetadataClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ResourceHealthMetadataCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -382,8 +384,9 @@ func (client ResourceHealthMetadataClient) ListByResourceGroupComplete(ctx conte } // ListBySite gets the category of ResourceHealthMetadata to use for the given site as a collection -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. func (client ResourceHealthMetadataClient) ListBySite(ctx context.Context, resourceGroupName string, name string) (result ResourceHealthMetadataCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -484,9 +487,10 @@ func (client ResourceHealthMetadataClient) ListBySiteComplete(ctx context.Contex } // ListBySiteSlot gets the category of ResourceHealthMetadata to use for the given site as a collection -// -// resourceGroupName is name of the resource group to which the resource belongs. name is name of web app. slot is -// name of web app slot. If not specified then will default to production slot. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of web app. +// slot - name of web app slot. If not specified then will default to production slot. func (client ResourceHealthMetadataClient) ListBySiteSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result ResourceHealthMetadataCollectionPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/topleveldomains.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/topleveldomains.go index e9494f76cda7..6b836bed0dd0 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/topleveldomains.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/topleveldomains.go @@ -40,8 +40,8 @@ func NewTopLevelDomainsClientWithBaseURI(baseURI string, subscriptionID string) } // Get get details of a top-level domain. -// -// name is name of the top-level domain. +// Parameters: +// name - name of the top-level domain. func (client TopLevelDomainsClient) Get(ctx context.Context, name string) (result TopLevelDomain, err error) { req, err := client.GetPreparer(ctx, name) if err != nil { @@ -195,8 +195,9 @@ func (client TopLevelDomainsClient) ListComplete(ctx context.Context) (result To } // ListAgreements gets all legal agreements that user needs to accept before purchasing a domain. -// -// name is name of the top-level domain. agreementOption is domain agreement options. +// Parameters: +// name - name of the top-level domain. +// agreementOption - domain agreement options. func (client TopLevelDomainsClient) ListAgreements(ctx context.Context, name string, agreementOption TopLevelDomainAgreementOption) (result TldLegalAgreementCollectionPage, err error) { result.fn = client.listAgreementsNextResults req, err := client.ListAgreementsPreparer(ctx, name, agreementOption) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/blob.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/blob.go index 24ee5db6fbcc..1d2248625b33 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/blob.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/blob.go @@ -140,7 +140,7 @@ func (b *Blob) Exists() (bool, error) { headers := b.Container.bsc.client.getStandardHeaders() resp, err := b.Container.bsc.client.exec(http.MethodHead, uri, headers, nil, b.Container.bsc.auth) if resp != nil { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if resp.StatusCode == http.StatusOK || resp.StatusCode == http.StatusNotFound { return resp.StatusCode == http.StatusOK, nil } @@ -293,7 +293,7 @@ func (b *Blob) CreateSnapshot(options *SnapshotOptions) (snapshotTimestamp *time if err != nil || resp == nil { return nil, err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err := checkRespCode(resp, []int{http.StatusCreated}); err != nil { return nil, err @@ -340,7 +340,7 @@ func (b *Blob) GetProperties(options *GetBlobPropertiesOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err = checkRespCode(resp, []int{http.StatusOK}); err != nil { return err @@ -463,7 +463,7 @@ func (b *Blob) SetProperties(options *SetBlobPropertiesOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusOK}) } @@ -501,7 +501,7 @@ func (b *Blob) SetMetadata(options *SetBlobMetadataOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusOK}) } @@ -538,7 +538,7 @@ func (b *Blob) GetMetadata(options *GetBlobMetadataOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err := checkRespCode(resp, []int{http.StatusOK}); err != nil { return err @@ -574,7 +574,7 @@ func (b *Blob) Delete(options *DeleteBlobOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusAccepted}) } @@ -585,7 +585,7 @@ func (b *Blob) Delete(options *DeleteBlobOptions) error { func (b *Blob) DeleteIfExists(options *DeleteBlobOptions) (bool, error) { resp, err := b.delete(options) if resp != nil { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if resp.StatusCode == http.StatusAccepted || resp.StatusCode == http.StatusNotFound { return resp.StatusCode == http.StatusAccepted, nil } @@ -622,7 +622,7 @@ func pathForResource(container, name string) string { } func (b *Blob) respondCreation(resp *http.Response, bt BlobType) error { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) err := checkRespCode(resp, []int{http.StatusCreated}) if err != nil { return err diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/blockblob.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/blockblob.go index 5d9467afdb75..c9c62d799acf 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/blockblob.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/blockblob.go @@ -229,7 +229,7 @@ func (b *Blob) PutBlockList(blocks []Block, options *PutBlockListOptions) error if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusCreated}) } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/client.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/client.go index 651ba87226e3..2930824b26f0 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/client.go @@ -120,6 +120,7 @@ func (ds *DefaultSender) Send(c *Client, req *http.Request) (resp *http.Response if err != nil || !autorest.ResponseHasStatusCode(resp, ds.ValidStatusCodes...) { return resp, err } + drainRespBody(resp) autorest.DelayForBackoff(ds.RetryDuration, attempts, req.Cancel) ds.attempts = attempts } @@ -880,6 +881,12 @@ func readAndCloseBody(body io.ReadCloser) ([]byte, error) { return out, err } +// reads the response body then closes it +func drainRespBody(resp *http.Response) { + io.Copy(ioutil.Discard, resp.Body) + resp.Body.Close() +} + func serviceErrFromXML(body []byte, storageErr *AzureStorageServiceError) error { if err := xml.Unmarshal(body, storageErr); err != nil { storageErr.Message = fmt.Sprintf("Response body could no be unmarshaled: %v. Body: %v.", err, string(body)) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/container.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/container.go index bba44db74747..056473d49a20 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/container.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/container.go @@ -258,7 +258,7 @@ func (c *Container) Create(options *CreateContainerOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusCreated}) } @@ -267,7 +267,7 @@ func (c *Container) Create(options *CreateContainerOptions) error { func (c *Container) CreateIfNotExists(options *CreateContainerOptions) (bool, error) { resp, err := c.create(options) if resp != nil { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if resp.StatusCode == http.StatusCreated || resp.StatusCode == http.StatusConflict { return resp.StatusCode == http.StatusCreated, nil } @@ -307,7 +307,7 @@ func (c *Container) Exists() (bool, error) { resp, err := c.bsc.client.exec(http.MethodHead, uri, headers, nil, c.bsc.auth) if resp != nil { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if resp.StatusCode == http.StatusOK || resp.StatusCode == http.StatusNotFound { return resp.StatusCode == http.StatusOK, nil } @@ -349,7 +349,7 @@ func (c *Container) SetPermissions(permissions ContainerPermissions, options *Se if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusOK}) } @@ -431,7 +431,7 @@ func (c *Container) Delete(options *DeleteContainerOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusAccepted}) } @@ -444,7 +444,7 @@ func (c *Container) Delete(options *DeleteContainerOptions) error { func (c *Container) DeleteIfExists(options *DeleteContainerOptions) (bool, error) { resp, err := c.delete(options) if resp != nil { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if resp.StatusCode == http.StatusAccepted || resp.StatusCode == http.StatusNotFound { return resp.StatusCode == http.StatusAccepted, nil } @@ -535,7 +535,7 @@ func (c *Container) SetMetadata(options *ContainerMetadataOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusOK}) } @@ -563,7 +563,7 @@ func (c *Container) GetMetadata(options *ContainerMetadataOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err := checkRespCode(resp, []int{http.StatusOK}); err != nil { return err } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/copyblob.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/copyblob.go index 248dfb220eb8..151e9a51072c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/copyblob.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/copyblob.go @@ -110,7 +110,7 @@ func (b *Blob) StartCopy(sourceBlob string, options *CopyOptions) (string, error if err != nil { return "", err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err := checkRespCode(resp, []int{http.StatusAccepted, http.StatusCreated}); err != nil { return "", err @@ -152,7 +152,7 @@ func (b *Blob) AbortCopy(copyID string, options *AbortCopyOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusNoContent}) } @@ -223,7 +223,7 @@ func (b *Blob) IncrementalCopyBlob(sourceBlobURL string, snapshotTime time.Time, if err != nil { return "", err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err := checkRespCode(resp, []int{http.StatusAccepted}); err != nil { return "", err diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/directory.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/directory.go index 237d10fd155c..2e805e7dff37 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/directory.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/directory.go @@ -107,7 +107,7 @@ func (d *Directory) CreateIfNotExists(options *FileRequestOptions) (bool, error) params := prepareOptions(options) resp, err := d.fsc.createResourceNoClose(d.buildPath(), resourceDirectory, params, nil) if resp != nil { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if resp.StatusCode == http.StatusCreated || resp.StatusCode == http.StatusConflict { if resp.StatusCode == http.StatusCreated { d.updateEtagAndLastModified(resp.Header) @@ -135,7 +135,7 @@ func (d *Directory) Delete(options *FileRequestOptions) error { func (d *Directory) DeleteIfExists(options *FileRequestOptions) (bool, error) { resp, err := d.fsc.deleteResourceNoClose(d.buildPath(), resourceDirectory, options) if resp != nil { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if resp.StatusCode == http.StatusAccepted || resp.StatusCode == http.StatusNotFound { return resp.StatusCode == http.StatusAccepted, nil } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/entity.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/entity.go index 5af9b1ef3e35..fbbcb93bacae 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/entity.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/entity.go @@ -112,7 +112,7 @@ func (e *Entity) Get(timeout uint, ml MetadataLevel, options *GetEntityOptions) if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err = checkRespCode(resp, []int{http.StatusOK}); err != nil { return err @@ -154,7 +154,7 @@ func (e *Entity) Insert(ml MetadataLevel, options *EntityOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if ml != EmptyPayload { if err = checkRespCode(resp, []int{http.StatusCreated}); err != nil { @@ -212,7 +212,7 @@ func (e *Entity) Delete(force bool, options *EntityOptions) error { } return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err = checkRespCode(resp, []int{http.StatusNoContent}); err != nil { return err @@ -399,7 +399,7 @@ func (e *Entity) insertOr(verb string, options *EntityOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err = checkRespCode(resp, []int{http.StatusNoContent}); err != nil { return err @@ -428,7 +428,7 @@ func (e *Entity) updateMerge(force bool, verb string, options *EntityOptions) er } return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err = checkRespCode(resp, []int{http.StatusNoContent}); err != nil { return err diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/file.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/file.go index 8afc2e23355b..06bbe4ba08cb 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/file.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/file.go @@ -187,7 +187,7 @@ func (f *File) Delete(options *FileRequestOptions) error { func (f *File) DeleteIfExists(options *FileRequestOptions) (bool, error) { resp, err := f.fsc.deleteResourceNoClose(f.buildPath(), resourceFile, options) if resp != nil { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if resp.StatusCode == http.StatusAccepted || resp.StatusCode == http.StatusNotFound { return resp.StatusCode == http.StatusAccepted, nil } @@ -212,7 +212,7 @@ func (f *File) DownloadToStream(options *FileRequestOptions) (io.ReadCloser, err } if err = checkRespCode(resp, []int{http.StatusOK}); err != nil { - readAndCloseBody(resp.Body) + drainRespBody(resp) return nil, err } return resp.Body, nil @@ -242,7 +242,7 @@ func (f *File) DownloadRangeToStream(fileRange FileRange, options *GetFileOption } if err = checkRespCode(resp, []int{http.StatusOK, http.StatusPartialContent}); err != nil { - readAndCloseBody(resp.Body) + drainRespBody(resp) return fs, err } @@ -375,7 +375,7 @@ func (f *File) modifyRange(bytes io.Reader, fileRange FileRange, timeout *uint, if err != nil { return nil, err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return resp.Header, checkRespCode(resp, []int{http.StatusCreated}) } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/fileserviceclient.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/fileserviceclient.go index 6467937d2fac..1db8e7da6103 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/fileserviceclient.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/fileserviceclient.go @@ -194,7 +194,7 @@ func (f FileServiceClient) listContent(path string, params url.Values, extraHead } if err = checkRespCode(resp, []int{http.StatusOK}); err != nil { - readAndCloseBody(resp.Body) + drainRespBody(resp) return nil, err } @@ -212,7 +212,7 @@ func (f FileServiceClient) resourceExists(path string, res resourceType) (bool, resp, err := f.client.exec(http.MethodHead, uri, headers, nil, f.auth) if resp != nil { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if resp.StatusCode == http.StatusOK || resp.StatusCode == http.StatusNotFound { return resp.StatusCode == http.StatusOK, resp.Header, nil } @@ -226,7 +226,7 @@ func (f FileServiceClient) createResource(path string, res resourceType, urlPara if err != nil { return nil, err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return resp.Header, checkRespCode(resp, expectedResponseCodes) } @@ -251,7 +251,7 @@ func (f FileServiceClient) getResourceHeaders(path string, comp compType, res re if err != nil { return nil, err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err = checkRespCode(resp, []int{http.StatusOK}); err != nil { return nil, err @@ -279,7 +279,7 @@ func (f FileServiceClient) deleteResource(path string, res resourceType, options if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusAccepted}) } @@ -323,7 +323,7 @@ func (f FileServiceClient) setResourceHeaders(path string, comp compType, res re if err != nil { return nil, err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return resp.Header, checkRespCode(resp, []int{http.StatusOK}) } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/leaseblob.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/leaseblob.go index 22ddbcd65d8b..5b4a65145b61 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/leaseblob.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/leaseblob.go @@ -53,7 +53,7 @@ func (b *Blob) leaseCommonPut(headers map[string]string, expectedStatus int, opt if err != nil { return nil, err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err := checkRespCode(resp, []int{expectedStatus}); err != nil { return nil, err diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/message.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/message.go index ff13704ea10f..ce33dcb7270d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/message.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/message.go @@ -78,7 +78,7 @@ func (m *Message) Put(options *PutMessageOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) err = checkRespCode(resp, []int{http.StatusCreated}) if err != nil { return err @@ -128,7 +128,7 @@ func (m *Message) Update(options *UpdateMessageOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) m.PopReceipt = resp.Header.Get("x-ms-popreceipt") nextTimeStr := resp.Header.Get("x-ms-time-next-visible") @@ -160,7 +160,7 @@ func (m *Message) Delete(options *QueueServiceOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusNoContent}) } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/pageblob.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/pageblob.go index 007e19e618b4..7ffd63821d7a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/pageblob.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/pageblob.go @@ -121,7 +121,7 @@ func (b *Blob) modifyRange(blobRange BlobRange, bytes io.Reader, options *PutPag if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusCreated}) } @@ -160,7 +160,7 @@ func (b *Blob) GetPageRanges(options *GetPageRangesOptions) (GetPageRangesRespon if err != nil { return out, err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err = checkRespCode(resp, []int{http.StatusOK}); err != nil { return out, err diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/queue.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/queue.go index 9a821c56ade3..55238ab15ffc 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/queue.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/queue.go @@ -91,7 +91,7 @@ func (q *Queue) Create(options *QueueServiceOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusCreated}) } @@ -111,7 +111,7 @@ func (q *Queue) Delete(options *QueueServiceOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusNoContent}) } @@ -120,7 +120,7 @@ func (q *Queue) Exists() (bool, error) { uri := q.qsc.client.getEndpoint(queueServiceName, q.buildPath(), url.Values{"comp": {"metadata"}}) resp, err := q.qsc.client.exec(http.MethodGet, uri, q.qsc.client.getStandardHeaders(), nil, q.qsc.auth) if resp != nil { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if resp.StatusCode == http.StatusOK || resp.StatusCode == http.StatusNotFound { return resp.StatusCode == http.StatusOK, nil } @@ -148,7 +148,7 @@ func (q *Queue) SetMetadata(options *QueueServiceOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusNoContent}) } @@ -175,7 +175,7 @@ func (q *Queue) GetMetadata(options *QueueServiceOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if err := checkRespCode(resp, []int{http.StatusOK}); err != nil { return err @@ -314,7 +314,7 @@ func (q *Queue) ClearMessages(options *QueueServiceOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusNoContent}) } @@ -341,7 +341,7 @@ func (q *Queue) SetPermissions(permissions QueuePermissions, options *SetQueuePe if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusNoContent}) } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/share.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/share.go index 0ded501077bb..cf75a2659153 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/share.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/share.go @@ -75,7 +75,7 @@ func (s *Share) CreateIfNotExists(options *FileRequestOptions) (bool, error) { params := prepareOptions(options) resp, err := s.fsc.createResourceNoClose(s.buildPath(), resourceShare, params, extraheaders) if resp != nil { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if resp.StatusCode == http.StatusCreated || resp.StatusCode == http.StatusConflict { if resp.StatusCode == http.StatusCreated { s.updateEtagAndLastModified(resp.Header) @@ -103,7 +103,7 @@ func (s *Share) Delete(options *FileRequestOptions) error { func (s *Share) DeleteIfExists(options *FileRequestOptions) (bool, error) { resp, err := s.fsc.deleteResourceNoClose(s.buildPath(), resourceShare, options) if resp != nil { - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) if resp.StatusCode == http.StatusAccepted || resp.StatusCode == http.StatusNotFound { return resp.StatusCode == http.StatusAccepted, nil } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/storageservice.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/storageservice.go index a68ad09303cf..c338975ab5c9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/storageservice.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/storageservice.go @@ -126,6 +126,6 @@ func (c Client) setServiceProperties(props ServiceProperties, service string, au if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusAccepted}) } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/table.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/table.go index b96ca6e12867..22d9b4f5c130 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/table.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/table.go @@ -186,7 +186,7 @@ func (t *Table) Delete(timeout uint, options *TableOptions) error { if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusNoContent}) } @@ -269,7 +269,7 @@ func (t *Table) SetPermissions(tap []TableAccessPolicy, timeout uint, options *T if err != nil { return err } - defer readAndCloseBody(resp.Body) + defer drainRespBody(resp) return checkRespCode(resp, []int{http.StatusNoContent}) } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/table_batch.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/table_batch.go index 6595fb70fc1c..a2159e2966e3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/table_batch.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/table_batch.go @@ -163,7 +163,7 @@ func (t *TableBatch) ExecuteBatch() error { if err != nil { return err } - defer readAndCloseBody(resp.resp.Body) + defer drainRespBody(resp.resp) if err = checkRespCode(resp.resp, []int{http.StatusAccepted}); err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/version/version.go b/vendor/github.com/Azure/azure-sdk-for-go/version/version.go index e03d8ff36795..0bf03ceee37f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/version/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/version/version.go @@ -18,4 +18,4 @@ package version // Changes may cause incorrect behavior and will be lost if the code is regenerated. // Number contains the semantic version of this SDK. -const Number = "v15.1.0" +const Number = "v16.2.1" diff --git a/vendor/github.com/Azure/go-autorest/autorest/adal/token.go b/vendor/github.com/Azure/go-autorest/autorest/adal/token.go index b61b3eb8ea54..67c5a0b0ba50 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/adal/token.go +++ b/vendor/github.com/Azure/go-autorest/autorest/adal/token.go @@ -15,6 +15,7 @@ package adal // limitations under the License. import ( + "context" "crypto/rand" "crypto/rsa" "crypto/sha1" @@ -23,6 +24,7 @@ import ( "encoding/json" "fmt" "io/ioutil" + "net" "net/http" "net/url" "strconv" @@ -77,6 +79,13 @@ type Refresher interface { EnsureFresh() error } +// RefresherWithContext is an interface for token refresh functionality +type RefresherWithContext interface { + RefreshWithContext(ctx context.Context) error + RefreshExchangeWithContext(ctx context.Context, resource string) error + EnsureFreshWithContext(ctx context.Context) error +} + // TokenRefreshCallback is the type representing callbacks that will be called after // a successful token refresh type TokenRefreshCallback func(Token) error @@ -528,12 +537,18 @@ func newTokenRefreshError(message string, resp *http.Response) TokenRefreshError // EnsureFresh will refresh the token if it will expire within the refresh window (as set by // RefreshWithin) and autoRefresh flag is on. This method is safe for concurrent use. func (spt *ServicePrincipalToken) EnsureFresh() error { + return spt.EnsureFreshWithContext(context.Background()) +} + +// EnsureFreshWithContext will refresh the token if it will expire within the refresh window (as set by +// RefreshWithin) and autoRefresh flag is on. This method is safe for concurrent use. +func (spt *ServicePrincipalToken) EnsureFreshWithContext(ctx context.Context) error { if spt.autoRefresh && spt.token.WillExpireIn(spt.refreshWithin) { // take the write lock then check to see if the token was already refreshed spt.refreshLock.Lock() defer spt.refreshLock.Unlock() if spt.token.WillExpireIn(spt.refreshWithin) { - return spt.refreshInternal(spt.resource) + return spt.refreshInternal(ctx, spt.resource) } } return nil @@ -555,17 +570,29 @@ func (spt *ServicePrincipalToken) InvokeRefreshCallbacks(token Token) error { // Refresh obtains a fresh token for the Service Principal. // This method is not safe for concurrent use and should be syncrhonized. func (spt *ServicePrincipalToken) Refresh() error { + return spt.RefreshWithContext(context.Background()) +} + +// RefreshWithContext obtains a fresh token for the Service Principal. +// This method is not safe for concurrent use and should be syncrhonized. +func (spt *ServicePrincipalToken) RefreshWithContext(ctx context.Context) error { spt.refreshLock.Lock() defer spt.refreshLock.Unlock() - return spt.refreshInternal(spt.resource) + return spt.refreshInternal(ctx, spt.resource) } // RefreshExchange refreshes the token, but for a different resource. // This method is not safe for concurrent use and should be syncrhonized. func (spt *ServicePrincipalToken) RefreshExchange(resource string) error { + return spt.RefreshExchangeWithContext(context.Background(), resource) +} + +// RefreshExchangeWithContext refreshes the token, but for a different resource. +// This method is not safe for concurrent use and should be syncrhonized. +func (spt *ServicePrincipalToken) RefreshExchangeWithContext(ctx context.Context, resource string) error { spt.refreshLock.Lock() defer spt.refreshLock.Unlock() - return spt.refreshInternal(resource) + return spt.refreshInternal(ctx, resource) } func (spt *ServicePrincipalToken) getGrantType() string { @@ -587,12 +614,12 @@ func isIMDS(u url.URL) bool { return u.Host == imds.Host && u.Path == imds.Path } -func (spt *ServicePrincipalToken) refreshInternal(resource string) error { +func (spt *ServicePrincipalToken) refreshInternal(ctx context.Context, resource string) error { req, err := http.NewRequest(http.MethodPost, spt.oauthConfig.TokenEndpoint.String(), nil) if err != nil { return fmt.Errorf("adal: Failed to build the refresh request. Error = '%v'", err) } - + req = req.WithContext(ctx) if !isIMDS(spt.oauthConfig.TokenEndpoint) { v := url.Values{} v.Set("client_id", spt.clientID) @@ -621,9 +648,14 @@ func (spt *ServicePrincipalToken) refreshInternal(resource string) error { req.Header.Set(metadataHeader, "true") } - resp, err := spt.sender.Do(req) + var resp *http.Response + if isIMDS(spt.oauthConfig.TokenEndpoint) { + resp, err = retry(spt.sender, req) + } else { + resp, err = spt.sender.Do(req) + } if err != nil { - return fmt.Errorf("adal: Failed to execute the refresh request. Error = '%v'", err) + return newTokenRefreshError(fmt.Sprintf("adal: Failed to execute the refresh request. Error = '%v'", err), nil) } defer resp.Body.Close() @@ -631,11 +663,15 @@ func (spt *ServicePrincipalToken) refreshInternal(resource string) error { if resp.StatusCode != http.StatusOK { if err != nil { - return newTokenRefreshError(fmt.Sprintf("adal: Refresh request failed. Status Code = '%d'. Failed reading response body", resp.StatusCode), resp) + return newTokenRefreshError(fmt.Sprintf("adal: Refresh request failed. Status Code = '%d'. Failed reading response body: %v", resp.StatusCode, err), resp) } return newTokenRefreshError(fmt.Sprintf("adal: Refresh request failed. Status Code = '%d'. Response body: %s", resp.StatusCode, string(rb)), resp) } + // for the following error cases don't return a TokenRefreshError. the operation succeeded + // but some transient failure happened during deserialization. by returning a generic error + // the retry logic will kick in (we don't retry on TokenRefreshError). + if err != nil { return fmt.Errorf("adal: Failed to read a new service principal token during refresh. Error = '%v'", err) } @@ -653,6 +689,81 @@ func (spt *ServicePrincipalToken) refreshInternal(resource string) error { return spt.InvokeRefreshCallbacks(token) } +func retry(sender Sender, req *http.Request) (resp *http.Response, err error) { + retries := []int{ + http.StatusRequestTimeout, // 408 + http.StatusTooManyRequests, // 429 + http.StatusInternalServerError, // 500 + http.StatusBadGateway, // 502 + http.StatusServiceUnavailable, // 503 + http.StatusGatewayTimeout, // 504 + } + // Extra retry status codes requered + retries = append(retries, http.StatusNotFound, + // all remaining 5xx + http.StatusNotImplemented, + http.StatusHTTPVersionNotSupported, + http.StatusVariantAlsoNegotiates, + http.StatusInsufficientStorage, + http.StatusLoopDetected, + http.StatusNotExtended, + http.StatusNetworkAuthenticationRequired) + + attempt := 0 + maxAttempts := 5 + + for attempt < maxAttempts { + resp, err = sender.Do(req) + // retry on temporary network errors, e.g. transient network failures. + if (err != nil && !isTemporaryNetworkError(err)) || resp.StatusCode == http.StatusOK || !containsInt(retries, resp.StatusCode) { + return + } + + if !delay(resp, req.Context().Done()) { + select { + case <-time.After(time.Second): + attempt++ + case <-req.Context().Done(): + err = req.Context().Err() + return + } + } + } + return +} + +func isTemporaryNetworkError(err error) bool { + if netErr, ok := err.(net.Error); ok && netErr.Temporary() { + return true + } + return false +} + +func containsInt(ints []int, n int) bool { + for _, i := range ints { + if i == n { + return true + } + } + return false +} + +func delay(resp *http.Response, cancel <-chan struct{}) bool { + if resp == nil { + return false + } + retryAfter, _ := strconv.Atoi(resp.Header.Get("Retry-After")) + if resp.StatusCode == http.StatusTooManyRequests && retryAfter > 0 { + select { + case <-time.After(time.Duration(retryAfter) * time.Second): + return true + case <-cancel: + return false + } + } + return false +} + // SetAutoRefresh enables or disables automatic refreshing of stale tokens. func (spt *ServicePrincipalToken) SetAutoRefresh(autoRefresh bool) { spt.autoRefresh = autoRefresh diff --git a/vendor/github.com/Azure/go-autorest/autorest/authorization.go b/vendor/github.com/Azure/go-autorest/autorest/authorization.go index c51eac0a7830..77eff45bddb5 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/authorization.go +++ b/vendor/github.com/Azure/go-autorest/autorest/authorization.go @@ -113,17 +113,19 @@ func (ba *BearerAuthorizer) WithAuthorization() PrepareDecorator { return PreparerFunc(func(r *http.Request) (*http.Request, error) { r, err := p.Prepare(r) if err == nil { - refresher, ok := ba.tokenProvider.(adal.Refresher) - if ok { - err := refresher.EnsureFresh() - if err != nil { - var resp *http.Response - if tokError, ok := err.(adal.TokenRefreshError); ok { - resp = tokError.Response() - } - return r, NewErrorWithError(err, "azure.BearerAuthorizer", "WithAuthorization", resp, - "Failed to refresh the Token for request to %s", r.URL) + // the ordering is important here, prefer RefresherWithContext if available + if refresher, ok := ba.tokenProvider.(adal.RefresherWithContext); ok { + err = refresher.EnsureFreshWithContext(r.Context()) + } else if refresher, ok := ba.tokenProvider.(adal.Refresher); ok { + err = refresher.EnsureFresh() + } + if err != nil { + var resp *http.Response + if tokError, ok := err.(adal.TokenRefreshError); ok { + resp = tokError.Response() } + return r, NewErrorWithError(err, "azure.BearerAuthorizer", "WithAuthorization", resp, + "Failed to refresh the Token for request to %s", r.URL) } return Prepare(r, WithHeader(headerAuthorization, fmt.Sprintf("Bearer %s", ba.tokenProvider.OAuthToken()))) } diff --git a/vendor/github.com/Azure/go-autorest/autorest/sender.go b/vendor/github.com/Azure/go-autorest/autorest/sender.go index b4f762325f6c..cacbd815717d 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/sender.go +++ b/vendor/github.com/Azure/go-autorest/autorest/sender.go @@ -223,6 +223,10 @@ func DoRetryForStatusCodes(attempts int, backoff time.Duration, codes ...int) Se return resp, err } resp, err = s.Do(rr.Request()) + // if the error isn't temporary don't bother retrying + if err != nil && !IsTemporaryNetworkError(err) { + return nil, err + } // we want to retry if err is not nil (e.g. transient network failure). note that for failed authentication // resp and err will both have a value, so in this case we don't want to retry as it will never succeed. if err == nil && !ResponseHasStatusCode(resp, codes...) || IsTokenRefreshError(err) { diff --git a/vendor/github.com/Azure/go-autorest/autorest/utility.go b/vendor/github.com/Azure/go-autorest/autorest/utility.go index afb3e4e161ba..f3a42bfc268d 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/utility.go +++ b/vendor/github.com/Azure/go-autorest/autorest/utility.go @@ -20,6 +20,7 @@ import ( "encoding/xml" "fmt" "io" + "net" "net/http" "net/url" "reflect" @@ -216,3 +217,11 @@ func IsTokenRefreshError(err error) bool { } return false } + +// IsTemporaryNetworkError returns true if the specified error is a temporary network error. +func IsTemporaryNetworkError(err error) bool { + if netErr, ok := err.(net.Error); ok && netErr.Temporary() { + return true + } + return false +} diff --git a/vendor/github.com/Azure/go-autorest/autorest/version.go b/vendor/github.com/Azure/go-autorest/autorest/version.go index 4ad7754adab4..d265055f51fb 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/version.go +++ b/vendor/github.com/Azure/go-autorest/autorest/version.go @@ -16,5 +16,5 @@ package autorest // Version returns the semantic version (see http://semver.org). func Version() string { - return "v10.5.0" + return "v10.8.1" } diff --git a/vendor/vendor.json b/vendor/vendor.json index 9f966fb81730..f7f29678221b 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,356 +3,356 @@ "ignore": "test", "package": [ { - "checksumSHA1": "he/VGR6IgJ8CxXoYBmgFvTKRAtE=", + "checksumSHA1": "I1O9w4/hn+3DtQFbJrgwau5VOXI=", "path": "github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "uxqhpe2KAMLaOJ4UJZbNW85/DRQ=", + "checksumSHA1": "jf0lz1wRA07ILyDujw/NzoU3kMA=", "path": "github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "9z+AoEc7nQeXjTmnPnvG4m2e+SA=", + "checksumSHA1": "cL5VuAorqkBbkDvfOpB8Mh8Mm48=", "path": "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "9zEuoQJZTVs2pUTQQOVwSL9KDvo=", + "checksumSHA1": "jNqFdbZdsFgDH9xhq3fXNIk1+eM=", "path": "github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { "checksumSHA1": "kM2PZfGUZRmE9wFeHAFjHFPepzk=", "path": "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-12-01/compute", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "ufJjnUN3IoNaycDXS3irWPADAvQ=", + "checksumSHA1": "17kDQcToCpJ8yGuAd7nP1QkOO6M=", "path": "github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "7t0VrdSexJ3Fkft4qx6Y7i+XUag=", + "checksumSHA1": "Uafz6z4ARTszbiN4lBDe9XzLvpc=", "path": "github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "CFz0XzK5dml6LU9NwZmQf7rGiCg=", + "checksumSHA1": "OS98xAxprza/yF/IQZqgM8QHf30=", "path": "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "vqgxILYG9Q90LilSHK37e3TMJlU=", + "checksumSHA1": "xPqRAsuso4gp81HrMH1RnhbzfCk=", "path": "github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "Jic4NwZdIHPlBvO6KwQH8WWOYbM=", + "checksumSHA1": "cdSthV7hZqJYRvbNwWuC0VFzn14=", "path": "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "Nzv5lOussmqZ2h3i9/H2LmJWJBA=", + "checksumSHA1": "NieGKPVYPaCrPLxkzS+fEMidE3M=", "path": "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "7ZlPzptP9bH3HHJdYsPD+1CH0fA=", + "checksumSHA1": "wVJTMg87mLWoBmlniu/UA/YmVe4=", "path": "github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "ZjMfE/TWv/Xqzwu+tw4y72uY/bc=", + "checksumSHA1": "x9ceW8JE2/FgODRSywClj0fRlh8=", "path": "github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "0kRLbd9dmqjHMNHLDoiIQTv5Vdc=", + "checksumSHA1": "XCm0kJwkGqkv1VL2gUNTU7PIK6o=", "path": "github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "AxqtZ/9WzUGzJlHROXKrxwe2fS8=", + "checksumSHA1": "o1oH4ofWhXB67MoFvPDl5sl65j4=", "path": "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "XxIQmqFCsZoiHnyzJ/5aVMM11B0=", + "checksumSHA1": "IT8QxbA8sPbbCR79wiG9UxyRGEw=", "path": "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "QW7MPOpXOPihcLyyLXIBXNmSR8Q=", + "checksumSHA1": "vAkF/ng9NforhX2dTdVfNWMZmKo=", "path": "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { "checksumSHA1": "l5LiS1E96VhqOILV/TKh37eYbeg=", "path": "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "xRIUSsPljkKhI6zvql/7bGJiUAU=", + "checksumSHA1": "wRmQ+EBPmpsb6NvjlBXE8Y/JSZA=", "path": "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "FKVggufINs+t2nWOsbnZo7bi+hw=", + "checksumSHA1": "DzVfhx2cwj/AgX9m6fvrecc7VyU=", "path": "github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "ThSWR8EWt3+Klt7DG4HANzmxhEQ=", + "checksumSHA1": "0ubEDR8ye1PhBuUd5aVsGa3GLJs=", "path": "github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { "checksumSHA1": "d0AbZFEWBxTD9kTLApajDviAra8=", "path": "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "MIhAkAYROlF0bQN4AT4WZWkBQtY=", + "checksumSHA1": "UWSnIzZywuEpEevbPfbPNLk1dFk=", "path": "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "JNSBPrbVww7i2tKS02XHTRU9f6A=", + "checksumSHA1": "H9FyJDYC9FApeVyIl7eBnPusRlw=", "path": "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "woz67BK+/NdoZm4GzVYnJwzl61A=", + "checksumSHA1": "DJY5zDEcGa82/Hbfud8lgHCuvU4=", "path": "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "Dn2rizAeld0NpL5Oj920eiMwL2o=", + "checksumSHA1": "DQuP9Nzul8I8SN5fBg0NqWn124Q=", "path": "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/locks", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "F8O+DFqLL3C7QCG43si9N3NleHQ=", + "checksumSHA1": "pn550P6giSwxXck8lRRaNOPwxaQ=", "path": "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "Cm1d0n9h/87EA43VSuPazm7lmgA=", + "checksumSHA1": "G0pRv7MqqQwOFOg6IIaIoSWYwvY=", "path": "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "KnpIP9m1vO3qKIgEaTH/tzdCQsY=", + "checksumSHA1": "mIu5+RFHKL8U4H/6cQRiP2rUg9Q=", "path": "github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "bmOcu7B6nT4ubNAFcs4DLWmBAIo=", + "checksumSHA1": "D6gwM+shQnzYSGV0EnvH+uduzIg=", "path": "github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "O7UKTV+UsCZnvYLzZMLaxS9N5Jk=", + "checksumSHA1": "47wZjqF3UfIT1Xs56kXJ11zpCNc=", "path": "github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "lrA+cOUwjF47b1it8r93jaw6MSE=", + "checksumSHA1": "9CF6+vlasWn5NLNO3WGhLAFqp2w=", "path": "github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "g9eP5AgV9yXRkY36M8h7aDW9oi8=", + "checksumSHA1": "Gtq0yrNJHVALuWjOKpHgLRvvgxA=", "path": "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "f9IwwrByqa3ypvYApuuZD5rIMvE=", + "checksumSHA1": "HhbwyLbz+/pbGSWb2cp+fAp6YsI=", "path": "github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-05-01/trafficmanager", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "kX5YZ4u08mQ44HEJVjjDOdfbNqI=", + "checksumSHA1": "SuQHgkFuOrdDvajcGAImyzyb6+E=", "path": "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "3N5Et8QnWsHJYN+v/0J/VSQUkJ0=", + "checksumSHA1": "NAkdZOb1m8R72Av84tCFDXxmD2Q=", "path": "github.com/Azure/azure-sdk-for-go/storage", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "Gp9PjNDzkHRrBqQ4iSH0UcQlNMU=", + "checksumSHA1": "E0PGco6Wn0cOyCgy9G2dC5O+yfs=", "path": "github.com/Azure/azure-sdk-for-go/version", - "revision": "0b745831a99da5f43aa3cc641cfcb9ed323e1f9f", - "revisionTime": "2018-04-09T17:42:04Z", - "version": "v15.1.0", - "versionExact": "v15.1.0" + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" }, { - "checksumSHA1": "yWr3Vmf8wvJYTg+UR3zOjd9Kq3g=", + "checksumSHA1": "sQy6zpkumGcXs0QZLhYs8An1vlI=", "path": "github.com/Azure/go-autorest/autorest", - "revision": "9ad9326b278af8fa5cc67c30c0ce9a58cc0862b2", - "revisionTime": "2018-04-04T23:29:44Z", - "version": "v10.6.0", - "versionExact": "v10.6.0" + "revision": "eaa7994b2278094c904d31993d26f56324db3052", + "revisionTime": "2018-05-02T23:02:43Z", + "version": "v10.8.1", + "versionExact": "v10.8.1" }, { - "checksumSHA1": "2Mju3jwpFTNGwZT243jaHZ8f0dg=", + "checksumSHA1": "Xu6BOMnd2rZzabW6ld1yUrVjBQw=", "path": "github.com/Azure/go-autorest/autorest/adal", - "revision": "9ad9326b278af8fa5cc67c30c0ce9a58cc0862b2", - "revisionTime": "2018-04-04T23:29:44Z", - "version": "v10.6.0", - "versionExact": "v10.6.0" + "revision": "eaa7994b2278094c904d31993d26f56324db3052", + "revisionTime": "2018-05-02T23:02:43Z", + "version": "v10.8.1", + "versionExact": "v10.8.1" }, { "checksumSHA1": "vUHo41PG/G6Qq+vqD65l9KHFxUs=", "path": "github.com/Azure/go-autorest/autorest/azure", - "revision": "9ad9326b278af8fa5cc67c30c0ce9a58cc0862b2", - "revisionTime": "2018-04-04T23:29:44Z", - "version": "v10.6.0", - "versionExact": "v10.6.0" + "revision": "eaa7994b2278094c904d31993d26f56324db3052", + "revisionTime": "2018-05-02T23:02:43Z", + "version": "v10.8.1", + "versionExact": "v10.8.1" }, { "checksumSHA1": "+nXRwVB/JVEGe+oLsFhCmSkKPuI=", "path": "github.com/Azure/go-autorest/autorest/azure/cli", - "revision": "9ad9326b278af8fa5cc67c30c0ce9a58cc0862b2", - "revisionTime": "2018-04-04T23:29:44Z", - "version": "v10.6.0", - "versionExact": "v10.6.0" + "revision": "eaa7994b2278094c904d31993d26f56324db3052", + "revisionTime": "2018-05-02T23:02:43Z", + "version": "v10.8.1", + "versionExact": "v10.8.1" }, { "checksumSHA1": "9nXCi9qQsYjxCeajJKWttxgEt0I=", "path": "github.com/Azure/go-autorest/autorest/date", - "revision": "9ad9326b278af8fa5cc67c30c0ce9a58cc0862b2", - "revisionTime": "2018-04-04T23:29:44Z", - "version": "v10.6.0", - "versionExact": "v10.6.0" + "revision": "eaa7994b2278094c904d31993d26f56324db3052", + "revisionTime": "2018-05-02T23:02:43Z", + "version": "v10.8.1", + "versionExact": "v10.8.1" }, { "checksumSHA1": "SbBb2GcJNm5GjuPKGL2777QywR4=", "path": "github.com/Azure/go-autorest/autorest/to", - "revision": "9ad9326b278af8fa5cc67c30c0ce9a58cc0862b2", - "revisionTime": "2018-04-04T23:29:44Z", - "version": "v10.6.0", - "versionExact": "v10.6.0" + "revision": "eaa7994b2278094c904d31993d26f56324db3052", + "revisionTime": "2018-05-02T23:02:43Z", + "version": "v10.8.1", + "versionExact": "v10.8.1" }, { "checksumSHA1": "5UH4IFIB/98iowPCzzVs4M4MXiQ=", "path": "github.com/Azure/go-autorest/autorest/validation", - "revision": "9ad9326b278af8fa5cc67c30c0ce9a58cc0862b2", - "revisionTime": "2018-04-04T23:29:44Z", - "version": "v10.6.0", - "versionExact": "v10.6.0" + "revision": "eaa7994b2278094c904d31993d26f56324db3052", + "revisionTime": "2018-05-02T23:02:43Z", + "version": "v10.8.1", + "versionExact": "v10.8.1" }, { "checksumSHA1": "jQh1fnoKPKMURvKkpdRjN695nAQ=", From 26b30a419152577044dfe86ffce1497947045571 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 7 May 2018 07:28:19 -0700 Subject: [PATCH 083/320] Updating to include # [GH-1198] --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dffba7ca630..b94aeba479fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ FEATURES: IMPROVEMENTS: +* dependencies - upgrading to v16.2.1 of `Azure/azure-sdk-for-go` [GH-1198] +* dependencies - upgrading to v10.8.1 of `Azure/go-autorest` [GH-1198] * `azurerm_app_service` - support for HTTP2 [GH-1188] * `azurerm_app_service` - support for Managed Service Identity [GH-1130] * `azurerm_app_service_slot` - support for HTTP2 [GH-1205] From c6dc17c58b153be302bc15c06758d900f62c9216 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 8 May 2018 07:42:12 -0700 Subject: [PATCH 084/320] New Data Source: `azurerm_kubernetes_cluster` (#1204) * New Data Source: `azurerm_kubernetes_cluster` * Documenting how to use the AKS data source with the K8S Provider * Fixing issues identified in code review * `service_principal` - setting as a List not a Set --- azurerm/data_source_kubernetes_cluster.go | 350 ++++++++++++++++++ .../data_source_kubernetes_cluster_test.go | 87 +++++ azurerm/provider.go | 1 + azurerm/resource_arm_kubernetes_cluster.go | 85 +++-- website/azurerm.erb | 4 + .../docs/d/kubernetes_cluster.html.markdown | 109 ++++++ 6 files changed, 599 insertions(+), 37 deletions(-) create mode 100644 azurerm/data_source_kubernetes_cluster.go create mode 100644 azurerm/data_source_kubernetes_cluster_test.go create mode 100644 website/docs/d/kubernetes_cluster.html.markdown diff --git a/azurerm/data_source_kubernetes_cluster.go b/azurerm/data_source_kubernetes_cluster.go new file mode 100644 index 000000000000..10cd61503d02 --- /dev/null +++ b/azurerm/data_source_kubernetes_cluster.go @@ -0,0 +1,350 @@ +package azurerm + +import ( + "fmt" + + "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice" + "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/kubernetes" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmKubernetesCluster() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmKubernetesClusterRead, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + + "resource_group_name": resourceGroupNameForDataSourceSchema(), + + "location": locationForDataSourceSchema(), + + "dns_prefix": { + Type: schema.TypeString, + Computed: true, + }, + + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + + "kubernetes_version": { + Type: schema.TypeString, + Computed: true, + }, + + "kube_config": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "host": { + Type: schema.TypeString, + Computed: true, + }, + "username": { + Type: schema.TypeString, + Computed: true, + }, + "password": { + Type: schema.TypeString, + Computed: true, + }, + "client_certificate": { + Type: schema.TypeString, + Computed: true, + }, + "client_key": { + Type: schema.TypeString, + Computed: true, + }, + "cluster_ca_certificate": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + + "kube_config_raw": { + Type: schema.TypeString, + Computed: true, + }, + + "linux_profile": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "admin_username": { + Type: schema.TypeString, + Computed: true, + }, + "ssh_key": { + Type: schema.TypeList, + Computed: true, + + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "key_data": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + }, + }, + }, + + "agent_pool_profile": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Computed: true, + }, + + "count": { + Type: schema.TypeInt, + Computed: true, + }, + + "dns_prefix": { + Type: schema.TypeString, + Computed: true, + }, + + "vm_size": { + Type: schema.TypeString, + Computed: true, + }, + + "os_disk_size_gb": { + Type: schema.TypeInt, + Computed: true, + }, + + "vnet_subnet_id": { + Type: schema.TypeString, + Computed: true, + }, + + "os_type": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + + "service_principal": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "client_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + + "tags": tagsForDataSourceSchema(), + }, + } +} + +func dataSourceArmKubernetesClusterRead(d *schema.ResourceData, meta interface{}) error { + kubernetesClustersClient := meta.(*ArmClient).kubernetesClustersClient + client := meta.(*ArmClient) + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + ctx := client.StopContext + resp, err := kubernetesClustersClient.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + + return fmt.Errorf("Error making Read request on AKS Managed Cluster %q (resource group %q): %+v", name, resourceGroup, err) + } + + profile, err := kubernetesClustersClient.GetAccessProfiles(ctx, resourceGroup, name, "clusterUser") + if err != nil { + return fmt.Errorf("Error getting access profile while making Read request on AKS Managed Cluster %q (resource group %q): %+v", name, resourceGroup, err) + } + + d.SetId(*resp.ID) + + d.Set("name", resp.Name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azureRMNormalizeLocation(*location)) + } + + if props := resp.ManagedClusterProperties; props != nil { + d.Set("dns_prefix", props.DNSPrefix) + d.Set("fqdn", props.Fqdn) + d.Set("kubernetes_version", props.KubernetesVersion) + + linuxProfile := flattenKubernetesClusterDataSourceLinuxProfile(props.LinuxProfile) + if err := d.Set("linux_profile", linuxProfile); err != nil { + return fmt.Errorf("Error setting `linux_profile`: %+v", err) + } + + agentPoolProfiles := flattenKubernetesClusterDataSourceAgentPoolProfiles(props.AgentPoolProfiles) + if err := d.Set("agent_pool_profile", agentPoolProfiles); err != nil { + return fmt.Errorf("Error setting `agent_pool_profile`: %+v", err) + } + + servicePrincipal := flattenKubernetesClusterDataSourceServicePrincipalProfile(resp.ManagedClusterProperties.ServicePrincipalProfile) + if err := d.Set("service_principal", servicePrincipal); err != nil { + return fmt.Errorf("Error setting `service_principal`: %+v", err) + } + } + + kubeConfigRaw, kubeConfig := flattenKubernetesClusterDataSourceAccessProfile(&profile) + d.Set("kube_config_raw", kubeConfigRaw) + + if err := d.Set("kube_config", kubeConfig); err != nil { + return fmt.Errorf("Error setting `kube_config`: %+v", err) + } + + flattenAndSetTags(d, resp.Tags) + + return nil +} + +func flattenKubernetesClusterDataSourceLinuxProfile(input *containerservice.LinuxProfile) []interface{} { + values := make(map[string]interface{}) + sshKeys := make([]interface{}, 0) + + if profile := input; profile != nil { + if username := profile.AdminUsername; username != nil { + values["admin_username"] = *username + } + + if ssh := profile.SSH; ssh != nil { + if keys := ssh.PublicKeys; keys != nil { + for _, sshKey := range *keys { + if keyData := sshKey.KeyData; keyData != nil { + outputs := make(map[string]interface{}, 0) + outputs["key_data"] = *keyData + sshKeys = append(sshKeys, outputs) + } + } + } + } + } + + values["ssh_key"] = sshKeys + + return []interface{}{values} +} + +func flattenKubernetesClusterDataSourceAgentPoolProfiles(input *[]containerservice.AgentPoolProfile) []interface{} { + agentPoolProfiles := make([]interface{}, 0) + + if input == nil { + return agentPoolProfiles + } + + for _, profile := range *input { + agentPoolProfile := make(map[string]interface{}) + + if profile.Count != nil { + agentPoolProfile["count"] = int(*profile.Count) + } + + if profile.DNSPrefix != nil { + agentPoolProfile["dns_prefix"] = *profile.DNSPrefix + } + + if profile.Name != nil { + agentPoolProfile["name"] = *profile.Name + } + + if profile.VMSize != "" { + agentPoolProfile["vm_size"] = string(profile.VMSize) + } + + if profile.OsDiskSizeGB != nil { + agentPoolProfile["os_disk_size_gb"] = int(*profile.OsDiskSizeGB) + } + + if profile.VnetSubnetID != nil { + agentPoolProfile["vnet_subnet_id"] = *profile.VnetSubnetID + } + + if profile.OsType != "" { + agentPoolProfile["os_type"] = string(profile.OsType) + } + + agentPoolProfiles = append(agentPoolProfiles, agentPoolProfile) + } + + return agentPoolProfiles +} + +func flattenKubernetesClusterDataSourceServicePrincipalProfile(profile *containerservice.ServicePrincipalProfile) []interface{} { + if profile == nil { + return []interface{}{} + } + + values := make(map[string]interface{}) + + if clientId := profile.ClientID; clientId != nil { + values["client_id"] = *clientId + } + + return []interface{}{values} +} + +func flattenKubernetesClusterDataSourceAccessProfile(profile *containerservice.ManagedClusterAccessProfile) (*string, []interface{}) { + if profile == nil || profile.AccessProfile == nil { + return nil, []interface{}{} + } + + if kubeConfigRaw := profile.AccessProfile.KubeConfig; kubeConfigRaw != nil { + rawConfig := string(*kubeConfigRaw) + + kubeConfig, err := kubernetes.ParseKubeConfig(rawConfig) + if err != nil { + return utils.String(rawConfig), []interface{}{} + } + + flattenedKubeConfig := flattenKubernetesClusterDataSourceKubeConfig(*kubeConfig) + return utils.String(rawConfig), flattenedKubeConfig + } + + return nil, []interface{}{} +} + +func flattenKubernetesClusterDataSourceKubeConfig(config kubernetes.KubeConfig) []interface{} { + values := make(map[string]interface{}) + + cluster := config.Clusters[0].Cluster + user := config.Users[0].User + name := config.Users[0].Name + + values["host"] = cluster.Server + values["username"] = name + values["password"] = user.Token + values["client_certificate"] = user.ClientCertificteData + values["client_key"] = user.ClientKeyData + values["cluster_ca_certificate"] = cluster.ClusterAuthorityData + + return []interface{}{values} +} diff --git a/azurerm/data_source_kubernetes_cluster_test.go b/azurerm/data_source_kubernetes_cluster_test.go new file mode 100644 index 000000000000..f5cb8dfb7e42 --- /dev/null +++ b/azurerm/data_source_kubernetes_cluster_test.go @@ -0,0 +1,87 @@ +package azurerm + +import ( + "fmt" + "os" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccDataSourceAzureRMKubernetesCluster_basic(t *testing.T) { + dataSourceName := "data.azurerm_kubernetes_cluster.test" + ri := acctest.RandInt() + clientId := os.Getenv("ARM_CLIENT_ID") + clientSecret := os.Getenv("ARM_CLIENT_SECRET") + location := testLocation() + config := testAccDataSourceAzureRMKubernetesCluster_basic(ri, clientId, clientSecret, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMKubernetesClusterDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKubernetesClusterExists(dataSourceName), + resource.TestCheckResourceAttrSet(dataSourceName, "kube_config.0.client_key"), + resource.TestCheckResourceAttrSet(dataSourceName, "kube_config.0.client_certificate"), + resource.TestCheckResourceAttrSet(dataSourceName, "kube_config.0.cluster_ca_certificate"), + resource.TestCheckResourceAttrSet(dataSourceName, "kube_config.0.host"), + resource.TestCheckResourceAttrSet(dataSourceName, "kube_config.0.username"), + resource.TestCheckResourceAttrSet(dataSourceName, "kube_config.0.password"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMKubernetesCluster_internalNetwork(t *testing.T) { + dataSourceName := "data.azurerm_kubernetes_cluster.test" + ri := acctest.RandInt() + clientId := os.Getenv("ARM_CLIENT_ID") + clientSecret := os.Getenv("ARM_CLIENT_SECRET") + location := testLocation() + config := testAccDataSourceAzureRMKubernetesCluster_internalNetwork(ri, clientId, clientSecret, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMKubernetesClusterDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKubernetesClusterExists(dataSourceName), + resource.TestCheckResourceAttrSet(dataSourceName, "agent_pool_profile.0.vnet_subnet_id"), + ), + }, + }, + }) +} + +func testAccDataSourceAzureRMKubernetesCluster_basic(rInt int, clientId string, clientSecret string, location string) string { + resource := testAccAzureRMKubernetesCluster_basic(rInt, clientId, clientSecret, location) + return fmt.Sprintf(` +%s + +data "azurerm_kubernetes_cluster" "test" { + name = "${azurerm_kubernetes_cluster.test.name}" + resource_group_name = "${azurerm_kubernetes_cluster.test.resource_group_name}" +} +`, resource) +} + +func testAccDataSourceAzureRMKubernetesCluster_internalNetwork(rInt int, clientId string, clientSecret string, location string) string { + resource := testAccAzureRMKubernetesCluster_internalNetwork(rInt, clientId, clientSecret, location) + return fmt.Sprintf(` +%s + +data "azurerm_kubernetes_cluster" "test" { + name = "${azurerm_kubernetes_cluster.test.name}" + resource_group_name = "${azurerm_kubernetes_cluster.test.resource_group_name}" +} +`, resource) +} diff --git a/azurerm/provider.go b/azurerm/provider.go index e4d7bd412cf1..bdc6d44bdd20 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -88,6 +88,7 @@ func Provider() terraform.ResourceProvider { "azurerm_eventhub_namespace": dataSourceEventHubNamespace(), "azurerm_image": dataSourceArmImage(), "azurerm_key_vault_access_policy": dataSourceArmKeyVaultAccessPolicy(), + "azurerm_kubernetes_cluster": dataSourceArmKubernetesCluster(), "azurerm_managed_disk": dataSourceArmManagedDisk(), "azurerm_network_interface": dataSourceArmNetworkInterface(), "azurerm_network_security_group": dataSourceArmNetworkSecurityGroup(), diff --git a/azurerm/resource_arm_kubernetes_cluster.go b/azurerm/resource_arm_kubernetes_cluster.go index a8765ce9a03c..e19008358af3 100644 --- a/azurerm/resource_arm_kubernetes_cluster.go +++ b/azurerm/resource_arm_kubernetes_cluster.go @@ -290,34 +290,36 @@ func resourceArmKubernetesClusterRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error making Read request on AKS Managed Cluster %q (resource group %q): %+v", name, resGroup, err) } + profile, err := kubernetesClustersClient.GetAccessProfiles(ctx, resGroup, name, "clusterUser") + if err != nil { + return fmt.Errorf("Error getting access profile while making Read request on AKS Managed Cluster %q (resource group %q): %+v", name, resGroup, err) + } + d.Set("name", resp.Name) d.Set("resource_group_name", resGroup) if location := resp.Location; location != nil { d.Set("location", azureRMNormalizeLocation(*location)) } - d.Set("dns_prefix", resp.DNSPrefix) - d.Set("fqdn", resp.Fqdn) - d.Set("kubernetes_version", resp.KubernetesVersion) - - linuxProfile := flattenAzureRmKubernetesClusterLinuxProfile(*resp.ManagedClusterProperties.LinuxProfile) - if err := d.Set("linux_profile", &linuxProfile); err != nil { - return fmt.Errorf("Error setting `linux_profile`: %+v", err) - } + if props := resp.ManagedClusterProperties; props != nil { + d.Set("dns_prefix", props.DNSPrefix) + d.Set("fqdn", props.Fqdn) + d.Set("kubernetes_version", props.KubernetesVersion) - agentPoolProfiles := flattenAzureRmKubernetesClusterAgentPoolProfiles(resp.ManagedClusterProperties.AgentPoolProfiles, resp.Fqdn) - if err := d.Set("agent_pool_profile", &agentPoolProfiles); err != nil { - return fmt.Errorf("Error setting `agent_pool_profile`: %+v", err) - } + linuxProfile := flattenAzureRmKubernetesClusterLinuxProfile(props.LinuxProfile) + if err := d.Set("linux_profile", linuxProfile); err != nil { + return fmt.Errorf("Error setting `linux_profile`: %+v", err) + } - servicePrincipal := flattenAzureRmKubernetesClusterServicePrincipalProfile(resp.ManagedClusterProperties.ServicePrincipalProfile) - if servicePrincipal != nil { - d.Set("service_principal", servicePrincipal) - } + agentPoolProfiles := flattenAzureRmKubernetesClusterAgentPoolProfiles(props.AgentPoolProfiles, resp.Fqdn) + if err := d.Set("agent_pool_profile", agentPoolProfiles); err != nil { + return fmt.Errorf("Error setting `agent_pool_profile`: %+v", err) + } - profile, err := kubernetesClustersClient.GetAccessProfiles(ctx, resGroup, name, "clusterUser") - if err != nil { - return fmt.Errorf("Error getting access profile while making Read request on AKS Managed Cluster %q (resource group %q): %+v", name, resGroup, err) + servicePrincipal := flattenAzureRmKubernetesClusterServicePrincipalProfile(resp.ManagedClusterProperties.ServicePrincipalProfile) + if err := d.Set("service_principal", servicePrincipal); err != nil { + return fmt.Errorf("Error setting `service_principal`: %+v", err) + } } kubeConfigRaw, kubeConfig := flattenAzureRmKubernetesClusterAccessProfile(&profile) @@ -352,27 +354,34 @@ func resourceArmKubernetesClusterDelete(d *schema.ResourceData, meta interface{} return future.WaitForCompletion(ctx, kubernetesClustersClient.Client) } -func flattenAzureRmKubernetesClusterLinuxProfile(profile containerservice.LinuxProfile) []interface{} { - profiles := make([]interface{}, 0) +func flattenAzureRmKubernetesClusterLinuxProfile(input *containerservice.LinuxProfile) []interface{} { values := make(map[string]interface{}) - sshKeys := make([]interface{}, 0, len(*profile.SSH.PublicKeys)) + sshKeys := make([]interface{}, 0) - for _, ssh := range *profile.SSH.PublicKeys { - keys := make(map[string]interface{}) - keys["key_data"] = *ssh.KeyData - sshKeys = append(sshKeys, keys) - } + if profile := input; profile != nil { + if username := profile.AdminUsername; username != nil { + values["admin_username"] = *username + } - values["admin_username"] = *profile.AdminUsername + if ssh := profile.SSH; ssh != nil { + if keys := ssh.PublicKeys; keys != nil { + for _, sshKey := range *keys { + outputs := make(map[string]interface{}, 0) + if keyData := sshKey.KeyData; keyData != nil { + outputs["key_data"] = *keyData + } + sshKeys = append(sshKeys, outputs) + } + } + } + } values["ssh_key"] = sshKeys - profiles = append(profiles, values) - - return profiles + return []interface{}{values} } func flattenAzureRmKubernetesClusterAgentPoolProfiles(profiles *[]containerservice.AgentPoolProfile, fqdn *string) []interface{} { - agentPoolProfiles := make([]interface{}, 0, len(*profiles)) + agentPoolProfiles := make([]interface{}, 0) for _, profile := range *profiles { agentPoolProfile := make(map[string]interface{}) @@ -427,9 +436,11 @@ func flattenAzureRmKubernetesClusterServicePrincipalProfile(profile *containerse values := make(map[string]interface{}) - values["client_id"] = *profile.ClientID - if profile.Secret != nil { - values["client_secret"] = *profile.Secret + if clientId := profile.ClientID; clientId != nil { + values["client_id"] = *clientId + } + if secret := profile.Secret; secret != nil { + values["client_secret"] = *secret } servicePrincipalProfiles.Add(values) @@ -448,7 +459,7 @@ func flattenAzureRmKubernetesClusterAccessProfile(profile *containerservice.Mana return utils.String(rawConfig), []interface{}{} } - flattenedKubeConfig := flattenKubeConfig(*kubeConfig) + flattenedKubeConfig := flattenKubernetesClusterKubeConfig(*kubeConfig) return utils.String(rawConfig), flattenedKubeConfig } } @@ -456,7 +467,7 @@ func flattenAzureRmKubernetesClusterAccessProfile(profile *containerservice.Mana return nil, []interface{}{} } -func flattenKubeConfig(config kubernetes.KubeConfig) []interface{} { +func flattenKubernetesClusterKubeConfig(config kubernetes.KubeConfig) []interface{} { values := make(map[string]interface{}) cluster := config.Clusters[0].Cluster diff --git a/website/azurerm.erb b/website/azurerm.erb index 7142801abd6e..e5a91a873599 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -72,6 +72,10 @@ azurerm_key_vault_access_policy + > + azurerm_kubernetes_cluster + + > azurerm_managed_disk diff --git a/website/docs/d/kubernetes_cluster.html.markdown b/website/docs/d/kubernetes_cluster.html.markdown new file mode 100644 index 000000000000..11fd4bf06d4f --- /dev/null +++ b/website/docs/d/kubernetes_cluster.html.markdown @@ -0,0 +1,109 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_kubernetes_cluster" +sidebar_current: "docs-azurerm-data-source-kubernetes-cluster" +description: |- + Gets information about a managed Kubernetes Cluster (AKS) +--- + +# Data Source: azurerm_kubernetes_cluster + +Gets information about a managed Kubernetes Cluster (AKS) + +~> **Note:** All arguments including the client secret will be stored in the raw state as plain-text. +[Read more about sensitive data in state](/docs/state/sensitive-data.html). + + +## Example Usage + +```hcl +data "azurerm_kubernetes_cluster" "test" { + name = "myakscluster" + resource_group_name = "my-example-resource-group" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the managed Kubernetes Cluster. + +* `resource_group_name` - (Required) The name of the Resource Group in which the managed Kubernetes Cluster exists. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The Kubernetes Managed Cluster ID. + +* `fqdn` - The FQDN of the Azure Kubernetes Managed Cluster. + +* `kube_config_raw` - Base64 encoded Kubernetes configuration. + +* `kube_config` - A `kube_config` block as defined below. + +* `location` - The Azure Region in which the managed Kubernetes Cluster exists. + +* `dns_prefix` - The DNS Prefix of the managed Kubernetes cluster. + +* `kubernetes_version` - The version of Kubernetes used on the managed Kubernetes Cluster. + +* `linux_profile` - A `linux_profile` block as documented below. + +* `agent_pool_profile` - One or more `agent_profile_pool` blocks as documented below. + +* `service_principal` - A `service_principal` block as documented below. + +* `tags` - A mapping of tags assigned to this resource. + +--- + +`kube_config` exports the following: + +* `client_key` - Base64 encoded private key used by clients to authenticate to the Kubernetes cluster. + +* `client_certificate` - Base64 encoded public certificate used by clients to authenticate to the Kubernetes cluster. + +* `cluster_ca_certificate` - Base64 encoded public CA certificate used as the root of trust for the Kubernetes cluster. + +* `host` - The Kubernetes cluster server host. + +* `username` - A username used to authenticate to the Kubernetes cluster. + +* `password` - A password or token used to authenticate to the Kubernetes cluster. + +-> **NOTE:** It's possible to use these credentials with [the Kubernetes Provider](/docs/providers/kubernetes/index.html) like so: + +``` +provider "kubernetes" { + host = "${data.azurerm_kubernetes_cluster.main.kube_config.0.host}" + username = "${data.azurerm_kubernetes_cluster.main.kube_config.0.username}" + password = "${data.azurerm_kubernetes_cluster.main.kube_config.0.password}" + client_certificate = "${base64decode(data.azurerm_kubernetes_cluster.main.kube_config.0.client_certificate)}" + client_key = "${base64decode(data.azurerm_kubernetes_cluster.main.kube_config.0.client_key)}" + cluster_ca_certificate = "${base64decode(data.azurerm_kubernetes_cluster.main.kube_config.0.cluster_ca_certificate)}" +} +``` + +`linux_profile` exports the following: + +* `admin_username` - The username associated with the administrator account of the managed Kubernetes Cluster. +* `ssh_key` - One or more `ssh_key` blocks as defined below. + +`ssh_key` exports the following: + +* `key_data` - The Public SSH Key used to access the cluster. + +`agent_pool_profile` exports the following: + +* `name` - The name assigned to this pool of agents +* `count` - The number of Agents (VM's) in the Pool. +* `vm_size` - The size of each VM in the Agent Pool (e.g. `Standard_F1`). +* `os_disk_size_gb` - The size of the Agent VM's Operating System Disk in GB. +* `os_type` - The Operating System used for the Agents. +* `vnet_subnet_id` - The ID of the Subnet where the Agents in the Pool are provisioned. + +`service_principal` supports the following: + +* `client_id` - The Client ID of the Service Principal used by this Managed Kubernetes Cluster. From 8595f835b904abbe1a1a3e21e30111bd93e9fb47 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 8 May 2018 07:42:39 -0700 Subject: [PATCH 085/320] Updating to include #1204 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b94aeba479fb..db6454389e1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ FEATURES: * **New Data Source:** `azurerm_cosmosdb_account` [GH-1056] +* **New Data Source:** `azurerm_kubernetes_cluster` [GH-1204] * **New Data Source:** `azurerm_route_table` [GH-1203] IMPROVEMENTS: From 6d3c508779fb34d4f0319d260e5b96c5cc6b8aa8 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Tue, 8 May 2018 16:55:31 +0100 Subject: [PATCH 086/320] adding website docs and fixing data source --- azurerm/data_source_data_lake_store.go | 5 +- website/azurerm.erb | 15 +++++ website/docs/d/data_lake_store.html.markdown | 36 ++++++++++ website/docs/r/data_lake_store.html.markdown | 70 ++++++++++++++++++++ 4 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 website/docs/d/data_lake_store.html.markdown create mode 100644 website/docs/r/data_lake_store.html.markdown diff --git a/azurerm/data_source_data_lake_store.go b/azurerm/data_source_data_lake_store.go index e5db925ba599..47a9bde55eb2 100644 --- a/azurerm/data_source_data_lake_store.go +++ b/azurerm/data_source_data_lake_store.go @@ -55,7 +55,10 @@ func dataSourceArmDateLakeStoreAccountRead(d *schema.ResourceData, meta interfac if location := resp.Location; location != nil { d.Set("location", azureRMNormalizeLocation(*location)) } - d.Set("tier", resp.Type) + + if tier := resp.DataLakeStoreAccountProperties; tier != nil { + d.Set("tier", string(tier.CurrentTier)) + } flattenAndSetTags(d, resp.Tags) diff --git a/website/azurerm.erb b/website/azurerm.erb index f52739eeb4cf..1891f051332e 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -55,6 +55,10 @@ azurerm_dns_zone + > + azurerm_data_lake_store + + > azurerm_eventhub_namespace @@ -372,6 +376,17 @@
+ > + Data Lake Store Resources + + + > DNS Resources
    diff --git a/website/docs/d/data_lake_store.html.markdown b/website/docs/d/data_lake_store.html.markdown new file mode 100644 index 000000000000..5e51366b5965 --- /dev/null +++ b/website/docs/d/data_lake_store.html.markdown @@ -0,0 +1,36 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_data_lake_store" +sidebar_current: "docs-azurerm-datasource-data-lake-store" +description: |- + Get information about a Data Lake Store + +--- + +# Data Source: azurerm_data_lake_store + +Use this data source to obtain information about a Data Lake Store. + +## Example Usage + +```hcl +data "azurerm_data_lake_store" "test" { + name = "testdatalake" + resource_group_name = "testdatalake" +} + +output "data_lake_store_id" { + value = "${data.azurerm_data_lake_store.test.id}" +} +``` + +## Argument Reference + +* `name` - (Required) The name of the DNS Zone. +* `resource_group_name` - (Required) The Name of the Resource Group where the DNS Zone exists. + +## Attributes Reference + +* `id` - The ID of the Data Lake Store. +* `tier` - Current Commitment tier for the account. +* `tags` - A mapping of tags to assign to the Data Lake Store. diff --git a/website/docs/r/data_lake_store.html.markdown b/website/docs/r/data_lake_store.html.markdown new file mode 100644 index 000000000000..7397568fa231 --- /dev/null +++ b/website/docs/r/data_lake_store.html.markdown @@ -0,0 +1,70 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_data_lake_store" +sidebar_current: "docs-azurerm-resource-data-lake-store" +description: |- + Create a Azure Data Lake Store. +--- + +# azurerm\_data\_lake\_store + +Create a Azure Data Lake Store. + +## Example Usage + +```hcl +# Pay As You Go +resource "azurerm_resource_group" "test" { + name = "test" + location = "northeurope" +} + +resource "azurerm_data_lake_store" "payasyougo" { + name = "payasyougodatalake" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "northeurope" +} + +# Monthly Commitment Tier +resource "azurerm_resource_group" "test" { + name = "test" + location = "westeurope" +} + +resource "azurerm_data_lake_store" "monthly" { + name = "monthlydatalake" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "westeurope" + tier = "Commitment_1TB" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the Data Lake Store. Changing this forces a + new resource to be created. Has to be between 8 to 24 characters. + +* `resource_group_name` - (Required) The name of the resource group in which to + create the Data Lake Store. + +* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. + +* `tier` - (Optional) The commitment tier for Data Lake Store. Accepted values are `Consumption`, `Commitment_1TB`, `Commitment_10TB`, `Commitment_100TB`, `Commitment_500TB`, `Commitment_1PB` or `Commitment_5PB`. + +* `tags` - (Optional) A mapping of tags to assign to the resource. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The Date Lake Store ID. + +## Import + +Date Lake Store can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_data_lake_store.test /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.DataLakeStore/accounts/mydatalakeaccount +``` From f205a570879963183af9eadb8cee48509d4b65bd Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 8 May 2018 08:57:40 -0700 Subject: [PATCH 087/320] Adding Issue Templates for Bugs, Features and Questions (#1214) --- .github/ISSUE_TEMPLATE.md | 47 ++---------- .github/ISSUE_TEMPLATE/Bug_Report.md | 87 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/Feature_Request.md | 47 ++++++++++++ .github/ISSUE_TEMPLATE/Question.md | 15 ++++ 4 files changed, 154 insertions(+), 42 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/Bug_Report.md create mode 100644 .github/ISSUE_TEMPLATE/Feature_Request.md create mode 100644 .github/ISSUE_TEMPLATE/Question.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 8066d3921e43..24e79d04832c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,43 +1,6 @@ -Hi there, + diff --git a/.github/ISSUE_TEMPLATE/Bug_Report.md b/.github/ISSUE_TEMPLATE/Bug_Report.md new file mode 100644 index 000000000000..d7733f9f260f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/Bug_Report.md @@ -0,0 +1,87 @@ +--- +name: 🐛 Bug Report +about: If something isn't working as expected 🤔. + +--- + + + + + +### Community Note + +* Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original issue to help the community and maintainers prioritize this request +* Please do not leave "+1" or "me too" comments, they generate extra noise for issue followers and do not help prioritize the request +* If you are interested in working on this issue or have submitted a pull request, please leave a comment + + + +### Terraform Version + + + +### Affected Resource(s) + + + +* azurerm_XXXXX + +### Terraform Configuration Files + + + +```hcl +# Copy-paste your Terraform configurations here - for large Terraform configs, +# please use a service like Dropbox and share a link to the ZIP file. For +# security, you can also encrypt the files using our GPG public key: https://keybase.io/hashicorp +``` + +### Debug Output + + + +### Panic Output + + + +### Expected Behavior + + + +### Actual Behavior + + + +### Steps to Reproduce + + + +1. `terraform apply` + +### Important Factoids + + + +### References + + + +* #0000 diff --git a/.github/ISSUE_TEMPLATE/Feature_Request.md b/.github/ISSUE_TEMPLATE/Feature_Request.md new file mode 100644 index 000000000000..29eb370161d6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/Feature_Request.md @@ -0,0 +1,47 @@ +--- +name: 🚀 Feature Request +about: I have a suggestion (and might want to implement myself 🙂)! + +--- + + + +### Community Note + +* Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original issue to help the community and maintainers prioritize this request +* Please do not leave "+1" or "me too" comments, they generate extra noise for issue followers and do not help prioritize the request +* If you are interested in working on this issue or have submitted a pull request, please leave a comment + + + +### Description + + + +### New or Affected Resource(s) + + + +* azurerm_XXXXX + +### Potential Terraform Configuration + + + +```hcl +# Copy-paste your Terraform configurations here - for large Terraform configs, +# please use a service like Dropbox and share a link to the ZIP file. For +# security, you can also encrypt the files using our GPG public key. +``` + +### References + + + +* #0000 diff --git a/.github/ISSUE_TEMPLATE/Question.md b/.github/ISSUE_TEMPLATE/Question.md new file mode 100644 index 000000000000..a3f9a38394f3 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/Question.md @@ -0,0 +1,15 @@ +--- +name: 💬 Question +about: If you have a question, please check out our other community resources! + +--- + +Issues on GitHub are intended to be related to bugs or feature requests with provider codebase, +so we recommend using our other community resources instead of asking here 👍. + +--- + +If you have a support request or question please submit them to one of these resources: + +* [Terraform community resources](https://www.terraform.io/docs/extend/community/index.html) +* [HashiCorp support](https://support.hashicorp.com) (Terraform Enterprise customers) From 0dbe063b1d3d181cb7eba9983cea0985fac9eb20 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 8 May 2018 09:26:22 -0700 Subject: [PATCH 088/320] App Service Plan: updating the Linux examples (#1215) --- azurerm/resource_arm_app_service_plan_test.go | 4 ++++ website/docs/r/app_service_plan.html.markdown | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_app_service_plan_test.go b/azurerm/resource_arm_app_service_plan_test.go index 3508b3dd94bf..74628a84c1ee 100644 --- a/azurerm/resource_arm_app_service_plan_test.go +++ b/azurerm/resource_arm_app_service_plan_test.go @@ -293,6 +293,10 @@ resource "azurerm_app_service_plan" "test" { tier = "Basic" size = "B1" } + + properties { + reserved = true + } } `, rInt, location, rInt) } diff --git a/website/docs/r/app_service_plan.html.markdown b/website/docs/r/app_service_plan.html.markdown index f122baa1c8a3..b0c555f4c29c 100644 --- a/website/docs/r/app_service_plan.html.markdown +++ b/website/docs/r/app_service_plan.html.markdown @@ -64,12 +64,15 @@ resource "azurerm_app_service_plan" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" kind = "Linux" - reserved = true sku { tier = "Standard" size = "S1" } + + properties { + reserved = true + } } ``` From d50f52aa0ba24ad28d5545911241278013ace7e9 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Tue, 8 May 2018 17:51:36 +0100 Subject: [PATCH 089/320] no clue how this happned --- website/azurerm.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/azurerm.erb b/website/azurerm.erb index 1891f051332e..8aecad6ce53f 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -103,7 +103,7 @@ azurerm_resource_group - > + > azurerm_role_definition From f6b1e782cd05960b7c98bba6183037b9fc6b8dac Mon Sep 17 00:00:00 2001 From: Ben Abineri <32292786+benabineri@users.noreply.github.com> Date: Tue, 8 May 2018 21:15:53 +0100 Subject: [PATCH 090/320] fix link to RSV datasource (#1217) --- website/azurerm.erb | 2 +- website/docs/d/recovery_services_vault.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/azurerm.erb b/website/azurerm.erb index e5a91a873599..4985c36ffb61 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -101,7 +101,7 @@ > - azurerm_recovery_services_vault + azurerm_recovery_services_vault > diff --git a/website/docs/d/recovery_services_vault.markdown b/website/docs/d/recovery_services_vault.markdown index 3a29a6824ccb..fae00f753378 100644 --- a/website/docs/d/recovery_services_vault.markdown +++ b/website/docs/d/recovery_services_vault.markdown @@ -8,7 +8,7 @@ description: |- # azurerm_recovery_services_vault -Use this data source to access the properties of an Recovery Services Vault. +Use this data source to access the properties of a Recovery Services Vault. ## Example Usage From f705ce11632fe114d0496a27c23ffd1aa87d8f98 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 8 May 2018 14:25:19 -0700 Subject: [PATCH 091/320] azurerm_scheduler_job_collection: Renamed max_retry_interval to max_recurrence_interval to better match azure --- .../data_source_scheduler_job_collection.go | 2 +- .../resource_arm_scheduler_job_collection.go | 40 ++++++++++++++----- examples/scheduler-jobs/main.tf | 4 +- .../r/scheduler_job_collection.html.markdown | 4 +- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/azurerm/data_source_scheduler_job_collection.go b/azurerm/data_source_scheduler_job_collection.go index 0fd143008fdd..a7a16f1fefa2 100644 --- a/azurerm/data_source_scheduler_job_collection.go +++ b/azurerm/data_source_scheduler_job_collection.go @@ -102,7 +102,7 @@ func dataSourceArmSchedulerJobCollectionRead(d *schema.ResourceData, meta interf } d.Set("state", string(properties.State)) - if err := d.Set("quota", flattenAzureArmSchedulerJobCollectionQuota(properties.Quota)); err != nil { + if err := d.Set("quota", flattenAzureArmSchedulerJobCollectionQuota(properties.Quota, d.Get("quota").([]interface{}))); err != nil { return fmt.Errorf("Error flattening quota for Job Collection %q (Resource Group %q): %+v", collection.Name, resourceGroup, err) } } diff --git a/azurerm/resource_arm_scheduler_job_collection.go b/azurerm/resource_arm_scheduler_job_collection.go index b052f3c0f3f6..65550afa4971 100644 --- a/azurerm/resource_arm_scheduler_job_collection.go +++ b/azurerm/resource_arm_scheduler_job_collection.go @@ -69,6 +69,7 @@ func resourceArmSchedulerJobCollection() *schema.Resource { "quota": { Type: schema.TypeList, Optional: true, + MinItems: 1, MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -94,12 +95,21 @@ func resourceArmSchedulerJobCollection() *schema.Resource { }, true), }, - //this is MaxRecurrance.Interval, property is named this as the documentation in the api states: - // Gets or sets the interval between retries. + // API documentation states the MaxRecurrance.Interval "Gets or sets the interval between retries." + // however it does appear it is the max interval allowed for recurrences "max_retry_interval": { - Type: schema.TypeInt, - Optional: true, - ValidateFunc: validation.IntAtLeast(1), //changes depending on the frequency, unknown maximums + Type: schema.TypeInt, + Optional: true, + Deprecated: "Renamed to match azure", + ConflictsWith: []string{"quota.0.max_recurrence_interval"}, + ValidateFunc: validation.IntAtLeast(1), //changes depending on the frequency, unknown maximums + }, + + "max_recurrence_interval": { + Type: schema.TypeInt, + Optional: true, + ConflictsWith: []string{"quota.0.max_retry_interval"}, + ValidateFunc: validation.IntAtLeast(1), //changes depending on the frequency, unknown maximums }, }, }, @@ -195,7 +205,7 @@ func resourceArmSchedulerJobCollectionPopulate(d *schema.ResourceData, resourceG } d.Set("state", string(properties.State)) - if err := d.Set("quota", flattenAzureArmSchedulerJobCollectionQuota(properties.Quota)); err != nil { + if err := d.Set("quota", flattenAzureArmSchedulerJobCollectionQuota(properties.Quota, d.Get("quota").([]interface{}))); err != nil { return fmt.Errorf("Error flattening quota for Job Collection %q (Resource Group %q): %+v", collection.Name, resourceGroup, err) } } @@ -248,7 +258,10 @@ func expandAzureArmSchedulerJobCollectionQuota(d *schema.ResourceData) *schedule if v, ok := quotaBlock["max_recurrence_frequency"].(string); ok { quota.MaxRecurrence.Frequency = scheduler.RecurrenceFrequency(v) } - if v, ok := quotaBlock["max_retry_interval"].(int); ok { + if v, ok := quotaBlock["max_retry_interval"].(int); ok && v > 0 { + quota.MaxRecurrence.Interval = utils.Int32(int32(v)) + } + if v, ok := quotaBlock["max_recurrence_interval"].(int); ok && v > 0 { quota.MaxRecurrence.Interval = utils.Int32(int32(v)) } @@ -258,12 +271,21 @@ func expandAzureArmSchedulerJobCollectionQuota(d *schema.ResourceData) *schedule return nil } -func flattenAzureArmSchedulerJobCollectionQuota(quota *scheduler.JobCollectionQuota) []interface{} { +func flattenAzureArmSchedulerJobCollectionQuota(quota *scheduler.JobCollectionQuota, oldBlock []interface{}) []interface{} { if quota == nil { return nil } + //todo remove once max_retry_interval is retired + maxRecurrenceField := "max_recurrence_interval" + if len(oldBlock) > 0 { + b := oldBlock[0].(map[string]interface{}) + + if v, ok := b["max_retry_interval"].(int); ok && v > 0 { + maxRecurrenceField = "max_retry_interval" + } //else max_recurrence_interval is in use, or we default to max_recurrence_interval + } quotaBlock := make(map[string]interface{}) if v := quota.MaxJobCount; v != nil { @@ -271,7 +293,7 @@ func flattenAzureArmSchedulerJobCollectionQuota(quota *scheduler.JobCollectionQu } if recurrence := quota.MaxRecurrence; recurrence != nil { if v := recurrence.Interval; v != nil { - quotaBlock["max_retry_interval"] = *v + quotaBlock[maxRecurrenceField] = *v } quotaBlock["max_recurrence_frequency"] = string(recurrence.Frequency) diff --git a/examples/scheduler-jobs/main.tf b/examples/scheduler-jobs/main.tf index 483cacc85129..55909a748e20 100644 --- a/examples/scheduler-jobs/main.tf +++ b/examples/scheduler-jobs/main.tf @@ -12,8 +12,8 @@ resource "azurerm_scheduler_job_collection" "jobs" { state = "enabled" quota { - max_job_count = 5 - max_retry_interval = 24 + max_job_count = 5 + max_recurrence_interval = 24 max_recurrence_frequency = "hour" } } diff --git a/website/docs/r/scheduler_job_collection.html.markdown b/website/docs/r/scheduler_job_collection.html.markdown index 3a760f0f547a..2fdcf743a174 100644 --- a/website/docs/r/scheduler_job_collection.html.markdown +++ b/website/docs/r/scheduler_job_collection.html.markdown @@ -27,7 +27,7 @@ resource "azurerm_scheduler_job_collection" "jobs" { quota { max_job_count = 5 - max_retry_interval = 24 + max_recurrence_interval = 24 max_recurrence_frequency = "hour" } } @@ -58,7 +58,7 @@ The `quota` block supports: * `max_recurrence_frequency` - (Required) The maximum frequency of recurrence. Possible values include: `Minute`, `Hour`, `Day`, `Week`, `Month` -* `max_retry_interval` - (Optional) The maximum interval between retries. +* `max_recurrence_interval` - (Optional) The maximum interval between recurrence. ## Attributes Reference From b2430436de5c76f3356f48e0d624ac929bc3f8df Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 8 May 2018 14:33:12 -0700 Subject: [PATCH 092/320] azurerm_scheduler_job_collection: added import tests --- ...ource_arm_scheduler_job_collection_test.go | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/azurerm/resource_arm_scheduler_job_collection_test.go b/azurerm/resource_arm_scheduler_job_collection_test.go index 8da692f6e334..08922ae1d9f8 100644 --- a/azurerm/resource_arm_scheduler_job_collection_test.go +++ b/azurerm/resource_arm_scheduler_job_collection_test.go @@ -15,7 +15,6 @@ import ( func TestAccAzureRMSchedulerJobCollection_basic(t *testing.T) { ri := acctest.RandInt() resourceName := "azurerm_scheduler_job_collection.test" - config := testAccAzureRMSchedulerJobCollection_basic(ri, testLocation(), "") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -23,9 +22,14 @@ func TestAccAzureRMSchedulerJobCollection_basic(t *testing.T) { CheckDestroy: testCheckAzureRMSchedulerJobCollectionDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMSchedulerJobCollection_basic(ri, testLocation(), ""), Check: checkAccAzureRMSchedulerJobCollection_basic(resourceName), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -33,8 +37,6 @@ func TestAccAzureRMSchedulerJobCollection_basic(t *testing.T) { func TestAccAzureRMSchedulerJobCollection_complete(t *testing.T) { ri := acctest.RandInt() resourceName := "azurerm_scheduler_job_collection.test" - preConfig := testAccAzureRMSchedulerJobCollection_basic(ri, testLocation(), "") - config := testAccAzureRMSchedulerJobCollection_complete(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -42,13 +44,18 @@ func TestAccAzureRMSchedulerJobCollection_complete(t *testing.T) { CheckDestroy: testCheckAzureRMSchedulerJobCollectionDestroy, Steps: []resource.TestStep{ { - Config: preConfig, + Config: testAccAzureRMSchedulerJobCollection_basic(ri, testLocation(), ""), Check: checkAccAzureRMSchedulerJobCollection_basic(resourceName), }, { - Config: config, + Config: testAccAzureRMSchedulerJobCollection_complete(ri, testLocation()), Check: checkAccAzureRMSchedulerJobCollection_complete(resourceName), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -133,7 +140,7 @@ func testAccAzureRMSchedulerJobCollection_complete(rInt int, location string) st state = "disabled" quota { max_recurrence_frequency = "Hour" - max_retry_interval = 10 + max_recurrence_interval = 10 max_job_count = 10 } `) @@ -159,7 +166,7 @@ func checkAccAzureRMSchedulerJobCollection_complete(resourceName string) resourc resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), resource.TestCheckResourceAttr(resourceName, "state", string(scheduler.Disabled)), resource.TestCheckResourceAttr(resourceName, "quota.0.max_job_count", "10"), - resource.TestCheckResourceAttr(resourceName, "quota.0.max_retry_interval", "10"), + resource.TestCheckResourceAttr(resourceName, "quota.0.max_recurrence_interval", "10"), resource.TestCheckResourceAttr(resourceName, "quota.0.max_recurrence_frequency", "hour"), ) } From 56e9a01713e3e23409faac166a1272635ced612e Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Wed, 9 May 2018 07:04:55 +0100 Subject: [PATCH 093/320] correct letters --- website/docs/r/data_lake_store.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/data_lake_store.html.markdown b/website/docs/r/data_lake_store.html.markdown index 7397568fa231..ff9edc1f1099 100644 --- a/website/docs/r/data_lake_store.html.markdown +++ b/website/docs/r/data_lake_store.html.markdown @@ -44,7 +44,7 @@ resource "azurerm_data_lake_store" "monthly" { The following arguments are supported: * `name` - (Required) Specifies the name of the Data Lake Store. Changing this forces a - new resource to be created. Has to be between 8 to 24 characters. + new resource to be created. Has to be between 3 to 24 characters. * `resource_group_name` - (Required) The name of the resource group in which to create the Data Lake Store. From d7f0afcf57156f7199cb290fc1c03768e5b976c5 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 8 May 2018 23:44:34 -0700 Subject: [PATCH 094/320] azurerm_storage_account: minor doc updates --- azurerm/resource_arm_storage_account.go | 3 +-- website/docs/r/storage_account.html.markdown | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index 1ae58a7a83c4..4f99a377811c 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -82,7 +82,7 @@ func resourceArmStorageAccount() *schema.Resource { DiffSuppressFunc: ignoreCaseDiffSuppressFunc, }, - // Only valid for BlobStorage accounts, defaults to "Hot" in create function + // Only valid for BlobStorage & StorageV2 accounts, defaults to "Hot" in create function "access_tier": { Type: schema.TypeString, Optional: true, @@ -220,7 +220,6 @@ func resourceArmStorageAccount() *schema.Resource { "tags": tagsSchema(), }, } - } func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) error { diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index 9edc04130668..f2eb13964f24 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -53,9 +53,7 @@ The following arguments are supported: * `account_replication_type` - (Required) Defines the type of replication to use for this storage account. Valid options are `LRS`, `GRS`, `RAGRS` and `ZRS`. -* `access_tier` - (Required for `BlobStorage` accounts) Defines the access tier - for `BlobStorage` accounts. Valid options are `Hot` and `Cold`, defaults to - `Hot`. +* `access_tier` - (Optional) Defines the access tier for `BlobStorage` and `StorageV2` accounts. Valid options are `Hot` and `Cold`, defaults to `Hot`. * `enable_blob_encryption` - (Optional) Boolean flag which controls if Encryption Services are enabled for Blob storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) From dd3022fd7b1cd2098a8236459a50e83b1999dc91 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Wed, 9 May 2018 11:45:56 +0100 Subject: [PATCH 095/320] only 3 to 24 chars allowed --- azurerm/data_source_data_lake_store_test.go | 8 ++++---- azurerm/import_arm_data_lake_store_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azurerm/data_source_data_lake_store_test.go b/azurerm/data_source_data_lake_store_test.go index 46c4d93cef75..14abf69fa8e1 100644 --- a/azurerm/data_source_data_lake_store_test.go +++ b/azurerm/data_source_data_lake_store_test.go @@ -10,7 +10,7 @@ import ( func TestAccDataSourceAzureRMDataLakeStore_payasyougo(t *testing.T) { dataSourceName := "data.azurerm_data_lake_store.test" - rInt := acctest.RandInt() + rInt := acctest.RandIntRange(1, 999999) location := testLocation() resource.Test(t, resource.TestCase{ @@ -29,7 +29,7 @@ func TestAccDataSourceAzureRMDataLakeStore_payasyougo(t *testing.T) { func TestAccDataSourceAzureRMDataLakeStore_monthlycommitment(t *testing.T) { dataSourceName := "data.azurerm_data_lake_store.test" - rInt := acctest.RandInt() + rInt := acctest.RandIntRange(1, 999999) location := testLocation() resource.Test(t, resource.TestCase{ @@ -56,7 +56,7 @@ resource "azurerm_resource_group" "test" { } resource "azurerm_data_lake_store" "test" { - name = "acctestdatalakestore%d" + name = "acctest%d" location = "%s" resource_group_name = "${azurerm_resource_group.test.name}" tags { @@ -79,7 +79,7 @@ resource "azurerm_resource_group" "test" { } resource "azurerm_data_lake_store" "test" { - name = "acctestdatalakestore%d" + name = "acctest%d" location = "%s" tier = "Commitment_1TB" resource_group_name = "${azurerm_resource_group.test.name}" diff --git a/azurerm/import_arm_data_lake_store_test.go b/azurerm/import_arm_data_lake_store_test.go index 77e33d416bd1..5b49f7ccef04 100644 --- a/azurerm/import_arm_data_lake_store_test.go +++ b/azurerm/import_arm_data_lake_store_test.go @@ -10,7 +10,7 @@ import ( func TestAccAzureRMDataLakeStore_importPayAsYouGo(t *testing.T) { resourceName := "azurerm_data_lake_store.test" - ri := acctest.RandInt() + ri := acctest.RandIntRange(1, 999999) config := testAccAzureRMDataLakeStore_payasyougo(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -33,7 +33,7 @@ func TestAccAzureRMDataLakeStore_importPayAsYouGo(t *testing.T) { func TestAccAzureRMDataLakeStore_importTags(t *testing.T) { resourceName := "azurerm_data_lake_store.test" - ri := acctest.RandInt() + ri := acctest.RandIntRange(1, 999999) config := testAccAzureRMDataLakeStore_withTags(ri, testLocation()) resource.Test(t, resource.TestCase{ From 5ef2472293b8078b1946b5a62847465b492680f3 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Wed, 9 May 2018 12:54:26 +0100 Subject: [PATCH 096/320] dont mess with this --- website/azurerm.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/azurerm.erb b/website/azurerm.erb index 8aecad6ce53f..1891f051332e 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -103,7 +103,7 @@ azurerm_resource_group - > + > azurerm_role_definition From 242dfcc9ef53789176514303c1731fed41a758a1 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Wed, 9 May 2018 12:55:59 +0100 Subject: [PATCH 097/320] add monthly tier --- website/docs/d/data_lake_store.html.markdown | 2 +- website/docs/r/data_lake_store.html.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/d/data_lake_store.html.markdown b/website/docs/d/data_lake_store.html.markdown index 5e51366b5965..bdbb2983b428 100644 --- a/website/docs/d/data_lake_store.html.markdown +++ b/website/docs/d/data_lake_store.html.markdown @@ -32,5 +32,5 @@ output "data_lake_store_id" { ## Attributes Reference * `id` - The ID of the Data Lake Store. -* `tier` - Current Commitment tier for the account. +* `tier` - Current monthly commitment tier for the account. * `tags` - A mapping of tags to assign to the Data Lake Store. diff --git a/website/docs/r/data_lake_store.html.markdown b/website/docs/r/data_lake_store.html.markdown index ff9edc1f1099..d267aaed21d2 100644 --- a/website/docs/r/data_lake_store.html.markdown +++ b/website/docs/r/data_lake_store.html.markdown @@ -51,7 +51,7 @@ The following arguments are supported: * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `tier` - (Optional) The commitment tier for Data Lake Store. Accepted values are `Consumption`, `Commitment_1TB`, `Commitment_10TB`, `Commitment_100TB`, `Commitment_500TB`, `Commitment_1PB` or `Commitment_5PB`. +* `tier` - (Optional) The monnthly commitment tier for Data Lake Store. Accepted values are `Consumption`, `Commitment_1TB`, `Commitment_10TB`, `Commitment_100TB`, `Commitment_500TB`, `Commitment_1PB` or `Commitment_5PB`. * `tags` - (Optional) A mapping of tags to assign to the resource. From 7e430a4c57c2877963a7da1547ce55587531cd82 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Wed, 9 May 2018 13:11:52 +0100 Subject: [PATCH 098/320] add v16.2.1 for datalake --- .../2015-10-01-preview/filesystem/client.go | 52 + .../filesystem/filesystem.go | 1871 ++++++++++++++++ .../2015-10-01-preview/filesystem/models.go | 1283 +++++++++++ .../2015-10-01-preview/filesystem/version.go | 31 + .../store/2016-11-01/filesystem/client.go | 49 + .../store/2016-11-01/filesystem/filesystem.go | 1804 ++++++++++++++++ .../store/2016-11-01/filesystem/models.go | 1295 ++++++++++++ .../store/2016-11-01/filesystem/version.go | 30 + .../2015-10-01-preview/account/account.go | 1002 +++++++++ .../mgmt/2015-10-01-preview/account/client.go | 54 + .../mgmt/2015-10-01-preview/account/models.go | 718 +++++++ .../2015-10-01-preview/account/version.go | 31 + .../store/mgmt/2016-11-01/account/accounts.go | 740 +++++++ .../store/mgmt/2016-11-01/account/client.go | 51 + .../mgmt/2016-11-01/account/firewallrules.go | 430 ++++ .../mgmt/2016-11-01/account/locations.go | 105 + .../store/mgmt/2016-11-01/account/models.go | 1874 +++++++++++++++++ .../mgmt/2016-11-01/account/operations.go | 98 + .../2016-11-01/account/trustedidproviders.go | 430 ++++ .../store/mgmt/2016-11-01/account/version.go | 30 + 20 files changed, 11978 insertions(+) create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/client.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/filesystem.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/models.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/version.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/client.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/filesystem.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/models.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/version.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/account.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/client.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/models.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/version.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/accounts.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/client.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/firewallrules.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/locations.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/models.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/operations.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/trustedidproviders.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/version.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/client.go new file mode 100644 index 000000000000..822a60db9995 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/client.go @@ -0,0 +1,52 @@ +// Package filesystem implements the Azure ARM Filesystem service API version 2015-10-01-preview. +// +// Creates an Azure Data Lake Store filesystem client. +package filesystem + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" +) + +const ( + // DefaultAdlsFileSystemDNSSuffix is the default value for adls file system dns suffix + DefaultAdlsFileSystemDNSSuffix = "azuredatalakestore.net" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// BaseClient is the base client for Filesystem. +type BaseClient struct { + autorest.Client + AdlsFileSystemDNSSuffix string +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// New creates an instance of the BaseClient client. +func New() BaseClient { + return NewWithoutDefaults(DefaultAdlsFileSystemDNSSuffix) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// NewWithoutDefaults creates an instance of the BaseClient client. +func NewWithoutDefaults(adlsFileSystemDNSSuffix string) BaseClient { + return BaseClient{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + AdlsFileSystemDNSSuffix: adlsFileSystemDNSSuffix, + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/filesystem.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/filesystem.go new file mode 100644 index 000000000000..8f7f2ed3bb52 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/filesystem.go @@ -0,0 +1,1871 @@ +package filesystem + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "io" + "net/http" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// Client is the creates an Azure Data Lake Store filesystem client. +type Client struct { + BaseClient +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// NewClient creates an instance of the Client client. +func NewClient() Client { + return Client{New()} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// Append appends to the specified file. This method does not support multiple concurrent appends to the file. NOTE: +// Concurrent append and normal (serial) append CANNOT be used interchangeably. Once a file has been appended to using +// either append option, it can only be appended to using that append option. Use the ConcurrentAppend option if you +// would like support for concurrent appends. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. directFilePath is the Data +// Lake Store path (starting with '/') of the file to which to append. streamContents is the file contents to +// include when appending to the file. streamContents will be closed upon successful return. Callers should ensure +// closure when receiving an error.offset is the optional offset in the stream to begin the append operation. +// Default is to append at the end of the stream. +func (client Client) Append(ctx context.Context, accountName string, directFilePath string, streamContents io.ReadCloser, offset *int64) (result autorest.Response, err error) { + req, err := client.AppendPreparer(ctx, accountName, directFilePath, streamContents, offset) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Append", nil, "Failure preparing request") + return + } + + resp, err := client.AppendSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "Append", resp, "Failure sending request") + return + } + + result, err = client.AppendResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Append", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AppendPreparer prepares the Append request. +func (client Client) AppendPreparer(ctx context.Context, accountName string, directFilePath string, streamContents io.ReadCloser, offset *int64) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "directFilePath": autorest.Encode("path", directFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "append": autorest.Encode("query", "true"), + "op": autorest.Encode("query", "APPEND"), + } + if offset != nil { + queryParameters["offset"] = autorest.Encode("query", *offset) + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/octet-stream"), + autorest.AsPost(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{directFilePath}", pathParameters), + autorest.WithFile(streamContents), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AppendSender sends the Append request. The method will close the +// http.Response Body if it receives an error. +func (client Client) AppendSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AppendResponder handles the response to the Append request. The method always +// closes the http.Response Body. +func (client Client) AppendResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// CheckAccess checks if the specified access is available at the given path. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. pathParameter is the Data +// Lake Store path (starting with '/') of the file or directory for which to check access. fsaction is file system +// operation read/write/execute in string form, matching regex pattern '[rwx-]{3}' +func (client Client) CheckAccess(ctx context.Context, accountName string, pathParameter string, fsaction string) (result autorest.Response, err error) { + req, err := client.CheckAccessPreparer(ctx, accountName, pathParameter, fsaction) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "CheckAccess", nil, "Failure preparing request") + return + } + + resp, err := client.CheckAccessSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "CheckAccess", resp, "Failure sending request") + return + } + + result, err = client.CheckAccessResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "CheckAccess", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// CheckAccessPreparer prepares the CheckAccess request. +func (client Client) CheckAccessPreparer(ctx context.Context, accountName string, pathParameter string, fsaction string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "CHECKACCESS"), + } + if len(fsaction) > 0 { + queryParameters["fsaction"] = autorest.Encode("query", fsaction) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// CheckAccessSender sends the CheckAccess request. The method will close the +// http.Response Body if it receives an error. +func (client Client) CheckAccessSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// CheckAccessResponder handles the response to the CheckAccess request. The method always +// closes the http.Response Body. +func (client Client) CheckAccessResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// Concat concatenates the list of source files into the destination file, removing all source files upon success. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. destinationPath is the +// Data Lake Store path (starting with '/') of the destination file resulting from the concatenation. sources is a +// list of comma seperated Data Lake Store paths (starting with '/') of the files to concatenate, in the order in +// which they should be concatenated. +func (client Client) Concat(ctx context.Context, accountName string, destinationPath string, sources []string) (result autorest.Response, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: sources, + Constraints: []validation.Constraint{{Target: "sources", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { + return result, validation.NewError("filesystem.Client", "Concat", err.Error()) + } + + req, err := client.ConcatPreparer(ctx, accountName, destinationPath, sources) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Concat", nil, "Failure preparing request") + return + } + + resp, err := client.ConcatSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "Concat", resp, "Failure sending request") + return + } + + result, err = client.ConcatResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Concat", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ConcatPreparer prepares the Concat request. +func (client Client) ConcatPreparer(ctx context.Context, accountName string, destinationPath string, sources []string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "destinationPath": autorest.Encode("path", destinationPath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "CONCAT"), + "sources": autorest.Encode("query", sources, ","), + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{destinationPath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ConcatSender sends the Concat request. The method will close the +// http.Response Body if it receives an error. +func (client Client) ConcatSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ConcatResponder handles the response to the Concat request. The method always +// closes the http.Response Body. +func (client Client) ConcatResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ConcurrentAppend appends to the specified file. This method supports multiple concurrent appends to the file. NOTE: +// ConcurrentAppend and normal (serial) Append CANNOT be used interchangeably; once a file has been appended to using +// either of these append options, it can only be appended to using that append option. ConcurrentAppend DOES NOT +// guarantee order and can result in duplicated data landing in the target file. In order to close a file after using +// ConcurrentAppend, call the Flush method. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. filePath is the Data Lake +// Store path (starting with '/') of the file to which to append using concurrent append. streamContents is the +// file contents to include when appending to the file. streamContents will be closed upon successful return. +// Callers should ensure closure when receiving an error.appendMode is indicates the concurrent append call should +// create the file if it doesn't exist or just open the existing file for append +func (client Client) ConcurrentAppend(ctx context.Context, accountName string, filePath string, streamContents io.ReadCloser, appendMode AppendModeType) (result autorest.Response, err error) { + req, err := client.ConcurrentAppendPreparer(ctx, accountName, filePath, streamContents, appendMode) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "ConcurrentAppend", nil, "Failure preparing request") + return + } + + resp, err := client.ConcurrentAppendSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "ConcurrentAppend", resp, "Failure sending request") + return + } + + result, err = client.ConcurrentAppendResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "ConcurrentAppend", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ConcurrentAppendPreparer prepares the ConcurrentAppend request. +func (client Client) ConcurrentAppendPreparer(ctx context.Context, accountName string, filePath string, streamContents io.ReadCloser, appendMode AppendModeType) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "filePath": autorest.Encode("path", filePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "CONCURRENTAPPEND"), + } + if len(string(appendMode)) > 0 { + queryParameters["appendMode"] = autorest.Encode("query", appendMode) + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/octet-stream"), + autorest.AsPost(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/WebHdfsExt/{filePath}", pathParameters), + autorest.WithFile(streamContents), + autorest.WithQueryParameters(queryParameters), + autorest.WithHeader("Transfer-Encoding", "chunked")) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ConcurrentAppendSender sends the ConcurrentAppend request. The method will close the +// http.Response Body if it receives an error. +func (client Client) ConcurrentAppendSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ConcurrentAppendResponder handles the response to the ConcurrentAppend request. The method always +// closes the http.Response Body. +func (client Client) ConcurrentAppendResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// Create creates a file with optionally specified content. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. directFilePath is the Data +// Lake Store path (starting with '/') of the file to create. streamContents is the file contents to include when +// creating the file. This parameter is optional, resulting in an empty file if not specified. streamContents will +// be closed upon successful return. Callers should ensure closure when receiving an error.overwrite is the +// indication of if the file should be overwritten. +func (client Client) Create(ctx context.Context, accountName string, directFilePath string, streamContents io.ReadCloser, overwrite *bool) (result autorest.Response, err error) { + req, err := client.CreatePreparer(ctx, accountName, directFilePath, streamContents, overwrite) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Create", nil, "Failure preparing request") + return + } + + resp, err := client.CreateSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "Create", resp, "Failure sending request") + return + } + + result, err = client.CreateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Create", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// CreatePreparer prepares the Create request. +func (client Client) CreatePreparer(ctx context.Context, accountName string, directFilePath string, streamContents io.ReadCloser, overwrite *bool) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "directFilePath": autorest.Encode("path", directFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "CREATE"), + "write": autorest.Encode("query", "true"), + } + if overwrite != nil { + queryParameters["overwrite"] = autorest.Encode("query", *overwrite) + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/octet-stream"), + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{directFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + if streamContents != nil { + preparer = autorest.DecoratePreparer(preparer, + autorest.WithFile(streamContents)) + } + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// CreateSender sends the Create request. The method will close the +// http.Response Body if it receives an error. +func (client Client) CreateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// CreateResponder handles the response to the Create request. The method always +// closes the http.Response Body. +func (client Client) CreateResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// Delete deletes the requested file or directory, optionally recursively. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. filePath is the Data Lake +// Store path (starting with '/') of the file or directory to delete. recursive is the optional switch indicating +// if the delete should be recursive +func (client Client) Delete(ctx context.Context, accountName string, filePath string, recursive *bool) (result FileOperationResult, err error) { + req, err := client.DeletePreparer(ctx, accountName, filePath, recursive) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Delete", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// DeletePreparer prepares the Delete request. +func (client Client) DeletePreparer(ctx context.Context, accountName string, filePath string, recursive *bool) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "filePath": autorest.Encode("path", filePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "DELETE"), + } + if recursive != nil { + queryParameters["recursive"] = autorest.Encode("query", *recursive) + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{filePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client Client) DeleteSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client Client) DeleteResponder(resp *http.Response) (result FileOperationResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// Flush flushes the specified file to the store. This forces an update to the metadata of the file (returned from +// GetFileStatus), and is required by ConcurrentAppend once the file is done to populate finalized metadata. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. flushFilePath is the Data +// Lake Store path (starting with '/') of the file to which to flush. +func (client Client) Flush(ctx context.Context, accountName string, flushFilePath string) (result autorest.Response, err error) { + req, err := client.FlushPreparer(ctx, accountName, flushFilePath) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Flush", nil, "Failure preparing request") + return + } + + resp, err := client.FlushSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "Flush", resp, "Failure sending request") + return + } + + result, err = client.FlushResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Flush", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// FlushPreparer prepares the Flush request. +func (client Client) FlushPreparer(ctx context.Context, accountName string, flushFilePath string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "flushFilePath": autorest.Encode("path", flushFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "append": autorest.Encode("query", "true"), + "flush": autorest.Encode("query", "true"), + "op": autorest.Encode("query", "APPEND"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{flushFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// FlushSender sends the Flush request. The method will close the +// http.Response Body if it receives an error. +func (client Client) FlushSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// FlushResponder handles the response to the Flush request. The method always +// closes the http.Response Body. +func (client Client) FlushResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// GetACLStatus gets Access Control List (ACL) entries for the specified file or directory. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. ACLFilePath is the Data +// Lake Store path (starting with '/') of the file or directory for which to get the ACL. +func (client Client) GetACLStatus(ctx context.Context, accountName string, ACLFilePath string) (result ACLStatusResult, err error) { + req, err := client.GetACLStatusPreparer(ctx, accountName, ACLFilePath) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetACLStatus", nil, "Failure preparing request") + return + } + + resp, err := client.GetACLStatusSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetACLStatus", resp, "Failure sending request") + return + } + + result, err = client.GetACLStatusResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetACLStatus", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// GetACLStatusPreparer prepares the GetACLStatus request. +func (client Client) GetACLStatusPreparer(ctx context.Context, accountName string, ACLFilePath string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "aclFilePath": autorest.Encode("path", ACLFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "MSGETACLSTATUS"), + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{aclFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// GetACLStatusSender sends the GetACLStatus request. The method will close the +// http.Response Body if it receives an error. +func (client Client) GetACLStatusSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// GetACLStatusResponder handles the response to the GetACLStatus request. The method always +// closes the http.Response Body. +func (client Client) GetACLStatusResponder(resp *http.Response) (result ACLStatusResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// GetContentSummary gets the file content summary object specified by the file path. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. getContentSummaryFilePath +// is the Data Lake Store path (starting with '/') of the file for which to retrieve the summary. +func (client Client) GetContentSummary(ctx context.Context, accountName string, getContentSummaryFilePath string) (result ContentSummaryResult, err error) { + req, err := client.GetContentSummaryPreparer(ctx, accountName, getContentSummaryFilePath) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetContentSummary", nil, "Failure preparing request") + return + } + + resp, err := client.GetContentSummarySender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetContentSummary", resp, "Failure sending request") + return + } + + result, err = client.GetContentSummaryResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetContentSummary", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// GetContentSummaryPreparer prepares the GetContentSummary request. +func (client Client) GetContentSummaryPreparer(ctx context.Context, accountName string, getContentSummaryFilePath string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "getContentSummaryFilePath": autorest.Encode("path", getContentSummaryFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "GETCONTENTSUMMARY"), + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/va/{getContentSummaryFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// GetContentSummarySender sends the GetContentSummary request. The method will close the +// http.Response Body if it receives an error. +func (client Client) GetContentSummarySender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// GetContentSummaryResponder handles the response to the GetContentSummary request. The method always +// closes the http.Response Body. +func (client Client) GetContentSummaryResponder(resp *http.Response) (result ContentSummaryResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// GetFileStatus get the file status object specified by the file path. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. getFilePath is the Data +// Lake Store path (starting with '/') of the file or directory for which to retrieve the status. +func (client Client) GetFileStatus(ctx context.Context, accountName string, getFilePath string) (result FileStatusResult, err error) { + req, err := client.GetFileStatusPreparer(ctx, accountName, getFilePath) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetFileStatus", nil, "Failure preparing request") + return + } + + resp, err := client.GetFileStatusSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetFileStatus", resp, "Failure sending request") + return + } + + result, err = client.GetFileStatusResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetFileStatus", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// GetFileStatusPreparer prepares the GetFileStatus request. +func (client Client) GetFileStatusPreparer(ctx context.Context, accountName string, getFilePath string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "getFilePath": autorest.Encode("path", getFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "MSGETFILESTATUS"), + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{getFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// GetFileStatusSender sends the GetFileStatus request. The method will close the +// http.Response Body if it receives an error. +func (client Client) GetFileStatusSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// GetFileStatusResponder handles the response to the GetFileStatus request. The method always +// closes the http.Response Body. +func (client Client) GetFileStatusResponder(resp *http.Response) (result FileStatusResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ListFileStatus get the list of file status objects specified by the file path, with optional pagination parameters +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. listFilePath is the Data +// Lake Store path (starting with '/') of the directory to list. listSize is gets or sets the number of items to +// return. Optional. listAfter is gets or sets the item or lexographical index after which to begin returning +// results. For example, a file list of 'a','b','d' and listAfter='b' will return 'd', and a listAfter='c' will +// also return 'd'. Optional. listBefore is gets or sets the item or lexographical index before which to begin +// returning results. For example, a file list of 'a','b','d' and listBefore='d' will return 'a','b', and a +// listBefore='c' will also return 'a','b'. Optional. +func (client Client) ListFileStatus(ctx context.Context, accountName string, listFilePath string, listSize *int32, listAfter string, listBefore string) (result FileStatusesResult, err error) { + req, err := client.ListFileStatusPreparer(ctx, accountName, listFilePath, listSize, listAfter, listBefore) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "ListFileStatus", nil, "Failure preparing request") + return + } + + resp, err := client.ListFileStatusSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "ListFileStatus", resp, "Failure sending request") + return + } + + result, err = client.ListFileStatusResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "ListFileStatus", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ListFileStatusPreparer prepares the ListFileStatus request. +func (client Client) ListFileStatusPreparer(ctx context.Context, accountName string, listFilePath string, listSize *int32, listAfter string, listBefore string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "listFilePath": autorest.Encode("path", listFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "MSLISTSTATUS"), + } + if listSize != nil { + queryParameters["listSize"] = autorest.Encode("query", *listSize) + } + if len(listAfter) > 0 { + queryParameters["listAfter"] = autorest.Encode("query", listAfter) + } + if len(listBefore) > 0 { + queryParameters["listBefore"] = autorest.Encode("query", listBefore) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{listFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ListFileStatusSender sends the ListFileStatus request. The method will close the +// http.Response Body if it receives an error. +func (client Client) ListFileStatusSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ListFileStatusResponder handles the response to the ListFileStatus request. The method always +// closes the http.Response Body. +func (client Client) ListFileStatusResponder(resp *http.Response) (result FileStatusesResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// Mkdirs creates a directory. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. pathParameter is the Data +// Lake Store path (starting with '/') of the directory to create. +func (client Client) Mkdirs(ctx context.Context, accountName string, pathParameter string) (result FileOperationResult, err error) { + req, err := client.MkdirsPreparer(ctx, accountName, pathParameter) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Mkdirs", nil, "Failure preparing request") + return + } + + resp, err := client.MkdirsSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "Mkdirs", resp, "Failure sending request") + return + } + + result, err = client.MkdirsResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Mkdirs", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MkdirsPreparer prepares the Mkdirs request. +func (client Client) MkdirsPreparer(ctx context.Context, accountName string, pathParameter string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "MKDIRS"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MkdirsSender sends the Mkdirs request. The method will close the +// http.Response Body if it receives an error. +func (client Client) MkdirsSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MkdirsResponder handles the response to the Mkdirs request. The method always +// closes the http.Response Body. +func (client Client) MkdirsResponder(resp *http.Response) (result FileOperationResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ModifyACLEntries modifies existing Access Control List (ACL) entries on a file or folder. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. modifyACLFilePath is the +// Data Lake Store path (starting with '/') of the file or directory with the ACL being modified. aclspec is the +// ACL specification included in ACL modification operations in the format '[default:]user|group|other::r|-w|-x|-' +func (client Client) ModifyACLEntries(ctx context.Context, accountName string, modifyACLFilePath string, aclspec string) (result autorest.Response, err error) { + req, err := client.ModifyACLEntriesPreparer(ctx, accountName, modifyACLFilePath, aclspec) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "ModifyACLEntries", nil, "Failure preparing request") + return + } + + resp, err := client.ModifyACLEntriesSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "ModifyACLEntries", resp, "Failure sending request") + return + } + + result, err = client.ModifyACLEntriesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "ModifyACLEntries", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ModifyACLEntriesPreparer prepares the ModifyACLEntries request. +func (client Client) ModifyACLEntriesPreparer(ctx context.Context, accountName string, modifyACLFilePath string, aclspec string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "modifyAclFilePath": autorest.Encode("path", modifyACLFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "aclspec": autorest.Encode("query", aclspec), + "api-version": APIVersion, + "op": autorest.Encode("query", "MODIFYACLENTRIES"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{modifyAclFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ModifyACLEntriesSender sends the ModifyACLEntries request. The method will close the +// http.Response Body if it receives an error. +func (client Client) ModifyACLEntriesSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ModifyACLEntriesResponder handles the response to the ModifyACLEntries request. The method always +// closes the http.Response Body. +func (client Client) ModifyACLEntriesResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MsConcat concatenates the list of source files into the destination file, deleting all source files upon success. +// This method accepts more source file paths than the Concat method. This method and the parameters it accepts are +// subject to change for usability in an upcoming version. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. msConcatDestinationPath is +// the Data Lake Store path (starting with '/') of the destination file resulting from the concatenation. +// streamContents is a list of Data Lake Store paths (starting with '/') of the source files. Must be in the +// format: sources= streamContents will be closed upon successful return. Callers should +// ensure closure when receiving an error.deleteSourceDirectory is indicates that as an optimization instead of +// deleting each individual source stream, delete the source stream folder if all streams are in the same folder +// instead. This results in a substantial performance improvement when the only streams in the folder are part of +// the concatenation operation. WARNING: This includes the deletion of any other files that are not source files. +// Only set this to true when source files are the only files in the source directory. +func (client Client) MsConcat(ctx context.Context, accountName string, msConcatDestinationPath string, streamContents io.ReadCloser, deleteSourceDirectory *bool) (result autorest.Response, err error) { + req, err := client.MsConcatPreparer(ctx, accountName, msConcatDestinationPath, streamContents, deleteSourceDirectory) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "MsConcat", nil, "Failure preparing request") + return + } + + resp, err := client.MsConcatSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "MsConcat", resp, "Failure sending request") + return + } + + result, err = client.MsConcatResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "MsConcat", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MsConcatPreparer prepares the MsConcat request. +func (client Client) MsConcatPreparer(ctx context.Context, accountName string, msConcatDestinationPath string, streamContents io.ReadCloser, deleteSourceDirectory *bool) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "msConcatDestinationPath": autorest.Encode("path", msConcatDestinationPath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "MSCONCAT"), + } + if deleteSourceDirectory != nil { + queryParameters["deleteSourceDirectory"] = autorest.Encode("query", *deleteSourceDirectory) + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/octet-stream"), + autorest.AsPost(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{msConcatDestinationPath}", pathParameters), + autorest.WithFile(streamContents), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MsConcatSender sends the MsConcat request. The method will close the +// http.Response Body if it receives an error. +func (client Client) MsConcatSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MsConcatResponder handles the response to the MsConcat request. The method always +// closes the http.Response Body. +func (client Client) MsConcatResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// Open opens and reads from the specified file. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. directFilePath is the Data +// Lake Store path (starting with '/') of the file to open. +func (client Client) Open(ctx context.Context, accountName string, directFilePath string, length *int64, offset *int64) (result ReadCloser, err error) { + req, err := client.OpenPreparer(ctx, accountName, directFilePath, length, offset) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Open", nil, "Failure preparing request") + return + } + + resp, err := client.OpenSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "Open", resp, "Failure sending request") + return + } + + result, err = client.OpenResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Open", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// OpenPreparer prepares the Open request. +func (client Client) OpenPreparer(ctx context.Context, accountName string, directFilePath string, length *int64, offset *int64) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "directFilePath": autorest.Encode("path", directFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "OPEN"), + "read": autorest.Encode("query", "true"), + } + if length != nil { + queryParameters["length"] = autorest.Encode("query", *length) + } + if offset != nil { + queryParameters["offset"] = autorest.Encode("query", *offset) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{directFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// OpenSender sends the Open request. The method will close the +// http.Response Body if it receives an error. +func (client Client) OpenSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// OpenResponder handles the response to the Open request. The method always +// closes the http.Response Body. +func (client Client) OpenResponder(resp *http.Response) (result ReadCloser, err error) { + result.Value = &resp.Body + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK)) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RemoveACL removes the existing Access Control List (ACL) of the specified file or directory. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. ACLFilePath is the Data +// Lake Store path (starting with '/') of the file or directory with the ACL being removed. +func (client Client) RemoveACL(ctx context.Context, accountName string, ACLFilePath string) (result autorest.Response, err error) { + req, err := client.RemoveACLPreparer(ctx, accountName, ACLFilePath) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACL", nil, "Failure preparing request") + return + } + + resp, err := client.RemoveACLSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACL", resp, "Failure sending request") + return + } + + result, err = client.RemoveACLResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACL", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RemoveACLPreparer prepares the RemoveACL request. +func (client Client) RemoveACLPreparer(ctx context.Context, accountName string, ACLFilePath string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "aclFilePath": autorest.Encode("path", ACLFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "REMOVEACL"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{aclFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RemoveACLSender sends the RemoveACL request. The method will close the +// http.Response Body if it receives an error. +func (client Client) RemoveACLSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RemoveACLResponder handles the response to the RemoveACL request. The method always +// closes the http.Response Body. +func (client Client) RemoveACLResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RemoveACLEntries removes existing Access Control List (ACL) entries for a file or folder. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. removeACLFilePath is the +// Data Lake Store path (starting with '/') of the file or directory with the ACL being removed. aclspec is the ACL +// spec included in ACL removal operations in the format '[default:]user|group|other' +func (client Client) RemoveACLEntries(ctx context.Context, accountName string, removeACLFilePath string, aclspec string) (result autorest.Response, err error) { + req, err := client.RemoveACLEntriesPreparer(ctx, accountName, removeACLFilePath, aclspec) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACLEntries", nil, "Failure preparing request") + return + } + + resp, err := client.RemoveACLEntriesSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACLEntries", resp, "Failure sending request") + return + } + + result, err = client.RemoveACLEntriesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACLEntries", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RemoveACLEntriesPreparer prepares the RemoveACLEntries request. +func (client Client) RemoveACLEntriesPreparer(ctx context.Context, accountName string, removeACLFilePath string, aclspec string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "removeAclFilePath": autorest.Encode("path", removeACLFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "aclspec": autorest.Encode("query", aclspec), + "api-version": APIVersion, + "op": autorest.Encode("query", "REMOVEACLENTRIES"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{removeAclFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RemoveACLEntriesSender sends the RemoveACLEntries request. The method will close the +// http.Response Body if it receives an error. +func (client Client) RemoveACLEntriesSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RemoveACLEntriesResponder handles the response to the RemoveACLEntries request. The method always +// closes the http.Response Body. +func (client Client) RemoveACLEntriesResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RemoveDefaultACL removes the existing Default Access Control List (ACL) of the specified directory. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. defaultACLFilePath is the +// Data Lake Store path (starting with '/') of the directory with the default ACL being removed. +func (client Client) RemoveDefaultACL(ctx context.Context, accountName string, defaultACLFilePath string) (result autorest.Response, err error) { + req, err := client.RemoveDefaultACLPreparer(ctx, accountName, defaultACLFilePath) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveDefaultACL", nil, "Failure preparing request") + return + } + + resp, err := client.RemoveDefaultACLSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveDefaultACL", resp, "Failure sending request") + return + } + + result, err = client.RemoveDefaultACLResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveDefaultACL", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RemoveDefaultACLPreparer prepares the RemoveDefaultACL request. +func (client Client) RemoveDefaultACLPreparer(ctx context.Context, accountName string, defaultACLFilePath string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "defaultAclFilePath": autorest.Encode("path", defaultACLFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "REMOVEDEFAULTACL"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{defaultAclFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RemoveDefaultACLSender sends the RemoveDefaultACL request. The method will close the +// http.Response Body if it receives an error. +func (client Client) RemoveDefaultACLSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RemoveDefaultACLResponder handles the response to the RemoveDefaultACL request. The method always +// closes the http.Response Body. +func (client Client) RemoveDefaultACLResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// Rename rename a file or directory. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. renameFilePath is the Data +// Lake Store path (starting with '/') of the file or directory to move/rename. destination is the path to +// move/rename the file or folder to +func (client Client) Rename(ctx context.Context, accountName string, renameFilePath string, destination string) (result FileOperationResult, err error) { + req, err := client.RenamePreparer(ctx, accountName, renameFilePath, destination) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Rename", nil, "Failure preparing request") + return + } + + resp, err := client.RenameSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "Rename", resp, "Failure sending request") + return + } + + result, err = client.RenameResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Rename", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RenamePreparer prepares the Rename request. +func (client Client) RenamePreparer(ctx context.Context, accountName string, renameFilePath string, destination string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "renameFilePath": autorest.Encode("path", renameFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "destination": autorest.Encode("query", destination), + "op": autorest.Encode("query", "RENAME"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{renameFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RenameSender sends the Rename request. The method will close the +// http.Response Body if it receives an error. +func (client Client) RenameSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// RenameResponder handles the response to the Rename request. The method always +// closes the http.Response Body. +func (client Client) RenameResponder(resp *http.Response) (result FileOperationResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetACL sets the Access Control List (ACL) for a file or folder. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. setACLFilePath is the Data +// Lake Store path (starting with '/') of the file or directory on which to set the ACL. aclspec is the ACL spec +// included in ACL creation operations in the format '[default:]user|group|other::r|-w|-x|-' +func (client Client) SetACL(ctx context.Context, accountName string, setACLFilePath string, aclspec string) (result autorest.Response, err error) { + req, err := client.SetACLPreparer(ctx, accountName, setACLFilePath, aclspec) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetACL", nil, "Failure preparing request") + return + } + + resp, err := client.SetACLSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetACL", resp, "Failure sending request") + return + } + + result, err = client.SetACLResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetACL", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetACLPreparer prepares the SetACL request. +func (client Client) SetACLPreparer(ctx context.Context, accountName string, setACLFilePath string, aclspec string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "setAclFilePath": autorest.Encode("path", setACLFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "aclspec": autorest.Encode("query", aclspec), + "api-version": APIVersion, + "op": autorest.Encode("query", "SETACL"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{setAclFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetACLSender sends the SetACL request. The method will close the +// http.Response Body if it receives an error. +func (client Client) SetACLSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetACLResponder handles the response to the SetACL request. The method always +// closes the http.Response Body. +func (client Client) SetACLResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetFileExpiry sets or removes the expiration time on the specified file. This operation can only be executed against +// files. Folders are not supported. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. filePath is the Data Lake +// Store path (starting with '/') of the file on which to set or remove the expiration time. expiryOption is +// indicates the type of expiration to use for the file: 1. NeverExpire: ExpireTime is ignored. 2. RelativeToNow: +// ExpireTime is an integer in milliseconds representing the expiration date relative to when file expiration is +// updated. 3. RelativeToCreationDate: ExpireTime is an integer in milliseconds representing the expiration date +// relative to file creation. 4. Absolute: ExpireTime is an integer in milliseconds, as a Unix timestamp relative +// to 1/1/1970 00:00:00. expireTime is the time that the file will expire, corresponding to the ExpiryOption that +// was set. +func (client Client) SetFileExpiry(ctx context.Context, accountName string, filePath string, expiryOption ExpiryOptionType, expireTime *int64) (result autorest.Response, err error) { + req, err := client.SetFileExpiryPreparer(ctx, accountName, filePath, expiryOption, expireTime) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetFileExpiry", nil, "Failure preparing request") + return + } + + resp, err := client.SetFileExpirySender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetFileExpiry", resp, "Failure sending request") + return + } + + result, err = client.SetFileExpiryResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetFileExpiry", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetFileExpiryPreparer prepares the SetFileExpiry request. +func (client Client) SetFileExpiryPreparer(ctx context.Context, accountName string, filePath string, expiryOption ExpiryOptionType, expireTime *int64) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "filePath": autorest.Encode("path", filePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "expiryOption": autorest.Encode("query", expiryOption), + "op": autorest.Encode("query", "SETEXPIRY"), + } + if expireTime != nil { + queryParameters["expireTime"] = autorest.Encode("query", *expireTime) + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/WebHdfsExt/{filePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetFileExpirySender sends the SetFileExpiry request. The method will close the +// http.Response Body if it receives an error. +func (client Client) SetFileExpirySender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetFileExpiryResponder handles the response to the SetFileExpiry request. The method always +// closes the http.Response Body. +func (client Client) SetFileExpiryResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetOwner sets the owner of a file or directory. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. setOwnerFilePath is the +// Data Lake Store path (starting with '/') of the file or directory for which to set the owner. owner is the AAD +// Object ID of the user owner of the file or directory. If empty, the property will remain unchanged. group is the +// AAD Object ID of the group owner of the file or directory. If empty, the property will remain unchanged. +func (client Client) SetOwner(ctx context.Context, accountName string, setOwnerFilePath string, owner string, group string) (result autorest.Response, err error) { + req, err := client.SetOwnerPreparer(ctx, accountName, setOwnerFilePath, owner, group) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetOwner", nil, "Failure preparing request") + return + } + + resp, err := client.SetOwnerSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetOwner", resp, "Failure sending request") + return + } + + result, err = client.SetOwnerResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetOwner", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetOwnerPreparer prepares the SetOwner request. +func (client Client) SetOwnerPreparer(ctx context.Context, accountName string, setOwnerFilePath string, owner string, group string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "setOwnerFilePath": autorest.Encode("path", setOwnerFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "SETOWNER"), + } + if len(owner) > 0 { + queryParameters["owner"] = autorest.Encode("query", owner) + } + if len(group) > 0 { + queryParameters["group"] = autorest.Encode("query", group) + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{setOwnerFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetOwnerSender sends the SetOwner request. The method will close the +// http.Response Body if it receives an error. +func (client Client) SetOwnerSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetOwnerResponder handles the response to the SetOwner request. The method always +// closes the http.Response Body. +func (client Client) SetOwnerResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetPermission sets the permission of the file or folder. +// +// accountName is the Azure Data Lake Store account to execute filesystem operations on. setPermissionFilePath is +// the Data Lake Store path (starting with '/') of the file or directory for which to set the permission. +// permission is a string representation of the permission (i.e 'rwx'). If empty, this property remains unchanged. +func (client Client) SetPermission(ctx context.Context, accountName string, setPermissionFilePath string, permission string) (result autorest.Response, err error) { + req, err := client.SetPermissionPreparer(ctx, accountName, setPermissionFilePath, permission) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetPermission", nil, "Failure preparing request") + return + } + + resp, err := client.SetPermissionSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetPermission", resp, "Failure sending request") + return + } + + result, err = client.SetPermissionResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetPermission", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetPermissionPreparer prepares the SetPermission request. +func (client Client) SetPermissionPreparer(ctx context.Context, accountName string, setPermissionFilePath string, permission string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "setPermissionFilePath": autorest.Encode("path", setPermissionFilePath), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "SETPERMISSION"), + } + if len(permission) > 0 { + queryParameters["permission"] = autorest.Encode("query", permission) + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{setPermissionFilePath}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetPermissionSender sends the SetPermission request. The method will close the +// http.Response Body if it receives an error. +func (client Client) SetPermissionSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// SetPermissionResponder handles the response to the SetPermission request. The method always +// closes the http.Response Body. +func (client Client) SetPermissionResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/models.go new file mode 100644 index 000000000000..688674d27bcf --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/models.go @@ -0,0 +1,1283 @@ +package filesystem + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "encoding/json" + "github.com/Azure/go-autorest/autorest" + "io" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AppendModeType enumerates the values for append mode type. +type AppendModeType string + +const ( + // Autocreate ... + Autocreate AppendModeType = "autocreate" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// PossibleAppendModeTypeValues returns an array of possible values for the AppendModeType const type. +func PossibleAppendModeTypeValues() []AppendModeType { + return []AppendModeType{Autocreate} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// Exception enumerates the values for exception. +type Exception string + +const ( + // ExceptionAccessControlException ... + ExceptionAccessControlException Exception = "AccessControlException" + // ExceptionAdlsRemoteException ... + ExceptionAdlsRemoteException Exception = "AdlsRemoteException" + // ExceptionBadOffsetException ... + ExceptionBadOffsetException Exception = "BadOffsetException" + // ExceptionFileAlreadyExistsException ... + ExceptionFileAlreadyExistsException Exception = "FileAlreadyExistsException" + // ExceptionFileNotFoundException ... + ExceptionFileNotFoundException Exception = "FileNotFoundException" + // ExceptionIllegalArgumentException ... + ExceptionIllegalArgumentException Exception = "IllegalArgumentException" + // ExceptionIOException ... + ExceptionIOException Exception = "IOException" + // ExceptionRuntimeException ... + ExceptionRuntimeException Exception = "RuntimeException" + // ExceptionSecurityException ... + ExceptionSecurityException Exception = "SecurityException" + // ExceptionUnsupportedOperationException ... + ExceptionUnsupportedOperationException Exception = "UnsupportedOperationException" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// PossibleExceptionValues returns an array of possible values for the Exception const type. +func PossibleExceptionValues() []Exception { + return []Exception{ExceptionAccessControlException, ExceptionAdlsRemoteException, ExceptionBadOffsetException, ExceptionFileAlreadyExistsException, ExceptionFileNotFoundException, ExceptionIllegalArgumentException, ExceptionIOException, ExceptionRuntimeException, ExceptionSecurityException, ExceptionUnsupportedOperationException} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ExpiryOptionType enumerates the values for expiry option type. +type ExpiryOptionType string + +const ( + // Absolute ... + Absolute ExpiryOptionType = "Absolute" + // NeverExpire ... + NeverExpire ExpiryOptionType = "NeverExpire" + // RelativeToCreationDate ... + RelativeToCreationDate ExpiryOptionType = "RelativeToCreationDate" + // RelativeToNow ... + RelativeToNow ExpiryOptionType = "RelativeToNow" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// PossibleExpiryOptionTypeValues returns an array of possible values for the ExpiryOptionType const type. +func PossibleExpiryOptionTypeValues() []ExpiryOptionType { + return []ExpiryOptionType{Absolute, NeverExpire, RelativeToCreationDate, RelativeToNow} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// FileType enumerates the values for file type. +type FileType string + +const ( + // DIRECTORY ... + DIRECTORY FileType = "DIRECTORY" + // FILE ... + FILE FileType = "FILE" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// PossibleFileTypeValues returns an array of possible values for the FileType const type. +func PossibleFileTypeValues() []FileType { + return []FileType{DIRECTORY, FILE} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ACLStatus data Lake Store file or directory Access Control List information. +type ACLStatus struct { + // Entries - the list of ACLSpec entries on a file or directory. + Entries *[]string `json:"entries,omitempty"` + // Group - the group owner, an AAD Object ID. + Group *string `json:"group,omitempty"` + // Owner - the user owner, an AAD Object ID. + Owner *string `json:"owner,omitempty"` + // Permission - The octal representation of the unnamed user, mask and other permissions. + Permission *int32 `json:"permission,omitempty"` + // StickyBit - the indicator of whether the sticky bit is on or off. + StickyBit *bool `json:"stickyBit,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ACLStatusResult data Lake Store file or directory Access Control List information. +type ACLStatusResult struct { + autorest.Response `json:"-"` + // ACLStatus - the AclStatus object for a given file or directory. + ACLStatus *ACLStatus `json:"AclStatus,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AdlsAccessControlException a WebHDFS exception thrown indicating that access is denied due to insufficient +// permissions. Thrown when a 403 error response code is returned (forbidden). +type AdlsAccessControlException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' + Exception Exception `json:"exception,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MarshalJSON is the custom marshaler for AdlsAccessControlException. +func (aace AdlsAccessControlException) MarshalJSON() ([]byte, error) { + aace.Exception = ExceptionAccessControlException + objectMap := make(map[string]interface{}) + if aace.JavaClassName != nil { + objectMap["javaClassName"] = aace.JavaClassName + } + if aace.Message != nil { + objectMap["message"] = aace.Message + } + if aace.Exception != "" { + objectMap["exception"] = aace.Exception + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return &aace, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &aace, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AdlsBadOffsetException a WebHDFS exception thrown indicating the append or read is from a bad offset. Thrown +// when a 400 error response code is returned for append and open operations (Bad request). +type AdlsBadOffsetException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' + Exception Exception `json:"exception,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MarshalJSON is the custom marshaler for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) MarshalJSON() ([]byte, error) { + aboe.Exception = ExceptionBadOffsetException + objectMap := make(map[string]interface{}) + if aboe.JavaClassName != nil { + objectMap["javaClassName"] = aboe.JavaClassName + } + if aboe.Message != nil { + objectMap["message"] = aboe.Message + } + if aboe.Exception != "" { + objectMap["exception"] = aboe.Exception + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return &aboe, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &aboe, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AdlsError data Lake Store filesystem error containing a specific WebHDFS exception. +type AdlsError struct { + // RemoteException - the object representing the actual WebHDFS exception being returned. + RemoteException BasicAdlsRemoteException `json:"RemoteException,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// UnmarshalJSON is the custom unmarshaler for AdlsError struct. +func (ae *AdlsError) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "RemoteException": + if v != nil { + remoteException, err := unmarshalBasicAdlsRemoteException(*v) + if err != nil { + return err + } + ae.RemoteException = remoteException + } + } + } + + return nil +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AdlsFileAlreadyExistsException a WebHDFS exception thrown indicating the file or folder already exists. Thrown +// when a 403 error response code is returned (forbidden). +type AdlsFileAlreadyExistsException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' + Exception Exception `json:"exception,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MarshalJSON is the custom marshaler for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) MarshalJSON() ([]byte, error) { + afaee.Exception = ExceptionFileAlreadyExistsException + objectMap := make(map[string]interface{}) + if afaee.JavaClassName != nil { + objectMap["javaClassName"] = afaee.JavaClassName + } + if afaee.Message != nil { + objectMap["message"] = afaee.Message + } + if afaee.Exception != "" { + objectMap["exception"] = afaee.Exception + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return &afaee, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &afaee, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AdlsFileNotFoundException a WebHDFS exception thrown indicating the file or folder could not be found. Thrown +// when a 404 error response code is returned (not found). +type AdlsFileNotFoundException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' + Exception Exception `json:"exception,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MarshalJSON is the custom marshaler for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) MarshalJSON() ([]byte, error) { + afnfe.Exception = ExceptionFileNotFoundException + objectMap := make(map[string]interface{}) + if afnfe.JavaClassName != nil { + objectMap["javaClassName"] = afnfe.JavaClassName + } + if afnfe.Message != nil { + objectMap["message"] = afnfe.Message + } + if afnfe.Exception != "" { + objectMap["exception"] = afnfe.Exception + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return &afnfe, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &afnfe, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AdlsIllegalArgumentException a WebHDFS exception thrown indicating that one more arguments is incorrect. Thrown +// when a 400 error response code is returned (bad request). +type AdlsIllegalArgumentException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' + Exception Exception `json:"exception,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MarshalJSON is the custom marshaler for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) MarshalJSON() ([]byte, error) { + aiae.Exception = ExceptionIllegalArgumentException + objectMap := make(map[string]interface{}) + if aiae.JavaClassName != nil { + objectMap["javaClassName"] = aiae.JavaClassName + } + if aiae.Message != nil { + objectMap["message"] = aiae.Message + } + if aiae.Exception != "" { + objectMap["exception"] = aiae.Exception + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return &aiae, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &aiae, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AdlsIOException a WebHDFS exception thrown indicating there was an IO (read or write) error. Thrown when a 403 +// error response code is returned (forbidden). +type AdlsIOException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' + Exception Exception `json:"exception,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MarshalJSON is the custom marshaler for AdlsIOException. +func (aie AdlsIOException) MarshalJSON() ([]byte, error) { + aie.Exception = ExceptionIOException + objectMap := make(map[string]interface{}) + if aie.JavaClassName != nil { + objectMap["javaClassName"] = aie.JavaClassName + } + if aie.Message != nil { + objectMap["message"] = aie.Message + } + if aie.Exception != "" { + objectMap["exception"] = aie.Exception + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsIOException() (*AdlsIOException, bool) { + return &aie, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &aie, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// BasicAdlsRemoteException data Lake Store filesystem exception based on the WebHDFS definition for RemoteExceptions. +type BasicAdlsRemoteException interface { + AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) + AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) + AsAdlsSecurityException() (*AdlsSecurityException, bool) + AsAdlsIOException() (*AdlsIOException, bool) + AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) + AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) + AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) + AsAdlsRuntimeException() (*AdlsRuntimeException, bool) + AsAdlsAccessControlException() (*AdlsAccessControlException, bool) + AsAdlsRemoteException() (*AdlsRemoteException, bool) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AdlsRemoteException data Lake Store filesystem exception based on the WebHDFS definition for RemoteExceptions. +type AdlsRemoteException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' + Exception Exception `json:"exception,omitempty"` +} + +func unmarshalBasicAdlsRemoteException(body []byte) (BasicAdlsRemoteException, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["exception"] { + case string(ExceptionIllegalArgumentException): + var aiae AdlsIllegalArgumentException + err := json.Unmarshal(body, &aiae) + return aiae, err + case string(ExceptionUnsupportedOperationException): + var auoe AdlsUnsupportedOperationException + err := json.Unmarshal(body, &auoe) + return auoe, err + case string(ExceptionSecurityException): + var ase AdlsSecurityException + err := json.Unmarshal(body, &ase) + return ase, err + case string(ExceptionIOException): + var aie AdlsIOException + err := json.Unmarshal(body, &aie) + return aie, err + case string(ExceptionFileNotFoundException): + var afnfe AdlsFileNotFoundException + err := json.Unmarshal(body, &afnfe) + return afnfe, err + case string(ExceptionFileAlreadyExistsException): + var afaee AdlsFileAlreadyExistsException + err := json.Unmarshal(body, &afaee) + return afaee, err + case string(ExceptionBadOffsetException): + var aboe AdlsBadOffsetException + err := json.Unmarshal(body, &aboe) + return aboe, err + case string(ExceptionRuntimeException): + var are AdlsRuntimeException + err := json.Unmarshal(body, &are) + return are, err + case string(ExceptionAccessControlException): + var aace AdlsAccessControlException + err := json.Unmarshal(body, &aace) + return aace, err + default: + var are AdlsRemoteException + err := json.Unmarshal(body, &are) + return are, err + } +} +func unmarshalBasicAdlsRemoteExceptionArray(body []byte) ([]BasicAdlsRemoteException, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + areArray := make([]BasicAdlsRemoteException, len(rawMessages)) + + for index, rawMessage := range rawMessages { + are, err := unmarshalBasicAdlsRemoteException(*rawMessage) + if err != nil { + return nil, err + } + areArray[index] = are + } + return areArray, nil +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MarshalJSON is the custom marshaler for AdlsRemoteException. +func (are AdlsRemoteException) MarshalJSON() ([]byte, error) { + are.Exception = ExceptionAdlsRemoteException + objectMap := make(map[string]interface{}) + if are.JavaClassName != nil { + objectMap["javaClassName"] = are.JavaClassName + } + if are.Message != nil { + objectMap["message"] = are.Message + } + if are.Exception != "" { + objectMap["exception"] = are.Exception + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return &are, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &are, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AdlsRuntimeException a WebHDFS exception thrown when an unexpected error occurs during an operation. Thrown when +// a 500 error response code is returned (Internal server error). +type AdlsRuntimeException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' + Exception Exception `json:"exception,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MarshalJSON is the custom marshaler for AdlsRuntimeException. +func (are AdlsRuntimeException) MarshalJSON() ([]byte, error) { + are.Exception = ExceptionRuntimeException + objectMap := make(map[string]interface{}) + if are.JavaClassName != nil { + objectMap["javaClassName"] = are.JavaClassName + } + if are.Message != nil { + objectMap["message"] = are.Message + } + if are.Exception != "" { + objectMap["exception"] = are.Exception + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return &are, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &are, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AdlsSecurityException a WebHDFS exception thrown indicating that access is denied. Thrown when a 401 error +// response code is returned (Unauthorized). +type AdlsSecurityException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' + Exception Exception `json:"exception,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MarshalJSON is the custom marshaler for AdlsSecurityException. +func (ase AdlsSecurityException) MarshalJSON() ([]byte, error) { + ase.Exception = ExceptionSecurityException + objectMap := make(map[string]interface{}) + if ase.JavaClassName != nil { + objectMap["javaClassName"] = ase.JavaClassName + } + if ase.Message != nil { + objectMap["message"] = ase.Message + } + if ase.Exception != "" { + objectMap["exception"] = ase.Exception + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return &ase, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &ase, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AdlsUnsupportedOperationException a WebHDFS exception thrown indicating that the requested operation is not +// supported. Thrown when a 400 error response code is returned (bad request). +type AdlsUnsupportedOperationException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' + Exception Exception `json:"exception,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// MarshalJSON is the custom marshaler for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) MarshalJSON() ([]byte, error) { + auoe.Exception = ExceptionUnsupportedOperationException + objectMap := make(map[string]interface{}) + if auoe.JavaClassName != nil { + objectMap["javaClassName"] = auoe.JavaClassName + } + if auoe.Message != nil { + objectMap["message"] = auoe.Message + } + if auoe.Exception != "" { + objectMap["exception"] = auoe.Exception + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return &auoe, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &auoe, true +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ContentSummary data Lake Store content summary information +type ContentSummary struct { + // DirectoryCount - the number of directories. + DirectoryCount *int64 `json:"directoryCount,omitempty"` + // FileCount - the number of files. + FileCount *int64 `json:"fileCount,omitempty"` + // Length - the number of bytes used by the contet. + Length *int64 `json:"length,omitempty"` + // SpaceConsumed - the disk space consumed by the content. + SpaceConsumed *int64 `json:"spaceConsumed,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ContentSummaryResult data Lake Store filesystem content summary information response. +type ContentSummaryResult struct { + autorest.Response `json:"-"` + // ContentSummary - the content summary for the specified path + ContentSummary *ContentSummary `json:"ContentSummary,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// FileOperationResult the result of the request or operation. +type FileOperationResult struct { + autorest.Response `json:"-"` + // OperationResult - the result of the operation or request. + OperationResult *bool `json:"boolean,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// FileStatuses data Lake Store file status list information. +type FileStatuses struct { + // FileStatus - the object containing the list of properties of the files. + FileStatus *[]FileStatusProperties `json:"FileStatus,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// FileStatusesResult data Lake Store filesystem file status list information response. +type FileStatusesResult struct { + autorest.Response `json:"-"` + // FileStatuses - the object representing the list of file statuses. + FileStatuses *FileStatuses `json:"FileStatuses,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// FileStatusProperties data Lake Store file or directory information. +type FileStatusProperties struct { + // AccessTime - the last access time as ticks since the epoch. + AccessTime *int64 `json:"accessTime,omitempty"` + // BlockSize - the block size for the file. + BlockSize *int64 `json:"blockSize,omitempty"` + // ChildrenNum - the number of children in the directory. + ChildrenNum *int64 `json:"childrenNum,omitempty"` + // ExpirationTime - Gets the expiration time, if any, as ticks since the epoch. If this is set to 0 or DateTime.MaxValue there is no expiration. + ExpirationTime *int64 `json:"expirationTime,omitempty"` + // Group - the group owner. + Group *string `json:"group,omitempty"` + // Length - the number of bytes in a file. + Length *int64 `json:"length,omitempty"` + // ModificationTime - the modification time as ticks since the epoch. + ModificationTime *int64 `json:"modificationTime,omitempty"` + // Owner - the user who is the owner. + Owner *string `json:"owner,omitempty"` + // PathSuffix - the path suffix. + PathSuffix *string `json:"pathSuffix,omitempty"` + // Permission - the permission represented as an string. + Permission *string `json:"permission,omitempty"` + // Type - the type of the path object. Possible values include: 'FILE', 'DIRECTORY' + Type FileType `json:"type,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// FileStatusResult data Lake Store filesystem file status information response. +type FileStatusResult struct { + autorest.Response `json:"-"` + // FileStatus - the file status object associated with the specified path. + FileStatus *FileStatusProperties `json:"FileStatus,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// ReadCloser ... +type ReadCloser struct { + autorest.Response `json:"-"` + Value *io.ReadCloser `json:"value,omitempty"` +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/version.go new file mode 100644 index 000000000000..39bcd68c0402 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/version.go @@ -0,0 +1,31 @@ +package filesystem + +import "github.com/Azure/azure-sdk-for-go/version" + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// UserAgent returns the UserAgent string to use when sending http.Requests. +func UserAgent() string { + return "Azure-SDK-For-Go/" + version.Number + " filesystem/2015-10-01-preview" +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. +// Version returns the semantic version (see http://semver.org) of the client. +func Version() string { + return version.Number +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/client.go new file mode 100644 index 000000000000..ed15265f06e4 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/client.go @@ -0,0 +1,49 @@ +// Package filesystem implements the Azure ARM Filesystem service API version 2016-11-01. +// +// Creates an Azure Data Lake Store filesystem client. +package filesystem + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" +) + +const ( + // DefaultAdlsFileSystemDNSSuffix is the default value for adls file system dns suffix + DefaultAdlsFileSystemDNSSuffix = "azuredatalakestore.net" +) + +// BaseClient is the base client for Filesystem. +type BaseClient struct { + autorest.Client + AdlsFileSystemDNSSuffix string +} + +// New creates an instance of the BaseClient client. +func New() BaseClient { + return NewWithoutDefaults(DefaultAdlsFileSystemDNSSuffix) +} + +// NewWithoutDefaults creates an instance of the BaseClient client. +func NewWithoutDefaults(adlsFileSystemDNSSuffix string) BaseClient { + return BaseClient{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + AdlsFileSystemDNSSuffix: adlsFileSystemDNSSuffix, + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/filesystem.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/filesystem.go new file mode 100644 index 000000000000..9a03cec7936d --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/filesystem.go @@ -0,0 +1,1804 @@ +package filesystem + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "github.com/satori/go.uuid" + "io" + "net/http" +) + +// Client is the creates an Azure Data Lake Store filesystem client. +type Client struct { + BaseClient +} + +// NewClient creates an instance of the Client client. +func NewClient() Client { + return Client{New()} +} + +// Append used for serial appends to the specified file. NOTE: The target must not contain data added by +// ConcurrentAppend. ConcurrentAppend and Append cannot be used interchangeably; once a target file has been modified +// using either of these append options, the other append option cannot be used on the target file. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file to which to append. +// streamContents - the file contents to include when appending to the file. +// offset - the optional offset in the stream to begin the append operation. Default is to append at the end of +// the stream. +// syncFlag - optionally indicates what to do after completion of the concurrent append. DATA indicates that +// more data will be sent immediately by the client, the file handle should remain open/locked, and file +// metadata (including file length, last modified time) should NOT get updated. METADATA indicates that more +// data will be sent immediately by the client, the file handle should remain open/locked, and file metadata +// should get updated. CLOSE indicates that the client is done sending data, the file handle should be +// closed/unlocked, and file metadata should get updated. +// leaseID - optional unique GUID per file to ensure single writer semantics, meaning that only clients that +// append to the file with the same leaseId will be allowed to do so. +// fileSessionID - optional unique GUID per file indicating all the appends with the same fileSessionId are +// from the same client and same session. This will give a performance benefit when syncFlag is DATA or +// METADATA. +func (client Client) Append(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, offset *int64, syncFlag SyncFlag, leaseID *uuid.UUID, fileSessionID *uuid.UUID) (result autorest.Response, err error) { + req, err := client.AppendPreparer(ctx, accountName, pathParameter, streamContents, offset, syncFlag, leaseID, fileSessionID) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Append", nil, "Failure preparing request") + return + } + + resp, err := client.AppendSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "Append", resp, "Failure sending request") + return + } + + result, err = client.AppendResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Append", resp, "Failure responding to request") + } + + return +} + +// AppendPreparer prepares the Append request. +func (client Client) AppendPreparer(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, offset *int64, syncFlag SyncFlag, leaseID *uuid.UUID, fileSessionID *uuid.UUID) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "append": autorest.Encode("query", "true"), + "op": autorest.Encode("query", "APPEND"), + } + if offset != nil { + queryParameters["offset"] = autorest.Encode("query", *offset) + } + if len(string(syncFlag)) > 0 { + queryParameters["syncFlag"] = autorest.Encode("query", syncFlag) + } else { + queryParameters["syncFlag"] = autorest.Encode("query", "CLOSE") + } + if leaseID != nil { + queryParameters["leaseId"] = autorest.Encode("query", *leaseID) + } + if fileSessionID != nil { + queryParameters["fileSessionId"] = autorest.Encode("query", *fileSessionID) + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/octet-stream"), + autorest.AsPost(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithFile(streamContents), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// AppendSender sends the Append request. The method will close the +// http.Response Body if it receives an error. +func (client Client) AppendSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// AppendResponder handles the response to the Append request. The method always +// closes the http.Response Body. +func (client Client) AppendResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// CheckAccess checks if the specified access is available at the given path. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file or directory for which to check +// access. +// fsaction - file system operation read/write/execute in string form, matching regex pattern '[rwx-]{3}' +func (client Client) CheckAccess(ctx context.Context, accountName string, pathParameter string, fsaction string) (result autorest.Response, err error) { + req, err := client.CheckAccessPreparer(ctx, accountName, pathParameter, fsaction) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "CheckAccess", nil, "Failure preparing request") + return + } + + resp, err := client.CheckAccessSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "CheckAccess", resp, "Failure sending request") + return + } + + result, err = client.CheckAccessResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "CheckAccess", resp, "Failure responding to request") + } + + return +} + +// CheckAccessPreparer prepares the CheckAccess request. +func (client Client) CheckAccessPreparer(ctx context.Context, accountName string, pathParameter string, fsaction string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "fsaction": autorest.Encode("query", fsaction), + "op": autorest.Encode("query", "CHECKACCESS"), + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CheckAccessSender sends the CheckAccess request. The method will close the +// http.Response Body if it receives an error. +func (client Client) CheckAccessSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// CheckAccessResponder handles the response to the CheckAccess request. The method always +// closes the http.Response Body. +func (client Client) CheckAccessResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Concat concatenates the list of source files into the destination file, removing all source files upon success. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the destination file resulting from the +// concatenation. +// sources - a list of comma separated Data Lake Store paths (starting with '/') of the files to concatenate, +// in the order in which they should be concatenated. +func (client Client) Concat(ctx context.Context, accountName string, pathParameter string, sources []string) (result autorest.Response, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: sources, + Constraints: []validation.Constraint{{Target: "sources", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { + return result, validation.NewError("filesystem.Client", "Concat", err.Error()) + } + + req, err := client.ConcatPreparer(ctx, accountName, pathParameter, sources) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Concat", nil, "Failure preparing request") + return + } + + resp, err := client.ConcatSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "Concat", resp, "Failure sending request") + return + } + + result, err = client.ConcatResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Concat", resp, "Failure responding to request") + } + + return +} + +// ConcatPreparer prepares the Concat request. +func (client Client) ConcatPreparer(ctx context.Context, accountName string, pathParameter string, sources []string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "CONCAT"), + "sources": autorest.Encode("query", sources, ","), + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ConcatSender sends the Concat request. The method will close the +// http.Response Body if it receives an error. +func (client Client) ConcatSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// ConcatResponder handles the response to the Concat request. The method always +// closes the http.Response Body. +func (client Client) ConcatResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// ConcurrentAppend appends to the specified file, optionally first creating the file if it does not yet exist. This +// method supports multiple concurrent appends to the file. NOTE: The target must not contain data added by Create or +// normal (serial) Append. ConcurrentAppend and Append cannot be used interchangeably; once a target file has been +// modified using either of these append options, the other append option cannot be used on the target file. +// ConcurrentAppend does not guarantee order and can result in duplicated data landing in the target file. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file to which to append using concurrent +// append. +// streamContents - the file contents to include when appending to the file. +// appendMode - indicates the concurrent append call should create the file if it doesn't exist or just open +// the existing file for append +// syncFlag - optionally indicates what to do after completion of the concurrent append. DATA indicates that +// more data will be sent immediately by the client, the file handle should remain open/locked, and file +// metadata (including file length, last modified time) should NOT get updated. METADATA indicates that more +// data will be sent immediately by the client, the file handle should remain open/locked, and file metadata +// should get updated. CLOSE indicates that the client is done sending data, the file handle should be +// closed/unlocked, and file metadata should get updated. +func (client Client) ConcurrentAppend(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, appendMode AppendModeType, syncFlag SyncFlag) (result autorest.Response, err error) { + req, err := client.ConcurrentAppendPreparer(ctx, accountName, pathParameter, streamContents, appendMode, syncFlag) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "ConcurrentAppend", nil, "Failure preparing request") + return + } + + resp, err := client.ConcurrentAppendSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "ConcurrentAppend", resp, "Failure sending request") + return + } + + result, err = client.ConcurrentAppendResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "ConcurrentAppend", resp, "Failure responding to request") + } + + return +} + +// ConcurrentAppendPreparer prepares the ConcurrentAppend request. +func (client Client) ConcurrentAppendPreparer(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, appendMode AppendModeType, syncFlag SyncFlag) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "CONCURRENTAPPEND"), + } + if len(string(appendMode)) > 0 { + queryParameters["appendMode"] = autorest.Encode("query", appendMode) + } + if len(string(syncFlag)) > 0 { + queryParameters["syncFlag"] = autorest.Encode("query", syncFlag) + } else { + queryParameters["syncFlag"] = autorest.Encode("query", "DATA") + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/octet-stream"), + autorest.AsPost(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/WebHdfsExt/{path}", pathParameters), + autorest.WithFile(streamContents), + autorest.WithQueryParameters(queryParameters), + autorest.WithHeader("Transfer-Encoding", "chunked")) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ConcurrentAppendSender sends the ConcurrentAppend request. The method will close the +// http.Response Body if it receives an error. +func (client Client) ConcurrentAppendSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// ConcurrentAppendResponder handles the response to the ConcurrentAppend request. The method always +// closes the http.Response Body. +func (client Client) ConcurrentAppendResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Create creates a file with optionally specified content. NOTE: If content is provided, the resulting file cannot be +// modified using ConcurrentAppend. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file to create. +// streamContents - the file contents to include when creating the file. This parameter is optional, resulting +// in an empty file if not specified. +// overwrite - the indication of if the file should be overwritten. +// syncFlag - optionally indicates what to do after completion of the create. DATA indicates that more data +// will be sent immediately by the client, the file handle should remain open/locked, and file metadata +// (including file length, last modified time) should NOT get updated. METADATA indicates that more data will +// be sent immediately by the client, the file handle should remain open/locked, and file metadata should get +// updated. CLOSE indicates that the client is done sending data, the file handle should be closed/unlocked, +// and file metadata should get updated. +// leaseID - optional unique GUID per file to ensure single writer semantics, meaning that only clients that +// append to the file with the same leaseId will be allowed to do so. +// permission - the octal representation of the unnamed user, mask and other permissions that should be set for +// the file when created. If not specified, it inherits these from the container. +func (client Client) Create(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, overwrite *bool, syncFlag SyncFlag, leaseID *uuid.UUID, permission *int32) (result autorest.Response, err error) { + req, err := client.CreatePreparer(ctx, accountName, pathParameter, streamContents, overwrite, syncFlag, leaseID, permission) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Create", nil, "Failure preparing request") + return + } + + resp, err := client.CreateSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "Create", resp, "Failure sending request") + return + } + + result, err = client.CreateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Create", resp, "Failure responding to request") + } + + return +} + +// CreatePreparer prepares the Create request. +func (client Client) CreatePreparer(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, overwrite *bool, syncFlag SyncFlag, leaseID *uuid.UUID, permission *int32) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "CREATE"), + "write": autorest.Encode("query", "true"), + } + if overwrite != nil { + queryParameters["overwrite"] = autorest.Encode("query", *overwrite) + } + if len(string(syncFlag)) > 0 { + queryParameters["syncFlag"] = autorest.Encode("query", syncFlag) + } else { + queryParameters["syncFlag"] = autorest.Encode("query", "CLOSE") + } + if leaseID != nil { + queryParameters["leaseId"] = autorest.Encode("query", *leaseID) + } + if permission != nil { + queryParameters["permission"] = autorest.Encode("query", *permission) + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/octet-stream"), + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + if streamContents != nil { + preparer = autorest.DecoratePreparer(preparer, + autorest.WithFile(streamContents)) + } + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateSender sends the Create request. The method will close the +// http.Response Body if it receives an error. +func (client Client) CreateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// CreateResponder handles the response to the Create request. The method always +// closes the http.Response Body. +func (client Client) CreateResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByClosing()) + result.Response = resp + return +} + +// Delete deletes the requested file or directory, optionally recursively. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file or directory to delete. +// recursive - the optional switch indicating if the delete should be recursive +func (client Client) Delete(ctx context.Context, accountName string, pathParameter string, recursive *bool) (result FileOperationResult, err error) { + req, err := client.DeletePreparer(ctx, accountName, pathParameter, recursive) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client Client) DeletePreparer(ctx context.Context, accountName string, pathParameter string, recursive *bool) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "DELETE"), + } + if recursive != nil { + queryParameters["recursive"] = autorest.Encode("query", *recursive) + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client Client) DeleteSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client Client) DeleteResponder(resp *http.Response) (result FileOperationResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetACLStatus gets Access Control List (ACL) entries for the specified file or directory. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file or directory for which to get the +// ACL. +// tooID - an optional switch to return friendly names in place of object ID for ACL entries. tooid=false +// returns friendly names instead of the AAD Object ID. Default value is true, returning AAD object IDs. +func (client Client) GetACLStatus(ctx context.Context, accountName string, pathParameter string, tooID *bool) (result ACLStatusResult, err error) { + req, err := client.GetACLStatusPreparer(ctx, accountName, pathParameter, tooID) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetACLStatus", nil, "Failure preparing request") + return + } + + resp, err := client.GetACLStatusSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetACLStatus", resp, "Failure sending request") + return + } + + result, err = client.GetACLStatusResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetACLStatus", resp, "Failure responding to request") + } + + return +} + +// GetACLStatusPreparer prepares the GetACLStatus request. +func (client Client) GetACLStatusPreparer(ctx context.Context, accountName string, pathParameter string, tooID *bool) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "GETACLSTATUS"), + } + if tooID != nil { + queryParameters["tooId"] = autorest.Encode("query", *tooID) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetACLStatusSender sends the GetACLStatus request. The method will close the +// http.Response Body if it receives an error. +func (client Client) GetACLStatusSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// GetACLStatusResponder handles the response to the GetACLStatus request. The method always +// closes the http.Response Body. +func (client Client) GetACLStatusResponder(resp *http.Response) (result ACLStatusResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetContentSummary gets the file content summary object specified by the file path. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file for which to retrieve the summary. +func (client Client) GetContentSummary(ctx context.Context, accountName string, pathParameter string) (result ContentSummaryResult, err error) { + req, err := client.GetContentSummaryPreparer(ctx, accountName, pathParameter) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetContentSummary", nil, "Failure preparing request") + return + } + + resp, err := client.GetContentSummarySender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetContentSummary", resp, "Failure sending request") + return + } + + result, err = client.GetContentSummaryResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetContentSummary", resp, "Failure responding to request") + } + + return +} + +// GetContentSummaryPreparer prepares the GetContentSummary request. +func (client Client) GetContentSummaryPreparer(ctx context.Context, accountName string, pathParameter string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "GETCONTENTSUMMARY"), + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetContentSummarySender sends the GetContentSummary request. The method will close the +// http.Response Body if it receives an error. +func (client Client) GetContentSummarySender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// GetContentSummaryResponder handles the response to the GetContentSummary request. The method always +// closes the http.Response Body. +func (client Client) GetContentSummaryResponder(resp *http.Response) (result ContentSummaryResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetFileStatus get the file status object specified by the file path. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file or directory for which to retrieve +// the status. +// tooID - an optional switch to return friendly names in place of owner and group. tooid=false returns +// friendly names instead of the AAD Object ID. Default value is true, returning AAD object IDs. +func (client Client) GetFileStatus(ctx context.Context, accountName string, pathParameter string, tooID *bool) (result FileStatusResult, err error) { + req, err := client.GetFileStatusPreparer(ctx, accountName, pathParameter, tooID) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetFileStatus", nil, "Failure preparing request") + return + } + + resp, err := client.GetFileStatusSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetFileStatus", resp, "Failure sending request") + return + } + + result, err = client.GetFileStatusResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "GetFileStatus", resp, "Failure responding to request") + } + + return +} + +// GetFileStatusPreparer prepares the GetFileStatus request. +func (client Client) GetFileStatusPreparer(ctx context.Context, accountName string, pathParameter string, tooID *bool) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "GETFILESTATUS"), + } + if tooID != nil { + queryParameters["tooId"] = autorest.Encode("query", *tooID) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetFileStatusSender sends the GetFileStatus request. The method will close the +// http.Response Body if it receives an error. +func (client Client) GetFileStatusSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// GetFileStatusResponder handles the response to the GetFileStatus request. The method always +// closes the http.Response Body. +func (client Client) GetFileStatusResponder(resp *http.Response) (result FileStatusResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListFileStatus get the list of file status objects specified by the file path, with optional pagination parameters +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the directory to list. +// listSize - gets or sets the number of items to return. Optional. +// listAfter - gets or sets the item or lexographical index after which to begin returning results. For +// example, a file list of 'a','b','d' and listAfter='b' will return 'd', and a listAfter='c' will also return +// 'd'. Optional. +// listBefore - gets or sets the item or lexographical index before which to begin returning results. For +// example, a file list of 'a','b','d' and listBefore='d' will return 'a','b', and a listBefore='c' will also +// return 'a','b'. Optional. +// tooID - an optional switch to return friendly names in place of owner and group. tooid=false returns +// friendly names instead of the AAD Object ID. Default value is true, returning AAD object IDs. +func (client Client) ListFileStatus(ctx context.Context, accountName string, pathParameter string, listSize *int32, listAfter string, listBefore string, tooID *bool) (result FileStatusesResult, err error) { + req, err := client.ListFileStatusPreparer(ctx, accountName, pathParameter, listSize, listAfter, listBefore, tooID) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "ListFileStatus", nil, "Failure preparing request") + return + } + + resp, err := client.ListFileStatusSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "ListFileStatus", resp, "Failure sending request") + return + } + + result, err = client.ListFileStatusResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "ListFileStatus", resp, "Failure responding to request") + } + + return +} + +// ListFileStatusPreparer prepares the ListFileStatus request. +func (client Client) ListFileStatusPreparer(ctx context.Context, accountName string, pathParameter string, listSize *int32, listAfter string, listBefore string, tooID *bool) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "LISTSTATUS"), + } + if listSize != nil { + queryParameters["listSize"] = autorest.Encode("query", *listSize) + } + if len(listAfter) > 0 { + queryParameters["listAfter"] = autorest.Encode("query", listAfter) + } + if len(listBefore) > 0 { + queryParameters["listBefore"] = autorest.Encode("query", listBefore) + } + if tooID != nil { + queryParameters["tooId"] = autorest.Encode("query", *tooID) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListFileStatusSender sends the ListFileStatus request. The method will close the +// http.Response Body if it receives an error. +func (client Client) ListFileStatusSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// ListFileStatusResponder handles the response to the ListFileStatus request. The method always +// closes the http.Response Body. +func (client Client) ListFileStatusResponder(resp *http.Response) (result FileStatusesResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Mkdirs creates a directory. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the directory to create. +// permission - optional octal permission with which the directory should be created. +func (client Client) Mkdirs(ctx context.Context, accountName string, pathParameter string, permission *int32) (result FileOperationResult, err error) { + req, err := client.MkdirsPreparer(ctx, accountName, pathParameter, permission) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Mkdirs", nil, "Failure preparing request") + return + } + + resp, err := client.MkdirsSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "Mkdirs", resp, "Failure sending request") + return + } + + result, err = client.MkdirsResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Mkdirs", resp, "Failure responding to request") + } + + return +} + +// MkdirsPreparer prepares the Mkdirs request. +func (client Client) MkdirsPreparer(ctx context.Context, accountName string, pathParameter string, permission *int32) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "MKDIRS"), + } + if permission != nil { + queryParameters["permission"] = autorest.Encode("query", *permission) + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// MkdirsSender sends the Mkdirs request. The method will close the +// http.Response Body if it receives an error. +func (client Client) MkdirsSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// MkdirsResponder handles the response to the Mkdirs request. The method always +// closes the http.Response Body. +func (client Client) MkdirsResponder(resp *http.Response) (result FileOperationResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ModifyACLEntries modifies existing Access Control List (ACL) entries on a file or folder. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file or directory with the ACL being +// modified. +// aclspec - the ACL specification included in ACL modification operations in the format +// '[default:]user|group|other::r|-w|-x|-' +func (client Client) ModifyACLEntries(ctx context.Context, accountName string, pathParameter string, aclspec string) (result autorest.Response, err error) { + req, err := client.ModifyACLEntriesPreparer(ctx, accountName, pathParameter, aclspec) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "ModifyACLEntries", nil, "Failure preparing request") + return + } + + resp, err := client.ModifyACLEntriesSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "ModifyACLEntries", resp, "Failure sending request") + return + } + + result, err = client.ModifyACLEntriesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "ModifyACLEntries", resp, "Failure responding to request") + } + + return +} + +// ModifyACLEntriesPreparer prepares the ModifyACLEntries request. +func (client Client) ModifyACLEntriesPreparer(ctx context.Context, accountName string, pathParameter string, aclspec string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "aclspec": autorest.Encode("query", aclspec), + "api-version": APIVersion, + "op": autorest.Encode("query", "MODIFYACLENTRIES"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ModifyACLEntriesSender sends the ModifyACLEntries request. The method will close the +// http.Response Body if it receives an error. +func (client Client) ModifyACLEntriesSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// ModifyACLEntriesResponder handles the response to the ModifyACLEntries request. The method always +// closes the http.Response Body. +func (client Client) ModifyACLEntriesResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// MsConcat concatenates the list of source files into the destination file, deleting all source files upon success. +// This method accepts more source file paths than the Concat method. This method and the parameters it accepts are +// subject to change for usability in an upcoming version. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the destination file resulting from the +// concatenation. +// streamContents - a list of Data Lake Store paths (starting with '/') of the source files. Must be a +// comma-separated path list in the format: sources=/file/path/1.txt,/file/path/2.txt,/file/path/lastfile.csv +// deleteSourceDirectory - indicates that as an optimization instead of deleting each individual source stream, +// delete the source stream folder if all streams are in the same folder instead. This results in a substantial +// performance improvement when the only streams in the folder are part of the concatenation operation. +// WARNING: This includes the deletion of any other files that are not source files. Only set this to true when +// source files are the only files in the source directory. +func (client Client) MsConcat(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, deleteSourceDirectory *bool) (result autorest.Response, err error) { + req, err := client.MsConcatPreparer(ctx, accountName, pathParameter, streamContents, deleteSourceDirectory) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "MsConcat", nil, "Failure preparing request") + return + } + + resp, err := client.MsConcatSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "MsConcat", resp, "Failure sending request") + return + } + + result, err = client.MsConcatResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "MsConcat", resp, "Failure responding to request") + } + + return +} + +// MsConcatPreparer prepares the MsConcat request. +func (client Client) MsConcatPreparer(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, deleteSourceDirectory *bool) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "MSCONCAT"), + } + if deleteSourceDirectory != nil { + queryParameters["deleteSourceDirectory"] = autorest.Encode("query", *deleteSourceDirectory) + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/octet-stream"), + autorest.AsPost(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithFile(streamContents), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// MsConcatSender sends the MsConcat request. The method will close the +// http.Response Body if it receives an error. +func (client Client) MsConcatSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// MsConcatResponder handles the response to the MsConcat request. The method always +// closes the http.Response Body. +func (client Client) MsConcatResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Open opens and reads from the specified file. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file to open. +// length - the number of bytes that the server will attempt to retrieve. It will retrieve <= length bytes. +// offset - the byte offset to start reading data from. +// fileSessionID - optional unique GUID per file indicating all the reads with the same fileSessionId are from +// the same client and same session. This will give a performance benefit. +func (client Client) Open(ctx context.Context, accountName string, pathParameter string, length *int64, offset *int64, fileSessionID *uuid.UUID) (result ReadCloser, err error) { + req, err := client.OpenPreparer(ctx, accountName, pathParameter, length, offset, fileSessionID) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Open", nil, "Failure preparing request") + return + } + + resp, err := client.OpenSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "Open", resp, "Failure sending request") + return + } + + result, err = client.OpenResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Open", resp, "Failure responding to request") + } + + return +} + +// OpenPreparer prepares the Open request. +func (client Client) OpenPreparer(ctx context.Context, accountName string, pathParameter string, length *int64, offset *int64, fileSessionID *uuid.UUID) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "OPEN"), + "read": autorest.Encode("query", "true"), + } + if length != nil { + queryParameters["length"] = autorest.Encode("query", *length) + } + if offset != nil { + queryParameters["offset"] = autorest.Encode("query", *offset) + } + if fileSessionID != nil { + queryParameters["fileSessionId"] = autorest.Encode("query", *fileSessionID) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// OpenSender sends the Open request. The method will close the +// http.Response Body if it receives an error. +func (client Client) OpenSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// OpenResponder handles the response to the Open request. The method always +// closes the http.Response Body. +func (client Client) OpenResponder(resp *http.Response) (result ReadCloser, err error) { + result.Value = &resp.Body + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK)) + result.Response = autorest.Response{Response: resp} + return +} + +// RemoveACL removes the existing Access Control List (ACL) of the specified file or directory. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file or directory with the ACL being +// removed. +func (client Client) RemoveACL(ctx context.Context, accountName string, pathParameter string) (result autorest.Response, err error) { + req, err := client.RemoveACLPreparer(ctx, accountName, pathParameter) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACL", nil, "Failure preparing request") + return + } + + resp, err := client.RemoveACLSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACL", resp, "Failure sending request") + return + } + + result, err = client.RemoveACLResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACL", resp, "Failure responding to request") + } + + return +} + +// RemoveACLPreparer prepares the RemoveACL request. +func (client Client) RemoveACLPreparer(ctx context.Context, accountName string, pathParameter string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "REMOVEACL"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// RemoveACLSender sends the RemoveACL request. The method will close the +// http.Response Body if it receives an error. +func (client Client) RemoveACLSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// RemoveACLResponder handles the response to the RemoveACL request. The method always +// closes the http.Response Body. +func (client Client) RemoveACLResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// RemoveACLEntries removes existing Access Control List (ACL) entries for a file or folder. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file or directory with the ACL being +// removed. +// aclspec - the ACL spec included in ACL removal operations in the format '[default:]user|group|other' +func (client Client) RemoveACLEntries(ctx context.Context, accountName string, pathParameter string, aclspec string) (result autorest.Response, err error) { + req, err := client.RemoveACLEntriesPreparer(ctx, accountName, pathParameter, aclspec) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACLEntries", nil, "Failure preparing request") + return + } + + resp, err := client.RemoveACLEntriesSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACLEntries", resp, "Failure sending request") + return + } + + result, err = client.RemoveACLEntriesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACLEntries", resp, "Failure responding to request") + } + + return +} + +// RemoveACLEntriesPreparer prepares the RemoveACLEntries request. +func (client Client) RemoveACLEntriesPreparer(ctx context.Context, accountName string, pathParameter string, aclspec string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "aclspec": autorest.Encode("query", aclspec), + "api-version": APIVersion, + "op": autorest.Encode("query", "REMOVEACLENTRIES"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// RemoveACLEntriesSender sends the RemoveACLEntries request. The method will close the +// http.Response Body if it receives an error. +func (client Client) RemoveACLEntriesSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// RemoveACLEntriesResponder handles the response to the RemoveACLEntries request. The method always +// closes the http.Response Body. +func (client Client) RemoveACLEntriesResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// RemoveDefaultACL removes the existing Default Access Control List (ACL) of the specified directory. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the directory with the default ACL being +// removed. +func (client Client) RemoveDefaultACL(ctx context.Context, accountName string, pathParameter string) (result autorest.Response, err error) { + req, err := client.RemoveDefaultACLPreparer(ctx, accountName, pathParameter) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveDefaultACL", nil, "Failure preparing request") + return + } + + resp, err := client.RemoveDefaultACLSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveDefaultACL", resp, "Failure sending request") + return + } + + result, err = client.RemoveDefaultACLResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveDefaultACL", resp, "Failure responding to request") + } + + return +} + +// RemoveDefaultACLPreparer prepares the RemoveDefaultACL request. +func (client Client) RemoveDefaultACLPreparer(ctx context.Context, accountName string, pathParameter string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "REMOVEDEFAULTACL"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// RemoveDefaultACLSender sends the RemoveDefaultACL request. The method will close the +// http.Response Body if it receives an error. +func (client Client) RemoveDefaultACLSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// RemoveDefaultACLResponder handles the response to the RemoveDefaultACL request. The method always +// closes the http.Response Body. +func (client Client) RemoveDefaultACLResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Rename rename a file or directory. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file or directory to move/rename. +// destination - the path to move/rename the file or folder to +func (client Client) Rename(ctx context.Context, accountName string, pathParameter string, destination string) (result FileOperationResult, err error) { + req, err := client.RenamePreparer(ctx, accountName, pathParameter, destination) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Rename", nil, "Failure preparing request") + return + } + + resp, err := client.RenameSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "filesystem.Client", "Rename", resp, "Failure sending request") + return + } + + result, err = client.RenameResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "Rename", resp, "Failure responding to request") + } + + return +} + +// RenamePreparer prepares the Rename request. +func (client Client) RenamePreparer(ctx context.Context, accountName string, pathParameter string, destination string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "destination": autorest.Encode("query", destination), + "op": autorest.Encode("query", "RENAME"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// RenameSender sends the Rename request. The method will close the +// http.Response Body if it receives an error. +func (client Client) RenameSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// RenameResponder handles the response to the Rename request. The method always +// closes the http.Response Body. +func (client Client) RenameResponder(resp *http.Response) (result FileOperationResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// SetACL sets the Access Control List (ACL) for a file or folder. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file or directory on which to set the +// ACL. +// aclspec - the ACL spec included in ACL creation operations in the format +// '[default:]user|group|other::r|-w|-x|-' +func (client Client) SetACL(ctx context.Context, accountName string, pathParameter string, aclspec string) (result autorest.Response, err error) { + req, err := client.SetACLPreparer(ctx, accountName, pathParameter, aclspec) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetACL", nil, "Failure preparing request") + return + } + + resp, err := client.SetACLSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetACL", resp, "Failure sending request") + return + } + + result, err = client.SetACLResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetACL", resp, "Failure responding to request") + } + + return +} + +// SetACLPreparer prepares the SetACL request. +func (client Client) SetACLPreparer(ctx context.Context, accountName string, pathParameter string, aclspec string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "aclspec": autorest.Encode("query", aclspec), + "api-version": APIVersion, + "op": autorest.Encode("query", "SETACL"), + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// SetACLSender sends the SetACL request. The method will close the +// http.Response Body if it receives an error. +func (client Client) SetACLSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// SetACLResponder handles the response to the SetACL request. The method always +// closes the http.Response Body. +func (client Client) SetACLResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// SetFileExpiry sets or removes the expiration time on the specified file. This operation can only be executed against +// files. Folders are not supported. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file on which to set or remove the +// expiration time. +// expiryOption - indicates the type of expiration to use for the file: 1. NeverExpire: ExpireTime is ignored. +// 2. RelativeToNow: ExpireTime is an integer in milliseconds representing the expiration date relative to when +// file expiration is updated. 3. RelativeToCreationDate: ExpireTime is an integer in milliseconds representing +// the expiration date relative to file creation. 4. Absolute: ExpireTime is an integer in milliseconds, as a +// Unix timestamp relative to 1/1/1970 00:00:00. +// expireTime - the time that the file will expire, corresponding to the ExpiryOption that was set. +func (client Client) SetFileExpiry(ctx context.Context, accountName string, pathParameter string, expiryOption ExpiryOptionType, expireTime *int64) (result autorest.Response, err error) { + req, err := client.SetFileExpiryPreparer(ctx, accountName, pathParameter, expiryOption, expireTime) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetFileExpiry", nil, "Failure preparing request") + return + } + + resp, err := client.SetFileExpirySender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetFileExpiry", resp, "Failure sending request") + return + } + + result, err = client.SetFileExpiryResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetFileExpiry", resp, "Failure responding to request") + } + + return +} + +// SetFileExpiryPreparer prepares the SetFileExpiry request. +func (client Client) SetFileExpiryPreparer(ctx context.Context, accountName string, pathParameter string, expiryOption ExpiryOptionType, expireTime *int64) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "expiryOption": autorest.Encode("query", expiryOption), + "op": autorest.Encode("query", "SETEXPIRY"), + } + if expireTime != nil { + queryParameters["expireTime"] = autorest.Encode("query", *expireTime) + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/WebHdfsExt/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// SetFileExpirySender sends the SetFileExpiry request. The method will close the +// http.Response Body if it receives an error. +func (client Client) SetFileExpirySender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// SetFileExpiryResponder handles the response to the SetFileExpiry request. The method always +// closes the http.Response Body. +func (client Client) SetFileExpiryResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// SetOwner sets the owner of a file or directory. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file or directory for which to set the +// owner. +// owner - the AAD Object ID of the user owner of the file or directory. If empty, the property will remain +// unchanged. +// group - the AAD Object ID of the group owner of the file or directory. If empty, the property will remain +// unchanged. +func (client Client) SetOwner(ctx context.Context, accountName string, pathParameter string, owner string, group string) (result autorest.Response, err error) { + req, err := client.SetOwnerPreparer(ctx, accountName, pathParameter, owner, group) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetOwner", nil, "Failure preparing request") + return + } + + resp, err := client.SetOwnerSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetOwner", resp, "Failure sending request") + return + } + + result, err = client.SetOwnerResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetOwner", resp, "Failure responding to request") + } + + return +} + +// SetOwnerPreparer prepares the SetOwner request. +func (client Client) SetOwnerPreparer(ctx context.Context, accountName string, pathParameter string, owner string, group string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "SETOWNER"), + } + if len(owner) > 0 { + queryParameters["owner"] = autorest.Encode("query", owner) + } + if len(group) > 0 { + queryParameters["group"] = autorest.Encode("query", group) + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// SetOwnerSender sends the SetOwner request. The method will close the +// http.Response Body if it receives an error. +func (client Client) SetOwnerSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// SetOwnerResponder handles the response to the SetOwner request. The method always +// closes the http.Response Body. +func (client Client) SetOwnerResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// SetPermission sets the permission of the file or folder. +// Parameters: +// accountName - the Azure Data Lake Store account to execute filesystem operations on. +// pathParameter - the Data Lake Store path (starting with '/') of the file or directory for which to set the +// permission. +// permission - a string representation of the permission (i.e 'rwx'). If empty, this property remains +// unchanged. +func (client Client) SetPermission(ctx context.Context, accountName string, pathParameter string, permission string) (result autorest.Response, err error) { + req, err := client.SetPermissionPreparer(ctx, accountName, pathParameter, permission) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetPermission", nil, "Failure preparing request") + return + } + + resp, err := client.SetPermissionSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetPermission", resp, "Failure sending request") + return + } + + result, err = client.SetPermissionResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "filesystem.Client", "SetPermission", resp, "Failure responding to request") + } + + return +} + +// SetPermissionPreparer prepares the SetPermission request. +func (client Client) SetPermissionPreparer(ctx context.Context, accountName string, pathParameter string, permission string) (*http.Request, error) { + urlParameters := map[string]interface{}{ + "accountName": accountName, + "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, + } + + pathParameters := map[string]interface{}{ + "path": autorest.Encode("path", pathParameter), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + "op": autorest.Encode("query", "SETPERMISSION"), + } + if len(permission) > 0 { + queryParameters["permission"] = autorest.Encode("query", permission) + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), + autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// SetPermissionSender sends the SetPermission request. The method will close the +// http.Response Body if it receives an error. +func (client Client) SetPermissionSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// SetPermissionResponder handles the response to the SetPermission request. The method always +// closes the http.Response Body. +func (client Client) SetPermissionResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/models.go new file mode 100644 index 000000000000..c38c70b92e8e --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/models.go @@ -0,0 +1,1295 @@ +package filesystem + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "encoding/json" + "github.com/Azure/go-autorest/autorest" + "io" +) + +// AppendModeType enumerates the values for append mode type. +type AppendModeType string + +const ( + // Autocreate ... + Autocreate AppendModeType = "autocreate" +) + +// PossibleAppendModeTypeValues returns an array of possible values for the AppendModeType const type. +func PossibleAppendModeTypeValues() []AppendModeType { + return []AppendModeType{Autocreate} +} + +// Exception enumerates the values for exception. +type Exception string + +const ( + // ExceptionAccessControlException ... + ExceptionAccessControlException Exception = "AccessControlException" + // ExceptionAdlsRemoteException ... + ExceptionAdlsRemoteException Exception = "AdlsRemoteException" + // ExceptionBadOffsetException ... + ExceptionBadOffsetException Exception = "BadOffsetException" + // ExceptionFileAlreadyExistsException ... + ExceptionFileAlreadyExistsException Exception = "FileAlreadyExistsException" + // ExceptionFileNotFoundException ... + ExceptionFileNotFoundException Exception = "FileNotFoundException" + // ExceptionIllegalArgumentException ... + ExceptionIllegalArgumentException Exception = "IllegalArgumentException" + // ExceptionIOException ... + ExceptionIOException Exception = "IOException" + // ExceptionRuntimeException ... + ExceptionRuntimeException Exception = "RuntimeException" + // ExceptionSecurityException ... + ExceptionSecurityException Exception = "SecurityException" + // ExceptionThrottledException ... + ExceptionThrottledException Exception = "ThrottledException" + // ExceptionUnsupportedOperationException ... + ExceptionUnsupportedOperationException Exception = "UnsupportedOperationException" +) + +// PossibleExceptionValues returns an array of possible values for the Exception const type. +func PossibleExceptionValues() []Exception { + return []Exception{ExceptionAccessControlException, ExceptionAdlsRemoteException, ExceptionBadOffsetException, ExceptionFileAlreadyExistsException, ExceptionFileNotFoundException, ExceptionIllegalArgumentException, ExceptionIOException, ExceptionRuntimeException, ExceptionSecurityException, ExceptionThrottledException, ExceptionUnsupportedOperationException} +} + +// ExpiryOptionType enumerates the values for expiry option type. +type ExpiryOptionType string + +const ( + // Absolute ... + Absolute ExpiryOptionType = "Absolute" + // NeverExpire ... + NeverExpire ExpiryOptionType = "NeverExpire" + // RelativeToCreationDate ... + RelativeToCreationDate ExpiryOptionType = "RelativeToCreationDate" + // RelativeToNow ... + RelativeToNow ExpiryOptionType = "RelativeToNow" +) + +// PossibleExpiryOptionTypeValues returns an array of possible values for the ExpiryOptionType const type. +func PossibleExpiryOptionTypeValues() []ExpiryOptionType { + return []ExpiryOptionType{Absolute, NeverExpire, RelativeToCreationDate, RelativeToNow} +} + +// FileType enumerates the values for file type. +type FileType string + +const ( + // DIRECTORY ... + DIRECTORY FileType = "DIRECTORY" + // FILE ... + FILE FileType = "FILE" +) + +// PossibleFileTypeValues returns an array of possible values for the FileType const type. +func PossibleFileTypeValues() []FileType { + return []FileType{DIRECTORY, FILE} +} + +// SyncFlag enumerates the values for sync flag. +type SyncFlag string + +const ( + // CLOSE ... + CLOSE SyncFlag = "CLOSE" + // DATA ... + DATA SyncFlag = "DATA" + // METADATA ... + METADATA SyncFlag = "METADATA" +) + +// PossibleSyncFlagValues returns an array of possible values for the SyncFlag const type. +func PossibleSyncFlagValues() []SyncFlag { + return []SyncFlag{CLOSE, DATA, METADATA} +} + +// ACLStatus data Lake Store file or directory Access Control List information. +type ACLStatus struct { + // Entries - the list of ACLSpec entries on a file or directory. + Entries *[]string `json:"entries,omitempty"` + // Group - the group owner, an AAD Object ID. + Group *string `json:"group,omitempty"` + // Owner - the user owner, an AAD Object ID. + Owner *string `json:"owner,omitempty"` + // Permission - The octal representation of the unnamed user, mask and other permissions. + Permission *string `json:"permission,omitempty"` + // StickyBit - the indicator of whether the sticky bit is on or off. + StickyBit *bool `json:"stickyBit,omitempty"` +} + +// ACLStatusResult data Lake Store file or directory Access Control List information. +type ACLStatusResult struct { + autorest.Response `json:"-"` + // ACLStatus - the AclStatus object for a given file or directory. + ACLStatus *ACLStatus `json:"aclStatus,omitempty"` +} + +// AdlsAccessControlException a WebHDFS exception thrown indicating that access is denied due to insufficient +// permissions. Thrown when a 403 error response code is returned (forbidden). +type AdlsAccessControlException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' + Exception Exception `json:"exception,omitempty"` +} + +// MarshalJSON is the custom marshaler for AdlsAccessControlException. +func (aace AdlsAccessControlException) MarshalJSON() ([]byte, error) { + aace.Exception = ExceptionAccessControlException + objectMap := make(map[string]interface{}) + if aace.JavaClassName != nil { + objectMap["javaClassName"] = aace.JavaClassName + } + if aace.Message != nil { + objectMap["message"] = aace.Message + } + if aace.Exception != "" { + objectMap["exception"] = aace.Exception + } + return json.Marshal(objectMap) +} + +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return &aace, true +} + +// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { + return nil, false +} + +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. +func (aace AdlsAccessControlException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &aace, true +} + +// AdlsBadOffsetException a WebHDFS exception thrown indicating the append or read is from a bad offset. Thrown +// when a 400 error response code is returned for append and open operations (Bad request). +type AdlsBadOffsetException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' + Exception Exception `json:"exception,omitempty"` +} + +// MarshalJSON is the custom marshaler for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) MarshalJSON() ([]byte, error) { + aboe.Exception = ExceptionBadOffsetException + objectMap := make(map[string]interface{}) + if aboe.JavaClassName != nil { + objectMap["javaClassName"] = aboe.JavaClassName + } + if aboe.Message != nil { + objectMap["message"] = aboe.Message + } + if aboe.Exception != "" { + objectMap["exception"] = aboe.Exception + } + return json.Marshal(objectMap) +} + +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return &aboe, true +} + +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { + return nil, false +} + +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. +func (aboe AdlsBadOffsetException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &aboe, true +} + +// AdlsError data Lake Store filesystem error containing a specific WebHDFS exception. +type AdlsError struct { + // RemoteException - the object representing the actual WebHDFS exception being returned. + RemoteException BasicAdlsRemoteException `json:"remoteException,omitempty"` +} + +// UnmarshalJSON is the custom unmarshaler for AdlsError struct. +func (ae *AdlsError) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "remoteException": + if v != nil { + remoteException, err := unmarshalBasicAdlsRemoteException(*v) + if err != nil { + return err + } + ae.RemoteException = remoteException + } + } + } + + return nil +} + +// AdlsFileAlreadyExistsException a WebHDFS exception thrown indicating the file or folder already exists. Thrown +// when a 403 error response code is returned (forbidden). +type AdlsFileAlreadyExistsException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' + Exception Exception `json:"exception,omitempty"` +} + +// MarshalJSON is the custom marshaler for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) MarshalJSON() ([]byte, error) { + afaee.Exception = ExceptionFileAlreadyExistsException + objectMap := make(map[string]interface{}) + if afaee.JavaClassName != nil { + objectMap["javaClassName"] = afaee.JavaClassName + } + if afaee.Message != nil { + objectMap["message"] = afaee.Message + } + if afaee.Exception != "" { + objectMap["exception"] = afaee.Exception + } + return json.Marshal(objectMap) +} + +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return &afaee, true +} + +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { + return nil, false +} + +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. +func (afaee AdlsFileAlreadyExistsException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &afaee, true +} + +// AdlsFileNotFoundException a WebHDFS exception thrown indicating the file or folder could not be found. Thrown +// when a 404 error response code is returned (not found). +type AdlsFileNotFoundException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' + Exception Exception `json:"exception,omitempty"` +} + +// MarshalJSON is the custom marshaler for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) MarshalJSON() ([]byte, error) { + afnfe.Exception = ExceptionFileNotFoundException + objectMap := make(map[string]interface{}) + if afnfe.JavaClassName != nil { + objectMap["javaClassName"] = afnfe.JavaClassName + } + if afnfe.Message != nil { + objectMap["message"] = afnfe.Message + } + if afnfe.Exception != "" { + objectMap["exception"] = afnfe.Exception + } + return json.Marshal(objectMap) +} + +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return &afnfe, true +} + +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { + return nil, false +} + +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. +func (afnfe AdlsFileNotFoundException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &afnfe, true +} + +// AdlsIllegalArgumentException a WebHDFS exception thrown indicating that one more arguments is incorrect. Thrown +// when a 400 error response code is returned (bad request). +type AdlsIllegalArgumentException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' + Exception Exception `json:"exception,omitempty"` +} + +// MarshalJSON is the custom marshaler for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) MarshalJSON() ([]byte, error) { + aiae.Exception = ExceptionIllegalArgumentException + objectMap := make(map[string]interface{}) + if aiae.JavaClassName != nil { + objectMap["javaClassName"] = aiae.JavaClassName + } + if aiae.Message != nil { + objectMap["message"] = aiae.Message + } + if aiae.Exception != "" { + objectMap["exception"] = aiae.Exception + } + return json.Marshal(objectMap) +} + +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return &aiae, true +} + +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { + return nil, false +} + +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. +func (aiae AdlsIllegalArgumentException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &aiae, true +} + +// AdlsIOException a WebHDFS exception thrown indicating there was an IO (read or write) error. Thrown when a 403 +// error response code is returned (forbidden). +type AdlsIOException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' + Exception Exception `json:"exception,omitempty"` +} + +// MarshalJSON is the custom marshaler for AdlsIOException. +func (aie AdlsIOException) MarshalJSON() ([]byte, error) { + aie.Exception = ExceptionIOException + objectMap := make(map[string]interface{}) + if aie.JavaClassName != nil { + objectMap["javaClassName"] = aie.JavaClassName + } + if aie.Message != nil { + objectMap["message"] = aie.Message + } + if aie.Exception != "" { + objectMap["exception"] = aie.Exception + } + return json.Marshal(objectMap) +} + +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsIOException() (*AdlsIOException, bool) { + return &aie, true +} + +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { + return nil, false +} + +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIOException. +func (aie AdlsIOException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &aie, true +} + +// BasicAdlsRemoteException data Lake Store filesystem exception based on the WebHDFS definition for RemoteExceptions. +// This is a WebHDFS 'catch all' exception +type BasicAdlsRemoteException interface { + AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) + AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) + AsAdlsSecurityException() (*AdlsSecurityException, bool) + AsAdlsIOException() (*AdlsIOException, bool) + AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) + AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) + AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) + AsAdlsRuntimeException() (*AdlsRuntimeException, bool) + AsAdlsAccessControlException() (*AdlsAccessControlException, bool) + AsAdlsThrottledException() (*AdlsThrottledException, bool) + AsAdlsRemoteException() (*AdlsRemoteException, bool) +} + +// AdlsRemoteException data Lake Store filesystem exception based on the WebHDFS definition for RemoteExceptions. +// This is a WebHDFS 'catch all' exception +type AdlsRemoteException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' + Exception Exception `json:"exception,omitempty"` +} + +func unmarshalBasicAdlsRemoteException(body []byte) (BasicAdlsRemoteException, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["exception"] { + case string(ExceptionIllegalArgumentException): + var aiae AdlsIllegalArgumentException + err := json.Unmarshal(body, &aiae) + return aiae, err + case string(ExceptionUnsupportedOperationException): + var auoe AdlsUnsupportedOperationException + err := json.Unmarshal(body, &auoe) + return auoe, err + case string(ExceptionSecurityException): + var ase AdlsSecurityException + err := json.Unmarshal(body, &ase) + return ase, err + case string(ExceptionIOException): + var aie AdlsIOException + err := json.Unmarshal(body, &aie) + return aie, err + case string(ExceptionFileNotFoundException): + var afnfe AdlsFileNotFoundException + err := json.Unmarshal(body, &afnfe) + return afnfe, err + case string(ExceptionFileAlreadyExistsException): + var afaee AdlsFileAlreadyExistsException + err := json.Unmarshal(body, &afaee) + return afaee, err + case string(ExceptionBadOffsetException): + var aboe AdlsBadOffsetException + err := json.Unmarshal(body, &aboe) + return aboe, err + case string(ExceptionRuntimeException): + var are AdlsRuntimeException + err := json.Unmarshal(body, &are) + return are, err + case string(ExceptionAccessControlException): + var aace AdlsAccessControlException + err := json.Unmarshal(body, &aace) + return aace, err + case string(ExceptionThrottledException): + var ate AdlsThrottledException + err := json.Unmarshal(body, &ate) + return ate, err + default: + var are AdlsRemoteException + err := json.Unmarshal(body, &are) + return are, err + } +} +func unmarshalBasicAdlsRemoteExceptionArray(body []byte) ([]BasicAdlsRemoteException, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + areArray := make([]BasicAdlsRemoteException, len(rawMessages)) + + for index, rawMessage := range rawMessages { + are, err := unmarshalBasicAdlsRemoteException(*rawMessage) + if err != nil { + return nil, err + } + areArray[index] = are + } + return areArray, nil +} + +// MarshalJSON is the custom marshaler for AdlsRemoteException. +func (are AdlsRemoteException) MarshalJSON() ([]byte, error) { + are.Exception = ExceptionAdlsRemoteException + objectMap := make(map[string]interface{}) + if are.JavaClassName != nil { + objectMap["javaClassName"] = are.JavaClassName + } + if are.Message != nil { + objectMap["message"] = are.Message + } + if are.Exception != "" { + objectMap["exception"] = are.Exception + } + return json.Marshal(objectMap) +} + +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { + return nil, false +} + +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return &are, true +} + +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRemoteException. +func (are AdlsRemoteException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &are, true +} + +// AdlsRuntimeException a WebHDFS exception thrown when an unexpected error occurs during an operation. Thrown when +// a 500 error response code is returned (Internal server error). +type AdlsRuntimeException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' + Exception Exception `json:"exception,omitempty"` +} + +// MarshalJSON is the custom marshaler for AdlsRuntimeException. +func (are AdlsRuntimeException) MarshalJSON() ([]byte, error) { + are.Exception = ExceptionRuntimeException + objectMap := make(map[string]interface{}) + if are.JavaClassName != nil { + objectMap["javaClassName"] = are.JavaClassName + } + if are.Message != nil { + objectMap["message"] = are.Message + } + if are.Exception != "" { + objectMap["exception"] = are.Exception + } + return json.Marshal(objectMap) +} + +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return &are, true +} + +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { + return nil, false +} + +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. +func (are AdlsRuntimeException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &are, true +} + +// AdlsSecurityException a WebHDFS exception thrown indicating that access is denied. Thrown when a 401 error +// response code is returned (Unauthorized). +type AdlsSecurityException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' + Exception Exception `json:"exception,omitempty"` +} + +// MarshalJSON is the custom marshaler for AdlsSecurityException. +func (ase AdlsSecurityException) MarshalJSON() ([]byte, error) { + ase.Exception = ExceptionSecurityException + objectMap := make(map[string]interface{}) + if ase.JavaClassName != nil { + objectMap["javaClassName"] = ase.JavaClassName + } + if ase.Message != nil { + objectMap["message"] = ase.Message + } + if ase.Exception != "" { + objectMap["exception"] = ase.Exception + } + return json.Marshal(objectMap) +} + +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return &ase, true +} + +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { + return nil, false +} + +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsSecurityException. +func (ase AdlsSecurityException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &ase, true +} + +// AdlsThrottledException a WebHDFS exception thrown indicating that the request is being throttled. Reducing the +// number of requests or request size helps to mitigate this error. +type AdlsThrottledException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' + Exception Exception `json:"exception,omitempty"` +} + +// MarshalJSON is the custom marshaler for AdlsThrottledException. +func (ate AdlsThrottledException) MarshalJSON() ([]byte, error) { + ate.Exception = ExceptionThrottledException + objectMap := make(map[string]interface{}) + if ate.JavaClassName != nil { + objectMap["javaClassName"] = ate.JavaClassName + } + if ate.Message != nil { + objectMap["message"] = ate.Message + } + if ate.Exception != "" { + objectMap["exception"] = ate.Exception + } + return json.Marshal(objectMap) +} + +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsThrottledException. +func (ate AdlsThrottledException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsThrottledException. +func (ate AdlsThrottledException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return nil, false +} + +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsThrottledException. +func (ate AdlsThrottledException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsThrottledException. +func (ate AdlsThrottledException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsThrottledException. +func (ate AdlsThrottledException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsThrottledException. +func (ate AdlsThrottledException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsThrottledException. +func (ate AdlsThrottledException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsThrottledException. +func (ate AdlsThrottledException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsThrottledException. +func (ate AdlsThrottledException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsThrottledException. +func (ate AdlsThrottledException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { + return &ate, true +} + +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsThrottledException. +func (ate AdlsThrottledException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsThrottledException. +func (ate AdlsThrottledException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &ate, true +} + +// AdlsUnsupportedOperationException a WebHDFS exception thrown indicating that the requested operation is not +// supported. Thrown when a 400 error response code is returned (bad request). +type AdlsUnsupportedOperationException struct { + // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. + JavaClassName *string `json:"javaClassName,omitempty"` + // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. + Message *string `json:"message,omitempty"` + // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' + Exception Exception `json:"exception,omitempty"` +} + +// MarshalJSON is the custom marshaler for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) MarshalJSON() ([]byte, error) { + auoe.Exception = ExceptionUnsupportedOperationException + objectMap := make(map[string]interface{}) + if auoe.JavaClassName != nil { + objectMap["javaClassName"] = auoe.JavaClassName + } + if auoe.Message != nil { + objectMap["message"] = auoe.Message + } + if auoe.Exception != "" { + objectMap["exception"] = auoe.Exception + } + return json.Marshal(objectMap) +} + +// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { + return nil, false +} + +// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { + return &auoe, true +} + +// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { + return nil, false +} + +// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsIOException() (*AdlsIOException, bool) { + return nil, false +} + +// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { + return nil, false +} + +// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { + return nil, false +} + +// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { + return nil, false +} + +// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { + return nil, false +} + +// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { + return nil, false +} + +// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { + return nil, false +} + +// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { + return nil, false +} + +// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. +func (auoe AdlsUnsupportedOperationException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { + return &auoe, true +} + +// ContentSummary data Lake Store content summary information +type ContentSummary struct { + // DirectoryCount - the number of directories. + DirectoryCount *int64 `json:"directoryCount,omitempty"` + // FileCount - the number of files. + FileCount *int64 `json:"fileCount,omitempty"` + // Length - the number of bytes used by the content. + Length *int64 `json:"length,omitempty"` + // SpaceConsumed - the disk space consumed by the content. + SpaceConsumed *int64 `json:"spaceConsumed,omitempty"` +} + +// ContentSummaryResult data Lake Store filesystem content summary information response. +type ContentSummaryResult struct { + autorest.Response `json:"-"` + // ContentSummary - the content summary for the specified path + ContentSummary *ContentSummary `json:"contentSummary,omitempty"` +} + +// FileOperationResult the result of the request or operation. +type FileOperationResult struct { + autorest.Response `json:"-"` + // OperationResult - the result of the operation or request. + OperationResult *bool `json:"boolean,omitempty"` +} + +// FileStatuses data Lake Store file status list information. +type FileStatuses struct { + // FileStatus - the object containing the list of properties of the files. + FileStatus *[]FileStatusProperties `json:"fileStatus,omitempty"` +} + +// FileStatusesResult data Lake Store filesystem file status list information response. +type FileStatusesResult struct { + autorest.Response `json:"-"` + // FileStatuses - the object representing the list of file statuses. + FileStatuses *FileStatuses `json:"fileStatuses,omitempty"` +} + +// FileStatusProperties data Lake Store file or directory information. +type FileStatusProperties struct { + // AccessTime - the last access time as ticks since the epoch. + AccessTime *int64 `json:"accessTime,omitempty"` + // BlockSize - the block size for the file. + BlockSize *int64 `json:"blockSize,omitempty"` + // ExpirationTime - Gets the expiration time, if any, as ticks since the epoch. If the value is 0 or DateTime.MaxValue there is no expiration. + ExpirationTime *int64 `json:"msExpirationTime,omitempty"` + // Group - the group owner. + Group *string `json:"group,omitempty"` + // Length - the number of bytes in a file. + Length *int64 `json:"length,omitempty"` + // ModificationTime - the modification time as ticks since the epoch. + ModificationTime *int64 `json:"modificationTime,omitempty"` + // Owner - the user who is the owner. + Owner *string `json:"owner,omitempty"` + // PathSuffix - the path suffix. + PathSuffix *string `json:"pathSuffix,omitempty"` + // Permission - the permission represented as an string. + Permission *string `json:"permission,omitempty"` + // Type - the type of the path object. Possible values include: 'FILE', 'DIRECTORY' + Type FileType `json:"type,omitempty"` + // ACLBit - flag to indicate if extended acls are enabled + ACLBit *bool `json:"aclBit,omitempty"` +} + +// FileStatusResult data Lake Store filesystem file status information response. +type FileStatusResult struct { + autorest.Response `json:"-"` + // FileStatus - the file status object associated with the specified path. + FileStatus *FileStatusProperties `json:"fileStatus,omitempty"` +} + +// ReadCloser ... +type ReadCloser struct { + autorest.Response `json:"-"` + Value *io.ReadCloser `json:"value,omitempty"` +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/version.go new file mode 100644 index 000000000000..6b47571b9de6 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/version.go @@ -0,0 +1,30 @@ +package filesystem + +import "github.com/Azure/azure-sdk-for-go/version" + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +// UserAgent returns the UserAgent string to use when sending http.Requests. +func UserAgent() string { + return "Azure-SDK-For-Go/" + version.Number + " filesystem/2016-11-01" +} + +// Version returns the semantic version (see http://semver.org) of the client. +func Version() string { + return version.Number +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/account.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/account.go new file mode 100644 index 000000000000..036986ff17d9 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/account.go @@ -0,0 +1,1002 @@ +package account + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Client is the dataLake Store Client +type Client struct { + BaseClient +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// NewClient creates an instance of the Client client. +func NewClient(subscriptionID string) Client { + return NewClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// NewClientWithBaseURI creates an instance of the Client client. +func NewClientWithBaseURI(baseURI string, subscriptionID string) Client { + return Client{NewWithBaseURI(baseURI, subscriptionID)} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Create creates the specified Data Lake Store account. +// +// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. name is the +// name of the Data Lake Store account to create. parameters is parameters supplied to create the Data Lake Store +// account. +func (client Client) Create(ctx context.Context, resourceGroupName string, name string, parameters DataLakeStoreAccount) (result CreateFuture, err error) { + req, err := client.CreatePreparer(ctx, resourceGroupName, name, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "Create", nil, "Failure preparing request") + return + } + + result, err = client.CreateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "Create", result.Response(), "Failure sending request") + return + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// CreatePreparer prepares the Create request. +func (client Client) CreatePreparer(ctx context.Context, resourceGroupName string, name string, parameters DataLakeStoreAccount) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{name}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// CreateSender sends the Create request. The method will close the +// http.Response Body if it receives an error. +func (client Client) CreateSender(req *http.Request) (future CreateFuture, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// CreateResponder handles the response to the Create request. The method always +// closes the http.Response Body. +func (client Client) CreateResponder(resp *http.Response) (result DataLakeStoreAccount, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// CreateOrUpdateFirewallRule creates or updates the specified firewall rule. +// +// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName +// is the name of the Data Lake Store account to which to add the firewall rule. name is the name of the firewall +// rule to create or update. parameters is parameters supplied to create the create firewall rule. +func (client Client) CreateOrUpdateFirewallRule(ctx context.Context, resourceGroupName string, accountName string, name string, parameters FirewallRule) (result FirewallRule, err error) { + req, err := client.CreateOrUpdateFirewallRulePreparer(ctx, resourceGroupName, accountName, name, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "CreateOrUpdateFirewallRule", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateFirewallRuleSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.Client", "CreateOrUpdateFirewallRule", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateFirewallRuleResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "CreateOrUpdateFirewallRule", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// CreateOrUpdateFirewallRulePreparer prepares the CreateOrUpdateFirewallRule request. +func (client Client) CreateOrUpdateFirewallRulePreparer(ctx context.Context, resourceGroupName string, accountName string, name string, parameters FirewallRule) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules/{name}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// CreateOrUpdateFirewallRuleSender sends the CreateOrUpdateFirewallRule request. The method will close the +// http.Response Body if it receives an error. +func (client Client) CreateOrUpdateFirewallRuleSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// CreateOrUpdateFirewallRuleResponder handles the response to the CreateOrUpdateFirewallRule request. The method always +// closes the http.Response Body. +func (client Client) CreateOrUpdateFirewallRuleResponder(resp *http.Response) (result FirewallRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Delete deletes the specified Data Lake Store account. +// +// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName +// is the name of the Data Lake Store account to delete. +func (client Client) Delete(ctx context.Context, resourceGroupName string, accountName string) (result DeleteFuture, err error) { + req, err := client.DeletePreparer(ctx, resourceGroupName, accountName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "Delete", nil, "Failure preparing request") + return + } + + result, err = client.DeleteSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "Delete", result.Response(), "Failure sending request") + return + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DeletePreparer prepares the Delete request. +func (client Client) DeletePreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client Client) DeleteSender(req *http.Request) (future DeleteFuture, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusNotFound)) + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client Client) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusNotFound), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DeleteFirewallRule deletes the specified firewall rule from the specified Data Lake Store account +// +// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName +// is the name of the Data Lake Store account from which to delete the firewall rule. firewallRuleName is the name +// of the firewall rule to delete. +func (client Client) DeleteFirewallRule(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string) (result autorest.Response, err error) { + req, err := client.DeleteFirewallRulePreparer(ctx, resourceGroupName, accountName, firewallRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "DeleteFirewallRule", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteFirewallRuleSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "account.Client", "DeleteFirewallRule", resp, "Failure sending request") + return + } + + result, err = client.DeleteFirewallRuleResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "DeleteFirewallRule", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DeleteFirewallRulePreparer prepares the DeleteFirewallRule request. +func (client Client) DeleteFirewallRulePreparer(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "firewallRuleName": autorest.Encode("path", firewallRuleName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules/{firewallRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DeleteFirewallRuleSender sends the DeleteFirewallRule request. The method will close the +// http.Response Body if it receives an error. +func (client Client) DeleteFirewallRuleSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DeleteFirewallRuleResponder handles the response to the DeleteFirewallRule request. The method always +// closes the http.Response Body. +func (client Client) DeleteFirewallRuleResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// EnableKeyVault attempts to enable a user managed key vault for encryption of the specified Data Lake Store account. +// +// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName +// is the name of the Data Lake Store account to attempt to enable the Key Vault for. +func (client Client) EnableKeyVault(ctx context.Context, resourceGroupName string, accountName string) (result autorest.Response, err error) { + req, err := client.EnableKeyVaultPreparer(ctx, resourceGroupName, accountName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "EnableKeyVault", nil, "Failure preparing request") + return + } + + resp, err := client.EnableKeyVaultSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "account.Client", "EnableKeyVault", resp, "Failure sending request") + return + } + + result, err = client.EnableKeyVaultResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "EnableKeyVault", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// EnableKeyVaultPreparer prepares the EnableKeyVault request. +func (client Client) EnableKeyVaultPreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/enableKeyVault", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// EnableKeyVaultSender sends the EnableKeyVault request. The method will close the +// http.Response Body if it receives an error. +func (client Client) EnableKeyVaultSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// EnableKeyVaultResponder handles the response to the EnableKeyVault request. The method always +// closes the http.Response Body. +func (client Client) EnableKeyVaultResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Get gets the specified Data Lake Store account. +// +// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName +// is the name of the Data Lake Store account to retrieve. +func (client Client) Get(ctx context.Context, resourceGroupName string, accountName string) (result DataLakeStoreAccount, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, accountName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.Client", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "Get", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// GetPreparer prepares the Get request. +func (client Client) GetPreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client Client) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client Client) GetResponder(resp *http.Response) (result DataLakeStoreAccount, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// GetFirewallRule gets the specified Data Lake Store firewall rule. +// +// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName +// is the name of the Data Lake Store account from which to get the firewall rule. firewallRuleName is the name of +// the firewall rule to retrieve. +func (client Client) GetFirewallRule(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string) (result FirewallRule, err error) { + req, err := client.GetFirewallRulePreparer(ctx, resourceGroupName, accountName, firewallRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "GetFirewallRule", nil, "Failure preparing request") + return + } + + resp, err := client.GetFirewallRuleSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.Client", "GetFirewallRule", resp, "Failure sending request") + return + } + + result, err = client.GetFirewallRuleResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "GetFirewallRule", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// GetFirewallRulePreparer prepares the GetFirewallRule request. +func (client Client) GetFirewallRulePreparer(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "firewallRuleName": autorest.Encode("path", firewallRuleName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules/{firewallRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// GetFirewallRuleSender sends the GetFirewallRule request. The method will close the +// http.Response Body if it receives an error. +func (client Client) GetFirewallRuleSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// GetFirewallRuleResponder handles the response to the GetFirewallRule request. The method always +// closes the http.Response Body. +func (client Client) GetFirewallRuleResponder(resp *http.Response) (result FirewallRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// List lists the Data Lake Store accounts within the subscription. The response includes a link to the next page of +// results, if any. +// +// filter is oData filter. Optional. top is the number of items to return. Optional. skip is the number of items to +// skip over before returning elements. Optional. expand is oData expansion. Expand related resources in line with +// the retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category +// entry. Optional. selectParameter is oData Select statement. Limits the properties on each entry to just those +// requested, e.g. Categories?$select=CategoryName,Description. Optional. orderby is orderBy clause. One or more +// comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the +// values sorted, e.g. Categories?$orderby=CategoryName desc. Optional. count is the Boolean value of true or false +// to request a count of the matching resources included with the resources in the response, e.g. +// Categories?$count=true. Optional. search is a free form search. A free-text search expression to match for +// whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional. +// formatParameter is the desired return format. Return the response in particular formatxii without access to +// request headers for standard content-type negotiation (e.g Orders?$format=json). Optional. +func (client Client) List(ctx context.Context, filter string, top *int32, skip *int32, expand string, selectParameter string, orderby string, count *bool, search string, formatParameter string) (result DataLakeStoreAccountListResultPage, err error) { + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx, filter, top, skip, expand, selectParameter, orderby, count, search, formatParameter) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.dlsalr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.Client", "List", resp, "Failure sending request") + return + } + + result.dlsalr, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "List", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListPreparer prepares the List request. +func (client Client) ListPreparer(ctx context.Context, filter string, top *int32, skip *int32, expand string, selectParameter string, orderby string, count *bool, search string, formatParameter string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(filter) > 0 { + queryParameters["$filter"] = autorest.Encode("query", filter) + } + if top != nil { + queryParameters["$top"] = autorest.Encode("query", *top) + } + if skip != nil { + queryParameters["$skip"] = autorest.Encode("query", *skip) + } + if len(expand) > 0 { + queryParameters["$expand"] = autorest.Encode("query", expand) + } + if len(selectParameter) > 0 { + queryParameters["$select"] = autorest.Encode("query", selectParameter) + } + if len(orderby) > 0 { + queryParameters["$orderby"] = autorest.Encode("query", orderby) + } + if count != nil { + queryParameters["$count"] = autorest.Encode("query", *count) + } + if len(search) > 0 { + queryParameters["$search"] = autorest.Encode("query", search) + } + if len(formatParameter) > 0 { + queryParameters["$format"] = autorest.Encode("query", formatParameter) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.DataLakeStore/accounts", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client Client) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client Client) ListResponder(resp *http.Response) (result DataLakeStoreAccountListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client Client) listNextResults(lastResults DataLakeStoreAccountListResult) (result DataLakeStoreAccountListResult, err error) { + req, err := lastResults.dataLakeStoreAccountListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "account.Client", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "account.Client", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client Client) ListComplete(ctx context.Context, filter string, top *int32, skip *int32, expand string, selectParameter string, orderby string, count *bool, search string, formatParameter string) (result DataLakeStoreAccountListResultIterator, err error) { + result.page, err = client.List(ctx, filter, top, skip, expand, selectParameter, orderby, count, search, formatParameter) + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListByResourceGroup lists the Data Lake Store accounts within a specific resource group. The response includes a +// link to the next page of results, if any. +// +// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account(s). filter +// is oData filter. Optional. top is the number of items to return. Optional. skip is the number of items to skip +// over before returning elements. Optional. expand is oData expansion. Expand related resources in line with the +// retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category +// entry. Optional. selectParameter is oData Select statement. Limits the properties on each entry to just those +// requested, e.g. Categories?$select=CategoryName,Description. Optional. orderby is orderBy clause. One or more +// comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the +// values sorted, e.g. Categories?$orderby=CategoryName desc. Optional. count is a Boolean value of true or false +// to request a count of the matching resources included with the resources in the response, e.g. +// Categories?$count=true. Optional. search is a free form search. A free-text search expression to match for +// whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional. +// formatParameter is the desired return format. Return the response in particular formatxii without access to +// request headers for standard content-type negotiation (e.g Orders?$format=json). Optional. +func (client Client) ListByResourceGroup(ctx context.Context, resourceGroupName string, filter string, top *int32, skip *int32, expand string, selectParameter string, orderby string, count *bool, search string, formatParameter string) (result DataLakeStoreAccountListResultPage, err error) { + result.fn = client.listByResourceGroupNextResults + req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName, filter, top, skip, expand, selectParameter, orderby, count, search, formatParameter) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "ListByResourceGroup", nil, "Failure preparing request") + return + } + + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.dlsalr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.Client", "ListByResourceGroup", resp, "Failure sending request") + return + } + + result.dlsalr, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "ListByResourceGroup", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListByResourceGroupPreparer prepares the ListByResourceGroup request. +func (client Client) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string, filter string, top *int32, skip *int32, expand string, selectParameter string, orderby string, count *bool, search string, formatParameter string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(filter) > 0 { + queryParameters["$filter"] = autorest.Encode("query", filter) + } + if top != nil { + queryParameters["$top"] = autorest.Encode("query", *top) + } + if skip != nil { + queryParameters["$skip"] = autorest.Encode("query", *skip) + } + if len(expand) > 0 { + queryParameters["$expand"] = autorest.Encode("query", expand) + } + if len(selectParameter) > 0 { + queryParameters["$select"] = autorest.Encode("query", selectParameter) + } + if len(orderby) > 0 { + queryParameters["$orderby"] = autorest.Encode("query", orderby) + } + if count != nil { + queryParameters["$count"] = autorest.Encode("query", *count) + } + if len(search) > 0 { + queryParameters["$search"] = autorest.Encode("query", search) + } + if len(formatParameter) > 0 { + queryParameters["$format"] = autorest.Encode("query", formatParameter) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the +// http.Response Body if it receives an error. +func (client Client) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always +// closes the http.Response Body. +func (client Client) ListByResourceGroupResponder(resp *http.Response) (result DataLakeStoreAccountListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByResourceGroupNextResults retrieves the next set of results, if any. +func (client Client) listByResourceGroupNextResults(lastResults DataLakeStoreAccountListResult) (result DataLakeStoreAccountListResult, err error) { + req, err := lastResults.dataLakeStoreAccountListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "account.Client", "listByResourceGroupNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "account.Client", "listByResourceGroupNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "listByResourceGroupNextResults", resp, "Failure responding to next results request") + } + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. +func (client Client) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string, filter string, top *int32, skip *int32, expand string, selectParameter string, orderby string, count *bool, search string, formatParameter string) (result DataLakeStoreAccountListResultIterator, err error) { + result.page, err = client.ListByResourceGroup(ctx, resourceGroupName, filter, top, skip, expand, selectParameter, orderby, count, search, formatParameter) + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListFirewallRules lists the Data Lake Store firewall rules within the specified Data Lake Store account. +// +// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName +// is the name of the Data Lake Store account from which to get the firewall rules. +func (client Client) ListFirewallRules(ctx context.Context, resourceGroupName string, accountName string) (result DataLakeStoreFirewallRuleListResultPage, err error) { + result.fn = client.listFirewallRulesNextResults + req, err := client.ListFirewallRulesPreparer(ctx, resourceGroupName, accountName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "ListFirewallRules", nil, "Failure preparing request") + return + } + + resp, err := client.ListFirewallRulesSender(req) + if err != nil { + result.dlsfrlr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.Client", "ListFirewallRules", resp, "Failure sending request") + return + } + + result.dlsfrlr, err = client.ListFirewallRulesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "ListFirewallRules", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListFirewallRulesPreparer prepares the ListFirewallRules request. +func (client Client) ListFirewallRulesPreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListFirewallRulesSender sends the ListFirewallRules request. The method will close the +// http.Response Body if it receives an error. +func (client Client) ListFirewallRulesSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListFirewallRulesResponder handles the response to the ListFirewallRules request. The method always +// closes the http.Response Body. +func (client Client) ListFirewallRulesResponder(resp *http.Response) (result DataLakeStoreFirewallRuleListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listFirewallRulesNextResults retrieves the next set of results, if any. +func (client Client) listFirewallRulesNextResults(lastResults DataLakeStoreFirewallRuleListResult) (result DataLakeStoreFirewallRuleListResult, err error) { + req, err := lastResults.dataLakeStoreFirewallRuleListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "account.Client", "listFirewallRulesNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListFirewallRulesSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "account.Client", "listFirewallRulesNextResults", resp, "Failure sending next results request") + } + result, err = client.ListFirewallRulesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "listFirewallRulesNextResults", resp, "Failure responding to next results request") + } + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ListFirewallRulesComplete enumerates all values, automatically crossing page boundaries as required. +func (client Client) ListFirewallRulesComplete(ctx context.Context, resourceGroupName string, accountName string) (result DataLakeStoreFirewallRuleListResultIterator, err error) { + result.page, err = client.ListFirewallRules(ctx, resourceGroupName, accountName) + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Update updates the specified Data Lake Store account information. +// +// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. name is the +// name of the Data Lake Store account to update. parameters is parameters supplied to update the Data Lake Store +// account. +func (client Client) Update(ctx context.Context, resourceGroupName string, name string, parameters DataLakeStoreAccount) (result UpdateFuture, err error) { + req, err := client.UpdatePreparer(ctx, resourceGroupName, name, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "Update", nil, "Failure preparing request") + return + } + + result, err = client.UpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "account.Client", "Update", result.Response(), "Failure sending request") + return + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// UpdatePreparer prepares the Update request. +func (client Client) UpdatePreparer(ctx context.Context, resourceGroupName string, name string, parameters DataLakeStoreAccount) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-10-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{name}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client Client) UpdateSender(req *http.Request) (future UpdateFuture, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client Client) UpdateResponder(resp *http.Response) (result DataLakeStoreAccount, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/client.go new file mode 100644 index 000000000000..312b1deff73b --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/client.go @@ -0,0 +1,54 @@ +// Package account implements the Azure ARM Account service API version 2015-10-01-preview. +// +// DataLake Store Client +package account + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" +) + +const ( + // DefaultBaseURI is the default URI used for the service Account + DefaultBaseURI = "https://management.azure.com" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// BaseClient is the base client for Account. +type BaseClient struct { + autorest.Client + BaseURI string + SubscriptionID string +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// New creates an instance of the BaseClient client. +func New(subscriptionID string) BaseClient { + return NewWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// NewWithBaseURI creates an instance of the BaseClient client. +func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { + return BaseClient{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + BaseURI: baseURI, + SubscriptionID: subscriptionID, + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/models.go new file mode 100644 index 000000000000..b95dd2cdb6b3 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/models.go @@ -0,0 +1,718 @@ +package account + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "encoding/json" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/date" + "github.com/Azure/go-autorest/autorest/to" + "github.com/satori/go.uuid" + "net/http" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DataLakeStoreAccountState enumerates the values for data lake store account state. +type DataLakeStoreAccountState string + +const ( + // Active ... + Active DataLakeStoreAccountState = "active" + // Suspended ... + Suspended DataLakeStoreAccountState = "suspended" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// PossibleDataLakeStoreAccountStateValues returns an array of possible values for the DataLakeStoreAccountState const type. +func PossibleDataLakeStoreAccountStateValues() []DataLakeStoreAccountState { + return []DataLakeStoreAccountState{Active, Suspended} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DataLakeStoreAccountStatus enumerates the values for data lake store account status. +type DataLakeStoreAccountStatus string + +const ( + // Creating ... + Creating DataLakeStoreAccountStatus = "Creating" + // Deleted ... + Deleted DataLakeStoreAccountStatus = "Deleted" + // Deleting ... + Deleting DataLakeStoreAccountStatus = "Deleting" + // Failed ... + Failed DataLakeStoreAccountStatus = "Failed" + // Patching ... + Patching DataLakeStoreAccountStatus = "Patching" + // Resuming ... + Resuming DataLakeStoreAccountStatus = "Resuming" + // Running ... + Running DataLakeStoreAccountStatus = "Running" + // Succeeded ... + Succeeded DataLakeStoreAccountStatus = "Succeeded" + // Suspending ... + Suspending DataLakeStoreAccountStatus = "Suspending" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// PossibleDataLakeStoreAccountStatusValues returns an array of possible values for the DataLakeStoreAccountStatus const type. +func PossibleDataLakeStoreAccountStatusValues() []DataLakeStoreAccountStatus { + return []DataLakeStoreAccountStatus{Creating, Deleted, Deleting, Failed, Patching, Resuming, Running, Succeeded, Suspending} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// EncryptionConfigType enumerates the values for encryption config type. +type EncryptionConfigType string + +const ( + // ServiceManaged ... + ServiceManaged EncryptionConfigType = "ServiceManaged" + // UserManaged ... + UserManaged EncryptionConfigType = "UserManaged" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// PossibleEncryptionConfigTypeValues returns an array of possible values for the EncryptionConfigType const type. +func PossibleEncryptionConfigTypeValues() []EncryptionConfigType { + return []EncryptionConfigType{ServiceManaged, UserManaged} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// EncryptionIdentityType enumerates the values for encryption identity type. +type EncryptionIdentityType string + +const ( + // SystemAssigned ... + SystemAssigned EncryptionIdentityType = "SystemAssigned" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// PossibleEncryptionIdentityTypeValues returns an array of possible values for the EncryptionIdentityType const type. +func PossibleEncryptionIdentityTypeValues() []EncryptionIdentityType { + return []EncryptionIdentityType{SystemAssigned} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// EncryptionProvisioningState enumerates the values for encryption provisioning state. +type EncryptionProvisioningState string + +const ( + // EncryptionProvisioningStateCreating ... + EncryptionProvisioningStateCreating EncryptionProvisioningState = "Creating" + // EncryptionProvisioningStateSucceeded ... + EncryptionProvisioningStateSucceeded EncryptionProvisioningState = "Succeeded" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// PossibleEncryptionProvisioningStateValues returns an array of possible values for the EncryptionProvisioningState const type. +func PossibleEncryptionProvisioningStateValues() []EncryptionProvisioningState { + return []EncryptionProvisioningState{EncryptionProvisioningStateCreating, EncryptionProvisioningStateSucceeded} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// EncryptionState enumerates the values for encryption state. +type EncryptionState string + +const ( + // Disabled ... + Disabled EncryptionState = "Disabled" + // Enabled ... + Enabled EncryptionState = "Enabled" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// PossibleEncryptionStateValues returns an array of possible values for the EncryptionState const type. +func PossibleEncryptionStateValues() []EncryptionState { + return []EncryptionState{Disabled, Enabled} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// OperationStatus enumerates the values for operation status. +type OperationStatus string + +const ( + // OperationStatusFailed ... + OperationStatusFailed OperationStatus = "Failed" + // OperationStatusInProgress ... + OperationStatusInProgress OperationStatus = "InProgress" + // OperationStatusSucceeded ... + OperationStatusSucceeded OperationStatus = "Succeeded" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type. +func PossibleOperationStatusValues() []OperationStatus { + return []OperationStatus{OperationStatusFailed, OperationStatusInProgress, OperationStatusSucceeded} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// AzureAsyncOperationResult the response body contains the status of the specified asynchronous operation, +// indicating whether it has succeeded, is in progress, or has failed. Note that this status is distinct from the +// HTTP status code returned for the Get Operation Status operation itself. If the asynchronous operation +// succeeded, the response body includes the HTTP status code for the successful request. If the asynchronous +// operation failed, the response body includes the HTTP status code for the failed request and error information +// regarding the failure. +type AzureAsyncOperationResult struct { + // Status - the status of the AzureAsuncOperation. Possible values include: 'OperationStatusInProgress', 'OperationStatusSucceeded', 'OperationStatusFailed' + Status OperationStatus `json:"status,omitempty"` + Error *Error `json:"error,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// CreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type CreateFuture struct { + azure.Future + req *http.Request +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future CreateFuture) Result(client Client) (dlsa DataLakeStoreAccount, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "account.CreateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + return dlsa, azure.NewAsyncOpIncompleteError("account.CreateFuture") + } + if future.PollingMethod() == azure.PollingLocation { + dlsa, err = client.CreateResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "account.CreateFuture", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "account.CreateFuture", "Result", resp, "Failure sending request") + return + } + dlsa, err = client.CreateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.CreateFuture", "Result", resp, "Failure responding to request") + } + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DataLakeStoreAccount data Lake Store account information +type DataLakeStoreAccount struct { + autorest.Response `json:"-"` + // Location - the account regional location. + Location *string `json:"location,omitempty"` + // Name - the account name. + Name *string `json:"name,omitempty"` + // Type - the namespace and type of the account. + Type *string `json:"type,omitempty"` + // ID - the account subscription ID. + ID *string `json:"id,omitempty"` + // Identity - The Key vault encryption identity, if any. + Identity *EncryptionIdentity `json:"identity,omitempty"` + // Tags - the value of custom properties. + Tags map[string]*string `json:"tags"` + // Properties - the Data Lake Store account properties. + Properties *DataLakeStoreAccountProperties `json:"properties,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// MarshalJSON is the custom marshaler for DataLakeStoreAccount. +func (dlsa DataLakeStoreAccount) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if dlsa.Location != nil { + objectMap["location"] = dlsa.Location + } + if dlsa.Name != nil { + objectMap["name"] = dlsa.Name + } + if dlsa.Type != nil { + objectMap["type"] = dlsa.Type + } + if dlsa.ID != nil { + objectMap["id"] = dlsa.ID + } + if dlsa.Identity != nil { + objectMap["identity"] = dlsa.Identity + } + if dlsa.Tags != nil { + objectMap["tags"] = dlsa.Tags + } + if dlsa.Properties != nil { + objectMap["properties"] = dlsa.Properties + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DataLakeStoreAccountListResult data Lake Store account list information response. +type DataLakeStoreAccountListResult struct { + autorest.Response `json:"-"` + // Value - the results of the list operation + Value *[]DataLakeStoreAccount `json:"value,omitempty"` + // NextLink - the link (url) to the next page of results. + NextLink *string `json:"nextLink,omitempty"` + // Count - the total count of results that are available, but might not be returned in the current page. + Count *int64 `json:"count,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DataLakeStoreAccountListResultIterator provides access to a complete listing of DataLakeStoreAccount values. +type DataLakeStoreAccountListResultIterator struct { + i int + page DataLakeStoreAccountListResultPage +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *DataLakeStoreAccountListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter DataLakeStoreAccountListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Response returns the raw server response from the last page request. +func (iter DataLakeStoreAccountListResultIterator) Response() DataLakeStoreAccountListResult { + return iter.page.Response() +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter DataLakeStoreAccountListResultIterator) Value() DataLakeStoreAccount { + if !iter.page.NotDone() { + return DataLakeStoreAccount{} + } + return iter.page.Values()[iter.i] +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// IsEmpty returns true if the ListResult contains no values. +func (dlsalr DataLakeStoreAccountListResult) IsEmpty() bool { + return dlsalr.Value == nil || len(*dlsalr.Value) == 0 +} + +// dataLakeStoreAccountListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (dlsalr DataLakeStoreAccountListResult) dataLakeStoreAccountListResultPreparer() (*http.Request, error) { + if dlsalr.NextLink == nil || len(to.String(dlsalr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(dlsalr.NextLink))) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DataLakeStoreAccountListResultPage contains a page of DataLakeStoreAccount values. +type DataLakeStoreAccountListResultPage struct { + fn func(DataLakeStoreAccountListResult) (DataLakeStoreAccountListResult, error) + dlsalr DataLakeStoreAccountListResult +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *DataLakeStoreAccountListResultPage) Next() error { + next, err := page.fn(page.dlsalr) + if err != nil { + return err + } + page.dlsalr = next + return nil +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page DataLakeStoreAccountListResultPage) NotDone() bool { + return !page.dlsalr.IsEmpty() +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Response returns the raw server response from the last page request. +func (page DataLakeStoreAccountListResultPage) Response() DataLakeStoreAccountListResult { + return page.dlsalr +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Values returns the slice of values for the current page or nil if there are no values. +func (page DataLakeStoreAccountListResultPage) Values() []DataLakeStoreAccount { + if page.dlsalr.IsEmpty() { + return nil + } + return *page.dlsalr.Value +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DataLakeStoreAccountProperties data Lake Store account properties information +type DataLakeStoreAccountProperties struct { + // ProvisioningState - the status of the Data Lake Store account while being provisioned. Possible values include: 'Failed', 'Creating', 'Running', 'Succeeded', 'Patching', 'Suspending', 'Resuming', 'Deleting', 'Deleted' + ProvisioningState DataLakeStoreAccountStatus `json:"provisioningState,omitempty"` + // State - the status of the Data Lake Store account after provisioning has completed. Possible values include: 'Active', 'Suspended' + State DataLakeStoreAccountState `json:"state,omitempty"` + // CreationTime - the account creation time. + CreationTime *date.Time `json:"creationTime,omitempty"` + // EncryptionState - The current state of encryption for this Data Lake store account. Possible values include: 'Enabled', 'Disabled' + EncryptionState EncryptionState `json:"encryptionState,omitempty"` + // EncryptionProvisioningState - The current state of encryption provisioning for this Data Lake store account. Possible values include: 'EncryptionProvisioningStateCreating', 'EncryptionProvisioningStateSucceeded' + EncryptionProvisioningState EncryptionProvisioningState `json:"encryptionProvisioningState,omitempty"` + // EncryptionConfig - The Key vault encryption configuration. + EncryptionConfig *EncryptionConfig `json:"encryptionConfig,omitempty"` + // LastModifiedTime - the account last modified time. + LastModifiedTime *date.Time `json:"lastModifiedTime,omitempty"` + // Endpoint - the gateway host. + Endpoint *string `json:"endpoint,omitempty"` + // DefaultGroup - the default owner group for all new folders and files created in the Data Lake Store account. + DefaultGroup *string `json:"defaultGroup,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DataLakeStoreFirewallRuleListResult data Lake Store firewall rule list information. +type DataLakeStoreFirewallRuleListResult struct { + autorest.Response `json:"-"` + // Value - the results of the list operation + Value *[]FirewallRule `json:"value,omitempty"` + // NextLink - the link (url) to the next page of results. + NextLink *string `json:"nextLink,omitempty"` + // Count - the total count of results that are available, but might not be returned in the current page. + Count *int64 `json:"count,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DataLakeStoreFirewallRuleListResultIterator provides access to a complete listing of FirewallRule values. +type DataLakeStoreFirewallRuleListResultIterator struct { + i int + page DataLakeStoreFirewallRuleListResultPage +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *DataLakeStoreFirewallRuleListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter DataLakeStoreFirewallRuleListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Response returns the raw server response from the last page request. +func (iter DataLakeStoreFirewallRuleListResultIterator) Response() DataLakeStoreFirewallRuleListResult { + return iter.page.Response() +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter DataLakeStoreFirewallRuleListResultIterator) Value() FirewallRule { + if !iter.page.NotDone() { + return FirewallRule{} + } + return iter.page.Values()[iter.i] +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// IsEmpty returns true if the ListResult contains no values. +func (dlsfrlr DataLakeStoreFirewallRuleListResult) IsEmpty() bool { + return dlsfrlr.Value == nil || len(*dlsfrlr.Value) == 0 +} + +// dataLakeStoreFirewallRuleListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (dlsfrlr DataLakeStoreFirewallRuleListResult) dataLakeStoreFirewallRuleListResultPreparer() (*http.Request, error) { + if dlsfrlr.NextLink == nil || len(to.String(dlsfrlr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(dlsfrlr.NextLink))) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DataLakeStoreFirewallRuleListResultPage contains a page of FirewallRule values. +type DataLakeStoreFirewallRuleListResultPage struct { + fn func(DataLakeStoreFirewallRuleListResult) (DataLakeStoreFirewallRuleListResult, error) + dlsfrlr DataLakeStoreFirewallRuleListResult +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *DataLakeStoreFirewallRuleListResultPage) Next() error { + next, err := page.fn(page.dlsfrlr) + if err != nil { + return err + } + page.dlsfrlr = next + return nil +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page DataLakeStoreFirewallRuleListResultPage) NotDone() bool { + return !page.dlsfrlr.IsEmpty() +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Response returns the raw server response from the last page request. +func (page DataLakeStoreFirewallRuleListResultPage) Response() DataLakeStoreFirewallRuleListResult { + return page.dlsfrlr +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Values returns the slice of values for the current page or nil if there are no values. +func (page DataLakeStoreFirewallRuleListResultPage) Values() []FirewallRule { + if page.dlsfrlr.IsEmpty() { + return nil + } + return *page.dlsfrlr.Value +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// DeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type DeleteFuture struct { + azure.Future + req *http.Request +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future DeleteFuture) Result(client Client) (ar autorest.Response, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "account.DeleteFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + return ar, azure.NewAsyncOpIncompleteError("account.DeleteFuture") + } + if future.PollingMethod() == azure.PollingLocation { + ar, err = client.DeleteResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "account.DeleteFuture", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "account.DeleteFuture", "Result", resp, "Failure sending request") + return + } + ar, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.DeleteFuture", "Result", resp, "Failure responding to request") + } + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// EncryptionConfig ... +type EncryptionConfig struct { + // Type - The type of encryption configuration being used. Currently the only supported types are 'UserManaged' and 'ServiceManaged'. Possible values include: 'UserManaged', 'ServiceManaged' + Type EncryptionConfigType `json:"type,omitempty"` + // KeyVaultMetaInfo - The Key vault information for connecting to user managed encryption keys. + KeyVaultMetaInfo *KeyVaultMetaInfo `json:"keyVaultMetaInfo,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// EncryptionIdentity ... +type EncryptionIdentity struct { + // Type - The type of encryption being used. Currently the only supported type is 'SystemAssigned'. Possible values include: 'SystemAssigned' + Type EncryptionIdentityType `json:"type,omitempty"` + // PrincipalID - The principal identifier associated with the encryption. + PrincipalID *uuid.UUID `json:"principalId,omitempty"` + // TenantID - The tenant identifier associated with the encryption. + TenantID *uuid.UUID `json:"tenantId,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Error data Lake Store error information +type Error struct { + // Code - the HTTP status code or error code associated with this error + Code *string `json:"code,omitempty"` + // Message - the error message to display. + Message *string `json:"message,omitempty"` + // Target - the target of the error. + Target *string `json:"target,omitempty"` + // Details - the list of error details + Details *[]ErrorDetails `json:"details,omitempty"` + // InnerError - the inner exceptions or errors, if any + InnerError *InnerError `json:"innerError,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// ErrorDetails data Lake Store error details information +type ErrorDetails struct { + // Code - the HTTP status code or error code associated with this error + Code *string `json:"code,omitempty"` + // Message - the error message localized based on Accept-Language + Message *string `json:"message,omitempty"` + // Target - the target of the particular error (for example, the name of the property in error). + Target *string `json:"target,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// FirewallRule data Lake Store firewall rule information +type FirewallRule struct { + autorest.Response `json:"-"` + // Name - the firewall rule's name. + Name *string `json:"name,omitempty"` + // Type - the namespace and type of the firewall Rule. + Type *string `json:"type,omitempty"` + // ID - the firewall rule's subscription ID. + ID *string `json:"id,omitempty"` + // Location - the firewall rule's regional location. + Location *string `json:"location,omitempty"` + // Properties - the properties of the firewall rule. + Properties *FirewallRuleProperties `json:"properties,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// FirewallRuleProperties data Lake Store firewall rule properties information +type FirewallRuleProperties struct { + // StartIPAddress - the start IP address for the firewall rule. + StartIPAddress *string `json:"startIpAddress,omitempty"` + // EndIPAddress - the end IP address for the firewall rule. + EndIPAddress *string `json:"endIpAddress,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// InnerError data Lake Store inner error information +type InnerError struct { + // Trace - the stack trace for the error + Trace *string `json:"trace,omitempty"` + // Context - the context for the error message + Context *string `json:"context,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// KeyVaultMetaInfo ... +type KeyVaultMetaInfo struct { + // KeyVaultResourceID - The resource identifier for the user managed Key Vault being used to encrypt. + KeyVaultResourceID *string `json:"keyVaultResourceId,omitempty"` + // EncryptionKeyName - The name of the user managed encryption key. + EncryptionKeyName *string `json:"encryptionKeyName,omitempty"` + // EncryptionKeyVersion - The version of the user managed encryption key. + EncryptionKeyVersion *string `json:"encryptionKeyVersion,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// UpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type UpdateFuture struct { + azure.Future + req *http.Request +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future UpdateFuture) Result(client Client) (dlsa DataLakeStoreAccount, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "account.UpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + return dlsa, azure.NewAsyncOpIncompleteError("account.UpdateFuture") + } + if future.PollingMethod() == azure.PollingLocation { + dlsa, err = client.UpdateResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "account.UpdateFuture", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "account.UpdateFuture", "Result", resp, "Failure sending request") + return + } + dlsa, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.UpdateFuture", "Result", resp, "Failure responding to request") + } + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/version.go new file mode 100644 index 000000000000..3d634ad57763 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/version.go @@ -0,0 +1,31 @@ +package account + +import "github.com/Azure/azure-sdk-for-go/version" + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// UserAgent returns the UserAgent string to use when sending http.Requests. +func UserAgent() string { + return "Azure-SDK-For-Go/" + version.Number + " account/2015-10-01-preview" +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. +// Version returns the semantic version (see http://semver.org) of the client. +func Version() string { + return version.Number +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/accounts.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/accounts.go new file mode 100644 index 000000000000..52f0dc72d3bf --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/accounts.go @@ -0,0 +1,740 @@ +package account + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// AccountsClient is the creates an Azure Data Lake Store account management client. +type AccountsClient struct { + BaseClient +} + +// NewAccountsClient creates an instance of the AccountsClient client. +func NewAccountsClient(subscriptionID string) AccountsClient { + return NewAccountsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewAccountsClientWithBaseURI creates an instance of the AccountsClient client. +func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient { + return AccountsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CheckNameAvailability checks whether the specified account name is available or taken. +// Parameters: +// location - the resource location without whitespace. +// parameters - parameters supplied to check the Data Lake Store account name availability. +func (client AccountsClient) CheckNameAvailability(ctx context.Context, location string, parameters CheckNameAvailabilityParameters) (result NameAvailabilityInformation, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.Name", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "parameters.Type", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { + return result, validation.NewError("account.AccountsClient", "CheckNameAvailability", err.Error()) + } + + req, err := client.CheckNameAvailabilityPreparer(ctx, location, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "CheckNameAvailability", nil, "Failure preparing request") + return + } + + resp, err := client.CheckNameAvailabilitySender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.AccountsClient", "CheckNameAvailability", resp, "Failure sending request") + return + } + + result, err = client.CheckNameAvailabilityResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "CheckNameAvailability", resp, "Failure responding to request") + } + + return +} + +// CheckNameAvailabilityPreparer prepares the CheckNameAvailability request. +func (client AccountsClient) CheckNameAvailabilityPreparer(ctx context.Context, location string, parameters CheckNameAvailabilityParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "location": autorest.Encode("path", location), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.DataLakeStore/locations/{location}/checkNameAvailability", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CheckNameAvailabilitySender sends the CheckNameAvailability request. The method will close the +// http.Response Body if it receives an error. +func (client AccountsClient) CheckNameAvailabilitySender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CheckNameAvailabilityResponder handles the response to the CheckNameAvailability request. The method always +// closes the http.Response Body. +func (client AccountsClient) CheckNameAvailabilityResponder(resp *http.Response) (result NameAvailabilityInformation, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Create creates the specified Data Lake Store account. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// parameters - parameters supplied to create the Data Lake Store account. +func (client AccountsClient) Create(ctx context.Context, resourceGroupName string, accountName string, parameters CreateDataLakeStoreAccountParameters) (result AccountsCreateFutureType, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.Location", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "parameters.Identity", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.Identity.Type", Name: validation.Null, Rule: true, Chain: nil}}}, + {Target: "parameters.CreateDataLakeStoreAccountProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.CreateDataLakeStoreAccountProperties.EncryptionConfig", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.CreateDataLakeStoreAccountProperties.EncryptionConfig.KeyVaultMetaInfo", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.CreateDataLakeStoreAccountProperties.EncryptionConfig.KeyVaultMetaInfo.KeyVaultResourceID", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "parameters.CreateDataLakeStoreAccountProperties.EncryptionConfig.KeyVaultMetaInfo.EncryptionKeyName", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "parameters.CreateDataLakeStoreAccountProperties.EncryptionConfig.KeyVaultMetaInfo.EncryptionKeyVersion", Name: validation.Null, Rule: true, Chain: nil}, + }}, + }}, + }}}}}); err != nil { + return result, validation.NewError("account.AccountsClient", "Create", err.Error()) + } + + req, err := client.CreatePreparer(ctx, resourceGroupName, accountName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "Create", nil, "Failure preparing request") + return + } + + result, err = client.CreateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "Create", result.Response(), "Failure sending request") + return + } + + return +} + +// CreatePreparer prepares the Create request. +func (client AccountsClient) CreatePreparer(ctx context.Context, resourceGroupName string, accountName string, parameters CreateDataLakeStoreAccountParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateSender sends the Create request. The method will close the +// http.Response Body if it receives an error. +func (client AccountsClient) CreateSender(req *http.Request) (future AccountsCreateFutureType, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + return +} + +// CreateResponder handles the response to the Create request. The method always +// closes the http.Response Body. +func (client AccountsClient) CreateResponder(resp *http.Response) (result DataLakeStoreAccount, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes the specified Data Lake Store account. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +func (client AccountsClient) Delete(ctx context.Context, resourceGroupName string, accountName string) (result AccountsDeleteFutureType, err error) { + req, err := client.DeletePreparer(ctx, resourceGroupName, accountName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "Delete", nil, "Failure preparing request") + return + } + + result, err = client.DeleteSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "Delete", result.Response(), "Failure sending request") + return + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client AccountsClient) DeletePreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client AccountsClient) DeleteSender(req *http.Request) (future AccountsDeleteFutureType, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + return +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client AccountsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// EnableKeyVault attempts to enable a user managed Key Vault for encryption of the specified Data Lake Store account. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +func (client AccountsClient) EnableKeyVault(ctx context.Context, resourceGroupName string, accountName string) (result autorest.Response, err error) { + req, err := client.EnableKeyVaultPreparer(ctx, resourceGroupName, accountName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "EnableKeyVault", nil, "Failure preparing request") + return + } + + resp, err := client.EnableKeyVaultSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "account.AccountsClient", "EnableKeyVault", resp, "Failure sending request") + return + } + + result, err = client.EnableKeyVaultResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "EnableKeyVault", resp, "Failure responding to request") + } + + return +} + +// EnableKeyVaultPreparer prepares the EnableKeyVault request. +func (client AccountsClient) EnableKeyVaultPreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/enableKeyVault", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// EnableKeyVaultSender sends the EnableKeyVault request. The method will close the +// http.Response Body if it receives an error. +func (client AccountsClient) EnableKeyVaultSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// EnableKeyVaultResponder handles the response to the EnableKeyVault request. The method always +// closes the http.Response Body. +func (client AccountsClient) EnableKeyVaultResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get gets the specified Data Lake Store account. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +func (client AccountsClient) Get(ctx context.Context, resourceGroupName string, accountName string) (result DataLakeStoreAccount, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, accountName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.AccountsClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client AccountsClient) GetPreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client AccountsClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client AccountsClient) GetResponder(resp *http.Response) (result DataLakeStoreAccount, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// List lists the Data Lake Store accounts within the subscription. The response includes a link to the next page of +// results, if any. +// Parameters: +// filter - oData filter. Optional. +// top - the number of items to return. Optional. +// skip - the number of items to skip over before returning elements. Optional. +// selectParameter - oData Select statement. Limits the properties on each entry to just those requested, e.g. +// Categories?$select=CategoryName,Description. Optional. +// orderby - orderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or +// "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. +// Optional. +// count - the Boolean value of true or false to request a count of the matching resources included with the +// resources in the response, e.g. Categories?$count=true. Optional. +func (client AccountsClient) List(ctx context.Context, filter string, top *int32, skip *int32, selectParameter string, orderby string, count *bool) (result DataLakeStoreAccountListResultPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: top, + Constraints: []validation.Constraint{{Target: "top", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}}}}}, + {TargetValue: skip, + Constraints: []validation.Constraint{{Target: "skip", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}}}}}}); err != nil { + return result, validation.NewError("account.AccountsClient", "List", err.Error()) + } + + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx, filter, top, skip, selectParameter, orderby, count) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.dlsalr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.AccountsClient", "List", resp, "Failure sending request") + return + } + + result.dlsalr, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client AccountsClient) ListPreparer(ctx context.Context, filter string, top *int32, skip *int32, selectParameter string, orderby string, count *bool) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(filter) > 0 { + queryParameters["$filter"] = autorest.Encode("query", filter) + } + if top != nil { + queryParameters["$top"] = autorest.Encode("query", *top) + } + if skip != nil { + queryParameters["$skip"] = autorest.Encode("query", *skip) + } + if len(selectParameter) > 0 { + queryParameters["$select"] = autorest.Encode("query", selectParameter) + } + if len(orderby) > 0 { + queryParameters["$orderby"] = autorest.Encode("query", orderby) + } + if count != nil { + queryParameters["$count"] = autorest.Encode("query", *count) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.DataLakeStore/accounts", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client AccountsClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client AccountsClient) ListResponder(resp *http.Response) (result DataLakeStoreAccountListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client AccountsClient) listNextResults(lastResults DataLakeStoreAccountListResult) (result DataLakeStoreAccountListResult, err error) { + req, err := lastResults.dataLakeStoreAccountListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "account.AccountsClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "account.AccountsClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client AccountsClient) ListComplete(ctx context.Context, filter string, top *int32, skip *int32, selectParameter string, orderby string, count *bool) (result DataLakeStoreAccountListResultIterator, err error) { + result.page, err = client.List(ctx, filter, top, skip, selectParameter, orderby, count) + return +} + +// ListByResourceGroup lists the Data Lake Store accounts within a specific resource group. The response includes a +// link to the next page of results, if any. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// filter - oData filter. Optional. +// top - the number of items to return. Optional. +// skip - the number of items to skip over before returning elements. Optional. +// selectParameter - oData Select statement. Limits the properties on each entry to just those requested, e.g. +// Categories?$select=CategoryName,Description. Optional. +// orderby - orderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or +// "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. +// Optional. +// count - a Boolean value of true or false to request a count of the matching resources included with the +// resources in the response, e.g. Categories?$count=true. Optional. +func (client AccountsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string, filter string, top *int32, skip *int32, selectParameter string, orderby string, count *bool) (result DataLakeStoreAccountListResultPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: top, + Constraints: []validation.Constraint{{Target: "top", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}}}}}, + {TargetValue: skip, + Constraints: []validation.Constraint{{Target: "skip", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}}}}}}); err != nil { + return result, validation.NewError("account.AccountsClient", "ListByResourceGroup", err.Error()) + } + + result.fn = client.listByResourceGroupNextResults + req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName, filter, top, skip, selectParameter, orderby, count) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "ListByResourceGroup", nil, "Failure preparing request") + return + } + + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.dlsalr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.AccountsClient", "ListByResourceGroup", resp, "Failure sending request") + return + } + + result.dlsalr, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "ListByResourceGroup", resp, "Failure responding to request") + } + + return +} + +// ListByResourceGroupPreparer prepares the ListByResourceGroup request. +func (client AccountsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string, filter string, top *int32, skip *int32, selectParameter string, orderby string, count *bool) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(filter) > 0 { + queryParameters["$filter"] = autorest.Encode("query", filter) + } + if top != nil { + queryParameters["$top"] = autorest.Encode("query", *top) + } + if skip != nil { + queryParameters["$skip"] = autorest.Encode("query", *skip) + } + if len(selectParameter) > 0 { + queryParameters["$select"] = autorest.Encode("query", selectParameter) + } + if len(orderby) > 0 { + queryParameters["$orderby"] = autorest.Encode("query", orderby) + } + if count != nil { + queryParameters["$count"] = autorest.Encode("query", *count) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the +// http.Response Body if it receives an error. +func (client AccountsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always +// closes the http.Response Body. +func (client AccountsClient) ListByResourceGroupResponder(resp *http.Response) (result DataLakeStoreAccountListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByResourceGroupNextResults retrieves the next set of results, if any. +func (client AccountsClient) listByResourceGroupNextResults(lastResults DataLakeStoreAccountListResult) (result DataLakeStoreAccountListResult, err error) { + req, err := lastResults.dataLakeStoreAccountListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "account.AccountsClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "account.AccountsClient", "listByResourceGroupNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. +func (client AccountsClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string, filter string, top *int32, skip *int32, selectParameter string, orderby string, count *bool) (result DataLakeStoreAccountListResultIterator, err error) { + result.page, err = client.ListByResourceGroup(ctx, resourceGroupName, filter, top, skip, selectParameter, orderby, count) + return +} + +// Update updates the specified Data Lake Store account information. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// parameters - parameters supplied to update the Data Lake Store account. +func (client AccountsClient) Update(ctx context.Context, resourceGroupName string, accountName string, parameters UpdateDataLakeStoreAccountParameters) (result AccountsUpdateFutureType, err error) { + req, err := client.UpdatePreparer(ctx, resourceGroupName, accountName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "Update", nil, "Failure preparing request") + return + } + + result, err = client.UpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsClient", "Update", result.Response(), "Failure sending request") + return + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client AccountsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, accountName string, parameters UpdateDataLakeStoreAccountParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client AccountsClient) UpdateSender(req *http.Request) (future AccountsUpdateFutureType, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + return +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client AccountsClient) UpdateResponder(resp *http.Response) (result DataLakeStoreAccount, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/client.go new file mode 100644 index 000000000000..d0b410873c46 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/client.go @@ -0,0 +1,51 @@ +// Package account implements the Azure ARM Account service API version 2016-11-01. +// +// Creates an Azure Data Lake Store account management client. +package account + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" +) + +const ( + // DefaultBaseURI is the default URI used for the service Account + DefaultBaseURI = "https://management.azure.com" +) + +// BaseClient is the base client for Account. +type BaseClient struct { + autorest.Client + BaseURI string + SubscriptionID string +} + +// New creates an instance of the BaseClient client. +func New(subscriptionID string) BaseClient { + return NewWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewWithBaseURI creates an instance of the BaseClient client. +func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { + return BaseClient{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + BaseURI: baseURI, + SubscriptionID: subscriptionID, + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/firewallrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/firewallrules.go new file mode 100644 index 000000000000..f3c1385d09b0 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/firewallrules.go @@ -0,0 +1,430 @@ +package account + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// FirewallRulesClient is the creates an Azure Data Lake Store account management client. +type FirewallRulesClient struct { + BaseClient +} + +// NewFirewallRulesClient creates an instance of the FirewallRulesClient client. +func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient { + return NewFirewallRulesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewFirewallRulesClientWithBaseURI creates an instance of the FirewallRulesClient client. +func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient { + return FirewallRulesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate creates or updates the specified firewall rule. During update, the firewall rule with the specified +// name will be replaced with this new firewall rule. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// firewallRuleName - the name of the firewall rule to create or update. +// parameters - parameters supplied to create or update the firewall rule. +func (client FirewallRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string, parameters CreateOrUpdateFirewallRuleParameters) (result FirewallRule, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.CreateOrUpdateFirewallRuleProperties", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.CreateOrUpdateFirewallRuleProperties.StartIPAddress", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "parameters.CreateOrUpdateFirewallRuleProperties.EndIPAddress", Name: validation.Null, Rule: true, Chain: nil}, + }}}}}); err != nil { + return result, validation.NewError("account.FirewallRulesClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, accountName, firewallRuleName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "CreateOrUpdate", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client FirewallRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string, parameters CreateOrUpdateFirewallRuleParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "firewallRuleName": autorest.Encode("path", firewallRuleName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules/{firewallRuleName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client FirewallRulesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client FirewallRulesClient) CreateOrUpdateResponder(resp *http.Response) (result FirewallRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes the specified firewall rule from the specified Data Lake Store account +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// firewallRuleName - the name of the firewall rule to delete. +func (client FirewallRulesClient) Delete(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string) (result autorest.Response, err error) { + req, err := client.DeletePreparer(ctx, resourceGroupName, accountName, firewallRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client FirewallRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "firewallRuleName": autorest.Encode("path", firewallRuleName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules/{firewallRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client FirewallRulesClient) DeleteSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client FirewallRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get gets the specified Data Lake Store firewall rule. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// firewallRuleName - the name of the firewall rule to retrieve. +func (client FirewallRulesClient) Get(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string) (result FirewallRule, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, accountName, firewallRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client FirewallRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "firewallRuleName": autorest.Encode("path", firewallRuleName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules/{firewallRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client FirewallRulesClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client FirewallRulesClient) GetResponder(resp *http.Response) (result FirewallRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListByAccount lists the Data Lake Store firewall rules within the specified Data Lake Store account. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +func (client FirewallRulesClient) ListByAccount(ctx context.Context, resourceGroupName string, accountName string) (result FirewallRuleListResultPage, err error) { + result.fn = client.listByAccountNextResults + req, err := client.ListByAccountPreparer(ctx, resourceGroupName, accountName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "ListByAccount", nil, "Failure preparing request") + return + } + + resp, err := client.ListByAccountSender(req) + if err != nil { + result.frlr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "ListByAccount", resp, "Failure sending request") + return + } + + result.frlr, err = client.ListByAccountResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "ListByAccount", resp, "Failure responding to request") + } + + return +} + +// ListByAccountPreparer prepares the ListByAccount request. +func (client FirewallRulesClient) ListByAccountPreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByAccountSender sends the ListByAccount request. The method will close the +// http.Response Body if it receives an error. +func (client FirewallRulesClient) ListByAccountSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByAccountResponder handles the response to the ListByAccount request. The method always +// closes the http.Response Body. +func (client FirewallRulesClient) ListByAccountResponder(resp *http.Response) (result FirewallRuleListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByAccountNextResults retrieves the next set of results, if any. +func (client FirewallRulesClient) listByAccountNextResults(lastResults FirewallRuleListResult) (result FirewallRuleListResult, err error) { + req, err := lastResults.firewallRuleListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "account.FirewallRulesClient", "listByAccountNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByAccountSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "account.FirewallRulesClient", "listByAccountNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByAccountResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "listByAccountNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByAccountComplete enumerates all values, automatically crossing page boundaries as required. +func (client FirewallRulesClient) ListByAccountComplete(ctx context.Context, resourceGroupName string, accountName string) (result FirewallRuleListResultIterator, err error) { + result.page, err = client.ListByAccount(ctx, resourceGroupName, accountName) + return +} + +// Update updates the specified firewall rule. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// firewallRuleName - the name of the firewall rule to update. +// parameters - parameters supplied to update the firewall rule. +func (client FirewallRulesClient) Update(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string, parameters *UpdateFirewallRuleParameters) (result FirewallRule, err error) { + req, err := client.UpdatePreparer(ctx, resourceGroupName, accountName, firewallRuleName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "Update", nil, "Failure preparing request") + return + } + + resp, err := client.UpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "Update", resp, "Failure sending request") + return + } + + result, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.FirewallRulesClient", "Update", resp, "Failure responding to request") + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client FirewallRulesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string, parameters *UpdateFirewallRuleParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "firewallRuleName": autorest.Encode("path", firewallRuleName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules/{firewallRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + if parameters != nil { + preparer = autorest.DecoratePreparer(preparer, + autorest.WithJSON(parameters)) + } + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client FirewallRulesClient) UpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client FirewallRulesClient) UpdateResponder(resp *http.Response) (result FirewallRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/locations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/locations.go new file mode 100644 index 000000000000..217126cda770 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/locations.go @@ -0,0 +1,105 @@ +package account + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// LocationsClient is the creates an Azure Data Lake Store account management client. +type LocationsClient struct { + BaseClient +} + +// NewLocationsClient creates an instance of the LocationsClient client. +func NewLocationsClient(subscriptionID string) LocationsClient { + return NewLocationsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewLocationsClientWithBaseURI creates an instance of the LocationsClient client. +func NewLocationsClientWithBaseURI(baseURI string, subscriptionID string) LocationsClient { + return LocationsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// GetCapability gets subscription-level properties and limits for Data Lake Store specified by resource location. +// Parameters: +// location - the resource location without whitespace. +func (client LocationsClient) GetCapability(ctx context.Context, location string) (result CapabilityInformation, err error) { + req, err := client.GetCapabilityPreparer(ctx, location) + if err != nil { + err = autorest.NewErrorWithError(err, "account.LocationsClient", "GetCapability", nil, "Failure preparing request") + return + } + + resp, err := client.GetCapabilitySender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.LocationsClient", "GetCapability", resp, "Failure sending request") + return + } + + result, err = client.GetCapabilityResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.LocationsClient", "GetCapability", resp, "Failure responding to request") + } + + return +} + +// GetCapabilityPreparer prepares the GetCapability request. +func (client LocationsClient) GetCapabilityPreparer(ctx context.Context, location string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "location": autorest.Encode("path", location), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.DataLakeStore/locations/{location}/capability", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetCapabilitySender sends the GetCapability request. The method will close the +// http.Response Body if it receives an error. +func (client LocationsClient) GetCapabilitySender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetCapabilityResponder handles the response to the GetCapability request. The method always +// closes the http.Response Body. +func (client LocationsClient) GetCapabilityResponder(resp *http.Response) (result CapabilityInformation, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNotFound), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/models.go new file mode 100644 index 000000000000..c5fd6c189532 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/models.go @@ -0,0 +1,1874 @@ +package account + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "encoding/json" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/date" + "github.com/Azure/go-autorest/autorest/to" + "github.com/satori/go.uuid" + "net/http" +) + +// DataLakeStoreAccountState enumerates the values for data lake store account state. +type DataLakeStoreAccountState string + +const ( + // Active ... + Active DataLakeStoreAccountState = "Active" + // Suspended ... + Suspended DataLakeStoreAccountState = "Suspended" +) + +// PossibleDataLakeStoreAccountStateValues returns an array of possible values for the DataLakeStoreAccountState const type. +func PossibleDataLakeStoreAccountStateValues() []DataLakeStoreAccountState { + return []DataLakeStoreAccountState{Active, Suspended} +} + +// DataLakeStoreAccountStatus enumerates the values for data lake store account status. +type DataLakeStoreAccountStatus string + +const ( + // Canceled ... + Canceled DataLakeStoreAccountStatus = "Canceled" + // Creating ... + Creating DataLakeStoreAccountStatus = "Creating" + // Deleted ... + Deleted DataLakeStoreAccountStatus = "Deleted" + // Deleting ... + Deleting DataLakeStoreAccountStatus = "Deleting" + // Failed ... + Failed DataLakeStoreAccountStatus = "Failed" + // Patching ... + Patching DataLakeStoreAccountStatus = "Patching" + // Resuming ... + Resuming DataLakeStoreAccountStatus = "Resuming" + // Running ... + Running DataLakeStoreAccountStatus = "Running" + // Succeeded ... + Succeeded DataLakeStoreAccountStatus = "Succeeded" + // Suspending ... + Suspending DataLakeStoreAccountStatus = "Suspending" + // Undeleting ... + Undeleting DataLakeStoreAccountStatus = "Undeleting" +) + +// PossibleDataLakeStoreAccountStatusValues returns an array of possible values for the DataLakeStoreAccountStatus const type. +func PossibleDataLakeStoreAccountStatusValues() []DataLakeStoreAccountStatus { + return []DataLakeStoreAccountStatus{Canceled, Creating, Deleted, Deleting, Failed, Patching, Resuming, Running, Succeeded, Suspending, Undeleting} +} + +// EncryptionConfigType enumerates the values for encryption config type. +type EncryptionConfigType string + +const ( + // ServiceManaged ... + ServiceManaged EncryptionConfigType = "ServiceManaged" + // UserManaged ... + UserManaged EncryptionConfigType = "UserManaged" +) + +// PossibleEncryptionConfigTypeValues returns an array of possible values for the EncryptionConfigType const type. +func PossibleEncryptionConfigTypeValues() []EncryptionConfigType { + return []EncryptionConfigType{ServiceManaged, UserManaged} +} + +// EncryptionProvisioningState enumerates the values for encryption provisioning state. +type EncryptionProvisioningState string + +const ( + // EncryptionProvisioningStateCreating ... + EncryptionProvisioningStateCreating EncryptionProvisioningState = "Creating" + // EncryptionProvisioningStateSucceeded ... + EncryptionProvisioningStateSucceeded EncryptionProvisioningState = "Succeeded" +) + +// PossibleEncryptionProvisioningStateValues returns an array of possible values for the EncryptionProvisioningState const type. +func PossibleEncryptionProvisioningStateValues() []EncryptionProvisioningState { + return []EncryptionProvisioningState{EncryptionProvisioningStateCreating, EncryptionProvisioningStateSucceeded} +} + +// EncryptionState enumerates the values for encryption state. +type EncryptionState string + +const ( + // Disabled ... + Disabled EncryptionState = "Disabled" + // Enabled ... + Enabled EncryptionState = "Enabled" +) + +// PossibleEncryptionStateValues returns an array of possible values for the EncryptionState const type. +func PossibleEncryptionStateValues() []EncryptionState { + return []EncryptionState{Disabled, Enabled} +} + +// FirewallAllowAzureIpsState enumerates the values for firewall allow azure ips state. +type FirewallAllowAzureIpsState string + +const ( + // FirewallAllowAzureIpsStateDisabled ... + FirewallAllowAzureIpsStateDisabled FirewallAllowAzureIpsState = "Disabled" + // FirewallAllowAzureIpsStateEnabled ... + FirewallAllowAzureIpsStateEnabled FirewallAllowAzureIpsState = "Enabled" +) + +// PossibleFirewallAllowAzureIpsStateValues returns an array of possible values for the FirewallAllowAzureIpsState const type. +func PossibleFirewallAllowAzureIpsStateValues() []FirewallAllowAzureIpsState { + return []FirewallAllowAzureIpsState{FirewallAllowAzureIpsStateDisabled, FirewallAllowAzureIpsStateEnabled} +} + +// FirewallState enumerates the values for firewall state. +type FirewallState string + +const ( + // FirewallStateDisabled ... + FirewallStateDisabled FirewallState = "Disabled" + // FirewallStateEnabled ... + FirewallStateEnabled FirewallState = "Enabled" +) + +// PossibleFirewallStateValues returns an array of possible values for the FirewallState const type. +func PossibleFirewallStateValues() []FirewallState { + return []FirewallState{FirewallStateDisabled, FirewallStateEnabled} +} + +// OperationOrigin enumerates the values for operation origin. +type OperationOrigin string + +const ( + // System ... + System OperationOrigin = "system" + // User ... + User OperationOrigin = "user" + // Usersystem ... + Usersystem OperationOrigin = "user,system" +) + +// PossibleOperationOriginValues returns an array of possible values for the OperationOrigin const type. +func PossibleOperationOriginValues() []OperationOrigin { + return []OperationOrigin{System, User, Usersystem} +} + +// SubscriptionState enumerates the values for subscription state. +type SubscriptionState string + +const ( + // SubscriptionStateDeleted ... + SubscriptionStateDeleted SubscriptionState = "Deleted" + // SubscriptionStateRegistered ... + SubscriptionStateRegistered SubscriptionState = "Registered" + // SubscriptionStateSuspended ... + SubscriptionStateSuspended SubscriptionState = "Suspended" + // SubscriptionStateUnregistered ... + SubscriptionStateUnregistered SubscriptionState = "Unregistered" + // SubscriptionStateWarned ... + SubscriptionStateWarned SubscriptionState = "Warned" +) + +// PossibleSubscriptionStateValues returns an array of possible values for the SubscriptionState const type. +func PossibleSubscriptionStateValues() []SubscriptionState { + return []SubscriptionState{SubscriptionStateDeleted, SubscriptionStateRegistered, SubscriptionStateSuspended, SubscriptionStateUnregistered, SubscriptionStateWarned} +} + +// TierType enumerates the values for tier type. +type TierType string + +const ( + // Commitment100TB ... + Commitment100TB TierType = "Commitment_100TB" + // Commitment10TB ... + Commitment10TB TierType = "Commitment_10TB" + // Commitment1PB ... + Commitment1PB TierType = "Commitment_1PB" + // Commitment1TB ... + Commitment1TB TierType = "Commitment_1TB" + // Commitment500TB ... + Commitment500TB TierType = "Commitment_500TB" + // Commitment5PB ... + Commitment5PB TierType = "Commitment_5PB" + // Consumption ... + Consumption TierType = "Consumption" +) + +// PossibleTierTypeValues returns an array of possible values for the TierType const type. +func PossibleTierTypeValues() []TierType { + return []TierType{Commitment100TB, Commitment10TB, Commitment1PB, Commitment1TB, Commitment500TB, Commitment5PB, Consumption} +} + +// TrustedIDProviderState enumerates the values for trusted id provider state. +type TrustedIDProviderState string + +const ( + // TrustedIDProviderStateDisabled ... + TrustedIDProviderStateDisabled TrustedIDProviderState = "Disabled" + // TrustedIDProviderStateEnabled ... + TrustedIDProviderStateEnabled TrustedIDProviderState = "Enabled" +) + +// PossibleTrustedIDProviderStateValues returns an array of possible values for the TrustedIDProviderState const type. +func PossibleTrustedIDProviderStateValues() []TrustedIDProviderState { + return []TrustedIDProviderState{TrustedIDProviderStateDisabled, TrustedIDProviderStateEnabled} +} + +// AccountsCreateFutureType an abstraction for monitoring and retrieving the results of a long-running operation. +type AccountsCreateFutureType struct { + azure.Future + req *http.Request +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future AccountsCreateFutureType) Result(client AccountsClient) (dlsa DataLakeStoreAccount, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsCreateFutureType", "Result", future.Response(), "Polling failure") + return + } + if !done { + return dlsa, azure.NewAsyncOpIncompleteError("account.AccountsCreateFutureType") + } + if future.PollingMethod() == azure.PollingLocation { + dlsa, err = client.CreateResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsCreateFutureType", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsCreateFutureType", "Result", resp, "Failure sending request") + return + } + dlsa, err = client.CreateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsCreateFutureType", "Result", resp, "Failure responding to request") + } + return +} + +// AccountsDeleteFutureType an abstraction for monitoring and retrieving the results of a long-running operation. +type AccountsDeleteFutureType struct { + azure.Future + req *http.Request +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future AccountsDeleteFutureType) Result(client AccountsClient) (ar autorest.Response, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsDeleteFutureType", "Result", future.Response(), "Polling failure") + return + } + if !done { + return ar, azure.NewAsyncOpIncompleteError("account.AccountsDeleteFutureType") + } + if future.PollingMethod() == azure.PollingLocation { + ar, err = client.DeleteResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsDeleteFutureType", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsDeleteFutureType", "Result", resp, "Failure sending request") + return + } + ar, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsDeleteFutureType", "Result", resp, "Failure responding to request") + } + return +} + +// AccountsUpdateFutureType an abstraction for monitoring and retrieving the results of a long-running operation. +type AccountsUpdateFutureType struct { + azure.Future + req *http.Request +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future AccountsUpdateFutureType) Result(client AccountsClient) (dlsa DataLakeStoreAccount, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsUpdateFutureType", "Result", future.Response(), "Polling failure") + return + } + if !done { + return dlsa, azure.NewAsyncOpIncompleteError("account.AccountsUpdateFutureType") + } + if future.PollingMethod() == azure.PollingLocation { + dlsa, err = client.UpdateResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsUpdateFutureType", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsUpdateFutureType", "Result", resp, "Failure sending request") + return + } + dlsa, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.AccountsUpdateFutureType", "Result", resp, "Failure responding to request") + } + return +} + +// CapabilityInformation subscription-level properties and limits for Data Lake Store. +type CapabilityInformation struct { + autorest.Response `json:"-"` + // SubscriptionID - The subscription credentials that uniquely identifies the subscription. + SubscriptionID *uuid.UUID `json:"subscriptionId,omitempty"` + // State - The subscription state. Possible values include: 'SubscriptionStateRegistered', 'SubscriptionStateSuspended', 'SubscriptionStateDeleted', 'SubscriptionStateUnregistered', 'SubscriptionStateWarned' + State SubscriptionState `json:"state,omitempty"` + // MaxAccountCount - The maximum supported number of accounts under this subscription. + MaxAccountCount *int32 `json:"maxAccountCount,omitempty"` + // AccountCount - The current number of accounts under this subscription. + AccountCount *int32 `json:"accountCount,omitempty"` + // MigrationState - The Boolean value of true or false to indicate the maintenance state. + MigrationState *bool `json:"migrationState,omitempty"` +} + +// CheckNameAvailabilityParameters data Lake Store account name availability check parameters. +type CheckNameAvailabilityParameters struct { + // Name - The Data Lake Store name to check availability for. + Name *string `json:"name,omitempty"` + // Type - The resource type. Note: This should not be set by the user, as the constant value is Microsoft.DataLakeStore/accounts + Type *string `json:"type,omitempty"` +} + +// CreateDataLakeStoreAccountParameters ... +type CreateDataLakeStoreAccountParameters struct { + // Location - The resource location. + Location *string `json:"location,omitempty"` + // Tags - The resource tags. + Tags map[string]*string `json:"tags"` + // Identity - The Key Vault encryption identity, if any. + Identity *EncryptionIdentity `json:"identity,omitempty"` + // CreateDataLakeStoreAccountProperties - The Data Lake Store account properties to use for creating. + *CreateDataLakeStoreAccountProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for CreateDataLakeStoreAccountParameters. +func (cdlsap CreateDataLakeStoreAccountParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if cdlsap.Location != nil { + objectMap["location"] = cdlsap.Location + } + if cdlsap.Tags != nil { + objectMap["tags"] = cdlsap.Tags + } + if cdlsap.Identity != nil { + objectMap["identity"] = cdlsap.Identity + } + if cdlsap.CreateDataLakeStoreAccountProperties != nil { + objectMap["properties"] = cdlsap.CreateDataLakeStoreAccountProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for CreateDataLakeStoreAccountParameters struct. +func (cdlsap *CreateDataLakeStoreAccountParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + cdlsap.Location = &location + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + cdlsap.Tags = tags + } + case "identity": + if v != nil { + var identity EncryptionIdentity + err = json.Unmarshal(*v, &identity) + if err != nil { + return err + } + cdlsap.Identity = &identity + } + case "properties": + if v != nil { + var createDataLakeStoreAccountProperties CreateDataLakeStoreAccountProperties + err = json.Unmarshal(*v, &createDataLakeStoreAccountProperties) + if err != nil { + return err + } + cdlsap.CreateDataLakeStoreAccountProperties = &createDataLakeStoreAccountProperties + } + } + } + + return nil +} + +// CreateDataLakeStoreAccountProperties ... +type CreateDataLakeStoreAccountProperties struct { + // DefaultGroup - The default owner group for all new folders and files created in the Data Lake Store account. + DefaultGroup *string `json:"defaultGroup,omitempty"` + // EncryptionConfig - The Key Vault encryption configuration. + EncryptionConfig *EncryptionConfig `json:"encryptionConfig,omitempty"` + // EncryptionState - The current state of encryption for this Data Lake Store account. Possible values include: 'Enabled', 'Disabled' + EncryptionState EncryptionState `json:"encryptionState,omitempty"` + // FirewallRules - The list of firewall rules associated with this Data Lake Store account. + FirewallRules *[]CreateFirewallRuleWithAccountParameters `json:"firewallRules,omitempty"` + // FirewallState - The current state of the IP address firewall for this Data Lake Store account. Possible values include: 'FirewallStateEnabled', 'FirewallStateDisabled' + FirewallState FirewallState `json:"firewallState,omitempty"` + // FirewallAllowAzureIps - The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced. Possible values include: 'FirewallAllowAzureIpsStateEnabled', 'FirewallAllowAzureIpsStateDisabled' + FirewallAllowAzureIps FirewallAllowAzureIpsState `json:"firewallAllowAzureIps,omitempty"` + // TrustedIDProviders - The list of trusted identity providers associated with this Data Lake Store account. + TrustedIDProviders *[]CreateTrustedIDProviderWithAccountParameters `json:"trustedIdProviders,omitempty"` + // TrustedIDProviderState - The current state of the trusted identity provider feature for this Data Lake Store account. Possible values include: 'TrustedIDProviderStateEnabled', 'TrustedIDProviderStateDisabled' + TrustedIDProviderState TrustedIDProviderState `json:"trustedIdProviderState,omitempty"` + // NewTier - The commitment tier to use for next month. Possible values include: 'Consumption', 'Commitment1TB', 'Commitment10TB', 'Commitment100TB', 'Commitment500TB', 'Commitment1PB', 'Commitment5PB' + NewTier TierType `json:"newTier,omitempty"` +} + +// CreateFirewallRuleWithAccountParameters the parameters used to create a new firewall rule while creating a new +// Data Lake Store account. +type CreateFirewallRuleWithAccountParameters struct { + // Name - The unique name of the firewall rule to create. + Name *string `json:"name,omitempty"` + // CreateOrUpdateFirewallRuleProperties - The firewall rule properties to use when creating a new firewall rule. + *CreateOrUpdateFirewallRuleProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for CreateFirewallRuleWithAccountParameters. +func (cfrwap CreateFirewallRuleWithAccountParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if cfrwap.Name != nil { + objectMap["name"] = cfrwap.Name + } + if cfrwap.CreateOrUpdateFirewallRuleProperties != nil { + objectMap["properties"] = cfrwap.CreateOrUpdateFirewallRuleProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for CreateFirewallRuleWithAccountParameters struct. +func (cfrwap *CreateFirewallRuleWithAccountParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + cfrwap.Name = &name + } + case "properties": + if v != nil { + var createOrUpdateFirewallRuleProperties CreateOrUpdateFirewallRuleProperties + err = json.Unmarshal(*v, &createOrUpdateFirewallRuleProperties) + if err != nil { + return err + } + cfrwap.CreateOrUpdateFirewallRuleProperties = &createOrUpdateFirewallRuleProperties + } + } + } + + return nil +} + +// CreateOrUpdateFirewallRuleParameters the parameters used to create a new firewall rule. +type CreateOrUpdateFirewallRuleParameters struct { + // CreateOrUpdateFirewallRuleProperties - The firewall rule properties to use when creating a new firewall rule. + *CreateOrUpdateFirewallRuleProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for CreateOrUpdateFirewallRuleParameters. +func (coufrp CreateOrUpdateFirewallRuleParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if coufrp.CreateOrUpdateFirewallRuleProperties != nil { + objectMap["properties"] = coufrp.CreateOrUpdateFirewallRuleProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for CreateOrUpdateFirewallRuleParameters struct. +func (coufrp *CreateOrUpdateFirewallRuleParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var createOrUpdateFirewallRuleProperties CreateOrUpdateFirewallRuleProperties + err = json.Unmarshal(*v, &createOrUpdateFirewallRuleProperties) + if err != nil { + return err + } + coufrp.CreateOrUpdateFirewallRuleProperties = &createOrUpdateFirewallRuleProperties + } + } + } + + return nil +} + +// CreateOrUpdateFirewallRuleProperties the firewall rule properties to use when creating a new firewall rule. +type CreateOrUpdateFirewallRuleProperties struct { + // StartIPAddress - The start IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol. + StartIPAddress *string `json:"startIpAddress,omitempty"` + // EndIPAddress - The end IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol. + EndIPAddress *string `json:"endIpAddress,omitempty"` +} + +// CreateOrUpdateTrustedIDProviderParameters the parameters used to create a new trusted identity provider. +type CreateOrUpdateTrustedIDProviderParameters struct { + // CreateOrUpdateTrustedIDProviderProperties - The trusted identity provider properties to use when creating a new trusted identity provider. + *CreateOrUpdateTrustedIDProviderProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for CreateOrUpdateTrustedIDProviderParameters. +func (coutipp CreateOrUpdateTrustedIDProviderParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if coutipp.CreateOrUpdateTrustedIDProviderProperties != nil { + objectMap["properties"] = coutipp.CreateOrUpdateTrustedIDProviderProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for CreateOrUpdateTrustedIDProviderParameters struct. +func (coutipp *CreateOrUpdateTrustedIDProviderParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var createOrUpdateTrustedIDProviderProperties CreateOrUpdateTrustedIDProviderProperties + err = json.Unmarshal(*v, &createOrUpdateTrustedIDProviderProperties) + if err != nil { + return err + } + coutipp.CreateOrUpdateTrustedIDProviderProperties = &createOrUpdateTrustedIDProviderProperties + } + } + } + + return nil +} + +// CreateOrUpdateTrustedIDProviderProperties the trusted identity provider properties to use when creating a new +// trusted identity provider. +type CreateOrUpdateTrustedIDProviderProperties struct { + // IDProvider - The URL of this trusted identity provider. + IDProvider *string `json:"idProvider,omitempty"` +} + +// CreateTrustedIDProviderWithAccountParameters the parameters used to create a new trusted identity provider while +// creating a new Data Lake Store account. +type CreateTrustedIDProviderWithAccountParameters struct { + // Name - The unique name of the trusted identity provider to create. + Name *string `json:"name,omitempty"` + // CreateOrUpdateTrustedIDProviderProperties - The trusted identity provider properties to use when creating a new trusted identity provider. + *CreateOrUpdateTrustedIDProviderProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for CreateTrustedIDProviderWithAccountParameters. +func (ctipwap CreateTrustedIDProviderWithAccountParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ctipwap.Name != nil { + objectMap["name"] = ctipwap.Name + } + if ctipwap.CreateOrUpdateTrustedIDProviderProperties != nil { + objectMap["properties"] = ctipwap.CreateOrUpdateTrustedIDProviderProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for CreateTrustedIDProviderWithAccountParameters struct. +func (ctipwap *CreateTrustedIDProviderWithAccountParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + ctipwap.Name = &name + } + case "properties": + if v != nil { + var createOrUpdateTrustedIDProviderProperties CreateOrUpdateTrustedIDProviderProperties + err = json.Unmarshal(*v, &createOrUpdateTrustedIDProviderProperties) + if err != nil { + return err + } + ctipwap.CreateOrUpdateTrustedIDProviderProperties = &createOrUpdateTrustedIDProviderProperties + } + } + } + + return nil +} + +// DataLakeStoreAccount data Lake Store account information. +type DataLakeStoreAccount struct { + autorest.Response `json:"-"` + // Identity - The Key Vault encryption identity, if any. + Identity *EncryptionIdentity `json:"identity,omitempty"` + // DataLakeStoreAccountProperties - The Data Lake Store account properties. + *DataLakeStoreAccountProperties `json:"properties,omitempty"` + // ID - The resource identifier. + ID *string `json:"id,omitempty"` + // Name - The resource name. + Name *string `json:"name,omitempty"` + // Type - The resource type. + Type *string `json:"type,omitempty"` + // Location - The resource location. + Location *string `json:"location,omitempty"` + // Tags - The resource tags. + Tags map[string]*string `json:"tags"` +} + +// MarshalJSON is the custom marshaler for DataLakeStoreAccount. +func (dlsa DataLakeStoreAccount) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if dlsa.Identity != nil { + objectMap["identity"] = dlsa.Identity + } + if dlsa.DataLakeStoreAccountProperties != nil { + objectMap["properties"] = dlsa.DataLakeStoreAccountProperties + } + if dlsa.ID != nil { + objectMap["id"] = dlsa.ID + } + if dlsa.Name != nil { + objectMap["name"] = dlsa.Name + } + if dlsa.Type != nil { + objectMap["type"] = dlsa.Type + } + if dlsa.Location != nil { + objectMap["location"] = dlsa.Location + } + if dlsa.Tags != nil { + objectMap["tags"] = dlsa.Tags + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for DataLakeStoreAccount struct. +func (dlsa *DataLakeStoreAccount) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "identity": + if v != nil { + var identity EncryptionIdentity + err = json.Unmarshal(*v, &identity) + if err != nil { + return err + } + dlsa.Identity = &identity + } + case "properties": + if v != nil { + var dataLakeStoreAccountProperties DataLakeStoreAccountProperties + err = json.Unmarshal(*v, &dataLakeStoreAccountProperties) + if err != nil { + return err + } + dlsa.DataLakeStoreAccountProperties = &dataLakeStoreAccountProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + dlsa.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + dlsa.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + dlsa.Type = &typeVar + } + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + dlsa.Location = &location + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + dlsa.Tags = tags + } + } + } + + return nil +} + +// DataLakeStoreAccountBasic basic Data Lake Store account information, returned on list calls. +type DataLakeStoreAccountBasic struct { + // DataLakeStoreAccountPropertiesBasic - The basic Data Lake Store account properties. + *DataLakeStoreAccountPropertiesBasic `json:"properties,omitempty"` + // ID - The resource identifier. + ID *string `json:"id,omitempty"` + // Name - The resource name. + Name *string `json:"name,omitempty"` + // Type - The resource type. + Type *string `json:"type,omitempty"` + // Location - The resource location. + Location *string `json:"location,omitempty"` + // Tags - The resource tags. + Tags map[string]*string `json:"tags"` +} + +// MarshalJSON is the custom marshaler for DataLakeStoreAccountBasic. +func (dlsab DataLakeStoreAccountBasic) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if dlsab.DataLakeStoreAccountPropertiesBasic != nil { + objectMap["properties"] = dlsab.DataLakeStoreAccountPropertiesBasic + } + if dlsab.ID != nil { + objectMap["id"] = dlsab.ID + } + if dlsab.Name != nil { + objectMap["name"] = dlsab.Name + } + if dlsab.Type != nil { + objectMap["type"] = dlsab.Type + } + if dlsab.Location != nil { + objectMap["location"] = dlsab.Location + } + if dlsab.Tags != nil { + objectMap["tags"] = dlsab.Tags + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for DataLakeStoreAccountBasic struct. +func (dlsab *DataLakeStoreAccountBasic) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var dataLakeStoreAccountPropertiesBasic DataLakeStoreAccountPropertiesBasic + err = json.Unmarshal(*v, &dataLakeStoreAccountPropertiesBasic) + if err != nil { + return err + } + dlsab.DataLakeStoreAccountPropertiesBasic = &dataLakeStoreAccountPropertiesBasic + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + dlsab.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + dlsab.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + dlsab.Type = &typeVar + } + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + dlsab.Location = &location + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + dlsab.Tags = tags + } + } + } + + return nil +} + +// DataLakeStoreAccountListResult data Lake Store account list information response. +type DataLakeStoreAccountListResult struct { + autorest.Response `json:"-"` + // Value - The results of the list operation. + Value *[]DataLakeStoreAccountBasic `json:"value,omitempty"` + // NextLink - The link (url) to the next page of results. + NextLink *string `json:"nextLink,omitempty"` +} + +// DataLakeStoreAccountListResultIterator provides access to a complete listing of DataLakeStoreAccountBasic +// values. +type DataLakeStoreAccountListResultIterator struct { + i int + page DataLakeStoreAccountListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *DataLakeStoreAccountListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter DataLakeStoreAccountListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter DataLakeStoreAccountListResultIterator) Response() DataLakeStoreAccountListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter DataLakeStoreAccountListResultIterator) Value() DataLakeStoreAccountBasic { + if !iter.page.NotDone() { + return DataLakeStoreAccountBasic{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (dlsalr DataLakeStoreAccountListResult) IsEmpty() bool { + return dlsalr.Value == nil || len(*dlsalr.Value) == 0 +} + +// dataLakeStoreAccountListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (dlsalr DataLakeStoreAccountListResult) dataLakeStoreAccountListResultPreparer() (*http.Request, error) { + if dlsalr.NextLink == nil || len(to.String(dlsalr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(dlsalr.NextLink))) +} + +// DataLakeStoreAccountListResultPage contains a page of DataLakeStoreAccountBasic values. +type DataLakeStoreAccountListResultPage struct { + fn func(DataLakeStoreAccountListResult) (DataLakeStoreAccountListResult, error) + dlsalr DataLakeStoreAccountListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *DataLakeStoreAccountListResultPage) Next() error { + next, err := page.fn(page.dlsalr) + if err != nil { + return err + } + page.dlsalr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page DataLakeStoreAccountListResultPage) NotDone() bool { + return !page.dlsalr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page DataLakeStoreAccountListResultPage) Response() DataLakeStoreAccountListResult { + return page.dlsalr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page DataLakeStoreAccountListResultPage) Values() []DataLakeStoreAccountBasic { + if page.dlsalr.IsEmpty() { + return nil + } + return *page.dlsalr.Value +} + +// DataLakeStoreAccountProperties data Lake Store account properties information. +type DataLakeStoreAccountProperties struct { + // DefaultGroup - The default owner group for all new folders and files created in the Data Lake Store account. + DefaultGroup *string `json:"defaultGroup,omitempty"` + // EncryptionConfig - The Key Vault encryption configuration. + EncryptionConfig *EncryptionConfig `json:"encryptionConfig,omitempty"` + // EncryptionState - The current state of encryption for this Data Lake Store account. Possible values include: 'Enabled', 'Disabled' + EncryptionState EncryptionState `json:"encryptionState,omitempty"` + // EncryptionProvisioningState - The current state of encryption provisioning for this Data Lake Store account. Possible values include: 'EncryptionProvisioningStateCreating', 'EncryptionProvisioningStateSucceeded' + EncryptionProvisioningState EncryptionProvisioningState `json:"encryptionProvisioningState,omitempty"` + // FirewallRules - The list of firewall rules associated with this Data Lake Store account. + FirewallRules *[]FirewallRule `json:"firewallRules,omitempty"` + // FirewallState - The current state of the IP address firewall for this Data Lake Store account. Possible values include: 'FirewallStateEnabled', 'FirewallStateDisabled' + FirewallState FirewallState `json:"firewallState,omitempty"` + // FirewallAllowAzureIps - The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced. Possible values include: 'FirewallAllowAzureIpsStateEnabled', 'FirewallAllowAzureIpsStateDisabled' + FirewallAllowAzureIps FirewallAllowAzureIpsState `json:"firewallAllowAzureIps,omitempty"` + // TrustedIDProviders - The list of trusted identity providers associated with this Data Lake Store account. + TrustedIDProviders *[]TrustedIDProvider `json:"trustedIdProviders,omitempty"` + // TrustedIDProviderState - The current state of the trusted identity provider feature for this Data Lake Store account. Possible values include: 'TrustedIDProviderStateEnabled', 'TrustedIDProviderStateDisabled' + TrustedIDProviderState TrustedIDProviderState `json:"trustedIdProviderState,omitempty"` + // NewTier - The commitment tier to use for next month. Possible values include: 'Consumption', 'Commitment1TB', 'Commitment10TB', 'Commitment100TB', 'Commitment500TB', 'Commitment1PB', 'Commitment5PB' + NewTier TierType `json:"newTier,omitempty"` + // CurrentTier - The commitment tier in use for the current month. Possible values include: 'Consumption', 'Commitment1TB', 'Commitment10TB', 'Commitment100TB', 'Commitment500TB', 'Commitment1PB', 'Commitment5PB' + CurrentTier TierType `json:"currentTier,omitempty"` + // AccountID - The unique identifier associated with this Data Lake Store account. + AccountID *uuid.UUID `json:"accountId,omitempty"` + // ProvisioningState - The provisioning status of the Data Lake Store account. Possible values include: 'Failed', 'Creating', 'Running', 'Succeeded', 'Patching', 'Suspending', 'Resuming', 'Deleting', 'Deleted', 'Undeleting', 'Canceled' + ProvisioningState DataLakeStoreAccountStatus `json:"provisioningState,omitempty"` + // State - The state of the Data Lake Store account. Possible values include: 'Active', 'Suspended' + State DataLakeStoreAccountState `json:"state,omitempty"` + // CreationTime - The account creation time. + CreationTime *date.Time `json:"creationTime,omitempty"` + // LastModifiedTime - The account last modified time. + LastModifiedTime *date.Time `json:"lastModifiedTime,omitempty"` + // Endpoint - The full CName endpoint for this account. + Endpoint *string `json:"endpoint,omitempty"` +} + +// DataLakeStoreAccountPropertiesBasic the basic account specific properties that are associated with an underlying +// Data Lake Store account. +type DataLakeStoreAccountPropertiesBasic struct { + // AccountID - The unique identifier associated with this Data Lake Store account. + AccountID *uuid.UUID `json:"accountId,omitempty"` + // ProvisioningState - The provisioning status of the Data Lake Store account. Possible values include: 'Failed', 'Creating', 'Running', 'Succeeded', 'Patching', 'Suspending', 'Resuming', 'Deleting', 'Deleted', 'Undeleting', 'Canceled' + ProvisioningState DataLakeStoreAccountStatus `json:"provisioningState,omitempty"` + // State - The state of the Data Lake Store account. Possible values include: 'Active', 'Suspended' + State DataLakeStoreAccountState `json:"state,omitempty"` + // CreationTime - The account creation time. + CreationTime *date.Time `json:"creationTime,omitempty"` + // LastModifiedTime - The account last modified time. + LastModifiedTime *date.Time `json:"lastModifiedTime,omitempty"` + // Endpoint - The full CName endpoint for this account. + Endpoint *string `json:"endpoint,omitempty"` +} + +// EncryptionConfig the encryption configuration for the account. +type EncryptionConfig struct { + // Type - The type of encryption configuration being used. Currently the only supported types are 'UserManaged' and 'ServiceManaged'. Possible values include: 'UserManaged', 'ServiceManaged' + Type EncryptionConfigType `json:"type,omitempty"` + // KeyVaultMetaInfo - The Key Vault information for connecting to user managed encryption keys. + KeyVaultMetaInfo *KeyVaultMetaInfo `json:"keyVaultMetaInfo,omitempty"` +} + +// EncryptionIdentity the encryption identity properties. +type EncryptionIdentity struct { + // Type - The type of encryption being used. Currently the only supported type is 'SystemAssigned'. + Type *string `json:"type,omitempty"` + // PrincipalID - The principal identifier associated with the encryption. + PrincipalID *uuid.UUID `json:"principalId,omitempty"` + // TenantID - The tenant identifier associated with the encryption. + TenantID *uuid.UUID `json:"tenantId,omitempty"` +} + +// FirewallRule data Lake Store firewall rule information. +type FirewallRule struct { + autorest.Response `json:"-"` + // FirewallRuleProperties - The firewall rule properties. + *FirewallRuleProperties `json:"properties,omitempty"` + // ID - The resource identifier. + ID *string `json:"id,omitempty"` + // Name - The resource name. + Name *string `json:"name,omitempty"` + // Type - The resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for FirewallRule. +func (fr FirewallRule) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if fr.FirewallRuleProperties != nil { + objectMap["properties"] = fr.FirewallRuleProperties + } + if fr.ID != nil { + objectMap["id"] = fr.ID + } + if fr.Name != nil { + objectMap["name"] = fr.Name + } + if fr.Type != nil { + objectMap["type"] = fr.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for FirewallRule struct. +func (fr *FirewallRule) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var firewallRuleProperties FirewallRuleProperties + err = json.Unmarshal(*v, &firewallRuleProperties) + if err != nil { + return err + } + fr.FirewallRuleProperties = &firewallRuleProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + fr.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + fr.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + fr.Type = &typeVar + } + } + } + + return nil +} + +// FirewallRuleListResult data Lake Store firewall rule list information. +type FirewallRuleListResult struct { + autorest.Response `json:"-"` + // Value - The results of the list operation. + Value *[]FirewallRule `json:"value,omitempty"` + // NextLink - The link (url) to the next page of results. + NextLink *string `json:"nextLink,omitempty"` +} + +// FirewallRuleListResultIterator provides access to a complete listing of FirewallRule values. +type FirewallRuleListResultIterator struct { + i int + page FirewallRuleListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *FirewallRuleListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter FirewallRuleListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter FirewallRuleListResultIterator) Response() FirewallRuleListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter FirewallRuleListResultIterator) Value() FirewallRule { + if !iter.page.NotDone() { + return FirewallRule{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (frlr FirewallRuleListResult) IsEmpty() bool { + return frlr.Value == nil || len(*frlr.Value) == 0 +} + +// firewallRuleListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (frlr FirewallRuleListResult) firewallRuleListResultPreparer() (*http.Request, error) { + if frlr.NextLink == nil || len(to.String(frlr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(frlr.NextLink))) +} + +// FirewallRuleListResultPage contains a page of FirewallRule values. +type FirewallRuleListResultPage struct { + fn func(FirewallRuleListResult) (FirewallRuleListResult, error) + frlr FirewallRuleListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *FirewallRuleListResultPage) Next() error { + next, err := page.fn(page.frlr) + if err != nil { + return err + } + page.frlr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page FirewallRuleListResultPage) NotDone() bool { + return !page.frlr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page FirewallRuleListResultPage) Response() FirewallRuleListResult { + return page.frlr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page FirewallRuleListResultPage) Values() []FirewallRule { + if page.frlr.IsEmpty() { + return nil + } + return *page.frlr.Value +} + +// FirewallRuleProperties the firewall rule properties. +type FirewallRuleProperties struct { + // StartIPAddress - The start IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol. + StartIPAddress *string `json:"startIpAddress,omitempty"` + // EndIPAddress - The end IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol. + EndIPAddress *string `json:"endIpAddress,omitempty"` +} + +// KeyVaultMetaInfo metadata information used by account encryption. +type KeyVaultMetaInfo struct { + // KeyVaultResourceID - The resource identifier for the user managed Key Vault being used to encrypt. + KeyVaultResourceID *string `json:"keyVaultResourceId,omitempty"` + // EncryptionKeyName - The name of the user managed encryption key. + EncryptionKeyName *string `json:"encryptionKeyName,omitempty"` + // EncryptionKeyVersion - The version of the user managed encryption key. + EncryptionKeyVersion *string `json:"encryptionKeyVersion,omitempty"` +} + +// NameAvailabilityInformation data Lake Store account name availability result information. +type NameAvailabilityInformation struct { + autorest.Response `json:"-"` + // NameAvailable - The Boolean value of true or false to indicate whether the Data Lake Store account name is available or not. + NameAvailable *bool `json:"nameAvailable,omitempty"` + // Reason - The reason why the Data Lake Store account name is not available, if nameAvailable is false. + Reason *string `json:"reason,omitempty"` + // Message - The message describing why the Data Lake Store account name is not available, if nameAvailable is false. + Message *string `json:"message,omitempty"` +} + +// Operation an available operation for Data Lake Store. +type Operation struct { + // Name - The name of the operation. + Name *string `json:"name,omitempty"` + // Display - The display information for the operation. + Display *OperationDisplay `json:"display,omitempty"` + // Origin - The intended executor of the operation. Possible values include: 'User', 'System', 'Usersystem' + Origin OperationOrigin `json:"origin,omitempty"` +} + +// OperationDisplay the display information for a particular operation. +type OperationDisplay struct { + // Provider - The resource provider of the operation. + Provider *string `json:"provider,omitempty"` + // Resource - The resource type of the operation. + Resource *string `json:"resource,omitempty"` + // Operation - A friendly name of the operation. + Operation *string `json:"operation,omitempty"` + // Description - A friendly description of the operation. + Description *string `json:"description,omitempty"` +} + +// OperationListResult the list of available operations for Data Lake Store. +type OperationListResult struct { + autorest.Response `json:"-"` + // Value - The results of the list operation. + Value *[]Operation `json:"value,omitempty"` + // NextLink - The link (url) to the next page of results. + NextLink *string `json:"nextLink,omitempty"` +} + +// Resource the resource model definition. +type Resource struct { + // ID - The resource identifier. + ID *string `json:"id,omitempty"` + // Name - The resource name. + Name *string `json:"name,omitempty"` + // Type - The resource type. + Type *string `json:"type,omitempty"` + // Location - The resource location. + Location *string `json:"location,omitempty"` + // Tags - The resource tags. + Tags map[string]*string `json:"tags"` +} + +// MarshalJSON is the custom marshaler for Resource. +func (r Resource) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if r.ID != nil { + objectMap["id"] = r.ID + } + if r.Name != nil { + objectMap["name"] = r.Name + } + if r.Type != nil { + objectMap["type"] = r.Type + } + if r.Location != nil { + objectMap["location"] = r.Location + } + if r.Tags != nil { + objectMap["tags"] = r.Tags + } + return json.Marshal(objectMap) +} + +// SubResource the resource model definition for a nested resource. +type SubResource struct { + // ID - The resource identifier. + ID *string `json:"id,omitempty"` + // Name - The resource name. + Name *string `json:"name,omitempty"` + // Type - The resource type. + Type *string `json:"type,omitempty"` +} + +// TrustedIDProvider data Lake Store trusted identity provider information. +type TrustedIDProvider struct { + autorest.Response `json:"-"` + // TrustedIDProviderProperties - The trusted identity provider properties. + *TrustedIDProviderProperties `json:"properties,omitempty"` + // ID - The resource identifier. + ID *string `json:"id,omitempty"` + // Name - The resource name. + Name *string `json:"name,omitempty"` + // Type - The resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for TrustedIDProvider. +func (tip TrustedIDProvider) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if tip.TrustedIDProviderProperties != nil { + objectMap["properties"] = tip.TrustedIDProviderProperties + } + if tip.ID != nil { + objectMap["id"] = tip.ID + } + if tip.Name != nil { + objectMap["name"] = tip.Name + } + if tip.Type != nil { + objectMap["type"] = tip.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for TrustedIDProvider struct. +func (tip *TrustedIDProvider) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var trustedIDProviderProperties TrustedIDProviderProperties + err = json.Unmarshal(*v, &trustedIDProviderProperties) + if err != nil { + return err + } + tip.TrustedIDProviderProperties = &trustedIDProviderProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + tip.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + tip.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + tip.Type = &typeVar + } + } + } + + return nil +} + +// TrustedIDProviderListResult data Lake Store trusted identity provider list information. +type TrustedIDProviderListResult struct { + autorest.Response `json:"-"` + // Value - The results of the list operation. + Value *[]TrustedIDProvider `json:"value,omitempty"` + // NextLink - The link (url) to the next page of results. + NextLink *string `json:"nextLink,omitempty"` +} + +// TrustedIDProviderListResultIterator provides access to a complete listing of TrustedIDProvider values. +type TrustedIDProviderListResultIterator struct { + i int + page TrustedIDProviderListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *TrustedIDProviderListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter TrustedIDProviderListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter TrustedIDProviderListResultIterator) Response() TrustedIDProviderListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter TrustedIDProviderListResultIterator) Value() TrustedIDProvider { + if !iter.page.NotDone() { + return TrustedIDProvider{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (tiplr TrustedIDProviderListResult) IsEmpty() bool { + return tiplr.Value == nil || len(*tiplr.Value) == 0 +} + +// trustedIDProviderListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (tiplr TrustedIDProviderListResult) trustedIDProviderListResultPreparer() (*http.Request, error) { + if tiplr.NextLink == nil || len(to.String(tiplr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(tiplr.NextLink))) +} + +// TrustedIDProviderListResultPage contains a page of TrustedIDProvider values. +type TrustedIDProviderListResultPage struct { + fn func(TrustedIDProviderListResult) (TrustedIDProviderListResult, error) + tiplr TrustedIDProviderListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *TrustedIDProviderListResultPage) Next() error { + next, err := page.fn(page.tiplr) + if err != nil { + return err + } + page.tiplr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page TrustedIDProviderListResultPage) NotDone() bool { + return !page.tiplr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page TrustedIDProviderListResultPage) Response() TrustedIDProviderListResult { + return page.tiplr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page TrustedIDProviderListResultPage) Values() []TrustedIDProvider { + if page.tiplr.IsEmpty() { + return nil + } + return *page.tiplr.Value +} + +// TrustedIDProviderProperties the trusted identity provider properties. +type TrustedIDProviderProperties struct { + // IDProvider - The URL of this trusted identity provider. + IDProvider *string `json:"idProvider,omitempty"` +} + +// UpdateDataLakeStoreAccountParameters data Lake Store account information to update. +type UpdateDataLakeStoreAccountParameters struct { + // Tags - Resource tags + Tags map[string]*string `json:"tags"` + // UpdateDataLakeStoreAccountProperties - The Data Lake Store account properties to update. + *UpdateDataLakeStoreAccountProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for UpdateDataLakeStoreAccountParameters. +func (udlsap UpdateDataLakeStoreAccountParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if udlsap.Tags != nil { + objectMap["tags"] = udlsap.Tags + } + if udlsap.UpdateDataLakeStoreAccountProperties != nil { + objectMap["properties"] = udlsap.UpdateDataLakeStoreAccountProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for UpdateDataLakeStoreAccountParameters struct. +func (udlsap *UpdateDataLakeStoreAccountParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + udlsap.Tags = tags + } + case "properties": + if v != nil { + var updateDataLakeStoreAccountProperties UpdateDataLakeStoreAccountProperties + err = json.Unmarshal(*v, &updateDataLakeStoreAccountProperties) + if err != nil { + return err + } + udlsap.UpdateDataLakeStoreAccountProperties = &updateDataLakeStoreAccountProperties + } + } + } + + return nil +} + +// UpdateDataLakeStoreAccountProperties data Lake Store account properties information to be updated. +type UpdateDataLakeStoreAccountProperties struct { + // DefaultGroup - The default owner group for all new folders and files created in the Data Lake Store account. + DefaultGroup *string `json:"defaultGroup,omitempty"` + // EncryptionConfig - Used for rotation of user managed Key Vault keys. Can only be used to rotate a user managed encryption Key Vault key. + EncryptionConfig *UpdateEncryptionConfig `json:"encryptionConfig,omitempty"` + // FirewallRules - The list of firewall rules associated with this Data Lake Store account. + FirewallRules *[]UpdateFirewallRuleWithAccountParameters `json:"firewallRules,omitempty"` + // FirewallState - The current state of the IP address firewall for this Data Lake Store account. Disabling the firewall does not remove existing rules, they will just be ignored until the firewall is re-enabled. Possible values include: 'FirewallStateEnabled', 'FirewallStateDisabled' + FirewallState FirewallState `json:"firewallState,omitempty"` + // FirewallAllowAzureIps - The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced. Possible values include: 'FirewallAllowAzureIpsStateEnabled', 'FirewallAllowAzureIpsStateDisabled' + FirewallAllowAzureIps FirewallAllowAzureIpsState `json:"firewallAllowAzureIps,omitempty"` + // TrustedIDProviders - The list of trusted identity providers associated with this Data Lake Store account. + TrustedIDProviders *[]UpdateTrustedIDProviderWithAccountParameters `json:"trustedIdProviders,omitempty"` + // TrustedIDProviderState - The current state of the trusted identity provider feature for this Data Lake Store account. Disabling trusted identity provider functionality does not remove the providers, they will just be ignored until this feature is re-enabled. Possible values include: 'TrustedIDProviderStateEnabled', 'TrustedIDProviderStateDisabled' + TrustedIDProviderState TrustedIDProviderState `json:"trustedIdProviderState,omitempty"` + // NewTier - The commitment tier to use for next month. Possible values include: 'Consumption', 'Commitment1TB', 'Commitment10TB', 'Commitment100TB', 'Commitment500TB', 'Commitment1PB', 'Commitment5PB' + NewTier TierType `json:"newTier,omitempty"` +} + +// UpdateEncryptionConfig the encryption configuration used to update a user managed Key Vault key. +type UpdateEncryptionConfig struct { + // KeyVaultMetaInfo - The updated Key Vault key to use in user managed key rotation. + KeyVaultMetaInfo *UpdateKeyVaultMetaInfo `json:"keyVaultMetaInfo,omitempty"` +} + +// UpdateFirewallRuleParameters the parameters used to update a firewall rule. +type UpdateFirewallRuleParameters struct { + // UpdateFirewallRuleProperties - The firewall rule properties to use when updating a firewall rule. + *UpdateFirewallRuleProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for UpdateFirewallRuleParameters. +func (ufrp UpdateFirewallRuleParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ufrp.UpdateFirewallRuleProperties != nil { + objectMap["properties"] = ufrp.UpdateFirewallRuleProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for UpdateFirewallRuleParameters struct. +func (ufrp *UpdateFirewallRuleParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var updateFirewallRuleProperties UpdateFirewallRuleProperties + err = json.Unmarshal(*v, &updateFirewallRuleProperties) + if err != nil { + return err + } + ufrp.UpdateFirewallRuleProperties = &updateFirewallRuleProperties + } + } + } + + return nil +} + +// UpdateFirewallRuleProperties the firewall rule properties to use when updating a firewall rule. +type UpdateFirewallRuleProperties struct { + // StartIPAddress - The start IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol. + StartIPAddress *string `json:"startIpAddress,omitempty"` + // EndIPAddress - The end IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol. + EndIPAddress *string `json:"endIpAddress,omitempty"` +} + +// UpdateFirewallRuleWithAccountParameters the parameters used to update a firewall rule while updating a Data Lake +// Store account. +type UpdateFirewallRuleWithAccountParameters struct { + // Name - The unique name of the firewall rule to update. + Name *string `json:"name,omitempty"` + // UpdateFirewallRuleProperties - The firewall rule properties to use when updating a firewall rule. + *UpdateFirewallRuleProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for UpdateFirewallRuleWithAccountParameters. +func (ufrwap UpdateFirewallRuleWithAccountParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ufrwap.Name != nil { + objectMap["name"] = ufrwap.Name + } + if ufrwap.UpdateFirewallRuleProperties != nil { + objectMap["properties"] = ufrwap.UpdateFirewallRuleProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for UpdateFirewallRuleWithAccountParameters struct. +func (ufrwap *UpdateFirewallRuleWithAccountParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + ufrwap.Name = &name + } + case "properties": + if v != nil { + var updateFirewallRuleProperties UpdateFirewallRuleProperties + err = json.Unmarshal(*v, &updateFirewallRuleProperties) + if err != nil { + return err + } + ufrwap.UpdateFirewallRuleProperties = &updateFirewallRuleProperties + } + } + } + + return nil +} + +// UpdateKeyVaultMetaInfo the Key Vault update information used for user managed key rotation. +type UpdateKeyVaultMetaInfo struct { + // EncryptionKeyVersion - The version of the user managed encryption key to update through a key rotation. + EncryptionKeyVersion *string `json:"encryptionKeyVersion,omitempty"` +} + +// UpdateTrustedIDProviderParameters the parameters used to update a trusted identity provider. +type UpdateTrustedIDProviderParameters struct { + // UpdateTrustedIDProviderProperties - The trusted identity provider properties to use when updating a trusted identity provider. + *UpdateTrustedIDProviderProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for UpdateTrustedIDProviderParameters. +func (utipp UpdateTrustedIDProviderParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if utipp.UpdateTrustedIDProviderProperties != nil { + objectMap["properties"] = utipp.UpdateTrustedIDProviderProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for UpdateTrustedIDProviderParameters struct. +func (utipp *UpdateTrustedIDProviderParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var updateTrustedIDProviderProperties UpdateTrustedIDProviderProperties + err = json.Unmarshal(*v, &updateTrustedIDProviderProperties) + if err != nil { + return err + } + utipp.UpdateTrustedIDProviderProperties = &updateTrustedIDProviderProperties + } + } + } + + return nil +} + +// UpdateTrustedIDProviderProperties the trusted identity provider properties to use when updating a trusted +// identity provider. +type UpdateTrustedIDProviderProperties struct { + // IDProvider - The URL of this trusted identity provider. + IDProvider *string `json:"idProvider,omitempty"` +} + +// UpdateTrustedIDProviderWithAccountParameters the parameters used to update a trusted identity provider while +// updating a Data Lake Store account. +type UpdateTrustedIDProviderWithAccountParameters struct { + // Name - The unique name of the trusted identity provider to update. + Name *string `json:"name,omitempty"` + // UpdateTrustedIDProviderProperties - The trusted identity provider properties to use when updating a trusted identity provider. + *UpdateTrustedIDProviderProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for UpdateTrustedIDProviderWithAccountParameters. +func (utipwap UpdateTrustedIDProviderWithAccountParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if utipwap.Name != nil { + objectMap["name"] = utipwap.Name + } + if utipwap.UpdateTrustedIDProviderProperties != nil { + objectMap["properties"] = utipwap.UpdateTrustedIDProviderProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for UpdateTrustedIDProviderWithAccountParameters struct. +func (utipwap *UpdateTrustedIDProviderWithAccountParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + utipwap.Name = &name + } + case "properties": + if v != nil { + var updateTrustedIDProviderProperties UpdateTrustedIDProviderProperties + err = json.Unmarshal(*v, &updateTrustedIDProviderProperties) + if err != nil { + return err + } + utipwap.UpdateTrustedIDProviderProperties = &updateTrustedIDProviderProperties + } + } + } + + return nil +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/operations.go new file mode 100644 index 000000000000..569e7554aca5 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/operations.go @@ -0,0 +1,98 @@ +package account + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// OperationsClient is the creates an Azure Data Lake Store account management client. +type OperationsClient struct { + BaseClient +} + +// NewOperationsClient creates an instance of the OperationsClient client. +func NewOperationsClient(subscriptionID string) OperationsClient { + return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. +func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { + return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// List lists all of the available Data Lake Store REST API operations. +func (client OperationsClient) List(ctx context.Context) (result OperationListResult, err error) { + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "account.OperationsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.OperationsClient", "List", resp, "Failure sending request") + return + } + + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.OperationsClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPath("/providers/Microsoft.DataLakeStore/operations"), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/trustedidproviders.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/trustedidproviders.go new file mode 100644 index 000000000000..01f92849a62b --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/trustedidproviders.go @@ -0,0 +1,430 @@ +package account + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// TrustedIDProvidersClient is the creates an Azure Data Lake Store account management client. +type TrustedIDProvidersClient struct { + BaseClient +} + +// NewTrustedIDProvidersClient creates an instance of the TrustedIDProvidersClient client. +func NewTrustedIDProvidersClient(subscriptionID string) TrustedIDProvidersClient { + return NewTrustedIDProvidersClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewTrustedIDProvidersClientWithBaseURI creates an instance of the TrustedIDProvidersClient client. +func NewTrustedIDProvidersClientWithBaseURI(baseURI string, subscriptionID string) TrustedIDProvidersClient { + return TrustedIDProvidersClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate creates or updates the specified trusted identity provider. During update, the trusted identity +// provider with the specified name will be replaced with this new provider +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// trustedIDProviderName - the name of the trusted identity provider. This is used for differentiation of +// providers in the account. +// parameters - parameters supplied to create or replace the trusted identity provider. +func (client TrustedIDProvidersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, accountName string, trustedIDProviderName string, parameters CreateOrUpdateTrustedIDProviderParameters) (result TrustedIDProvider, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.CreateOrUpdateTrustedIDProviderProperties", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.CreateOrUpdateTrustedIDProviderProperties.IDProvider", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil { + return result, validation.NewError("account.TrustedIDProvidersClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, accountName, trustedIDProviderName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "CreateOrUpdate", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client TrustedIDProvidersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, accountName string, trustedIDProviderName string, parameters CreateOrUpdateTrustedIDProviderParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "trustedIdProviderName": autorest.Encode("path", trustedIDProviderName), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/trustedIdProviders/{trustedIdProviderName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client TrustedIDProvidersClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client TrustedIDProvidersClient) CreateOrUpdateResponder(resp *http.Response) (result TrustedIDProvider, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes the specified trusted identity provider from the specified Data Lake Store account +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// trustedIDProviderName - the name of the trusted identity provider to delete. +func (client TrustedIDProvidersClient) Delete(ctx context.Context, resourceGroupName string, accountName string, trustedIDProviderName string) (result autorest.Response, err error) { + req, err := client.DeletePreparer(ctx, resourceGroupName, accountName, trustedIDProviderName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client TrustedIDProvidersClient) DeletePreparer(ctx context.Context, resourceGroupName string, accountName string, trustedIDProviderName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "trustedIdProviderName": autorest.Encode("path", trustedIDProviderName), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/trustedIdProviders/{trustedIdProviderName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client TrustedIDProvidersClient) DeleteSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client TrustedIDProvidersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get gets the specified Data Lake Store trusted identity provider. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// trustedIDProviderName - the name of the trusted identity provider to retrieve. +func (client TrustedIDProvidersClient) Get(ctx context.Context, resourceGroupName string, accountName string, trustedIDProviderName string) (result TrustedIDProvider, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, accountName, trustedIDProviderName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client TrustedIDProvidersClient) GetPreparer(ctx context.Context, resourceGroupName string, accountName string, trustedIDProviderName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "trustedIdProviderName": autorest.Encode("path", trustedIDProviderName), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/trustedIdProviders/{trustedIdProviderName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client TrustedIDProvidersClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client TrustedIDProvidersClient) GetResponder(resp *http.Response) (result TrustedIDProvider, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListByAccount lists the Data Lake Store trusted identity providers within the specified Data Lake Store account. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +func (client TrustedIDProvidersClient) ListByAccount(ctx context.Context, resourceGroupName string, accountName string) (result TrustedIDProviderListResultPage, err error) { + result.fn = client.listByAccountNextResults + req, err := client.ListByAccountPreparer(ctx, resourceGroupName, accountName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "ListByAccount", nil, "Failure preparing request") + return + } + + resp, err := client.ListByAccountSender(req) + if err != nil { + result.tiplr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "ListByAccount", resp, "Failure sending request") + return + } + + result.tiplr, err = client.ListByAccountResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "ListByAccount", resp, "Failure responding to request") + } + + return +} + +// ListByAccountPreparer prepares the ListByAccount request. +func (client TrustedIDProvidersClient) ListByAccountPreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/trustedIdProviders", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByAccountSender sends the ListByAccount request. The method will close the +// http.Response Body if it receives an error. +func (client TrustedIDProvidersClient) ListByAccountSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByAccountResponder handles the response to the ListByAccount request. The method always +// closes the http.Response Body. +func (client TrustedIDProvidersClient) ListByAccountResponder(resp *http.Response) (result TrustedIDProviderListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByAccountNextResults retrieves the next set of results, if any. +func (client TrustedIDProvidersClient) listByAccountNextResults(lastResults TrustedIDProviderListResult) (result TrustedIDProviderListResult, err error) { + req, err := lastResults.trustedIDProviderListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "listByAccountNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByAccountSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "listByAccountNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByAccountResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "listByAccountNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByAccountComplete enumerates all values, automatically crossing page boundaries as required. +func (client TrustedIDProvidersClient) ListByAccountComplete(ctx context.Context, resourceGroupName string, accountName string) (result TrustedIDProviderListResultIterator, err error) { + result.page, err = client.ListByAccount(ctx, resourceGroupName, accountName) + return +} + +// Update updates the specified trusted identity provider. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// trustedIDProviderName - the name of the trusted identity provider. This is used for differentiation of +// providers in the account. +// parameters - parameters supplied to update the trusted identity provider. +func (client TrustedIDProvidersClient) Update(ctx context.Context, resourceGroupName string, accountName string, trustedIDProviderName string, parameters *UpdateTrustedIDProviderParameters) (result TrustedIDProvider, err error) { + req, err := client.UpdatePreparer(ctx, resourceGroupName, accountName, trustedIDProviderName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "Update", nil, "Failure preparing request") + return + } + + resp, err := client.UpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "Update", resp, "Failure sending request") + return + } + + result, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.TrustedIDProvidersClient", "Update", resp, "Failure responding to request") + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client TrustedIDProvidersClient) UpdatePreparer(ctx context.Context, resourceGroupName string, accountName string, trustedIDProviderName string, parameters *UpdateTrustedIDProviderParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "trustedIdProviderName": autorest.Encode("path", trustedIDProviderName), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/trustedIdProviders/{trustedIdProviderName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + if parameters != nil { + preparer = autorest.DecoratePreparer(preparer, + autorest.WithJSON(parameters)) + } + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client TrustedIDProvidersClient) UpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client TrustedIDProvidersClient) UpdateResponder(resp *http.Response) (result TrustedIDProvider, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/version.go new file mode 100644 index 000000000000..1f7dbe76a206 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/version.go @@ -0,0 +1,30 @@ +package account + +import "github.com/Azure/azure-sdk-for-go/version" + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +// UserAgent returns the UserAgent string to use when sending http.Requests. +func UserAgent() string { + return "Azure-SDK-For-Go/" + version.Number + " account/2016-11-01" +} + +// Version returns the semantic version (see http://semver.org) of the client. +func Version() string { + return version.Number +} From 4c487a19dd7baf5cd389116e60ca73d7b57b9a31 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Wed, 9 May 2018 13:20:06 +0100 Subject: [PATCH 099/320] removing extra stuff --- .../2015-10-01-preview/filesystem/client.go | 52 - .../filesystem/filesystem.go | 1871 ----------------- .../2015-10-01-preview/filesystem/models.go | 1283 ----------- .../2015-10-01-preview/filesystem/version.go | 31 - .../store/2016-11-01/filesystem/client.go | 49 - .../store/2016-11-01/filesystem/filesystem.go | 1804 ---------------- .../store/2016-11-01/filesystem/models.go | 1295 ------------ .../store/2016-11-01/filesystem/version.go | 30 - .../2015-10-01-preview/account/account.go | 1002 --------- .../mgmt/2015-10-01-preview/account/client.go | 54 - .../mgmt/2015-10-01-preview/account/models.go | 718 ------- .../2015-10-01-preview/account/version.go | 31 - 12 files changed, 8220 deletions(-) delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/client.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/filesystem.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/models.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/version.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/client.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/filesystem.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/models.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/version.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/account.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/client.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/models.go delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/version.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/client.go deleted file mode 100644 index 822a60db9995..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/client.go +++ /dev/null @@ -1,52 +0,0 @@ -// Package filesystem implements the Azure ARM Filesystem service API version 2015-10-01-preview. -// -// Creates an Azure Data Lake Store filesystem client. -package filesystem - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "github.com/Azure/go-autorest/autorest" -) - -const ( - // DefaultAdlsFileSystemDNSSuffix is the default value for adls file system dns suffix - DefaultAdlsFileSystemDNSSuffix = "azuredatalakestore.net" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// BaseClient is the base client for Filesystem. -type BaseClient struct { - autorest.Client - AdlsFileSystemDNSSuffix string -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// New creates an instance of the BaseClient client. -func New() BaseClient { - return NewWithoutDefaults(DefaultAdlsFileSystemDNSSuffix) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// NewWithoutDefaults creates an instance of the BaseClient client. -func NewWithoutDefaults(adlsFileSystemDNSSuffix string) BaseClient { - return BaseClient{ - Client: autorest.NewClientWithUserAgent(UserAgent()), - AdlsFileSystemDNSSuffix: adlsFileSystemDNSSuffix, - } -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/filesystem.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/filesystem.go deleted file mode 100644 index 8f7f2ed3bb52..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/filesystem.go +++ /dev/null @@ -1,1871 +0,0 @@ -package filesystem - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "context" - "github.com/Azure/go-autorest/autorest" - "github.com/Azure/go-autorest/autorest/azure" - "github.com/Azure/go-autorest/autorest/validation" - "io" - "net/http" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// Client is the creates an Azure Data Lake Store filesystem client. -type Client struct { - BaseClient -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// NewClient creates an instance of the Client client. -func NewClient() Client { - return Client{New()} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// Append appends to the specified file. This method does not support multiple concurrent appends to the file. NOTE: -// Concurrent append and normal (serial) append CANNOT be used interchangeably. Once a file has been appended to using -// either append option, it can only be appended to using that append option. Use the ConcurrentAppend option if you -// would like support for concurrent appends. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. directFilePath is the Data -// Lake Store path (starting with '/') of the file to which to append. streamContents is the file contents to -// include when appending to the file. streamContents will be closed upon successful return. Callers should ensure -// closure when receiving an error.offset is the optional offset in the stream to begin the append operation. -// Default is to append at the end of the stream. -func (client Client) Append(ctx context.Context, accountName string, directFilePath string, streamContents io.ReadCloser, offset *int64) (result autorest.Response, err error) { - req, err := client.AppendPreparer(ctx, accountName, directFilePath, streamContents, offset) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Append", nil, "Failure preparing request") - return - } - - resp, err := client.AppendSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "Append", resp, "Failure sending request") - return - } - - result, err = client.AppendResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Append", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AppendPreparer prepares the Append request. -func (client Client) AppendPreparer(ctx context.Context, accountName string, directFilePath string, streamContents io.ReadCloser, offset *int64) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "directFilePath": autorest.Encode("path", directFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "append": autorest.Encode("query", "true"), - "op": autorest.Encode("query", "APPEND"), - } - if offset != nil { - queryParameters["offset"] = autorest.Encode("query", *offset) - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/octet-stream"), - autorest.AsPost(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{directFilePath}", pathParameters), - autorest.WithFile(streamContents), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AppendSender sends the Append request. The method will close the -// http.Response Body if it receives an error. -func (client Client) AppendSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AppendResponder handles the response to the Append request. The method always -// closes the http.Response Body. -func (client Client) AppendResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// CheckAccess checks if the specified access is available at the given path. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. pathParameter is the Data -// Lake Store path (starting with '/') of the file or directory for which to check access. fsaction is file system -// operation read/write/execute in string form, matching regex pattern '[rwx-]{3}' -func (client Client) CheckAccess(ctx context.Context, accountName string, pathParameter string, fsaction string) (result autorest.Response, err error) { - req, err := client.CheckAccessPreparer(ctx, accountName, pathParameter, fsaction) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "CheckAccess", nil, "Failure preparing request") - return - } - - resp, err := client.CheckAccessSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "CheckAccess", resp, "Failure sending request") - return - } - - result, err = client.CheckAccessResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "CheckAccess", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// CheckAccessPreparer prepares the CheckAccess request. -func (client Client) CheckAccessPreparer(ctx context.Context, accountName string, pathParameter string, fsaction string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "CHECKACCESS"), - } - if len(fsaction) > 0 { - queryParameters["fsaction"] = autorest.Encode("query", fsaction) - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// CheckAccessSender sends the CheckAccess request. The method will close the -// http.Response Body if it receives an error. -func (client Client) CheckAccessSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// CheckAccessResponder handles the response to the CheckAccess request. The method always -// closes the http.Response Body. -func (client Client) CheckAccessResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// Concat concatenates the list of source files into the destination file, removing all source files upon success. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. destinationPath is the -// Data Lake Store path (starting with '/') of the destination file resulting from the concatenation. sources is a -// list of comma seperated Data Lake Store paths (starting with '/') of the files to concatenate, in the order in -// which they should be concatenated. -func (client Client) Concat(ctx context.Context, accountName string, destinationPath string, sources []string) (result autorest.Response, err error) { - if err := validation.Validate([]validation.Validation{ - {TargetValue: sources, - Constraints: []validation.Constraint{{Target: "sources", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { - return result, validation.NewError("filesystem.Client", "Concat", err.Error()) - } - - req, err := client.ConcatPreparer(ctx, accountName, destinationPath, sources) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Concat", nil, "Failure preparing request") - return - } - - resp, err := client.ConcatSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "Concat", resp, "Failure sending request") - return - } - - result, err = client.ConcatResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Concat", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ConcatPreparer prepares the Concat request. -func (client Client) ConcatPreparer(ctx context.Context, accountName string, destinationPath string, sources []string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "destinationPath": autorest.Encode("path", destinationPath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "CONCAT"), - "sources": autorest.Encode("query", sources, ","), - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{destinationPath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ConcatSender sends the Concat request. The method will close the -// http.Response Body if it receives an error. -func (client Client) ConcatSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ConcatResponder handles the response to the Concat request. The method always -// closes the http.Response Body. -func (client Client) ConcatResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ConcurrentAppend appends to the specified file. This method supports multiple concurrent appends to the file. NOTE: -// ConcurrentAppend and normal (serial) Append CANNOT be used interchangeably; once a file has been appended to using -// either of these append options, it can only be appended to using that append option. ConcurrentAppend DOES NOT -// guarantee order and can result in duplicated data landing in the target file. In order to close a file after using -// ConcurrentAppend, call the Flush method. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. filePath is the Data Lake -// Store path (starting with '/') of the file to which to append using concurrent append. streamContents is the -// file contents to include when appending to the file. streamContents will be closed upon successful return. -// Callers should ensure closure when receiving an error.appendMode is indicates the concurrent append call should -// create the file if it doesn't exist or just open the existing file for append -func (client Client) ConcurrentAppend(ctx context.Context, accountName string, filePath string, streamContents io.ReadCloser, appendMode AppendModeType) (result autorest.Response, err error) { - req, err := client.ConcurrentAppendPreparer(ctx, accountName, filePath, streamContents, appendMode) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "ConcurrentAppend", nil, "Failure preparing request") - return - } - - resp, err := client.ConcurrentAppendSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "ConcurrentAppend", resp, "Failure sending request") - return - } - - result, err = client.ConcurrentAppendResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "ConcurrentAppend", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ConcurrentAppendPreparer prepares the ConcurrentAppend request. -func (client Client) ConcurrentAppendPreparer(ctx context.Context, accountName string, filePath string, streamContents io.ReadCloser, appendMode AppendModeType) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "filePath": autorest.Encode("path", filePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "CONCURRENTAPPEND"), - } - if len(string(appendMode)) > 0 { - queryParameters["appendMode"] = autorest.Encode("query", appendMode) - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/octet-stream"), - autorest.AsPost(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/WebHdfsExt/{filePath}", pathParameters), - autorest.WithFile(streamContents), - autorest.WithQueryParameters(queryParameters), - autorest.WithHeader("Transfer-Encoding", "chunked")) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ConcurrentAppendSender sends the ConcurrentAppend request. The method will close the -// http.Response Body if it receives an error. -func (client Client) ConcurrentAppendSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ConcurrentAppendResponder handles the response to the ConcurrentAppend request. The method always -// closes the http.Response Body. -func (client Client) ConcurrentAppendResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// Create creates a file with optionally specified content. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. directFilePath is the Data -// Lake Store path (starting with '/') of the file to create. streamContents is the file contents to include when -// creating the file. This parameter is optional, resulting in an empty file if not specified. streamContents will -// be closed upon successful return. Callers should ensure closure when receiving an error.overwrite is the -// indication of if the file should be overwritten. -func (client Client) Create(ctx context.Context, accountName string, directFilePath string, streamContents io.ReadCloser, overwrite *bool) (result autorest.Response, err error) { - req, err := client.CreatePreparer(ctx, accountName, directFilePath, streamContents, overwrite) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Create", nil, "Failure preparing request") - return - } - - resp, err := client.CreateSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "Create", resp, "Failure sending request") - return - } - - result, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Create", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// CreatePreparer prepares the Create request. -func (client Client) CreatePreparer(ctx context.Context, accountName string, directFilePath string, streamContents io.ReadCloser, overwrite *bool) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "directFilePath": autorest.Encode("path", directFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "CREATE"), - "write": autorest.Encode("query", "true"), - } - if overwrite != nil { - queryParameters["overwrite"] = autorest.Encode("query", *overwrite) - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/octet-stream"), - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{directFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - if streamContents != nil { - preparer = autorest.DecoratePreparer(preparer, - autorest.WithFile(streamContents)) - } - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// CreateSender sends the Create request. The method will close the -// http.Response Body if it receives an error. -func (client Client) CreateSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// CreateResponder handles the response to the Create request. The method always -// closes the http.Response Body. -func (client Client) CreateResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// Delete deletes the requested file or directory, optionally recursively. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. filePath is the Data Lake -// Store path (starting with '/') of the file or directory to delete. recursive is the optional switch indicating -// if the delete should be recursive -func (client Client) Delete(ctx context.Context, accountName string, filePath string, recursive *bool) (result FileOperationResult, err error) { - req, err := client.DeletePreparer(ctx, accountName, filePath, recursive) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Delete", nil, "Failure preparing request") - return - } - - resp, err := client.DeleteSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "Delete", resp, "Failure sending request") - return - } - - result, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Delete", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// DeletePreparer prepares the Delete request. -func (client Client) DeletePreparer(ctx context.Context, accountName string, filePath string, recursive *bool) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "filePath": autorest.Encode("path", filePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "DELETE"), - } - if recursive != nil { - queryParameters["recursive"] = autorest.Encode("query", *recursive) - } - - preparer := autorest.CreatePreparer( - autorest.AsDelete(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{filePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// DeleteSender sends the Delete request. The method will close the -// http.Response Body if it receives an error. -func (client Client) DeleteSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// DeleteResponder handles the response to the Delete request. The method always -// closes the http.Response Body. -func (client Client) DeleteResponder(resp *http.Response) (result FileOperationResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// Flush flushes the specified file to the store. This forces an update to the metadata of the file (returned from -// GetFileStatus), and is required by ConcurrentAppend once the file is done to populate finalized metadata. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. flushFilePath is the Data -// Lake Store path (starting with '/') of the file to which to flush. -func (client Client) Flush(ctx context.Context, accountName string, flushFilePath string) (result autorest.Response, err error) { - req, err := client.FlushPreparer(ctx, accountName, flushFilePath) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Flush", nil, "Failure preparing request") - return - } - - resp, err := client.FlushSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "Flush", resp, "Failure sending request") - return - } - - result, err = client.FlushResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Flush", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// FlushPreparer prepares the Flush request. -func (client Client) FlushPreparer(ctx context.Context, accountName string, flushFilePath string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "flushFilePath": autorest.Encode("path", flushFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "append": autorest.Encode("query", "true"), - "flush": autorest.Encode("query", "true"), - "op": autorest.Encode("query", "APPEND"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{flushFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// FlushSender sends the Flush request. The method will close the -// http.Response Body if it receives an error. -func (client Client) FlushSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// FlushResponder handles the response to the Flush request. The method always -// closes the http.Response Body. -func (client Client) FlushResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// GetACLStatus gets Access Control List (ACL) entries for the specified file or directory. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. ACLFilePath is the Data -// Lake Store path (starting with '/') of the file or directory for which to get the ACL. -func (client Client) GetACLStatus(ctx context.Context, accountName string, ACLFilePath string) (result ACLStatusResult, err error) { - req, err := client.GetACLStatusPreparer(ctx, accountName, ACLFilePath) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetACLStatus", nil, "Failure preparing request") - return - } - - resp, err := client.GetACLStatusSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetACLStatus", resp, "Failure sending request") - return - } - - result, err = client.GetACLStatusResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetACLStatus", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// GetACLStatusPreparer prepares the GetACLStatus request. -func (client Client) GetACLStatusPreparer(ctx context.Context, accountName string, ACLFilePath string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "aclFilePath": autorest.Encode("path", ACLFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "MSGETACLSTATUS"), - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{aclFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// GetACLStatusSender sends the GetACLStatus request. The method will close the -// http.Response Body if it receives an error. -func (client Client) GetACLStatusSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// GetACLStatusResponder handles the response to the GetACLStatus request. The method always -// closes the http.Response Body. -func (client Client) GetACLStatusResponder(resp *http.Response) (result ACLStatusResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// GetContentSummary gets the file content summary object specified by the file path. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. getContentSummaryFilePath -// is the Data Lake Store path (starting with '/') of the file for which to retrieve the summary. -func (client Client) GetContentSummary(ctx context.Context, accountName string, getContentSummaryFilePath string) (result ContentSummaryResult, err error) { - req, err := client.GetContentSummaryPreparer(ctx, accountName, getContentSummaryFilePath) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetContentSummary", nil, "Failure preparing request") - return - } - - resp, err := client.GetContentSummarySender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetContentSummary", resp, "Failure sending request") - return - } - - result, err = client.GetContentSummaryResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetContentSummary", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// GetContentSummaryPreparer prepares the GetContentSummary request. -func (client Client) GetContentSummaryPreparer(ctx context.Context, accountName string, getContentSummaryFilePath string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "getContentSummaryFilePath": autorest.Encode("path", getContentSummaryFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "GETCONTENTSUMMARY"), - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/va/{getContentSummaryFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// GetContentSummarySender sends the GetContentSummary request. The method will close the -// http.Response Body if it receives an error. -func (client Client) GetContentSummarySender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// GetContentSummaryResponder handles the response to the GetContentSummary request. The method always -// closes the http.Response Body. -func (client Client) GetContentSummaryResponder(resp *http.Response) (result ContentSummaryResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// GetFileStatus get the file status object specified by the file path. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. getFilePath is the Data -// Lake Store path (starting with '/') of the file or directory for which to retrieve the status. -func (client Client) GetFileStatus(ctx context.Context, accountName string, getFilePath string) (result FileStatusResult, err error) { - req, err := client.GetFileStatusPreparer(ctx, accountName, getFilePath) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetFileStatus", nil, "Failure preparing request") - return - } - - resp, err := client.GetFileStatusSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetFileStatus", resp, "Failure sending request") - return - } - - result, err = client.GetFileStatusResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetFileStatus", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// GetFileStatusPreparer prepares the GetFileStatus request. -func (client Client) GetFileStatusPreparer(ctx context.Context, accountName string, getFilePath string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "getFilePath": autorest.Encode("path", getFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "MSGETFILESTATUS"), - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{getFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// GetFileStatusSender sends the GetFileStatus request. The method will close the -// http.Response Body if it receives an error. -func (client Client) GetFileStatusSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// GetFileStatusResponder handles the response to the GetFileStatus request. The method always -// closes the http.Response Body. -func (client Client) GetFileStatusResponder(resp *http.Response) (result FileStatusResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ListFileStatus get the list of file status objects specified by the file path, with optional pagination parameters -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. listFilePath is the Data -// Lake Store path (starting with '/') of the directory to list. listSize is gets or sets the number of items to -// return. Optional. listAfter is gets or sets the item or lexographical index after which to begin returning -// results. For example, a file list of 'a','b','d' and listAfter='b' will return 'd', and a listAfter='c' will -// also return 'd'. Optional. listBefore is gets or sets the item or lexographical index before which to begin -// returning results. For example, a file list of 'a','b','d' and listBefore='d' will return 'a','b', and a -// listBefore='c' will also return 'a','b'. Optional. -func (client Client) ListFileStatus(ctx context.Context, accountName string, listFilePath string, listSize *int32, listAfter string, listBefore string) (result FileStatusesResult, err error) { - req, err := client.ListFileStatusPreparer(ctx, accountName, listFilePath, listSize, listAfter, listBefore) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "ListFileStatus", nil, "Failure preparing request") - return - } - - resp, err := client.ListFileStatusSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "ListFileStatus", resp, "Failure sending request") - return - } - - result, err = client.ListFileStatusResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "ListFileStatus", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ListFileStatusPreparer prepares the ListFileStatus request. -func (client Client) ListFileStatusPreparer(ctx context.Context, accountName string, listFilePath string, listSize *int32, listAfter string, listBefore string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "listFilePath": autorest.Encode("path", listFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "MSLISTSTATUS"), - } - if listSize != nil { - queryParameters["listSize"] = autorest.Encode("query", *listSize) - } - if len(listAfter) > 0 { - queryParameters["listAfter"] = autorest.Encode("query", listAfter) - } - if len(listBefore) > 0 { - queryParameters["listBefore"] = autorest.Encode("query", listBefore) - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{listFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ListFileStatusSender sends the ListFileStatus request. The method will close the -// http.Response Body if it receives an error. -func (client Client) ListFileStatusSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ListFileStatusResponder handles the response to the ListFileStatus request. The method always -// closes the http.Response Body. -func (client Client) ListFileStatusResponder(resp *http.Response) (result FileStatusesResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// Mkdirs creates a directory. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. pathParameter is the Data -// Lake Store path (starting with '/') of the directory to create. -func (client Client) Mkdirs(ctx context.Context, accountName string, pathParameter string) (result FileOperationResult, err error) { - req, err := client.MkdirsPreparer(ctx, accountName, pathParameter) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Mkdirs", nil, "Failure preparing request") - return - } - - resp, err := client.MkdirsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "Mkdirs", resp, "Failure sending request") - return - } - - result, err = client.MkdirsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Mkdirs", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MkdirsPreparer prepares the Mkdirs request. -func (client Client) MkdirsPreparer(ctx context.Context, accountName string, pathParameter string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "MKDIRS"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MkdirsSender sends the Mkdirs request. The method will close the -// http.Response Body if it receives an error. -func (client Client) MkdirsSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MkdirsResponder handles the response to the Mkdirs request. The method always -// closes the http.Response Body. -func (client Client) MkdirsResponder(resp *http.Response) (result FileOperationResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ModifyACLEntries modifies existing Access Control List (ACL) entries on a file or folder. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. modifyACLFilePath is the -// Data Lake Store path (starting with '/') of the file or directory with the ACL being modified. aclspec is the -// ACL specification included in ACL modification operations in the format '[default:]user|group|other::r|-w|-x|-' -func (client Client) ModifyACLEntries(ctx context.Context, accountName string, modifyACLFilePath string, aclspec string) (result autorest.Response, err error) { - req, err := client.ModifyACLEntriesPreparer(ctx, accountName, modifyACLFilePath, aclspec) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "ModifyACLEntries", nil, "Failure preparing request") - return - } - - resp, err := client.ModifyACLEntriesSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "ModifyACLEntries", resp, "Failure sending request") - return - } - - result, err = client.ModifyACLEntriesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "ModifyACLEntries", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ModifyACLEntriesPreparer prepares the ModifyACLEntries request. -func (client Client) ModifyACLEntriesPreparer(ctx context.Context, accountName string, modifyACLFilePath string, aclspec string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "modifyAclFilePath": autorest.Encode("path", modifyACLFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "aclspec": autorest.Encode("query", aclspec), - "api-version": APIVersion, - "op": autorest.Encode("query", "MODIFYACLENTRIES"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{modifyAclFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ModifyACLEntriesSender sends the ModifyACLEntries request. The method will close the -// http.Response Body if it receives an error. -func (client Client) ModifyACLEntriesSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ModifyACLEntriesResponder handles the response to the ModifyACLEntries request. The method always -// closes the http.Response Body. -func (client Client) ModifyACLEntriesResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MsConcat concatenates the list of source files into the destination file, deleting all source files upon success. -// This method accepts more source file paths than the Concat method. This method and the parameters it accepts are -// subject to change for usability in an upcoming version. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. msConcatDestinationPath is -// the Data Lake Store path (starting with '/') of the destination file resulting from the concatenation. -// streamContents is a list of Data Lake Store paths (starting with '/') of the source files. Must be in the -// format: sources= streamContents will be closed upon successful return. Callers should -// ensure closure when receiving an error.deleteSourceDirectory is indicates that as an optimization instead of -// deleting each individual source stream, delete the source stream folder if all streams are in the same folder -// instead. This results in a substantial performance improvement when the only streams in the folder are part of -// the concatenation operation. WARNING: This includes the deletion of any other files that are not source files. -// Only set this to true when source files are the only files in the source directory. -func (client Client) MsConcat(ctx context.Context, accountName string, msConcatDestinationPath string, streamContents io.ReadCloser, deleteSourceDirectory *bool) (result autorest.Response, err error) { - req, err := client.MsConcatPreparer(ctx, accountName, msConcatDestinationPath, streamContents, deleteSourceDirectory) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "MsConcat", nil, "Failure preparing request") - return - } - - resp, err := client.MsConcatSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "MsConcat", resp, "Failure sending request") - return - } - - result, err = client.MsConcatResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "MsConcat", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MsConcatPreparer prepares the MsConcat request. -func (client Client) MsConcatPreparer(ctx context.Context, accountName string, msConcatDestinationPath string, streamContents io.ReadCloser, deleteSourceDirectory *bool) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "msConcatDestinationPath": autorest.Encode("path", msConcatDestinationPath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "MSCONCAT"), - } - if deleteSourceDirectory != nil { - queryParameters["deleteSourceDirectory"] = autorest.Encode("query", *deleteSourceDirectory) - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/octet-stream"), - autorest.AsPost(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{msConcatDestinationPath}", pathParameters), - autorest.WithFile(streamContents), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MsConcatSender sends the MsConcat request. The method will close the -// http.Response Body if it receives an error. -func (client Client) MsConcatSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MsConcatResponder handles the response to the MsConcat request. The method always -// closes the http.Response Body. -func (client Client) MsConcatResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// Open opens and reads from the specified file. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. directFilePath is the Data -// Lake Store path (starting with '/') of the file to open. -func (client Client) Open(ctx context.Context, accountName string, directFilePath string, length *int64, offset *int64) (result ReadCloser, err error) { - req, err := client.OpenPreparer(ctx, accountName, directFilePath, length, offset) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Open", nil, "Failure preparing request") - return - } - - resp, err := client.OpenSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "Open", resp, "Failure sending request") - return - } - - result, err = client.OpenResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Open", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// OpenPreparer prepares the Open request. -func (client Client) OpenPreparer(ctx context.Context, accountName string, directFilePath string, length *int64, offset *int64) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "directFilePath": autorest.Encode("path", directFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "OPEN"), - "read": autorest.Encode("query", "true"), - } - if length != nil { - queryParameters["length"] = autorest.Encode("query", *length) - } - if offset != nil { - queryParameters["offset"] = autorest.Encode("query", *offset) - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{directFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// OpenSender sends the Open request. The method will close the -// http.Response Body if it receives an error. -func (client Client) OpenSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// OpenResponder handles the response to the Open request. The method always -// closes the http.Response Body. -func (client Client) OpenResponder(resp *http.Response) (result ReadCloser, err error) { - result.Value = &resp.Body - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) - result.Response = autorest.Response{Response: resp} - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RemoveACL removes the existing Access Control List (ACL) of the specified file or directory. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. ACLFilePath is the Data -// Lake Store path (starting with '/') of the file or directory with the ACL being removed. -func (client Client) RemoveACL(ctx context.Context, accountName string, ACLFilePath string) (result autorest.Response, err error) { - req, err := client.RemoveACLPreparer(ctx, accountName, ACLFilePath) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACL", nil, "Failure preparing request") - return - } - - resp, err := client.RemoveACLSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACL", resp, "Failure sending request") - return - } - - result, err = client.RemoveACLResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACL", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RemoveACLPreparer prepares the RemoveACL request. -func (client Client) RemoveACLPreparer(ctx context.Context, accountName string, ACLFilePath string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "aclFilePath": autorest.Encode("path", ACLFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "REMOVEACL"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{aclFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RemoveACLSender sends the RemoveACL request. The method will close the -// http.Response Body if it receives an error. -func (client Client) RemoveACLSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RemoveACLResponder handles the response to the RemoveACL request. The method always -// closes the http.Response Body. -func (client Client) RemoveACLResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RemoveACLEntries removes existing Access Control List (ACL) entries for a file or folder. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. removeACLFilePath is the -// Data Lake Store path (starting with '/') of the file or directory with the ACL being removed. aclspec is the ACL -// spec included in ACL removal operations in the format '[default:]user|group|other' -func (client Client) RemoveACLEntries(ctx context.Context, accountName string, removeACLFilePath string, aclspec string) (result autorest.Response, err error) { - req, err := client.RemoveACLEntriesPreparer(ctx, accountName, removeACLFilePath, aclspec) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACLEntries", nil, "Failure preparing request") - return - } - - resp, err := client.RemoveACLEntriesSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACLEntries", resp, "Failure sending request") - return - } - - result, err = client.RemoveACLEntriesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACLEntries", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RemoveACLEntriesPreparer prepares the RemoveACLEntries request. -func (client Client) RemoveACLEntriesPreparer(ctx context.Context, accountName string, removeACLFilePath string, aclspec string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "removeAclFilePath": autorest.Encode("path", removeACLFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "aclspec": autorest.Encode("query", aclspec), - "api-version": APIVersion, - "op": autorest.Encode("query", "REMOVEACLENTRIES"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{removeAclFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RemoveACLEntriesSender sends the RemoveACLEntries request. The method will close the -// http.Response Body if it receives an error. -func (client Client) RemoveACLEntriesSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RemoveACLEntriesResponder handles the response to the RemoveACLEntries request. The method always -// closes the http.Response Body. -func (client Client) RemoveACLEntriesResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RemoveDefaultACL removes the existing Default Access Control List (ACL) of the specified directory. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. defaultACLFilePath is the -// Data Lake Store path (starting with '/') of the directory with the default ACL being removed. -func (client Client) RemoveDefaultACL(ctx context.Context, accountName string, defaultACLFilePath string) (result autorest.Response, err error) { - req, err := client.RemoveDefaultACLPreparer(ctx, accountName, defaultACLFilePath) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveDefaultACL", nil, "Failure preparing request") - return - } - - resp, err := client.RemoveDefaultACLSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveDefaultACL", resp, "Failure sending request") - return - } - - result, err = client.RemoveDefaultACLResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveDefaultACL", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RemoveDefaultACLPreparer prepares the RemoveDefaultACL request. -func (client Client) RemoveDefaultACLPreparer(ctx context.Context, accountName string, defaultACLFilePath string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "defaultAclFilePath": autorest.Encode("path", defaultACLFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "REMOVEDEFAULTACL"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{defaultAclFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RemoveDefaultACLSender sends the RemoveDefaultACL request. The method will close the -// http.Response Body if it receives an error. -func (client Client) RemoveDefaultACLSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RemoveDefaultACLResponder handles the response to the RemoveDefaultACL request. The method always -// closes the http.Response Body. -func (client Client) RemoveDefaultACLResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// Rename rename a file or directory. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. renameFilePath is the Data -// Lake Store path (starting with '/') of the file or directory to move/rename. destination is the path to -// move/rename the file or folder to -func (client Client) Rename(ctx context.Context, accountName string, renameFilePath string, destination string) (result FileOperationResult, err error) { - req, err := client.RenamePreparer(ctx, accountName, renameFilePath, destination) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Rename", nil, "Failure preparing request") - return - } - - resp, err := client.RenameSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "Rename", resp, "Failure sending request") - return - } - - result, err = client.RenameResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Rename", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RenamePreparer prepares the Rename request. -func (client Client) RenamePreparer(ctx context.Context, accountName string, renameFilePath string, destination string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "renameFilePath": autorest.Encode("path", renameFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "destination": autorest.Encode("query", destination), - "op": autorest.Encode("query", "RENAME"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{renameFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RenameSender sends the Rename request. The method will close the -// http.Response Body if it receives an error. -func (client Client) RenameSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// RenameResponder handles the response to the Rename request. The method always -// closes the http.Response Body. -func (client Client) RenameResponder(resp *http.Response) (result FileOperationResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetACL sets the Access Control List (ACL) for a file or folder. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. setACLFilePath is the Data -// Lake Store path (starting with '/') of the file or directory on which to set the ACL. aclspec is the ACL spec -// included in ACL creation operations in the format '[default:]user|group|other::r|-w|-x|-' -func (client Client) SetACL(ctx context.Context, accountName string, setACLFilePath string, aclspec string) (result autorest.Response, err error) { - req, err := client.SetACLPreparer(ctx, accountName, setACLFilePath, aclspec) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetACL", nil, "Failure preparing request") - return - } - - resp, err := client.SetACLSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetACL", resp, "Failure sending request") - return - } - - result, err = client.SetACLResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetACL", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetACLPreparer prepares the SetACL request. -func (client Client) SetACLPreparer(ctx context.Context, accountName string, setACLFilePath string, aclspec string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "setAclFilePath": autorest.Encode("path", setACLFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "aclspec": autorest.Encode("query", aclspec), - "api-version": APIVersion, - "op": autorest.Encode("query", "SETACL"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{setAclFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetACLSender sends the SetACL request. The method will close the -// http.Response Body if it receives an error. -func (client Client) SetACLSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetACLResponder handles the response to the SetACL request. The method always -// closes the http.Response Body. -func (client Client) SetACLResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetFileExpiry sets or removes the expiration time on the specified file. This operation can only be executed against -// files. Folders are not supported. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. filePath is the Data Lake -// Store path (starting with '/') of the file on which to set or remove the expiration time. expiryOption is -// indicates the type of expiration to use for the file: 1. NeverExpire: ExpireTime is ignored. 2. RelativeToNow: -// ExpireTime is an integer in milliseconds representing the expiration date relative to when file expiration is -// updated. 3. RelativeToCreationDate: ExpireTime is an integer in milliseconds representing the expiration date -// relative to file creation. 4. Absolute: ExpireTime is an integer in milliseconds, as a Unix timestamp relative -// to 1/1/1970 00:00:00. expireTime is the time that the file will expire, corresponding to the ExpiryOption that -// was set. -func (client Client) SetFileExpiry(ctx context.Context, accountName string, filePath string, expiryOption ExpiryOptionType, expireTime *int64) (result autorest.Response, err error) { - req, err := client.SetFileExpiryPreparer(ctx, accountName, filePath, expiryOption, expireTime) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetFileExpiry", nil, "Failure preparing request") - return - } - - resp, err := client.SetFileExpirySender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetFileExpiry", resp, "Failure sending request") - return - } - - result, err = client.SetFileExpiryResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetFileExpiry", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetFileExpiryPreparer prepares the SetFileExpiry request. -func (client Client) SetFileExpiryPreparer(ctx context.Context, accountName string, filePath string, expiryOption ExpiryOptionType, expireTime *int64) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "filePath": autorest.Encode("path", filePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "expiryOption": autorest.Encode("query", expiryOption), - "op": autorest.Encode("query", "SETEXPIRY"), - } - if expireTime != nil { - queryParameters["expireTime"] = autorest.Encode("query", *expireTime) - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/WebHdfsExt/{filePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetFileExpirySender sends the SetFileExpiry request. The method will close the -// http.Response Body if it receives an error. -func (client Client) SetFileExpirySender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetFileExpiryResponder handles the response to the SetFileExpiry request. The method always -// closes the http.Response Body. -func (client Client) SetFileExpiryResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetOwner sets the owner of a file or directory. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. setOwnerFilePath is the -// Data Lake Store path (starting with '/') of the file or directory for which to set the owner. owner is the AAD -// Object ID of the user owner of the file or directory. If empty, the property will remain unchanged. group is the -// AAD Object ID of the group owner of the file or directory. If empty, the property will remain unchanged. -func (client Client) SetOwner(ctx context.Context, accountName string, setOwnerFilePath string, owner string, group string) (result autorest.Response, err error) { - req, err := client.SetOwnerPreparer(ctx, accountName, setOwnerFilePath, owner, group) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetOwner", nil, "Failure preparing request") - return - } - - resp, err := client.SetOwnerSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetOwner", resp, "Failure sending request") - return - } - - result, err = client.SetOwnerResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetOwner", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetOwnerPreparer prepares the SetOwner request. -func (client Client) SetOwnerPreparer(ctx context.Context, accountName string, setOwnerFilePath string, owner string, group string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "setOwnerFilePath": autorest.Encode("path", setOwnerFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "SETOWNER"), - } - if len(owner) > 0 { - queryParameters["owner"] = autorest.Encode("query", owner) - } - if len(group) > 0 { - queryParameters["group"] = autorest.Encode("query", group) - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{setOwnerFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetOwnerSender sends the SetOwner request. The method will close the -// http.Response Body if it receives an error. -func (client Client) SetOwnerSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetOwnerResponder handles the response to the SetOwner request. The method always -// closes the http.Response Body. -func (client Client) SetOwnerResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetPermission sets the permission of the file or folder. -// -// accountName is the Azure Data Lake Store account to execute filesystem operations on. setPermissionFilePath is -// the Data Lake Store path (starting with '/') of the file or directory for which to set the permission. -// permission is a string representation of the permission (i.e 'rwx'). If empty, this property remains unchanged. -func (client Client) SetPermission(ctx context.Context, accountName string, setPermissionFilePath string, permission string) (result autorest.Response, err error) { - req, err := client.SetPermissionPreparer(ctx, accountName, setPermissionFilePath, permission) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetPermission", nil, "Failure preparing request") - return - } - - resp, err := client.SetPermissionSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetPermission", resp, "Failure sending request") - return - } - - result, err = client.SetPermissionResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetPermission", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetPermissionPreparer prepares the SetPermission request. -func (client Client) SetPermissionPreparer(ctx context.Context, accountName string, setPermissionFilePath string, permission string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "setPermissionFilePath": autorest.Encode("path", setPermissionFilePath), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "SETPERMISSION"), - } - if len(permission) > 0 { - queryParameters["permission"] = autorest.Encode("query", permission) - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{setPermissionFilePath}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetPermissionSender sends the SetPermission request. The method will close the -// http.Response Body if it receives an error. -func (client Client) SetPermissionSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// SetPermissionResponder handles the response to the SetPermission request. The method always -// closes the http.Response Body. -func (client Client) SetPermissionResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/models.go deleted file mode 100644 index 688674d27bcf..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/models.go +++ /dev/null @@ -1,1283 +0,0 @@ -package filesystem - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "encoding/json" - "github.com/Azure/go-autorest/autorest" - "io" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AppendModeType enumerates the values for append mode type. -type AppendModeType string - -const ( - // Autocreate ... - Autocreate AppendModeType = "autocreate" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// PossibleAppendModeTypeValues returns an array of possible values for the AppendModeType const type. -func PossibleAppendModeTypeValues() []AppendModeType { - return []AppendModeType{Autocreate} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// Exception enumerates the values for exception. -type Exception string - -const ( - // ExceptionAccessControlException ... - ExceptionAccessControlException Exception = "AccessControlException" - // ExceptionAdlsRemoteException ... - ExceptionAdlsRemoteException Exception = "AdlsRemoteException" - // ExceptionBadOffsetException ... - ExceptionBadOffsetException Exception = "BadOffsetException" - // ExceptionFileAlreadyExistsException ... - ExceptionFileAlreadyExistsException Exception = "FileAlreadyExistsException" - // ExceptionFileNotFoundException ... - ExceptionFileNotFoundException Exception = "FileNotFoundException" - // ExceptionIllegalArgumentException ... - ExceptionIllegalArgumentException Exception = "IllegalArgumentException" - // ExceptionIOException ... - ExceptionIOException Exception = "IOException" - // ExceptionRuntimeException ... - ExceptionRuntimeException Exception = "RuntimeException" - // ExceptionSecurityException ... - ExceptionSecurityException Exception = "SecurityException" - // ExceptionUnsupportedOperationException ... - ExceptionUnsupportedOperationException Exception = "UnsupportedOperationException" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// PossibleExceptionValues returns an array of possible values for the Exception const type. -func PossibleExceptionValues() []Exception { - return []Exception{ExceptionAccessControlException, ExceptionAdlsRemoteException, ExceptionBadOffsetException, ExceptionFileAlreadyExistsException, ExceptionFileNotFoundException, ExceptionIllegalArgumentException, ExceptionIOException, ExceptionRuntimeException, ExceptionSecurityException, ExceptionUnsupportedOperationException} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ExpiryOptionType enumerates the values for expiry option type. -type ExpiryOptionType string - -const ( - // Absolute ... - Absolute ExpiryOptionType = "Absolute" - // NeverExpire ... - NeverExpire ExpiryOptionType = "NeverExpire" - // RelativeToCreationDate ... - RelativeToCreationDate ExpiryOptionType = "RelativeToCreationDate" - // RelativeToNow ... - RelativeToNow ExpiryOptionType = "RelativeToNow" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// PossibleExpiryOptionTypeValues returns an array of possible values for the ExpiryOptionType const type. -func PossibleExpiryOptionTypeValues() []ExpiryOptionType { - return []ExpiryOptionType{Absolute, NeverExpire, RelativeToCreationDate, RelativeToNow} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// FileType enumerates the values for file type. -type FileType string - -const ( - // DIRECTORY ... - DIRECTORY FileType = "DIRECTORY" - // FILE ... - FILE FileType = "FILE" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// PossibleFileTypeValues returns an array of possible values for the FileType const type. -func PossibleFileTypeValues() []FileType { - return []FileType{DIRECTORY, FILE} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ACLStatus data Lake Store file or directory Access Control List information. -type ACLStatus struct { - // Entries - the list of ACLSpec entries on a file or directory. - Entries *[]string `json:"entries,omitempty"` - // Group - the group owner, an AAD Object ID. - Group *string `json:"group,omitempty"` - // Owner - the user owner, an AAD Object ID. - Owner *string `json:"owner,omitempty"` - // Permission - The octal representation of the unnamed user, mask and other permissions. - Permission *int32 `json:"permission,omitempty"` - // StickyBit - the indicator of whether the sticky bit is on or off. - StickyBit *bool `json:"stickyBit,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ACLStatusResult data Lake Store file or directory Access Control List information. -type ACLStatusResult struct { - autorest.Response `json:"-"` - // ACLStatus - the AclStatus object for a given file or directory. - ACLStatus *ACLStatus `json:"AclStatus,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AdlsAccessControlException a WebHDFS exception thrown indicating that access is denied due to insufficient -// permissions. Thrown when a 403 error response code is returned (forbidden). -type AdlsAccessControlException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' - Exception Exception `json:"exception,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MarshalJSON is the custom marshaler for AdlsAccessControlException. -func (aace AdlsAccessControlException) MarshalJSON() ([]byte, error) { - aace.Exception = ExceptionAccessControlException - objectMap := make(map[string]interface{}) - if aace.JavaClassName != nil { - objectMap["javaClassName"] = aace.JavaClassName - } - if aace.Message != nil { - objectMap["message"] = aace.Message - } - if aace.Exception != "" { - objectMap["exception"] = aace.Exception - } - return json.Marshal(objectMap) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return &aace, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &aace, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AdlsBadOffsetException a WebHDFS exception thrown indicating the append or read is from a bad offset. Thrown -// when a 400 error response code is returned for append and open operations (Bad request). -type AdlsBadOffsetException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' - Exception Exception `json:"exception,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MarshalJSON is the custom marshaler for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) MarshalJSON() ([]byte, error) { - aboe.Exception = ExceptionBadOffsetException - objectMap := make(map[string]interface{}) - if aboe.JavaClassName != nil { - objectMap["javaClassName"] = aboe.JavaClassName - } - if aboe.Message != nil { - objectMap["message"] = aboe.Message - } - if aboe.Exception != "" { - objectMap["exception"] = aboe.Exception - } - return json.Marshal(objectMap) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return &aboe, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &aboe, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AdlsError data Lake Store filesystem error containing a specific WebHDFS exception. -type AdlsError struct { - // RemoteException - the object representing the actual WebHDFS exception being returned. - RemoteException BasicAdlsRemoteException `json:"RemoteException,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// UnmarshalJSON is the custom unmarshaler for AdlsError struct. -func (ae *AdlsError) UnmarshalJSON(body []byte) error { - var m map[string]*json.RawMessage - err := json.Unmarshal(body, &m) - if err != nil { - return err - } - for k, v := range m { - switch k { - case "RemoteException": - if v != nil { - remoteException, err := unmarshalBasicAdlsRemoteException(*v) - if err != nil { - return err - } - ae.RemoteException = remoteException - } - } - } - - return nil -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AdlsFileAlreadyExistsException a WebHDFS exception thrown indicating the file or folder already exists. Thrown -// when a 403 error response code is returned (forbidden). -type AdlsFileAlreadyExistsException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' - Exception Exception `json:"exception,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MarshalJSON is the custom marshaler for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) MarshalJSON() ([]byte, error) { - afaee.Exception = ExceptionFileAlreadyExistsException - objectMap := make(map[string]interface{}) - if afaee.JavaClassName != nil { - objectMap["javaClassName"] = afaee.JavaClassName - } - if afaee.Message != nil { - objectMap["message"] = afaee.Message - } - if afaee.Exception != "" { - objectMap["exception"] = afaee.Exception - } - return json.Marshal(objectMap) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return &afaee, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &afaee, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AdlsFileNotFoundException a WebHDFS exception thrown indicating the file or folder could not be found. Thrown -// when a 404 error response code is returned (not found). -type AdlsFileNotFoundException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' - Exception Exception `json:"exception,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MarshalJSON is the custom marshaler for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) MarshalJSON() ([]byte, error) { - afnfe.Exception = ExceptionFileNotFoundException - objectMap := make(map[string]interface{}) - if afnfe.JavaClassName != nil { - objectMap["javaClassName"] = afnfe.JavaClassName - } - if afnfe.Message != nil { - objectMap["message"] = afnfe.Message - } - if afnfe.Exception != "" { - objectMap["exception"] = afnfe.Exception - } - return json.Marshal(objectMap) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return &afnfe, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &afnfe, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AdlsIllegalArgumentException a WebHDFS exception thrown indicating that one more arguments is incorrect. Thrown -// when a 400 error response code is returned (bad request). -type AdlsIllegalArgumentException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' - Exception Exception `json:"exception,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MarshalJSON is the custom marshaler for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) MarshalJSON() ([]byte, error) { - aiae.Exception = ExceptionIllegalArgumentException - objectMap := make(map[string]interface{}) - if aiae.JavaClassName != nil { - objectMap["javaClassName"] = aiae.JavaClassName - } - if aiae.Message != nil { - objectMap["message"] = aiae.Message - } - if aiae.Exception != "" { - objectMap["exception"] = aiae.Exception - } - return json.Marshal(objectMap) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return &aiae, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &aiae, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AdlsIOException a WebHDFS exception thrown indicating there was an IO (read or write) error. Thrown when a 403 -// error response code is returned (forbidden). -type AdlsIOException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' - Exception Exception `json:"exception,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MarshalJSON is the custom marshaler for AdlsIOException. -func (aie AdlsIOException) MarshalJSON() ([]byte, error) { - aie.Exception = ExceptionIOException - objectMap := make(map[string]interface{}) - if aie.JavaClassName != nil { - objectMap["javaClassName"] = aie.JavaClassName - } - if aie.Message != nil { - objectMap["message"] = aie.Message - } - if aie.Exception != "" { - objectMap["exception"] = aie.Exception - } - return json.Marshal(objectMap) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsIOException() (*AdlsIOException, bool) { - return &aie, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &aie, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// BasicAdlsRemoteException data Lake Store filesystem exception based on the WebHDFS definition for RemoteExceptions. -type BasicAdlsRemoteException interface { - AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) - AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) - AsAdlsSecurityException() (*AdlsSecurityException, bool) - AsAdlsIOException() (*AdlsIOException, bool) - AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) - AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) - AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) - AsAdlsRuntimeException() (*AdlsRuntimeException, bool) - AsAdlsAccessControlException() (*AdlsAccessControlException, bool) - AsAdlsRemoteException() (*AdlsRemoteException, bool) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AdlsRemoteException data Lake Store filesystem exception based on the WebHDFS definition for RemoteExceptions. -type AdlsRemoteException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' - Exception Exception `json:"exception,omitempty"` -} - -func unmarshalBasicAdlsRemoteException(body []byte) (BasicAdlsRemoteException, error) { - var m map[string]interface{} - err := json.Unmarshal(body, &m) - if err != nil { - return nil, err - } - - switch m["exception"] { - case string(ExceptionIllegalArgumentException): - var aiae AdlsIllegalArgumentException - err := json.Unmarshal(body, &aiae) - return aiae, err - case string(ExceptionUnsupportedOperationException): - var auoe AdlsUnsupportedOperationException - err := json.Unmarshal(body, &auoe) - return auoe, err - case string(ExceptionSecurityException): - var ase AdlsSecurityException - err := json.Unmarshal(body, &ase) - return ase, err - case string(ExceptionIOException): - var aie AdlsIOException - err := json.Unmarshal(body, &aie) - return aie, err - case string(ExceptionFileNotFoundException): - var afnfe AdlsFileNotFoundException - err := json.Unmarshal(body, &afnfe) - return afnfe, err - case string(ExceptionFileAlreadyExistsException): - var afaee AdlsFileAlreadyExistsException - err := json.Unmarshal(body, &afaee) - return afaee, err - case string(ExceptionBadOffsetException): - var aboe AdlsBadOffsetException - err := json.Unmarshal(body, &aboe) - return aboe, err - case string(ExceptionRuntimeException): - var are AdlsRuntimeException - err := json.Unmarshal(body, &are) - return are, err - case string(ExceptionAccessControlException): - var aace AdlsAccessControlException - err := json.Unmarshal(body, &aace) - return aace, err - default: - var are AdlsRemoteException - err := json.Unmarshal(body, &are) - return are, err - } -} -func unmarshalBasicAdlsRemoteExceptionArray(body []byte) ([]BasicAdlsRemoteException, error) { - var rawMessages []*json.RawMessage - err := json.Unmarshal(body, &rawMessages) - if err != nil { - return nil, err - } - - areArray := make([]BasicAdlsRemoteException, len(rawMessages)) - - for index, rawMessage := range rawMessages { - are, err := unmarshalBasicAdlsRemoteException(*rawMessage) - if err != nil { - return nil, err - } - areArray[index] = are - } - return areArray, nil -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MarshalJSON is the custom marshaler for AdlsRemoteException. -func (are AdlsRemoteException) MarshalJSON() ([]byte, error) { - are.Exception = ExceptionAdlsRemoteException - objectMap := make(map[string]interface{}) - if are.JavaClassName != nil { - objectMap["javaClassName"] = are.JavaClassName - } - if are.Message != nil { - objectMap["message"] = are.Message - } - if are.Exception != "" { - objectMap["exception"] = are.Exception - } - return json.Marshal(objectMap) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return &are, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &are, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AdlsRuntimeException a WebHDFS exception thrown when an unexpected error occurs during an operation. Thrown when -// a 500 error response code is returned (Internal server error). -type AdlsRuntimeException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' - Exception Exception `json:"exception,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MarshalJSON is the custom marshaler for AdlsRuntimeException. -func (are AdlsRuntimeException) MarshalJSON() ([]byte, error) { - are.Exception = ExceptionRuntimeException - objectMap := make(map[string]interface{}) - if are.JavaClassName != nil { - objectMap["javaClassName"] = are.JavaClassName - } - if are.Message != nil { - objectMap["message"] = are.Message - } - if are.Exception != "" { - objectMap["exception"] = are.Exception - } - return json.Marshal(objectMap) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return &are, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &are, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AdlsSecurityException a WebHDFS exception thrown indicating that access is denied. Thrown when a 401 error -// response code is returned (Unauthorized). -type AdlsSecurityException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' - Exception Exception `json:"exception,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MarshalJSON is the custom marshaler for AdlsSecurityException. -func (ase AdlsSecurityException) MarshalJSON() ([]byte, error) { - ase.Exception = ExceptionSecurityException - objectMap := make(map[string]interface{}) - if ase.JavaClassName != nil { - objectMap["javaClassName"] = ase.JavaClassName - } - if ase.Message != nil { - objectMap["message"] = ase.Message - } - if ase.Exception != "" { - objectMap["exception"] = ase.Exception - } - return json.Marshal(objectMap) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return &ase, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &ase, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AdlsUnsupportedOperationException a WebHDFS exception thrown indicating that the requested operation is not -// supported. Thrown when a 400 error response code is returned (bad request). -type AdlsUnsupportedOperationException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException' - Exception Exception `json:"exception,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// MarshalJSON is the custom marshaler for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) MarshalJSON() ([]byte, error) { - auoe.Exception = ExceptionUnsupportedOperationException - objectMap := make(map[string]interface{}) - if auoe.JavaClassName != nil { - objectMap["javaClassName"] = auoe.JavaClassName - } - if auoe.Message != nil { - objectMap["message"] = auoe.Message - } - if auoe.Exception != "" { - objectMap["exception"] = auoe.Exception - } - return json.Marshal(objectMap) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return &auoe, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &auoe, true -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ContentSummary data Lake Store content summary information -type ContentSummary struct { - // DirectoryCount - the number of directories. - DirectoryCount *int64 `json:"directoryCount,omitempty"` - // FileCount - the number of files. - FileCount *int64 `json:"fileCount,omitempty"` - // Length - the number of bytes used by the contet. - Length *int64 `json:"length,omitempty"` - // SpaceConsumed - the disk space consumed by the content. - SpaceConsumed *int64 `json:"spaceConsumed,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ContentSummaryResult data Lake Store filesystem content summary information response. -type ContentSummaryResult struct { - autorest.Response `json:"-"` - // ContentSummary - the content summary for the specified path - ContentSummary *ContentSummary `json:"ContentSummary,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// FileOperationResult the result of the request or operation. -type FileOperationResult struct { - autorest.Response `json:"-"` - // OperationResult - the result of the operation or request. - OperationResult *bool `json:"boolean,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// FileStatuses data Lake Store file status list information. -type FileStatuses struct { - // FileStatus - the object containing the list of properties of the files. - FileStatus *[]FileStatusProperties `json:"FileStatus,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// FileStatusesResult data Lake Store filesystem file status list information response. -type FileStatusesResult struct { - autorest.Response `json:"-"` - // FileStatuses - the object representing the list of file statuses. - FileStatuses *FileStatuses `json:"FileStatuses,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// FileStatusProperties data Lake Store file or directory information. -type FileStatusProperties struct { - // AccessTime - the last access time as ticks since the epoch. - AccessTime *int64 `json:"accessTime,omitempty"` - // BlockSize - the block size for the file. - BlockSize *int64 `json:"blockSize,omitempty"` - // ChildrenNum - the number of children in the directory. - ChildrenNum *int64 `json:"childrenNum,omitempty"` - // ExpirationTime - Gets the expiration time, if any, as ticks since the epoch. If this is set to 0 or DateTime.MaxValue there is no expiration. - ExpirationTime *int64 `json:"expirationTime,omitempty"` - // Group - the group owner. - Group *string `json:"group,omitempty"` - // Length - the number of bytes in a file. - Length *int64 `json:"length,omitempty"` - // ModificationTime - the modification time as ticks since the epoch. - ModificationTime *int64 `json:"modificationTime,omitempty"` - // Owner - the user who is the owner. - Owner *string `json:"owner,omitempty"` - // PathSuffix - the path suffix. - PathSuffix *string `json:"pathSuffix,omitempty"` - // Permission - the permission represented as an string. - Permission *string `json:"permission,omitempty"` - // Type - the type of the path object. Possible values include: 'FILE', 'DIRECTORY' - Type FileType `json:"type,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// FileStatusResult data Lake Store filesystem file status information response. -type FileStatusResult struct { - autorest.Response `json:"-"` - // FileStatus - the file status object associated with the specified path. - FileStatus *FileStatusProperties `json:"FileStatus,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// ReadCloser ... -type ReadCloser struct { - autorest.Response `json:"-"` - Value *io.ReadCloser `json:"value,omitempty"` -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/version.go deleted file mode 100644 index 39bcd68c0402..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2015-10-01-preview/filesystem/version.go +++ /dev/null @@ -1,31 +0,0 @@ -package filesystem - -import "github.com/Azure/azure-sdk-for-go/version" - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// UserAgent returns the UserAgent string to use when sending http.Requests. -func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " filesystem/2015-10-01-preview" -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/2015-10-01-preview/filesystem instead. -// Version returns the semantic version (see http://semver.org) of the client. -func Version() string { - return version.Number -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/client.go deleted file mode 100644 index ed15265f06e4..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/client.go +++ /dev/null @@ -1,49 +0,0 @@ -// Package filesystem implements the Azure ARM Filesystem service API version 2016-11-01. -// -// Creates an Azure Data Lake Store filesystem client. -package filesystem - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "github.com/Azure/go-autorest/autorest" -) - -const ( - // DefaultAdlsFileSystemDNSSuffix is the default value for adls file system dns suffix - DefaultAdlsFileSystemDNSSuffix = "azuredatalakestore.net" -) - -// BaseClient is the base client for Filesystem. -type BaseClient struct { - autorest.Client - AdlsFileSystemDNSSuffix string -} - -// New creates an instance of the BaseClient client. -func New() BaseClient { - return NewWithoutDefaults(DefaultAdlsFileSystemDNSSuffix) -} - -// NewWithoutDefaults creates an instance of the BaseClient client. -func NewWithoutDefaults(adlsFileSystemDNSSuffix string) BaseClient { - return BaseClient{ - Client: autorest.NewClientWithUserAgent(UserAgent()), - AdlsFileSystemDNSSuffix: adlsFileSystemDNSSuffix, - } -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/filesystem.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/filesystem.go deleted file mode 100644 index 9a03cec7936d..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/filesystem.go +++ /dev/null @@ -1,1804 +0,0 @@ -package filesystem - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "context" - "github.com/Azure/go-autorest/autorest" - "github.com/Azure/go-autorest/autorest/azure" - "github.com/Azure/go-autorest/autorest/validation" - "github.com/satori/go.uuid" - "io" - "net/http" -) - -// Client is the creates an Azure Data Lake Store filesystem client. -type Client struct { - BaseClient -} - -// NewClient creates an instance of the Client client. -func NewClient() Client { - return Client{New()} -} - -// Append used for serial appends to the specified file. NOTE: The target must not contain data added by -// ConcurrentAppend. ConcurrentAppend and Append cannot be used interchangeably; once a target file has been modified -// using either of these append options, the other append option cannot be used on the target file. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file to which to append. -// streamContents - the file contents to include when appending to the file. -// offset - the optional offset in the stream to begin the append operation. Default is to append at the end of -// the stream. -// syncFlag - optionally indicates what to do after completion of the concurrent append. DATA indicates that -// more data will be sent immediately by the client, the file handle should remain open/locked, and file -// metadata (including file length, last modified time) should NOT get updated. METADATA indicates that more -// data will be sent immediately by the client, the file handle should remain open/locked, and file metadata -// should get updated. CLOSE indicates that the client is done sending data, the file handle should be -// closed/unlocked, and file metadata should get updated. -// leaseID - optional unique GUID per file to ensure single writer semantics, meaning that only clients that -// append to the file with the same leaseId will be allowed to do so. -// fileSessionID - optional unique GUID per file indicating all the appends with the same fileSessionId are -// from the same client and same session. This will give a performance benefit when syncFlag is DATA or -// METADATA. -func (client Client) Append(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, offset *int64, syncFlag SyncFlag, leaseID *uuid.UUID, fileSessionID *uuid.UUID) (result autorest.Response, err error) { - req, err := client.AppendPreparer(ctx, accountName, pathParameter, streamContents, offset, syncFlag, leaseID, fileSessionID) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Append", nil, "Failure preparing request") - return - } - - resp, err := client.AppendSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "Append", resp, "Failure sending request") - return - } - - result, err = client.AppendResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Append", resp, "Failure responding to request") - } - - return -} - -// AppendPreparer prepares the Append request. -func (client Client) AppendPreparer(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, offset *int64, syncFlag SyncFlag, leaseID *uuid.UUID, fileSessionID *uuid.UUID) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "append": autorest.Encode("query", "true"), - "op": autorest.Encode("query", "APPEND"), - } - if offset != nil { - queryParameters["offset"] = autorest.Encode("query", *offset) - } - if len(string(syncFlag)) > 0 { - queryParameters["syncFlag"] = autorest.Encode("query", syncFlag) - } else { - queryParameters["syncFlag"] = autorest.Encode("query", "CLOSE") - } - if leaseID != nil { - queryParameters["leaseId"] = autorest.Encode("query", *leaseID) - } - if fileSessionID != nil { - queryParameters["fileSessionId"] = autorest.Encode("query", *fileSessionID) - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/octet-stream"), - autorest.AsPost(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithFile(streamContents), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// AppendSender sends the Append request. The method will close the -// http.Response Body if it receives an error. -func (client Client) AppendSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// AppendResponder handles the response to the Append request. The method always -// closes the http.Response Body. -func (client Client) AppendResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// CheckAccess checks if the specified access is available at the given path. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file or directory for which to check -// access. -// fsaction - file system operation read/write/execute in string form, matching regex pattern '[rwx-]{3}' -func (client Client) CheckAccess(ctx context.Context, accountName string, pathParameter string, fsaction string) (result autorest.Response, err error) { - req, err := client.CheckAccessPreparer(ctx, accountName, pathParameter, fsaction) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "CheckAccess", nil, "Failure preparing request") - return - } - - resp, err := client.CheckAccessSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "CheckAccess", resp, "Failure sending request") - return - } - - result, err = client.CheckAccessResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "CheckAccess", resp, "Failure responding to request") - } - - return -} - -// CheckAccessPreparer prepares the CheckAccess request. -func (client Client) CheckAccessPreparer(ctx context.Context, accountName string, pathParameter string, fsaction string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "fsaction": autorest.Encode("query", fsaction), - "op": autorest.Encode("query", "CHECKACCESS"), - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// CheckAccessSender sends the CheckAccess request. The method will close the -// http.Response Body if it receives an error. -func (client Client) CheckAccessSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// CheckAccessResponder handles the response to the CheckAccess request. The method always -// closes the http.Response Body. -func (client Client) CheckAccessResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Concat concatenates the list of source files into the destination file, removing all source files upon success. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the destination file resulting from the -// concatenation. -// sources - a list of comma separated Data Lake Store paths (starting with '/') of the files to concatenate, -// in the order in which they should be concatenated. -func (client Client) Concat(ctx context.Context, accountName string, pathParameter string, sources []string) (result autorest.Response, err error) { - if err := validation.Validate([]validation.Validation{ - {TargetValue: sources, - Constraints: []validation.Constraint{{Target: "sources", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { - return result, validation.NewError("filesystem.Client", "Concat", err.Error()) - } - - req, err := client.ConcatPreparer(ctx, accountName, pathParameter, sources) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Concat", nil, "Failure preparing request") - return - } - - resp, err := client.ConcatSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "Concat", resp, "Failure sending request") - return - } - - result, err = client.ConcatResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Concat", resp, "Failure responding to request") - } - - return -} - -// ConcatPreparer prepares the Concat request. -func (client Client) ConcatPreparer(ctx context.Context, accountName string, pathParameter string, sources []string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "CONCAT"), - "sources": autorest.Encode("query", sources, ","), - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ConcatSender sends the Concat request. The method will close the -// http.Response Body if it receives an error. -func (client Client) ConcatSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// ConcatResponder handles the response to the Concat request. The method always -// closes the http.Response Body. -func (client Client) ConcatResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// ConcurrentAppend appends to the specified file, optionally first creating the file if it does not yet exist. This -// method supports multiple concurrent appends to the file. NOTE: The target must not contain data added by Create or -// normal (serial) Append. ConcurrentAppend and Append cannot be used interchangeably; once a target file has been -// modified using either of these append options, the other append option cannot be used on the target file. -// ConcurrentAppend does not guarantee order and can result in duplicated data landing in the target file. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file to which to append using concurrent -// append. -// streamContents - the file contents to include when appending to the file. -// appendMode - indicates the concurrent append call should create the file if it doesn't exist or just open -// the existing file for append -// syncFlag - optionally indicates what to do after completion of the concurrent append. DATA indicates that -// more data will be sent immediately by the client, the file handle should remain open/locked, and file -// metadata (including file length, last modified time) should NOT get updated. METADATA indicates that more -// data will be sent immediately by the client, the file handle should remain open/locked, and file metadata -// should get updated. CLOSE indicates that the client is done sending data, the file handle should be -// closed/unlocked, and file metadata should get updated. -func (client Client) ConcurrentAppend(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, appendMode AppendModeType, syncFlag SyncFlag) (result autorest.Response, err error) { - req, err := client.ConcurrentAppendPreparer(ctx, accountName, pathParameter, streamContents, appendMode, syncFlag) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "ConcurrentAppend", nil, "Failure preparing request") - return - } - - resp, err := client.ConcurrentAppendSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "ConcurrentAppend", resp, "Failure sending request") - return - } - - result, err = client.ConcurrentAppendResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "ConcurrentAppend", resp, "Failure responding to request") - } - - return -} - -// ConcurrentAppendPreparer prepares the ConcurrentAppend request. -func (client Client) ConcurrentAppendPreparer(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, appendMode AppendModeType, syncFlag SyncFlag) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "CONCURRENTAPPEND"), - } - if len(string(appendMode)) > 0 { - queryParameters["appendMode"] = autorest.Encode("query", appendMode) - } - if len(string(syncFlag)) > 0 { - queryParameters["syncFlag"] = autorest.Encode("query", syncFlag) - } else { - queryParameters["syncFlag"] = autorest.Encode("query", "DATA") - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/octet-stream"), - autorest.AsPost(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/WebHdfsExt/{path}", pathParameters), - autorest.WithFile(streamContents), - autorest.WithQueryParameters(queryParameters), - autorest.WithHeader("Transfer-Encoding", "chunked")) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ConcurrentAppendSender sends the ConcurrentAppend request. The method will close the -// http.Response Body if it receives an error. -func (client Client) ConcurrentAppendSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// ConcurrentAppendResponder handles the response to the ConcurrentAppend request. The method always -// closes the http.Response Body. -func (client Client) ConcurrentAppendResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Create creates a file with optionally specified content. NOTE: If content is provided, the resulting file cannot be -// modified using ConcurrentAppend. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file to create. -// streamContents - the file contents to include when creating the file. This parameter is optional, resulting -// in an empty file if not specified. -// overwrite - the indication of if the file should be overwritten. -// syncFlag - optionally indicates what to do after completion of the create. DATA indicates that more data -// will be sent immediately by the client, the file handle should remain open/locked, and file metadata -// (including file length, last modified time) should NOT get updated. METADATA indicates that more data will -// be sent immediately by the client, the file handle should remain open/locked, and file metadata should get -// updated. CLOSE indicates that the client is done sending data, the file handle should be closed/unlocked, -// and file metadata should get updated. -// leaseID - optional unique GUID per file to ensure single writer semantics, meaning that only clients that -// append to the file with the same leaseId will be allowed to do so. -// permission - the octal representation of the unnamed user, mask and other permissions that should be set for -// the file when created. If not specified, it inherits these from the container. -func (client Client) Create(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, overwrite *bool, syncFlag SyncFlag, leaseID *uuid.UUID, permission *int32) (result autorest.Response, err error) { - req, err := client.CreatePreparer(ctx, accountName, pathParameter, streamContents, overwrite, syncFlag, leaseID, permission) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Create", nil, "Failure preparing request") - return - } - - resp, err := client.CreateSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "Create", resp, "Failure sending request") - return - } - - result, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Create", resp, "Failure responding to request") - } - - return -} - -// CreatePreparer prepares the Create request. -func (client Client) CreatePreparer(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, overwrite *bool, syncFlag SyncFlag, leaseID *uuid.UUID, permission *int32) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "CREATE"), - "write": autorest.Encode("query", "true"), - } - if overwrite != nil { - queryParameters["overwrite"] = autorest.Encode("query", *overwrite) - } - if len(string(syncFlag)) > 0 { - queryParameters["syncFlag"] = autorest.Encode("query", syncFlag) - } else { - queryParameters["syncFlag"] = autorest.Encode("query", "CLOSE") - } - if leaseID != nil { - queryParameters["leaseId"] = autorest.Encode("query", *leaseID) - } - if permission != nil { - queryParameters["permission"] = autorest.Encode("query", *permission) - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/octet-stream"), - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - if streamContents != nil { - preparer = autorest.DecoratePreparer(preparer, - autorest.WithFile(streamContents)) - } - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// CreateSender sends the Create request. The method will close the -// http.Response Body if it receives an error. -func (client Client) CreateSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// CreateResponder handles the response to the Create request. The method always -// closes the http.Response Body. -func (client Client) CreateResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), - autorest.ByClosing()) - result.Response = resp - return -} - -// Delete deletes the requested file or directory, optionally recursively. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file or directory to delete. -// recursive - the optional switch indicating if the delete should be recursive -func (client Client) Delete(ctx context.Context, accountName string, pathParameter string, recursive *bool) (result FileOperationResult, err error) { - req, err := client.DeletePreparer(ctx, accountName, pathParameter, recursive) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Delete", nil, "Failure preparing request") - return - } - - resp, err := client.DeleteSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "Delete", resp, "Failure sending request") - return - } - - result, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Delete", resp, "Failure responding to request") - } - - return -} - -// DeletePreparer prepares the Delete request. -func (client Client) DeletePreparer(ctx context.Context, accountName string, pathParameter string, recursive *bool) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "DELETE"), - } - if recursive != nil { - queryParameters["recursive"] = autorest.Encode("query", *recursive) - } - - preparer := autorest.CreatePreparer( - autorest.AsDelete(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// DeleteSender sends the Delete request. The method will close the -// http.Response Body if it receives an error. -func (client Client) DeleteSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// DeleteResponder handles the response to the Delete request. The method always -// closes the http.Response Body. -func (client Client) DeleteResponder(resp *http.Response) (result FileOperationResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// GetACLStatus gets Access Control List (ACL) entries for the specified file or directory. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file or directory for which to get the -// ACL. -// tooID - an optional switch to return friendly names in place of object ID for ACL entries. tooid=false -// returns friendly names instead of the AAD Object ID. Default value is true, returning AAD object IDs. -func (client Client) GetACLStatus(ctx context.Context, accountName string, pathParameter string, tooID *bool) (result ACLStatusResult, err error) { - req, err := client.GetACLStatusPreparer(ctx, accountName, pathParameter, tooID) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetACLStatus", nil, "Failure preparing request") - return - } - - resp, err := client.GetACLStatusSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetACLStatus", resp, "Failure sending request") - return - } - - result, err = client.GetACLStatusResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetACLStatus", resp, "Failure responding to request") - } - - return -} - -// GetACLStatusPreparer prepares the GetACLStatus request. -func (client Client) GetACLStatusPreparer(ctx context.Context, accountName string, pathParameter string, tooID *bool) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "GETACLSTATUS"), - } - if tooID != nil { - queryParameters["tooId"] = autorest.Encode("query", *tooID) - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// GetACLStatusSender sends the GetACLStatus request. The method will close the -// http.Response Body if it receives an error. -func (client Client) GetACLStatusSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// GetACLStatusResponder handles the response to the GetACLStatus request. The method always -// closes the http.Response Body. -func (client Client) GetACLStatusResponder(resp *http.Response) (result ACLStatusResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// GetContentSummary gets the file content summary object specified by the file path. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file for which to retrieve the summary. -func (client Client) GetContentSummary(ctx context.Context, accountName string, pathParameter string) (result ContentSummaryResult, err error) { - req, err := client.GetContentSummaryPreparer(ctx, accountName, pathParameter) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetContentSummary", nil, "Failure preparing request") - return - } - - resp, err := client.GetContentSummarySender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetContentSummary", resp, "Failure sending request") - return - } - - result, err = client.GetContentSummaryResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetContentSummary", resp, "Failure responding to request") - } - - return -} - -// GetContentSummaryPreparer prepares the GetContentSummary request. -func (client Client) GetContentSummaryPreparer(ctx context.Context, accountName string, pathParameter string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "GETCONTENTSUMMARY"), - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// GetContentSummarySender sends the GetContentSummary request. The method will close the -// http.Response Body if it receives an error. -func (client Client) GetContentSummarySender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// GetContentSummaryResponder handles the response to the GetContentSummary request. The method always -// closes the http.Response Body. -func (client Client) GetContentSummaryResponder(resp *http.Response) (result ContentSummaryResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// GetFileStatus get the file status object specified by the file path. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file or directory for which to retrieve -// the status. -// tooID - an optional switch to return friendly names in place of owner and group. tooid=false returns -// friendly names instead of the AAD Object ID. Default value is true, returning AAD object IDs. -func (client Client) GetFileStatus(ctx context.Context, accountName string, pathParameter string, tooID *bool) (result FileStatusResult, err error) { - req, err := client.GetFileStatusPreparer(ctx, accountName, pathParameter, tooID) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetFileStatus", nil, "Failure preparing request") - return - } - - resp, err := client.GetFileStatusSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetFileStatus", resp, "Failure sending request") - return - } - - result, err = client.GetFileStatusResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "GetFileStatus", resp, "Failure responding to request") - } - - return -} - -// GetFileStatusPreparer prepares the GetFileStatus request. -func (client Client) GetFileStatusPreparer(ctx context.Context, accountName string, pathParameter string, tooID *bool) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "GETFILESTATUS"), - } - if tooID != nil { - queryParameters["tooId"] = autorest.Encode("query", *tooID) - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// GetFileStatusSender sends the GetFileStatus request. The method will close the -// http.Response Body if it receives an error. -func (client Client) GetFileStatusSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// GetFileStatusResponder handles the response to the GetFileStatus request. The method always -// closes the http.Response Body. -func (client Client) GetFileStatusResponder(resp *http.Response) (result FileStatusResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// ListFileStatus get the list of file status objects specified by the file path, with optional pagination parameters -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the directory to list. -// listSize - gets or sets the number of items to return. Optional. -// listAfter - gets or sets the item or lexographical index after which to begin returning results. For -// example, a file list of 'a','b','d' and listAfter='b' will return 'd', and a listAfter='c' will also return -// 'd'. Optional. -// listBefore - gets or sets the item or lexographical index before which to begin returning results. For -// example, a file list of 'a','b','d' and listBefore='d' will return 'a','b', and a listBefore='c' will also -// return 'a','b'. Optional. -// tooID - an optional switch to return friendly names in place of owner and group. tooid=false returns -// friendly names instead of the AAD Object ID. Default value is true, returning AAD object IDs. -func (client Client) ListFileStatus(ctx context.Context, accountName string, pathParameter string, listSize *int32, listAfter string, listBefore string, tooID *bool) (result FileStatusesResult, err error) { - req, err := client.ListFileStatusPreparer(ctx, accountName, pathParameter, listSize, listAfter, listBefore, tooID) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "ListFileStatus", nil, "Failure preparing request") - return - } - - resp, err := client.ListFileStatusSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "ListFileStatus", resp, "Failure sending request") - return - } - - result, err = client.ListFileStatusResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "ListFileStatus", resp, "Failure responding to request") - } - - return -} - -// ListFileStatusPreparer prepares the ListFileStatus request. -func (client Client) ListFileStatusPreparer(ctx context.Context, accountName string, pathParameter string, listSize *int32, listAfter string, listBefore string, tooID *bool) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "LISTSTATUS"), - } - if listSize != nil { - queryParameters["listSize"] = autorest.Encode("query", *listSize) - } - if len(listAfter) > 0 { - queryParameters["listAfter"] = autorest.Encode("query", listAfter) - } - if len(listBefore) > 0 { - queryParameters["listBefore"] = autorest.Encode("query", listBefore) - } - if tooID != nil { - queryParameters["tooId"] = autorest.Encode("query", *tooID) - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListFileStatusSender sends the ListFileStatus request. The method will close the -// http.Response Body if it receives an error. -func (client Client) ListFileStatusSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// ListFileStatusResponder handles the response to the ListFileStatus request. The method always -// closes the http.Response Body. -func (client Client) ListFileStatusResponder(resp *http.Response) (result FileStatusesResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// Mkdirs creates a directory. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the directory to create. -// permission - optional octal permission with which the directory should be created. -func (client Client) Mkdirs(ctx context.Context, accountName string, pathParameter string, permission *int32) (result FileOperationResult, err error) { - req, err := client.MkdirsPreparer(ctx, accountName, pathParameter, permission) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Mkdirs", nil, "Failure preparing request") - return - } - - resp, err := client.MkdirsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "Mkdirs", resp, "Failure sending request") - return - } - - result, err = client.MkdirsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Mkdirs", resp, "Failure responding to request") - } - - return -} - -// MkdirsPreparer prepares the Mkdirs request. -func (client Client) MkdirsPreparer(ctx context.Context, accountName string, pathParameter string, permission *int32) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "MKDIRS"), - } - if permission != nil { - queryParameters["permission"] = autorest.Encode("query", *permission) - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// MkdirsSender sends the Mkdirs request. The method will close the -// http.Response Body if it receives an error. -func (client Client) MkdirsSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// MkdirsResponder handles the response to the Mkdirs request. The method always -// closes the http.Response Body. -func (client Client) MkdirsResponder(resp *http.Response) (result FileOperationResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// ModifyACLEntries modifies existing Access Control List (ACL) entries on a file or folder. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file or directory with the ACL being -// modified. -// aclspec - the ACL specification included in ACL modification operations in the format -// '[default:]user|group|other::r|-w|-x|-' -func (client Client) ModifyACLEntries(ctx context.Context, accountName string, pathParameter string, aclspec string) (result autorest.Response, err error) { - req, err := client.ModifyACLEntriesPreparer(ctx, accountName, pathParameter, aclspec) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "ModifyACLEntries", nil, "Failure preparing request") - return - } - - resp, err := client.ModifyACLEntriesSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "ModifyACLEntries", resp, "Failure sending request") - return - } - - result, err = client.ModifyACLEntriesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "ModifyACLEntries", resp, "Failure responding to request") - } - - return -} - -// ModifyACLEntriesPreparer prepares the ModifyACLEntries request. -func (client Client) ModifyACLEntriesPreparer(ctx context.Context, accountName string, pathParameter string, aclspec string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "aclspec": autorest.Encode("query", aclspec), - "api-version": APIVersion, - "op": autorest.Encode("query", "MODIFYACLENTRIES"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ModifyACLEntriesSender sends the ModifyACLEntries request. The method will close the -// http.Response Body if it receives an error. -func (client Client) ModifyACLEntriesSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// ModifyACLEntriesResponder handles the response to the ModifyACLEntries request. The method always -// closes the http.Response Body. -func (client Client) ModifyACLEntriesResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// MsConcat concatenates the list of source files into the destination file, deleting all source files upon success. -// This method accepts more source file paths than the Concat method. This method and the parameters it accepts are -// subject to change for usability in an upcoming version. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the destination file resulting from the -// concatenation. -// streamContents - a list of Data Lake Store paths (starting with '/') of the source files. Must be a -// comma-separated path list in the format: sources=/file/path/1.txt,/file/path/2.txt,/file/path/lastfile.csv -// deleteSourceDirectory - indicates that as an optimization instead of deleting each individual source stream, -// delete the source stream folder if all streams are in the same folder instead. This results in a substantial -// performance improvement when the only streams in the folder are part of the concatenation operation. -// WARNING: This includes the deletion of any other files that are not source files. Only set this to true when -// source files are the only files in the source directory. -func (client Client) MsConcat(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, deleteSourceDirectory *bool) (result autorest.Response, err error) { - req, err := client.MsConcatPreparer(ctx, accountName, pathParameter, streamContents, deleteSourceDirectory) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "MsConcat", nil, "Failure preparing request") - return - } - - resp, err := client.MsConcatSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "MsConcat", resp, "Failure sending request") - return - } - - result, err = client.MsConcatResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "MsConcat", resp, "Failure responding to request") - } - - return -} - -// MsConcatPreparer prepares the MsConcat request. -func (client Client) MsConcatPreparer(ctx context.Context, accountName string, pathParameter string, streamContents io.ReadCloser, deleteSourceDirectory *bool) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "MSCONCAT"), - } - if deleteSourceDirectory != nil { - queryParameters["deleteSourceDirectory"] = autorest.Encode("query", *deleteSourceDirectory) - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/octet-stream"), - autorest.AsPost(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithFile(streamContents), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// MsConcatSender sends the MsConcat request. The method will close the -// http.Response Body if it receives an error. -func (client Client) MsConcatSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// MsConcatResponder handles the response to the MsConcat request. The method always -// closes the http.Response Body. -func (client Client) MsConcatResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Open opens and reads from the specified file. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file to open. -// length - the number of bytes that the server will attempt to retrieve. It will retrieve <= length bytes. -// offset - the byte offset to start reading data from. -// fileSessionID - optional unique GUID per file indicating all the reads with the same fileSessionId are from -// the same client and same session. This will give a performance benefit. -func (client Client) Open(ctx context.Context, accountName string, pathParameter string, length *int64, offset *int64, fileSessionID *uuid.UUID) (result ReadCloser, err error) { - req, err := client.OpenPreparer(ctx, accountName, pathParameter, length, offset, fileSessionID) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Open", nil, "Failure preparing request") - return - } - - resp, err := client.OpenSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "Open", resp, "Failure sending request") - return - } - - result, err = client.OpenResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Open", resp, "Failure responding to request") - } - - return -} - -// OpenPreparer prepares the Open request. -func (client Client) OpenPreparer(ctx context.Context, accountName string, pathParameter string, length *int64, offset *int64, fileSessionID *uuid.UUID) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "OPEN"), - "read": autorest.Encode("query", "true"), - } - if length != nil { - queryParameters["length"] = autorest.Encode("query", *length) - } - if offset != nil { - queryParameters["offset"] = autorest.Encode("query", *offset) - } - if fileSessionID != nil { - queryParameters["fileSessionId"] = autorest.Encode("query", *fileSessionID) - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// OpenSender sends the Open request. The method will close the -// http.Response Body if it receives an error. -func (client Client) OpenSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// OpenResponder handles the response to the Open request. The method always -// closes the http.Response Body. -func (client Client) OpenResponder(resp *http.Response) (result ReadCloser, err error) { - result.Value = &resp.Body - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) - result.Response = autorest.Response{Response: resp} - return -} - -// RemoveACL removes the existing Access Control List (ACL) of the specified file or directory. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file or directory with the ACL being -// removed. -func (client Client) RemoveACL(ctx context.Context, accountName string, pathParameter string) (result autorest.Response, err error) { - req, err := client.RemoveACLPreparer(ctx, accountName, pathParameter) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACL", nil, "Failure preparing request") - return - } - - resp, err := client.RemoveACLSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACL", resp, "Failure sending request") - return - } - - result, err = client.RemoveACLResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACL", resp, "Failure responding to request") - } - - return -} - -// RemoveACLPreparer prepares the RemoveACL request. -func (client Client) RemoveACLPreparer(ctx context.Context, accountName string, pathParameter string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "REMOVEACL"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// RemoveACLSender sends the RemoveACL request. The method will close the -// http.Response Body if it receives an error. -func (client Client) RemoveACLSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// RemoveACLResponder handles the response to the RemoveACL request. The method always -// closes the http.Response Body. -func (client Client) RemoveACLResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// RemoveACLEntries removes existing Access Control List (ACL) entries for a file or folder. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file or directory with the ACL being -// removed. -// aclspec - the ACL spec included in ACL removal operations in the format '[default:]user|group|other' -func (client Client) RemoveACLEntries(ctx context.Context, accountName string, pathParameter string, aclspec string) (result autorest.Response, err error) { - req, err := client.RemoveACLEntriesPreparer(ctx, accountName, pathParameter, aclspec) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACLEntries", nil, "Failure preparing request") - return - } - - resp, err := client.RemoveACLEntriesSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACLEntries", resp, "Failure sending request") - return - } - - result, err = client.RemoveACLEntriesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveACLEntries", resp, "Failure responding to request") - } - - return -} - -// RemoveACLEntriesPreparer prepares the RemoveACLEntries request. -func (client Client) RemoveACLEntriesPreparer(ctx context.Context, accountName string, pathParameter string, aclspec string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "aclspec": autorest.Encode("query", aclspec), - "api-version": APIVersion, - "op": autorest.Encode("query", "REMOVEACLENTRIES"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// RemoveACLEntriesSender sends the RemoveACLEntries request. The method will close the -// http.Response Body if it receives an error. -func (client Client) RemoveACLEntriesSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// RemoveACLEntriesResponder handles the response to the RemoveACLEntries request. The method always -// closes the http.Response Body. -func (client Client) RemoveACLEntriesResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// RemoveDefaultACL removes the existing Default Access Control List (ACL) of the specified directory. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the directory with the default ACL being -// removed. -func (client Client) RemoveDefaultACL(ctx context.Context, accountName string, pathParameter string) (result autorest.Response, err error) { - req, err := client.RemoveDefaultACLPreparer(ctx, accountName, pathParameter) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveDefaultACL", nil, "Failure preparing request") - return - } - - resp, err := client.RemoveDefaultACLSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveDefaultACL", resp, "Failure sending request") - return - } - - result, err = client.RemoveDefaultACLResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "RemoveDefaultACL", resp, "Failure responding to request") - } - - return -} - -// RemoveDefaultACLPreparer prepares the RemoveDefaultACL request. -func (client Client) RemoveDefaultACLPreparer(ctx context.Context, accountName string, pathParameter string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "REMOVEDEFAULTACL"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// RemoveDefaultACLSender sends the RemoveDefaultACL request. The method will close the -// http.Response Body if it receives an error. -func (client Client) RemoveDefaultACLSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// RemoveDefaultACLResponder handles the response to the RemoveDefaultACL request. The method always -// closes the http.Response Body. -func (client Client) RemoveDefaultACLResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Rename rename a file or directory. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file or directory to move/rename. -// destination - the path to move/rename the file or folder to -func (client Client) Rename(ctx context.Context, accountName string, pathParameter string, destination string) (result FileOperationResult, err error) { - req, err := client.RenamePreparer(ctx, accountName, pathParameter, destination) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Rename", nil, "Failure preparing request") - return - } - - resp, err := client.RenameSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "filesystem.Client", "Rename", resp, "Failure sending request") - return - } - - result, err = client.RenameResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "Rename", resp, "Failure responding to request") - } - - return -} - -// RenamePreparer prepares the Rename request. -func (client Client) RenamePreparer(ctx context.Context, accountName string, pathParameter string, destination string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "destination": autorest.Encode("query", destination), - "op": autorest.Encode("query", "RENAME"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// RenameSender sends the Rename request. The method will close the -// http.Response Body if it receives an error. -func (client Client) RenameSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// RenameResponder handles the response to the Rename request. The method always -// closes the http.Response Body. -func (client Client) RenameResponder(resp *http.Response) (result FileOperationResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// SetACL sets the Access Control List (ACL) for a file or folder. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file or directory on which to set the -// ACL. -// aclspec - the ACL spec included in ACL creation operations in the format -// '[default:]user|group|other::r|-w|-x|-' -func (client Client) SetACL(ctx context.Context, accountName string, pathParameter string, aclspec string) (result autorest.Response, err error) { - req, err := client.SetACLPreparer(ctx, accountName, pathParameter, aclspec) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetACL", nil, "Failure preparing request") - return - } - - resp, err := client.SetACLSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetACL", resp, "Failure sending request") - return - } - - result, err = client.SetACLResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetACL", resp, "Failure responding to request") - } - - return -} - -// SetACLPreparer prepares the SetACL request. -func (client Client) SetACLPreparer(ctx context.Context, accountName string, pathParameter string, aclspec string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "aclspec": autorest.Encode("query", aclspec), - "api-version": APIVersion, - "op": autorest.Encode("query", "SETACL"), - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// SetACLSender sends the SetACL request. The method will close the -// http.Response Body if it receives an error. -func (client Client) SetACLSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// SetACLResponder handles the response to the SetACL request. The method always -// closes the http.Response Body. -func (client Client) SetACLResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// SetFileExpiry sets or removes the expiration time on the specified file. This operation can only be executed against -// files. Folders are not supported. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file on which to set or remove the -// expiration time. -// expiryOption - indicates the type of expiration to use for the file: 1. NeverExpire: ExpireTime is ignored. -// 2. RelativeToNow: ExpireTime is an integer in milliseconds representing the expiration date relative to when -// file expiration is updated. 3. RelativeToCreationDate: ExpireTime is an integer in milliseconds representing -// the expiration date relative to file creation. 4. Absolute: ExpireTime is an integer in milliseconds, as a -// Unix timestamp relative to 1/1/1970 00:00:00. -// expireTime - the time that the file will expire, corresponding to the ExpiryOption that was set. -func (client Client) SetFileExpiry(ctx context.Context, accountName string, pathParameter string, expiryOption ExpiryOptionType, expireTime *int64) (result autorest.Response, err error) { - req, err := client.SetFileExpiryPreparer(ctx, accountName, pathParameter, expiryOption, expireTime) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetFileExpiry", nil, "Failure preparing request") - return - } - - resp, err := client.SetFileExpirySender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetFileExpiry", resp, "Failure sending request") - return - } - - result, err = client.SetFileExpiryResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetFileExpiry", resp, "Failure responding to request") - } - - return -} - -// SetFileExpiryPreparer prepares the SetFileExpiry request. -func (client Client) SetFileExpiryPreparer(ctx context.Context, accountName string, pathParameter string, expiryOption ExpiryOptionType, expireTime *int64) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "expiryOption": autorest.Encode("query", expiryOption), - "op": autorest.Encode("query", "SETEXPIRY"), - } - if expireTime != nil { - queryParameters["expireTime"] = autorest.Encode("query", *expireTime) - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/WebHdfsExt/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// SetFileExpirySender sends the SetFileExpiry request. The method will close the -// http.Response Body if it receives an error. -func (client Client) SetFileExpirySender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// SetFileExpiryResponder handles the response to the SetFileExpiry request. The method always -// closes the http.Response Body. -func (client Client) SetFileExpiryResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// SetOwner sets the owner of a file or directory. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file or directory for which to set the -// owner. -// owner - the AAD Object ID of the user owner of the file or directory. If empty, the property will remain -// unchanged. -// group - the AAD Object ID of the group owner of the file or directory. If empty, the property will remain -// unchanged. -func (client Client) SetOwner(ctx context.Context, accountName string, pathParameter string, owner string, group string) (result autorest.Response, err error) { - req, err := client.SetOwnerPreparer(ctx, accountName, pathParameter, owner, group) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetOwner", nil, "Failure preparing request") - return - } - - resp, err := client.SetOwnerSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetOwner", resp, "Failure sending request") - return - } - - result, err = client.SetOwnerResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetOwner", resp, "Failure responding to request") - } - - return -} - -// SetOwnerPreparer prepares the SetOwner request. -func (client Client) SetOwnerPreparer(ctx context.Context, accountName string, pathParameter string, owner string, group string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "SETOWNER"), - } - if len(owner) > 0 { - queryParameters["owner"] = autorest.Encode("query", owner) - } - if len(group) > 0 { - queryParameters["group"] = autorest.Encode("query", group) - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// SetOwnerSender sends the SetOwner request. The method will close the -// http.Response Body if it receives an error. -func (client Client) SetOwnerSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// SetOwnerResponder handles the response to the SetOwner request. The method always -// closes the http.Response Body. -func (client Client) SetOwnerResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// SetPermission sets the permission of the file or folder. -// Parameters: -// accountName - the Azure Data Lake Store account to execute filesystem operations on. -// pathParameter - the Data Lake Store path (starting with '/') of the file or directory for which to set the -// permission. -// permission - a string representation of the permission (i.e 'rwx'). If empty, this property remains -// unchanged. -func (client Client) SetPermission(ctx context.Context, accountName string, pathParameter string, permission string) (result autorest.Response, err error) { - req, err := client.SetPermissionPreparer(ctx, accountName, pathParameter, permission) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetPermission", nil, "Failure preparing request") - return - } - - resp, err := client.SetPermissionSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetPermission", resp, "Failure sending request") - return - } - - result, err = client.SetPermissionResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "filesystem.Client", "SetPermission", resp, "Failure responding to request") - } - - return -} - -// SetPermissionPreparer prepares the SetPermission request. -func (client Client) SetPermissionPreparer(ctx context.Context, accountName string, pathParameter string, permission string) (*http.Request, error) { - urlParameters := map[string]interface{}{ - "accountName": accountName, - "adlsFileSystemDnsSuffix": client.AdlsFileSystemDNSSuffix, - } - - pathParameters := map[string]interface{}{ - "path": autorest.Encode("path", pathParameter), - } - - const APIVersion = "2016-11-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - "op": autorest.Encode("query", "SETPERMISSION"), - } - if len(permission) > 0 { - queryParameters["permission"] = autorest.Encode("query", permission) - } - - preparer := autorest.CreatePreparer( - autorest.AsPut(), - autorest.WithCustomBaseURL("https://{accountName}.{adlsFileSystemDnsSuffix}", urlParameters), - autorest.WithPathParameters("/webhdfs/v1/{path}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// SetPermissionSender sends the SetPermission request. The method will close the -// http.Response Body if it receives an error. -func (client Client) SetPermissionSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) -} - -// SetPermissionResponder handles the response to the SetPermission request. The method always -// closes the http.Response Body. -func (client Client) SetPermissionResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/models.go deleted file mode 100644 index c38c70b92e8e..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/models.go +++ /dev/null @@ -1,1295 +0,0 @@ -package filesystem - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "encoding/json" - "github.com/Azure/go-autorest/autorest" - "io" -) - -// AppendModeType enumerates the values for append mode type. -type AppendModeType string - -const ( - // Autocreate ... - Autocreate AppendModeType = "autocreate" -) - -// PossibleAppendModeTypeValues returns an array of possible values for the AppendModeType const type. -func PossibleAppendModeTypeValues() []AppendModeType { - return []AppendModeType{Autocreate} -} - -// Exception enumerates the values for exception. -type Exception string - -const ( - // ExceptionAccessControlException ... - ExceptionAccessControlException Exception = "AccessControlException" - // ExceptionAdlsRemoteException ... - ExceptionAdlsRemoteException Exception = "AdlsRemoteException" - // ExceptionBadOffsetException ... - ExceptionBadOffsetException Exception = "BadOffsetException" - // ExceptionFileAlreadyExistsException ... - ExceptionFileAlreadyExistsException Exception = "FileAlreadyExistsException" - // ExceptionFileNotFoundException ... - ExceptionFileNotFoundException Exception = "FileNotFoundException" - // ExceptionIllegalArgumentException ... - ExceptionIllegalArgumentException Exception = "IllegalArgumentException" - // ExceptionIOException ... - ExceptionIOException Exception = "IOException" - // ExceptionRuntimeException ... - ExceptionRuntimeException Exception = "RuntimeException" - // ExceptionSecurityException ... - ExceptionSecurityException Exception = "SecurityException" - // ExceptionThrottledException ... - ExceptionThrottledException Exception = "ThrottledException" - // ExceptionUnsupportedOperationException ... - ExceptionUnsupportedOperationException Exception = "UnsupportedOperationException" -) - -// PossibleExceptionValues returns an array of possible values for the Exception const type. -func PossibleExceptionValues() []Exception { - return []Exception{ExceptionAccessControlException, ExceptionAdlsRemoteException, ExceptionBadOffsetException, ExceptionFileAlreadyExistsException, ExceptionFileNotFoundException, ExceptionIllegalArgumentException, ExceptionIOException, ExceptionRuntimeException, ExceptionSecurityException, ExceptionThrottledException, ExceptionUnsupportedOperationException} -} - -// ExpiryOptionType enumerates the values for expiry option type. -type ExpiryOptionType string - -const ( - // Absolute ... - Absolute ExpiryOptionType = "Absolute" - // NeverExpire ... - NeverExpire ExpiryOptionType = "NeverExpire" - // RelativeToCreationDate ... - RelativeToCreationDate ExpiryOptionType = "RelativeToCreationDate" - // RelativeToNow ... - RelativeToNow ExpiryOptionType = "RelativeToNow" -) - -// PossibleExpiryOptionTypeValues returns an array of possible values for the ExpiryOptionType const type. -func PossibleExpiryOptionTypeValues() []ExpiryOptionType { - return []ExpiryOptionType{Absolute, NeverExpire, RelativeToCreationDate, RelativeToNow} -} - -// FileType enumerates the values for file type. -type FileType string - -const ( - // DIRECTORY ... - DIRECTORY FileType = "DIRECTORY" - // FILE ... - FILE FileType = "FILE" -) - -// PossibleFileTypeValues returns an array of possible values for the FileType const type. -func PossibleFileTypeValues() []FileType { - return []FileType{DIRECTORY, FILE} -} - -// SyncFlag enumerates the values for sync flag. -type SyncFlag string - -const ( - // CLOSE ... - CLOSE SyncFlag = "CLOSE" - // DATA ... - DATA SyncFlag = "DATA" - // METADATA ... - METADATA SyncFlag = "METADATA" -) - -// PossibleSyncFlagValues returns an array of possible values for the SyncFlag const type. -func PossibleSyncFlagValues() []SyncFlag { - return []SyncFlag{CLOSE, DATA, METADATA} -} - -// ACLStatus data Lake Store file or directory Access Control List information. -type ACLStatus struct { - // Entries - the list of ACLSpec entries on a file or directory. - Entries *[]string `json:"entries,omitempty"` - // Group - the group owner, an AAD Object ID. - Group *string `json:"group,omitempty"` - // Owner - the user owner, an AAD Object ID. - Owner *string `json:"owner,omitempty"` - // Permission - The octal representation of the unnamed user, mask and other permissions. - Permission *string `json:"permission,omitempty"` - // StickyBit - the indicator of whether the sticky bit is on or off. - StickyBit *bool `json:"stickyBit,omitempty"` -} - -// ACLStatusResult data Lake Store file or directory Access Control List information. -type ACLStatusResult struct { - autorest.Response `json:"-"` - // ACLStatus - the AclStatus object for a given file or directory. - ACLStatus *ACLStatus `json:"aclStatus,omitempty"` -} - -// AdlsAccessControlException a WebHDFS exception thrown indicating that access is denied due to insufficient -// permissions. Thrown when a 403 error response code is returned (forbidden). -type AdlsAccessControlException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' - Exception Exception `json:"exception,omitempty"` -} - -// MarshalJSON is the custom marshaler for AdlsAccessControlException. -func (aace AdlsAccessControlException) MarshalJSON() ([]byte, error) { - aace.Exception = ExceptionAccessControlException - objectMap := make(map[string]interface{}) - if aace.JavaClassName != nil { - objectMap["javaClassName"] = aace.JavaClassName - } - if aace.Message != nil { - objectMap["message"] = aace.Message - } - if aace.Exception != "" { - objectMap["exception"] = aace.Exception - } - return json.Marshal(objectMap) -} - -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return &aace, true -} - -// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { - return nil, false -} - -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsAccessControlException. -func (aace AdlsAccessControlException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &aace, true -} - -// AdlsBadOffsetException a WebHDFS exception thrown indicating the append or read is from a bad offset. Thrown -// when a 400 error response code is returned for append and open operations (Bad request). -type AdlsBadOffsetException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' - Exception Exception `json:"exception,omitempty"` -} - -// MarshalJSON is the custom marshaler for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) MarshalJSON() ([]byte, error) { - aboe.Exception = ExceptionBadOffsetException - objectMap := make(map[string]interface{}) - if aboe.JavaClassName != nil { - objectMap["javaClassName"] = aboe.JavaClassName - } - if aboe.Message != nil { - objectMap["message"] = aboe.Message - } - if aboe.Exception != "" { - objectMap["exception"] = aboe.Exception - } - return json.Marshal(objectMap) -} - -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return &aboe, true -} - -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { - return nil, false -} - -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsBadOffsetException. -func (aboe AdlsBadOffsetException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &aboe, true -} - -// AdlsError data Lake Store filesystem error containing a specific WebHDFS exception. -type AdlsError struct { - // RemoteException - the object representing the actual WebHDFS exception being returned. - RemoteException BasicAdlsRemoteException `json:"remoteException,omitempty"` -} - -// UnmarshalJSON is the custom unmarshaler for AdlsError struct. -func (ae *AdlsError) UnmarshalJSON(body []byte) error { - var m map[string]*json.RawMessage - err := json.Unmarshal(body, &m) - if err != nil { - return err - } - for k, v := range m { - switch k { - case "remoteException": - if v != nil { - remoteException, err := unmarshalBasicAdlsRemoteException(*v) - if err != nil { - return err - } - ae.RemoteException = remoteException - } - } - } - - return nil -} - -// AdlsFileAlreadyExistsException a WebHDFS exception thrown indicating the file or folder already exists. Thrown -// when a 403 error response code is returned (forbidden). -type AdlsFileAlreadyExistsException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' - Exception Exception `json:"exception,omitempty"` -} - -// MarshalJSON is the custom marshaler for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) MarshalJSON() ([]byte, error) { - afaee.Exception = ExceptionFileAlreadyExistsException - objectMap := make(map[string]interface{}) - if afaee.JavaClassName != nil { - objectMap["javaClassName"] = afaee.JavaClassName - } - if afaee.Message != nil { - objectMap["message"] = afaee.Message - } - if afaee.Exception != "" { - objectMap["exception"] = afaee.Exception - } - return json.Marshal(objectMap) -} - -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return &afaee, true -} - -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { - return nil, false -} - -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileAlreadyExistsException. -func (afaee AdlsFileAlreadyExistsException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &afaee, true -} - -// AdlsFileNotFoundException a WebHDFS exception thrown indicating the file or folder could not be found. Thrown -// when a 404 error response code is returned (not found). -type AdlsFileNotFoundException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' - Exception Exception `json:"exception,omitempty"` -} - -// MarshalJSON is the custom marshaler for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) MarshalJSON() ([]byte, error) { - afnfe.Exception = ExceptionFileNotFoundException - objectMap := make(map[string]interface{}) - if afnfe.JavaClassName != nil { - objectMap["javaClassName"] = afnfe.JavaClassName - } - if afnfe.Message != nil { - objectMap["message"] = afnfe.Message - } - if afnfe.Exception != "" { - objectMap["exception"] = afnfe.Exception - } - return json.Marshal(objectMap) -} - -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return &afnfe, true -} - -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { - return nil, false -} - -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsFileNotFoundException. -func (afnfe AdlsFileNotFoundException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &afnfe, true -} - -// AdlsIllegalArgumentException a WebHDFS exception thrown indicating that one more arguments is incorrect. Thrown -// when a 400 error response code is returned (bad request). -type AdlsIllegalArgumentException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' - Exception Exception `json:"exception,omitempty"` -} - -// MarshalJSON is the custom marshaler for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) MarshalJSON() ([]byte, error) { - aiae.Exception = ExceptionIllegalArgumentException - objectMap := make(map[string]interface{}) - if aiae.JavaClassName != nil { - objectMap["javaClassName"] = aiae.JavaClassName - } - if aiae.Message != nil { - objectMap["message"] = aiae.Message - } - if aiae.Exception != "" { - objectMap["exception"] = aiae.Exception - } - return json.Marshal(objectMap) -} - -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return &aiae, true -} - -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { - return nil, false -} - -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIllegalArgumentException. -func (aiae AdlsIllegalArgumentException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &aiae, true -} - -// AdlsIOException a WebHDFS exception thrown indicating there was an IO (read or write) error. Thrown when a 403 -// error response code is returned (forbidden). -type AdlsIOException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' - Exception Exception `json:"exception,omitempty"` -} - -// MarshalJSON is the custom marshaler for AdlsIOException. -func (aie AdlsIOException) MarshalJSON() ([]byte, error) { - aie.Exception = ExceptionIOException - objectMap := make(map[string]interface{}) - if aie.JavaClassName != nil { - objectMap["javaClassName"] = aie.JavaClassName - } - if aie.Message != nil { - objectMap["message"] = aie.Message - } - if aie.Exception != "" { - objectMap["exception"] = aie.Exception - } - return json.Marshal(objectMap) -} - -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsIOException() (*AdlsIOException, bool) { - return &aie, true -} - -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { - return nil, false -} - -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsIOException. -func (aie AdlsIOException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &aie, true -} - -// BasicAdlsRemoteException data Lake Store filesystem exception based on the WebHDFS definition for RemoteExceptions. -// This is a WebHDFS 'catch all' exception -type BasicAdlsRemoteException interface { - AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) - AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) - AsAdlsSecurityException() (*AdlsSecurityException, bool) - AsAdlsIOException() (*AdlsIOException, bool) - AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) - AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) - AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) - AsAdlsRuntimeException() (*AdlsRuntimeException, bool) - AsAdlsAccessControlException() (*AdlsAccessControlException, bool) - AsAdlsThrottledException() (*AdlsThrottledException, bool) - AsAdlsRemoteException() (*AdlsRemoteException, bool) -} - -// AdlsRemoteException data Lake Store filesystem exception based on the WebHDFS definition for RemoteExceptions. -// This is a WebHDFS 'catch all' exception -type AdlsRemoteException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' - Exception Exception `json:"exception,omitempty"` -} - -func unmarshalBasicAdlsRemoteException(body []byte) (BasicAdlsRemoteException, error) { - var m map[string]interface{} - err := json.Unmarshal(body, &m) - if err != nil { - return nil, err - } - - switch m["exception"] { - case string(ExceptionIllegalArgumentException): - var aiae AdlsIllegalArgumentException - err := json.Unmarshal(body, &aiae) - return aiae, err - case string(ExceptionUnsupportedOperationException): - var auoe AdlsUnsupportedOperationException - err := json.Unmarshal(body, &auoe) - return auoe, err - case string(ExceptionSecurityException): - var ase AdlsSecurityException - err := json.Unmarshal(body, &ase) - return ase, err - case string(ExceptionIOException): - var aie AdlsIOException - err := json.Unmarshal(body, &aie) - return aie, err - case string(ExceptionFileNotFoundException): - var afnfe AdlsFileNotFoundException - err := json.Unmarshal(body, &afnfe) - return afnfe, err - case string(ExceptionFileAlreadyExistsException): - var afaee AdlsFileAlreadyExistsException - err := json.Unmarshal(body, &afaee) - return afaee, err - case string(ExceptionBadOffsetException): - var aboe AdlsBadOffsetException - err := json.Unmarshal(body, &aboe) - return aboe, err - case string(ExceptionRuntimeException): - var are AdlsRuntimeException - err := json.Unmarshal(body, &are) - return are, err - case string(ExceptionAccessControlException): - var aace AdlsAccessControlException - err := json.Unmarshal(body, &aace) - return aace, err - case string(ExceptionThrottledException): - var ate AdlsThrottledException - err := json.Unmarshal(body, &ate) - return ate, err - default: - var are AdlsRemoteException - err := json.Unmarshal(body, &are) - return are, err - } -} -func unmarshalBasicAdlsRemoteExceptionArray(body []byte) ([]BasicAdlsRemoteException, error) { - var rawMessages []*json.RawMessage - err := json.Unmarshal(body, &rawMessages) - if err != nil { - return nil, err - } - - areArray := make([]BasicAdlsRemoteException, len(rawMessages)) - - for index, rawMessage := range rawMessages { - are, err := unmarshalBasicAdlsRemoteException(*rawMessage) - if err != nil { - return nil, err - } - areArray[index] = are - } - return areArray, nil -} - -// MarshalJSON is the custom marshaler for AdlsRemoteException. -func (are AdlsRemoteException) MarshalJSON() ([]byte, error) { - are.Exception = ExceptionAdlsRemoteException - objectMap := make(map[string]interface{}) - if are.JavaClassName != nil { - objectMap["javaClassName"] = are.JavaClassName - } - if are.Message != nil { - objectMap["message"] = are.Message - } - if are.Exception != "" { - objectMap["exception"] = are.Exception - } - return json.Marshal(objectMap) -} - -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { - return nil, false -} - -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return &are, true -} - -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRemoteException. -func (are AdlsRemoteException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &are, true -} - -// AdlsRuntimeException a WebHDFS exception thrown when an unexpected error occurs during an operation. Thrown when -// a 500 error response code is returned (Internal server error). -type AdlsRuntimeException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' - Exception Exception `json:"exception,omitempty"` -} - -// MarshalJSON is the custom marshaler for AdlsRuntimeException. -func (are AdlsRuntimeException) MarshalJSON() ([]byte, error) { - are.Exception = ExceptionRuntimeException - objectMap := make(map[string]interface{}) - if are.JavaClassName != nil { - objectMap["javaClassName"] = are.JavaClassName - } - if are.Message != nil { - objectMap["message"] = are.Message - } - if are.Exception != "" { - objectMap["exception"] = are.Exception - } - return json.Marshal(objectMap) -} - -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return &are, true -} - -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { - return nil, false -} - -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsRuntimeException. -func (are AdlsRuntimeException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &are, true -} - -// AdlsSecurityException a WebHDFS exception thrown indicating that access is denied. Thrown when a 401 error -// response code is returned (Unauthorized). -type AdlsSecurityException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' - Exception Exception `json:"exception,omitempty"` -} - -// MarshalJSON is the custom marshaler for AdlsSecurityException. -func (ase AdlsSecurityException) MarshalJSON() ([]byte, error) { - ase.Exception = ExceptionSecurityException - objectMap := make(map[string]interface{}) - if ase.JavaClassName != nil { - objectMap["javaClassName"] = ase.JavaClassName - } - if ase.Message != nil { - objectMap["message"] = ase.Message - } - if ase.Exception != "" { - objectMap["exception"] = ase.Exception - } - return json.Marshal(objectMap) -} - -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return &ase, true -} - -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { - return nil, false -} - -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsSecurityException. -func (ase AdlsSecurityException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &ase, true -} - -// AdlsThrottledException a WebHDFS exception thrown indicating that the request is being throttled. Reducing the -// number of requests or request size helps to mitigate this error. -type AdlsThrottledException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' - Exception Exception `json:"exception,omitempty"` -} - -// MarshalJSON is the custom marshaler for AdlsThrottledException. -func (ate AdlsThrottledException) MarshalJSON() ([]byte, error) { - ate.Exception = ExceptionThrottledException - objectMap := make(map[string]interface{}) - if ate.JavaClassName != nil { - objectMap["javaClassName"] = ate.JavaClassName - } - if ate.Message != nil { - objectMap["message"] = ate.Message - } - if ate.Exception != "" { - objectMap["exception"] = ate.Exception - } - return json.Marshal(objectMap) -} - -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsThrottledException. -func (ate AdlsThrottledException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsThrottledException. -func (ate AdlsThrottledException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return nil, false -} - -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsThrottledException. -func (ate AdlsThrottledException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsThrottledException. -func (ate AdlsThrottledException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsThrottledException. -func (ate AdlsThrottledException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsThrottledException. -func (ate AdlsThrottledException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsThrottledException. -func (ate AdlsThrottledException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsThrottledException. -func (ate AdlsThrottledException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsThrottledException. -func (ate AdlsThrottledException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsThrottledException. -func (ate AdlsThrottledException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { - return &ate, true -} - -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsThrottledException. -func (ate AdlsThrottledException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsThrottledException. -func (ate AdlsThrottledException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &ate, true -} - -// AdlsUnsupportedOperationException a WebHDFS exception thrown indicating that the requested operation is not -// supported. Thrown when a 400 error response code is returned (bad request). -type AdlsUnsupportedOperationException struct { - // JavaClassName - the full class package name for the exception thrown, such as 'java.lang.IllegalArgumentException'. - JavaClassName *string `json:"javaClassName,omitempty"` - // Message - the message associated with the exception that was thrown, such as 'Invalid value for webhdfs parameter "permission":...'. - Message *string `json:"message,omitempty"` - // Exception - Possible values include: 'ExceptionAdlsRemoteException', 'ExceptionIllegalArgumentException', 'ExceptionUnsupportedOperationException', 'ExceptionSecurityException', 'ExceptionIOException', 'ExceptionFileNotFoundException', 'ExceptionFileAlreadyExistsException', 'ExceptionBadOffsetException', 'ExceptionRuntimeException', 'ExceptionAccessControlException', 'ExceptionThrottledException' - Exception Exception `json:"exception,omitempty"` -} - -// MarshalJSON is the custom marshaler for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) MarshalJSON() ([]byte, error) { - auoe.Exception = ExceptionUnsupportedOperationException - objectMap := make(map[string]interface{}) - if auoe.JavaClassName != nil { - objectMap["javaClassName"] = auoe.JavaClassName - } - if auoe.Message != nil { - objectMap["message"] = auoe.Message - } - if auoe.Exception != "" { - objectMap["exception"] = auoe.Exception - } - return json.Marshal(objectMap) -} - -// AsAdlsIllegalArgumentException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsIllegalArgumentException() (*AdlsIllegalArgumentException, bool) { - return nil, false -} - -// AsAdlsUnsupportedOperationException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsUnsupportedOperationException() (*AdlsUnsupportedOperationException, bool) { - return &auoe, true -} - -// AsAdlsSecurityException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsSecurityException() (*AdlsSecurityException, bool) { - return nil, false -} - -// AsAdlsIOException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsIOException() (*AdlsIOException, bool) { - return nil, false -} - -// AsAdlsFileNotFoundException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsFileNotFoundException() (*AdlsFileNotFoundException, bool) { - return nil, false -} - -// AsAdlsFileAlreadyExistsException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsFileAlreadyExistsException() (*AdlsFileAlreadyExistsException, bool) { - return nil, false -} - -// AsAdlsBadOffsetException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsBadOffsetException() (*AdlsBadOffsetException, bool) { - return nil, false -} - -// AsAdlsRuntimeException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsRuntimeException() (*AdlsRuntimeException, bool) { - return nil, false -} - -// AsAdlsAccessControlException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsAccessControlException() (*AdlsAccessControlException, bool) { - return nil, false -} - -// AsAdlsThrottledException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsThrottledException() (*AdlsThrottledException, bool) { - return nil, false -} - -// AsAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsAdlsRemoteException() (*AdlsRemoteException, bool) { - return nil, false -} - -// AsBasicAdlsRemoteException is the BasicAdlsRemoteException implementation for AdlsUnsupportedOperationException. -func (auoe AdlsUnsupportedOperationException) AsBasicAdlsRemoteException() (BasicAdlsRemoteException, bool) { - return &auoe, true -} - -// ContentSummary data Lake Store content summary information -type ContentSummary struct { - // DirectoryCount - the number of directories. - DirectoryCount *int64 `json:"directoryCount,omitempty"` - // FileCount - the number of files. - FileCount *int64 `json:"fileCount,omitempty"` - // Length - the number of bytes used by the content. - Length *int64 `json:"length,omitempty"` - // SpaceConsumed - the disk space consumed by the content. - SpaceConsumed *int64 `json:"spaceConsumed,omitempty"` -} - -// ContentSummaryResult data Lake Store filesystem content summary information response. -type ContentSummaryResult struct { - autorest.Response `json:"-"` - // ContentSummary - the content summary for the specified path - ContentSummary *ContentSummary `json:"contentSummary,omitempty"` -} - -// FileOperationResult the result of the request or operation. -type FileOperationResult struct { - autorest.Response `json:"-"` - // OperationResult - the result of the operation or request. - OperationResult *bool `json:"boolean,omitempty"` -} - -// FileStatuses data Lake Store file status list information. -type FileStatuses struct { - // FileStatus - the object containing the list of properties of the files. - FileStatus *[]FileStatusProperties `json:"fileStatus,omitempty"` -} - -// FileStatusesResult data Lake Store filesystem file status list information response. -type FileStatusesResult struct { - autorest.Response `json:"-"` - // FileStatuses - the object representing the list of file statuses. - FileStatuses *FileStatuses `json:"fileStatuses,omitempty"` -} - -// FileStatusProperties data Lake Store file or directory information. -type FileStatusProperties struct { - // AccessTime - the last access time as ticks since the epoch. - AccessTime *int64 `json:"accessTime,omitempty"` - // BlockSize - the block size for the file. - BlockSize *int64 `json:"blockSize,omitempty"` - // ExpirationTime - Gets the expiration time, if any, as ticks since the epoch. If the value is 0 or DateTime.MaxValue there is no expiration. - ExpirationTime *int64 `json:"msExpirationTime,omitempty"` - // Group - the group owner. - Group *string `json:"group,omitempty"` - // Length - the number of bytes in a file. - Length *int64 `json:"length,omitempty"` - // ModificationTime - the modification time as ticks since the epoch. - ModificationTime *int64 `json:"modificationTime,omitempty"` - // Owner - the user who is the owner. - Owner *string `json:"owner,omitempty"` - // PathSuffix - the path suffix. - PathSuffix *string `json:"pathSuffix,omitempty"` - // Permission - the permission represented as an string. - Permission *string `json:"permission,omitempty"` - // Type - the type of the path object. Possible values include: 'FILE', 'DIRECTORY' - Type FileType `json:"type,omitempty"` - // ACLBit - flag to indicate if extended acls are enabled - ACLBit *bool `json:"aclBit,omitempty"` -} - -// FileStatusResult data Lake Store filesystem file status information response. -type FileStatusResult struct { - autorest.Response `json:"-"` - // FileStatus - the file status object associated with the specified path. - FileStatus *FileStatusProperties `json:"fileStatus,omitempty"` -} - -// ReadCloser ... -type ReadCloser struct { - autorest.Response `json:"-"` - Value *io.ReadCloser `json:"value,omitempty"` -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/version.go deleted file mode 100644 index 6b47571b9de6..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem/version.go +++ /dev/null @@ -1,30 +0,0 @@ -package filesystem - -import "github.com/Azure/azure-sdk-for-go/version" - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -// UserAgent returns the UserAgent string to use when sending http.Requests. -func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " filesystem/2016-11-01" -} - -// Version returns the semantic version (see http://semver.org) of the client. -func Version() string { - return version.Number -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/account.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/account.go deleted file mode 100644 index 036986ff17d9..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/account.go +++ /dev/null @@ -1,1002 +0,0 @@ -package account - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "context" - "github.com/Azure/go-autorest/autorest" - "github.com/Azure/go-autorest/autorest/azure" - "net/http" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Client is the dataLake Store Client -type Client struct { - BaseClient -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// NewClient creates an instance of the Client client. -func NewClient(subscriptionID string) Client { - return NewClientWithBaseURI(DefaultBaseURI, subscriptionID) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// NewClientWithBaseURI creates an instance of the Client client. -func NewClientWithBaseURI(baseURI string, subscriptionID string) Client { - return Client{NewWithBaseURI(baseURI, subscriptionID)} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Create creates the specified Data Lake Store account. -// -// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. name is the -// name of the Data Lake Store account to create. parameters is parameters supplied to create the Data Lake Store -// account. -func (client Client) Create(ctx context.Context, resourceGroupName string, name string, parameters DataLakeStoreAccount) (result CreateFuture, err error) { - req, err := client.CreatePreparer(ctx, resourceGroupName, name, parameters) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "Create", nil, "Failure preparing request") - return - } - - result, err = client.CreateSender(req) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "Create", result.Response(), "Failure sending request") - return - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// CreatePreparer prepares the Create request. -func (client Client) CreatePreparer(ctx context.Context, resourceGroupName string, name string, parameters DataLakeStoreAccount) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/json; charset=utf-8"), - autorest.AsPut(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{name}", pathParameters), - autorest.WithJSON(parameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// CreateSender sends the Create request. The method will close the -// http.Response Body if it receives an error. -func (client Client) CreateSender(req *http.Request) (future CreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) - if err != nil { - return - } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// CreateResponder handles the response to the Create request. The method always -// closes the http.Response Body. -func (client Client) CreateResponder(resp *http.Response) (result DataLakeStoreAccount, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// CreateOrUpdateFirewallRule creates or updates the specified firewall rule. -// -// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName -// is the name of the Data Lake Store account to which to add the firewall rule. name is the name of the firewall -// rule to create or update. parameters is parameters supplied to create the create firewall rule. -func (client Client) CreateOrUpdateFirewallRule(ctx context.Context, resourceGroupName string, accountName string, name string, parameters FirewallRule) (result FirewallRule, err error) { - req, err := client.CreateOrUpdateFirewallRulePreparer(ctx, resourceGroupName, accountName, name, parameters) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "CreateOrUpdateFirewallRule", nil, "Failure preparing request") - return - } - - resp, err := client.CreateOrUpdateFirewallRuleSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "account.Client", "CreateOrUpdateFirewallRule", resp, "Failure sending request") - return - } - - result, err = client.CreateOrUpdateFirewallRuleResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "CreateOrUpdateFirewallRule", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// CreateOrUpdateFirewallRulePreparer prepares the CreateOrUpdateFirewallRule request. -func (client Client) CreateOrUpdateFirewallRulePreparer(ctx context.Context, resourceGroupName string, accountName string, name string, parameters FirewallRule) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "accountName": autorest.Encode("path", accountName), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/json; charset=utf-8"), - autorest.AsPut(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules/{name}", pathParameters), - autorest.WithJSON(parameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// CreateOrUpdateFirewallRuleSender sends the CreateOrUpdateFirewallRule request. The method will close the -// http.Response Body if it receives an error. -func (client Client) CreateOrUpdateFirewallRuleSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// CreateOrUpdateFirewallRuleResponder handles the response to the CreateOrUpdateFirewallRule request. The method always -// closes the http.Response Body. -func (client Client) CreateOrUpdateFirewallRuleResponder(resp *http.Response) (result FirewallRule, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Delete deletes the specified Data Lake Store account. -// -// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName -// is the name of the Data Lake Store account to delete. -func (client Client) Delete(ctx context.Context, resourceGroupName string, accountName string) (result DeleteFuture, err error) { - req, err := client.DeletePreparer(ctx, resourceGroupName, accountName) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "Delete", nil, "Failure preparing request") - return - } - - result, err = client.DeleteSender(req) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "Delete", result.Response(), "Failure sending request") - return - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DeletePreparer prepares the Delete request. -func (client Client) DeletePreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "accountName": autorest.Encode("path", accountName), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsDelete(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DeleteSender sends the Delete request. The method will close the -// http.Response Body if it receives an error. -func (client Client) DeleteSender(req *http.Request) (future DeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) - if err != nil { - return - } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusNotFound)) - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DeleteResponder handles the response to the Delete request. The method always -// closes the http.Response Body. -func (client Client) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusNotFound), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DeleteFirewallRule deletes the specified firewall rule from the specified Data Lake Store account -// -// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName -// is the name of the Data Lake Store account from which to delete the firewall rule. firewallRuleName is the name -// of the firewall rule to delete. -func (client Client) DeleteFirewallRule(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string) (result autorest.Response, err error) { - req, err := client.DeleteFirewallRulePreparer(ctx, resourceGroupName, accountName, firewallRuleName) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "DeleteFirewallRule", nil, "Failure preparing request") - return - } - - resp, err := client.DeleteFirewallRuleSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "account.Client", "DeleteFirewallRule", resp, "Failure sending request") - return - } - - result, err = client.DeleteFirewallRuleResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "DeleteFirewallRule", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DeleteFirewallRulePreparer prepares the DeleteFirewallRule request. -func (client Client) DeleteFirewallRulePreparer(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "accountName": autorest.Encode("path", accountName), - "firewallRuleName": autorest.Encode("path", firewallRuleName), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsDelete(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules/{firewallRuleName}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DeleteFirewallRuleSender sends the DeleteFirewallRule request. The method will close the -// http.Response Body if it receives an error. -func (client Client) DeleteFirewallRuleSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DeleteFirewallRuleResponder handles the response to the DeleteFirewallRule request. The method always -// closes the http.Response Body. -func (client Client) DeleteFirewallRuleResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// EnableKeyVault attempts to enable a user managed key vault for encryption of the specified Data Lake Store account. -// -// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName -// is the name of the Data Lake Store account to attempt to enable the Key Vault for. -func (client Client) EnableKeyVault(ctx context.Context, resourceGroupName string, accountName string) (result autorest.Response, err error) { - req, err := client.EnableKeyVaultPreparer(ctx, resourceGroupName, accountName) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "EnableKeyVault", nil, "Failure preparing request") - return - } - - resp, err := client.EnableKeyVaultSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "account.Client", "EnableKeyVault", resp, "Failure sending request") - return - } - - result, err = client.EnableKeyVaultResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "EnableKeyVault", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// EnableKeyVaultPreparer prepares the EnableKeyVault request. -func (client Client) EnableKeyVaultPreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "accountName": autorest.Encode("path", accountName), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/enableKeyVault", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// EnableKeyVaultSender sends the EnableKeyVault request. The method will close the -// http.Response Body if it receives an error. -func (client Client) EnableKeyVaultSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// EnableKeyVaultResponder handles the response to the EnableKeyVault request. The method always -// closes the http.Response Body. -func (client Client) EnableKeyVaultResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByClosing()) - result.Response = resp - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Get gets the specified Data Lake Store account. -// -// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName -// is the name of the Data Lake Store account to retrieve. -func (client Client) Get(ctx context.Context, resourceGroupName string, accountName string) (result DataLakeStoreAccount, err error) { - req, err := client.GetPreparer(ctx, resourceGroupName, accountName) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "Get", nil, "Failure preparing request") - return - } - - resp, err := client.GetSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "account.Client", "Get", resp, "Failure sending request") - return - } - - result, err = client.GetResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "Get", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// GetPreparer prepares the Get request. -func (client Client) GetPreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "accountName": autorest.Encode("path", accountName), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// GetSender sends the Get request. The method will close the -// http.Response Body if it receives an error. -func (client Client) GetSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// GetResponder handles the response to the Get request. The method always -// closes the http.Response Body. -func (client Client) GetResponder(resp *http.Response) (result DataLakeStoreAccount, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// GetFirewallRule gets the specified Data Lake Store firewall rule. -// -// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName -// is the name of the Data Lake Store account from which to get the firewall rule. firewallRuleName is the name of -// the firewall rule to retrieve. -func (client Client) GetFirewallRule(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string) (result FirewallRule, err error) { - req, err := client.GetFirewallRulePreparer(ctx, resourceGroupName, accountName, firewallRuleName) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "GetFirewallRule", nil, "Failure preparing request") - return - } - - resp, err := client.GetFirewallRuleSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "account.Client", "GetFirewallRule", resp, "Failure sending request") - return - } - - result, err = client.GetFirewallRuleResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "GetFirewallRule", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// GetFirewallRulePreparer prepares the GetFirewallRule request. -func (client Client) GetFirewallRulePreparer(ctx context.Context, resourceGroupName string, accountName string, firewallRuleName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "accountName": autorest.Encode("path", accountName), - "firewallRuleName": autorest.Encode("path", firewallRuleName), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules/{firewallRuleName}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// GetFirewallRuleSender sends the GetFirewallRule request. The method will close the -// http.Response Body if it receives an error. -func (client Client) GetFirewallRuleSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// GetFirewallRuleResponder handles the response to the GetFirewallRule request. The method always -// closes the http.Response Body. -func (client Client) GetFirewallRuleResponder(resp *http.Response) (result FirewallRule, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// List lists the Data Lake Store accounts within the subscription. The response includes a link to the next page of -// results, if any. -// -// filter is oData filter. Optional. top is the number of items to return. Optional. skip is the number of items to -// skip over before returning elements. Optional. expand is oData expansion. Expand related resources in line with -// the retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category -// entry. Optional. selectParameter is oData Select statement. Limits the properties on each entry to just those -// requested, e.g. Categories?$select=CategoryName,Description. Optional. orderby is orderBy clause. One or more -// comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the -// values sorted, e.g. Categories?$orderby=CategoryName desc. Optional. count is the Boolean value of true or false -// to request a count of the matching resources included with the resources in the response, e.g. -// Categories?$count=true. Optional. search is a free form search. A free-text search expression to match for -// whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional. -// formatParameter is the desired return format. Return the response in particular formatxii without access to -// request headers for standard content-type negotiation (e.g Orders?$format=json). Optional. -func (client Client) List(ctx context.Context, filter string, top *int32, skip *int32, expand string, selectParameter string, orderby string, count *bool, search string, formatParameter string) (result DataLakeStoreAccountListResultPage, err error) { - result.fn = client.listNextResults - req, err := client.ListPreparer(ctx, filter, top, skip, expand, selectParameter, orderby, count, search, formatParameter) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "List", nil, "Failure preparing request") - return - } - - resp, err := client.ListSender(req) - if err != nil { - result.dlsalr.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "account.Client", "List", resp, "Failure sending request") - return - } - - result.dlsalr, err = client.ListResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "List", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListPreparer prepares the List request. -func (client Client) ListPreparer(ctx context.Context, filter string, top *int32, skip *int32, expand string, selectParameter string, orderby string, count *bool, search string, formatParameter string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - if len(filter) > 0 { - queryParameters["$filter"] = autorest.Encode("query", filter) - } - if top != nil { - queryParameters["$top"] = autorest.Encode("query", *top) - } - if skip != nil { - queryParameters["$skip"] = autorest.Encode("query", *skip) - } - if len(expand) > 0 { - queryParameters["$expand"] = autorest.Encode("query", expand) - } - if len(selectParameter) > 0 { - queryParameters["$select"] = autorest.Encode("query", selectParameter) - } - if len(orderby) > 0 { - queryParameters["$orderby"] = autorest.Encode("query", orderby) - } - if count != nil { - queryParameters["$count"] = autorest.Encode("query", *count) - } - if len(search) > 0 { - queryParameters["$search"] = autorest.Encode("query", search) - } - if len(formatParameter) > 0 { - queryParameters["$format"] = autorest.Encode("query", formatParameter) - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.DataLakeStore/accounts", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListSender sends the List request. The method will close the -// http.Response Body if it receives an error. -func (client Client) ListSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListResponder handles the response to the List request. The method always -// closes the http.Response Body. -func (client Client) ListResponder(resp *http.Response) (result DataLakeStoreAccountListResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listNextResults retrieves the next set of results, if any. -func (client Client) listNextResults(lastResults DataLakeStoreAccountListResult) (result DataLakeStoreAccountListResult, err error) { - req, err := lastResults.dataLakeStoreAccountListResultPreparer() - if err != nil { - return result, autorest.NewErrorWithError(err, "account.Client", "listNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "account.Client", "listNextResults", resp, "Failure sending next results request") - } - result, err = client.ListResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "listNextResults", resp, "Failure responding to next results request") - } - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListComplete enumerates all values, automatically crossing page boundaries as required. -func (client Client) ListComplete(ctx context.Context, filter string, top *int32, skip *int32, expand string, selectParameter string, orderby string, count *bool, search string, formatParameter string) (result DataLakeStoreAccountListResultIterator, err error) { - result.page, err = client.List(ctx, filter, top, skip, expand, selectParameter, orderby, count, search, formatParameter) - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListByResourceGroup lists the Data Lake Store accounts within a specific resource group. The response includes a -// link to the next page of results, if any. -// -// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account(s). filter -// is oData filter. Optional. top is the number of items to return. Optional. skip is the number of items to skip -// over before returning elements. Optional. expand is oData expansion. Expand related resources in line with the -// retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category -// entry. Optional. selectParameter is oData Select statement. Limits the properties on each entry to just those -// requested, e.g. Categories?$select=CategoryName,Description. Optional. orderby is orderBy clause. One or more -// comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the -// values sorted, e.g. Categories?$orderby=CategoryName desc. Optional. count is a Boolean value of true or false -// to request a count of the matching resources included with the resources in the response, e.g. -// Categories?$count=true. Optional. search is a free form search. A free-text search expression to match for -// whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional. -// formatParameter is the desired return format. Return the response in particular formatxii without access to -// request headers for standard content-type negotiation (e.g Orders?$format=json). Optional. -func (client Client) ListByResourceGroup(ctx context.Context, resourceGroupName string, filter string, top *int32, skip *int32, expand string, selectParameter string, orderby string, count *bool, search string, formatParameter string) (result DataLakeStoreAccountListResultPage, err error) { - result.fn = client.listByResourceGroupNextResults - req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName, filter, top, skip, expand, selectParameter, orderby, count, search, formatParameter) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "ListByResourceGroup", nil, "Failure preparing request") - return - } - - resp, err := client.ListByResourceGroupSender(req) - if err != nil { - result.dlsalr.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "account.Client", "ListByResourceGroup", resp, "Failure sending request") - return - } - - result.dlsalr, err = client.ListByResourceGroupResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "ListByResourceGroup", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListByResourceGroupPreparer prepares the ListByResourceGroup request. -func (client Client) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string, filter string, top *int32, skip *int32, expand string, selectParameter string, orderby string, count *bool, search string, formatParameter string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - if len(filter) > 0 { - queryParameters["$filter"] = autorest.Encode("query", filter) - } - if top != nil { - queryParameters["$top"] = autorest.Encode("query", *top) - } - if skip != nil { - queryParameters["$skip"] = autorest.Encode("query", *skip) - } - if len(expand) > 0 { - queryParameters["$expand"] = autorest.Encode("query", expand) - } - if len(selectParameter) > 0 { - queryParameters["$select"] = autorest.Encode("query", selectParameter) - } - if len(orderby) > 0 { - queryParameters["$orderby"] = autorest.Encode("query", orderby) - } - if count != nil { - queryParameters["$count"] = autorest.Encode("query", *count) - } - if len(search) > 0 { - queryParameters["$search"] = autorest.Encode("query", search) - } - if len(formatParameter) > 0 { - queryParameters["$format"] = autorest.Encode("query", formatParameter) - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the -// http.Response Body if it receives an error. -func (client Client) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always -// closes the http.Response Body. -func (client Client) ListByResourceGroupResponder(resp *http.Response) (result DataLakeStoreAccountListResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listByResourceGroupNextResults retrieves the next set of results, if any. -func (client Client) listByResourceGroupNextResults(lastResults DataLakeStoreAccountListResult) (result DataLakeStoreAccountListResult, err error) { - req, err := lastResults.dataLakeStoreAccountListResultPreparer() - if err != nil { - return result, autorest.NewErrorWithError(err, "account.Client", "listByResourceGroupNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListByResourceGroupSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "account.Client", "listByResourceGroupNextResults", resp, "Failure sending next results request") - } - result, err = client.ListByResourceGroupResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "listByResourceGroupNextResults", resp, "Failure responding to next results request") - } - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. -func (client Client) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string, filter string, top *int32, skip *int32, expand string, selectParameter string, orderby string, count *bool, search string, formatParameter string) (result DataLakeStoreAccountListResultIterator, err error) { - result.page, err = client.ListByResourceGroup(ctx, resourceGroupName, filter, top, skip, expand, selectParameter, orderby, count, search, formatParameter) - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListFirewallRules lists the Data Lake Store firewall rules within the specified Data Lake Store account. -// -// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. accountName -// is the name of the Data Lake Store account from which to get the firewall rules. -func (client Client) ListFirewallRules(ctx context.Context, resourceGroupName string, accountName string) (result DataLakeStoreFirewallRuleListResultPage, err error) { - result.fn = client.listFirewallRulesNextResults - req, err := client.ListFirewallRulesPreparer(ctx, resourceGroupName, accountName) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "ListFirewallRules", nil, "Failure preparing request") - return - } - - resp, err := client.ListFirewallRulesSender(req) - if err != nil { - result.dlsfrlr.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "account.Client", "ListFirewallRules", resp, "Failure sending request") - return - } - - result.dlsfrlr, err = client.ListFirewallRulesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "ListFirewallRules", resp, "Failure responding to request") - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListFirewallRulesPreparer prepares the ListFirewallRules request. -func (client Client) ListFirewallRulesPreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "accountName": autorest.Encode("path", accountName), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/firewallRules", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListFirewallRulesSender sends the ListFirewallRules request. The method will close the -// http.Response Body if it receives an error. -func (client Client) ListFirewallRulesSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListFirewallRulesResponder handles the response to the ListFirewallRules request. The method always -// closes the http.Response Body. -func (client Client) ListFirewallRulesResponder(resp *http.Response) (result DataLakeStoreFirewallRuleListResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listFirewallRulesNextResults retrieves the next set of results, if any. -func (client Client) listFirewallRulesNextResults(lastResults DataLakeStoreFirewallRuleListResult) (result DataLakeStoreFirewallRuleListResult, err error) { - req, err := lastResults.dataLakeStoreFirewallRuleListResultPreparer() - if err != nil { - return result, autorest.NewErrorWithError(err, "account.Client", "listFirewallRulesNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListFirewallRulesSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "account.Client", "listFirewallRulesNextResults", resp, "Failure sending next results request") - } - result, err = client.ListFirewallRulesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "listFirewallRulesNextResults", resp, "Failure responding to next results request") - } - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ListFirewallRulesComplete enumerates all values, automatically crossing page boundaries as required. -func (client Client) ListFirewallRulesComplete(ctx context.Context, resourceGroupName string, accountName string) (result DataLakeStoreFirewallRuleListResultIterator, err error) { - result.page, err = client.ListFirewallRules(ctx, resourceGroupName, accountName) - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Update updates the specified Data Lake Store account information. -// -// resourceGroupName is the name of the Azure resource group that contains the Data Lake Store account. name is the -// name of the Data Lake Store account to update. parameters is parameters supplied to update the Data Lake Store -// account. -func (client Client) Update(ctx context.Context, resourceGroupName string, name string, parameters DataLakeStoreAccount) (result UpdateFuture, err error) { - req, err := client.UpdatePreparer(ctx, resourceGroupName, name, parameters) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "Update", nil, "Failure preparing request") - return - } - - result, err = client.UpdateSender(req) - if err != nil { - err = autorest.NewErrorWithError(err, "account.Client", "Update", result.Response(), "Failure sending request") - return - } - - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// UpdatePreparer prepares the Update request. -func (client Client) UpdatePreparer(ctx context.Context, resourceGroupName string, name string, parameters DataLakeStoreAccount) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2015-10-01-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/json; charset=utf-8"), - autorest.AsPatch(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{name}", pathParameters), - autorest.WithJSON(parameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// UpdateSender sends the Update request. The method will close the -// http.Response Body if it receives an error. -func (client Client) UpdateSender(req *http.Request) (future UpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) - if err != nil { - return - } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// UpdateResponder handles the response to the Update request. The method always -// closes the http.Response Body. -func (client Client) UpdateResponder(resp *http.Response) (result DataLakeStoreAccount, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/client.go deleted file mode 100644 index 312b1deff73b..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/client.go +++ /dev/null @@ -1,54 +0,0 @@ -// Package account implements the Azure ARM Account service API version 2015-10-01-preview. -// -// DataLake Store Client -package account - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "github.com/Azure/go-autorest/autorest" -) - -const ( - // DefaultBaseURI is the default URI used for the service Account - DefaultBaseURI = "https://management.azure.com" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// BaseClient is the base client for Account. -type BaseClient struct { - autorest.Client - BaseURI string - SubscriptionID string -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// New creates an instance of the BaseClient client. -func New(subscriptionID string) BaseClient { - return NewWithBaseURI(DefaultBaseURI, subscriptionID) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// NewWithBaseURI creates an instance of the BaseClient client. -func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { - return BaseClient{ - Client: autorest.NewClientWithUserAgent(UserAgent()), - BaseURI: baseURI, - SubscriptionID: subscriptionID, - } -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/models.go deleted file mode 100644 index b95dd2cdb6b3..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/models.go +++ /dev/null @@ -1,718 +0,0 @@ -package account - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "encoding/json" - "github.com/Azure/go-autorest/autorest" - "github.com/Azure/go-autorest/autorest/azure" - "github.com/Azure/go-autorest/autorest/date" - "github.com/Azure/go-autorest/autorest/to" - "github.com/satori/go.uuid" - "net/http" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DataLakeStoreAccountState enumerates the values for data lake store account state. -type DataLakeStoreAccountState string - -const ( - // Active ... - Active DataLakeStoreAccountState = "active" - // Suspended ... - Suspended DataLakeStoreAccountState = "suspended" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// PossibleDataLakeStoreAccountStateValues returns an array of possible values for the DataLakeStoreAccountState const type. -func PossibleDataLakeStoreAccountStateValues() []DataLakeStoreAccountState { - return []DataLakeStoreAccountState{Active, Suspended} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DataLakeStoreAccountStatus enumerates the values for data lake store account status. -type DataLakeStoreAccountStatus string - -const ( - // Creating ... - Creating DataLakeStoreAccountStatus = "Creating" - // Deleted ... - Deleted DataLakeStoreAccountStatus = "Deleted" - // Deleting ... - Deleting DataLakeStoreAccountStatus = "Deleting" - // Failed ... - Failed DataLakeStoreAccountStatus = "Failed" - // Patching ... - Patching DataLakeStoreAccountStatus = "Patching" - // Resuming ... - Resuming DataLakeStoreAccountStatus = "Resuming" - // Running ... - Running DataLakeStoreAccountStatus = "Running" - // Succeeded ... - Succeeded DataLakeStoreAccountStatus = "Succeeded" - // Suspending ... - Suspending DataLakeStoreAccountStatus = "Suspending" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// PossibleDataLakeStoreAccountStatusValues returns an array of possible values for the DataLakeStoreAccountStatus const type. -func PossibleDataLakeStoreAccountStatusValues() []DataLakeStoreAccountStatus { - return []DataLakeStoreAccountStatus{Creating, Deleted, Deleting, Failed, Patching, Resuming, Running, Succeeded, Suspending} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// EncryptionConfigType enumerates the values for encryption config type. -type EncryptionConfigType string - -const ( - // ServiceManaged ... - ServiceManaged EncryptionConfigType = "ServiceManaged" - // UserManaged ... - UserManaged EncryptionConfigType = "UserManaged" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// PossibleEncryptionConfigTypeValues returns an array of possible values for the EncryptionConfigType const type. -func PossibleEncryptionConfigTypeValues() []EncryptionConfigType { - return []EncryptionConfigType{ServiceManaged, UserManaged} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// EncryptionIdentityType enumerates the values for encryption identity type. -type EncryptionIdentityType string - -const ( - // SystemAssigned ... - SystemAssigned EncryptionIdentityType = "SystemAssigned" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// PossibleEncryptionIdentityTypeValues returns an array of possible values for the EncryptionIdentityType const type. -func PossibleEncryptionIdentityTypeValues() []EncryptionIdentityType { - return []EncryptionIdentityType{SystemAssigned} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// EncryptionProvisioningState enumerates the values for encryption provisioning state. -type EncryptionProvisioningState string - -const ( - // EncryptionProvisioningStateCreating ... - EncryptionProvisioningStateCreating EncryptionProvisioningState = "Creating" - // EncryptionProvisioningStateSucceeded ... - EncryptionProvisioningStateSucceeded EncryptionProvisioningState = "Succeeded" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// PossibleEncryptionProvisioningStateValues returns an array of possible values for the EncryptionProvisioningState const type. -func PossibleEncryptionProvisioningStateValues() []EncryptionProvisioningState { - return []EncryptionProvisioningState{EncryptionProvisioningStateCreating, EncryptionProvisioningStateSucceeded} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// EncryptionState enumerates the values for encryption state. -type EncryptionState string - -const ( - // Disabled ... - Disabled EncryptionState = "Disabled" - // Enabled ... - Enabled EncryptionState = "Enabled" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// PossibleEncryptionStateValues returns an array of possible values for the EncryptionState const type. -func PossibleEncryptionStateValues() []EncryptionState { - return []EncryptionState{Disabled, Enabled} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// OperationStatus enumerates the values for operation status. -type OperationStatus string - -const ( - // OperationStatusFailed ... - OperationStatusFailed OperationStatus = "Failed" - // OperationStatusInProgress ... - OperationStatusInProgress OperationStatus = "InProgress" - // OperationStatusSucceeded ... - OperationStatusSucceeded OperationStatus = "Succeeded" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type. -func PossibleOperationStatusValues() []OperationStatus { - return []OperationStatus{OperationStatusFailed, OperationStatusInProgress, OperationStatusSucceeded} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// AzureAsyncOperationResult the response body contains the status of the specified asynchronous operation, -// indicating whether it has succeeded, is in progress, or has failed. Note that this status is distinct from the -// HTTP status code returned for the Get Operation Status operation itself. If the asynchronous operation -// succeeded, the response body includes the HTTP status code for the successful request. If the asynchronous -// operation failed, the response body includes the HTTP status code for the failed request and error information -// regarding the failure. -type AzureAsyncOperationResult struct { - // Status - the status of the AzureAsuncOperation. Possible values include: 'OperationStatusInProgress', 'OperationStatusSucceeded', 'OperationStatusFailed' - Status OperationStatus `json:"status,omitempty"` - Error *Error `json:"error,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// CreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. -type CreateFuture struct { - azure.Future - req *http.Request -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future CreateFuture) Result(client Client) (dlsa DataLakeStoreAccount, err error) { - var done bool - done, err = future.Done(client) - if err != nil { - err = autorest.NewErrorWithError(err, "account.CreateFuture", "Result", future.Response(), "Polling failure") - return - } - if !done { - return dlsa, azure.NewAsyncOpIncompleteError("account.CreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - dlsa, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "account.CreateFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "account.CreateFuture", "Result", resp, "Failure sending request") - return - } - dlsa, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.CreateFuture", "Result", resp, "Failure responding to request") - } - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DataLakeStoreAccount data Lake Store account information -type DataLakeStoreAccount struct { - autorest.Response `json:"-"` - // Location - the account regional location. - Location *string `json:"location,omitempty"` - // Name - the account name. - Name *string `json:"name,omitempty"` - // Type - the namespace and type of the account. - Type *string `json:"type,omitempty"` - // ID - the account subscription ID. - ID *string `json:"id,omitempty"` - // Identity - The Key vault encryption identity, if any. - Identity *EncryptionIdentity `json:"identity,omitempty"` - // Tags - the value of custom properties. - Tags map[string]*string `json:"tags"` - // Properties - the Data Lake Store account properties. - Properties *DataLakeStoreAccountProperties `json:"properties,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// MarshalJSON is the custom marshaler for DataLakeStoreAccount. -func (dlsa DataLakeStoreAccount) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]interface{}) - if dlsa.Location != nil { - objectMap["location"] = dlsa.Location - } - if dlsa.Name != nil { - objectMap["name"] = dlsa.Name - } - if dlsa.Type != nil { - objectMap["type"] = dlsa.Type - } - if dlsa.ID != nil { - objectMap["id"] = dlsa.ID - } - if dlsa.Identity != nil { - objectMap["identity"] = dlsa.Identity - } - if dlsa.Tags != nil { - objectMap["tags"] = dlsa.Tags - } - if dlsa.Properties != nil { - objectMap["properties"] = dlsa.Properties - } - return json.Marshal(objectMap) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DataLakeStoreAccountListResult data Lake Store account list information response. -type DataLakeStoreAccountListResult struct { - autorest.Response `json:"-"` - // Value - the results of the list operation - Value *[]DataLakeStoreAccount `json:"value,omitempty"` - // NextLink - the link (url) to the next page of results. - NextLink *string `json:"nextLink,omitempty"` - // Count - the total count of results that are available, but might not be returned in the current page. - Count *int64 `json:"count,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DataLakeStoreAccountListResultIterator provides access to a complete listing of DataLakeStoreAccount values. -type DataLakeStoreAccountListResultIterator struct { - i int - page DataLakeStoreAccountListResultPage -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Next advances to the next value. If there was an error making -// the request the iterator does not advance and the error is returned. -func (iter *DataLakeStoreAccountListResultIterator) Next() error { - iter.i++ - if iter.i < len(iter.page.Values()) { - return nil - } - err := iter.page.Next() - if err != nil { - iter.i-- - return err - } - iter.i = 0 - return nil -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// NotDone returns true if the enumeration should be started or is not yet complete. -func (iter DataLakeStoreAccountListResultIterator) NotDone() bool { - return iter.page.NotDone() && iter.i < len(iter.page.Values()) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Response returns the raw server response from the last page request. -func (iter DataLakeStoreAccountListResultIterator) Response() DataLakeStoreAccountListResult { - return iter.page.Response() -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Value returns the current value or a zero-initialized value if the -// iterator has advanced beyond the end of the collection. -func (iter DataLakeStoreAccountListResultIterator) Value() DataLakeStoreAccount { - if !iter.page.NotDone() { - return DataLakeStoreAccount{} - } - return iter.page.Values()[iter.i] -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// IsEmpty returns true if the ListResult contains no values. -func (dlsalr DataLakeStoreAccountListResult) IsEmpty() bool { - return dlsalr.Value == nil || len(*dlsalr.Value) == 0 -} - -// dataLakeStoreAccountListResultPreparer prepares a request to retrieve the next set of results. -// It returns nil if no more results exist. -func (dlsalr DataLakeStoreAccountListResult) dataLakeStoreAccountListResultPreparer() (*http.Request, error) { - if dlsalr.NextLink == nil || len(to.String(dlsalr.NextLink)) < 1 { - return nil, nil - } - return autorest.Prepare(&http.Request{}, - autorest.AsJSON(), - autorest.AsGet(), - autorest.WithBaseURL(to.String(dlsalr.NextLink))) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DataLakeStoreAccountListResultPage contains a page of DataLakeStoreAccount values. -type DataLakeStoreAccountListResultPage struct { - fn func(DataLakeStoreAccountListResult) (DataLakeStoreAccountListResult, error) - dlsalr DataLakeStoreAccountListResult -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Next advances to the next page of values. If there was an error making -// the request the page does not advance and the error is returned. -func (page *DataLakeStoreAccountListResultPage) Next() error { - next, err := page.fn(page.dlsalr) - if err != nil { - return err - } - page.dlsalr = next - return nil -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// NotDone returns true if the page enumeration should be started or is not yet complete. -func (page DataLakeStoreAccountListResultPage) NotDone() bool { - return !page.dlsalr.IsEmpty() -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Response returns the raw server response from the last page request. -func (page DataLakeStoreAccountListResultPage) Response() DataLakeStoreAccountListResult { - return page.dlsalr -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Values returns the slice of values for the current page or nil if there are no values. -func (page DataLakeStoreAccountListResultPage) Values() []DataLakeStoreAccount { - if page.dlsalr.IsEmpty() { - return nil - } - return *page.dlsalr.Value -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DataLakeStoreAccountProperties data Lake Store account properties information -type DataLakeStoreAccountProperties struct { - // ProvisioningState - the status of the Data Lake Store account while being provisioned. Possible values include: 'Failed', 'Creating', 'Running', 'Succeeded', 'Patching', 'Suspending', 'Resuming', 'Deleting', 'Deleted' - ProvisioningState DataLakeStoreAccountStatus `json:"provisioningState,omitempty"` - // State - the status of the Data Lake Store account after provisioning has completed. Possible values include: 'Active', 'Suspended' - State DataLakeStoreAccountState `json:"state,omitempty"` - // CreationTime - the account creation time. - CreationTime *date.Time `json:"creationTime,omitempty"` - // EncryptionState - The current state of encryption for this Data Lake store account. Possible values include: 'Enabled', 'Disabled' - EncryptionState EncryptionState `json:"encryptionState,omitempty"` - // EncryptionProvisioningState - The current state of encryption provisioning for this Data Lake store account. Possible values include: 'EncryptionProvisioningStateCreating', 'EncryptionProvisioningStateSucceeded' - EncryptionProvisioningState EncryptionProvisioningState `json:"encryptionProvisioningState,omitempty"` - // EncryptionConfig - The Key vault encryption configuration. - EncryptionConfig *EncryptionConfig `json:"encryptionConfig,omitempty"` - // LastModifiedTime - the account last modified time. - LastModifiedTime *date.Time `json:"lastModifiedTime,omitempty"` - // Endpoint - the gateway host. - Endpoint *string `json:"endpoint,omitempty"` - // DefaultGroup - the default owner group for all new folders and files created in the Data Lake Store account. - DefaultGroup *string `json:"defaultGroup,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DataLakeStoreFirewallRuleListResult data Lake Store firewall rule list information. -type DataLakeStoreFirewallRuleListResult struct { - autorest.Response `json:"-"` - // Value - the results of the list operation - Value *[]FirewallRule `json:"value,omitempty"` - // NextLink - the link (url) to the next page of results. - NextLink *string `json:"nextLink,omitempty"` - // Count - the total count of results that are available, but might not be returned in the current page. - Count *int64 `json:"count,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DataLakeStoreFirewallRuleListResultIterator provides access to a complete listing of FirewallRule values. -type DataLakeStoreFirewallRuleListResultIterator struct { - i int - page DataLakeStoreFirewallRuleListResultPage -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Next advances to the next value. If there was an error making -// the request the iterator does not advance and the error is returned. -func (iter *DataLakeStoreFirewallRuleListResultIterator) Next() error { - iter.i++ - if iter.i < len(iter.page.Values()) { - return nil - } - err := iter.page.Next() - if err != nil { - iter.i-- - return err - } - iter.i = 0 - return nil -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// NotDone returns true if the enumeration should be started or is not yet complete. -func (iter DataLakeStoreFirewallRuleListResultIterator) NotDone() bool { - return iter.page.NotDone() && iter.i < len(iter.page.Values()) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Response returns the raw server response from the last page request. -func (iter DataLakeStoreFirewallRuleListResultIterator) Response() DataLakeStoreFirewallRuleListResult { - return iter.page.Response() -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Value returns the current value or a zero-initialized value if the -// iterator has advanced beyond the end of the collection. -func (iter DataLakeStoreFirewallRuleListResultIterator) Value() FirewallRule { - if !iter.page.NotDone() { - return FirewallRule{} - } - return iter.page.Values()[iter.i] -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// IsEmpty returns true if the ListResult contains no values. -func (dlsfrlr DataLakeStoreFirewallRuleListResult) IsEmpty() bool { - return dlsfrlr.Value == nil || len(*dlsfrlr.Value) == 0 -} - -// dataLakeStoreFirewallRuleListResultPreparer prepares a request to retrieve the next set of results. -// It returns nil if no more results exist. -func (dlsfrlr DataLakeStoreFirewallRuleListResult) dataLakeStoreFirewallRuleListResultPreparer() (*http.Request, error) { - if dlsfrlr.NextLink == nil || len(to.String(dlsfrlr.NextLink)) < 1 { - return nil, nil - } - return autorest.Prepare(&http.Request{}, - autorest.AsJSON(), - autorest.AsGet(), - autorest.WithBaseURL(to.String(dlsfrlr.NextLink))) -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DataLakeStoreFirewallRuleListResultPage contains a page of FirewallRule values. -type DataLakeStoreFirewallRuleListResultPage struct { - fn func(DataLakeStoreFirewallRuleListResult) (DataLakeStoreFirewallRuleListResult, error) - dlsfrlr DataLakeStoreFirewallRuleListResult -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Next advances to the next page of values. If there was an error making -// the request the page does not advance and the error is returned. -func (page *DataLakeStoreFirewallRuleListResultPage) Next() error { - next, err := page.fn(page.dlsfrlr) - if err != nil { - return err - } - page.dlsfrlr = next - return nil -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// NotDone returns true if the page enumeration should be started or is not yet complete. -func (page DataLakeStoreFirewallRuleListResultPage) NotDone() bool { - return !page.dlsfrlr.IsEmpty() -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Response returns the raw server response from the last page request. -func (page DataLakeStoreFirewallRuleListResultPage) Response() DataLakeStoreFirewallRuleListResult { - return page.dlsfrlr -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Values returns the slice of values for the current page or nil if there are no values. -func (page DataLakeStoreFirewallRuleListResultPage) Values() []FirewallRule { - if page.dlsfrlr.IsEmpty() { - return nil - } - return *page.dlsfrlr.Value -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// DeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. -type DeleteFuture struct { - azure.Future - req *http.Request -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future DeleteFuture) Result(client Client) (ar autorest.Response, err error) { - var done bool - done, err = future.Done(client) - if err != nil { - err = autorest.NewErrorWithError(err, "account.DeleteFuture", "Result", future.Response(), "Polling failure") - return - } - if !done { - return ar, azure.NewAsyncOpIncompleteError("account.DeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "account.DeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "account.DeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.DeleteFuture", "Result", resp, "Failure responding to request") - } - return -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// EncryptionConfig ... -type EncryptionConfig struct { - // Type - The type of encryption configuration being used. Currently the only supported types are 'UserManaged' and 'ServiceManaged'. Possible values include: 'UserManaged', 'ServiceManaged' - Type EncryptionConfigType `json:"type,omitempty"` - // KeyVaultMetaInfo - The Key vault information for connecting to user managed encryption keys. - KeyVaultMetaInfo *KeyVaultMetaInfo `json:"keyVaultMetaInfo,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// EncryptionIdentity ... -type EncryptionIdentity struct { - // Type - The type of encryption being used. Currently the only supported type is 'SystemAssigned'. Possible values include: 'SystemAssigned' - Type EncryptionIdentityType `json:"type,omitempty"` - // PrincipalID - The principal identifier associated with the encryption. - PrincipalID *uuid.UUID `json:"principalId,omitempty"` - // TenantID - The tenant identifier associated with the encryption. - TenantID *uuid.UUID `json:"tenantId,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Error data Lake Store error information -type Error struct { - // Code - the HTTP status code or error code associated with this error - Code *string `json:"code,omitempty"` - // Message - the error message to display. - Message *string `json:"message,omitempty"` - // Target - the target of the error. - Target *string `json:"target,omitempty"` - // Details - the list of error details - Details *[]ErrorDetails `json:"details,omitempty"` - // InnerError - the inner exceptions or errors, if any - InnerError *InnerError `json:"innerError,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// ErrorDetails data Lake Store error details information -type ErrorDetails struct { - // Code - the HTTP status code or error code associated with this error - Code *string `json:"code,omitempty"` - // Message - the error message localized based on Accept-Language - Message *string `json:"message,omitempty"` - // Target - the target of the particular error (for example, the name of the property in error). - Target *string `json:"target,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// FirewallRule data Lake Store firewall rule information -type FirewallRule struct { - autorest.Response `json:"-"` - // Name - the firewall rule's name. - Name *string `json:"name,omitempty"` - // Type - the namespace and type of the firewall Rule. - Type *string `json:"type,omitempty"` - // ID - the firewall rule's subscription ID. - ID *string `json:"id,omitempty"` - // Location - the firewall rule's regional location. - Location *string `json:"location,omitempty"` - // Properties - the properties of the firewall rule. - Properties *FirewallRuleProperties `json:"properties,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// FirewallRuleProperties data Lake Store firewall rule properties information -type FirewallRuleProperties struct { - // StartIPAddress - the start IP address for the firewall rule. - StartIPAddress *string `json:"startIpAddress,omitempty"` - // EndIPAddress - the end IP address for the firewall rule. - EndIPAddress *string `json:"endIpAddress,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// InnerError data Lake Store inner error information -type InnerError struct { - // Trace - the stack trace for the error - Trace *string `json:"trace,omitempty"` - // Context - the context for the error message - Context *string `json:"context,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// KeyVaultMetaInfo ... -type KeyVaultMetaInfo struct { - // KeyVaultResourceID - The resource identifier for the user managed Key Vault being used to encrypt. - KeyVaultResourceID *string `json:"keyVaultResourceId,omitempty"` - // EncryptionKeyName - The name of the user managed encryption key. - EncryptionKeyName *string `json:"encryptionKeyName,omitempty"` - // EncryptionKeyVersion - The version of the user managed encryption key. - EncryptionKeyVersion *string `json:"encryptionKeyVersion,omitempty"` -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// UpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. -type UpdateFuture struct { - azure.Future - req *http.Request -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future UpdateFuture) Result(client Client) (dlsa DataLakeStoreAccount, err error) { - var done bool - done, err = future.Done(client) - if err != nil { - err = autorest.NewErrorWithError(err, "account.UpdateFuture", "Result", future.Response(), "Polling failure") - return - } - if !done { - return dlsa, azure.NewAsyncOpIncompleteError("account.UpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - dlsa, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "account.UpdateFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "account.UpdateFuture", "Result", resp, "Failure sending request") - return - } - dlsa, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.UpdateFuture", "Result", resp, "Failure responding to request") - } - return -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/version.go deleted file mode 100644 index 3d634ad57763..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2015-10-01-preview/account/version.go +++ /dev/null @@ -1,31 +0,0 @@ -package account - -import "github.com/Azure/azure-sdk-for-go/version" - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// UserAgent returns the UserAgent string to use when sending http.Requests. -func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " account/2015-10-01-preview" -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/datalake/store/mgmt/2015-10-01-preview/account instead. -// Version returns the semantic version (see http://semver.org) of the client. -func Version() string { - return version.Number -} From 16c79f268c64b85ca7c58a4fe81bf106860c6f7c Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Wed, 9 May 2018 14:41:26 +0100 Subject: [PATCH 100/320] update the correct vendor --- vendor/vendor.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/vendor/vendor.json b/vendor/vendor.json index 9f966fb81730..f1c8c47c4fb5 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -82,6 +82,14 @@ "version": "v15.1.0", "versionExact": "v15.1.0" }, + { + "checksumSHA1": "MsygGK8s34NdTsbkzvaqHgPLs6I=", + "path": "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account", + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" + }, { "checksumSHA1": "Nzv5lOussmqZ2h3i9/H2LmJWJBA=", "path": "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid", From fe30e5dbec435f65671877f831326a3eb9567298 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Wed, 9 May 2018 15:30:22 +0100 Subject: [PATCH 101/320] was missing a bracket --- vendor/vendor.json | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor/vendor.json b/vendor/vendor.json index 3c092a40dc82..8c1332e6dd8d 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -90,6 +90,7 @@ "version": "v16.2.1", "versionExact": "v16.2.1" }, + { "checksumSHA1": "NieGKPVYPaCrPLxkzS+fEMidE3M=", "path": "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid", "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", From b763b8345b7d9a87863abe8f5545713dddd259f2 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 9 May 2018 15:13:43 -0700 Subject: [PATCH 102/320] Normalized hash functions and protected them against nil inputs --- azurerm/resource_arm_container_service.go | 53 ++++---- azurerm/resource_arm_cosmos_db_account.go | 26 ++-- azurerm/resource_arm_dns_mx_record.go | 7 +- azurerm/resource_arm_dns_srv_record.go | 11 +- azurerm/resource_arm_kubernetes_cluster.go | 6 +- .../resource_arm_traffic_manager_profile.go | 18 +-- azurerm/resource_arm_virtual_machine.go | 47 +++---- .../resource_arm_virtual_machine_scale_set.go | 121 ++++++++++-------- azurerm/resource_arm_virtual_network.go | 14 +- 9 files changed, 163 insertions(+), 140 deletions(-) diff --git a/azurerm/resource_arm_container_service.go b/azurerm/resource_arm_container_service.go index 949de81d6755..9eeea972ae35 100644 --- a/azurerm/resource_arm_container_service.go +++ b/azurerm/resource_arm_container_service.go @@ -543,73 +543,64 @@ func containerServiceStateRefreshFunc(client *ArmClient, resourceGroupName strin func resourceAzureRMContainerServiceMasterProfileHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - count := m["count"].(int) - dnsPrefix := m["dns_prefix"].(string) - - buf.WriteString(fmt.Sprintf("%d-", count)) - buf.WriteString(fmt.Sprintf("%s-", dnsPrefix)) + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%d-", m["count"].(int))) + buf.WriteString(fmt.Sprintf("%s-", m["dns_prefix"].(string))) + } return hashcode.String(buf.String()) } func resourceAzureRMContainerServiceLinuxProfilesHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - - adminUsername := m["admin_username"].(string) - buf.WriteString(fmt.Sprintf("%s-", adminUsername)) + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%s-", m["admin_username"].(string))) + } return hashcode.String(buf.String()) } func resourceAzureRMContainerServiceLinuxProfilesSSHKeysHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - - keyData := m["key_data"].(string) - buf.WriteString(fmt.Sprintf("%s-", keyData)) + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%s-", m["key_data"].(string))) + } return hashcode.String(buf.String()) } func resourceAzureRMContainerServiceAgentPoolProfilesHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - count := m["count"].(int) - dnsPrefix := m["dns_prefix"].(string) - name := m["name"].(string) - vm_size := m["vm_size"].(string) - - buf.WriteString(fmt.Sprintf("%d-", count)) - buf.WriteString(fmt.Sprintf("%s-", dnsPrefix)) - buf.WriteString(fmt.Sprintf("%s-", name)) - buf.WriteString(fmt.Sprintf("%s-", vm_size)) + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%d-", m["count"].(int))) + buf.WriteString(fmt.Sprintf("%s-", m["dns_prefix"].(string))) + buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) + buf.WriteString(fmt.Sprintf("%s-", m["vm_size"].(string))) + } return hashcode.String(buf.String()) } func resourceAzureRMContainerServiceServicePrincipalProfileHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - clientId := m["client_id"].(string) - buf.WriteString(fmt.Sprintf("%s-", clientId)) + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%s-", m["client_id"].(string))) + } return hashcode.String(buf.String()) } func resourceAzureRMContainerServiceDiagnosticProfilesHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - enabled := m["enabled"].(bool) - - buf.WriteString(fmt.Sprintf("%t", enabled)) + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%t", m["enabled"].(bool))) + } return hashcode.String(buf.String()) } diff --git a/azurerm/resource_arm_cosmos_db_account.go b/azurerm/resource_arm_cosmos_db_account.go index 805af209d8a3..270fdf3c08d1 100644 --- a/azurerm/resource_arm_cosmos_db_account.go +++ b/azurerm/resource_arm_cosmos_db_account.go @@ -798,28 +798,30 @@ func flattenAzureRmCosmosDBAccountGeoLocations(d *schema.ResourceData, account d //todo remove once deprecated field `failover_policy` is removed func resourceAzureRMCosmosDBAccountFailoverPolicyHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - location := azureRMNormalizeLocation(m["location"].(string)) - priority := int32(m["priority"].(int)) + if m, ok := v.(map[string]interface{}); ok { + location := azureRMNormalizeLocation(m["location"].(string)) + priority := int32(m["priority"].(int)) - buf.WriteString(fmt.Sprintf("%s-%d", location, priority)) + buf.WriteString(fmt.Sprintf("%s-%d", location, priority)) + } return hashcode.String(buf.String()) } func resourceAzureRMCosmosDBAccountGeoLocationHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - prefix := "" - if v, ok := m["prefix"].(string); ok { - prefix = v - } - location := azureRMNormalizeLocation(m["location"].(string)) - priority := int32(m["failover_priority"].(int)) + if m, ok := v.(map[string]interface{}); ok { + prefix := "" + if v, ok := m["prefix"].(string); ok { + prefix = v + } + location := azureRMNormalizeLocation(m["location"].(string)) + priority := int32(m["failover_priority"].(int)) - buf.WriteString(fmt.Sprintf("%s-%s-%d", prefix, location, priority)) + buf.WriteString(fmt.Sprintf("%s-%s-%d", prefix, location, priority)) + } return hashcode.String(buf.String()) } diff --git a/azurerm/resource_arm_dns_mx_record.go b/azurerm/resource_arm_dns_mx_record.go index 14aafd260fb2..82f87f1ec879 100644 --- a/azurerm/resource_arm_dns_mx_record.go +++ b/azurerm/resource_arm_dns_mx_record.go @@ -206,10 +206,11 @@ func expandAzureRmDnsMxRecords(d *schema.ResourceData) ([]dns.MxRecord, error) { func resourceArmDnsMxRecordHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%s-", m["preference"].(string))) - buf.WriteString(fmt.Sprintf("%s-", m["exchange"].(string))) + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%s-", m["preference"].(string))) + buf.WriteString(fmt.Sprintf("%s-", m["exchange"].(string))) + } return hashcode.String(buf.String()) } diff --git a/azurerm/resource_arm_dns_srv_record.go b/azurerm/resource_arm_dns_srv_record.go index dc3e65237e40..636769e983a1 100644 --- a/azurerm/resource_arm_dns_srv_record.go +++ b/azurerm/resource_arm_dns_srv_record.go @@ -213,12 +213,13 @@ func expandAzureRmDnsSrvRecords(d *schema.ResourceData) ([]dns.SrvRecord, error) func resourceArmDnsSrvRecordHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%d-", m["priority"].(int))) - buf.WriteString(fmt.Sprintf("%d-", m["weight"].(int))) - buf.WriteString(fmt.Sprintf("%d-", m["port"].(int))) - buf.WriteString(fmt.Sprintf("%s-", m["target"].(string))) + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%d-", m["priority"].(int))) + buf.WriteString(fmt.Sprintf("%d-", m["weight"].(int))) + buf.WriteString(fmt.Sprintf("%d-", m["port"].(int))) + buf.WriteString(fmt.Sprintf("%s-", m["target"].(string))) + } return hashcode.String(buf.String()) } diff --git a/azurerm/resource_arm_kubernetes_cluster.go b/azurerm/resource_arm_kubernetes_cluster.go index e19008358af3..c9f3414876e5 100644 --- a/azurerm/resource_arm_kubernetes_cluster.go +++ b/azurerm/resource_arm_kubernetes_cluster.go @@ -566,10 +566,10 @@ func expandAzureRmKubernetesClusterAgentProfiles(d *schema.ResourceData) []conta func resourceAzureRMKubernetesClusterServicePrincipalProfileHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - clientId := m["client_id"].(string) - buf.WriteString(fmt.Sprintf("%s-", clientId)) + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%s-", m["client_id"].(string))) + } return hashcode.String(buf.String()) } diff --git a/azurerm/resource_arm_traffic_manager_profile.go b/azurerm/resource_arm_traffic_manager_profile.go index bc04ff5a43d3..3f2632e3bf93 100644 --- a/azurerm/resource_arm_traffic_manager_profile.go +++ b/azurerm/resource_arm_traffic_manager_profile.go @@ -282,23 +282,25 @@ func flattenAzureRMTrafficManagerProfileMonitorConfig(cfg *trafficmanager.Monito func resourceAzureRMTrafficManagerDNSConfigHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%s-", m["relative_name"].(string))) - buf.WriteString(fmt.Sprintf("%d-", m["ttl"].(int))) + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%s-", m["relative_name"].(string))) + buf.WriteString(fmt.Sprintf("%d-", m["ttl"].(int))) + } return hashcode.String(buf.String()) } func resourceAzureRMTrafficManagerMonitorConfigHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%s-", strings.ToLower(m["protocol"].(string)))) - buf.WriteString(fmt.Sprintf("%d-", m["port"].(int))) + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%s-", strings.ToLower(m["protocol"].(string)))) + buf.WriteString(fmt.Sprintf("%d-", m["port"].(int))) - if m["path"] != "" { - buf.WriteString(fmt.Sprintf("%s-", m["path"].(string))) + if v, ok := m["path"]; ok && v != "" { + buf.WriteString(fmt.Sprintf("%s-", m["path"].(string))) + } } return hashcode.String(buf.String()) diff --git a/azurerm/resource_arm_virtual_machine.go b/azurerm/resource_arm_virtual_machine.go index 42f9a0881bdf..e5fb9e52dc51 100644 --- a/azurerm/resource_arm_virtual_machine.go +++ b/azurerm/resource_arm_virtual_machine.go @@ -1577,8 +1577,7 @@ func findStorageAccountResourceGroup(meta interface{}, storageAccountName string func resourceArmVirtualMachineStorageOsProfileHash(v interface{}) int { var buf bytes.Buffer - if v != nil { - m := v.(map[string]interface{}) + if m, ok := v.(map[string]interface{}); ok { buf.WriteString(fmt.Sprintf("%s-", m["admin_username"].(string))) buf.WriteString(fmt.Sprintf("%s-", m["computer_name"].(string))) } @@ -1589,13 +1588,12 @@ func resourceArmVirtualMachineStorageOsProfileHash(v interface{}) int { func resourceArmVirtualMachineStorageOsProfileWindowsConfigHash(v interface{}) int { var buf bytes.Buffer - if v != nil { - m := v.(map[string]interface{}) - if m["provision_vm_agent"] != nil { - buf.WriteString(fmt.Sprintf("%t-", m["provision_vm_agent"].(bool))) + if m, ok := v.(map[string]interface{}); ok { + if v, ok := m["provision_vm_agent"]; ok { + buf.WriteString(fmt.Sprintf("%t-", v.(bool))) } - if m["enable_automatic_upgrades"] != nil { - buf.WriteString(fmt.Sprintf("%t-", m["enable_automatic_upgrades"].(bool))) + if v, ok := m["enable_automatic_upgrades"]; ok { + buf.WriteString(fmt.Sprintf("%t-", v.(bool))) } } @@ -1604,27 +1602,32 @@ func resourceArmVirtualMachineStorageOsProfileWindowsConfigHash(v interface{}) i func resourceArmVirtualMachineStorageOsProfileLinuxConfigHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%t-", m["disable_password_authentication"].(bool))) + + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%t-", m["disable_password_authentication"].(bool))) + } return hashcode.String(buf.String()) } func resourceArmVirtualMachineStorageImageReferenceHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - if m["publisher"] != nil { - buf.WriteString(fmt.Sprintf("%s-", m["publisher"].(string))) - } - if m["offer"] != nil { - buf.WriteString(fmt.Sprintf("%s-", m["offer"].(string))) - } - if m["sku"] != nil { - buf.WriteString(fmt.Sprintf("%s-", m["sku"].(string))) - } - if m["id"] != nil { - buf.WriteString(fmt.Sprintf("%s-", m["id"].(string))) + + if m, ok := v.(map[string]interface{}); ok { + if v, ok := m["publisher"]; ok { + buf.WriteString(fmt.Sprintf("%s-", v.(string))) + } + if v, ok := m["offer"]; ok { + buf.WriteString(fmt.Sprintf("%s-", v.(string))) + } + if v, ok := m["sku"]; ok { + buf.WriteString(fmt.Sprintf("%s-", v.(string))) + } + if v, ok := m["id"]; ok { + buf.WriteString(fmt.Sprintf("%s-", v.(string))) + } } + return hashcode.String(buf.String()) } diff --git a/azurerm/resource_arm_virtual_machine_scale_set.go b/azurerm/resource_arm_virtual_machine_scale_set.go index eabf8cdbf59a..00f8a81e44ee 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set.go +++ b/azurerm/resource_arm_virtual_machine_scale_set.go @@ -1189,44 +1189,52 @@ func flattenAzureRmVirtualMachineScaleSetExtensionProfile(profile *compute.Virtu func resourceArmVirtualMachineScaleSetStorageProfileImageReferenceHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - if m["publisher"] != nil { - buf.WriteString(fmt.Sprintf("%s-", m["publisher"].(string))) - } - if m["offer"] != nil { - buf.WriteString(fmt.Sprintf("%s-", m["offer"].(string))) - } - if m["sku"] != nil { - buf.WriteString(fmt.Sprintf("%s-", m["sku"].(string))) - } - if m["version"] != nil { - buf.WriteString(fmt.Sprintf("%s-", m["version"].(string))) - } - if m["id"] != nil { - buf.WriteString(fmt.Sprintf("%s-", m["id"].(string))) + + if m, ok := v.(map[string]interface{}); ok { + if v, ok := m["publisher"]; ok { + buf.WriteString(fmt.Sprintf("%s-", v.(string))) + } + if v, ok := m["offer"]; ok { + buf.WriteString(fmt.Sprintf("%s-", v.(string))) + } + if v, ok := m["sku"]; ok { + buf.WriteString(fmt.Sprintf("%s-", v.(string))) + } + if v, ok := m["version"]; ok { + buf.WriteString(fmt.Sprintf("%s-", v.(string))) + } + if v, ok := m["id"]; ok { + buf.WriteString(fmt.Sprintf("%s-", v.(string))) + } } + return hashcode.String(buf.String()) } func resourceArmVirtualMachineScaleSetSkuHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) - if m["tier"] != nil { - buf.WriteString(fmt.Sprintf("%s-", strings.ToLower(m["tier"].(string)))) + + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) + buf.WriteString(fmt.Sprintf("%d-", m["capacity"].(int))) + + if v, ok := m["tier"]; ok { + buf.WriteString(fmt.Sprintf("%s-", strings.ToLower(v.(string)))) + } } - buf.WriteString(fmt.Sprintf("%d-", m["capacity"].(int))) return hashcode.String(buf.String()) } func resourceArmVirtualMachineScaleSetStorageProfileOsDiskHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) - if m["vhd_containers"] != nil { - buf.WriteString(fmt.Sprintf("%s-", m["vhd_containers"].(*schema.Set).List())) + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) + + if v, ok := m["vhd_containers"]; ok { + buf.WriteString(fmt.Sprintf("%s-", v.(*schema.Set).List())) + } } return hashcode.String(buf.String()) @@ -1234,51 +1242,62 @@ func resourceArmVirtualMachineScaleSetStorageProfileOsDiskHash(v interface{}) in func resourceArmVirtualMachineScaleSetNetworkConfigurationHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) - buf.WriteString(fmt.Sprintf("%t-", m["primary"].(bool))) + + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) + buf.WriteString(fmt.Sprintf("%t-", m["primary"].(bool))) + } + return hashcode.String(buf.String()) } func resourceArmVirtualMachineScaleSetOsProfileLinuxConfigHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%t-", m["disable_password_authentication"].(bool))) + + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%t-", m["disable_password_authentication"].(bool))) + } return hashcode.String(buf.String()) } func resourceArmVirtualMachineScaleSetOsProfileWindowsConfigHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - if m["provision_vm_agent"] != nil { - buf.WriteString(fmt.Sprintf("%t-", m["provision_vm_agent"].(bool))) - } - if m["enable_automatic_upgrades"] != nil { - buf.WriteString(fmt.Sprintf("%t-", m["enable_automatic_upgrades"].(bool))) + + if m, ok := v.(map[string]interface{}); ok { + if v, ok := m["provision_vm_agent"]; ok { + buf.WriteString(fmt.Sprintf("%t-", v.(bool))) + } + if v, ok := m["enable_automatic_upgrades"]; ok { + buf.WriteString(fmt.Sprintf("%t-", v.(bool))) + } } + return hashcode.String(buf.String()) } func resourceArmVirtualMachineScaleSetExtensionHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) - buf.WriteString(fmt.Sprintf("%s-", m["publisher"].(string))) - buf.WriteString(fmt.Sprintf("%s-", m["type"].(string))) - buf.WriteString(fmt.Sprintf("%s-", m["type_handler_version"].(string))) - if m["auto_upgrade_minor_version"] != nil { - buf.WriteString(fmt.Sprintf("%t-", m["auto_upgrade_minor_version"].(bool))) - } - - // we need to ensure the whitespace is consistent - settings := m["settings"].(string) - if settings != "" { - expandedSettings, err := structure.ExpandJsonFromString(settings) - if err == nil { - serialisedSettings, err := structure.FlattenJsonToString(expandedSettings) + + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) + buf.WriteString(fmt.Sprintf("%s-", m["publisher"].(string))) + buf.WriteString(fmt.Sprintf("%s-", m["type"].(string))) + buf.WriteString(fmt.Sprintf("%s-", m["type_handler_version"].(string))) + + if v, ok := m["auto_upgrade_minor_version"]; ok { + buf.WriteString(fmt.Sprintf("%t-", v.(bool))) + } + + // we need to ensure the whitespace is consistent + settings := m["settings"].(string) + if settings != "" { + expandedSettings, err := structure.ExpandJsonFromString(settings) if err == nil { - buf.WriteString(fmt.Sprintf("%s-", serialisedSettings)) + serialisedSettings, err := structure.FlattenJsonToString(expandedSettings) + if err == nil { + buf.WriteString(fmt.Sprintf("%s-", serialisedSettings)) + } } } } diff --git a/azurerm/resource_arm_virtual_network.go b/azurerm/resource_arm_virtual_network.go index c5284ff719a3..60b255507714 100644 --- a/azurerm/resource_arm_virtual_network.go +++ b/azurerm/resource_arm_virtual_network.go @@ -336,12 +336,16 @@ func flattenVirtualNetworkDNSServers(input *network.DhcpOptions) []string { func resourceAzureSubnetHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%s", m["name"].(string))) - buf.WriteString(fmt.Sprintf("%s", m["address_prefix"].(string))) - if v, ok := m["security_group"]; ok { - buf.WriteString(v.(string)) + + if m, ok := v.(map[string]interface{}); ok { + buf.WriteString(fmt.Sprintf("%s", m["name"].(string))) + buf.WriteString(fmt.Sprintf("%s", m["address_prefix"].(string))) + + if v, ok := m["security_group"]; ok { + buf.WriteString(v.(string)) + } } + return hashcode.String(buf.String()) } From 5c25ccf0814c83d73e53996238dfdf5eea77fcd3 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 10 May 2018 14:29:08 -0700 Subject: [PATCH 103/320] azurerm_kubernetes_cluster: config_raw is now sensitive (#1225) * azurerm_kubernetes_cluster: config_raw is now sensitive * azurerm_kubernetes_cluster: datasource config_raw is now sensitive --- azurerm/data_source_kubernetes_cluster.go | 5 +++-- azurerm/resource_arm_kubernetes_cluster.go | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/azurerm/data_source_kubernetes_cluster.go b/azurerm/data_source_kubernetes_cluster.go index 10cd61503d02..3d1c5a36e70d 100644 --- a/azurerm/data_source_kubernetes_cluster.go +++ b/azurerm/data_source_kubernetes_cluster.go @@ -72,8 +72,9 @@ func dataSourceArmKubernetesCluster() *schema.Resource { }, "kube_config_raw": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "linux_profile": { diff --git a/azurerm/resource_arm_kubernetes_cluster.go b/azurerm/resource_arm_kubernetes_cluster.go index e19008358af3..a2eb75e4470c 100644 --- a/azurerm/resource_arm_kubernetes_cluster.go +++ b/azurerm/resource_arm_kubernetes_cluster.go @@ -87,8 +87,9 @@ func resourceArmKubernetesCluster() *schema.Resource { }, "kube_config_raw": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "linux_profile": { From 5116581f535eddb6c027931265b6ef6fcf645efd Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 10 May 2018 14:30:02 -0700 Subject: [PATCH 104/320] Updating to include #1225 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db6454389e1c..6256a4ec7643 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ IMPROVEMENTS: * `azurerm_app_service_slot` - support for HTTP2 [GH-1205] * `azurerm_cosmosdb_account` - added support for the `connection_strings` property [GH-1194] * `azurerm_key_vault_certificate` - exposing the `certificate_data` [GH-1200] +* `azurerm_kubernetes_cluster` - making `kube_config_raw` a sensitive field [GH-1225] * `azurerm_virtual_network` - guarding against nil-objects in the response [GH-1208] * `azurerm_virtual_network_gateway` - ignoring the case of the `GatewaySubnet` [GH-1141] From 7f1919d6b3683ee35953c8f30edd50b1361c6a68 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 10 May 2018 14:39:18 -0700 Subject: [PATCH 105/320] New Data Sources: `azurerm_key_vault` & `azurerm_key_vault_secret` (#1202) * New Data Source: `azurerm_key_vault_secret` Fixes #606 * Adding disclaimers about sensitive values in the state * New Data Source: `azurerm_key_vault * Prefixing the Data Source names with "Data Source" * Setting the ID's for the Data Sources * Fixing the test expectation * Returning an error message when the Key Vault / Key Vault Secret don't exist * Making the documentation consistent --- azurerm/data_source_key_vault.go | 210 ++++++++++++++++++ azurerm/data_source_key_vault_secret.go | 80 +++++++ azurerm/data_source_key_vault_secret_test.go | 78 +++++++ azurerm/data_source_key_vault_test.go | 90 ++++++++ azurerm/import_arm_key_vault_test.go | 23 ++ azurerm/provider.go | 2 + azurerm/resource_arm_key_vault.go | 22 +- azurerm/resource_arm_key_vault_test.go | 4 - website/azurerm.erb | 10 +- website/docs/d/key_vault.html.markdown | 74 ++++++ website/docs/d/key_vault_secret.html.markdown | 47 ++++ website/docs/d/public_ips.html.markdown | 2 +- .../docs/d/recovery_services_vault.markdown | 2 +- website/docs/r/key_vault.html.markdown | 10 +- website/docs/r/key_vault_secret.html.markdown | 5 +- 15 files changed, 638 insertions(+), 21 deletions(-) create mode 100644 azurerm/data_source_key_vault.go create mode 100644 azurerm/data_source_key_vault_secret.go create mode 100644 azurerm/data_source_key_vault_secret_test.go create mode 100644 azurerm/data_source_key_vault_test.go create mode 100644 website/docs/d/key_vault.html.markdown create mode 100644 website/docs/d/key_vault_secret.html.markdown diff --git a/azurerm/data_source_key_vault.go b/azurerm/data_source_key_vault.go new file mode 100644 index 000000000000..3107545aba0e --- /dev/null +++ b/azurerm/data_source_key_vault.go @@ -0,0 +1,210 @@ +package azurerm + +import ( + "fmt" + + "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault" + "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmKeyVault() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmKeyVaultRead, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateKeyVaultName, + }, + + "resource_group_name": resourceGroupNameForDataSourceSchema(), + + "location": locationForDataSourceSchema(), + + "sku": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + + "vault_uri": { + Type: schema.TypeString, + Computed: true, + }, + + "tenant_id": { + Type: schema.TypeString, + Computed: true, + }, + + "access_policy": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "tenant_id": { + Type: schema.TypeString, + Computed: true, + }, + "object_id": { + Type: schema.TypeString, + Computed: true, + }, + "application_id": { + Type: schema.TypeString, + Computed: true, + }, + "certificate_permissions": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "key_permissions": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "secret_permissions": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + }, + }, + }, + + "enabled_for_deployment": { + Type: schema.TypeBool, + Computed: true, + }, + + "enabled_for_disk_encryption": { + Type: schema.TypeBool, + Computed: true, + }, + + "enabled_for_template_deployment": { + Type: schema.TypeBool, + Computed: true, + }, + + "tags": tagsForDataSourceSchema(), + }, + } +} + +func dataSourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).keyVaultClient + ctx := meta.(*ArmClient).StopContext + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("KeyVault %q (Resource Group %q) does not exist", name, resourceGroup) + } + return fmt.Errorf("Error making Read request on KeyVault %q: %+v", name, err) + } + + d.SetId(*resp.ID) + + d.Set("name", resp.Name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azureRMNormalizeLocation(*location)) + } + + if props := resp.Properties; props != nil { + d.Set("tenant_id", props.TenantID.String()) + d.Set("enabled_for_deployment", props.EnabledForDeployment) + d.Set("enabled_for_disk_encryption", props.EnabledForDiskEncryption) + d.Set("enabled_for_template_deployment", props.EnabledForTemplateDeployment) + if err := d.Set("sku", flattenKeyVaultDataSourceSku(props.Sku)); err != nil { + return fmt.Errorf("Error flattening `sku` for KeyVault %q: %+v", resp.Name, err) + } + if err := d.Set("access_policy", flattenKeyVaultDataSourceAccessPolicies(props.AccessPolicies)); err != nil { + return fmt.Errorf("Error flattening `access_policy` for KeyVault %q: %+v", resp.Name, err) + } + d.Set("vault_uri", props.VaultURI) + } + + flattenAndSetTags(d, resp.Tags) + + return nil +} + +func flattenKeyVaultDataSourceSku(sku *keyvault.Sku) []interface{} { + result := map[string]interface{}{ + "name": string(sku.Name), + } + + return []interface{}{result} +} + +func flattenKeyVaultDataSourceAccessPolicies(policies *[]keyvault.AccessPolicyEntry) []interface{} { + result := make([]interface{}, 0, len(*policies)) + + if policies == nil { + return result + } + + for _, policy := range *policies { + policyRaw := make(map[string]interface{}) + + keyPermissionsRaw := make([]interface{}, 0) + secretPermissionsRaw := make([]interface{}, 0) + certificatePermissionsRaw := make([]interface{}, 0) + + if permissions := policy.Permissions; permissions != nil { + if keys := permissions.Keys; keys != nil { + for _, keyPermission := range *keys { + keyPermissionsRaw = append(keyPermissionsRaw, string(keyPermission)) + } + } + if secrets := permissions.Secrets; secrets != nil { + for _, secretPermission := range *secrets { + secretPermissionsRaw = append(secretPermissionsRaw, string(secretPermission)) + } + } + + if certificates := permissions.Certificates; certificates != nil { + for _, certificatePermission := range *certificates { + certificatePermissionsRaw = append(certificatePermissionsRaw, string(certificatePermission)) + } + } + } + + policyRaw["tenant_id"] = policy.TenantID.String() + if policy.ObjectID != nil { + policyRaw["object_id"] = *policy.ObjectID + } + if policy.ApplicationID != nil { + policyRaw["application_id"] = policy.ApplicationID.String() + } + policyRaw["key_permissions"] = keyPermissionsRaw + policyRaw["secret_permissions"] = secretPermissionsRaw + policyRaw["certificate_permissions"] = certificatePermissionsRaw + + result = append(result, policyRaw) + } + + return result +} diff --git a/azurerm/data_source_key_vault_secret.go b/azurerm/data_source_key_vault_secret.go new file mode 100644 index 000000000000..63962141d532 --- /dev/null +++ b/azurerm/data_source_key_vault_secret.go @@ -0,0 +1,80 @@ +package azurerm + +import ( + "fmt" + + "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmKeyVaultSecret() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmKeyVaultSecretRead, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "vault_uri": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "value": { + Type: schema.TypeString, + Computed: true, + Sensitive: true, + }, + + "content_type": { + Type: schema.TypeString, + Computed: true, + }, + + "version": { + Type: schema.TypeString, + Computed: true, + }, + + "tags": tagsForDataSourceSchema(), + }, + } +} + +func dataSourceArmKeyVaultSecretRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).keyVaultManagementClient + ctx := meta.(*ArmClient).StopContext + + name := d.Get("name").(string) + vaultUri := d.Get("vault_uri").(string) + + // we always want to get the latest version + resp, err := client.GetSecret(ctx, vaultUri, name, "") + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("KeyVault Secret %q (KeyVault URI %q) does not exist", name, vaultUri) + } + return fmt.Errorf("Error making Read request on Azure KeyVault Secret %s: %+v", name, err) + } + + // the version may have changed, so parse the updated id + respID, err := parseKeyVaultChildID(*resp.ID) + if err != nil { + return err + } + + d.SetId(*resp.ID) + + d.Set("name", respID.Name) + d.Set("vault_uri", respID.KeyVaultBaseUrl) + d.Set("value", resp.Value) + d.Set("version", respID.Version) + d.Set("content_type", resp.ContentType) + + flattenAndSetTags(d, resp.Tags) + return nil +} diff --git a/azurerm/data_source_key_vault_secret_test.go b/azurerm/data_source_key_vault_secret_test.go new file mode 100644 index 000000000000..29d7204b85e4 --- /dev/null +++ b/azurerm/data_source_key_vault_secret_test.go @@ -0,0 +1,78 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccDataSourceAzureRMKeyVaultSecret_basic(t *testing.T) { + dataSourceName := "data.azurerm_key_vault_secret.test" + + rString := acctest.RandString(8) + location := testLocation() + config := testAccDataSourceKeyVaultSecret_basic(rString, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "value", "rick-and-morty"), + resource.TestCheckResourceAttr(dataSourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMKeyVaultSecret_complete(t *testing.T) { + dataSourceName := "data.azurerm_key_vault_secret.test" + + rString := acctest.RandString(8) + location := testLocation() + config := testAccDataSourceKeyVaultSecret_complete(rString, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "value", ""), + resource.TestCheckResourceAttr(dataSourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(dataSourceName, "tags.hello", "world"), + ), + }, + }, + }) +} + +func testAccDataSourceKeyVaultSecret_basic(rString string, location string) string { + resource := testAccAzureRMKeyVaultSecret_basic(rString, location) + return fmt.Sprintf(` +%s + +data "azurerm_key_vault_secret" "test" { + name = "${azurerm_key_vault_secret.test.name}" + vault_uri = "${azurerm_key_vault_secret.test.vault_uri}" +} +`, resource) +} + +func testAccDataSourceKeyVaultSecret_complete(rString string, location string) string { + resource := testAccAzureRMKeyVaultSecret_complete(rString, location) + return fmt.Sprintf(` +%s + +data "azurerm_key_vault_secret" "test" { + name = "${azurerm_key_vault_secret.test.name}" + vault_uri = "${azurerm_key_vault_secret.test.vault_uri}" +} +`, resource) +} diff --git a/azurerm/data_source_key_vault_test.go b/azurerm/data_source_key_vault_test.go new file mode 100644 index 000000000000..d2881e3e799c --- /dev/null +++ b/azurerm/data_source_key_vault_test.go @@ -0,0 +1,90 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccDataSourceAzureRMKeyVault_basic(t *testing.T) { + dataSourceName := "data.azurerm_key_vault.test" + ri := acctest.RandInt() + location := testLocation() + config := testAccDataSourceAzureRMKeyVault_basic(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(dataSourceName), + resource.TestCheckResourceAttrSet(dataSourceName, "tenant_id"), + resource.TestCheckResourceAttrSet(dataSourceName, "sku.0.name"), + resource.TestCheckResourceAttrSet(dataSourceName, "access_policy.0.tenant_id"), + resource.TestCheckResourceAttrSet(dataSourceName, "access_policy.0.object_id"), + resource.TestCheckResourceAttr(dataSourceName, "access_policy.0.key_permissions.0", "create"), + resource.TestCheckResourceAttr(dataSourceName, "access_policy.0.secret_permissions.0", "set"), + resource.TestCheckResourceAttr(dataSourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMKeyVault_complete(t *testing.T) { + dataSourceName := "data.azurerm_key_vault.test" + ri := acctest.RandInt() + location := testLocation() + config := testAccDataSourceAzureRMKeyVault_complete(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(dataSourceName), + resource.TestCheckResourceAttrSet(dataSourceName, "tenant_id"), + resource.TestCheckResourceAttrSet(dataSourceName, "sku.0.name"), + resource.TestCheckResourceAttrSet(dataSourceName, "access_policy.0.tenant_id"), + resource.TestCheckResourceAttrSet(dataSourceName, "access_policy.0.object_id"), + resource.TestCheckResourceAttr(dataSourceName, "access_policy.0.key_permissions.0", "get"), + resource.TestCheckResourceAttr(dataSourceName, "access_policy.0.secret_permissions.0", "get"), + resource.TestCheckResourceAttr(dataSourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(dataSourceName, "tags.environment", "Production"), + ), + }, + }, + }) +} + +func testAccDataSourceAzureRMKeyVault_basic(rInt int, location string) string { + resource := testAccAzureRMKeyVault_basic(rInt, location) + return fmt.Sprintf(` +%s + +data "azurerm_key_vault" "test" { + name = "${azurerm_key_vault.test.name}" + resource_group_name = "${azurerm_key_vault.test.resource_group_name}" +} +`, resource) +} + +func testAccDataSourceAzureRMKeyVault_complete(rInt int, location string) string { + resource := testAccAzureRMKeyVault_complete(rInt, location) + return fmt.Sprintf(` +%s + +data "azurerm_key_vault" "test" { + name = "${azurerm_key_vault.test.name}" + resource_group_name = "${azurerm_key_vault.test.resource_group_name}" +} +`, resource) +} diff --git a/azurerm/import_arm_key_vault_test.go b/azurerm/import_arm_key_vault_test.go index dd0fe04d39b3..5612b8a07a70 100644 --- a/azurerm/import_arm_key_vault_test.go +++ b/azurerm/import_arm_key_vault_test.go @@ -29,3 +29,26 @@ func TestAccAzureRMKeyVault_importBasic(t *testing.T) { }, }) } + +func TestAccAzureRMKeyVault_importComplete(t *testing.T) { + resourceName := "azurerm_key_vault.test" + + ri := acctest.RandInt() + config := testAccAzureRMKeyVault_complete(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} diff --git a/azurerm/provider.go b/azurerm/provider.go index bdc6d44bdd20..96971de5e67e 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -87,7 +87,9 @@ func Provider() terraform.ResourceProvider { "azurerm_dns_zone": dataSourceArmDnsZone(), "azurerm_eventhub_namespace": dataSourceEventHubNamespace(), "azurerm_image": dataSourceArmImage(), + "azurerm_key_vault": dataSourceArmKeyVault(), "azurerm_key_vault_access_policy": dataSourceArmKeyVaultAccessPolicy(), + "azurerm_key_vault_secret": dataSourceArmKeyVaultSecret(), "azurerm_kubernetes_cluster": dataSourceArmKubernetesCluster(), "azurerm_managed_disk": dataSourceArmManagedDisk(), "azurerm_network_interface": dataSourceArmNetworkInterface(), diff --git a/azurerm/resource_arm_key_vault.go b/azurerm/resource_arm_key_vault.go index 7691ee6abd52..2a30b0b92069 100644 --- a/azurerm/resource_arm_key_vault.go +++ b/azurerm/resource_arm_key_vault.go @@ -278,16 +278,22 @@ func resourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { if location := resp.Location; location != nil { d.Set("location", azureRMNormalizeLocation(*location)) } - d.Set("tenant_id", resp.Properties.TenantID.String()) - d.Set("enabled_for_deployment", resp.Properties.EnabledForDeployment) - d.Set("enabled_for_disk_encryption", resp.Properties.EnabledForDiskEncryption) - d.Set("enabled_for_template_deployment", resp.Properties.EnabledForTemplateDeployment) - d.Set("sku", flattenKeyVaultSku(resp.Properties.Sku)) - d.Set("access_policy", flattenKeyVaultAccessPolicies(resp.Properties.AccessPolicies)) - d.Set("vault_uri", resp.Properties.VaultURI) - flattenAndSetTags(d, resp.Tags) + if props := resp.Properties; props != nil { + d.Set("tenant_id", props.TenantID.String()) + d.Set("enabled_for_deployment", props.EnabledForDeployment) + d.Set("enabled_for_disk_encryption", props.EnabledForDiskEncryption) + d.Set("enabled_for_template_deployment", props.EnabledForTemplateDeployment) + if err := d.Set("sku", flattenKeyVaultSku(props.Sku)); err != nil { + return fmt.Errorf("Error flattening `sku` for KeyVault %q: %+v", resp.Name, err) + } + if err := d.Set("access_policy", flattenKeyVaultAccessPolicies(props.AccessPolicies)); err != nil { + return fmt.Errorf("Error flattening `access_policy` for KeyVault %q: %+v", resp.Name, err) + } + d.Set("vault_uri", props.VaultURI) + } + flattenAndSetTags(d, resp.Tags) return nil } diff --git a/azurerm/resource_arm_key_vault_test.go b/azurerm/resource_arm_key_vault_test.go index 15950a8cbbb1..e8f79974d29c 100644 --- a/azurerm/resource_arm_key_vault_test.go +++ b/azurerm/resource_arm_key_vault_test.go @@ -230,10 +230,6 @@ resource "azurerm_key_vault" "test" { "set", ] } - - tags { - environment = "Production" - } } `, rInt, location, rInt) } diff --git a/website/azurerm.erb b/website/azurerm.erb index 4985c36ffb61..8a205cdae715 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -68,14 +68,22 @@ azurerm_image + > + azurerm_key_vault + + > azurerm_key_vault_access_policy + > + azurerm_key_vault_secret + + > azurerm_kubernetes_cluster - + > azurerm_managed_disk diff --git a/website/docs/d/key_vault.html.markdown b/website/docs/d/key_vault.html.markdown new file mode 100644 index 000000000000..0c9a73e88b47 --- /dev/null +++ b/website/docs/d/key_vault.html.markdown @@ -0,0 +1,74 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_key_vault" +sidebar_current: "docs-azurerm-data-source-key-vault-x" +description: |- + Gets information about a Key Vault. +--- + +# Data Source: azurerm_key_vault + +Gets information about a Key Vault. + +## Example Usage + +```hcl +data "azurerm_key_vault" "test" { + name = "mykeyvault" + resource_group_name = "some-resource-group" +} + +output "vault_uri" { + value = "${data.azurerm_key_vault.test.vault_uri}" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the Key Vault. + +* `resource_group_name` - (Required) The name of the Resource Group in which the Key Vault exists. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The Vault ID. + +* `vault_uri` - The URI of the vault for performing operations on keys and secrets. + +* `location` - The Azure Region in which the Key Vault exists. + +* `sku` - A `sku` block as described below. + +* `tenant_id` - The Azure Active Directory Tenant ID used for authenticating requests to the Key Vault. + +* `access_policy` - One or more `access_policy` blocks as defined below. + +* `enabled_for_deployment` - Can Azure Virtual Machines retrieve certificates stored as secrets from the Key Vault? + +* `enabled_for_disk_encryption` - Can Azure Disk Encryption retrieve secrets from the Key Vault? + +* `enabled_for_template_deployment` - Can Azure Resource Manager retrieve secrets from the Key Vault? + +* `tags` - A mapping of tags assigned to the Key Vault. + +A `sku` block exports the following: + +* `name` - The name of the SKU used for this Key Vault. + +`access_policy` supports the following: + +* `tenant_id` - The Azure Active Directory Tenant ID used to authenticate requests for this Key Vault. + +* `object_id` - An Object ID of a User, Service Principal or Security Group. + +* `application_id` - The Object ID of a Azure Active Directory Application. + +* `certificate_permissions` - A list of certificate permissions applicable to this Access Policy. + +* `key_permissions` - A list of key permissions applicable to this Access Policy. + +* `secret_permissions` - A list of secret permissions applicable to this Access Policy. \ No newline at end of file diff --git a/website/docs/d/key_vault_secret.html.markdown b/website/docs/d/key_vault_secret.html.markdown new file mode 100644 index 000000000000..2274b34ca7fa --- /dev/null +++ b/website/docs/d/key_vault_secret.html.markdown @@ -0,0 +1,47 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_key_vault_secret" +sidebar_current: "docs-azurerm-data-source-key-vault-secret" +description: |- + Returns information about the specified Key Vault Secret. + +--- + +# Data Source: azurerm_key_vault_secret + +Returns information about the specified Key Vault Secret. + +~> **Note:** All arguments including the secret value will be stored in the raw state as plain-text. +[Read more about sensitive data in state](/docs/state/sensitive-data.html). + +## Example Usage + +```hcl +data "azurerm_key_vault_secret" "test" { + name = "secret-sauce" + vault_uri = "https://rickslab.vault.azure.net/" +} + +output "secret_value" { + value = "${data.azurerm_key_vault_secret.test.value}" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the Key Vault Secret. + +* `vault_uri` - (Required) Specifies the URI used to access the Key Vault instance, available on the `azurerm_key_vault` Data Source / Resource. + + +## Attributes Reference + +The following attributes are exported: + +* `id` - The Key Vault Secret ID. +* `value` - The value of the Key Vault Secret. +* `version` - The current version of the Key Vault Secret. +* `content_type` - The content type for the Key Vault Secret. +* `tags` - Any tags assigned to this resource. diff --git a/website/docs/d/public_ips.html.markdown b/website/docs/d/public_ips.html.markdown index 09051f11cc99..d2fbeb9c1aca 100644 --- a/website/docs/d/public_ips.html.markdown +++ b/website/docs/d/public_ips.html.markdown @@ -6,7 +6,7 @@ description: |- Provides a list of public IP addresses. --- -# azurerm_public_ips +# Data Source: azurerm_public_ips Use this data source to access a filtered list of Public IP Addresses diff --git a/website/docs/d/recovery_services_vault.markdown b/website/docs/d/recovery_services_vault.markdown index fae00f753378..2b377e8d256a 100644 --- a/website/docs/d/recovery_services_vault.markdown +++ b/website/docs/d/recovery_services_vault.markdown @@ -6,7 +6,7 @@ description: |- Get information about the specified Recovery Services Vault. --- -# azurerm_recovery_services_vault +# Data Source: azurerm_recovery_services_vault Use this data source to access the properties of a Recovery Services Vault. diff --git a/website/docs/r/key_vault.html.markdown b/website/docs/r/key_vault.html.markdown index 1a139de54abb..8075ec52c174 100644 --- a/website/docs/r/key_vault.html.markdown +++ b/website/docs/r/key_vault.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_key_vault" sidebar_current: "docs-azurerm-resource-key-vault-x" description: |- - Create a Key Vault. + Manages a Key Vault. --- -# azurerm\_key\_vault +# azurerm_key_vault -Create a Key Vault. +Manages a Key Vault. ## Example Usage @@ -54,14 +54,14 @@ resource "azurerm_key_vault" "test" { The following arguments are supported: -* `name` - (Required) Specifies the name of the Key Vault resource. Changing this +* `name` - (Required) Specifies the name of the Key Vault. Changing this forces a new resource to be created. * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. * `resource_group_name` - (Required) The name of the resource group in which to - create the namespace. Changing this forces a new resource to be created. + create the Key Vault. Changing this forces a new resource to be created. * `sku` - (Required) An SKU block as described below. diff --git a/website/docs/r/key_vault_secret.html.markdown b/website/docs/r/key_vault_secret.html.markdown index 1de6e5a2477c..54df8eb22a24 100644 --- a/website/docs/r/key_vault_secret.html.markdown +++ b/website/docs/r/key_vault_secret.html.markdown @@ -7,10 +7,13 @@ description: |- --- -# azurerm\_key\_vault\_secret +# azurerm_key_vault_secret Manages a Key Vault Secret. +~> **Note:** All arguments including the secret value will be stored in the raw state as plain-text. +[Read more about sensitive data in state](/docs/state/sensitive-data.html). + ## Example Usage ```hcl From 9638a19e49766b6f2feb636ae4400d6eb2d36a6a Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 10 May 2018 14:40:05 -0700 Subject: [PATCH 106/320] Updating to include #1202 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6256a4ec7643..d5039970df71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ FEATURES: * **New Data Source:** `azurerm_cosmosdb_account` [GH-1056] * **New Data Source:** `azurerm_kubernetes_cluster` [GH-1204] +* **New Data Source:** `azurerm_key_vault` [GH-1202] +* **New Data Source:** `azurerm_key_vault_secret` [GH-1202] * **New Data Source:** `azurerm_route_table` [GH-1203] IMPROVEMENTS: From 0ef7d079d4a44fd1378cc1b8728ab60bd1f04e76 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 10 May 2018 14:41:11 -0700 Subject: [PATCH 107/320] Data Sources: returning an error when resources don't exist (#1223) --- azurerm/data_source_app_service.go | 5 +---- azurerm/data_source_app_service_plan.go | 3 +-- azurerm/data_source_application_security_group.go | 3 +-- azurerm/data_source_cdn_profile.go | 3 +-- azurerm/data_source_cosmos_db_account.go | 3 +-- azurerm/data_source_dns_zone.go | 3 +-- azurerm/data_source_eventhub_namespace.go | 3 +-- azurerm/data_source_image.go | 6 ++---- azurerm/data_source_kubernetes_cluster.go | 3 +-- azurerm/data_source_managed_disk.go | 9 ++++----- azurerm/data_source_network_interface.go | 3 +-- azurerm/data_source_network_security_group.go | 2 +- azurerm/data_source_public_ip.go | 2 +- azurerm/data_source_public_ips.go | 6 ------ azurerm/data_source_recovery_services_vault.go | 3 +-- azurerm/data_source_resource_group.go | 6 ++++++ azurerm/data_source_role_definition.go | 2 +- azurerm/data_source_route_table.go | 3 +-- azurerm/data_source_scheduler_job_collection.go | 3 +-- azurerm/data_source_snapshot.go | 4 ++++ azurerm/data_source_storage_account.go | 3 +-- azurerm/data_source_subnet.go | 9 ++++----- azurerm/data_source_subscription.go | 5 +++++ azurerm/data_source_virtual_network.go | 5 +++-- azurerm/data_source_virtual_network_gateway.go | 2 +- 25 files changed, 45 insertions(+), 54 deletions(-) diff --git a/azurerm/data_source_app_service.go b/azurerm/data_source_app_service.go index 4121cbe2113d..67f3e9bb9473 100644 --- a/azurerm/data_source_app_service.go +++ b/azurerm/data_source_app_service.go @@ -2,7 +2,6 @@ package azurerm import ( "fmt" - "log" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -218,9 +217,7 @@ func dataSourceArmAppServiceRead(d *schema.ResourceData, meta interface{}) error resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] App Service %q (resource group %q) was not found - removing from state", name, resourceGroup) - d.SetId("") - return nil + return fmt.Errorf("Error: App Service %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error making Read request on AzureRM App Service %q: %+v", name, err) } diff --git a/azurerm/data_source_app_service_plan.go b/azurerm/data_source_app_service_plan.go index b3c6761276fe..ea76e8781684 100644 --- a/azurerm/data_source_app_service_plan.go +++ b/azurerm/data_source_app_service_plan.go @@ -94,8 +94,7 @@ func dataSourceAppServicePlanRead(d *schema.ResourceData, meta interface{}) erro } if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: App Service Plan %q (Resource Group %q) was not found", name, resourceGroup) } d.SetId(*resp.ID) diff --git a/azurerm/data_source_application_security_group.go b/azurerm/data_source_application_security_group.go index 5c3d5e2661ee..1976c78e0ea5 100644 --- a/azurerm/data_source_application_security_group.go +++ b/azurerm/data_source_application_security_group.go @@ -39,8 +39,7 @@ func dataSourceArmApplicationSecurityGroupRead(d *schema.ResourceData, meta inte resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: Application Security Group %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error making Read request on Application Security Group %q (Resource Group %q): %+v", name, resourceGroup, err) diff --git a/azurerm/data_source_cdn_profile.go b/azurerm/data_source_cdn_profile.go index e9e0c7997da5..f68952c538df 100644 --- a/azurerm/data_source_cdn_profile.go +++ b/azurerm/data_source_cdn_profile.go @@ -41,8 +41,7 @@ func dataSourceArmCdnProfileRead(d *schema.ResourceData, meta interface{}) error resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: CDN Profile %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error making Read request on Azure CDN Profile %q (Resource Group %q): %+v", name, resourceGroup, err) } diff --git a/azurerm/data_source_cosmos_db_account.go b/azurerm/data_source_cosmos_db_account.go index 2eaf979689bc..16b5697dfd4e 100644 --- a/azurerm/data_source_cosmos_db_account.go +++ b/azurerm/data_source_cosmos_db_account.go @@ -147,8 +147,7 @@ func dataSourceArmCosmosDBAccountRead(d *schema.ResourceData, meta interface{}) resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: CosmosDB Account %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error making Read request on AzureRM CosmosDB Account %s (Resource Group %q): %+v", name, resourceGroup, err) diff --git a/azurerm/data_source_dns_zone.go b/azurerm/data_source_dns_zone.go index af251eed1462..3c62bd5a09f8 100644 --- a/azurerm/data_source_dns_zone.go +++ b/azurerm/data_source_dns_zone.go @@ -51,8 +51,7 @@ func dataSourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: DNS Zone %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error reading DNS Zone %q (Resource Group %q): %+v", name, resourceGroup, err) } diff --git a/azurerm/data_source_eventhub_namespace.go b/azurerm/data_source_eventhub_namespace.go index 5b375eb36247..0897273e8322 100644 --- a/azurerm/data_source_eventhub_namespace.go +++ b/azurerm/data_source_eventhub_namespace.go @@ -77,8 +77,7 @@ func dataSourceEventHubNamespaceRead(d *schema.ResourceData, meta interface{}) e resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: EventHub Namespace %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error making Read request on EventHub Namespace %q (Resource Group %q): %+v", name, resourceGroup, err) diff --git a/azurerm/data_source_image.go b/azurerm/data_source_image.go index 814fdd091a32..8ced006c2254 100644 --- a/azurerm/data_source_image.go +++ b/azurerm/data_source_image.go @@ -126,8 +126,7 @@ func dataSourceArmImageRead(d *schema.ResourceData, meta interface{}) error { var err error if img, err = client.Get(ctx, resGroup, name, ""); err != nil { if utils.ResponseWasNotFound(img.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: Image %q (Resource Group %q) was not found", name, resGroup) } return fmt.Errorf("[ERROR] Error making Read request on Azure Image %q (resource group %q): %+v", name, resGroup, err) } @@ -138,8 +137,7 @@ func dataSourceArmImageRead(d *schema.ResourceData, meta interface{}) error { resp, err := client.ListByResourceGroupComplete(ctx, resGroup) if err != nil { if utils.ResponseWasNotFound(resp.Response().Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: Image %q (Resource Group %q) was not found", name, resGroup) } return fmt.Errorf("[ERROR] Error getting list of images (resource group %q): %+v", resGroup, err) } diff --git a/azurerm/data_source_kubernetes_cluster.go b/azurerm/data_source_kubernetes_cluster.go index 3d1c5a36e70d..b063252ff72a 100644 --- a/azurerm/data_source_kubernetes_cluster.go +++ b/azurerm/data_source_kubernetes_cluster.go @@ -175,8 +175,7 @@ func dataSourceArmKubernetesClusterRead(d *schema.ResourceData, meta interface{} resp, err := kubernetesClustersClient.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: AKS Managed Cluster %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error making Read request on AKS Managed Cluster %q (resource group %q): %+v", name, resourceGroup, err) diff --git a/azurerm/data_source_managed_disk.go b/azurerm/data_source_managed_disk.go index 10638dfecacd..4a16c8863c7c 100644 --- a/azurerm/data_source_managed_disk.go +++ b/azurerm/data_source_managed_disk.go @@ -2,9 +2,9 @@ package azurerm import ( "fmt" - "net/http" "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmManagedDisk() *schema.Resource { @@ -60,11 +60,10 @@ func dataSourceArmManagedDiskRead(d *schema.ResourceData, meta interface{}) erro resp, err := client.Get(ctx, resGroup, name) if err != nil { - if resp.StatusCode == http.StatusNotFound { - d.SetId("") - return nil + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: Managed Disk %q (Resource Group %q) was not found", name, resGroup) } - return fmt.Errorf("[ERROR] Error making Read request on Azure Managed Disk %s (resource group %s): %s", name, resGroup, err) + return fmt.Errorf("[ERROR] Error making Read request on Azure Managed Disk %q (Resource Group %q): %s", name, resGroup, err) } d.SetId(*resp.ID) diff --git a/azurerm/data_source_network_interface.go b/azurerm/data_source_network_interface.go index 4a6580a92e5f..46aacd3785a0 100644 --- a/azurerm/data_source_network_interface.go +++ b/azurerm/data_source_network_interface.go @@ -171,8 +171,7 @@ func dataSourceArmNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) resp, err := client.Get(ctx, resGroup, name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: Network Interface %q (Resource Group %q) was not found", name, resGroup) } return fmt.Errorf("Error making Read request on Azure Network Interface %q (Resource Group %q): %+v", name, resGroup, err) } diff --git a/azurerm/data_source_network_security_group.go b/azurerm/data_source_network_security_group.go index 5931ce9246e0..4dd5502c3e87 100644 --- a/azurerm/data_source_network_security_group.go +++ b/azurerm/data_source_network_security_group.go @@ -135,7 +135,7 @@ func dataSourceArmNetworkSecurityGroupRead(d *schema.ResourceData, meta interfac resp, err := client.Get(ctx, resourceGroup, name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") + return fmt.Errorf("Error: Network Security Group %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error making Read request on Network Security Group %q (Resource Group %q): %+v", name, resourceGroup, err) } diff --git a/azurerm/data_source_public_ip.go b/azurerm/data_source_public_ip.go index 6553c671de40..5c338dc26ffe 100644 --- a/azurerm/data_source_public_ip.go +++ b/azurerm/data_source_public_ip.go @@ -53,7 +53,7 @@ func dataSourceArmPublicIPRead(d *schema.ResourceData, meta interface{}) error { resp, err := client.Get(ctx, resGroup, name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") + return fmt.Errorf("Error: Public IP %q (Resource Group %q) was not found", name, resGroup) } return fmt.Errorf("Error making Read request on Azure public ip %s: %s", name, err) } diff --git a/azurerm/data_source_public_ips.go b/azurerm/data_source_public_ips.go index 3b236d276500..b4664cd77d81 100644 --- a/azurerm/data_source_public_ips.go +++ b/azurerm/data_source_public_ips.go @@ -9,7 +9,6 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmPublicIPs() *schema.Resource { @@ -79,11 +78,6 @@ func dataSourceArmPublicIPsRead(d *schema.ResourceData, meta interface{}) error log.Printf("[DEBUG] Reading Public IP's in Resource Group %q", resourceGroup) resp, err := client.List(ctx, resourceGroup) if err != nil { - if utils.ResponseWasNotFound(resp.Response().Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error listing Public IP Addresses in the Resource Group %q: %v", resourceGroup, err) } diff --git a/azurerm/data_source_recovery_services_vault.go b/azurerm/data_source_recovery_services_vault.go index 203dbf4286a7..9737b6225e6c 100644 --- a/azurerm/data_source_recovery_services_vault.go +++ b/azurerm/data_source_recovery_services_vault.go @@ -48,8 +48,7 @@ func dataSourceArmRecoveryServicesVaultRead(d *schema.ResourceData, meta interfa vault, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(vault.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: Recovery Services Vault %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error making Read request on Recovery Service Vault %q (Resource Group %q): %+v", name, resourceGroup, err) diff --git a/azurerm/data_source_resource_group.go b/azurerm/data_source_resource_group.go index e51e446cc902..10426ba87c47 100644 --- a/azurerm/data_source_resource_group.go +++ b/azurerm/data_source_resource_group.go @@ -1,7 +1,10 @@ package azurerm import ( + "fmt" + "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmResourceGroup() *schema.Resource { @@ -23,6 +26,9 @@ func dataSourceArmResourceGroupRead(d *schema.ResourceData, meta interface{}) er name := d.Get("name").(string) resp, err := client.Get(ctx, name) if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: Resource Group %q was not found", name) + } return err } diff --git a/azurerm/data_source_role_definition.go b/azurerm/data_source_role_definition.go index 7c863d74f2a0..686dd0b3fe84 100644 --- a/azurerm/data_source_role_definition.go +++ b/azurerm/data_source_role_definition.go @@ -74,7 +74,7 @@ func dataSourceArmRoleDefinitionRead(d *schema.ResourceData, meta interface{}) e role, err := client.Get(ctx, scope, roleDefinitionId) if err != nil { - return fmt.Errorf("Error loadng Role Definition: %+v", err) + return fmt.Errorf("Error loading Role Definition: %+v", err) } d.SetId(*role.ID) diff --git a/azurerm/data_source_route_table.go b/azurerm/data_source_route_table.go index d1ca24376730..0afea7306b70 100644 --- a/azurerm/data_source_route_table.go +++ b/azurerm/data_source_route_table.go @@ -72,8 +72,7 @@ func dataSourceArmRouteTableRead(d *schema.ResourceData, meta interface{}) error resp, err := client.Get(ctx, resourceGroup, name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: Route Table %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error making Read request on Azure Route Table %q: %+v", name, err) } diff --git a/azurerm/data_source_scheduler_job_collection.go b/azurerm/data_source_scheduler_job_collection.go index 0fd143008fdd..6141e5379c8d 100644 --- a/azurerm/data_source_scheduler_job_collection.go +++ b/azurerm/data_source_scheduler_job_collection.go @@ -77,8 +77,7 @@ func dataSourceArmSchedulerJobCollectionRead(d *schema.ResourceData, meta interf collection, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(collection.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: Scheduler Job Collection %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error making Read request on Scheduler Job Collection %q (Resource Group %q): %+v", name, resourceGroup, err) diff --git a/azurerm/data_source_snapshot.go b/azurerm/data_source_snapshot.go index c5400c99a9e0..6d6e2f012877 100644 --- a/azurerm/data_source_snapshot.go +++ b/azurerm/data_source_snapshot.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmSnapshot() *schema.Resource { @@ -106,6 +107,9 @@ func dataSourceArmSnapshotRead(d *schema.ResourceData, meta interface{}) error { resp, err := client.Get(ctx, resourceGroup, name) if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: Snapshot %q (Resource Group %q) was not found", name, resourceGroup) + } return fmt.Errorf("Error loading Snapshot %q (Resource Group %q): %+v", name, resourceGroup, err) } diff --git a/azurerm/data_source_storage_account.go b/azurerm/data_source_storage_account.go index 298161c092c4..49002cbffa9c 100644 --- a/azurerm/data_source_storage_account.go +++ b/azurerm/data_source_storage_account.go @@ -169,8 +169,7 @@ func dataSourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) e resp, err := client.GetProperties(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: Storage Account %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error reading the state of AzureRM Storage Account %q: %+v", name, err) } diff --git a/azurerm/data_source_subnet.go b/azurerm/data_source_subnet.go index 042e702ffa25..74df16535706 100644 --- a/azurerm/data_source_subnet.go +++ b/azurerm/data_source_subnet.go @@ -57,9 +57,9 @@ func dataSourceArmSubnetRead(d *schema.ResourceData, meta interface{}) error { name := d.Get("name").(string) virtualNetworkName := d.Get("virtual_network_name").(string) - resourceGroupName := d.Get("resource_group_name").(string) + resourceGroup := d.Get("resource_group_name").(string) - resp, err := client.Get(ctx, resourceGroupName, virtualNetworkName, name, "") + resp, err := client.Get(ctx, resourceGroup, virtualNetworkName, name, "") if err != nil { return fmt.Errorf("Error reading Subnet: %+v", err) } @@ -68,14 +68,13 @@ func dataSourceArmSubnetRead(d *schema.ResourceData, meta interface{}) error { if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: Subnet %q (Virtual Network %q / Resource Group %q) was not found", name, resourceGroup, virtualNetworkName) } return fmt.Errorf("Error making Read request on Azure Subnet %q: %+v", name, err) } d.Set("name", name) - d.Set("resource_group_name", resourceGroupName) + d.Set("resource_group_name", resourceGroup) d.Set("virtual_network_name", virtualNetworkName) if props := resp.SubnetPropertiesFormat; props != nil { diff --git a/azurerm/data_source_subscription.go b/azurerm/data_source_subscription.go index e28320863fde..c872549c8400 100644 --- a/azurerm/data_source_subscription.go +++ b/azurerm/data_source_subscription.go @@ -5,6 +5,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/subscription" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmSubscription() *schema.Resource { @@ -26,6 +27,10 @@ func dataSourceArmSubscriptionRead(d *schema.ResourceData, meta interface{}) err resp, err := groupClient.Get(ctx, subscriptionId) if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: Subscription %q was not found", subscriptionId) + } + return fmt.Errorf("Error reading subscription: %+v", err) } diff --git a/azurerm/data_source_virtual_network.go b/azurerm/data_source_virtual_network.go index 167d6eaa6e28..4e9f221ecfee 100644 --- a/azurerm/data_source_virtual_network.go +++ b/azurerm/data_source_virtual_network.go @@ -64,9 +64,10 @@ func dataSourceArmVnetRead(d *schema.ResourceData, meta interface{}) error { resp, err := client.Get(ctx, resGroup, name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Error making Read request on Azure virtual network %q (resource group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error: Virtual Network %q (Resource Group %q) was not found", name, resGroup) } - return err + + return fmt.Errorf("Error making Read request on Virtual Network %q (resource group %q): %+v", name, resGroup, err) } d.SetId(*resp.ID) diff --git a/azurerm/data_source_virtual_network_gateway.go b/azurerm/data_source_virtual_network_gateway.go index b47283d7a0c2..0efb7792a523 100644 --- a/azurerm/data_source_virtual_network_gateway.go +++ b/azurerm/data_source_virtual_network_gateway.go @@ -162,7 +162,7 @@ func dataSourceArmVirtualNetworkGatewayRead(d *schema.ResourceData, meta interfa resp, err := client.Get(ctx, resGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Virtual Network Gateway %q (Resource Group %q) was not found!", name, resGroup) + return fmt.Errorf("Virtual Network Gateway %q (Resource Group %q) was not found", name, resGroup) } return fmt.Errorf("Error making Read request on AzureRM Virtual Network Gateway %q (Resource Group %q): %+v", name, resGroup, err) From 150e426d6d4c7ede6319b38761de5166fb3708ac Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 10 May 2018 14:42:23 -0700 Subject: [PATCH 108/320] Updating to include a section about a breaking change in Data Sources --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5039970df71..606d313c2add 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 1.5.0 (Unreleased) +UPGRADE NOTES: + +~> **Please Note:** Prior to v1.5 Data Sources in the AzureRM Provider returned `nil` rather than an error message when a Resource didn't exist, which was a bug. In order to bring this into line with other Providers - starting in v1.5 the AzureRM Provider will return an error message when a resource doesn't exist. + FEATURES: * **New Data Source:** `azurerm_cosmosdb_account` [GH-1056] From 95a820c20ee73c830633d7c5bd38917f5a59f32c Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 13 May 2018 08:28:51 -0700 Subject: [PATCH 109/320] Added Import support to Redis Cache/Firewall Rule (#1211) * `azurerm_redis_cache` - support for importing * `azurerm_firewall_rule` - support for import * Setting the redis_configuration using the correct types * maxclients becomes computed * Documenting a known bug in the API * Documenting the behaviour of the storage_connection_string field * Working around broken API's --- azurerm/import_arm_redis_cache_test.go | 219 ++++++++++++++++++ .../import_arm_redis_firewall_rule_test.go | 31 +++ azurerm/resource_arm_redis_cache.go | 80 +++++-- azurerm/resource_arm_redis_cache_test.go | 31 +-- azurerm/resource_arm_redis_firewall_rule.go | 3 + website/docs/r/redis_cache.html.markdown | 29 ++- .../docs/r/redis_firewall_rule.html.markdown | 8 + 7 files changed, 370 insertions(+), 31 deletions(-) create mode 100644 azurerm/import_arm_redis_cache_test.go create mode 100644 azurerm/import_arm_redis_firewall_rule_test.go diff --git a/azurerm/import_arm_redis_cache_test.go b/azurerm/import_arm_redis_cache_test.go new file mode 100644 index 000000000000..694d9b6c948c --- /dev/null +++ b/azurerm/import_arm_redis_cache_test.go @@ -0,0 +1,219 @@ +package azurerm + +import ( + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccAzureRMRedisCache_importBasic(t *testing.T) { + resourceName := "azurerm_redis_cache.test" + + ri := acctest.RandInt() + config := testAccAzureRMRedisCache_basic(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRedisCacheDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMRedisCache_importStandard(t *testing.T) { + resourceName := "azurerm_redis_cache.test" + + ri := acctest.RandInt() + config := testAccAzureRMRedisCache_standard(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRedisCacheDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMRedisCache_importPremium(t *testing.T) { + resourceName := "azurerm_redis_cache.test" + + ri := acctest.RandInt() + config := testAccAzureRMRedisCache_premium(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRedisCacheDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMRedisCache_importPremiumSharded(t *testing.T) { + resourceName := "azurerm_redis_cache.test" + + ri := acctest.RandInt() + config := testAccAzureRMRedisCache_premiumSharded(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRedisCacheDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMRedisCache_importNonStandardCasing(t *testing.T) { + resourceName := "azurerm_redis_cache.test" + + ri := acctest.RandInt() + config := testAccAzureRMRedisCacheNonStandardCasing(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRedisCacheDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMRedisCache_importBackupEnabled(t *testing.T) { + resourceName := "azurerm_redis_cache.test" + + ri := acctest.RandInt() + rs := acctest.RandString(4) + config := testAccAzureRMRedisCacheBackupEnabled(ri, rs, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRedisCacheDestroy, + Steps: []resource.TestStep{ + { + Config: config, + // `redis_configuration.0.rdb_storage_connection_string` is returned as: + // "...;AccountKey=[key hidden]" rather than "...;AccountKey=fsjfvjnfnf" + // TODO: remove this once the Bug's been fixed: + // https://github.com/Azure/azure-rest-api-specs/issues/3037 + ExpectNonEmptyPlan: true, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"redis_configuration.0.rdb_storage_connection_string"}, + }, + }, + }) +} + +func TestAccAzureRMRedisCache_importPatchSchedule(t *testing.T) { + resourceName := "azurerm_redis_cache.test" + ri := acctest.RandInt() + location := testLocation() + config := testAccAzureRMRedisCachePatchSchedule(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRedisCacheDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} +func TestAccAzureRMRedisCache_importInternalSubnet(t *testing.T) { + resourceName := "azurerm_redis_cache.test" + ri := acctest.RandInt() + config := testAccAzureRMRedisCache_internalSubnet(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRedisCacheDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMRedisCache_importInternalSubnetStaticIP(t *testing.T) { + resourceName := "azurerm_redis_cache.test" + ri := acctest.RandInt() + config := testAccAzureRMRedisCache_internalSubnetStaticIP(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRedisCacheDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} diff --git a/azurerm/import_arm_redis_firewall_rule_test.go b/azurerm/import_arm_redis_firewall_rule_test.go new file mode 100644 index 000000000000..cf2da3897830 --- /dev/null +++ b/azurerm/import_arm_redis_firewall_rule_test.go @@ -0,0 +1,31 @@ +package azurerm + +import ( + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccAzureRMRedisFirewallRule_importBasic(t *testing.T) { + resourceName := "azurerm_redis_firewall_rule.test" + + ri := acctest.RandInt() + config := testAccAzureRMRedisFirewallRule_basic(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRedisFirewallRuleDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} diff --git a/azurerm/resource_arm_redis_cache.go b/azurerm/resource_arm_redis_cache.go index 4fc3e041d0b4..a7934a6d3aae 100644 --- a/azurerm/resource_arm_redis_cache.go +++ b/azurerm/resource_arm_redis_cache.go @@ -23,6 +23,9 @@ func resourceArmRedisCache() *schema.Resource { Read: resourceArmRedisCacheRead, Update: resourceArmRedisCacheUpdate, Delete: resourceArmRedisCacheDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, Schema: map[string]*schema.Schema{ "name": { @@ -95,7 +98,6 @@ func resourceArmRedisCache() *schema.Resource { Schema: map[string]*schema.Schema{ "maxclients": { Type: schema.TypeInt, - Optional: true, Computed: true, }, @@ -444,8 +446,13 @@ func resourceArmRedisCacheRead(d *schema.ResourceData, meta interface{}) error { d.Set("subnet_id", props.SubnetID) } - redisConfiguration := flattenRedisConfiguration(resp.RedisConfiguration) - d.Set("redis_configuration", &redisConfiguration) + redisConfiguration, err := flattenRedisConfiguration(resp.RedisConfiguration) + if err != nil { + return fmt.Errorf("Error flattening `redis_configuration`: %+v", err) + } + if err := d.Set("redis_configuration", redisConfiguration); err != nil { + return fmt.Errorf("Error setting `redis_configuration`: %+v", err) + } d.Set("primary_access_key", keysResp.PrimaryKey) d.Set("secondary_access_key", keysResp.SecondaryKey) @@ -574,21 +581,64 @@ func expandRedisPatchSchedule(d *schema.ResourceData) (*redis.PatchSchedule, err return &schedule, nil } -func flattenRedisConfiguration(input map[string]*string) map[string]*string { - redisConfiguration := make(map[string]*string, len(input)) +func flattenRedisConfiguration(input map[string]*string) ([]interface{}, error) { + outputs := make(map[string]interface{}, len(input)) - redisConfiguration["maxclients"] = input["maxclients"] - redisConfiguration["maxmemory_delta"] = input["maxmemory-delta"] - redisConfiguration["maxmemory_reserved"] = input["maxmemory-reserved"] - redisConfiguration["maxmemory_policy"] = input["maxmemory-policy"] + if v := input["maxclients"]; v != nil { + i, err := strconv.Atoi(*v) + if err != nil { + return nil, fmt.Errorf("Error parsing `maxclients` %q: %+v", v, err) + } + outputs["maxclients"] = i + } + if v := input["maxmemory-delta"]; v != nil { + i, err := strconv.Atoi(*v) + if err != nil { + return nil, fmt.Errorf("Error parsing `maxmemory-delta` %q: %+v", v, err) + } + outputs["maxmemory_delta"] = i + } + if v := input["maxmemory-reserved"]; v != nil { + i, err := strconv.Atoi(*v) + if err != nil { + return nil, fmt.Errorf("Error parsing `maxmemory-reserved` %q: %+v", v, err) + } + outputs["maxmemory_reserved"] = i + } + if v := input["maxmemory-policy"]; v != nil { + outputs["maxmemory_policy"] = *v + } - redisConfiguration["rdb_backup_enabled"] = input["rdb-backup-enabled"] - redisConfiguration["rdb_backup_frequency"] = input["rdb-backup-frequency"] - redisConfiguration["rdb_backup_max_snapshot_count"] = input["rdb-backup-max-snapshot-count"] - redisConfiguration["rdb_storage_connection_string"] = input["rdb-storage-connection-string"] - redisConfiguration["notify_keyspace_events"] = input["notify-keyspace-events"] + // delta, reserved, enabled, frequency,, count, + if v := input["rdb-backup-enabled"]; v != nil { + b, err := strconv.ParseBool(*v) + if err != nil { + return nil, fmt.Errorf("Error parsing `rdb-backup-enabled` %q: %+v", v, err) + } + outputs["rdb_backup_enabled"] = b + } + if v := input["rdb-backup-frequency"]; v != nil { + i, err := strconv.Atoi(*v) + if err != nil { + return nil, fmt.Errorf("Error parsing `rdb-backup-frequency` %q: %+v", v, err) + } + outputs["rdb_backup_frequency"] = i + } + if v := input["rdb-backup-max-snapshot-count"]; v != nil { + i, err := strconv.Atoi(*v) + if err != nil { + return nil, fmt.Errorf("Error parsing `rdb-backup-max-snapshot-count` %q: %+v", v, err) + } + outputs["rdb_backup_max_snapshot_count"] = i + } + if v := input["rdb-storage-connection-string"]; v != nil { + outputs["rdb_storage_connection_string"] = *v + } + if v := input["notify-keyspace-events"]; v != nil { + outputs["notify_keyspace_events"] = *v + } - return redisConfiguration + return []interface{}{outputs}, nil } func flattenRedisPatchSchedules(schedule redis.PatchSchedule) []interface{} { diff --git a/azurerm/resource_arm_redis_cache_test.go b/azurerm/resource_arm_redis_cache_test.go index 6aced55ab66d..f60df1aa83e3 100644 --- a/azurerm/resource_arm_redis_cache_test.go +++ b/azurerm/resource_arm_redis_cache_test.go @@ -238,6 +238,11 @@ func TestAccAzureRMRedisCache_BackupEnabled(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMRedisCacheExists("azurerm_redis_cache.test"), ), + // `redis_configuration.0.rdb_storage_connection_string` is returned as: + // "...;AccountKey=[key hidden]" rather than "...;AccountKey=fsjfvjnfnf" + // TODO: remove this once the Bug's been fixed: + // https://github.com/Azure/azure-rest-api-specs/issues/3037 + ExpectNonEmptyPlan: true, }, }, }) @@ -260,12 +265,22 @@ func TestAccAzureRMRedisCache_BackupEnabledDisabled(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMRedisCacheExists("azurerm_redis_cache.test"), ), + // `redis_configuration.0.rdb_storage_connection_string` is returned as: + // "...;AccountKey=[key hidden]" rather than "...;AccountKey=fsjfvjnfnf" + // TODO: remove this once the Bug's been fixed: + // https://github.com/Azure/azure-rest-api-specs/issues/3037 + ExpectNonEmptyPlan: true, }, { Config: updatedConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMRedisCacheExists("azurerm_redis_cache.test"), ), + // `redis_configuration.0.rdb_storage_connection_string` is returned as: + // "...;AccountKey=[key hidden]" rather than "...;AccountKey=fsjfvjnfnf" + // TODO: remove this once the Bug's been fixed: + // https://github.com/Azure/azure-rest-api-specs/issues/3037 + ExpectNonEmptyPlan: true, }, }, }) @@ -449,7 +464,6 @@ resource "azurerm_redis_cache" "test" { enable_non_ssl_port = false redis_configuration { - maxclients = "256" } } `, rInt, location, rInt) @@ -471,7 +485,6 @@ resource "azurerm_redis_cache" "test" { sku_name = "Standard" enable_non_ssl_port = false redis_configuration { - maxclients = "256" } tags { @@ -497,8 +510,7 @@ resource "azurerm_redis_cache" "test" { sku_name = "Premium" enable_non_ssl_port = false redis_configuration { - maxclients = 256, - maxmemory_reserved = 2, + maxmemory_reserved = 2 maxmemory_delta = 2 maxmemory_policy = "allkeys-lru" } @@ -523,8 +535,7 @@ resource "azurerm_redis_cache" "test" { enable_non_ssl_port = true shard_count = 3 redis_configuration { - maxclients = "256", - maxmemory_reserved = 2, + maxmemory_reserved = 2 maxmemory_delta = 2 maxmemory_policy = "allkeys-lru" } @@ -548,7 +559,6 @@ resource "azurerm_redis_cache" "test" { sku_name = "basic" enable_non_ssl_port = false redis_configuration { - maxclients = "256" } } `, ri, location, ri) @@ -570,7 +580,6 @@ resource "azurerm_redis_cache" "test" { sku_name = "Premium" enable_non_ssl_port = false redis_configuration { - maxclients = "256" rdb_backup_enabled = false } } @@ -605,7 +614,6 @@ resource "azurerm_redis_cache" "test" { sku_name = "Premium" enable_non_ssl_port = false redis_configuration { - maxclients = "256" rdb_backup_enabled = true rdb_backup_frequency = 60 rdb_backup_max_snapshot_count = 1 @@ -630,8 +638,7 @@ resource "azurerm_redis_cache" "test" { sku_name = "Premium" enable_non_ssl_port = false redis_configuration { - maxclients = 256, - maxmemory_reserved = 2, + maxmemory_reserved = 2 maxmemory_delta = 2 maxmemory_policy = "allkeys-lru" } @@ -704,7 +711,6 @@ resource "azurerm_redis_cache" "test" { enable_non_ssl_port = false subnet_id = "${azurerm_subnet.test.id}" redis_configuration { - maxclients = "256" } } `, ri, location, ri, ri) @@ -742,7 +748,6 @@ resource "azurerm_redis_cache" "test" { subnet_id = "${azurerm_subnet.test.id}" private_static_ip_address = "10.0.1.20" redis_configuration { - maxclients = "256" } } `, ri, location, ri, ri) diff --git a/azurerm/resource_arm_redis_firewall_rule.go b/azurerm/resource_arm_redis_firewall_rule.go index 28071c872770..97fd84e9e295 100644 --- a/azurerm/resource_arm_redis_firewall_rule.go +++ b/azurerm/resource_arm_redis_firewall_rule.go @@ -17,6 +17,9 @@ func resourceArmRedisFirewallRule() *schema.Resource { Read: resourceArmRedisFirewallRuleRead, Update: resourceArmRedisFirewallRuleCreateUpdate, Delete: resourceArmRedisFirewallRuleDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, Schema: map[string]*schema.Schema{ "name": { diff --git a/website/docs/r/redis_cache.html.markdown b/website/docs/r/redis_cache.html.markdown index ee67bb1faaba..bb5de5891e37 100644 --- a/website/docs/r/redis_cache.html.markdown +++ b/website/docs/r/redis_cache.html.markdown @@ -177,7 +177,6 @@ The pricing group for the Redis Family - either "C" or "P" at present. * `redis_configuration` supports the following: -* `maxclients` - (Optional) Set the max number of connected clients at the same time. Defaults are shown below. * `maxmemory_reserve` - (Optional) Value in megabytes reserved for non-cache usage e.g. failover. Defaults are shown below. * `maxmemory_delta` - (Optional) The max-memory delta for this Redis instance. Defaults are shown below. * `maxmemory_policy` - (Optional) How Redis will select what to remove when `maxmemory` is reached. Defaults are shown below. @@ -186,11 +185,20 @@ The pricing group for the Redis Family - either "C" or "P" at present. * `rdb_backup_frequency` - (Optional) The Backup Frequency in Minutes. Only supported on Premium SKU's. Possible values are: `15`, `30`, `60`, `360`, `720` and `1440`. * `rdb_backup_max_snapshot_count` - (Optional) The maximum number of snapshots to create as a backup. Only supported for Premium SKU's. * `rdb_storage_connection_string` - (Optional) The Connection String to the Storage Account. Only supported for Premium SKU's. In the format: `DefaultEndpointsProtocol=https;BlobEndpoint=${azurerm_storage_account.test.primary_blob_endpoint};AccountName=${azurerm_storage_account.test.name};AccountKey=${azurerm_storage_account.test.primary_access_key}`. + +~> **NOTE:** There's a bug in the Redis API where the original storage connection string isn't being returned, which [is being tracked in this issue](https://github.com/Azure/azure-rest-api-specs/issues/3037). In the interim you can use [the `ignore_changes` attribute to ignore changes to this field](https://www.terraform.io/docs/configuration/resources.html#ignore_changes) e.g.: + +``` +resource "azurerm_redis_cache" "test" { + # ... + ignore_changes = ["redis_configuration.0.rdb_storage_connection_string"] +} +``` + * `notify_keyspace_events` - (Optional) Keyspace notifications allows clients to subscribe to Pub/Sub channels in order to receive events affecting the Redis data set in some way. [Reference](https://redis.io/topics/notifications#configuration) ```hcl redis_configuration { - maxclients = 512 maxmemory_reserve = 10 maxmemory_delta = 2 maxmemory_policy = "allkeys-lru" @@ -200,7 +208,6 @@ redis_configuration { ## Default Redis Configuration Values | Redis Value | Basic | Standard | Premium | | ------------------ | ------------ | ------------ | ------------ | -| maxclients | 256 | 1000 | 7500 | | maxmemory_reserved | 2 | 50 | 200 | | maxmemory_delta | 2 | 50 | 200 | | maxmemory_policy | volatile-lru | volatile-lru | volatile-lru | @@ -230,6 +237,22 @@ The following attributes are exported: * `secondary_access_key` - The Secondary Access Key for the Redis Instance +* `redis_configuration` - A `redis_configuration` block as defined below: + +--- + +A `redis_configuration` block exports the following: + +* `maxclients` - Returns the max number of connected clients at the same time. + ## Relevant Links - [Azure Redis Cache: SKU specific configuration limitations](https://azure.microsoft.com/en-us/documentation/articles/cache-configure/#advanced-settings) - [Redis: Available Configuration Settings](http://redis.io/topics/config) + +## Import + +Redis Cache's can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_redis_cache.cache1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Cache/Redis/cache1 +``` diff --git a/website/docs/r/redis_firewall_rule.html.markdown b/website/docs/r/redis_firewall_rule.html.markdown index 212f13fe7bad..a2eca72b19e7 100644 --- a/website/docs/r/redis_firewall_rule.html.markdown +++ b/website/docs/r/redis_firewall_rule.html.markdown @@ -75,3 +75,11 @@ The following arguments are supported: The following attributes are exported: * `id` - The Redis Firewall Rule ID. + +## Import + +Redis Firewall Rules can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_redis_firewall_rule.rule1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Cache/Redis/cache1/firewallRules/rule1 +``` From b6e7cecbb3dafa114e35eb6fc2cf964f774b8198 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 13 May 2018 08:33:37 -0700 Subject: [PATCH 110/320] Updating to include #1211 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 606d313c2add..4780eaeac938 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ UPGRADE NOTES: ~> **Please Note:** Prior to v1.5 Data Sources in the AzureRM Provider returned `nil` rather than an error message when a Resource didn't exist, which was a bug. In order to bring this into line with other Providers - starting in v1.5 the AzureRM Provider will return an error message when a resource doesn't exist. +~> **Please Note:** This release fixes a bug in the `azurerm_redis_cache` resource where changes to fields weren't detected; as such you may see changes in the `redis_configuration` block, particularly with the `rdb_storage_connection_string` field. There's a bug tracking this inconsistency in [the Azure Rest API Specs Repository](https://github.com/Azure/azure-rest-api-specs/issues/3037). FEATURES: @@ -12,6 +13,10 @@ FEATURES: * **New Data Source:** `azurerm_key_vault_secret` [GH-1202] * **New Data Source:** `azurerm_route_table` [GH-1203] +BUG FIXES: + +* `azurerm_redis_cache` - changes to the `redis_configuration` block are now detected - please see the note above for more information [GH-1211] + IMPROVEMENTS: * dependencies - upgrading to v16.2.1 of `Azure/azure-sdk-for-go` [GH-1198] @@ -22,6 +27,8 @@ IMPROVEMENTS: * `azurerm_cosmosdb_account` - added support for the `connection_strings` property [GH-1194] * `azurerm_key_vault_certificate` - exposing the `certificate_data` [GH-1200] * `azurerm_kubernetes_cluster` - making `kube_config_raw` a sensitive field [GH-1225] +* `azurerm_redis_cache` - Redis Caches can now be Imported [GH-1211] +* `azurerm_redis_firewall_rule` - Redis Firewall Rules can now be Imported [GH-1211] * `azurerm_virtual_network` - guarding against nil-objects in the response [GH-1208] * `azurerm_virtual_network_gateway` - ignoring the case of the `GatewaySubnet` [GH-1141] From 27fbaf38309f08ffabdfc8a85cbf70b6387fa5b7 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 13 May 2018 08:34:04 -0700 Subject: [PATCH 111/320] Fixing the spacing --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4780eaeac938..dfae490dc368 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ UPGRADE NOTES: ~> **Please Note:** Prior to v1.5 Data Sources in the AzureRM Provider returned `nil` rather than an error message when a Resource didn't exist, which was a bug. In order to bring this into line with other Providers - starting in v1.5 the AzureRM Provider will return an error message when a resource doesn't exist. + ~> **Please Note:** This release fixes a bug in the `azurerm_redis_cache` resource where changes to fields weren't detected; as such you may see changes in the `redis_configuration` block, particularly with the `rdb_storage_connection_string` field. There's a bug tracking this inconsistency in [the Azure Rest API Specs Repository](https://github.com/Azure/azure-rest-api-specs/issues/3037). FEATURES: From f17a19295eadd5ae70853d9391f7f82c0936e543 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 14 May 2018 11:02:43 -0700 Subject: [PATCH 112/320] redis firewall rule: fix max_clients in tests --- azurerm/resource_arm_redis_firewall_rule_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/azurerm/resource_arm_redis_firewall_rule_test.go b/azurerm/resource_arm_redis_firewall_rule_test.go index 58ba3cb96005..5d50eab6234f 100644 --- a/azurerm/resource_arm_redis_firewall_rule_test.go +++ b/azurerm/resource_arm_redis_firewall_rule_test.go @@ -164,7 +164,6 @@ resource "azurerm_redis_cache" "test" { sku_name = "Premium" enable_non_ssl_port = false redis_configuration { - maxclients = 256, maxmemory_reserved = 2, maxmemory_delta = 2 maxmemory_policy = "allkeys-lru" @@ -197,7 +196,6 @@ resource "azurerm_redis_cache" "test" { sku_name = "Premium" enable_non_ssl_port = false redis_configuration { - maxclients = 256, maxmemory_reserved = 2, maxmemory_delta = 2 maxmemory_policy = "allkeys-lru" From 39ded39ca3dee85e22dc33d118dd0ded1429ee11 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Mon, 14 May 2018 18:51:36 +0000 Subject: [PATCH 113/320] v1.5.0 --- CHANGELOG.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfae490dc368..19a8917cb9b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.5.0 (Unreleased) +## 1.5.0 (May 14, 2018) UPGRADE NOTES: @@ -8,30 +8,30 @@ UPGRADE NOTES: FEATURES: -* **New Data Source:** `azurerm_cosmosdb_account` [GH-1056] -* **New Data Source:** `azurerm_kubernetes_cluster` [GH-1204] -* **New Data Source:** `azurerm_key_vault` [GH-1202] -* **New Data Source:** `azurerm_key_vault_secret` [GH-1202] -* **New Data Source:** `azurerm_route_table` [GH-1203] +* **New Data Source:** `azurerm_cosmosdb_account` ([#1056](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1056)) +* **New Data Source:** `azurerm_kubernetes_cluster` ([#1204](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1204)) +* **New Data Source:** `azurerm_key_vault` ([#1202](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1202)) +* **New Data Source:** `azurerm_key_vault_secret` ([#1202](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1202)) +* **New Data Source:** `azurerm_route_table` ([#1203](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1203)) BUG FIXES: -* `azurerm_redis_cache` - changes to the `redis_configuration` block are now detected - please see the note above for more information [GH-1211] +* `azurerm_redis_cache` - changes to the `redis_configuration` block are now detected - please see the note above for more information ([#1211](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1211)) IMPROVEMENTS: -* dependencies - upgrading to v16.2.1 of `Azure/azure-sdk-for-go` [GH-1198] -* dependencies - upgrading to v10.8.1 of `Azure/go-autorest` [GH-1198] -* `azurerm_app_service` - support for HTTP2 [GH-1188] -* `azurerm_app_service` - support for Managed Service Identity [GH-1130] -* `azurerm_app_service_slot` - support for HTTP2 [GH-1205] -* `azurerm_cosmosdb_account` - added support for the `connection_strings` property [GH-1194] -* `azurerm_key_vault_certificate` - exposing the `certificate_data` [GH-1200] -* `azurerm_kubernetes_cluster` - making `kube_config_raw` a sensitive field [GH-1225] -* `azurerm_redis_cache` - Redis Caches can now be Imported [GH-1211] -* `azurerm_redis_firewall_rule` - Redis Firewall Rules can now be Imported [GH-1211] -* `azurerm_virtual_network` - guarding against nil-objects in the response [GH-1208] -* `azurerm_virtual_network_gateway` - ignoring the case of the `GatewaySubnet` [GH-1141] +* dependencies - upgrading to v16.2.1 of `Azure/azure-sdk-for-go` ([#1198](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1198)) +* dependencies - upgrading to v10.8.1 of `Azure/go-autorest` ([#1198](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1198)) +* `azurerm_app_service` - support for HTTP2 ([#1188](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1188)) +* `azurerm_app_service` - support for Managed Service Identity ([#1130](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1130)) +* `azurerm_app_service_slot` - support for HTTP2 ([#1205](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1205)) +* `azurerm_cosmosdb_account` - added support for the `connection_strings` property ([#1194](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1194)) +* `azurerm_key_vault_certificate` - exposing the `certificate_data` ([#1200](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1200)) +* `azurerm_kubernetes_cluster` - making `kube_config_raw` a sensitive field ([#1225](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1225)) +* `azurerm_redis_cache` - Redis Caches can now be Imported ([#1211](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1211)) +* `azurerm_redis_firewall_rule` - Redis Firewall Rules can now be Imported ([#1211](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1211)) +* `azurerm_virtual_network` - guarding against nil-objects in the response ([#1208](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1208)) +* `azurerm_virtual_network_gateway` - ignoring the case of the `GatewaySubnet` ([#1141](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1141)) ## 1.4.0 (April 26, 2018) From 8ca8756c305168c2bde7b6a2ee1bd52f2ebbad62 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Mon, 14 May 2018 18:57:01 +0000 Subject: [PATCH 114/320] Cleanup after v1.5.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19a8917cb9b2..afba74c3a352 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 1.6.0 (Unreleased) ## 1.5.0 (May 14, 2018) UPGRADE NOTES: From 7e9818d1e0271dd3f5fead212759c63eb96d0cb4 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 14 May 2018 12:38:43 -0700 Subject: [PATCH 115/320] Update CHANGELOG.md to include #1224 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index afba74c3a352..6dae54d47b6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## 1.6.0 (Unreleased) + +BUG FIXES: + +* `azurerm_virtual_machine_scale_set` - an empty `os_profile_windows_config` block no longer causes a panic [GH-1224] + ## 1.5.0 (May 14, 2018) UPGRADE NOTES: From d63b21b445ebe41836a133116da24cab27f98e7b Mon Sep 17 00:00:00 2001 From: Jon Povey Date: Mon, 14 May 2018 21:39:54 +0100 Subject: [PATCH 116/320] Add dead_lettering_on_message_expiration property to servicebus queue resource (#1235) --- azurerm/resource_arm_servicebus_queue.go | 19 +++++-- azurerm/resource_arm_servicebus_queue_test.go | 51 +++++++++++++++++++ website/docs/r/servicebus_queue.html.markdown | 2 + 3 files changed, 67 insertions(+), 5 deletions(-) diff --git a/azurerm/resource_arm_servicebus_queue.go b/azurerm/resource_arm_servicebus_queue.go index 915c372d6f92..a4986c980771 100644 --- a/azurerm/resource_arm_servicebus_queue.go +++ b/azurerm/resource_arm_servicebus_queue.go @@ -93,6 +93,12 @@ func resourceArmServiceBusQueue() *schema.Resource { ForceNew: true, }, + "dead_lettering_on_message_expiration": { + Type: schema.TypeBool, + Default: false, + Optional: true, + }, + // TODO: remove these in the next major release "enable_batched_operations": { Type: schema.TypeBool, @@ -122,15 +128,17 @@ func resourceArmServiceBusQueueCreateUpdate(d *schema.ResourceData, meta interfa maxSize := int32(d.Get("max_size_in_megabytes").(int)) requiresDuplicateDetection := d.Get("requires_duplicate_detection").(bool) requiresSession := d.Get("requires_session").(bool) + deadLetteringOnMessageExpiration := d.Get("dead_lettering_on_message_expiration").(bool) parameters := servicebus.SBQueue{ Name: &name, SBQueueProperties: &servicebus.SBQueueProperties{ - EnableExpress: &enableExpress, - EnablePartitioning: &enablePartitioning, - MaxSizeInMegabytes: &maxSize, - RequiresDuplicateDetection: &requiresDuplicateDetection, - RequiresSession: &requiresSession, + EnableExpress: &enableExpress, + EnablePartitioning: &enablePartitioning, + MaxSizeInMegabytes: &maxSize, + RequiresDuplicateDetection: &requiresDuplicateDetection, + RequiresSession: &requiresSession, + DeadLetteringOnMessageExpiration: &deadLetteringOnMessageExpiration, }, } @@ -223,6 +231,7 @@ func resourceArmServiceBusQueueRead(d *schema.ResourceData, meta interface{}) er d.Set("enable_partitioning", props.EnablePartitioning) d.Set("requires_duplicate_detection", props.RequiresDuplicateDetection) d.Set("requires_session", props.RequiresSession) + d.Set("dead_lettering_on_message_expiration", props.DeadLetteringOnMessageExpiration) if maxSizeMB := props.MaxSizeInMegabytes; maxSizeMB != nil { maxSize := int(*maxSizeMB) diff --git a/azurerm/resource_arm_servicebus_queue_test.go b/azurerm/resource_arm_servicebus_queue_test.go index 9f2c062f0403..5e92900127e4 100644 --- a/azurerm/resource_arm_servicebus_queue_test.go +++ b/azurerm/resource_arm_servicebus_queue_test.go @@ -172,6 +172,33 @@ func TestAccAzureRMServiceBusQueue_enableRequiresSession(t *testing.T) { }) } +func TestAccAzureRMServiceBusQueue_enableDeadLetteringOnMessageExpiration(t *testing.T) { + resourceName := "azurerm_servicebus_queue.test" + location := testLocation() + ri := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMServiceBusQueueDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMServiceBusQueue_basic(ri, location), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMServiceBusQueueExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "dead_lettering_on_message_expiration", "false"), + ), + }, + { + Config: testAccAzureRMServiceBusQueue_enableDeadLetteringOnMessageExpiration(ri, location), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "dead_lettering_on_message_expiration", "true"), + ), + }, + }, + }) +} + func TestAccAzureRMServiceBusQueue_lockDuration(t *testing.T) { resourceName := "azurerm_servicebus_queue.test" ri := acctest.RandInt() @@ -405,6 +432,30 @@ resource "azurerm_servicebus_queue" "test" { `, rInt, location, rInt, rInt) } +func testAccAzureRMServiceBusQueue_enableDeadLetteringOnMessageExpiration(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_servicebus_namespace" "test" { + name = "acctestservicebusnamespace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku = "standard" +} + +resource "azurerm_servicebus_queue" "test" { + name = "acctestservicebusqueue-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + namespace_name = "${azurerm_servicebus_namespace.test.name}" + dead_lettering_on_message_expiration = true +} +`, rInt, location, rInt, rInt) +} + func testAccAzureRMServiceBusQueue_lockDuration(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/website/docs/r/servicebus_queue.html.markdown b/website/docs/r/servicebus_queue.html.markdown index 0116a03a0e68..cb042bbc182e 100644 --- a/website/docs/r/servicebus_queue.html.markdown +++ b/website/docs/r/servicebus_queue.html.markdown @@ -102,6 +102,8 @@ The following arguments are supported: This will allow ordered handling of unbounded sequences of related messages. With sessions enabled a queue can guarantee first-in-first-out delivery of messages. Changing this forces a new resource to be created. Defaults to `false`. + +* `requires_session` - (Optional) Boolean flag which controls whether the Queue has dead letter support when a message expires. Defaults to `false`. ### TimeSpan Format From baac5cb9b7c4dc31724850460d499847cfe6dd93 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 14 May 2018 13:40:16 -0700 Subject: [PATCH 117/320] Updating to include #1235 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dae54d47b6c..44d329746521 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ BUG FIXES: * `azurerm_virtual_machine_scale_set` - an empty `os_profile_windows_config` block no longer causes a panic [GH-1224] +IMPROVEMENTS: + +* `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` [GH-1235] + ## 1.5.0 (May 14, 2018) UPGRADE NOTES: From af7b7e532f1745f437e9d7e45ce79110f0b02107 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 14 May 2018 14:04:44 -0700 Subject: [PATCH 118/320] New Resource: `azurerm_relay_namespace` (#1233) * Vendoring the Azure Relay SDK * Adding `Microsoft.Relay` to the list of Resource Providers * New Resource: `azurerm_relay_namespace` ``` $ acctests azurerm TestAccAzureRMRelayNamespace_ === RUN TestAccAzureRMRelayNamespace_basic --- PASS: TestAccAzureRMRelayNamespace_basic (154.19s) === RUN TestAccAzureRMRelayNamespace_complete --- PASS: TestAccAzureRMRelayNamespace_complete (148.58s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 302.825s ``` Import tests: ``` $ acctests azurerm TestAccAzureRMRelayNamespace_import === RUN TestAccAzureRMRelayNamespace_importBasic --- PASS: TestAccAzureRMRelayNamespace_importBasic (194.74s) === RUN TestAccAzureRMRelayNamespace_importComplete --- PASS: TestAccAzureRMRelayNamespace_importComplete (164.46s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 359.235s ``` --- azurerm/config.go | 11 + azurerm/import_arm_relay_namespace_test.go | 54 + azurerm/provider.go | 2 + azurerm/resource_arm_relay_namespace.go | 257 +++ azurerm/resource_arm_relay_namespace_test.go | 158 ++ .../relay/mgmt/2017-04-01/relay/client.go | 51 + .../2017-04-01/relay/hybridconnections.go | 942 +++++++++++ .../relay/mgmt/2017-04-01/relay/models.go | 1425 +++++++++++++++++ .../relay/mgmt/2017-04-01/relay/namespaces.go | 1144 +++++++++++++ .../relay/mgmt/2017-04-01/relay/operations.go | 126 ++ .../relay/mgmt/2017-04-01/relay/version.go | 30 + .../relay/mgmt/2017-04-01/relay/wcfrelays.go | 942 +++++++++++ vendor/vendor.json | 8 + website/azurerm.erb | 4 + website/docs/r/relay_namespace.html.markdown | 82 + 15 files changed, 5236 insertions(+) create mode 100644 azurerm/import_arm_relay_namespace_test.go create mode 100644 azurerm/resource_arm_relay_namespace.go create mode 100644 azurerm/resource_arm_relay_namespace_test.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/client.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/hybridconnections.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/models.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/namespaces.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/operations.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/version.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/wcfrelays.go create mode 100644 website/docs/r/relay_namespace.html.markdown diff --git a/azurerm/config.go b/azurerm/config.go index 06c646de77c9..5f75ec675f25 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -34,6 +34,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql" "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices" "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis" + "github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/locks" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy" @@ -170,6 +171,9 @@ type ArmClient struct { // Recovery Services recoveryServicesVaultsClient recoveryservices.VaultsClient + // Relay + relayNamespacesClient relay.NamespacesClient + // Resources managementLocksClient locks.ManagementLocksClient deploymentsClient resources.DeploymentsClient @@ -380,6 +384,7 @@ func getArmClient(c *authentication.Config) (*ArmClient, error) { client.registerOperationalInsightsClients(endpoint, c.SubscriptionID, auth, sender) client.registerRecoveryServiceClients(endpoint, c.SubscriptionID, auth) client.registerRedisClients(endpoint, c.SubscriptionID, auth, sender) + client.registerRelayClients(endpoint, c.SubscriptionID, auth, sender) client.registerResourcesClients(endpoint, c.SubscriptionID, auth) client.registerSearchClients(endpoint, c.SubscriptionID, auth) client.registerServiceBusClients(endpoint, c.SubscriptionID, auth) @@ -812,6 +817,12 @@ func (c *ArmClient) registerRedisClients(endpoint, subscriptionId string, auth a c.redisPatchSchedulesClient = patchSchedulesClient } +func (c *ArmClient) registerRelayClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) { + relayNamespacesClient := relay.NewNamespacesClientWithBaseURI(endpoint, subscriptionId) + c.configureClient(&relayNamespacesClient.Client, auth) + c.relayNamespacesClient = relayNamespacesClient +} + func (c *ArmClient) registerResourcesClients(endpoint, subscriptionId string, auth autorest.Authorizer) { locksClient := locks.NewManagementLocksClientWithBaseURI(endpoint, subscriptionId) c.configureClient(&locksClient.Client, auth) diff --git a/azurerm/import_arm_relay_namespace_test.go b/azurerm/import_arm_relay_namespace_test.go new file mode 100644 index 000000000000..c9607a7ff527 --- /dev/null +++ b/azurerm/import_arm_relay_namespace_test.go @@ -0,0 +1,54 @@ +package azurerm + +import ( + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccAzureRMRelayNamespace_importBasic(t *testing.T) { + resourceName := "azurerm_relay_namespace.test" + + ri := acctest.RandInt() + config := testAccAzureRMRelayNamespace_basic(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRelayNamespaceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMRelayNamespace_importComplete(t *testing.T) { + resourceName := "azurerm_relay_namespace.test" + + ri := acctest.RandInt() + config := testAccAzureRMRelayNamespace_complete(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRelayNamespaceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} diff --git a/azurerm/provider.go b/azurerm/provider.go index 96971de5e67e..1f4352bd7176 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -185,6 +185,7 @@ func Provider() terraform.ResourceProvider { "azurerm_postgresql_firewall_rule": resourceArmPostgreSQLFirewallRule(), "azurerm_postgresql_server": resourceArmPostgreSQLServer(), "azurerm_public_ip": resourceArmPublicIp(), + "azurerm_relay_namespace": resourceArmRelayNamespace(), "azurerm_recovery_services_vault": resourceArmRecoveryServicesVault(), "azurerm_redis_cache": resourceArmRedisCache(), "azurerm_redis_firewall_rule": resourceArmRedisFirewallRule(), @@ -342,6 +343,7 @@ func determineAzureResourceProvidersToRegister(providerList []resources.Provider "microsoft.insights": {}, "Microsoft.Network": {}, "Microsoft.OperationalInsights": {}, + "Microsoft.Relay": {}, "Microsoft.Resources": {}, "Microsoft.Search": {}, "Microsoft.ServiceBus": {}, diff --git a/azurerm/resource_arm_relay_namespace.go b/azurerm/resource_arm_relay_namespace.go new file mode 100644 index 000000000000..049a1cf840ec --- /dev/null +++ b/azurerm/resource_arm_relay_namespace.go @@ -0,0 +1,257 @@ +package azurerm + +import ( + "context" + "fmt" + "log" + + "time" + + "github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmRelayNamespace() *schema.Resource { + return &schema.Resource{ + Create: resourceArmRelayNamespaceCreateUpdate, + Read: resourceArmRelayNamespaceRead, + Update: resourceArmRelayNamespaceCreateUpdate, + Delete: resourceArmRelayNamespaceDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(6, 50), + }, + + "location": locationSchema(), + + "resource_group_name": resourceGroupNameSchema(), + + "sku": { + Type: schema.TypeList, + Required: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ValidateFunc: validation.StringInSlice([]string{ + string(relay.Standard), + }, true), + }, + }, + }, + }, + + "metric_id": { + Type: schema.TypeString, + Computed: true, + }, + + "primary_connection_string": { + Type: schema.TypeString, + Computed: true, + }, + + "secondary_connection_string": { + Type: schema.TypeString, + Computed: true, + }, + + "primary_key": { + Type: schema.TypeString, + Computed: true, + }, + + "secondary_key": { + Type: schema.TypeString, + Computed: true, + }, + + "tags": tagsSchema(), + }, + } +} + +func resourceArmRelayNamespaceCreateUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).relayNamespacesClient + ctx := meta.(*ArmClient).StopContext + log.Printf("[INFO] preparing arguments for Relay Namespace creation.") + + name := d.Get("name").(string) + location := azureRMNormalizeLocation(d.Get("location").(string)) + resourceGroup := d.Get("resource_group_name").(string) + + sku := expandRelayNamespaceSku(d) + tags := d.Get("tags").(map[string]interface{}) + expandedTags := expandTags(tags) + + parameters := relay.Namespace{ + Location: utils.String(location), + Sku: sku, + NamespaceProperties: &relay.NamespaceProperties{}, + Tags: expandedTags, + } + + future, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters) + if err != nil { + return err + } + + err = future.WaitForCompletion(ctx, client.Client) + if err != nil { + return err + } + + read, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Cannot read Relay Namespace %q (resource group %s) ID", name, resourceGroup) + } + + d.SetId(*read.ID) + + return resourceArmRelayNamespaceRead(d, meta) +} + +func resourceArmRelayNamespaceRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).relayNamespacesClient + ctx := meta.(*ArmClient).StopContext + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["namespaces"] + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + + return fmt.Errorf("Error making Read request on Relay Namespace %q (Resource Group %q): %s", name, resourceGroup, err) + } + + d.Set("name", name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azureRMNormalizeLocation(*location)) + } + + if sku := resp.Sku; sku != nil { + flattenedSku := flattenRelayNamespaceSku(sku) + if err := d.Set("sku", flattenedSku); err != nil { + return fmt.Errorf("Error setting `sku`: %+v", err) + } + } + + if props := resp.NamespaceProperties; props != nil { + d.Set("metric_id", props.MetricID) + } + + keysResp, err := client.ListKeys(ctx, resourceGroup, name, "RootManageSharedAccessKey") + if err != nil { + return fmt.Errorf("Error making ListKeys request on Relay Namespace %q (Resource Group %q): %s", name, resourceGroup, err) + } + + d.Set("primary_connection_string", keysResp.PrimaryConnectionString) + d.Set("primary_key", keysResp.PrimaryKey) + d.Set("secondary_connection_string", keysResp.SecondaryConnectionString) + d.Set("secondary_key", keysResp.SecondaryKey) + + flattenAndSetTags(d, resp.Tags) + + return nil +} + +func resourceArmRelayNamespaceDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).relayNamespacesClient + ctx := meta.(*ArmClient).StopContext + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["namespaces"] + + future, err := client.Delete(ctx, resourceGroup, name) + if err != nil { + if response.WasNotFound(future.Response()) { + return nil + } + + return err + } + + // we can't make use of the Future here due to a bug where 404 isn't tracked as Successful + log.Printf("[DEBUG] Waiting for Relay Namespace %q (Resource Group %q) to be deleted", name, resourceGroup) + stateConf := &resource.StateChangeConf{ + Pending: []string{"Pending"}, + Target: []string{"Deleted"}, + Refresh: relayNamespaceDeleteRefreshFunc(ctx, client, resourceGroup, name), + Timeout: 60 * time.Minute, + MinTimeout: 15 * time.Second, + } + if _, err := stateConf.WaitForState(); err != nil { + return fmt.Errorf("Error waiting for Relay Namespace %q (Resource Group %q) to be deleted: %s", name, resourceGroup, err) + } + + return nil +} + +func relayNamespaceDeleteRefreshFunc(ctx context.Context, client relay.NamespacesClient, resourceGroupName string, name string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + res, err := client.Get(ctx, resourceGroupName, name) + if err != nil { + if utils.ResponseWasNotFound(res.Response) { + return res, "Deleted", nil + } + + return nil, "Error", fmt.Errorf("Error issuing read request in relayNamespaceDeleteRefreshFunc to Relay Namespace %q (Resource Group %q): %s", name, resourceGroupName, err) + } + + return res, "Pending", nil + } +} + +func expandRelayNamespaceSku(d *schema.ResourceData) *relay.Sku { + vs := d.Get("sku").([]interface{}) + v := vs[0].(map[string]interface{}) + + name := v["name"].(string) + + return &relay.Sku{ + Name: utils.String(name), + Tier: relay.SkuTier(name), + } +} + +func flattenRelayNamespaceSku(input *relay.Sku) []interface{} { + if input == nil { + return []interface{}{} + } + + output := make(map[string]interface{}, 0) + if name := input.Name; name != nil { + output["name"] = *name + } + return []interface{}{output} +} diff --git a/azurerm/resource_arm_relay_namespace_test.go b/azurerm/resource_arm_relay_namespace_test.go new file mode 100644 index 000000000000..78c169aef22e --- /dev/null +++ b/azurerm/resource_arm_relay_namespace_test.go @@ -0,0 +1,158 @@ +package azurerm + +import ( + "fmt" + "net/http" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccAzureRMRelayNamespace_basic(t *testing.T) { + resourceName := "azurerm_relay_namespace.test" + ri := acctest.RandInt() + location := testLocation() + config := testAccAzureRMRelayNamespace_basic(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRelayNamespaceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMRelayNamespaceExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "metric_id"), + resource.TestCheckResourceAttrSet(resourceName, "primary_connection_string"), + resource.TestCheckResourceAttrSet(resourceName, "secondary_connection_string"), + resource.TestCheckResourceAttrSet(resourceName, "primary_key"), + resource.TestCheckResourceAttrSet(resourceName, "secondary_key"), + ), + }, + }, + }) +} + +func TestAccAzureRMRelayNamespace_complete(t *testing.T) { + resourceName := "azurerm_relay_namespace.test" + ri := acctest.RandInt() + location := testLocation() + config := testAccAzureRMRelayNamespace_complete(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRelayNamespaceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMRelayNamespaceExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "metric_id"), + resource.TestCheckResourceAttrSet(resourceName, "primary_connection_string"), + resource.TestCheckResourceAttrSet(resourceName, "secondary_connection_string"), + resource.TestCheckResourceAttrSet(resourceName, "primary_key"), + resource.TestCheckResourceAttrSet(resourceName, "secondary_key"), + ), + }, + }, + }) +} + +func testCheckAzureRMRelayNamespaceExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + resourceGroup := rs.Primary.Attributes["resource_group_name"] + name := rs.Primary.Attributes["name"] + + // Ensure resource group exists in API + client := testAccProvider.Meta().(*ArmClient).relayNamespacesClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("Bad: Get on relayNamespacesClient: %+v", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: Relay Namespace %q (Resource Group: %q) does not exist", name, resourceGroup) + } + + return nil + } +} + +func testCheckAzureRMRelayNamespaceDestroy(s *terraform.State) error { + client := testAccProvider.Meta().(*ArmClient).relayNamespacesClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_relay_namespace" { + continue + } + + resourceGroup := rs.Primary.Attributes["resource_group_name"] + name := rs.Primary.Attributes["name"] + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("Relay Namespace still exists:\n%#v", resp) + } + } + + return nil +} + +func testAccAzureRMRelayNamespace_basic(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_relay_namespace" "test" { + name = "acctestrn-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "Standard" + } +} +`, rInt, location, rInt) +} + +func testAccAzureRMRelayNamespace_complete(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_relay_namespace" "test" { + name = "acctestrn-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "Standard" + } + + tags { + "Hello" = "World" + } +} +`, rInt, location, rInt) +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/client.go new file mode 100644 index 000000000000..a881d83d1356 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/client.go @@ -0,0 +1,51 @@ +// Package relay implements the Azure ARM Relay service API version 2017-04-01. +// +// Use these API to manage Azure Relay resources through Azure Resource Manager. +package relay + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" +) + +const ( + // DefaultBaseURI is the default URI used for the service Relay + DefaultBaseURI = "https://management.azure.com" +) + +// BaseClient is the base client for Relay. +type BaseClient struct { + autorest.Client + BaseURI string + SubscriptionID string +} + +// New creates an instance of the BaseClient client. +func New(subscriptionID string) BaseClient { + return NewWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewWithBaseURI creates an instance of the BaseClient client. +func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { + return BaseClient{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + BaseURI: baseURI, + SubscriptionID: subscriptionID, + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/hybridconnections.go b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/hybridconnections.go new file mode 100644 index 000000000000..9310fa033510 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/hybridconnections.go @@ -0,0 +1,942 @@ +package relay + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// HybridConnectionsClient is the use these API to manage Azure Relay resources through Azure Resource Manager. +type HybridConnectionsClient struct { + BaseClient +} + +// NewHybridConnectionsClient creates an instance of the HybridConnectionsClient client. +func NewHybridConnectionsClient(subscriptionID string) HybridConnectionsClient { + return NewHybridConnectionsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewHybridConnectionsClientWithBaseURI creates an instance of the HybridConnectionsClient client. +func NewHybridConnectionsClientWithBaseURI(baseURI string, subscriptionID string) HybridConnectionsClient { + return HybridConnectionsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate creates or updates a service hybrid connection. This operation is idempotent. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// hybridConnectionName - the hybrid connection name. +// parameters - parameters supplied to create a hybrid connection. +func (client HybridConnectionsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string, parameters HybridConnection) (result HybridConnection, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: hybridConnectionName, + Constraints: []validation.Constraint{{Target: "hybridConnectionName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.HybridConnectionProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.HybridConnectionProperties.ListenerCount", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.HybridConnectionProperties.ListenerCount", Name: validation.InclusiveMaximum, Rule: 25, Chain: nil}, + {Target: "parameters.HybridConnectionProperties.ListenerCount", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}, + }}, + }}}}}); err != nil { + return result, validation.NewError("relay.HybridConnectionsClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, namespaceName, hybridConnectionName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "CreateOrUpdate", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client HybridConnectionsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string, parameters HybridConnection) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "hybridConnectionName": autorest.Encode("path", hybridConnectionName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/hybridConnections/{hybridConnectionName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client HybridConnectionsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client HybridConnectionsClient) CreateOrUpdateResponder(resp *http.Response) (result HybridConnection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// CreateOrUpdateAuthorizationRule creates or updates an authorization rule for a hybrid connection. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// hybridConnectionName - the hybrid connection name. +// authorizationRuleName - the authorization rule name. +// parameters - the authorization rule parameters. +func (client HybridConnectionsClient) CreateOrUpdateAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string, authorizationRuleName string, parameters AuthorizationRule) (result AuthorizationRule, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: hybridConnectionName, + Constraints: []validation.Constraint{{Target: "hybridConnectionName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.AuthorizationRuleProperties", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.AuthorizationRuleProperties.Rights", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.AuthorizationRuleProperties.Rights", Name: validation.UniqueItems, Rule: true, Chain: nil}}}, + }}}}}); err != nil { + return result, validation.NewError("relay.HybridConnectionsClient", "CreateOrUpdateAuthorizationRule", err.Error()) + } + + req, err := client.CreateOrUpdateAuthorizationRulePreparer(ctx, resourceGroupName, namespaceName, hybridConnectionName, authorizationRuleName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "CreateOrUpdateAuthorizationRule", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateAuthorizationRuleSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "CreateOrUpdateAuthorizationRule", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateAuthorizationRuleResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "CreateOrUpdateAuthorizationRule", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdateAuthorizationRulePreparer prepares the CreateOrUpdateAuthorizationRule request. +func (client HybridConnectionsClient) CreateOrUpdateAuthorizationRulePreparer(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string, authorizationRuleName string, parameters AuthorizationRule) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "hybridConnectionName": autorest.Encode("path", hybridConnectionName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/hybridConnections/{hybridConnectionName}/authorizationRules/{authorizationRuleName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateAuthorizationRuleSender sends the CreateOrUpdateAuthorizationRule request. The method will close the +// http.Response Body if it receives an error. +func (client HybridConnectionsClient) CreateOrUpdateAuthorizationRuleSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CreateOrUpdateAuthorizationRuleResponder handles the response to the CreateOrUpdateAuthorizationRule request. The method always +// closes the http.Response Body. +func (client HybridConnectionsClient) CreateOrUpdateAuthorizationRuleResponder(resp *http.Response) (result AuthorizationRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes a hybrid connection. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// hybridConnectionName - the hybrid connection name. +func (client HybridConnectionsClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string) (result autorest.Response, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: hybridConnectionName, + Constraints: []validation.Constraint{{Target: "hybridConnectionName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.HybridConnectionsClient", "Delete", err.Error()) + } + + req, err := client.DeletePreparer(ctx, resourceGroupName, namespaceName, hybridConnectionName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client HybridConnectionsClient) DeletePreparer(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "hybridConnectionName": autorest.Encode("path", hybridConnectionName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/hybridConnections/{hybridConnectionName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client HybridConnectionsClient) DeleteSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client HybridConnectionsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// DeleteAuthorizationRule deletes a hybrid connection authorization rule. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// hybridConnectionName - the hybrid connection name. +// authorizationRuleName - the authorization rule name. +func (client HybridConnectionsClient) DeleteAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string, authorizationRuleName string) (result autorest.Response, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: hybridConnectionName, + Constraints: []validation.Constraint{{Target: "hybridConnectionName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.HybridConnectionsClient", "DeleteAuthorizationRule", err.Error()) + } + + req, err := client.DeleteAuthorizationRulePreparer(ctx, resourceGroupName, namespaceName, hybridConnectionName, authorizationRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "DeleteAuthorizationRule", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteAuthorizationRuleSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "DeleteAuthorizationRule", resp, "Failure sending request") + return + } + + result, err = client.DeleteAuthorizationRuleResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "DeleteAuthorizationRule", resp, "Failure responding to request") + } + + return +} + +// DeleteAuthorizationRulePreparer prepares the DeleteAuthorizationRule request. +func (client HybridConnectionsClient) DeleteAuthorizationRulePreparer(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string, authorizationRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "hybridConnectionName": autorest.Encode("path", hybridConnectionName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/hybridConnections/{hybridConnectionName}/authorizationRules/{authorizationRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteAuthorizationRuleSender sends the DeleteAuthorizationRule request. The method will close the +// http.Response Body if it receives an error. +func (client HybridConnectionsClient) DeleteAuthorizationRuleSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteAuthorizationRuleResponder handles the response to the DeleteAuthorizationRule request. The method always +// closes the http.Response Body. +func (client HybridConnectionsClient) DeleteAuthorizationRuleResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get returns the description for the specified hybrid connection. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// hybridConnectionName - the hybrid connection name. +func (client HybridConnectionsClient) Get(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string) (result HybridConnection, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: hybridConnectionName, + Constraints: []validation.Constraint{{Target: "hybridConnectionName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.HybridConnectionsClient", "Get", err.Error()) + } + + req, err := client.GetPreparer(ctx, resourceGroupName, namespaceName, hybridConnectionName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client HybridConnectionsClient) GetPreparer(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "hybridConnectionName": autorest.Encode("path", hybridConnectionName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/hybridConnections/{hybridConnectionName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client HybridConnectionsClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client HybridConnectionsClient) GetResponder(resp *http.Response) (result HybridConnection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetAuthorizationRule hybrid connection authorization rule for a hybrid connection by name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// hybridConnectionName - the hybrid connection name. +// authorizationRuleName - the authorization rule name. +func (client HybridConnectionsClient) GetAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string, authorizationRuleName string) (result AuthorizationRule, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: hybridConnectionName, + Constraints: []validation.Constraint{{Target: "hybridConnectionName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.HybridConnectionsClient", "GetAuthorizationRule", err.Error()) + } + + req, err := client.GetAuthorizationRulePreparer(ctx, resourceGroupName, namespaceName, hybridConnectionName, authorizationRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "GetAuthorizationRule", nil, "Failure preparing request") + return + } + + resp, err := client.GetAuthorizationRuleSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "GetAuthorizationRule", resp, "Failure sending request") + return + } + + result, err = client.GetAuthorizationRuleResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "GetAuthorizationRule", resp, "Failure responding to request") + } + + return +} + +// GetAuthorizationRulePreparer prepares the GetAuthorizationRule request. +func (client HybridConnectionsClient) GetAuthorizationRulePreparer(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string, authorizationRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "hybridConnectionName": autorest.Encode("path", hybridConnectionName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/hybridConnections/{hybridConnectionName}/authorizationRules/{authorizationRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetAuthorizationRuleSender sends the GetAuthorizationRule request. The method will close the +// http.Response Body if it receives an error. +func (client HybridConnectionsClient) GetAuthorizationRuleSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetAuthorizationRuleResponder handles the response to the GetAuthorizationRule request. The method always +// closes the http.Response Body. +func (client HybridConnectionsClient) GetAuthorizationRuleResponder(resp *http.Response) (result AuthorizationRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListAuthorizationRules authorization rules for a hybrid connection. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// hybridConnectionName - the hybrid connection name. +func (client HybridConnectionsClient) ListAuthorizationRules(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string) (result AuthorizationRuleListResultPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: hybridConnectionName, + Constraints: []validation.Constraint{{Target: "hybridConnectionName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.HybridConnectionsClient", "ListAuthorizationRules", err.Error()) + } + + result.fn = client.listAuthorizationRulesNextResults + req, err := client.ListAuthorizationRulesPreparer(ctx, resourceGroupName, namespaceName, hybridConnectionName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "ListAuthorizationRules", nil, "Failure preparing request") + return + } + + resp, err := client.ListAuthorizationRulesSender(req) + if err != nil { + result.arlr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "ListAuthorizationRules", resp, "Failure sending request") + return + } + + result.arlr, err = client.ListAuthorizationRulesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "ListAuthorizationRules", resp, "Failure responding to request") + } + + return +} + +// ListAuthorizationRulesPreparer prepares the ListAuthorizationRules request. +func (client HybridConnectionsClient) ListAuthorizationRulesPreparer(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "hybridConnectionName": autorest.Encode("path", hybridConnectionName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/hybridConnections/{hybridConnectionName}/authorizationRules", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListAuthorizationRulesSender sends the ListAuthorizationRules request. The method will close the +// http.Response Body if it receives an error. +func (client HybridConnectionsClient) ListAuthorizationRulesSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListAuthorizationRulesResponder handles the response to the ListAuthorizationRules request. The method always +// closes the http.Response Body. +func (client HybridConnectionsClient) ListAuthorizationRulesResponder(resp *http.Response) (result AuthorizationRuleListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listAuthorizationRulesNextResults retrieves the next set of results, if any. +func (client HybridConnectionsClient) listAuthorizationRulesNextResults(lastResults AuthorizationRuleListResult) (result AuthorizationRuleListResult, err error) { + req, err := lastResults.authorizationRuleListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "listAuthorizationRulesNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListAuthorizationRulesSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "listAuthorizationRulesNextResults", resp, "Failure sending next results request") + } + result, err = client.ListAuthorizationRulesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "listAuthorizationRulesNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListAuthorizationRulesComplete enumerates all values, automatically crossing page boundaries as required. +func (client HybridConnectionsClient) ListAuthorizationRulesComplete(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string) (result AuthorizationRuleListResultIterator, err error) { + result.page, err = client.ListAuthorizationRules(ctx, resourceGroupName, namespaceName, hybridConnectionName) + return +} + +// ListByNamespace lists the hybrid connection within the namespace. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +func (client HybridConnectionsClient) ListByNamespace(ctx context.Context, resourceGroupName string, namespaceName string) (result HybridConnectionListResultPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.HybridConnectionsClient", "ListByNamespace", err.Error()) + } + + result.fn = client.listByNamespaceNextResults + req, err := client.ListByNamespacePreparer(ctx, resourceGroupName, namespaceName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "ListByNamespace", nil, "Failure preparing request") + return + } + + resp, err := client.ListByNamespaceSender(req) + if err != nil { + result.hclr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "ListByNamespace", resp, "Failure sending request") + return + } + + result.hclr, err = client.ListByNamespaceResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "ListByNamespace", resp, "Failure responding to request") + } + + return +} + +// ListByNamespacePreparer prepares the ListByNamespace request. +func (client HybridConnectionsClient) ListByNamespacePreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/hybridConnections", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByNamespaceSender sends the ListByNamespace request. The method will close the +// http.Response Body if it receives an error. +func (client HybridConnectionsClient) ListByNamespaceSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByNamespaceResponder handles the response to the ListByNamespace request. The method always +// closes the http.Response Body. +func (client HybridConnectionsClient) ListByNamespaceResponder(resp *http.Response) (result HybridConnectionListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByNamespaceNextResults retrieves the next set of results, if any. +func (client HybridConnectionsClient) listByNamespaceNextResults(lastResults HybridConnectionListResult) (result HybridConnectionListResult, err error) { + req, err := lastResults.hybridConnectionListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "listByNamespaceNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByNamespaceSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "listByNamespaceNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByNamespaceResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "listByNamespaceNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByNamespaceComplete enumerates all values, automatically crossing page boundaries as required. +func (client HybridConnectionsClient) ListByNamespaceComplete(ctx context.Context, resourceGroupName string, namespaceName string) (result HybridConnectionListResultIterator, err error) { + result.page, err = client.ListByNamespace(ctx, resourceGroupName, namespaceName) + return +} + +// ListKeys primary and secondary connection strings to the hybrid connection. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// hybridConnectionName - the hybrid connection name. +// authorizationRuleName - the authorization rule name. +func (client HybridConnectionsClient) ListKeys(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string, authorizationRuleName string) (result AccessKeys, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: hybridConnectionName, + Constraints: []validation.Constraint{{Target: "hybridConnectionName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.HybridConnectionsClient", "ListKeys", err.Error()) + } + + req, err := client.ListKeysPreparer(ctx, resourceGroupName, namespaceName, hybridConnectionName, authorizationRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "ListKeys", nil, "Failure preparing request") + return + } + + resp, err := client.ListKeysSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "ListKeys", resp, "Failure sending request") + return + } + + result, err = client.ListKeysResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "ListKeys", resp, "Failure responding to request") + } + + return +} + +// ListKeysPreparer prepares the ListKeys request. +func (client HybridConnectionsClient) ListKeysPreparer(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string, authorizationRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "hybridConnectionName": autorest.Encode("path", hybridConnectionName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/hybridConnections/{hybridConnectionName}/authorizationRules/{authorizationRuleName}/listKeys", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListKeysSender sends the ListKeys request. The method will close the +// http.Response Body if it receives an error. +func (client HybridConnectionsClient) ListKeysSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListKeysResponder handles the response to the ListKeys request. The method always +// closes the http.Response Body. +func (client HybridConnectionsClient) ListKeysResponder(resp *http.Response) (result AccessKeys, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// RegenerateKeys regenerates the primary or secondary connection strings to the hybrid connection. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// hybridConnectionName - the hybrid connection name. +// authorizationRuleName - the authorization rule name. +// parameters - parameters supplied to regenerate authorization rule. +func (client HybridConnectionsClient) RegenerateKeys(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string, authorizationRuleName string, parameters RegenerateAccessKeyParameters) (result AccessKeys, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: hybridConnectionName, + Constraints: []validation.Constraint{{Target: "hybridConnectionName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.HybridConnectionsClient", "RegenerateKeys", err.Error()) + } + + req, err := client.RegenerateKeysPreparer(ctx, resourceGroupName, namespaceName, hybridConnectionName, authorizationRuleName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "RegenerateKeys", nil, "Failure preparing request") + return + } + + resp, err := client.RegenerateKeysSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "RegenerateKeys", resp, "Failure sending request") + return + } + + result, err = client.RegenerateKeysResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.HybridConnectionsClient", "RegenerateKeys", resp, "Failure responding to request") + } + + return +} + +// RegenerateKeysPreparer prepares the RegenerateKeys request. +func (client HybridConnectionsClient) RegenerateKeysPreparer(ctx context.Context, resourceGroupName string, namespaceName string, hybridConnectionName string, authorizationRuleName string, parameters RegenerateAccessKeyParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "hybridConnectionName": autorest.Encode("path", hybridConnectionName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/hybridConnections/{hybridConnectionName}/authorizationRules/{authorizationRuleName}/regenerateKeys", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// RegenerateKeysSender sends the RegenerateKeys request. The method will close the +// http.Response Body if it receives an error. +func (client HybridConnectionsClient) RegenerateKeysSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// RegenerateKeysResponder handles the response to the RegenerateKeys request. The method always +// closes the http.Response Body. +func (client HybridConnectionsClient) RegenerateKeysResponder(resp *http.Response) (result AccessKeys, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/models.go new file mode 100644 index 000000000000..fc6eb79269b4 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/models.go @@ -0,0 +1,1425 @@ +package relay + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "encoding/json" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/date" + "github.com/Azure/go-autorest/autorest/to" + "net/http" +) + +// AccessRights enumerates the values for access rights. +type AccessRights string + +const ( + // Listen ... + Listen AccessRights = "Listen" + // Manage ... + Manage AccessRights = "Manage" + // Send ... + Send AccessRights = "Send" +) + +// PossibleAccessRightsValues returns an array of possible values for the AccessRights const type. +func PossibleAccessRightsValues() []AccessRights { + return []AccessRights{Listen, Manage, Send} +} + +// KeyType enumerates the values for key type. +type KeyType string + +const ( + // PrimaryKey ... + PrimaryKey KeyType = "PrimaryKey" + // SecondaryKey ... + SecondaryKey KeyType = "SecondaryKey" +) + +// PossibleKeyTypeValues returns an array of possible values for the KeyType const type. +func PossibleKeyTypeValues() []KeyType { + return []KeyType{PrimaryKey, SecondaryKey} +} + +// ProvisioningStateEnum enumerates the values for provisioning state enum. +type ProvisioningStateEnum string + +const ( + // Created ... + Created ProvisioningStateEnum = "Created" + // Deleted ... + Deleted ProvisioningStateEnum = "Deleted" + // Failed ... + Failed ProvisioningStateEnum = "Failed" + // Succeeded ... + Succeeded ProvisioningStateEnum = "Succeeded" + // Unknown ... + Unknown ProvisioningStateEnum = "Unknown" + // Updating ... + Updating ProvisioningStateEnum = "Updating" +) + +// PossibleProvisioningStateEnumValues returns an array of possible values for the ProvisioningStateEnum const type. +func PossibleProvisioningStateEnumValues() []ProvisioningStateEnum { + return []ProvisioningStateEnum{Created, Deleted, Failed, Succeeded, Unknown, Updating} +} + +// RelaytypeEnum enumerates the values for relaytype enum. +type RelaytypeEnum string + +const ( + // HTTP ... + HTTP RelaytypeEnum = "Http" + // NetTCP ... + NetTCP RelaytypeEnum = "NetTcp" +) + +// PossibleRelaytypeEnumValues returns an array of possible values for the RelaytypeEnum const type. +func PossibleRelaytypeEnumValues() []RelaytypeEnum { + return []RelaytypeEnum{HTTP, NetTCP} +} + +// SkuTier enumerates the values for sku tier. +type SkuTier string + +const ( + // Standard ... + Standard SkuTier = "Standard" +) + +// PossibleSkuTierValues returns an array of possible values for the SkuTier const type. +func PossibleSkuTierValues() []SkuTier { + return []SkuTier{Standard} +} + +// UnavailableReason enumerates the values for unavailable reason. +type UnavailableReason string + +const ( + // InvalidName ... + InvalidName UnavailableReason = "InvalidName" + // NameInLockdown ... + NameInLockdown UnavailableReason = "NameInLockdown" + // NameInUse ... + NameInUse UnavailableReason = "NameInUse" + // None ... + None UnavailableReason = "None" + // SubscriptionIsDisabled ... + SubscriptionIsDisabled UnavailableReason = "SubscriptionIsDisabled" + // TooManyNamespaceInCurrentSubscription ... + TooManyNamespaceInCurrentSubscription UnavailableReason = "TooManyNamespaceInCurrentSubscription" +) + +// PossibleUnavailableReasonValues returns an array of possible values for the UnavailableReason const type. +func PossibleUnavailableReasonValues() []UnavailableReason { + return []UnavailableReason{InvalidName, NameInLockdown, NameInUse, None, SubscriptionIsDisabled, TooManyNamespaceInCurrentSubscription} +} + +// AccessKeys namespace/Relay Connection String +type AccessKeys struct { + autorest.Response `json:"-"` + // PrimaryConnectionString - Primary connection string of the created namespace authorization rule. + PrimaryConnectionString *string `json:"primaryConnectionString,omitempty"` + // SecondaryConnectionString - Secondary connection string of the created namespace authorization rule. + SecondaryConnectionString *string `json:"secondaryConnectionString,omitempty"` + // PrimaryKey - A base64-encoded 256-bit primary key for signing and validating the SAS token. + PrimaryKey *string `json:"primaryKey,omitempty"` + // SecondaryKey - A base64-encoded 256-bit secondary key for signing and validating the SAS token. + SecondaryKey *string `json:"secondaryKey,omitempty"` + // KeyName - A string that describes the authorization rule. + KeyName *string `json:"keyName,omitempty"` +} + +// AuthorizationRule description of a namespace authorization rule. +type AuthorizationRule struct { + autorest.Response `json:"-"` + // AuthorizationRuleProperties - Authorization rule properties. + *AuthorizationRuleProperties `json:"properties,omitempty"` + // ID - Resource ID. + ID *string `json:"id,omitempty"` + // Name - Resource name. + Name *string `json:"name,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for AuthorizationRule. +func (ar AuthorizationRule) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ar.AuthorizationRuleProperties != nil { + objectMap["properties"] = ar.AuthorizationRuleProperties + } + if ar.ID != nil { + objectMap["id"] = ar.ID + } + if ar.Name != nil { + objectMap["name"] = ar.Name + } + if ar.Type != nil { + objectMap["type"] = ar.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for AuthorizationRule struct. +func (ar *AuthorizationRule) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var authorizationRuleProperties AuthorizationRuleProperties + err = json.Unmarshal(*v, &authorizationRuleProperties) + if err != nil { + return err + } + ar.AuthorizationRuleProperties = &authorizationRuleProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + ar.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + ar.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + ar.Type = &typeVar + } + } + } + + return nil +} + +// AuthorizationRuleListResult the response from the list namespace operation. +type AuthorizationRuleListResult struct { + autorest.Response `json:"-"` + // Value - Result of the list authorization rules operation. + Value *[]AuthorizationRule `json:"value,omitempty"` + // NextLink - Link to the next set of results. Not empty if value contains incomplete list of authorization rules. + NextLink *string `json:"nextLink,omitempty"` +} + +// AuthorizationRuleListResultIterator provides access to a complete listing of AuthorizationRule values. +type AuthorizationRuleListResultIterator struct { + i int + page AuthorizationRuleListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *AuthorizationRuleListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter AuthorizationRuleListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter AuthorizationRuleListResultIterator) Response() AuthorizationRuleListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter AuthorizationRuleListResultIterator) Value() AuthorizationRule { + if !iter.page.NotDone() { + return AuthorizationRule{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (arlr AuthorizationRuleListResult) IsEmpty() bool { + return arlr.Value == nil || len(*arlr.Value) == 0 +} + +// authorizationRuleListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (arlr AuthorizationRuleListResult) authorizationRuleListResultPreparer() (*http.Request, error) { + if arlr.NextLink == nil || len(to.String(arlr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(arlr.NextLink))) +} + +// AuthorizationRuleListResultPage contains a page of AuthorizationRule values. +type AuthorizationRuleListResultPage struct { + fn func(AuthorizationRuleListResult) (AuthorizationRuleListResult, error) + arlr AuthorizationRuleListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *AuthorizationRuleListResultPage) Next() error { + next, err := page.fn(page.arlr) + if err != nil { + return err + } + page.arlr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page AuthorizationRuleListResultPage) NotDone() bool { + return !page.arlr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page AuthorizationRuleListResultPage) Response() AuthorizationRuleListResult { + return page.arlr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page AuthorizationRuleListResultPage) Values() []AuthorizationRule { + if page.arlr.IsEmpty() { + return nil + } + return *page.arlr.Value +} + +// AuthorizationRuleProperties authorization rule properties. +type AuthorizationRuleProperties struct { + // Rights - The rights associated with the rule. + Rights *[]AccessRights `json:"rights,omitempty"` +} + +// CheckNameAvailability description of the check name availability request properties. +type CheckNameAvailability struct { + // Name - The namespace name to check for availability. The namespace name can contain only letters, numbers, and hyphens. The namespace must start with a letter, and it must end with a letter or number. + Name *string `json:"name,omitempty"` +} + +// CheckNameAvailabilityResult description of the check name availability request properties. +type CheckNameAvailabilityResult struct { + autorest.Response `json:"-"` + // Message - The detailed info regarding the reason associated with the namespace. + Message *string `json:"message,omitempty"` + // NameAvailable - Value indicating namespace is available. Returns true if the namespace is available; otherwise, false. + NameAvailable *bool `json:"nameAvailable,omitempty"` + // Reason - The reason for unavailability of a namespace. Possible values include: 'None', 'InvalidName', 'SubscriptionIsDisabled', 'NameInUse', 'NameInLockdown', 'TooManyNamespaceInCurrentSubscription' + Reason UnavailableReason `json:"reason,omitempty"` +} + +// ErrorResponse error reponse indicates Relay service is not able to process the incoming request. The reason is +// provided in the error message. +type ErrorResponse struct { + // Code - Error code. + Code *string `json:"code,omitempty"` + // Message - Error message indicating why the operation failed. + Message *string `json:"message,omitempty"` +} + +// HybridConnection description of hybrid connection resource. +type HybridConnection struct { + autorest.Response `json:"-"` + // HybridConnectionProperties - Properties of the HybridConnection. + *HybridConnectionProperties `json:"properties,omitempty"` + // ID - Resource ID. + ID *string `json:"id,omitempty"` + // Name - Resource name. + Name *string `json:"name,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for HybridConnection. +func (hc HybridConnection) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if hc.HybridConnectionProperties != nil { + objectMap["properties"] = hc.HybridConnectionProperties + } + if hc.ID != nil { + objectMap["id"] = hc.ID + } + if hc.Name != nil { + objectMap["name"] = hc.Name + } + if hc.Type != nil { + objectMap["type"] = hc.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for HybridConnection struct. +func (hc *HybridConnection) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var hybridConnectionProperties HybridConnectionProperties + err = json.Unmarshal(*v, &hybridConnectionProperties) + if err != nil { + return err + } + hc.HybridConnectionProperties = &hybridConnectionProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + hc.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + hc.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + hc.Type = &typeVar + } + } + } + + return nil +} + +// HybridConnectionListResult the response of the list hybrid connection operation. +type HybridConnectionListResult struct { + autorest.Response `json:"-"` + // Value - Result of the list hybrid connections. + Value *[]HybridConnection `json:"value,omitempty"` + // NextLink - Link to the next set of results. Not empty if value contains incomplete list hybrid connection operation. + NextLink *string `json:"nextLink,omitempty"` +} + +// HybridConnectionListResultIterator provides access to a complete listing of HybridConnection values. +type HybridConnectionListResultIterator struct { + i int + page HybridConnectionListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *HybridConnectionListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter HybridConnectionListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter HybridConnectionListResultIterator) Response() HybridConnectionListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter HybridConnectionListResultIterator) Value() HybridConnection { + if !iter.page.NotDone() { + return HybridConnection{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (hclr HybridConnectionListResult) IsEmpty() bool { + return hclr.Value == nil || len(*hclr.Value) == 0 +} + +// hybridConnectionListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (hclr HybridConnectionListResult) hybridConnectionListResultPreparer() (*http.Request, error) { + if hclr.NextLink == nil || len(to.String(hclr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(hclr.NextLink))) +} + +// HybridConnectionListResultPage contains a page of HybridConnection values. +type HybridConnectionListResultPage struct { + fn func(HybridConnectionListResult) (HybridConnectionListResult, error) + hclr HybridConnectionListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *HybridConnectionListResultPage) Next() error { + next, err := page.fn(page.hclr) + if err != nil { + return err + } + page.hclr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page HybridConnectionListResultPage) NotDone() bool { + return !page.hclr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page HybridConnectionListResultPage) Response() HybridConnectionListResult { + return page.hclr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page HybridConnectionListResultPage) Values() []HybridConnection { + if page.hclr.IsEmpty() { + return nil + } + return *page.hclr.Value +} + +// HybridConnectionProperties properties of the HybridConnection. +type HybridConnectionProperties struct { + // CreatedAt - The time the hybrid connection was created. + CreatedAt *date.Time `json:"createdAt,omitempty"` + // UpdatedAt - The time the namespace was updated. + UpdatedAt *date.Time `json:"updatedAt,omitempty"` + // ListenerCount - The number of listeners for this hybrid connection. Note that min : 1 and max:25 are supported. + ListenerCount *int32 `json:"listenerCount,omitempty"` + // RequiresClientAuthorization - Returns true if client authorization is needed for this hybrid connection; otherwise, false. + RequiresClientAuthorization *bool `json:"requiresClientAuthorization,omitempty"` + // UserMetadata - The usermetadata is a placeholder to store user-defined string data for the hybrid connection endpoint. For example, it can be used to store descriptive data, such as a list of teams and their contact information. Also, user-defined configuration settings can be stored. + UserMetadata *string `json:"userMetadata,omitempty"` +} + +// Namespace description of a namespace resource. +type Namespace struct { + autorest.Response `json:"-"` + // Sku - SKU of the namespace. + Sku *Sku `json:"sku,omitempty"` + // NamespaceProperties - Description of Relay namespace + *NamespaceProperties `json:"properties,omitempty"` + // Location - Resource location. + Location *string `json:"location,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // ID - Resource ID. + ID *string `json:"id,omitempty"` + // Name - Resource name. + Name *string `json:"name,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for Namespace. +func (n Namespace) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if n.Sku != nil { + objectMap["sku"] = n.Sku + } + if n.NamespaceProperties != nil { + objectMap["properties"] = n.NamespaceProperties + } + if n.Location != nil { + objectMap["location"] = n.Location + } + if n.Tags != nil { + objectMap["tags"] = n.Tags + } + if n.ID != nil { + objectMap["id"] = n.ID + } + if n.Name != nil { + objectMap["name"] = n.Name + } + if n.Type != nil { + objectMap["type"] = n.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for Namespace struct. +func (n *Namespace) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "sku": + if v != nil { + var sku Sku + err = json.Unmarshal(*v, &sku) + if err != nil { + return err + } + n.Sku = &sku + } + case "properties": + if v != nil { + var namespaceProperties NamespaceProperties + err = json.Unmarshal(*v, &namespaceProperties) + if err != nil { + return err + } + n.NamespaceProperties = &namespaceProperties + } + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + n.Location = &location + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + n.Tags = tags + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + n.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + n.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + n.Type = &typeVar + } + } + } + + return nil +} + +// NamespaceListResult the response from the list namespace operation. +type NamespaceListResult struct { + autorest.Response `json:"-"` + // Value - Result of the list namespace operation. + Value *[]Namespace `json:"value,omitempty"` + // NextLink - Link to the next set of results. Not empty if value contains incomplete list of namespaces. + NextLink *string `json:"nextLink,omitempty"` +} + +// NamespaceListResultIterator provides access to a complete listing of Namespace values. +type NamespaceListResultIterator struct { + i int + page NamespaceListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *NamespaceListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter NamespaceListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter NamespaceListResultIterator) Response() NamespaceListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter NamespaceListResultIterator) Value() Namespace { + if !iter.page.NotDone() { + return Namespace{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (nlr NamespaceListResult) IsEmpty() bool { + return nlr.Value == nil || len(*nlr.Value) == 0 +} + +// namespaceListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (nlr NamespaceListResult) namespaceListResultPreparer() (*http.Request, error) { + if nlr.NextLink == nil || len(to.String(nlr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(nlr.NextLink))) +} + +// NamespaceListResultPage contains a page of Namespace values. +type NamespaceListResultPage struct { + fn func(NamespaceListResult) (NamespaceListResult, error) + nlr NamespaceListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *NamespaceListResultPage) Next() error { + next, err := page.fn(page.nlr) + if err != nil { + return err + } + page.nlr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page NamespaceListResultPage) NotDone() bool { + return !page.nlr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page NamespaceListResultPage) Response() NamespaceListResult { + return page.nlr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page NamespaceListResultPage) Values() []Namespace { + if page.nlr.IsEmpty() { + return nil + } + return *page.nlr.Value +} + +// NamespaceProperties properties of the namespace. +type NamespaceProperties struct { + // ProvisioningState - Possible values include: 'Created', 'Succeeded', 'Deleted', 'Failed', 'Updating', 'Unknown' + ProvisioningState ProvisioningStateEnum `json:"provisioningState,omitempty"` + // CreatedAt - The time the namespace was created. + CreatedAt *date.Time `json:"createdAt,omitempty"` + // UpdatedAt - The time the namespace was updated. + UpdatedAt *date.Time `json:"updatedAt,omitempty"` + // ServiceBusEndpoint - Endpoint you can use to perform Service Bus operations. + ServiceBusEndpoint *string `json:"serviceBusEndpoint,omitempty"` + // MetricID - Identifier for Azure Insights metrics. + MetricID *string `json:"metricId,omitempty"` +} + +// NamespacesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type NamespacesCreateOrUpdateFuture struct { + azure.Future + req *http.Request +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (n Namespace, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + return n, azure.NewAsyncOpIncompleteError("relay.NamespacesCreateOrUpdateFuture") + } + if future.PollingMethod() == azure.PollingLocation { + n, err = client.CreateOrUpdateResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesCreateOrUpdateFuture", "Result", resp, "Failure sending request") + return + } + n, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") + } + return +} + +// NamespacesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type NamespacesDeleteFuture struct { + azure.Future + req *http.Request +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future NamespacesDeleteFuture) Result(client NamespacesClient) (ar autorest.Response, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesDeleteFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + return ar, azure.NewAsyncOpIncompleteError("relay.NamespacesDeleteFuture") + } + if future.PollingMethod() == azure.PollingLocation { + ar, err = client.DeleteResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesDeleteFuture", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesDeleteFuture", "Result", resp, "Failure sending request") + return + } + ar, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesDeleteFuture", "Result", resp, "Failure responding to request") + } + return +} + +// Operation a Relay REST API operation. +type Operation struct { + // Name - Operation name: {provider}/{resource}/{operation} + Name *string `json:"name,omitempty"` + // Display - The object that represents the operation. + Display *OperationDisplay `json:"display,omitempty"` +} + +// OperationDisplay the object that represents the operation. +type OperationDisplay struct { + // Provider - Service provider: Relay. + Provider *string `json:"provider,omitempty"` + // Resource - Resource on which the operation is performed: Invoice, etc. + Resource *string `json:"resource,omitempty"` + // Operation - Operation type: Read, write, delete, etc. + Operation *string `json:"operation,omitempty"` +} + +// OperationListResult result of the request to list Relay operations. It contains a list of operations and a URL +// link to get the next set of results. +type OperationListResult struct { + autorest.Response `json:"-"` + // Value - List of Relay operations supported by resource provider. + Value *[]Operation `json:"value,omitempty"` + // NextLink - URL to get the next set of operation list results if there are any. + NextLink *string `json:"nextLink,omitempty"` +} + +// OperationListResultIterator provides access to a complete listing of Operation values. +type OperationListResultIterator struct { + i int + page OperationListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *OperationListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter OperationListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter OperationListResultIterator) Response() OperationListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter OperationListResultIterator) Value() Operation { + if !iter.page.NotDone() { + return Operation{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (olr OperationListResult) IsEmpty() bool { + return olr.Value == nil || len(*olr.Value) == 0 +} + +// operationListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (olr OperationListResult) operationListResultPreparer() (*http.Request, error) { + if olr.NextLink == nil || len(to.String(olr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(olr.NextLink))) +} + +// OperationListResultPage contains a page of Operation values. +type OperationListResultPage struct { + fn func(OperationListResult) (OperationListResult, error) + olr OperationListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *OperationListResultPage) Next() error { + next, err := page.fn(page.olr) + if err != nil { + return err + } + page.olr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page OperationListResultPage) NotDone() bool { + return !page.olr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page OperationListResultPage) Response() OperationListResult { + return page.olr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page OperationListResultPage) Values() []Operation { + if page.olr.IsEmpty() { + return nil + } + return *page.olr.Value +} + +// RegenerateAccessKeyParameters parameters supplied to the regenerate authorization rule operation, specifies +// which key neeeds to be reset. +type RegenerateAccessKeyParameters struct { + // KeyType - The access key to regenerate. Possible values include: 'PrimaryKey', 'SecondaryKey' + KeyType KeyType `json:"keyType,omitempty"` + // Key - Optional. If the key value is provided, this is set to key type, or autogenerated key value set for key type. + Key *string `json:"key,omitempty"` +} + +// Resource the resource definition. +type Resource struct { + // ID - Resource ID. + ID *string `json:"id,omitempty"` + // Name - Resource name. + Name *string `json:"name,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// ResourceNamespacePatch definition of resource. +type ResourceNamespacePatch struct { + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // ID - Resource ID. + ID *string `json:"id,omitempty"` + // Name - Resource name. + Name *string `json:"name,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for ResourceNamespacePatch. +func (rnp ResourceNamespacePatch) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if rnp.Tags != nil { + objectMap["tags"] = rnp.Tags + } + if rnp.ID != nil { + objectMap["id"] = rnp.ID + } + if rnp.Name != nil { + objectMap["name"] = rnp.Name + } + if rnp.Type != nil { + objectMap["type"] = rnp.Type + } + return json.Marshal(objectMap) +} + +// Sku SKU of the namespace. +type Sku struct { + // Name - Name of this SKU. + Name *string `json:"name,omitempty"` + // Tier - The tier of this SKU. Possible values include: 'Standard' + Tier SkuTier `json:"tier,omitempty"` +} + +// TrackedResource definition of resource. +type TrackedResource struct { + // Location - Resource location. + Location *string `json:"location,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // ID - Resource ID. + ID *string `json:"id,omitempty"` + // Name - Resource name. + Name *string `json:"name,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for TrackedResource. +func (tr TrackedResource) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if tr.Location != nil { + objectMap["location"] = tr.Location + } + if tr.Tags != nil { + objectMap["tags"] = tr.Tags + } + if tr.ID != nil { + objectMap["id"] = tr.ID + } + if tr.Name != nil { + objectMap["name"] = tr.Name + } + if tr.Type != nil { + objectMap["type"] = tr.Type + } + return json.Marshal(objectMap) +} + +// UpdateParameters description of a namespace resource. +type UpdateParameters struct { + // Sku - SKU of the namespace. + Sku *Sku `json:"sku,omitempty"` + // NamespaceProperties - Description of Relay namespace. + *NamespaceProperties `json:"properties,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // ID - Resource ID. + ID *string `json:"id,omitempty"` + // Name - Resource name. + Name *string `json:"name,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for UpdateParameters. +func (up UpdateParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if up.Sku != nil { + objectMap["sku"] = up.Sku + } + if up.NamespaceProperties != nil { + objectMap["properties"] = up.NamespaceProperties + } + if up.Tags != nil { + objectMap["tags"] = up.Tags + } + if up.ID != nil { + objectMap["id"] = up.ID + } + if up.Name != nil { + objectMap["name"] = up.Name + } + if up.Type != nil { + objectMap["type"] = up.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for UpdateParameters struct. +func (up *UpdateParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "sku": + if v != nil { + var sku Sku + err = json.Unmarshal(*v, &sku) + if err != nil { + return err + } + up.Sku = &sku + } + case "properties": + if v != nil { + var namespaceProperties NamespaceProperties + err = json.Unmarshal(*v, &namespaceProperties) + if err != nil { + return err + } + up.NamespaceProperties = &namespaceProperties + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + up.Tags = tags + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + up.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + up.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + up.Type = &typeVar + } + } + } + + return nil +} + +// WcfRelay description of the WCF relay resource. +type WcfRelay struct { + autorest.Response `json:"-"` + // WcfRelayProperties - Properties of the WCF relay. + *WcfRelayProperties `json:"properties,omitempty"` + // ID - Resource ID. + ID *string `json:"id,omitempty"` + // Name - Resource name. + Name *string `json:"name,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for WcfRelay. +func (wr WcfRelay) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if wr.WcfRelayProperties != nil { + objectMap["properties"] = wr.WcfRelayProperties + } + if wr.ID != nil { + objectMap["id"] = wr.ID + } + if wr.Name != nil { + objectMap["name"] = wr.Name + } + if wr.Type != nil { + objectMap["type"] = wr.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for WcfRelay struct. +func (wr *WcfRelay) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var wcfRelayProperties WcfRelayProperties + err = json.Unmarshal(*v, &wcfRelayProperties) + if err != nil { + return err + } + wr.WcfRelayProperties = &wcfRelayProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + wr.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + wr.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + wr.Type = &typeVar + } + } + } + + return nil +} + +// WcfRelayProperties properties of the WCF relay. +type WcfRelayProperties struct { + // IsDynamic - Returns true if the relay is dynamic; otherwise, false. + IsDynamic *bool `json:"isDynamic,omitempty"` + // CreatedAt - The time the WCF relay was created. + CreatedAt *date.Time `json:"createdAt,omitempty"` + // UpdatedAt - The time the namespace was updated. + UpdatedAt *date.Time `json:"updatedAt,omitempty"` + // ListenerCount - The number of listeners for this relay. Note that min :1 and max:25 are supported. + ListenerCount *int32 `json:"listenerCount,omitempty"` + // RelayType - WCF relay type. Possible values include: 'NetTCP', 'HTTP' + RelayType RelaytypeEnum `json:"relayType,omitempty"` + // RequiresClientAuthorization - Returns true if client authorization is needed for this relay; otherwise, false. + RequiresClientAuthorization *bool `json:"requiresClientAuthorization,omitempty"` + // RequiresTransportSecurity - Returns true if transport security is needed for this relay; otherwise, false. + RequiresTransportSecurity *bool `json:"requiresTransportSecurity,omitempty"` + // UserMetadata - The usermetadata is a placeholder to store user-defined string data for the WCF Relay endpoint. For example, it can be used to store descriptive data, such as list of teams and their contact information. Also, user-defined configuration settings can be stored. + UserMetadata *string `json:"userMetadata,omitempty"` +} + +// WcfRelaysListResult the response of the list WCF relay operation. +type WcfRelaysListResult struct { + autorest.Response `json:"-"` + // Value - Result of the list WCF relay operation. + Value *[]WcfRelay `json:"value,omitempty"` + // NextLink - Link to the next set of results. Not empty if value contains incomplete list of WCF relays. + NextLink *string `json:"nextLink,omitempty"` +} + +// WcfRelaysListResultIterator provides access to a complete listing of WcfRelay values. +type WcfRelaysListResultIterator struct { + i int + page WcfRelaysListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *WcfRelaysListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter WcfRelaysListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter WcfRelaysListResultIterator) Response() WcfRelaysListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter WcfRelaysListResultIterator) Value() WcfRelay { + if !iter.page.NotDone() { + return WcfRelay{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (wrlr WcfRelaysListResult) IsEmpty() bool { + return wrlr.Value == nil || len(*wrlr.Value) == 0 +} + +// wcfRelaysListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (wrlr WcfRelaysListResult) wcfRelaysListResultPreparer() (*http.Request, error) { + if wrlr.NextLink == nil || len(to.String(wrlr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(wrlr.NextLink))) +} + +// WcfRelaysListResultPage contains a page of WcfRelay values. +type WcfRelaysListResultPage struct { + fn func(WcfRelaysListResult) (WcfRelaysListResult, error) + wrlr WcfRelaysListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *WcfRelaysListResultPage) Next() error { + next, err := page.fn(page.wrlr) + if err != nil { + return err + } + page.wrlr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page WcfRelaysListResultPage) NotDone() bool { + return !page.wrlr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page WcfRelaysListResultPage) Response() WcfRelaysListResult { + return page.wrlr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page WcfRelaysListResultPage) Values() []WcfRelay { + if page.wrlr.IsEmpty() { + return nil + } + return *page.wrlr.Value +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/namespaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/namespaces.go new file mode 100644 index 000000000000..f1dd78a83e27 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/namespaces.go @@ -0,0 +1,1144 @@ +package relay + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// NamespacesClient is the use these API to manage Azure Relay resources through Azure Resource Manager. +type NamespacesClient struct { + BaseClient +} + +// NewNamespacesClient creates an instance of the NamespacesClient client. +func NewNamespacesClient(subscriptionID string) NamespacesClient { + return NewNamespacesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewNamespacesClientWithBaseURI creates an instance of the NamespacesClient client. +func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient { + return NamespacesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CheckNameAvailabilityMethod check the specified namespace name availability. +// Parameters: +// parameters - parameters to check availability of the specified namespace name. +func (client NamespacesClient) CheckNameAvailabilityMethod(ctx context.Context, parameters CheckNameAvailability) (result CheckNameAvailabilityResult, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.Name", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.NamespacesClient", "CheckNameAvailabilityMethod", err.Error()) + } + + req, err := client.CheckNameAvailabilityMethodPreparer(ctx, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "CheckNameAvailabilityMethod", nil, "Failure preparing request") + return + } + + resp, err := client.CheckNameAvailabilityMethodSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "CheckNameAvailabilityMethod", resp, "Failure sending request") + return + } + + result, err = client.CheckNameAvailabilityMethodResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "CheckNameAvailabilityMethod", resp, "Failure responding to request") + } + + return +} + +// CheckNameAvailabilityMethodPreparer prepares the CheckNameAvailabilityMethod request. +func (client NamespacesClient) CheckNameAvailabilityMethodPreparer(ctx context.Context, parameters CheckNameAvailability) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Relay/checkNameAvailability", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CheckNameAvailabilityMethodSender sends the CheckNameAvailabilityMethod request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) CheckNameAvailabilityMethodSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CheckNameAvailabilityMethodResponder handles the response to the CheckNameAvailabilityMethod request. The method always +// closes the http.Response Body. +func (client NamespacesClient) CheckNameAvailabilityMethodResponder(resp *http.Response) (result CheckNameAvailabilityResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// CreateOrUpdate create Azure Relay namespace. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// parameters - parameters supplied to create a namespace resource. +func (client NamespacesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, parameters Namespace) (result NamespacesCreateOrUpdateFuture, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.Sku", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.Sku.Name", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil { + return result, validation.NewError("relay.NamespacesClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, namespaceName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + result, err = client.CreateOrUpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "CreateOrUpdate", result.Response(), "Failure sending request") + return + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client NamespacesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, namespaceName string, parameters Namespace) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) CreateOrUpdateSender(req *http.Request) (future NamespacesCreateOrUpdateFuture, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + return +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client NamespacesClient) CreateOrUpdateResponder(resp *http.Response) (result Namespace, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// CreateOrUpdateAuthorizationRule creates or updates an authorization rule for a namespace. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// authorizationRuleName - the authorization rule name. +// parameters - the authorization rule parameters. +func (client NamespacesClient) CreateOrUpdateAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string, parameters AuthorizationRule) (result AuthorizationRule, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.AuthorizationRuleProperties", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.AuthorizationRuleProperties.Rights", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.AuthorizationRuleProperties.Rights", Name: validation.UniqueItems, Rule: true, Chain: nil}}}, + }}}}}); err != nil { + return result, validation.NewError("relay.NamespacesClient", "CreateOrUpdateAuthorizationRule", err.Error()) + } + + req, err := client.CreateOrUpdateAuthorizationRulePreparer(ctx, resourceGroupName, namespaceName, authorizationRuleName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "CreateOrUpdateAuthorizationRule", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateAuthorizationRuleSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "CreateOrUpdateAuthorizationRule", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateAuthorizationRuleResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "CreateOrUpdateAuthorizationRule", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdateAuthorizationRulePreparer prepares the CreateOrUpdateAuthorizationRule request. +func (client NamespacesClient) CreateOrUpdateAuthorizationRulePreparer(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string, parameters AuthorizationRule) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/authorizationRules/{authorizationRuleName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateAuthorizationRuleSender sends the CreateOrUpdateAuthorizationRule request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) CreateOrUpdateAuthorizationRuleSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CreateOrUpdateAuthorizationRuleResponder handles the response to the CreateOrUpdateAuthorizationRule request. The method always +// closes the http.Response Body. +func (client NamespacesClient) CreateOrUpdateAuthorizationRuleResponder(resp *http.Response) (result AuthorizationRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes an existing namespace. This operation also removes all associated resources under the namespace. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +func (client NamespacesClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string) (result NamespacesDeleteFuture, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.NamespacesClient", "Delete", err.Error()) + } + + req, err := client.DeletePreparer(ctx, resourceGroupName, namespaceName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "Delete", nil, "Failure preparing request") + return + } + + result, err = client.DeleteSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "Delete", result.Response(), "Failure sending request") + return + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client NamespacesClient) DeletePreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) DeleteSender(req *http.Request) (future NamespacesDeleteFuture, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + return +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client NamespacesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// DeleteAuthorizationRule deletes a namespace authorization rule. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// authorizationRuleName - the authorization rule name. +func (client NamespacesClient) DeleteAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string) (result autorest.Response, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.NamespacesClient", "DeleteAuthorizationRule", err.Error()) + } + + req, err := client.DeleteAuthorizationRulePreparer(ctx, resourceGroupName, namespaceName, authorizationRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "DeleteAuthorizationRule", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteAuthorizationRuleSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "DeleteAuthorizationRule", resp, "Failure sending request") + return + } + + result, err = client.DeleteAuthorizationRuleResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "DeleteAuthorizationRule", resp, "Failure responding to request") + } + + return +} + +// DeleteAuthorizationRulePreparer prepares the DeleteAuthorizationRule request. +func (client NamespacesClient) DeleteAuthorizationRulePreparer(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/authorizationRules/{authorizationRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteAuthorizationRuleSender sends the DeleteAuthorizationRule request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) DeleteAuthorizationRuleSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteAuthorizationRuleResponder handles the response to the DeleteAuthorizationRule request. The method always +// closes the http.Response Body. +func (client NamespacesClient) DeleteAuthorizationRuleResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get returns the description for the specified namespace. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +func (client NamespacesClient) Get(ctx context.Context, resourceGroupName string, namespaceName string) (result Namespace, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.NamespacesClient", "Get", err.Error()) + } + + req, err := client.GetPreparer(ctx, resourceGroupName, namespaceName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client NamespacesClient) GetPreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client NamespacesClient) GetResponder(resp *http.Response) (result Namespace, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetAuthorizationRule authorization rule for a namespace by name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// authorizationRuleName - the authorization rule name. +func (client NamespacesClient) GetAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string) (result AuthorizationRule, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.NamespacesClient", "GetAuthorizationRule", err.Error()) + } + + req, err := client.GetAuthorizationRulePreparer(ctx, resourceGroupName, namespaceName, authorizationRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "GetAuthorizationRule", nil, "Failure preparing request") + return + } + + resp, err := client.GetAuthorizationRuleSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "GetAuthorizationRule", resp, "Failure sending request") + return + } + + result, err = client.GetAuthorizationRuleResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "GetAuthorizationRule", resp, "Failure responding to request") + } + + return +} + +// GetAuthorizationRulePreparer prepares the GetAuthorizationRule request. +func (client NamespacesClient) GetAuthorizationRulePreparer(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/authorizationRules/{authorizationRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetAuthorizationRuleSender sends the GetAuthorizationRule request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) GetAuthorizationRuleSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetAuthorizationRuleResponder handles the response to the GetAuthorizationRule request. The method always +// closes the http.Response Body. +func (client NamespacesClient) GetAuthorizationRuleResponder(resp *http.Response) (result AuthorizationRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// List lists all the available namespaces within the subscription regardless of the resourceGroups. +func (client NamespacesClient) List(ctx context.Context) (result NamespaceListResultPage, err error) { + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.nlr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "List", resp, "Failure sending request") + return + } + + result.nlr, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client NamespacesClient) ListPreparer(ctx context.Context) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Relay/namespaces", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client NamespacesClient) ListResponder(resp *http.Response) (result NamespaceListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client NamespacesClient) listNextResults(lastResults NamespaceListResult) (result NamespaceListResult, err error) { + req, err := lastResults.namespaceListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "relay.NamespacesClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "relay.NamespacesClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client NamespacesClient) ListComplete(ctx context.Context) (result NamespaceListResultIterator, err error) { + result.page, err = client.List(ctx) + return +} + +// ListAuthorizationRules authorization rules for a namespace. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +func (client NamespacesClient) ListAuthorizationRules(ctx context.Context, resourceGroupName string, namespaceName string) (result AuthorizationRuleListResultPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.NamespacesClient", "ListAuthorizationRules", err.Error()) + } + + result.fn = client.listAuthorizationRulesNextResults + req, err := client.ListAuthorizationRulesPreparer(ctx, resourceGroupName, namespaceName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "ListAuthorizationRules", nil, "Failure preparing request") + return + } + + resp, err := client.ListAuthorizationRulesSender(req) + if err != nil { + result.arlr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "ListAuthorizationRules", resp, "Failure sending request") + return + } + + result.arlr, err = client.ListAuthorizationRulesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "ListAuthorizationRules", resp, "Failure responding to request") + } + + return +} + +// ListAuthorizationRulesPreparer prepares the ListAuthorizationRules request. +func (client NamespacesClient) ListAuthorizationRulesPreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/authorizationRules", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListAuthorizationRulesSender sends the ListAuthorizationRules request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) ListAuthorizationRulesSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListAuthorizationRulesResponder handles the response to the ListAuthorizationRules request. The method always +// closes the http.Response Body. +func (client NamespacesClient) ListAuthorizationRulesResponder(resp *http.Response) (result AuthorizationRuleListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listAuthorizationRulesNextResults retrieves the next set of results, if any. +func (client NamespacesClient) listAuthorizationRulesNextResults(lastResults AuthorizationRuleListResult) (result AuthorizationRuleListResult, err error) { + req, err := lastResults.authorizationRuleListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "relay.NamespacesClient", "listAuthorizationRulesNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListAuthorizationRulesSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "relay.NamespacesClient", "listAuthorizationRulesNextResults", resp, "Failure sending next results request") + } + result, err = client.ListAuthorizationRulesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "listAuthorizationRulesNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListAuthorizationRulesComplete enumerates all values, automatically crossing page boundaries as required. +func (client NamespacesClient) ListAuthorizationRulesComplete(ctx context.Context, resourceGroupName string, namespaceName string) (result AuthorizationRuleListResultIterator, err error) { + result.page, err = client.ListAuthorizationRules(ctx, resourceGroupName, namespaceName) + return +} + +// ListByResourceGroup lists all the available namespaces within the ResourceGroup. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +func (client NamespacesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result NamespaceListResultPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.NamespacesClient", "ListByResourceGroup", err.Error()) + } + + result.fn = client.listByResourceGroupNextResults + req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "ListByResourceGroup", nil, "Failure preparing request") + return + } + + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.nlr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "ListByResourceGroup", resp, "Failure sending request") + return + } + + result.nlr, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "ListByResourceGroup", resp, "Failure responding to request") + } + + return +} + +// ListByResourceGroupPreparer prepares the ListByResourceGroup request. +func (client NamespacesClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always +// closes the http.Response Body. +func (client NamespacesClient) ListByResourceGroupResponder(resp *http.Response) (result NamespaceListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByResourceGroupNextResults retrieves the next set of results, if any. +func (client NamespacesClient) listByResourceGroupNextResults(lastResults NamespaceListResult) (result NamespaceListResult, err error) { + req, err := lastResults.namespaceListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "relay.NamespacesClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "relay.NamespacesClient", "listByResourceGroupNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. +func (client NamespacesClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result NamespaceListResultIterator, err error) { + result.page, err = client.ListByResourceGroup(ctx, resourceGroupName) + return +} + +// ListKeys primary and secondary connection strings to the namespace. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// authorizationRuleName - the authorization rule name. +func (client NamespacesClient) ListKeys(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string) (result AccessKeys, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.NamespacesClient", "ListKeys", err.Error()) + } + + req, err := client.ListKeysPreparer(ctx, resourceGroupName, namespaceName, authorizationRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "ListKeys", nil, "Failure preparing request") + return + } + + resp, err := client.ListKeysSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "ListKeys", resp, "Failure sending request") + return + } + + result, err = client.ListKeysResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "ListKeys", resp, "Failure responding to request") + } + + return +} + +// ListKeysPreparer prepares the ListKeys request. +func (client NamespacesClient) ListKeysPreparer(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/authorizationRules/{authorizationRuleName}/listKeys", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListKeysSender sends the ListKeys request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) ListKeysSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListKeysResponder handles the response to the ListKeys request. The method always +// closes the http.Response Body. +func (client NamespacesClient) ListKeysResponder(resp *http.Response) (result AccessKeys, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// RegenerateKeys regenerates the primary or secondary connection strings to the namespace. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// authorizationRuleName - the authorization rule name. +// parameters - parameters supplied to regenerate authorization rule. +func (client NamespacesClient) RegenerateKeys(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string, parameters RegenerateAccessKeyParameters) (result AccessKeys, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.NamespacesClient", "RegenerateKeys", err.Error()) + } + + req, err := client.RegenerateKeysPreparer(ctx, resourceGroupName, namespaceName, authorizationRuleName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "RegenerateKeys", nil, "Failure preparing request") + return + } + + resp, err := client.RegenerateKeysSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "RegenerateKeys", resp, "Failure sending request") + return + } + + result, err = client.RegenerateKeysResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "RegenerateKeys", resp, "Failure responding to request") + } + + return +} + +// RegenerateKeysPreparer prepares the RegenerateKeys request. +func (client NamespacesClient) RegenerateKeysPreparer(ctx context.Context, resourceGroupName string, namespaceName string, authorizationRuleName string, parameters RegenerateAccessKeyParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/authorizationRules/{authorizationRuleName}/regenerateKeys", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// RegenerateKeysSender sends the RegenerateKeys request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) RegenerateKeysSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// RegenerateKeysResponder handles the response to the RegenerateKeys request. The method always +// closes the http.Response Body. +func (client NamespacesClient) RegenerateKeysResponder(resp *http.Response) (result AccessKeys, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Update creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation +// is idempotent. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// parameters - parameters for updating a namespace resource. +func (client NamespacesClient) Update(ctx context.Context, resourceGroupName string, namespaceName string, parameters UpdateParameters) (result Namespace, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.NamespacesClient", "Update", err.Error()) + } + + req, err := client.UpdatePreparer(ctx, resourceGroupName, namespaceName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "Update", nil, "Failure preparing request") + return + } + + resp, err := client.UpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "Update", resp, "Failure sending request") + return + } + + result, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.NamespacesClient", "Update", resp, "Failure responding to request") + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client NamespacesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, namespaceName string, parameters UpdateParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client NamespacesClient) UpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client NamespacesClient) UpdateResponder(resp *http.Response) (result Namespace, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/operations.go new file mode 100644 index 000000000000..9046fe485976 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/operations.go @@ -0,0 +1,126 @@ +package relay + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// OperationsClient is the use these API to manage Azure Relay resources through Azure Resource Manager. +type OperationsClient struct { + BaseClient +} + +// NewOperationsClient creates an instance of the OperationsClient client. +func NewOperationsClient(subscriptionID string) OperationsClient { + return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. +func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { + return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// List lists all available Relay REST API operations. +func (client OperationsClient) List(ctx context.Context) (result OperationListResultPage, err error) { + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.OperationsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.olr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.OperationsClient", "List", resp, "Failure sending request") + return + } + + result.olr, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.OperationsClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPath("/providers/Microsoft.Relay/operations"), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client OperationsClient) listNextResults(lastResults OperationListResult) (result OperationListResult, err error) { + req, err := lastResults.operationListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "relay.OperationsClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "relay.OperationsClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.OperationsClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client OperationsClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) { + result.page, err = client.List(ctx) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/version.go new file mode 100644 index 000000000000..fed5c9635937 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/version.go @@ -0,0 +1,30 @@ +package relay + +import "github.com/Azure/azure-sdk-for-go/version" + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +// UserAgent returns the UserAgent string to use when sending http.Requests. +func UserAgent() string { + return "Azure-SDK-For-Go/" + version.Number + " relay/2017-04-01" +} + +// Version returns the semantic version (see http://semver.org) of the client. +func Version() string { + return version.Number +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/wcfrelays.go b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/wcfrelays.go new file mode 100644 index 000000000000..37b5a7a20a68 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/wcfrelays.go @@ -0,0 +1,942 @@ +package relay + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// WCFRelaysClient is the use these API to manage Azure Relay resources through Azure Resource Manager. +type WCFRelaysClient struct { + BaseClient +} + +// NewWCFRelaysClient creates an instance of the WCFRelaysClient client. +func NewWCFRelaysClient(subscriptionID string) WCFRelaysClient { + return NewWCFRelaysClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewWCFRelaysClientWithBaseURI creates an instance of the WCFRelaysClient client. +func NewWCFRelaysClientWithBaseURI(baseURI string, subscriptionID string) WCFRelaysClient { + return WCFRelaysClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate creates or updates a WCF relay. This operation is idempotent. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// relayName - the relay name. +// parameters - parameters supplied to create a WCF relay. +func (client WCFRelaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, namespaceName string, relayName string, parameters WcfRelay) (result WcfRelay, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: relayName, + Constraints: []validation.Constraint{{Target: "relayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.WcfRelayProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.WcfRelayProperties.ListenerCount", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.WcfRelayProperties.ListenerCount", Name: validation.InclusiveMaximum, Rule: 25, Chain: nil}, + {Target: "parameters.WcfRelayProperties.ListenerCount", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}, + }}, + }}}}}); err != nil { + return result, validation.NewError("relay.WCFRelaysClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, namespaceName, relayName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "CreateOrUpdate", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client WCFRelaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, namespaceName string, relayName string, parameters WcfRelay) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "relayName": autorest.Encode("path", relayName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/wcfRelays/{relayName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client WCFRelaysClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client WCFRelaysClient) CreateOrUpdateResponder(resp *http.Response) (result WcfRelay, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// CreateOrUpdateAuthorizationRule creates or updates an authorization rule for a WCF relay. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// relayName - the relay name. +// authorizationRuleName - the authorization rule name. +// parameters - the authorization rule parameters. +func (client WCFRelaysClient) CreateOrUpdateAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, relayName string, authorizationRuleName string, parameters AuthorizationRule) (result AuthorizationRule, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: relayName, + Constraints: []validation.Constraint{{Target: "relayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.AuthorizationRuleProperties", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.AuthorizationRuleProperties.Rights", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.AuthorizationRuleProperties.Rights", Name: validation.UniqueItems, Rule: true, Chain: nil}}}, + }}}}}); err != nil { + return result, validation.NewError("relay.WCFRelaysClient", "CreateOrUpdateAuthorizationRule", err.Error()) + } + + req, err := client.CreateOrUpdateAuthorizationRulePreparer(ctx, resourceGroupName, namespaceName, relayName, authorizationRuleName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "CreateOrUpdateAuthorizationRule", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateAuthorizationRuleSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "CreateOrUpdateAuthorizationRule", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateAuthorizationRuleResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "CreateOrUpdateAuthorizationRule", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdateAuthorizationRulePreparer prepares the CreateOrUpdateAuthorizationRule request. +func (client WCFRelaysClient) CreateOrUpdateAuthorizationRulePreparer(ctx context.Context, resourceGroupName string, namespaceName string, relayName string, authorizationRuleName string, parameters AuthorizationRule) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "namespaceName": autorest.Encode("path", namespaceName), + "relayName": autorest.Encode("path", relayName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/wcfRelays/{relayName}/authorizationRules/{authorizationRuleName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateAuthorizationRuleSender sends the CreateOrUpdateAuthorizationRule request. The method will close the +// http.Response Body if it receives an error. +func (client WCFRelaysClient) CreateOrUpdateAuthorizationRuleSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CreateOrUpdateAuthorizationRuleResponder handles the response to the CreateOrUpdateAuthorizationRule request. The method always +// closes the http.Response Body. +func (client WCFRelaysClient) CreateOrUpdateAuthorizationRuleResponder(resp *http.Response) (result AuthorizationRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes a WCF relay. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// relayName - the relay name. +func (client WCFRelaysClient) Delete(ctx context.Context, resourceGroupName string, namespaceName string, relayName string) (result autorest.Response, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: relayName, + Constraints: []validation.Constraint{{Target: "relayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.WCFRelaysClient", "Delete", err.Error()) + } + + req, err := client.DeletePreparer(ctx, resourceGroupName, namespaceName, relayName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client WCFRelaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, namespaceName string, relayName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "relayName": autorest.Encode("path", relayName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/wcfRelays/{relayName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client WCFRelaysClient) DeleteSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client WCFRelaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// DeleteAuthorizationRule deletes a WCF relay authorization rule. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// relayName - the relay name. +// authorizationRuleName - the authorization rule name. +func (client WCFRelaysClient) DeleteAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, relayName string, authorizationRuleName string) (result autorest.Response, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: relayName, + Constraints: []validation.Constraint{{Target: "relayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.WCFRelaysClient", "DeleteAuthorizationRule", err.Error()) + } + + req, err := client.DeleteAuthorizationRulePreparer(ctx, resourceGroupName, namespaceName, relayName, authorizationRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "DeleteAuthorizationRule", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteAuthorizationRuleSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "DeleteAuthorizationRule", resp, "Failure sending request") + return + } + + result, err = client.DeleteAuthorizationRuleResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "DeleteAuthorizationRule", resp, "Failure responding to request") + } + + return +} + +// DeleteAuthorizationRulePreparer prepares the DeleteAuthorizationRule request. +func (client WCFRelaysClient) DeleteAuthorizationRulePreparer(ctx context.Context, resourceGroupName string, namespaceName string, relayName string, authorizationRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "namespaceName": autorest.Encode("path", namespaceName), + "relayName": autorest.Encode("path", relayName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/wcfRelays/{relayName}/authorizationRules/{authorizationRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteAuthorizationRuleSender sends the DeleteAuthorizationRule request. The method will close the +// http.Response Body if it receives an error. +func (client WCFRelaysClient) DeleteAuthorizationRuleSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteAuthorizationRuleResponder handles the response to the DeleteAuthorizationRule request. The method always +// closes the http.Response Body. +func (client WCFRelaysClient) DeleteAuthorizationRuleResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get returns the description for the specified WCF relay. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// relayName - the relay name. +func (client WCFRelaysClient) Get(ctx context.Context, resourceGroupName string, namespaceName string, relayName string) (result WcfRelay, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: relayName, + Constraints: []validation.Constraint{{Target: "relayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.WCFRelaysClient", "Get", err.Error()) + } + + req, err := client.GetPreparer(ctx, resourceGroupName, namespaceName, relayName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client WCFRelaysClient) GetPreparer(ctx context.Context, resourceGroupName string, namespaceName string, relayName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "relayName": autorest.Encode("path", relayName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/wcfRelays/{relayName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client WCFRelaysClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client WCFRelaysClient) GetResponder(resp *http.Response) (result WcfRelay, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetAuthorizationRule get authorizationRule for a WCF relay by name. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// relayName - the relay name. +// authorizationRuleName - the authorization rule name. +func (client WCFRelaysClient) GetAuthorizationRule(ctx context.Context, resourceGroupName string, namespaceName string, relayName string, authorizationRuleName string) (result AuthorizationRule, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: relayName, + Constraints: []validation.Constraint{{Target: "relayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.WCFRelaysClient", "GetAuthorizationRule", err.Error()) + } + + req, err := client.GetAuthorizationRulePreparer(ctx, resourceGroupName, namespaceName, relayName, authorizationRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "GetAuthorizationRule", nil, "Failure preparing request") + return + } + + resp, err := client.GetAuthorizationRuleSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "GetAuthorizationRule", resp, "Failure sending request") + return + } + + result, err = client.GetAuthorizationRuleResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "GetAuthorizationRule", resp, "Failure responding to request") + } + + return +} + +// GetAuthorizationRulePreparer prepares the GetAuthorizationRule request. +func (client WCFRelaysClient) GetAuthorizationRulePreparer(ctx context.Context, resourceGroupName string, namespaceName string, relayName string, authorizationRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "namespaceName": autorest.Encode("path", namespaceName), + "relayName": autorest.Encode("path", relayName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/wcfRelays/{relayName}/authorizationRules/{authorizationRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetAuthorizationRuleSender sends the GetAuthorizationRule request. The method will close the +// http.Response Body if it receives an error. +func (client WCFRelaysClient) GetAuthorizationRuleSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetAuthorizationRuleResponder handles the response to the GetAuthorizationRule request. The method always +// closes the http.Response Body. +func (client WCFRelaysClient) GetAuthorizationRuleResponder(resp *http.Response) (result AuthorizationRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListAuthorizationRules authorization rules for a WCF relay. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// relayName - the relay name. +func (client WCFRelaysClient) ListAuthorizationRules(ctx context.Context, resourceGroupName string, namespaceName string, relayName string) (result AuthorizationRuleListResultPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: relayName, + Constraints: []validation.Constraint{{Target: "relayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.WCFRelaysClient", "ListAuthorizationRules", err.Error()) + } + + result.fn = client.listAuthorizationRulesNextResults + req, err := client.ListAuthorizationRulesPreparer(ctx, resourceGroupName, namespaceName, relayName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "ListAuthorizationRules", nil, "Failure preparing request") + return + } + + resp, err := client.ListAuthorizationRulesSender(req) + if err != nil { + result.arlr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "ListAuthorizationRules", resp, "Failure sending request") + return + } + + result.arlr, err = client.ListAuthorizationRulesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "ListAuthorizationRules", resp, "Failure responding to request") + } + + return +} + +// ListAuthorizationRulesPreparer prepares the ListAuthorizationRules request. +func (client WCFRelaysClient) ListAuthorizationRulesPreparer(ctx context.Context, resourceGroupName string, namespaceName string, relayName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "relayName": autorest.Encode("path", relayName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/wcfRelays/{relayName}/authorizationRules", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListAuthorizationRulesSender sends the ListAuthorizationRules request. The method will close the +// http.Response Body if it receives an error. +func (client WCFRelaysClient) ListAuthorizationRulesSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListAuthorizationRulesResponder handles the response to the ListAuthorizationRules request. The method always +// closes the http.Response Body. +func (client WCFRelaysClient) ListAuthorizationRulesResponder(resp *http.Response) (result AuthorizationRuleListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listAuthorizationRulesNextResults retrieves the next set of results, if any. +func (client WCFRelaysClient) listAuthorizationRulesNextResults(lastResults AuthorizationRuleListResult) (result AuthorizationRuleListResult, err error) { + req, err := lastResults.authorizationRuleListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "listAuthorizationRulesNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListAuthorizationRulesSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "listAuthorizationRulesNextResults", resp, "Failure sending next results request") + } + result, err = client.ListAuthorizationRulesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "listAuthorizationRulesNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListAuthorizationRulesComplete enumerates all values, automatically crossing page boundaries as required. +func (client WCFRelaysClient) ListAuthorizationRulesComplete(ctx context.Context, resourceGroupName string, namespaceName string, relayName string) (result AuthorizationRuleListResultIterator, err error) { + result.page, err = client.ListAuthorizationRules(ctx, resourceGroupName, namespaceName, relayName) + return +} + +// ListByNamespace lists the WCF relays within the namespace. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +func (client WCFRelaysClient) ListByNamespace(ctx context.Context, resourceGroupName string, namespaceName string) (result WcfRelaysListResultPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.WCFRelaysClient", "ListByNamespace", err.Error()) + } + + result.fn = client.listByNamespaceNextResults + req, err := client.ListByNamespacePreparer(ctx, resourceGroupName, namespaceName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "ListByNamespace", nil, "Failure preparing request") + return + } + + resp, err := client.ListByNamespaceSender(req) + if err != nil { + result.wrlr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "ListByNamespace", resp, "Failure sending request") + return + } + + result.wrlr, err = client.ListByNamespaceResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "ListByNamespace", resp, "Failure responding to request") + } + + return +} + +// ListByNamespacePreparer prepares the ListByNamespace request. +func (client WCFRelaysClient) ListByNamespacePreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "namespaceName": autorest.Encode("path", namespaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/wcfRelays", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByNamespaceSender sends the ListByNamespace request. The method will close the +// http.Response Body if it receives an error. +func (client WCFRelaysClient) ListByNamespaceSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByNamespaceResponder handles the response to the ListByNamespace request. The method always +// closes the http.Response Body. +func (client WCFRelaysClient) ListByNamespaceResponder(resp *http.Response) (result WcfRelaysListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByNamespaceNextResults retrieves the next set of results, if any. +func (client WCFRelaysClient) listByNamespaceNextResults(lastResults WcfRelaysListResult) (result WcfRelaysListResult, err error) { + req, err := lastResults.wcfRelaysListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "listByNamespaceNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByNamespaceSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "listByNamespaceNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByNamespaceResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "listByNamespaceNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByNamespaceComplete enumerates all values, automatically crossing page boundaries as required. +func (client WCFRelaysClient) ListByNamespaceComplete(ctx context.Context, resourceGroupName string, namespaceName string) (result WcfRelaysListResultIterator, err error) { + result.page, err = client.ListByNamespace(ctx, resourceGroupName, namespaceName) + return +} + +// ListKeys primary and secondary connection strings to the WCF relay. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// relayName - the relay name. +// authorizationRuleName - the authorization rule name. +func (client WCFRelaysClient) ListKeys(ctx context.Context, resourceGroupName string, namespaceName string, relayName string, authorizationRuleName string) (result AccessKeys, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: relayName, + Constraints: []validation.Constraint{{Target: "relayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.WCFRelaysClient", "ListKeys", err.Error()) + } + + req, err := client.ListKeysPreparer(ctx, resourceGroupName, namespaceName, relayName, authorizationRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "ListKeys", nil, "Failure preparing request") + return + } + + resp, err := client.ListKeysSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "ListKeys", resp, "Failure sending request") + return + } + + result, err = client.ListKeysResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "ListKeys", resp, "Failure responding to request") + } + + return +} + +// ListKeysPreparer prepares the ListKeys request. +func (client WCFRelaysClient) ListKeysPreparer(ctx context.Context, resourceGroupName string, namespaceName string, relayName string, authorizationRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "namespaceName": autorest.Encode("path", namespaceName), + "relayName": autorest.Encode("path", relayName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/wcfRelays/{relayName}/authorizationRules/{authorizationRuleName}/listKeys", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListKeysSender sends the ListKeys request. The method will close the +// http.Response Body if it receives an error. +func (client WCFRelaysClient) ListKeysSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListKeysResponder handles the response to the ListKeys request. The method always +// closes the http.Response Body. +func (client WCFRelaysClient) ListKeysResponder(resp *http.Response) (result AccessKeys, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// RegenerateKeys regenerates the primary or secondary connection strings to the WCF relay. +// Parameters: +// resourceGroupName - name of the Resource group within the Azure subscription. +// namespaceName - the namespace name +// relayName - the relay name. +// authorizationRuleName - the authorization rule name. +// parameters - parameters supplied to regenerate authorization rule. +func (client WCFRelaysClient) RegenerateKeys(ctx context.Context, resourceGroupName string, namespaceName string, relayName string, authorizationRuleName string, parameters RegenerateAccessKeyParameters) (result AccessKeys, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: namespaceName, + Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: relayName, + Constraints: []validation.Constraint{{Target: "relayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: authorizationRuleName, + Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + return result, validation.NewError("relay.WCFRelaysClient", "RegenerateKeys", err.Error()) + } + + req, err := client.RegenerateKeysPreparer(ctx, resourceGroupName, namespaceName, relayName, authorizationRuleName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "RegenerateKeys", nil, "Failure preparing request") + return + } + + resp, err := client.RegenerateKeysSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "RegenerateKeys", resp, "Failure sending request") + return + } + + result, err = client.RegenerateKeysResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "relay.WCFRelaysClient", "RegenerateKeys", resp, "Failure responding to request") + } + + return +} + +// RegenerateKeysPreparer prepares the RegenerateKeys request. +func (client WCFRelaysClient) RegenerateKeysPreparer(ctx context.Context, resourceGroupName string, namespaceName string, relayName string, authorizationRuleName string, parameters RegenerateAccessKeyParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "authorizationRuleName": autorest.Encode("path", authorizationRuleName), + "namespaceName": autorest.Encode("path", namespaceName), + "relayName": autorest.Encode("path", relayName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Relay/namespaces/{namespaceName}/wcfRelays/{relayName}/authorizationRules/{authorizationRuleName}/regenerateKeys", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// RegenerateKeysSender sends the RegenerateKeys request. The method will close the +// http.Response Body if it receives an error. +func (client WCFRelaysClient) RegenerateKeysSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// RegenerateKeysResponder handles the response to the RegenerateKeys request. The method always +// closes the http.Response Body. +func (client WCFRelaysClient) RegenerateKeysResponder(resp *http.Response) (result AccessKeys, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/vendor.json b/vendor/vendor.json index f7f29678221b..f05e53de3058 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -194,6 +194,14 @@ "version": "v16.2.1", "versionExact": "v16.2.1" }, + { + "checksumSHA1": "/Tlgqs81ToI+zz4miZcfu5yvZYU=", + "path": "github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay", + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" + }, { "checksumSHA1": "DJY5zDEcGa82/Hbfud8lgHCuvU4=", "path": "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions", diff --git a/website/azurerm.erb b/website/azurerm.erb index 8a205cdae715..7d118afd0049 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -526,6 +526,10 @@ azurerm_iothub + > + azurerm_relay_namespace + + > azurerm_servicebus_namespace diff --git a/website/docs/r/relay_namespace.html.markdown b/website/docs/r/relay_namespace.html.markdown new file mode 100644 index 000000000000..8dfc02ead48b --- /dev/null +++ b/website/docs/r/relay_namespace.html.markdown @@ -0,0 +1,82 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_relay_namespace" +sidebar_current: "docs-azurerm-resource-relay-namespace" +description: |- + Manages an Azure Relay Namespace. + +--- + +# azurerm_relay_namespace + +Manages an Azure Relay Namespace. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "test" { + name = "example-resources" + location = "West Europe" +} + +resource "azurerm_relay_namespace" "test" { + name = "example-relay" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku { + name = "Standard" + } + + tags { + source = "terraform" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the Azure Relay Namespace. Changing this forces a new resource to be created. + +* `resource_group_name` - (Required) The name of the resource group in which to create the Azure Relay Namespace. + +* `location` - (Required) Specifies the supported Azure location where the Azure Relay Namespace exists. Changing this forces a new resource to be created. + +* `sku` - (Required) A `sku` block as defined below. + +* `tags` - (Optional) A mapping of tags to assign to the resource. + +--- + +A `sku` block contains: + +* `name` - (Required) The name of the SKU to use. At this time the only supported value is `Standard`. + + +## Attributes Reference + +The following attributes are exported: + +* `id` - The Azure Relay Namespace ID. + +The following attributes are exported only if there is an authorization rule named +`RootManageSharedAccessKey` which is created automatically by Azure. + +* `primary_connection_string` - The primary connection string for the authorization rule `RootManageSharedAccessKey`. + +* `secondary_connection_string` - The secondary connection string for the authorization rule `RootManageSharedAccessKey`. + +* `primary_key` - The primary access key for the authorization rule `RootManageSharedAccessKey`. + +* `secondary_key` - The secondary access key for the authorization rule `RootManageSharedAccessKey`. + +* `metric_id` - The Identifier for Azure Insights metrics. + +## Import + +Azure Relay Namespace's can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_relay_namespace.relay1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Relay/namespaces/relay1 +``` From d3f8c1ab7f38281aa0ec26a4aaf1fc71abafe3bd Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 14 May 2018 14:05:11 -0700 Subject: [PATCH 119/320] Updating to include #1233 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44d329746521..0cdeb387239d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 1.6.0 (Unreleased) +FEATURES: + +* **New Resource:** `azurerm_relay_namespace` [GH-1233] + BUG FIXES: * `azurerm_virtual_machine_scale_set` - an empty `os_profile_windows_config` block no longer causes a panic [GH-1224] From 26834a2facbbb4e92238da83b29402ae389058c1 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Mon, 14 May 2018 22:24:08 +0100 Subject: [PATCH 120/320] Adding IP restrictions to Web App (#1231) * adding iprestrictions * Documenting the `ip_restriction` fields * Ensuring we always set `ip_restriction` * Always setting the IP Restriction block for the Data Source * Removing the explicit assignment of default values * Fixing a typo --- azurerm/data_source_app_service.go | 22 +++++ azurerm/data_source_app_service_test.go | 32 ++++++ azurerm/import_arm_app_service_test.go | 23 +++++ azurerm/resource_arm_app_service.go | 63 +++++++++++- azurerm/resource_arm_app_service_test.go | 120 +++++++++++++++++++++++ website/docs/d/app_service.html.markdown | 12 ++- website/docs/r/app_service.html.markdown | 12 ++- 7 files changed, 281 insertions(+), 3 deletions(-) diff --git a/azurerm/data_source_app_service.go b/azurerm/data_source_app_service.go index 67f3e9bb9473..ab575d8206ac 100644 --- a/azurerm/data_source_app_service.go +++ b/azurerm/data_source_app_service.go @@ -123,6 +123,23 @@ func dataSourceArmAppService() *schema.Resource { Computed: true, }, + "ip_restriction": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "ip_address": { + Type: schema.TypeString, + Computed: true, + }, + "subnet_mask": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "https_only": { Type: schema.TypeBool, Computed: true, @@ -284,6 +301,11 @@ func dataSourceArmAppServiceRead(d *schema.ResourceData, meta interface{}) error return err } + restrictions := flattenAppServiceIpRestrictions(configResp.SiteConfig.IPSecurityRestrictions) + if err := d.Set("ip_restriction", restrictions); err != nil { + return fmt.Errorf("Error setting `ip_restriction`: %s", err) + } + scm := flattenAppServiceSourceControl(scmResp.SiteSourceControlProperties) if err := d.Set("source_control", scm); err != nil { return err diff --git a/azurerm/data_source_app_service_test.go b/azurerm/data_source_app_service_test.go index cc5e10e5cbbb..e6cd6788ba9f 100644 --- a/azurerm/data_source_app_service_test.go +++ b/azurerm/data_source_app_service_test.go @@ -126,6 +126,26 @@ func TestAccDataSourceAzureRMAppService_connectionString(t *testing.T) { }) } +func TestAccDataSourceAzureRMAppService_ipRestriction(t *testing.T) { + dataSourceName := "data.azurerm_app_service.test" + rInt := acctest.RandInt() + location := testLocation() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAppService_ipRestriction(rInt, location), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "ip_restriction.0.ip_address", "10.10.10.10"), + resource.TestCheckResourceAttr(dataSourceName, "ip_restriction.0.subnet_mask", "255.255.255.255"), + ), + }, + }, + }) +} + func TestAccDataSourceAzureRMAppService_http2Enabled(t *testing.T) { dataSourceName := "data.azurerm_app_service.test" rInt := acctest.RandInt() @@ -217,6 +237,18 @@ data "azurerm_app_service" "test" { `, config) } +func testAccDataSourceAppService_ipRestriction(rInt int, location string) string { + config := testAccAzureRMAppService_oneIpRestriction(rInt, location) + return fmt.Sprintf(` +%s + +data "azurerm_app_service" "test" { + name = "${azurerm_app_service.test.name}" + resource_group_name = "${azurerm_app_service.test.resource_group_name}" +} +`, config) +} + func testAccDataSourceAppService_http2Enabled(rInt int, location string) string { config := testAccAzureRMAppService_http2Enabled(rInt, location) return fmt.Sprintf(` diff --git a/azurerm/import_arm_app_service_test.go b/azurerm/import_arm_app_service_test.go index e2bacbcbae5e..b1740342612f 100644 --- a/azurerm/import_arm_app_service_test.go +++ b/azurerm/import_arm_app_service_test.go @@ -145,6 +145,29 @@ func TestAccAzureRMAppService_importConnectionStrings(t *testing.T) { }) } +func TestAccAzureRMAppService_importIpRestriction(t *testing.T) { + resourceName := "azurerm_app_service.test" + + ri := acctest.RandInt() + config := testAccAzureRMAppService_oneIpRestriction(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAzureRMAppService_importDefaultDocuments(t *testing.T) { resourceName := "azurerm_app_service.test" diff --git a/azurerm/resource_arm_app_service.go b/azurerm/resource_arm_app_service.go index 7c5af8ef2682..6ebc59e7134e 100644 --- a/azurerm/resource_arm_app_service.go +++ b/azurerm/resource_arm_app_service.go @@ -214,6 +214,25 @@ func resourceArmAppService() *schema.Resource { Computed: true, }, + "ip_restriction": { + Type: schema.TypeList, + Optional: true, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "ip_address": { + Type: schema.TypeString, + Required: true, + }, + "subnet_mask": { + Type: schema.TypeString, + Optional: true, + Default: "255.255.255.255", + }, + }, + }, + }, + "https_only": { Type: schema.TypeBool, Optional: true, @@ -432,7 +451,7 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error return err } - if d.HasChange("site_config") { + if d.HasChange("site_config") || d.HasChange("ip_restriction") { // update the main configuration siteConfig := expandAppServiceSiteConfig(d) siteConfigResource := web.SiteConfigResource{ @@ -594,6 +613,11 @@ func resourceArmAppServiceRead(d *schema.ResourceData, meta interface{}) error { return err } + restrictions := flattenAppServiceIpRestrictions(configResp.SiteConfig.IPSecurityRestrictions) + if err := d.Set("ip_restriction", restrictions); err != nil { + return fmt.Errorf("Error flattening `ip_restrictions`: %s", err) + } + scm := flattenAppServiceSourceControl(scmResp.SiteSourceControlProperties) if err := d.Set("source_control", scm); err != nil { return err @@ -643,6 +667,9 @@ func expandAppServiceSiteConfig(d *schema.ResourceData) web.SiteConfig { configs := d.Get("site_config").([]interface{}) siteConfig := web.SiteConfig{} + ipRestrictions := expandIpRestrictions(d) + siteConfig.IPSecurityRestrictions = ipRestrictions + if len(configs) == 0 { return siteConfig } @@ -852,6 +879,25 @@ func expandAppServiceConnectionStrings(d *schema.ResourceData) map[string]*web.C return output } +func expandIpRestrictions(d *schema.ResourceData) *[]web.IPSecurityRestriction { + ipSecurityRestrictions := d.Get("ip_restriction").([]interface{}) + restrictions := make([]web.IPSecurityRestriction, 0) + + for _, ipSecurityRestriction := range ipSecurityRestrictions { + restriction := ipSecurityRestriction.(map[string]interface{}) + + ip_address := restriction["ip_address"].(string) + subnet_mask := restriction["subnet_mask"].(string) + + restrictions = append(restrictions, web.IPSecurityRestriction{ + IPAddress: &ip_address, + SubnetMask: &subnet_mask, + }) + } + + return &restrictions +} + func flattenAppServiceConnectionStrings(input map[string]*web.ConnStringValueTypePair) interface{} { results := make([]interface{}, 0) @@ -866,6 +912,21 @@ func flattenAppServiceConnectionStrings(input map[string]*web.ConnStringValueTyp return results } +func flattenAppServiceIpRestrictions(input *[]web.IPSecurityRestriction) interface{} { + results := make([]interface{}, 0) + + if input != nil { + for _, v := range *input { + result := make(map[string]interface{}, 0) + result["ip_address"] = *v.IPAddress + result["subnet_mask"] = *v.SubnetMask + results = append(results, result) + } + } + + return results +} + func flattenAppServiceAppSettings(input map[string]*string) map[string]string { output := make(map[string]string, 0) for k, v := range input { diff --git a/azurerm/resource_arm_app_service_test.go b/azurerm/resource_arm_app_service_test.go index f46c4e0f933b..ddeed68f14be 100644 --- a/azurerm/resource_arm_app_service_test.go +++ b/azurerm/resource_arm_app_service_test.go @@ -371,6 +371,54 @@ func TestAccAzureRMAppService_connectionStrings(t *testing.T) { }) } +func TestAccAzureRMAppService_oneIpRestriction(t *testing.T) { + resourceName := "azurerm_app_service.test" + ri := acctest.RandInt() + config := testAccAzureRMAppService_oneIpRestriction(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "ip_restriction.0.ip_address", "10.10.10.10"), + resource.TestCheckResourceAttr(resourceName, "ip_restriction.0.subnet_mask", "255.255.255.255"), + ), + }, + }, + }) +} + +func TestAccAzureRMAppService_manyIpRestrictions(t *testing.T) { + resourceName := "azurerm_app_service.test" + ri := acctest.RandInt() + config := testAccAzureRMAppService_manyIpRestrictions(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "ip_restriction.0.ip_address", "10.10.10.10"), + resource.TestCheckResourceAttr(resourceName, "ip_restriction.0.subnet_mask", "255.255.255.255"), + resource.TestCheckResourceAttr(resourceName, "ip_restriction.1.ip_address", "20.20.20.0"), + resource.TestCheckResourceAttr(resourceName, "ip_restriction.1.subnet_mask", "255.255.255.0"), + resource.TestCheckResourceAttr(resourceName, "ip_restriction.2.ip_address", "30.30.0.0"), + resource.TestCheckResourceAttr(resourceName, "ip_restriction.2.subnet_mask", "255.255.0.0"), + ), + }, + }, + }) +} + func TestAccAzureRMAppService_defaultDocuments(t *testing.T) { resourceName := "azurerm_app_service.test" ri := acctest.RandInt() @@ -1153,6 +1201,78 @@ resource "azurerm_app_service" "test" { `, rInt, location, rInt, rInt) } +func testAccAzureRMAppService_oneIpRestriction(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_app_service_plan" "test" { + name = "acctestASP-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + tier = "Standard" + size = "S1" + } +} + +resource "azurerm_app_service" "test" { + name = "acctestAS-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_plan_id = "${azurerm_app_service_plan.test.id}" + + ip_restriction { + ip_address = "10.10.10.10" + } +} +`, rInt, location, rInt, rInt) +} + +func testAccAzureRMAppService_manyIpRestrictions(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_app_service_plan" "test" { + name = "acctestASP-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + tier = "Standard" + size = "S1" + } +} + +resource "azurerm_app_service" "test" { + name = "acctestAS-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_plan_id = "${azurerm_app_service_plan.test.id}" + + ip_restriction { + ip_address = "10.10.10.10" + } + + ip_restriction { + ip_address = "20.20.20.0" + subnet_mask = "255.255.255.0" + } + + ip_restriction { + ip_address = "30.30.0.0" + subnet_mask = "255.255.0.0" + } +} +`, rInt, location, rInt, rInt) +} + func testAccAzureRMAppService_defaultDocuments(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/website/docs/d/app_service.html.markdown b/website/docs/d/app_service.html.markdown index 7927b08508dd..d8c24f8ad2fe 100644 --- a/website/docs/d/app_service.html.markdown +++ b/website/docs/d/app_service.html.markdown @@ -47,7 +47,9 @@ output "app_service_id" { * `https_only` - Can the App Service only be accessed via HTTPS? -* `site_config` - A `site_config` object as defined below. +* `ip_restriction` - A `ip_restriction` block as defined below. + +* `site_config` - A `site_config` block as defined below. * `tags` - A mapping of tags to assign to the resource. @@ -63,6 +65,14 @@ output "app_service_id" { --- +`ip_restriction` exports the following: + +* `ip_address` - The IP Address used for this IP Restriction. + +* `subnet_mask` - The Subnet mask used for this IP Restriction. + +--- + `site_config` supports the following: * `always_on` - Is the app be loaded at all times? diff --git a/website/docs/r/app_service.html.markdown b/website/docs/r/app_service.html.markdown index 3fcfb8ace2be..98a344a6a61b 100644 --- a/website/docs/r/app_service.html.markdown +++ b/website/docs/r/app_service.html.markdown @@ -127,7 +127,9 @@ The following arguments are supported: * `https_only` - (Optional) Can the App Service only be accessed via HTTPS? Defaults to `false`. -* `site_config` - (Optional) A `site_config` object as defined below. +* `ip_restriction` - (Optional) A `ip_restriction` block as defined below. + +* `site_config` - (Optional) A `site_config` block as defined below. * `tags` - (Optional) A mapping of tags to assign to the resource. @@ -151,6 +153,14 @@ The following arguments are supported: --- +`ip_restriction` supports the following: + +* `ip_address` - (Required) The IP Address used for this IP Restriction. + +* `subnet_mask` - (Optional) The Subnet mask used for this IP Restriction. Defaults to `255.255.255.255`. + +--- + `site_config` supports the following: * `always_on` - (Optional) Should the app be loaded at all times? Defaults to `false`. From e0af3e3536a5bccd5f9d4a37acdab66659b49f34 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 14 May 2018 14:24:32 -0700 Subject: [PATCH 121/320] Updating to include #1231 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cdeb387239d..e4d35b138725 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ BUG FIXES: IMPROVEMENTS: +* `azurerm_app_service` - adding support for `ip_restriction`'s [GH-1231] * `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` [GH-1235] ## 1.5.0 (May 14, 2018) From efe7718faf4e96a9666e095a56eb03b9267b6a29 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 14 May 2018 16:00:12 -0700 Subject: [PATCH 122/320] azurerm_scheduler_job_collection: updated with PR comments --- .../data_source_scheduler_job_collection.go | 2 +- .../resource_arm_scheduler_job_collection.go | 46 ++++++------------- 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/azurerm/data_source_scheduler_job_collection.go b/azurerm/data_source_scheduler_job_collection.go index a7a16f1fefa2..0fd143008fdd 100644 --- a/azurerm/data_source_scheduler_job_collection.go +++ b/azurerm/data_source_scheduler_job_collection.go @@ -102,7 +102,7 @@ func dataSourceArmSchedulerJobCollectionRead(d *schema.ResourceData, meta interf } d.Set("state", string(properties.State)) - if err := d.Set("quota", flattenAzureArmSchedulerJobCollectionQuota(properties.Quota, d.Get("quota").([]interface{}))); err != nil { + if err := d.Set("quota", flattenAzureArmSchedulerJobCollectionQuota(properties.Quota)); err != nil { return fmt.Errorf("Error flattening quota for Job Collection %q (Resource Group %q): %+v", collection.Name, resourceGroup, err) } } diff --git a/azurerm/resource_arm_scheduler_job_collection.go b/azurerm/resource_arm_scheduler_job_collection.go index 65550afa4971..81d4aa1fb1a8 100644 --- a/azurerm/resource_arm_scheduler_job_collection.go +++ b/azurerm/resource_arm_scheduler_job_collection.go @@ -69,7 +69,6 @@ func resourceArmSchedulerJobCollection() *schema.Resource { "quota": { Type: schema.TypeList, Optional: true, - MinItems: 1, MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -98,18 +97,17 @@ func resourceArmSchedulerJobCollection() *schema.Resource { // API documentation states the MaxRecurrance.Interval "Gets or sets the interval between retries." // however it does appear it is the max interval allowed for recurrences "max_retry_interval": { - Type: schema.TypeInt, - Optional: true, - Deprecated: "Renamed to match azure", - ConflictsWith: []string{"quota.0.max_recurrence_interval"}, - ValidateFunc: validation.IntAtLeast(1), //changes depending on the frequency, unknown maximums + Type: schema.TypeInt, + Optional: true, + Computed: true, + Deprecated: "Renamed to `max_recurrence_interval` to match azure", + ValidateFunc: validation.IntAtLeast(1), //changes depending on the frequency, unknown maximums }, "max_recurrence_interval": { - Type: schema.TypeInt, - Optional: true, - ConflictsWith: []string{"quota.0.max_retry_interval"}, - ValidateFunc: validation.IntAtLeast(1), //changes depending on the frequency, unknown maximums + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntAtLeast(1), //changes depending on the frequency, unknown maximums }, }, }, @@ -158,7 +156,7 @@ func resourceArmSchedulerJobCollectionCreateUpdate(d *schema.ResourceData, meta d.SetId(*collection.ID) - return resourceArmSchedulerJobCollectionPopulate(d, resourceGroup, &collection) + return resourceArmSchedulerJobCollectionRead(d, meta) } func resourceArmSchedulerJobCollectionRead(d *schema.ResourceData, meta interface{}) error { @@ -185,11 +183,6 @@ func resourceArmSchedulerJobCollectionRead(d *schema.ResourceData, meta interfac return fmt.Errorf("Error making Read request on Scheduler Job Collection %q (Resource Group %q): %+v", name, resourceGroup, err) } - return resourceArmSchedulerJobCollectionPopulate(d, resourceGroup, &collection) -} - -func resourceArmSchedulerJobCollectionPopulate(d *schema.ResourceData, resourceGroup string, collection *scheduler.JobCollectionDefinition) error { - //standard properties d.Set("name", collection.Name) d.Set("resource_group_name", resourceGroup) @@ -205,7 +198,7 @@ func resourceArmSchedulerJobCollectionPopulate(d *schema.ResourceData, resourceG } d.Set("state", string(properties.State)) - if err := d.Set("quota", flattenAzureArmSchedulerJobCollectionQuota(properties.Quota, d.Get("quota").([]interface{}))); err != nil { + if err := d.Set("quota", flattenAzureArmSchedulerJobCollectionQuota(properties.Quota)); err != nil { return fmt.Errorf("Error flattening quota for Job Collection %q (Resource Group %q): %+v", collection.Name, resourceGroup, err) } } @@ -258,11 +251,10 @@ func expandAzureArmSchedulerJobCollectionQuota(d *schema.ResourceData) *schedule if v, ok := quotaBlock["max_recurrence_frequency"].(string); ok { quota.MaxRecurrence.Frequency = scheduler.RecurrenceFrequency(v) } - if v, ok := quotaBlock["max_retry_interval"].(int); ok && v > 0 { - quota.MaxRecurrence.Interval = utils.Int32(int32(v)) - } if v, ok := quotaBlock["max_recurrence_interval"].(int); ok && v > 0 { quota.MaxRecurrence.Interval = utils.Int32(int32(v)) + } else if v, ok := quotaBlock["max_retry_interval"].(int); ok && v > 0 { //todo remove once max_retry_interval is removed + quota.MaxRecurrence.Interval = utils.Int32(int32(v)) } return "a @@ -271,21 +263,12 @@ func expandAzureArmSchedulerJobCollectionQuota(d *schema.ResourceData) *schedule return nil } -func flattenAzureArmSchedulerJobCollectionQuota(quota *scheduler.JobCollectionQuota, oldBlock []interface{}) []interface{} { +func flattenAzureArmSchedulerJobCollectionQuota(quota *scheduler.JobCollectionQuota) []interface{} { if quota == nil { return nil } - //todo remove once max_retry_interval is retired - maxRecurrenceField := "max_recurrence_interval" - if len(oldBlock) > 0 { - b := oldBlock[0].(map[string]interface{}) - - if v, ok := b["max_retry_interval"].(int); ok && v > 0 { - maxRecurrenceField = "max_retry_interval" - } //else max_recurrence_interval is in use, or we default to max_recurrence_interval - } quotaBlock := make(map[string]interface{}) if v := quota.MaxJobCount; v != nil { @@ -293,7 +276,8 @@ func flattenAzureArmSchedulerJobCollectionQuota(quota *scheduler.JobCollectionQu } if recurrence := quota.MaxRecurrence; recurrence != nil { if v := recurrence.Interval; v != nil { - quotaBlock[maxRecurrenceField] = *v + quotaBlock["max_recurrence_interval"] = *v + quotaBlock["max_retry_interval"] = *v //todo remove once max_retry_interval is retired } quotaBlock["max_recurrence_frequency"] = string(recurrence.Frequency) From db5b8d8232064d083884bbd3e24aad3e7013e791 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 14 May 2018 16:07:42 -0700 Subject: [PATCH 123/320] Update CHANGELOG.md to include #1218 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4d35b138725..3fb64085e997 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 1.6.0 (Unreleased) +UPGRADE NOTES: + +* `azurerm_scheduler_job_collection` - the property `max_retry_interval` has been deprecated in favour of `max_recurrence_interval` to better match Azure [GH-1218] + FEATURES: * **New Resource:** `azurerm_relay_namespace` [GH-1233] @@ -52,7 +56,7 @@ IMPROVEMENTS: UPGRADE NOTES: -* `azurerm_cosmosdb_account` - the field `failover_policy` has been deprecated in favour of `geo_locations` to better match Azure. +* `azurerm_cosmosdb_account` - the field `failover_policy` has been deprecated in favour of `geo_locations` to better match Azure FEATURES: From 443f320f5b64f90c7cfb4b4ace13f0426b347750 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 16 May 2018 06:35:22 -0700 Subject: [PATCH 124/320] Mark numerous key, password and connection string properties sensitive (#1242) Signed-off-by: kt --- azurerm/data_source_cosmos_db_account.go | 20 ++++++++----- azurerm/data_source_eventhub_namespace.go | 20 ++++++++----- azurerm/data_source_kubernetes_cluster.go | 10 ++++--- azurerm/data_source_storage_account.go | 30 +++++++++++-------- azurerm/resource_arm_app_service.go | 5 ++-- azurerm/resource_arm_app_service_slot.go | 5 ++-- azurerm/resource_arm_application_insights.go | 5 ++-- azurerm/resource_arm_container_registry.go | 5 ++-- azurerm/resource_arm_cosmos_db_account.go | 25 +++++++++------- ...esource_arm_eventhub_authorization_rule.go | 20 ++++++++----- azurerm/resource_arm_eventhub_namespace.go | 20 ++++++++----- azurerm/resource_arm_express_route_circuit.go | 5 ++-- ...arm_express_route_circuit_authorization.go | 5 ++-- azurerm/resource_arm_function_app.go | 5 ++-- azurerm/resource_arm_iothub.go | 10 ++++--- azurerm/resource_arm_kubernetes_cluster.go | 10 ++++--- .../resource_arm_log_analytics_workspace.go | 10 ++++--- azurerm/resource_arm_redis_cache.go | 15 ++++++---- azurerm/resource_arm_relay_namespace.go | 20 ++++++++----- azurerm/resource_arm_servicebus_namespace.go | 20 ++++++++----- ...arm_servicebus_topic_authorization_rule.go | 20 ++++++++----- azurerm/resource_arm_storage_account.go | 30 +++++++++++-------- ..._arm_virtual_network_gateway_connection.go | 5 ++-- 23 files changed, 192 insertions(+), 128 deletions(-) diff --git a/azurerm/data_source_cosmos_db_account.go b/azurerm/data_source_cosmos_db_account.go index 16b5697dfd4e..1ecaacfb10a3 100644 --- a/azurerm/data_source_cosmos_db_account.go +++ b/azurerm/data_source_cosmos_db_account.go @@ -115,23 +115,27 @@ func dataSourceArmCosmosDBAccount() *schema.Resource { }, "primary_master_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_master_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "primary_readonly_master_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_readonly_master_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, }, } diff --git a/azurerm/data_source_eventhub_namespace.go b/azurerm/data_source_eventhub_namespace.go index 0897273e8322..0b99f264ea70 100644 --- a/azurerm/data_source_eventhub_namespace.go +++ b/azurerm/data_source_eventhub_namespace.go @@ -43,23 +43,27 @@ func dataSourceEventHubNamespace() *schema.Resource { }, "default_primary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "default_secondary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "default_primary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "default_secondary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "tags": tagsForDataSourceSchema(), diff --git a/azurerm/data_source_kubernetes_cluster.go b/azurerm/data_source_kubernetes_cluster.go index b063252ff72a..90b05c7f94af 100644 --- a/azurerm/data_source_kubernetes_cluster.go +++ b/azurerm/data_source_kubernetes_cluster.go @@ -52,16 +52,18 @@ func dataSourceArmKubernetesCluster() *schema.Resource { Computed: true, }, "password": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "client_certificate": { Type: schema.TypeString, Computed: true, }, "client_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "cluster_ca_certificate": { Type: schema.TypeString, diff --git a/azurerm/data_source_storage_account.go b/azurerm/data_source_storage_account.go index 49002cbffa9c..05adf019b4a5 100644 --- a/azurerm/data_source_storage_account.go +++ b/azurerm/data_source_storage_account.go @@ -123,33 +123,39 @@ func dataSourceArmStorageAccount() *schema.Resource { }, "primary_access_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_access_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "primary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "primary_blob_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_blob_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "tags": tagsForDataSourceSchema(), diff --git a/azurerm/resource_arm_app_service.go b/azurerm/resource_arm_app_service.go index 6ebc59e7134e..193f9a063d69 100644 --- a/azurerm/resource_arm_app_service.go +++ b/azurerm/resource_arm_app_service.go @@ -262,8 +262,9 @@ func resourceArmAppService() *schema.Resource { Required: true, }, "value": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + Sensitive: true, }, "type": { Type: schema.TypeString, diff --git a/azurerm/resource_arm_app_service_slot.go b/azurerm/resource_arm_app_service_slot.go index c4dc6f6d9101..43a77f188b84 100644 --- a/azurerm/resource_arm_app_service_slot.go +++ b/azurerm/resource_arm_app_service_slot.go @@ -233,8 +233,9 @@ func resourceArmAppServiceSlot() *schema.Resource { Required: true, }, "value": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + Sensitive: true, }, "type": { Type: schema.TypeString, diff --git a/azurerm/resource_arm_application_insights.go b/azurerm/resource_arm_application_insights.go index 1e8c8d327df3..54abebb20e5e 100644 --- a/azurerm/resource_arm_application_insights.go +++ b/azurerm/resource_arm_application_insights.go @@ -51,8 +51,9 @@ func resourceArmApplicationInsights() *schema.Resource { }, "instrumentation_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, }, } diff --git a/azurerm/resource_arm_container_registry.go b/azurerm/resource_arm_container_registry.go index b1ce13ce0d5f..fb1d5925e0e6 100644 --- a/azurerm/resource_arm_container_registry.go +++ b/azurerm/resource_arm_container_registry.go @@ -95,8 +95,9 @@ func resourceArmContainerRegistry() *schema.Resource { }, "admin_password": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "tags": tagsSchema(), diff --git a/azurerm/resource_arm_cosmos_db_account.go b/azurerm/resource_arm_cosmos_db_account.go index 270fdf3c08d1..fb9309efcc6c 100644 --- a/azurerm/resource_arm_cosmos_db_account.go +++ b/azurerm/resource_arm_cosmos_db_account.go @@ -213,28 +213,33 @@ func resourceArmCosmosDBAccount() *schema.Resource { }, "primary_master_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_master_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "primary_readonly_master_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_readonly_master_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "connection_strings": { - Type: schema.TypeList, - Computed: true, + Type: schema.TypeList, + Computed: true, + Sensitive: true, Elem: &schema.Schema{ Type: schema.TypeString, }, diff --git a/azurerm/resource_arm_eventhub_authorization_rule.go b/azurerm/resource_arm_eventhub_authorization_rule.go index adff6a9537ef..5ddb3ed51c18 100644 --- a/azurerm/resource_arm_eventhub_authorization_rule.go +++ b/azurerm/resource_arm_eventhub_authorization_rule.go @@ -62,23 +62,27 @@ func resourceArmEventHubAuthorizationRule() *schema.Resource { }, "primary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "primary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, }, } diff --git a/azurerm/resource_arm_eventhub_namespace.go b/azurerm/resource_arm_eventhub_namespace.go index 9adaeb20288f..845c057f502d 100644 --- a/azurerm/resource_arm_eventhub_namespace.go +++ b/azurerm/resource_arm_eventhub_namespace.go @@ -71,23 +71,27 @@ func resourceArmEventHubNamespace() *schema.Resource { }, "default_primary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "default_secondary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "default_primary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "default_secondary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "tags": tagsSchema(), diff --git a/azurerm/resource_arm_express_route_circuit.go b/azurerm/resource_arm_express_route_circuit.go index f0506afee348..d3393a893820 100644 --- a/azurerm/resource_arm_express_route_circuit.go +++ b/azurerm/resource_arm_express_route_circuit.go @@ -92,8 +92,9 @@ func resourceArmExpressRouteCircuit() *schema.Resource { }, "service_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "tags": tagsSchema(), diff --git a/azurerm/resource_arm_express_route_circuit_authorization.go b/azurerm/resource_arm_express_route_circuit_authorization.go index 6f6c0f3c1ef9..fe2a18be81a7 100644 --- a/azurerm/resource_arm_express_route_circuit_authorization.go +++ b/azurerm/resource_arm_express_route_circuit_authorization.go @@ -34,8 +34,9 @@ func resourceArmExpressRouteCircuitAuthorization() *schema.Resource { }, "authorization_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "authorization_use_status": { diff --git a/azurerm/resource_arm_function_app.go b/azurerm/resource_arm_function_app.go index 41e0c609cf3a..8a3c3eb1113d 100644 --- a/azurerm/resource_arm_function_app.go +++ b/azurerm/resource_arm_function_app.go @@ -79,8 +79,9 @@ func resourceArmFunctionApp() *schema.Resource { Required: true, }, "value": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + Sensitive: true, }, "type": { Type: schema.TypeString, diff --git a/azurerm/resource_arm_iothub.go b/azurerm/resource_arm_iothub.go index d319152813d2..597d91e9c9c8 100644 --- a/azurerm/resource_arm_iothub.go +++ b/azurerm/resource_arm_iothub.go @@ -93,12 +93,14 @@ func resourceArmIotHub() *schema.Resource { Computed: true, }, "primary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "permissions": { Type: schema.TypeString, diff --git a/azurerm/resource_arm_kubernetes_cluster.go b/azurerm/resource_arm_kubernetes_cluster.go index 415db6c6d017..555ba2aaa3e7 100644 --- a/azurerm/resource_arm_kubernetes_cluster.go +++ b/azurerm/resource_arm_kubernetes_cluster.go @@ -67,16 +67,18 @@ func resourceArmKubernetesCluster() *schema.Resource { Computed: true, }, "password": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "client_certificate": { Type: schema.TypeString, Computed: true, }, "client_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "cluster_ca_certificate": { Type: schema.TypeString, diff --git a/azurerm/resource_arm_log_analytics_workspace.go b/azurerm/resource_arm_log_analytics_workspace.go index 9ded0dd586c1..236922f636e4 100644 --- a/azurerm/resource_arm_log_analytics_workspace.go +++ b/azurerm/resource_arm_log_analytics_workspace.go @@ -66,13 +66,15 @@ func resourceArmLogAnalyticsWorkspace() *schema.Resource { }, "primary_shared_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_shared_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "tags": tagsSchema(), diff --git a/azurerm/resource_arm_redis_cache.go b/azurerm/resource_arm_redis_cache.go index a7934a6d3aae..1792378d86a7 100644 --- a/azurerm/resource_arm_redis_cache.go +++ b/azurerm/resource_arm_redis_cache.go @@ -133,8 +133,9 @@ func resourceArmRedisCache() *schema.Resource { Optional: true, }, "rdb_storage_connection_string": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + Sensitive: true, }, "notify_keyspace_events": { Type: schema.TypeString, @@ -188,13 +189,15 @@ func resourceArmRedisCache() *schema.Resource { }, "primary_access_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_access_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "tags": tagsSchema(), diff --git a/azurerm/resource_arm_relay_namespace.go b/azurerm/resource_arm_relay_namespace.go index 049a1cf840ec..95d8423024ff 100644 --- a/azurerm/resource_arm_relay_namespace.go +++ b/azurerm/resource_arm_relay_namespace.go @@ -61,23 +61,27 @@ func resourceArmRelayNamespace() *schema.Resource { }, "primary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "primary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "tags": tagsSchema(), diff --git a/azurerm/resource_arm_servicebus_namespace.go b/azurerm/resource_arm_servicebus_namespace.go index 7c173c14afe9..3a8e115188a6 100644 --- a/azurerm/resource_arm_servicebus_namespace.go +++ b/azurerm/resource_arm_servicebus_namespace.go @@ -58,23 +58,27 @@ func resourceArmServiceBusNamespace() *schema.Resource { }, "default_primary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "default_secondary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "default_primary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "default_secondary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "tags": tagsSchema(), diff --git a/azurerm/resource_arm_servicebus_topic_authorization_rule.go b/azurerm/resource_arm_servicebus_topic_authorization_rule.go index 422c8c2a838c..0111f6296c52 100644 --- a/azurerm/resource_arm_servicebus_topic_authorization_rule.go +++ b/azurerm/resource_arm_servicebus_topic_authorization_rule.go @@ -59,23 +59,27 @@ func resourceArmServiceBusTopicAuthorizationRule() *schema.Resource { }, "primary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "primary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, }, } diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index 4f99a377811c..c95c8839d337 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -188,33 +188,39 @@ func resourceArmStorageAccount() *schema.Resource { }, "primary_access_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Sensitive: true, + Computed: true, }, "secondary_access_key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "primary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "primary_blob_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "secondary_blob_connection_string": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "tags": tagsSchema(), diff --git a/azurerm/resource_arm_virtual_network_gateway_connection.go b/azurerm/resource_arm_virtual_network_gateway_connection.go index a5f96bc001f3..ac2feb8ae902 100644 --- a/azurerm/resource_arm_virtual_network_gateway_connection.go +++ b/azurerm/resource_arm_virtual_network_gateway_connection.go @@ -51,8 +51,9 @@ func resourceArmVirtualNetworkGatewayConnection() *schema.Resource { }, "authorization_key": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + Sensitive: true, }, "express_route_circuit_id": { From d2e23f94cf05b4bd8bc7745d03668cf3d3362d13 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Wed, 16 May 2018 06:35:50 -0700 Subject: [PATCH 125/320] Updating to include #1242 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fb64085e997..ae156c613f80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ FEATURES: BUG FIXES: +* across data-sources and resources: making Connection Strings, Keys and Passwords sensitive fields [GH-1242] * `azurerm_virtual_machine_scale_set` - an empty `os_profile_windows_config` block no longer causes a panic [GH-1224] IMPROVEMENTS: From b663c4306304168545a06a80310bccddb27db6c6 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Wed, 16 May 2018 15:22:39 +0100 Subject: [PATCH 126/320] better error messages as suggested --- azurerm/data_source_data_lake_store.go | 1 + azurerm/resource_arm_data_lake_store.go | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/azurerm/data_source_data_lake_store.go b/azurerm/data_source_data_lake_store.go index 47a9bde55eb2..3f8537f080d9 100644 --- a/azurerm/data_source_data_lake_store.go +++ b/azurerm/data_source_data_lake_store.go @@ -42,6 +42,7 @@ func dataSourceArmDateLakeStoreAccountRead(d *schema.ResourceData, meta interfac resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[WARN] DataLakeStoreAccount '%s' was not found (resource group '%s')", name, resourceGroup) d.SetId("") return nil } diff --git a/azurerm/resource_arm_data_lake_store.go b/azurerm/resource_arm_data_lake_store.go index 56a125b05cfb..40dc792c5cb1 100644 --- a/azurerm/resource_arm_data_lake_store.go +++ b/azurerm/resource_arm_data_lake_store.go @@ -140,8 +140,8 @@ func resourceArmDateLakeStoreRead(d *schema.ResourceData, meta interface{}) erro resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[WARN] DataLakeStoreAccount '%s' was not found (resource group '%s')", name, resourceGroup) d.SetId("") - fmt.Print("Oh no nothing was found") return nil } return fmt.Errorf("Error making Read request on Azure Data Lake Store %q (Resource Group %q): %+v", name, resourceGroup, err) @@ -178,7 +178,7 @@ func resourceArmDateLakeStoreDelete(d *schema.ResourceData, meta interface{}) er if response.WasNotFound(future.Response()) { return nil } - return fmt.Errorf("Error issuing delete request for Azure Data Lake Store %q (Resource Group %q): %+v", name, resourceGroup, err) + return err } err = future.WaitForCompletion(ctx, client.Client) @@ -186,8 +186,8 @@ func resourceArmDateLakeStoreDelete(d *schema.ResourceData, meta interface{}) er if response.WasNotFound(future.Response()) { return nil } - return fmt.Errorf("Error waiting for Azure Data Lake Store %q (Resource Group %q) to be deleted: %+v", name, resourceGroup, err) + return err } - return err + return nil } From 1641e0185f54aed68c6143c90c64e771dc4cf747 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Wed, 16 May 2018 15:33:02 +0100 Subject: [PATCH 127/320] add log in data_source --- azurerm/data_source_data_lake_store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/azurerm/data_source_data_lake_store.go b/azurerm/data_source_data_lake_store.go index 3f8537f080d9..446014bc2999 100644 --- a/azurerm/data_source_data_lake_store.go +++ b/azurerm/data_source_data_lake_store.go @@ -2,6 +2,7 @@ package azurerm import ( "fmt" + "log" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" From 546198c87408ad3cddbe628d1452e64b6dbe2367 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Wed, 16 May 2018 10:03:52 -0700 Subject: [PATCH 128/320] Redis Cache: removing the unused maxclients key from the docs (#1244) --- website/docs/r/redis_cache.html.markdown | 61 +++++++----------------- 1 file changed, 16 insertions(+), 45 deletions(-) diff --git a/website/docs/r/redis_cache.html.markdown b/website/docs/r/redis_cache.html.markdown index bb5de5891e37..79db178e70ab 100644 --- a/website/docs/r/redis_cache.html.markdown +++ b/website/docs/r/redis_cache.html.markdown @@ -3,93 +3,65 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_redis_cache" sidebar_current: "docs-azurerm-resource-redis-cache" description: |- - Creates a new Redis Cache Resource + Manages a Redis Cache + --- -# azurerm\_redis\_cache +# azurerm_redis_cache -Creates a new Redis Cache Resource +Manages a Redis Cache. ## Example Usage (Basic) ```hcl -resource "random_id" "server" { - keepers = { - azi_id = 1 - } - - byte_length = 8 -} - resource "azurerm_resource_group" "test" { - name = "acceptanceTestResourceGroup1" + name = "redis-resources" location = "West US" } +# NOTE: the Name used for Redis needs to be globally unique resource "azurerm_redis_cache" "test" { - name = "${random_id.server.hex}" + name = "tf-redis-basic" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" capacity = 0 family = "C" sku_name = "Basic" enable_non_ssl_port = false - - redis_configuration { - maxclients = 256 - } } ``` ## Example Usage (Standard) ```hcl -resource "random_id" "server" { - keepers = { - azi_id = 1 - } - - byte_length = 8 -} - resource "azurerm_resource_group" "test" { - name = "acceptanceTestResourceGroup1" + name = "redis-resources" location = "West US" } +# NOTE: the Name used for Redis needs to be globally unique resource "azurerm_redis_cache" "test" { - name = "${random_id.server.hex}" + name = "tf-redis-standard" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" capacity = 2 family = "C" sku_name = "Standard" enable_non_ssl_port = false - - redis_configuration { - maxclients = 1000 - } } ``` ## Example Usage (Premium with Clustering) ```hcl -resource "random_id" "server" { - keepers = { - azi_id = 1 - } - - byte_length = 8 -} - resource "azurerm_resource_group" "test" { - name = "acceptanceTestResourceGroup1" + name = "redis-resources" location = "West US" } +# NOTE: the Name used for Redis needs to be globally unique resource "azurerm_redis_cache" "test" { - name = "${random_id.server.hex}" + name = "tf-redis-premium" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" capacity = 1 @@ -99,7 +71,6 @@ resource "azurerm_redis_cache" "test" { shard_count = 3 redis_configuration { - maxclients = 7500 maxmemory_reserved = 2 maxmemory_delta = 2 maxmemory_policy = "allkeys-lru" @@ -111,7 +82,7 @@ resource "azurerm_redis_cache" "test" { ```hcl resource "azurerm_resource_group" "test" { - name = "redisrg" + name = "redis-resources" location = "West US" } @@ -123,8 +94,9 @@ resource "azurerm_storage_account" "test" { account_replication_type = "GRS" } +# NOTE: the Name used for Redis needs to be globally unique resource "azurerm_redis_cache" "test" { - name = "example-redis" + name = "tf-redis-pbkup" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" capacity = 3 @@ -132,7 +104,6 @@ resource "azurerm_redis_cache" "test" { sku_name = "Premium" enable_non_ssl_port = false redis_configuration { - maxclients = 256 rdb_backup_enabled = true rdb_backup_frequency = 60 rdb_backup_max_snapshot_count = 1 From b1febfbe9b1a8b6fcb8d33e06e975f94d837b942 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 16 May 2018 11:12:32 -0700 Subject: [PATCH 129/320] azurerm_public_ip: computed values now default to an empy string --- azurerm/resource_arm_public_ip.go | 44 +++++++++++--------------- azurerm/resource_arm_public_ip_test.go | 36 --------------------- 2 files changed, 18 insertions(+), 62 deletions(-) diff --git a/azurerm/resource_arm_public_ip.go b/azurerm/resource_arm_public_ip.go index 2d5d06b9e7b2..6db76a7ae1dd 100644 --- a/azurerm/resource_arm_public_ip.go +++ b/azurerm/resource_arm_public_ip.go @@ -18,6 +18,7 @@ func resourceArmPublicIp() *schema.Resource { Read: resourceArmPublicIpRead, Update: resourceArmPublicIpCreate, Delete: resourceArmPublicIpDelete, + Importer: &schema.ResourceImporter{ State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { id, err := parseAzureResourceID(d.Id()) @@ -48,11 +49,23 @@ func resourceArmPublicIp() *schema.Resource { "public_ip_address_allocation": { Type: schema.TypeString, Required: true, - ValidateFunc: validatePublicIpAllocation, + ValidateFunc: validation.StringInSlice([]string{"static", "dynamic"}, true), StateFunc: ignoreCaseStateFunc, DiffSuppressFunc: ignoreCaseDiffSuppressFunc, }, + "sku": { + Type: schema.TypeString, + Optional: true, + Default: string(network.PublicIPAddressSkuNameBasic), + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + string(network.PublicIPAddressSkuNameBasic), + string(network.PublicIPAddressSkuNameStandard), + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + "idle_timeout_in_minutes": { Type: schema.TypeInt, Optional: true, @@ -87,18 +100,6 @@ func resourceArmPublicIp() *schema.Resource { Computed: true, }, - "sku": { - Type: schema.TypeString, - Optional: true, - Default: string(network.PublicIPAddressSkuNameBasic), - ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{ - string(network.PublicIPAddressSkuNameBasic), - string(network.PublicIPAddressSkuNameStandard), - }, true), - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, - }, - "tags": tagsSchema(), }, } @@ -227,11 +228,15 @@ func resourceArmPublicIpRead(d *schema.ResourceData, meta interface{}) error { if settings := props.DNSSettings; settings != nil { if fqdn := settings.Fqdn; fqdn != nil { d.Set("fqdn", fqdn) + } else { + d.Set("fqdn", "") } } if ip := props.IPAddress; ip != nil { d.Set("ip_address", ip) + } else { + d.Set("ip_address", "") } } @@ -264,19 +269,6 @@ func resourceArmPublicIpDelete(d *schema.ResourceData, meta interface{}) error { return nil } -func validatePublicIpAllocation(v interface{}, k string) (ws []string, errors []error) { - value := strings.ToLower(v.(string)) - allocations := map[string]bool{ - "static": true, - "dynamic": true, - } - - if !allocations[value] { - errors = append(errors, fmt.Errorf("Public IP Allocation must be an accepted value: Static, Dynamic")) - } - return -} - func validatePublicIpDomainNameLabel(v interface{}, k string) (ws []string, errors []error) { value := v.(string) if !regexp.MustCompile(`^[a-z0-9-]+$`).MatchString(value) { diff --git a/azurerm/resource_arm_public_ip_test.go b/azurerm/resource_arm_public_ip_test.go index 26855511d0bf..54765e0d536f 100644 --- a/azurerm/resource_arm_public_ip_test.go +++ b/azurerm/resource_arm_public_ip_test.go @@ -10,42 +10,6 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestResourceAzureRMPublicIpAllocation_validation(t *testing.T) { - cases := []struct { - Value string - ErrCount int - }{ - { - Value: "Random", - ErrCount: 1, - }, - { - Value: "Static", - ErrCount: 0, - }, - { - Value: "Dynamic", - ErrCount: 0, - }, - { - Value: "STATIC", - ErrCount: 0, - }, - { - Value: "static", - ErrCount: 0, - }, - } - - for _, tc := range cases { - _, errors := validatePublicIpAllocation(tc.Value, "azurerm_public_ip") - - if len(errors) != tc.ErrCount { - t.Fatalf("Expected the Azure RM Public IP allocation to trigger a validation error") - } - } -} - func TestResourceAzureRMPublicIpDomainNameLabel_validation(t *testing.T) { cases := []struct { Value string From 49978ac7b69c34a3767136881c6e6932b0035738 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 16 May 2018 15:58:39 -0700 Subject: [PATCH 130/320] azurerm_public_ip: updated some validation --- azurerm/resource_arm_public_ip.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/azurerm/resource_arm_public_ip.go b/azurerm/resource_arm_public_ip.go index 6db76a7ae1dd..888398c833c1 100644 --- a/azurerm/resource_arm_public_ip.go +++ b/azurerm/resource_arm_public_ip.go @@ -50,15 +50,15 @@ func resourceArmPublicIp() *schema.Resource { Type: schema.TypeString, Required: true, ValidateFunc: validation.StringInSlice([]string{"static", "dynamic"}, true), - StateFunc: ignoreCaseStateFunc, DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + StateFunc: ignoreCaseStateFunc, }, "sku": { Type: schema.TypeString, Optional: true, - Default: string(network.PublicIPAddressSkuNameBasic), ForceNew: true, + Default: string(network.PublicIPAddressSkuNameBasic), ValidateFunc: validation.StringInSlice([]string{ string(network.PublicIPAddressSkuNameBasic), string(network.PublicIPAddressSkuNameStandard), @@ -67,16 +67,9 @@ func resourceArmPublicIp() *schema.Resource { }, "idle_timeout_in_minutes": { - Type: schema.TypeInt, - Optional: true, - ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) { - value := v.(int) - if value < 4 || value > 30 { - errors = append(errors, fmt.Errorf( - "The idle timeout must be between 4 and 30 minutes")) - } - return - }, + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntBetween(4, 30), }, "domain_name_label": { From 3d4c9f8553f28df3cda2c9f96c4b3d56ea4defe0 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Thu, 17 May 2018 14:51:52 +0100 Subject: [PATCH 131/320] added fixes as reccommended --- azurerm/data_source_data_lake_store.go | 4 +- azurerm/data_source_data_lake_store_test.go | 62 ++++----- azurerm/import_arm_data_lake_store_test.go | 54 -------- azurerm/provider.go | 4 +- azurerm/resource_arm_data_lake_store.go | 29 ++-- azurerm/resource_arm_data_lake_store_test.go | 132 ++++++++++++------- website/docs/d/data_lake_store.html.markdown | 4 +- website/docs/r/data_lake_store.html.markdown | 32 +++-- 8 files changed, 158 insertions(+), 163 deletions(-) delete mode 100644 azurerm/import_arm_data_lake_store_test.go diff --git a/azurerm/data_source_data_lake_store.go b/azurerm/data_source_data_lake_store.go index 446014bc2999..5ca79feb9835 100644 --- a/azurerm/data_source_data_lake_store.go +++ b/azurerm/data_source_data_lake_store.go @@ -58,8 +58,8 @@ func dataSourceArmDateLakeStoreAccountRead(d *schema.ResourceData, meta interfac d.Set("location", azureRMNormalizeLocation(*location)) } - if tier := resp.DataLakeStoreAccountProperties; tier != nil { - d.Set("tier", string(tier.CurrentTier)) + if properties := resp.DataLakeStoreAccountProperties; properties != nil { + d.Set("tier", string(properties.CurrentTier)) } flattenAndSetTags(d, resp.Tags) diff --git a/azurerm/data_source_data_lake_store_test.go b/azurerm/data_source_data_lake_store_test.go index 14abf69fa8e1..0314ec31e7d7 100644 --- a/azurerm/data_source_data_lake_store_test.go +++ b/azurerm/data_source_data_lake_store_test.go @@ -8,9 +8,10 @@ import ( "github.com/hashicorp/terraform/helper/resource" ) -func TestAccDataSourceAzureRMDataLakeStore_payasyougo(t *testing.T) { +func TestAccDataSourceAzureRMDataLakeStore_basic(t *testing.T) { dataSourceName := "data.azurerm_data_lake_store.test" - rInt := acctest.RandIntRange(1, 999999) + rInt := acctest.RandInt() + rs := acctest.RandString(4) location := testLocation() resource.Test(t, resource.TestCase{ @@ -18,18 +19,20 @@ func TestAccDataSourceAzureRMDataLakeStore_payasyougo(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceDataLakeStore_payasyougo(rInt, location), + Config: testAccDataSourceDataLakeStore_basic(rInt, rs, location), Check: resource.ComposeTestCheckFunc( testCheckAzureRMDataLakeStoreExists(dataSourceName), + resource.TestCheckResourceAttr(dataSourceName, "tier", "Consumption"), ), }, }, }) } -func TestAccDataSourceAzureRMDataLakeStore_monthlycommitment(t *testing.T) { +func TestAccDataSourceAzureRMDataLakeStore_tier(t *testing.T) { dataSourceName := "data.azurerm_data_lake_store.test" - rInt := acctest.RandIntRange(1, 999999) + rInt := acctest.RandInt() + rs := acctest.RandString(4) location := testLocation() resource.Test(t, resource.TestCase{ @@ -37,7 +40,7 @@ func TestAccDataSourceAzureRMDataLakeStore_monthlycommitment(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceDataLakeStore_monthlycommitment(rInt, location), + Config: testAccDataSourceDataLakeStore_tier(rInt, rs, location), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(dataSourceName, "tier", "Commitment_1TB"), resource.TestCheckResourceAttr(dataSourceName, "tags.%", "1"), @@ -48,49 +51,46 @@ func TestAccDataSourceAzureRMDataLakeStore_monthlycommitment(t *testing.T) { }) } -func testAccDataSourceDataLakeStore_payasyougo(rInt int, location string) string { +func testAccDataSourceDataLakeStore_basic(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" - location = "%s" + name = "acctestRG_%d" + location = "%s" } resource "azurerm_data_lake_store" "test" { - name = "acctest%d" - location = "%s" - resource_group_name = "${azurerm_resource_group.test.name}" - tags { - hello = "world" - } + name = "unlikely23exst2acct%s" + location = "%s" + resource_group_name = "${azurerm_resource_group.test.name}" } data "azurerm_data_lake_store" "test" { - name = "${azurerm_data_lake_store.test.name}" - resource_group_name = "${azurerm_data_lake_store.test.resource_group_name}" + name = "${azurerm_data_lake_store.test.name}" + resource_group_name = "${azurerm_data_lake_store.test.resource_group_name}" } -`, rInt, location, rInt, location) +`, rInt, location, rs, location) } -func testAccDataSourceDataLakeStore_monthlycommitment(rInt int, location string) string { +func testAccDataSourceDataLakeStore_tier(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" - location = "%s" + name = "acctestRG_%d" + location = "%s" } resource "azurerm_data_lake_store" "test" { - name = "acctest%d" - location = "%s" - tier = "Commitment_1TB" - resource_group_name = "${azurerm_resource_group.test.name}" - tags { - hello = "world" - } + name = "unlikely23exst2acct%s" + location = "%s" + tier = "Commitment_1TB" + resource_group_name = "${azurerm_resource_group.test.name}" + tags { + hello = "world" + } } data "azurerm_data_lake_store" "test" { - name = "${azurerm_data_lake_store.test.name}" - resource_group_name = "${azurerm_data_lake_store.test.resource_group_name}" + name = "${azurerm_data_lake_store.test.name}" + resource_group_name = "${azurerm_data_lake_store.test.resource_group_name}" } -`, rInt, location, rInt, location) +`, rInt, location, rs, location) } diff --git a/azurerm/import_arm_data_lake_store_test.go b/azurerm/import_arm_data_lake_store_test.go deleted file mode 100644 index 5b49f7ccef04..000000000000 --- a/azurerm/import_arm_data_lake_store_test.go +++ /dev/null @@ -1,54 +0,0 @@ -package azurerm - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAzureRMDataLakeStore_importPayAsYouGo(t *testing.T) { - resourceName := "azurerm_data_lake_store.test" - - ri := acctest.RandIntRange(1, 999999) - config := testAccAzureRMDataLakeStore_payasyougo(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMDataLakeStoreDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAzureRMDataLakeStore_importTags(t *testing.T) { - resourceName := "azurerm_data_lake_store.test" - - ri := acctest.RandIntRange(1, 999999) - config := testAccAzureRMDataLakeStore_withTags(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMDataLakeStoreDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/azurerm/provider.go b/azurerm/provider.go index 450e4cdec09c..fe4b59ffad50 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -84,8 +84,8 @@ func Provider() terraform.ResourceProvider { "azurerm_cdn_profile": dataSourceArmCdnProfile(), "azurerm_client_config": dataSourceArmClientConfig(), "azurerm_cosmosdb_account": dataSourceArmCosmosDBAccount(), - "azurerm_dns_zone": dataSourceArmDnsZone(), "azurerm_data_lake_store": dataSourceArmDataLakeStoreAccount(), + "azurerm_dns_zone": dataSourceArmDnsZone(), "azurerm_eventhub_namespace": dataSourceEventHubNamespace(), "azurerm_image": dataSourceArmImage(), "azurerm_key_vault_access_policy": dataSourceArmKeyVaultAccessPolicy(), @@ -332,11 +332,11 @@ func determineAzureResourceProvidersToRegister(providerList []resources.Provider "Microsoft.ContainerInstance": {}, "Microsoft.ContainerRegistry": {}, "Microsoft.ContainerService": {}, + "Microsoft.DataLakeStore": {}, "Microsoft.DBforMySQL": {}, "Microsoft.DBforPostgreSQL": {}, "Microsoft.Devices": {}, "Microsoft.DocumentDB": {}, - "Microsoft.DataLakeStore": {}, "Microsoft.EventGrid": {}, "Microsoft.EventHub": {}, "Microsoft.KeyVault": {}, diff --git a/azurerm/resource_arm_data_lake_store.go b/azurerm/resource_arm_data_lake_store.go index 40dc792c5cb1..60a5fbede7cb 100644 --- a/azurerm/resource_arm_data_lake_store.go +++ b/azurerm/resource_arm_data_lake_store.go @@ -3,6 +3,7 @@ package azurerm import ( "fmt" "log" + "regexp" "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account" "github.com/hashicorp/terraform/helper/schema" @@ -23,9 +24,10 @@ func resourceArmDataLakeStore() *schema.Resource { Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateArmDataLakeName, }, "location": locationSchema(), @@ -34,7 +36,6 @@ func resourceArmDataLakeStore() *schema.Resource { "tier": { Type: schema.TypeString, - ForceNew: false, Optional: true, Default: string(account.Consumption), DiffSuppressFunc: ignoreCaseDiffSuppressFunc, @@ -62,7 +63,7 @@ func resourceArmDateLakeStoreCreate(d *schema.ResourceData, meta interface{}) er name := d.Get("name").(string) location := azureRMNormalizeLocation(d.Get("location").(string)) - resGroup := d.Get("resource_group_name").(string) + resourceGroup := d.Get("resource_group_name").(string) tier := d.Get("tier").(string) tags := d.Get("tags").(map[string]interface{}) @@ -74,9 +75,9 @@ func resourceArmDateLakeStoreCreate(d *schema.ResourceData, meta interface{}) er }, } - future, err := client.Create(ctx, resGroup, name, dateLakeStore) + future, err := client.Create(ctx, resourceGroup, name, dateLakeStore) if err != nil { - return err + return fmt.Errorf("Error issuing create request for Data Lake Store %q (Resource Group %q): %+v", name, resourceGroup, err) } err = future.WaitForCompletion(ctx, client.Client) @@ -84,12 +85,12 @@ func resourceArmDateLakeStoreCreate(d *schema.ResourceData, meta interface{}) er return err } - read, err := client.Get(ctx, resGroup, name) + read, err := client.Get(ctx, resourceGroup, name) if err != nil { return err } if read.ID == nil { - return fmt.Errorf("Cannot read Data Lake Store %s (resource group %s) ID", name, resGroup) + return fmt.Errorf("Cannot read Data Lake Store %s (resource group %s) ID", name, resourceGroup) } d.SetId(*read.ID) @@ -191,3 +192,13 @@ func resourceArmDateLakeStoreDelete(d *schema.ResourceData, meta interface{}) er return nil } + +func validateArmDataLakeName(v interface{}, k string) (ws []string, es []error) { + input := v.(string) + + if !regexp.MustCompile(`\A([a-z0-9]{3,24})\z`).MatchString(input) { + es = append(es, fmt.Errorf("name can only consist of lowercase letters and numbers, and must be between 3 and 24 characters long")) + } + + return +} diff --git a/azurerm/resource_arm_data_lake_store_test.go b/azurerm/resource_arm_data_lake_store_test.go index 182cfeaf3dd7..5cfbc2f5320c 100644 --- a/azurerm/resource_arm_data_lake_store_test.go +++ b/azurerm/resource_arm_data_lake_store_test.go @@ -10,10 +10,33 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAzureRMDataLakeStore_payasyougo(t *testing.T) { +func TestValidateArmDataLakeName(t *testing.T) { + testCases := []struct { + input string + shouldError bool + }{ + {"ab", true}, + {"ABC", true}, + {"abc", false}, + {"123456789012345678901234", false}, + {"1234567890123456789012345", true}, + {"abc12345", false}, + } + + for _, test := range testCases { + _, es := validateArmDataLakeName(test.input, "name") + + if test.shouldError && len(es) == 0 { + t.Fatalf("Expected validating name %q to fail", test.input) + } + } +} + +func TestAccAzureRMDataLakeStore_basic(t *testing.T) { resourceName := "azurerm_data_lake_store.test" - ri := acctest.RandIntRange(1, 999999) - config := testAccAzureRMDataLakeStore_payasyougo(ri, testLocation()) + ri := acctest.RandInt() + rs := acctest.RandString(4) + config := testAccAzureRMDataLakeStore_basic(ri, rs, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -27,14 +50,20 @@ func TestAccAzureRMDataLakeStore_payasyougo(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tier", "Consumption"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } -func TestAccAzureRMDataLakeStore_monthlycommitment(t *testing.T) { +func TestAccAzureRMDataLakeStore_tier(t *testing.T) { resourceName := "azurerm_data_lake_store.test" - ri := acctest.RandIntRange(1, 999999) - config := testAccAzureRMDataLakeStore_monthlycommitment(ri, testLocation()) + ri := acctest.RandInt() + rs := acctest.RandString(4) + config := testAccAzureRMDataLakeStore_tier(ri, rs, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -48,16 +77,22 @@ func TestAccAzureRMDataLakeStore_monthlycommitment(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tier", "Commitment_1TB"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } func TestAccAzureRMDataLakeStore_withTags(t *testing.T) { resourceName := "azurerm_data_lake_store.test" - ri := acctest.RandIntRange(1, 999999) + ri := acctest.RandInt() + rs := acctest.RandString(4) location := testLocation() - preConfig := testAccAzureRMDataLakeStore_withTags(ri, location) - postConfig := testAccAzureRMDataLakeStore_withTagsUpdate(ri, location) + preConfig := testAccAzureRMDataLakeStore_withTags(ri, rs, location) + postConfig := testAccAzureRMDataLakeStore_withTagsUpdate(ri, rs, location) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -78,6 +113,11 @@ func TestAccAzureRMDataLakeStore_withTags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -139,70 +179,70 @@ func testCheckAzureRMDataLakeStoreDestroy(s *terraform.State) error { return nil } -func testAccAzureRMDataLakeStore_payasyougo(rInt int, location string) string { +func testAccAzureRMDataLakeStore_basic(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" - location = "%s" + name = "acctestRG_%d" + location = "%s" } resource "azurerm_data_lake_store" "test" { - name = "acctestlake%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "%s" + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "%s" } -`, rInt, location, rInt, location) +`, rInt, location, rs, location) } -func testAccAzureRMDataLakeStore_monthlycommitment(rInt int, location string) string { +func testAccAzureRMDataLakeStore_tier(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" - location = "%s" + name = "acctestRG_%d" + location = "%s" } resource "azurerm_data_lake_store" "test" { - name = "acctestlake%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "%s" - tier = "Commitment_1TB" + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "%s" + tier = "Commitment_1TB" } -`, rInt, location, rInt, location) +`, rInt, location, rs, location) } -func testAccAzureRMDataLakeStore_withTags(rInt int, location string) string { +func testAccAzureRMDataLakeStore_withTags(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" - location = "%s" + name = "acctestRG_%d" + location = "%s" } resource "azurerm_data_lake_store" "test" { - name = "acctestlake%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "%s" - tags { - environment = "Production" - cost_center = "MSFT" - } + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "%s" + tags { + environment = "Production" + cost_center = "MSFT" + } } -`, rInt, location, rInt, location) +`, rInt, location, rs, location) } -func testAccAzureRMDataLakeStore_withTagsUpdate(rInt int, location string) string { +func testAccAzureRMDataLakeStore_withTagsUpdate(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" - location = "%s" + name = "acctestRG_%d" + location = "%s" } resource "azurerm_data_lake_store" "test" { - name = "acctestlake%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "%s" - tags { - environment = "staging" - } -} -`, rInt, location, rInt, location) + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "%s" + tags { + environment = "staging" + } +} +`, rInt, location, rs, location) } diff --git a/website/docs/d/data_lake_store.html.markdown b/website/docs/d/data_lake_store.html.markdown index bdbb2983b428..b13258e105c2 100644 --- a/website/docs/d/data_lake_store.html.markdown +++ b/website/docs/d/data_lake_store.html.markdown @@ -26,8 +26,8 @@ output "data_lake_store_id" { ## Argument Reference -* `name` - (Required) The name of the DNS Zone. -* `resource_group_name` - (Required) The Name of the Resource Group where the DNS Zone exists. +* `name` - (Required) The name of the Data Lake Store. +* `resource_group_name` - (Required) The Name of the Resource Group where the Data Lake Store exists. ## Attributes Reference diff --git a/website/docs/r/data_lake_store.html.markdown b/website/docs/r/data_lake_store.html.markdown index d267aaed21d2..a850c4d8659a 100644 --- a/website/docs/r/data_lake_store.html.markdown +++ b/website/docs/r/data_lake_store.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_data_lake_store" sidebar_current: "docs-azurerm-resource-data-lake-store" description: |- - Create a Azure Data Lake Store. + Manage an Azure Data Lake Store. --- -# azurerm\_data\_lake\_store +# azurerm_data_lake_store -Create a Azure Data Lake Store. +Manage an Azure Data Lake Store. ## Example Usage @@ -19,23 +19,23 @@ resource "azurerm_resource_group" "test" { location = "northeurope" } -resource "azurerm_data_lake_store" "payasyougo" { - name = "payasyougodatalake" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "northeurope" +resource "azurerm_data_lake_store" "consumption" { + name = "consumptiondatalake" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "northeurope" } # Monthly Commitment Tier resource "azurerm_resource_group" "test" { - name = "test" - location = "westeurope" + name = "test" + location = "westeurope" } resource "azurerm_data_lake_store" "monthly" { - name = "monthlydatalake" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "westeurope" - tier = "Commitment_1TB" + name = "monthlydatalake" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "westeurope" + tier = "Commitment_1TB" } ``` @@ -43,11 +43,9 @@ resource "azurerm_data_lake_store" "monthly" { The following arguments are supported: -* `name` - (Required) Specifies the name of the Data Lake Store. Changing this forces a - new resource to be created. Has to be between 3 to 24 characters. +* `name` - (Required) Specifies the name of the Data Lake Store. Changing this forces a new resource to be created. Has to be between 3 to 24 characters. -* `resource_group_name` - (Required) The name of the resource group in which to - create the Data Lake Store. +* `resource_group_name` - (Required) The name of the resource group in which to create the Data Lake Store. * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. From 915a9685158d28be58d56cc2efd63707e8f49c2e Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Thu, 17 May 2018 14:56:41 +0100 Subject: [PATCH 132/320] formtting terraform --- website/docs/r/data_lake_store.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/data_lake_store.html.markdown b/website/docs/r/data_lake_store.html.markdown index a850c4d8659a..596352dcea1b 100644 --- a/website/docs/r/data_lake_store.html.markdown +++ b/website/docs/r/data_lake_store.html.markdown @@ -15,8 +15,8 @@ Manage an Azure Data Lake Store. ```hcl # Pay As You Go resource "azurerm_resource_group" "test" { - name = "test" - location = "northeurope" + name = "test" + location = "northeurope" } resource "azurerm_data_lake_store" "consumption" { From 5bc72648e8d1668dc4cc90856aa2c5f8461260e6 Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Fri, 18 May 2018 08:33:14 -0400 Subject: [PATCH 133/320] Remove unnecessary validation function per github review. Update documentation with more verbose field details. --- azurerm/data_source_storage_account_sas.go | 16 ------- .../data_source_storage_account_sas_test.go | 31 -------------- .../docs/d/storage_account_sas.html.markdown | 42 +++++++++++++++++-- 3 files changed, 39 insertions(+), 50 deletions(-) diff --git a/azurerm/data_source_storage_account_sas.go b/azurerm/data_source_storage_account_sas.go index 82fb3e7b5f59..ab92e688445a 100644 --- a/azurerm/data_source_storage_account_sas.go +++ b/azurerm/data_source_storage_account_sas.go @@ -6,7 +6,6 @@ import ( "encoding/base64" "fmt" "net/url" - "regexp" "strings" "crypto/hmac" @@ -199,11 +198,6 @@ func dataSourceArmStorageAccountSasRead(d *schema.ResourceData, _ interface{}) e services := buildServicesString(servicesIface[0].(map[string]interface{})) permissions := buildPermissionsString(permissionsIface[0].(map[string]interface{})) - _, svcErr := validateArmStorageAccountSasResourceTypes(resourceTypes, "") - if svcErr != nil { - return svcErr[0] - } - // Parse the connection string kvp, err := parseAzureStorageAccountConnectionString(connString) if err != nil { @@ -314,16 +308,6 @@ func buildResourceTypesString(resTypes map[string]interface{}) string { return retVal } -func validateArmStorageAccountSasResourceTypes(v interface{}, _ string) (ws []string, es []error) { - input := v.(string) - - if !regexp.MustCompile(`\A([cos]{1,3})\z`).MatchString(input) { - es = append(es, fmt.Errorf("resource types can only consist of 's', 'c', 'o', and must be between 1 and 3 characters long: found: %s", input)) - } - - return -} - func computeAzureStorageAccountSas(accountName string, accountKey string, permissions string, diff --git a/azurerm/data_source_storage_account_sas_test.go b/azurerm/data_source_storage_account_sas_test.go index 55c2355c107c..b0102d61ef89 100644 --- a/azurerm/data_source_storage_account_sas_test.go +++ b/azurerm/data_source_storage_account_sas_test.go @@ -177,37 +177,6 @@ func TestBuildPermissionsString(t *testing.T) { } } -func TestValidateArmStorageAccountSasResourceTypes(t *testing.T) { - testCases := []struct { - input string - shouldError bool - }{ - {"s", false}, - {"c", false}, - {"o", false}, - {"sc", false}, - {"cs", false}, - {"os", false}, - {"sco", false}, - {"cso", false}, - {"osc", false}, - {"scos", true}, - {"csoc", true}, - {"oscs", true}, - {"S", true}, - {"C", true}, - {"O", true}, - } - - for _, test := range testCases { - _, es := validateArmStorageAccountSasResourceTypes(test.input, "") - - if test.shouldError && len(es) == 0 { - t.Fatalf("Expected validating resource_types %q to fail", test.input) - } - } -} - // This connection string was for a real storage account which has been deleted // so its safe to include here for reference to understand the format. // DefaultEndpointsProtocol=https;AccountName=azurermtestsa0;AccountKey=T0ZQouXBDpWud/PlTRHIJH2+VUK8D+fnedEynb9Mx638IYnsMUe4mv1fFjC7t0NayTfFAQJzPZuV1WHFKOzGdg==;EndpointSuffix=core.windows.net diff --git a/website/docs/d/storage_account_sas.html.markdown b/website/docs/d/storage_account_sas.html.markdown index 51ed5b5291a5..0a1951c130dd 100644 --- a/website/docs/d/storage_account_sas.html.markdown +++ b/website/docs/d/storage_account_sas.html.markdown @@ -73,11 +73,47 @@ output "sas_url_query_string" { * `connection_string` - (Required) The connection string for the storage account to which this SAS applies. Typically directly from the `primary_connection_string` attribute of a terraform created `azurerm_storage_account` resource. * `https_only` - (Optional) Only permit `https` access. If `false`, both `http` and `https` are permitted. Defaults to `true`. -* `resouce_types` - (Required) A set of `true`/`false` flags which define the storage account resource types that are granted access by this SAS. -* `services` - (Required) A set of `true`/`false` flags which define the storage account services that are granted access by this SAS. +* `resouce_types` - (Required) A `resource_types` block as defined below. +* `services` - (Required) A `services` block as defined below. * `start` - (Required) The starting time and date of validity of this SAS. Must be a valid ISO-8601 format time/date string. * `expiry` - (Required) The expiration time and date of this SAS. Must be a valid ISO-8601 format time/date string. -* `permissions` - (Required) A set of `true`/`false` flags which define the granted permissions. +* `permissions` - (Required) A `permissions` block as defined below. + +--- + +`resource_types` is a set of `true`/`false` flags which define the storage account resource types that are granted +access by this SAS. This can be thought of as the scope over which the permissions apply. A `service` will have +larger scope (affecting all sub-resources) than `object`. + +A `resource_types` block contains: + +* `service` - (Required) Should permission be granted to the entire service? +* `container` - (Required) Should permission be granted to the container? +* `object` - (Required) Should permission be granted only to a specific object? + +--- + +`services` is a set of `true`/`false` flags which define the storage account services that are granted access by this SAS. + +A `services` block contains: + +* `blob` - (Required) Should permission be granted to `blob` services within this storage account? +* `queue` - (Required) Should permission be granted to `queue` services within this storage account? +* `table` - (Required) Should permission be granted to `table` services within this storage account? +* `file` - (Required) Should permission be granted to `file` services within this storage account? + +--- + +A `permissions` block contains: + +* `read` - (Required) Should Read permissions be enabled for this SAS? +* `write` - (Required) Should Write permissions be enabled for this SAS? +* `delete` - (Required) Should Delete permissions be enabled for this SAS? +* `list` - (Required) Should List permissions be enabled for this SAS? +* `add` - (Required) Should Add permissions be enabled for this SAS? +* `create` - (Required) Should Create permissions be enabled for this SAS? +* `update` - (Required) Should Update permissions be enabled for this SAS? +* `process` - (Required) Should Process permissions be enabled for this SAS? Refer to the [SAS creation reference from Azure](https://docs.microsoft.com/en-us/rest/api/storageservices/constructing-an-account-sas) for additional details on the fields above. From b0b76403787cf16ccad492d8607372b7903f9bcb Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Fri, 18 May 2018 18:10:00 -0400 Subject: [PATCH 134/320] Adjust the log messages to align with each other. (#1262) --- azurerm/resource_arm_network_security_rule.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azurerm/resource_arm_network_security_rule.go b/azurerm/resource_arm_network_security_rule.go index fed85161f1a0..f5db8534e372 100644 --- a/azurerm/resource_arm_network_security_rule.go +++ b/azurerm/resource_arm_network_security_rule.go @@ -263,10 +263,10 @@ func resourceArmNetworkSecurityRuleCreate(d *schema.ResourceData, meta interface read, err := client.Get(ctx, resGroup, nsgName, name) if err != nil { - return err + return fmt.Errorf("Error making Read request on Network Security Rule %q (NSG %q / Resource Group %q): %+v", name, nsgName, resGroup, err) } if read.ID == nil { - return fmt.Errorf("Cannot read Security Group Rule %s/%s (resource group %s) ID", nsgName, name, resGroup) + return fmt.Errorf("Cannot read Network Security Rule %s (NSG %q / resource group %s) ID", name, nsgName, resGroup) } d.SetId(*read.ID) @@ -292,7 +292,7 @@ func resourceArmNetworkSecurityRuleRead(d *schema.ResourceData, meta interface{} d.SetId("") return nil } - return fmt.Errorf("Error making Read request on Azure Network Security Rule %q: %+v", sgRuleName, err) + return fmt.Errorf("Error making Read request on Network Security Rule %q (NSG %q / Resource Group %q): %+v", sgRuleName, networkSGName, resGroup, err) } d.Set("name", resp.Name) @@ -343,5 +343,5 @@ func resourceArmNetworkSecurityRuleDelete(d *schema.ResourceData, meta interface return fmt.Errorf("Error waiting for the deletion of Network Security Rule %q (NSG %q / Resource Group %q): %+v", sgRuleName, nsgName, resGroup, err) } - return err + return nil } From 673926487f8deaf24d69931774fe52696599c230 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 18 May 2018 16:53:35 -0700 Subject: [PATCH 135/320] public ip type validation now derived from enums --- azurerm/resource_arm_public_ip.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/azurerm/resource_arm_public_ip.go b/azurerm/resource_arm_public_ip.go index 888398c833c1..9f9a9e34bf15 100644 --- a/azurerm/resource_arm_public_ip.go +++ b/azurerm/resource_arm_public_ip.go @@ -47,9 +47,12 @@ func resourceArmPublicIp() *schema.Resource { "zones": singleZonesSchema(), "public_ip_address_allocation": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{"static", "dynamic"}, true), + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + string(network.Static), + string(network.Dynamic), + }, true), DiffSuppressFunc: ignoreCaseDiffSuppressFunc, StateFunc: ignoreCaseStateFunc, }, From 24a9be7ff4b84c63318ca8da8d9bdb72b389d451 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline Date: Fri, 18 May 2018 17:07:57 -0700 Subject: [PATCH 136/320] Fix for issue #1256 --- azurerm/resource_arm_container_registry.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_container_registry.go b/azurerm/resource_arm_container_registry.go index fb1d5925e0e6..200359dd21c7 100644 --- a/azurerm/resource_arm_container_registry.go +++ b/azurerm/resource_arm_container_registry.go @@ -41,7 +41,6 @@ func resourceArmContainerRegistry() *schema.Resource { "sku": { Type: schema.TypeString, Optional: true, - ForceNew: true, Default: string(containerregistry.Classic), DiffSuppressFunc: ignoreCaseDiffSuppressFunc, ValidateFunc: validation.StringInSlice([]string{ @@ -183,6 +182,10 @@ func resourceArmContainerRegistryUpdate(d *schema.ResourceData, meta interface{} RegistryPropertiesUpdateParameters: &containerregistry.RegistryPropertiesUpdateParameters{ AdminUserEnabled: utils.Bool(adminUserEnabled), }, + Sku: &containerregistry.Sku{ + Name: containerregistry.SkuName(sku), + Tier: containerregistry.SkuTier(sku), + }, Tags: expandTags(tags), } From 02dbf2701ea14a17b3267ea099e00e7286466a97 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 18 May 2018 17:55:36 -0700 Subject: [PATCH 137/320] Updating CHANGELOG.md to include #1247 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae156c613f80..54480f9567ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,10 @@ BUG FIXES: IMPROVEMENTS: * `azurerm_app_service` - adding support for `ip_restriction`'s [GH-1231] +* `azurerm_public_ip` - computed values now default to an empy string [GH-1247] * `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` [GH-1235] + ## 1.5.0 (May 14, 2018) UPGRADE NOTES: From beeaed54c5d83333ea2c3798bcc21f1a457ea333 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 12 May 2018 17:50:44 -0700 Subject: [PATCH 138/320] azurerm_automation_schedule: added interval property --- azurerm/resource_arm_automation_account.go | 8 + azurerm/resource_arm_automation_schedule.go | 248 +++++++++++++----- .../resource_arm_automation_schedule_test.go | 36 --- examples/automation-account/main.tf | 33 +++ examples/automation-account/outputs.tf | 8 + examples/automation-account/variables.tf | 11 + .../docs/r/automation_schedule.html.markdown | 17 +- 7 files changed, 246 insertions(+), 115 deletions(-) create mode 100644 examples/automation-account/main.tf create mode 100644 examples/automation-account/outputs.tf create mode 100644 examples/automation-account/variables.tf diff --git a/azurerm/resource_arm_automation_account.go b/azurerm/resource_arm_automation_account.go index 30145a900ddc..85528c784e38 100644 --- a/azurerm/resource_arm_automation_account.go +++ b/azurerm/resource_arm_automation_account.go @@ -3,6 +3,7 @@ package azurerm import ( "fmt" "log" + "regexp" "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation" "github.com/hashicorp/terraform/helper/schema" @@ -16,6 +17,7 @@ func resourceArmAutomationAccount() *schema.Resource { Read: resourceArmAutomationAccountRead, Update: resourceArmAutomationAccountCreateUpdate, Delete: resourceArmAutomationAccountDelete, + Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -25,12 +27,17 @@ func resourceArmAutomationAccount() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, + ValidateFunc: validation.StringMatch( + regexp.MustCompile(`^[0-9a-zA-Z][-0-9a-zA-Z]{0,48}[0-9a-zA-Z]$`), //todo will not allow single character names, even thou they are valid + `The account name must not be empty, and must not exceed 50 characters in length. The account name must start with a letter or number. The account name can contain letters, numbers, and dashes. The final character must be a letter or a number.`, + ), }, "location": locationSchema(), "resource_group_name": resourceGroupNameSchema(), + //can we somehow default this? "sku": { Type: schema.TypeList, Required: true, @@ -154,6 +161,7 @@ func resourceArmAutomationAccountDelete(d *schema.ResourceData, meta interface{} return nil } +//todo remove when deprecated field func flattenAndSetAutomationAccountSku(d *schema.ResourceData, sku *automation.Sku) { results := make([]interface{}, 1) diff --git a/azurerm/resource_arm_automation_schedule.go b/azurerm/resource_arm_automation_schedule.go index 1248adc832da..7baf1986a3b5 100644 --- a/azurerm/resource_arm_automation_schedule.go +++ b/azurerm/resource_arm_automation_schedule.go @@ -10,6 +10,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" + "regexp" + "strings" ) func resourceArmAutomationSchedule() *schema.Resource { @@ -18,43 +20,64 @@ func resourceArmAutomationSchedule() *schema.Resource { Read: resourceArmAutomationScheduleRead, Update: resourceArmAutomationScheduleCreateUpdate, Delete: resourceArmAutomationScheduleDelete, + Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, + CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { + + interval, _ := diff.GetOk("interval") + if strings.ToLower(diff.Get("frequency").(string)) == "onetime" && interval.(int) > 0 { + return fmt.Errorf("interval canot be set when frequency is not OneTime") + } + + _, hasAccount := diff.GetOk("automation_account_name") + _, hasAutomationAccountWeb := diff.GetOk("account_name") + if !hasAccount && !hasAutomationAccountWeb { + return fmt.Errorf("`automation_account_name` must be set") + } + + //if automation_account_name changed or account_name chnaged not to or from nil force a new resource + oAan, nAan := diff.GetChange("automation_account_name") + if oAan != "" && nAan != "" { + diff.ForceNew("automation_account_name") + } + + oAn, nAn := diff.GetChange("account_name") + if oAn != "" && nAn != "" { + diff.ForceNew("automation_account_name") + } + + return nil + }, + Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, Required: true, ForceNew: true, - }, - - "account_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - - "description": { - Type: schema.TypeString, - Optional: true, - Computed: true, + ValidateFunc: validation.StringMatch( + regexp.MustCompile(`^[^<>*%&:\\?.+/]{0,127}[^<>*%&:\\?.+/\s]$`), + `The name length must be from 1 to 128 characters. The name cannot contain special characters < > * % & : \ ? . + / and cannot end with a whitespace character.`, + ), }, "resource_group_name": resourceGroupNameSchema(), - "start_time": { - Type: schema.TypeString, - Required: true, - DiffSuppressFunc: compareDataAsUTCSuppressFunc, - ValidateFunc: validateStartTime, + //this is AutomationAccountName in the SDK + "account_name": { + Type: schema.TypeString, + Optional: true, + Deprecated: "account_name has been renamed to automation_account_name for clarity and to better match the azure API", + ConflictsWith: []string{"automation_account_name"}, }, - "expiry_time": { - Type: schema.TypeString, - DiffSuppressFunc: compareDataAsUTCSuppressFunc, - Optional: true, - Computed: true, + "automation_account_name": { + Type: schema.TypeString, + Optional: true, //todo change to required once account_name has been removed + //ForceNew: true, //todo this needs to come back once account_name has been removed + ConflictsWith: []string{"account_name"}, }, "frequency": { @@ -69,16 +92,53 @@ func resourceArmAutomationSchedule() *schema.Resource { string(automation.Week), }, true), }, + + //ignored when frequency is `OneTime` + "interval": { + Type: schema.TypeInt, + Optional: true, + Computed: true, //defaults to 1 if frequency is not OneTime + ValidateFunc: validation.IntBetween(1, 100), + }, + + "start_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + DiffSuppressFunc: compareDataAsUTCSuppressFunc, + ValidateFunc: validateRFC3339DateInFutureBy(time.Duration(5) * time.Minute), + //defaults to now + 7 minutes in create function if not set + }, + + "expiry_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, //same as start time when OneTime, ridiculous value when recurring: "9999-12-31T15:59:00-08:00" + DiffSuppressFunc: compareDataAsUTCSuppressFunc, + ValidateFunc: validateRFC3339Date, + }, + + "description": { + Type: schema.TypeString, + Optional: true, + }, + "timezone": { Type: schema.TypeString, Optional: true, Default: "UTC", + //ValidateFunc: validateTimezone, + //go uses a different list }, + + //todo missing fields: week_days, month_days, month_week_day from advanced automation section + //also next_run may be useful }, } } -func compareDataAsUTCSuppressFunc(k, old, new string, d *schema.ResourceData) bool { +//todo move to internal package validate +func compareDataAsUTCSuppressFunc(_, old, new string, _ *schema.ResourceData) bool { ot, oerr := time.Parse(time.RFC3339, old) nt, nerr := time.Parse(time.RFC3339, new) if oerr != nil || nerr != nil { @@ -88,15 +148,28 @@ func compareDataAsUTCSuppressFunc(k, old, new string, d *schema.ResourceData) bo return nt.Equal(ot) } -func validateStartTime(v interface{}, k string) (ws []string, errors []error) { - starttime, tperr := time.Parse(time.RFC3339, v.(string)) - if tperr != nil { - errors = append(errors, fmt.Errorf("Cannot parse %q", k)) +//todo move to internal package validate +func validateRFC3339DateInFutureBy(d time.Duration) schema.SchemaValidateFunc { + return func(i interface{}, k string) (s []string, errors []error) { + t, err := time.Parse(time.RFC3339, i.(string)) + if err != nil { + errors = append(errors, fmt.Errorf("%q has the invalid RFC3339 date format %q: %+v", k, i, err)) + } + + if time.Until(t) < d { + errors = append(errors, fmt.Errorf("%q is %q but should be at least %q in the future", k, i, d)) + } + + return } +} + +//todo move to internal package validate +func validateTimezone(v interface{}, k string) (ws []string, errors []error) { + locationString := v.(string) - u := time.Until(starttime) - if u < 5*time.Minute { - errors = append(errors, fmt.Errorf("%q should be at least 5 minutes in the future", k)) + if _, err := time.LoadLocation(locationString); err != nil { + errors = append(errors, fmt.Errorf("%q is the invalid timezone %q: %+v", k, v, err)) } return @@ -105,49 +178,62 @@ func validateStartTime(v interface{}, k string) (ws []string, errors []error) { func resourceArmAutomationScheduleCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).automationScheduleClient ctx := meta.(*ArmClient).StopContext + log.Printf("[INFO] preparing arguments for AzureRM Automation Schedule creation.") name := d.Get("name").(string) resGroup := d.Get("resource_group_name").(string) + frequency := d.Get("frequency").(string) - accName := d.Get("account_name").(string) - freqstr := d.Get("frequency").(string) - freq := automation.ScheduleFrequency(freqstr) - - cst := d.Get("start_time").(string) - starttime, tperr := time.Parse(time.RFC3339, cst) - if tperr != nil { - return fmt.Errorf("Cannot parse start_time: %q", cst) - } - - expirytime, teperr := time.Parse(time.RFC3339, cst) - if teperr != nil { - return fmt.Errorf("Cannot parse expiry_time: %q", cst) - } - - stdt := date.Time{Time: starttime} - etdt := date.Time{Time: expirytime} - + timeZone := d.Get("timezone").(string) description := d.Get("description").(string) - timezone := d.Get("timezone").(string) + + //CustomizeDiff should ensure one of these two is set + //todo remove this once `account_name` is removed + accountName := "" + if v, ok := d.GetOk("automation_account_name"); ok { + accountName = v.(string) + } else if v, ok := d.GetOk("account_name"); ok { + accountName = v.(string) + } //CustomizeDiff should enforce one of these two being set parameters := automation.ScheduleCreateOrUpdateParameters{ Name: &name, ScheduleCreateOrUpdateProperties: &automation.ScheduleCreateOrUpdateProperties{ Description: &description, - Frequency: freq, - StartTime: &stdt, - ExpiryTime: &etdt, - TimeZone: &timezone, + Frequency: automation.ScheduleFrequency(frequency), + TimeZone: &timeZone, }, } + properties := parameters.ScheduleCreateOrUpdateProperties + + //start time can default to now + 7 (5 could be invalid by the time the API is called) + if v, ok := d.GetOk("start_time"); ok { + t, _ := time.Parse(time.RFC3339, v.(string)) //should be validated by the schema + properties.StartTime = &date.Time{Time: t} + } else { + properties.StartTime = &date.Time{Time: time.Now().Add(time.Duration(7) * time.Minute)} + } + + if v, ok := d.GetOk("expiry_time"); ok { + t, _ := time.Parse(time.RFC3339, v.(string)) //should be validated by the schema + properties.ExpiryTime = &date.Time{Time: t} + } - _, err := client.CreateOrUpdate(ctx, resGroup, accName, name, parameters) + //only pay attention to interval if frequency is not OneTime, and default it to 1 if not set + if properties.Frequency != automation.OneTime { + if v, ok := d.GetOk("interval"); ok { + properties.Interval = utils.Int32(int32(v.(int))) + } else { + properties.Interval = 1 + } + } + _, err := client.CreateOrUpdate(ctx, resGroup, accountName, name, parameters) if err != nil { return err } - read, err := client.Get(ctx, resGroup, accName, name) + read, err := client.Get(ctx, resGroup, accountName, name) if err != nil { return err } @@ -164,15 +250,17 @@ func resourceArmAutomationScheduleCreateUpdate(d *schema.ResourceData, meta inte func resourceArmAutomationScheduleRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).automationScheduleClient ctx := meta.(*ArmClient).StopContext + id, err := parseAzureResourceID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - accName := id.Path["automationAccounts"] + name := id.Path["schedules"] + resGroup := id.ResourceGroup + accountName := id.Path["automationAccounts"] - resp, err := client.Get(ctx, resGroup, accName, name) + resp, err := client.Get(ctx, resGroup, accountName, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") @@ -184,12 +272,30 @@ func resourceArmAutomationScheduleRead(d *schema.ResourceData, meta interface{}) d.Set("name", resp.Name) d.Set("resource_group_name", resGroup) - d.Set("account_name", accName) - d.Set("frequency", resp.Frequency) - d.Set("description", resp.Description) - d.Set("start_time", string(resp.StartTime.Format(time.RFC3339))) - d.Set("expiry_time", string(resp.ExpiryTime.Format(time.RFC3339))) - d.Set("timezone", resp.TimeZone) + //todo remove once `account_name` is removed + if _, ok := d.GetOk("automation_account_name"); ok { + d.Set("automation_account_name", accountName) + } else { + d.Set("account_name", accountName) + } + d.Set("frequency", string(resp.Frequency)) + + if v := resp.StartTime; v != nil { + d.Set("start_time", string(v.Format(time.RFC3339))) + } + if v := resp.ExpiryTime; v != nil { + d.Set("expiry_time", string(v.Format(time.RFC3339))) + } + if v := resp.Interval; v != nil { + //seems to me missing its type in swagger, leading to it being a interface{} float64 + d.Set("interval", int(v.(float64))) + } + if v := resp.Description; v != nil { + d.Set("description", v) + } + if v := resp.TimeZone; v != nil { + d.Set("timezone", v) + } return nil } @@ -201,18 +307,16 @@ func resourceArmAutomationScheduleDelete(d *schema.ResourceData, meta interface{ if err != nil { return err } - resGroup := id.ResourceGroup - accName := id.Path["automationAccounts"] - name := id.Path["schedules"] - resp, err := client.Delete(ctx, resGroup, accName, name) + name := id.Path["schedules"] + resGroup := id.ResourceGroup + accountName := id.Path["automationAccounts"] + resp, err := client.Delete(ctx, resGroup, accountName, name) if err != nil { - if utils.ResponseWasNotFound(resp) { - return nil + if !utils.ResponseWasNotFound(resp) { + return fmt.Errorf("Error issuing AzureRM delete request for Automation Schedule '%s': %+v", name, err) } - - return fmt.Errorf("Error issuing AzureRM delete request for Automation Schedule '%s': %+v", name, err) } return nil diff --git a/azurerm/resource_arm_automation_schedule_test.go b/azurerm/resource_arm_automation_schedule_test.go index 33ac8d9a1709..0cf8b718be0a 100644 --- a/azurerm/resource_arm_automation_schedule_test.go +++ b/azurerm/resource_arm_automation_schedule_test.go @@ -64,42 +64,6 @@ func testCheckAzureRMAutomationScheduleDestroy(s *terraform.State) error { return nil } -func testCheckAzureRMAutomationScheduleExistsAndFrequencyType(name string, freq automation.ScheduleFrequency) resource.TestCheckFunc { - return func(s *terraform.State) error { - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[name] - if !ok { - return fmt.Errorf("Not found: %s", name) - } - - name := rs.Primary.Attributes["name"] - accName := rs.Primary.Attributes["account_name"] - - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for Automation Schedule: '%s'", name) - } - - conn := testAccProvider.Meta().(*ArmClient).automationScheduleClient - ctx := testAccProvider.Meta().(*ArmClient).StopContext - - resp, err := conn.Get(ctx, resourceGroup, accName, name) - - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Automation Schedule '%s' (resource group: '%s') does not exist", name, resourceGroup) - } - - return fmt.Errorf("Bad: Get on automationScheduleClient: %+v", err) - } - - if resp.Frequency != freq { - return fmt.Errorf("Current frequency %s is not consistent with checked value %s", resp.Frequency, freq) - } - return nil - } -} - func testAccAzureRMAutomationSchedule_oneTime(rInt int, location string) string { startTime := time.Now().UTC().Add(time.Duration(7) * time.Minute) startTime = startTime.Add(time.Duration(-1*startTime.Second()) * time.Second) diff --git a/examples/automation-account/main.tf b/examples/automation-account/main.tf new file mode 100644 index 000000000000..2940c9363293 --- /dev/null +++ b/examples/automation-account/main.tf @@ -0,0 +1,33 @@ + +resource "azurerm_resource_group" "rg" { + name = "${var.resource_group_name}" + location = "${var.resource_group_location}" +} + +resource "azurerm_automation_account" "account" { + name = "tfex-automation-account" + location = "${azurerm_resource_group.rg.location}" + resource_group_name = "${azurerm_resource_group.rg.name}" + + sku { + name = "Basic" + } +} + +resource "azurerm_automation_schedule" "one-time" { + name = "tfex-automation_schedule-one_time" + resource_group_name = "${azurerm_resource_group.rg.name}" + automation_account_name = "${azurerm_automation_account.account.name}" + frequency = "OneTime" + timezone = "UTC+10" + //defaults start_time to now + 7 min +} + +resource "azurerm_automation_schedule" "hour" { + name = "tfex-automation_schedule-hour" + resource_group_name = "${azurerm_resource_group.rg.name}" + automation_account_name = "${azurerm_automation_account.account.name}" + frequency = "Hour" + interval = 2 + //timezone defaults to UTC +} diff --git a/examples/automation-account/outputs.tf b/examples/automation-account/outputs.tf new file mode 100644 index 000000000000..bb37dcf72eca --- /dev/null +++ b/examples/automation-account/outputs.tf @@ -0,0 +1,8 @@ + +output "automation_schedule-start_time" { + value = "${azurerm_automation_schedule.one-time.start_time}" +} + +output "automation_schedule-week-interval" { + value = "${azurerm_automation_schedule.hour.interval}" +} \ No newline at end of file diff --git a/examples/automation-account/variables.tf b/examples/automation-account/variables.tf new file mode 100644 index 000000000000..492bd5b309ad --- /dev/null +++ b/examples/automation-account/variables.tf @@ -0,0 +1,11 @@ +variable "resource_group_name" { + type = "string" + description = "Name of the azure resource group." + default = "tfex-automation_account" +} + +variable "resource_group_location" { + type = "string" + description = "Location of the azure resource group." + default = "west europe" +} diff --git a/website/docs/r/automation_schedule.html.markdown b/website/docs/r/automation_schedule.html.markdown index 26ddfbc0f887..56ee0d824c7e 100644 --- a/website/docs/r/automation_schedule.html.markdown +++ b/website/docs/r/automation_schedule.html.markdown @@ -6,7 +6,7 @@ description: |- Creates a new Automation Schedule. --- -# azurerm\_automation\_schedule +# azurerm_automation_schedule Creates a new Automation Schedule. @@ -31,7 +31,8 @@ resource "azurerm_automation_schedule" "example" { name = "schedule1" resource_group_name = "${azurerm_resource_group.example.name}" account_name = "${azurerm_automation_account.example.name}" - frequency = "OneTime" + frequency = "Hour" + interval = 1 timezone = "Central Europe Standard Time" start_time = "2014-04-15T18:00:15+02:00" description = "This is an example schedule" @@ -46,17 +47,19 @@ The following arguments are supported: * `resource_group_name` - (Required) The name of the resource group in which the Schedule is created. Changing this forces a new resource to be created. -* `account_name` - (Required) The name of the automation account in which the Schedule is created. Changing this forces a new resource to be created. +* `automation_account_name` - (Required) The name of the automation account in which the Schedule is created. Changing this forces a new resource to be created. + +* `frequency` - (Required) The frequency of the schedule. - can be either `OneTime`, `Day`, `Hour`, `Week`, or `Month`. * `description` - (Optional) A description for this Schedule. -* `start_time` - (Required) Start time of the schedule. Must be at least five minutes in the future. +* `interval` - (Optional) The number of `frequency`s between runs. Only valid for `Day`, `Hour`, `Week`, or `Month` and defaults to `1`. -* `expiry_time` - (Optional) The end time of the schedule. +* `start_time` - (Optional) Start time of the schedule. Must be at least five minutes in the future. Defaults to seven minutes in the future from the time the resource is created. -* `frequency` - (Required) The frequency of the schedule. - can be either `OneTime`, `Day`, `Hour`, `Week`, or `Month`. +* `expiry_time` - (Optional) The end time of the schedule. -* `timezone` - (Optional) The timezone of the start time. For possible values see: https://msdn.microsoft.com/en-us/library/ms912391(v=winembedded.11).aspx +* `timezone` - (Optional) The timezone of the start time. Defaults to `UTC`. For possible values see: https://msdn.microsoft.com/en-us/library/ms912391(v=winembedded.11).aspx ## Attributes Reference From 5697c6274e99551d27b05b9331bf376aea59fce4 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 19 May 2018 00:03:29 -0700 Subject: [PATCH 139/320] Clean up after merge: datasource should fail when they cant be found --- azurerm/data_source_dns_zone.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/azurerm/data_source_dns_zone.go b/azurerm/data_source_dns_zone.go index 0af27c0dcaa9..bc33259246c0 100644 --- a/azurerm/data_source_dns_zone.go +++ b/azurerm/data_source_dns_zone.go @@ -64,8 +64,7 @@ func dataSourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { resp, err = client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil + return fmt.Errorf("Error: DNS Zone %q (Resource Group %q) was not found", name, resourceGroup) } return fmt.Errorf("Error reading DNS Zone %q (Resource Group %q): %+v", name, resourceGroup, err) } @@ -78,8 +77,7 @@ func dataSourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { } if reflect.DeepEqual(resp, dns.Zone{}) { - d.SetId("") - return nil + return fmt.Errorf("Error: DNS Zone %q was not found", name, resourceGroup) } } From 6559cfd3e84674e82cbd7cf144667e818afee0cb Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 19 May 2018 00:06:44 -0700 Subject: [PATCH 140/320] Small simplification --- azurerm/data_source_dns_zone.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azurerm/data_source_dns_zone.go b/azurerm/data_source_dns_zone.go index bc33259246c0..909a0431a3b8 100644 --- a/azurerm/data_source_dns_zone.go +++ b/azurerm/data_source_dns_zone.go @@ -3,7 +3,6 @@ package azurerm import ( "context" "fmt" - "reflect" "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources" @@ -76,8 +75,8 @@ func dataSourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { return err } - if reflect.DeepEqual(resp, dns.Zone{}) { - return fmt.Errorf("Error: DNS Zone %q was not found", name, resourceGroup) + if resourceGroup == "" { + return fmt.Errorf("Error: DNS Zone %q was not found", name) } } From 9a9db40fc620aa6d6290179b10c834a7825f1bf4 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 19 May 2018 00:30:10 -0700 Subject: [PATCH 141/320] Update CHANGELOG.md to include #1180 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54480f9567ce..59a3f7f7137d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ BUG FIXES: IMPROVEMENTS: * `azurerm_app_service` - adding support for `ip_restriction`'s [GH-1231] +* `azurerm_dns_zone` - datasource's `resource_group` field is now optional [GH-1180] * `azurerm_public_ip` - computed values now default to an empy string [GH-1247] * `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` [GH-1235] From d014b3aec67fa6f632b1358c991fbcc21374dce5 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Sat, 19 May 2018 21:43:10 +0100 Subject: [PATCH 142/320] wrapping exceptions and removing unused func --- azurerm/data_source_data_lake_store.go | 3 +-- azurerm/resource_arm_data_lake_store.go | 23 +++++++------------- azurerm/resource_arm_data_lake_store_test.go | 22 ------------------- 3 files changed, 9 insertions(+), 39 deletions(-) diff --git a/azurerm/data_source_data_lake_store.go b/azurerm/data_source_data_lake_store.go index 5ca79feb9835..e3578b50c967 100644 --- a/azurerm/data_source_data_lake_store.go +++ b/azurerm/data_source_data_lake_store.go @@ -24,8 +24,7 @@ func dataSourceArmDataLakeStoreAccount() *schema.Resource { "tier": { Type: schema.TypeString, - Optional: true, - Default: false, + Computed: true, }, "tags": tagsForDataSourceSchema(), diff --git a/azurerm/resource_arm_data_lake_store.go b/azurerm/resource_arm_data_lake_store.go index 60a5fbede7cb..693b68e6e2da 100644 --- a/azurerm/resource_arm_data_lake_store.go +++ b/azurerm/resource_arm_data_lake_store.go @@ -27,7 +27,10 @@ func resourceArmDataLakeStore() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validateArmDataLakeName, + ValidateFunc: validation.StringMatch( + regexp.MustCompile(`\A([a-z0-9]{3,24})\z`), + "Name can only consist of lowercase letters and numbers, and must be between 3 and 24 characters long", + ), }, "location": locationSchema(), @@ -82,12 +85,12 @@ func resourceArmDateLakeStoreCreate(d *schema.ResourceData, meta interface{}) er err = future.WaitForCompletion(ctx, client.Client) if err != nil { - return err + return fmt.Errorf("Error creating Data Lake Store %q (Resource Group %q): %+v", name, resourceGroup, err) } read, err := client.Get(ctx, resourceGroup, name) if err != nil { - return err + return fmt.Errorf("Error retrieving Data Lake Store %q (Resource Group %q): %+v", name, resourceGroup, err) } if read.ID == nil { return fmt.Errorf("Cannot read Data Lake Store %s (resource group %s) ID", name, resourceGroup) @@ -179,7 +182,7 @@ func resourceArmDateLakeStoreDelete(d *schema.ResourceData, meta interface{}) er if response.WasNotFound(future.Response()) { return nil } - return err + return fmt.Errorf("Error issuing delete request for Data Lake Store %q (Resource Group %q): %+v", name, resourceGroup, err) } err = future.WaitForCompletion(ctx, client.Client) @@ -187,18 +190,8 @@ func resourceArmDateLakeStoreDelete(d *schema.ResourceData, meta interface{}) er if response.WasNotFound(future.Response()) { return nil } - return err + return fmt.Errorf("Error deleting Data Lake Store %q (Resource Group %q): %+v", name, resourceGroup, err) } return nil } - -func validateArmDataLakeName(v interface{}, k string) (ws []string, es []error) { - input := v.(string) - - if !regexp.MustCompile(`\A([a-z0-9]{3,24})\z`).MatchString(input) { - es = append(es, fmt.Errorf("name can only consist of lowercase letters and numbers, and must be between 3 and 24 characters long")) - } - - return -} diff --git a/azurerm/resource_arm_data_lake_store_test.go b/azurerm/resource_arm_data_lake_store_test.go index 5cfbc2f5320c..e22a02f1c8ec 100644 --- a/azurerm/resource_arm_data_lake_store_test.go +++ b/azurerm/resource_arm_data_lake_store_test.go @@ -10,28 +10,6 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestValidateArmDataLakeName(t *testing.T) { - testCases := []struct { - input string - shouldError bool - }{ - {"ab", true}, - {"ABC", true}, - {"abc", false}, - {"123456789012345678901234", false}, - {"1234567890123456789012345", true}, - {"abc12345", false}, - } - - for _, test := range testCases { - _, es := validateArmDataLakeName(test.input, "name") - - if test.shouldError && len(es) == 0 { - t.Fatalf("Expected validating name %q to fail", test.input) - } - } -} - func TestAccAzureRMDataLakeStore_basic(t *testing.T) { resourceName := "azurerm_data_lake_store.test" ri := acctest.RandInt() From 9bc609652b7a9d4b3dfb9f933e919d30e1b9ebb2 Mon Sep 17 00:00:00 2001 From: Neeran Gul Date: Sat, 19 May 2018 21:56:41 +0100 Subject: [PATCH 143/320] didnt run fmt --- azurerm/resource_arm_data_lake_store.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azurerm/resource_arm_data_lake_store.go b/azurerm/resource_arm_data_lake_store.go index 693b68e6e2da..523f2cc39247 100644 --- a/azurerm/resource_arm_data_lake_store.go +++ b/azurerm/resource_arm_data_lake_store.go @@ -24,9 +24,9 @@ func resourceArmDataLakeStore() *schema.Resource { Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, ValidateFunc: validation.StringMatch( regexp.MustCompile(`\A([a-z0-9]{3,24})\z`), "Name can only consist of lowercase letters and numbers, and must be between 3 and 24 characters long", From 8d74125a7912f736ba727f3ede6b16c472748538 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 19 May 2018 17:20:08 -0700 Subject: [PATCH 144/320] Update data_lake_store.html.markdown --- website/docs/r/data_lake_store.html.markdown | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/website/docs/r/data_lake_store.html.markdown b/website/docs/r/data_lake_store.html.markdown index 596352dcea1b..c7b09aec6854 100644 --- a/website/docs/r/data_lake_store.html.markdown +++ b/website/docs/r/data_lake_store.html.markdown @@ -15,27 +15,27 @@ Manage an Azure Data Lake Store. ```hcl # Pay As You Go resource "azurerm_resource_group" "test" { - name = "test" + name = "test" location = "northeurope" } resource "azurerm_data_lake_store" "consumption" { - name = "consumptiondatalake" + name = "consumptiondatalake" resource_group_name = "${azurerm_resource_group.test.name}" - location = "northeurope" + location = "northeurope" } # Monthly Commitment Tier resource "azurerm_resource_group" "test" { - name = "test" + name = "test" location = "westeurope" } resource "azurerm_data_lake_store" "monthly" { - name = "monthlydatalake" + name = "monthlydatalake" resource_group_name = "${azurerm_resource_group.test.name}" - location = "westeurope" - tier = "Commitment_1TB" + location = "westeurope" + tier = "Commitment_1TB" } ``` From 59dee530bce1e53adc5f426eebeb3a1c476a6c49 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 19 May 2018 17:21:45 -0700 Subject: [PATCH 145/320] Update resource_arm_data_lake_store_test.go --- azurerm/resource_arm_data_lake_store_test.go | 28 +++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/azurerm/resource_arm_data_lake_store_test.go b/azurerm/resource_arm_data_lake_store_test.go index e22a02f1c8ec..c39da36a49d4 100644 --- a/azurerm/resource_arm_data_lake_store_test.go +++ b/azurerm/resource_arm_data_lake_store_test.go @@ -160,14 +160,14 @@ func testCheckAzureRMDataLakeStoreDestroy(s *terraform.State) error { func testAccAzureRMDataLakeStore_basic(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG_%d" location = "%s" } resource "azurerm_data_lake_store" "test" { - name = "unlikely23exst2acct%s" + name = "unlikely23exst2acct%s" resource_group_name = "${azurerm_resource_group.test.name}" - location = "%s" + location = "%s" } `, rInt, location, rs, location) } @@ -175,15 +175,15 @@ resource "azurerm_data_lake_store" "test" { func testAccAzureRMDataLakeStore_tier(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG_%d" location = "%s" } resource "azurerm_data_lake_store" "test" { - name = "unlikely23exst2acct%s" + name = "unlikely23exst2acct%s" resource_group_name = "${azurerm_resource_group.test.name}" - location = "%s" - tier = "Commitment_1TB" + location = "%s" + tier = "Commitment_1TB" } `, rInt, location, rs, location) } @@ -191,14 +191,15 @@ resource "azurerm_data_lake_store" "test" { func testAccAzureRMDataLakeStore_withTags(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG_%d" location = "%s" } resource "azurerm_data_lake_store" "test" { - name = "unlikely23exst2acct%s" + name = "unlikely23exst2acct%s" resource_group_name = "${azurerm_resource_group.test.name}" - location = "%s" + location = "%s" + tags { environment = "Production" cost_center = "MSFT" @@ -210,14 +211,15 @@ resource "azurerm_data_lake_store" "test" { func testAccAzureRMDataLakeStore_withTagsUpdate(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG_%d" location = "%s" } resource "azurerm_data_lake_store" "test" { - name = "unlikely23exst2acct%s" + name = "unlikely23exst2acct%s" resource_group_name = "${azurerm_resource_group.test.name}" - location = "%s" + location = "%s" + tags { environment = "staging" } From 36e38821d456d46f2d898fd441122d71321d279e Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 19 May 2018 17:24:29 -0700 Subject: [PATCH 146/320] Update data_source_data_lake_store_test.go --- azurerm/data_source_data_lake_store_test.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/azurerm/data_source_data_lake_store_test.go b/azurerm/data_source_data_lake_store_test.go index 0314ec31e7d7..cb1ec86e3266 100644 --- a/azurerm/data_source_data_lake_store_test.go +++ b/azurerm/data_source_data_lake_store_test.go @@ -54,13 +54,13 @@ func TestAccDataSourceAzureRMDataLakeStore_tier(t *testing.T) { func testAccDataSourceDataLakeStore_basic(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG_%d" location = "%s" } resource "azurerm_data_lake_store" "test" { - name = "unlikely23exst2acct%s" - location = "%s" + name = "unlikely23exst2acct%s" + location = "%s" resource_group_name = "${azurerm_resource_group.test.name}" } @@ -74,15 +74,16 @@ data "azurerm_data_lake_store" "test" { func testAccDataSourceDataLakeStore_tier(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG_%d" location = "%s" } resource "azurerm_data_lake_store" "test" { - name = "unlikely23exst2acct%s" - location = "%s" - tier = "Commitment_1TB" + name = "unlikely23exst2acct%s" + location = "%s" + tier = "Commitment_1TB" resource_group_name = "${azurerm_resource_group.test.name}" + tags { hello = "world" } From 47bb5712a0641e50960b7e60980107a76b529d49 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 19 May 2018 18:19:53 -0700 Subject: [PATCH 147/320] Update resource_arm_data_lake_store_test.go Fix typo in test --- azurerm/resource_arm_data_lake_store_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_data_lake_store_test.go b/azurerm/resource_arm_data_lake_store_test.go index c39da36a49d4..488673fe5d80 100644 --- a/azurerm/resource_arm_data_lake_store_test.go +++ b/azurerm/resource_arm_data_lake_store_test.go @@ -87,7 +87,7 @@ func TestAccAzureRMDataLakeStore_withTags(t *testing.T) { { Config: postConfig, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDnsZoneExists(resourceName), + testCheckAzureRMDataLakeStoreExists(resourceName), resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), ), }, From 71350a45dd731098a5fc48e1f0d8f8426b193f34 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 19 May 2018 18:31:26 -0700 Subject: [PATCH 148/320] data_source_storage_account_sas_test.go make test names similar --- azurerm/data_source_storage_account_sas_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azurerm/data_source_storage_account_sas_test.go b/azurerm/data_source_storage_account_sas_test.go index b0102d61ef89..8fd705c7355c 100644 --- a/azurerm/data_source_storage_account_sas_test.go +++ b/azurerm/data_source_storage_account_sas_test.go @@ -8,7 +8,7 @@ import ( "time" ) -func TestAccDataSourceArmStorageAccountSasRead(t *testing.T) { +func TestAccDataSourceArmStorageAccountSas_basic(t *testing.T) { dataSourceName := "data.azurerm_storage_account_sas.test" rInt := acctest.RandInt() rString := acctest.RandString(4) @@ -84,7 +84,7 @@ data "azurerm_storage_account_sas" "test" { `, rInt, location, rString, startDate, endDate) } -func TestParseAzureStorageAccountConnectionString(t *testing.T) { +func TestAccDataSourceArmStorageAccountSas_connectionString(t *testing.T) { testCases := []struct { input string expectedAccountName string @@ -113,7 +113,7 @@ func TestParseAzureStorageAccountConnectionString(t *testing.T) { } -func TestBuildResourceTypesString(t *testing.T) { +func TestAccDataSourceArmStorageAccountSas_resourceTypesString(t *testing.T) { testCases := []struct { input map[string]interface{} expected string @@ -132,7 +132,7 @@ func TestBuildResourceTypesString(t *testing.T) { } } -func TestBuildServicesString(t *testing.T) { +func TestAccDataSourceArmStorageAccountSas_servicesString(t *testing.T) { testCases := []struct { input map[string]interface{} expected string @@ -153,7 +153,7 @@ func TestBuildServicesString(t *testing.T) { } -func TestBuildPermissionsString(t *testing.T) { +func TestAccDataSourceArmStorageAccountSas_permissionsString(t *testing.T) { testCases := []struct { input map[string]interface{} expected string @@ -181,7 +181,7 @@ func TestBuildPermissionsString(t *testing.T) { // so its safe to include here for reference to understand the format. // DefaultEndpointsProtocol=https;AccountName=azurermtestsa0;AccountKey=T0ZQouXBDpWud/PlTRHIJH2+VUK8D+fnedEynb9Mx638IYnsMUe4mv1fFjC7t0NayTfFAQJzPZuV1WHFKOzGdg==;EndpointSuffix=core.windows.net -func TestComputeAzureStorageAccountSas(t *testing.T) { +func TestAccDataSourceArmStorageAccountSas_computeSas(t *testing.T) { testCases := []struct { accountName string accountKey string From 449ccc0e10f2b165ad451d3a074a3cc7d7fe029c Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 19 May 2018 18:47:33 -0700 Subject: [PATCH 149/320] Update CHANGELOG.md to include #1219 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59a3f7f7137d..75483b7c06a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ UPGRADE NOTES: FEATURES: * **New Resource:** `azurerm_relay_namespace` [GH-1233] +* **New Resource:** `azurerm_data_lake_store` [GH-1219] BUG FIXES: From 87e86866a87b743162c40f8481f2d8ade730f93e Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 19 May 2018 20:11:17 -0700 Subject: [PATCH 150/320] Update CHANGELOG.md to include #1011 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75483b7c06a6..b271a518f68d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,9 @@ UPGRADE NOTES: FEATURES: -* **New Resource:** `azurerm_relay_namespace` [GH-1233] * **New Resource:** `azurerm_data_lake_store` [GH-1219] +* **New Resource:** `azurerm_storage_account_sas` [GH-1011] +* **New Resource:** `azurerm_relay_namespace` [GH-1233] BUG FIXES: From 3beac65774eacf044321ddc068d6630d71b32c67 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline Date: Mon, 21 May 2018 14:50:32 -0700 Subject: [PATCH 151/320] Added Test for sku upgrade --- .../resource_arm_container_registry_test.go | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/azurerm/resource_arm_container_registry_test.go b/azurerm/resource_arm_container_registry_test.go index 3cabb4e7d053..5afcd00f119a 100644 --- a/azurerm/resource_arm_container_registry_test.go +++ b/azurerm/resource_arm_container_registry_test.go @@ -144,6 +144,32 @@ func TestAccAzureRMContainerRegistry_basicPremium(t *testing.T) { }) } +func TestAccAzureRMContainerRegistry_basicBasicUpgradePremium(t *testing.T) { + ri := acctest.RandInt() + config := testAccAzureRMContainerRegistry_basicManaged(ri, testLocation(), "Basic") + configUpdated := testAccAzureRMContainerRegistry_basicManaged(ri, testLocation(), "Premium") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMContainerRegistryDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMContainerRegistryExistsValidateSkuValue("azurerm_container_registry.test", "Basic"), + ), + }, + { + Config: configUpdated, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMContainerRegistryExistsValidateSkuValue("azurerm_container_registry.test", "Premium"), + ), + }, + }, + }) +} + func TestAccAzureRMContainerRegistry_complete(t *testing.T) { ri := acctest.RandInt() rs := acctest.RandString(4) @@ -247,6 +273,49 @@ func testCheckAzureRMContainerRegistryExists(name string) resource.TestCheckFunc } } +func testCheckAzureRMContainerRegistryExistsValidateSkuValue(name string, value string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + name := rs.Primary.Attributes["name"] + sku := rs.Primary.Attributes["sku"] + + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + resourceSku, hasResourceSku := rs.Primary.Attributes["sku"] + + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for Container Registry: %s", name) + } + + if !hasResourceSku { + return fmt.Errorf("Bad: no sku found in state for Container Registry: %s", resourceSku) + } + + conn := testAccProvider.Meta().(*ArmClient).containerRegistryClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + resp, err := conn.Get(ctx, resourceGroup, name) + + if err != nil { + return fmt.Errorf("Bad: Get on containerRegistryClient: %+v", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: Container Registry %q (resource group: %q) does not exist", name, resourceGroup) + } + + if sku != value { + return fmt.Errorf("Bad: Container Registry sku '%s' does not match expected sku of '%s'", sku, value) + } + + return nil + } +} + func testAccAzureRMContainerRegistry_basicManaged(rInt int, location string, sku string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From a4ca51d9eeb031b95ae6a98377d8376a9a595942 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 22 May 2018 02:29:16 +0100 Subject: [PATCH 152/320] VMSS: exposing the `licence_type` property (#1245) * Adding support for using existing Windows Licences * r/azurerm_virtual_machine: refactoring * Minor refactoring --- .../resource_arm_virtual_machine_scale_set.go | 171 +++++++++++------- .../r/virtual_machine_scale_set.html.markdown | 13 +- 2 files changed, 114 insertions(+), 70 deletions(-) diff --git a/azurerm/resource_arm_virtual_machine_scale_set.go b/azurerm/resource_arm_virtual_machine_scale_set.go index 00f8a81e44ee..ce52e6ab3ff7 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set.go +++ b/azurerm/resource_arm_virtual_machine_scale_set.go @@ -87,6 +87,17 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { Set: resourceArmVirtualMachineScaleSetSkuHash, }, + "license_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ValidateFunc: validation.StringInSlice([]string{ + "Windows_Client", + "Windows_Server", + }, true), + }, + "upgrade_policy_mode": { Type: schema.TypeString, Required: true, @@ -660,7 +671,7 @@ func resourceArmVirtualMachineScaleSetCreate(d *schema.ResourceData, meta interf scaleSetProps.VirtualMachineProfile.DiagnosticsProfile = &diagnosticProfile } - scaleSetParams := compute.VirtualMachineScaleSet{ + properties := compute.VirtualMachineScaleSet{ Name: &name, Location: &location, Tags: expandTags(tags), @@ -670,7 +681,11 @@ func resourceArmVirtualMachineScaleSetCreate(d *schema.ResourceData, meta interf } if _, ok := d.GetOk("identity"); ok { - scaleSetParams.Identity = expandAzureRmVirtualMachineScaleSetIdentity(d) + properties.Identity = expandAzureRmVirtualMachineScaleSetIdentity(d) + } + + if v, ok := d.GetOk("license_type"); ok { + properties.VirtualMachineProfile.LicenseType = utils.String(v.(string)) } if _, ok := d.GetOk("plan"); ok { @@ -679,10 +694,10 @@ func resourceArmVirtualMachineScaleSetCreate(d *schema.ResourceData, meta interf return err } - scaleSetParams.Plan = plan + properties.Plan = plan } - future, err := client.CreateOrUpdate(ctx, resGroup, name, scaleSetParams) + future, err := client.CreateOrUpdate(ctx, resGroup, name, properties) if err != nil { return err } @@ -734,83 +749,111 @@ func resourceArmVirtualMachineScaleSetRead(d *schema.ResourceData, meta interfac d.Set("zones", resp.Zones) if err := d.Set("sku", flattenAzureRmVirtualMachineScaleSetSku(resp.Sku)); err != nil { - return fmt.Errorf("[DEBUG] Error setting Virtual Machine Scale Set Sku error: %#v", err) + return fmt.Errorf("[DEBUG] Error setting `sku`: %#v", err) } - if err := d.Set("identity", flattenAzureRmVirtualMachineScaleSetIdentity(resp.Identity)); err != nil { - return fmt.Errorf("[DEBUG] Error flattening `identity`: %+v", err) + flattenedIdentity := flattenAzureRmVirtualMachineScaleSetIdentity(resp.Identity) + if err := d.Set("identity", flattenedIdentity); err != nil { + return fmt.Errorf("[DEBUG] Error setting `identity`: %+v", err) } - properties := resp.VirtualMachineScaleSetProperties + if properties := resp.VirtualMachineScaleSetProperties; properties != nil { - d.Set("upgrade_policy_mode", properties.UpgradePolicy.Mode) - d.Set("overprovision", properties.Overprovision) - d.Set("single_placement_group", properties.SinglePlacementGroup) + if upgradePolicy := properties.UpgradePolicy; upgradePolicy != nil { + d.Set("upgrade_policy_mode", upgradePolicy.Mode) + } - osProfile, err := flattenAzureRMVirtualMachineScaleSetOsProfile(d, properties.VirtualMachineProfile.OsProfile) - if err != nil { - return fmt.Errorf("[DEBUG] Error flattening Virtual Machine Scale Set OS Profile. Error: %#v", err) - } + d.Set("overprovision", properties.Overprovision) + d.Set("single_placement_group", properties.SinglePlacementGroup) - if err := d.Set("os_profile", osProfile); err != nil { - return fmt.Errorf("[DEBUG] Error setting Virtual Machine Scale Set OS Profile error: %#v", err) - } + if profile := properties.VirtualMachineProfile; profile != nil { + d.Set("license_type", profile.LicenseType) - if properties.VirtualMachineProfile.OsProfile.Secrets != nil { - if err := d.Set("os_profile_secrets", flattenAzureRmVirtualMachineScaleSetOsProfileSecrets(properties.VirtualMachineProfile.OsProfile.Secrets)); err != nil { - return fmt.Errorf("[DEBUG] Error setting Virtual Machine Scale Set OS Profile Secrets error: %#v", err) - } - } + osProfile := flattenAzureRMVirtualMachineScaleSetOsProfile(d, profile.OsProfile) + if err := d.Set("os_profile", osProfile); err != nil { + return fmt.Errorf("[DEBUG] Error setting `os_profile`: %#v", err) + } - if properties.VirtualMachineProfile.DiagnosticsProfile != nil { - if err := d.Set("boot_diagnostics", flattenAzureRmVirtualMachineScaleSetBootDiagnostics(properties.VirtualMachineProfile.DiagnosticsProfile.BootDiagnostics)); err != nil { - return fmt.Errorf("[DEBUG] Error setting Virutal Machine Scale Set Boot Diagnostics: %#v", err) - } - } + if osProfile := profile.OsProfile; osProfile != nil { + if linuxConfiguration := osProfile.LinuxConfiguration; linuxConfiguration != nil { + flattenedLinuxConfiguration := flattenAzureRmVirtualMachineScaleSetOsProfileLinuxConfig(linuxConfiguration) + if err := d.Set("os_profile_linux_config", flattenedLinuxConfiguration); err != nil { + return fmt.Errorf("[DEBUG] Error setting `os_profile_linux_config`: %#v", err) + } + } - if properties.VirtualMachineProfile.OsProfile.WindowsConfiguration != nil { - if err := d.Set("os_profile_windows_config", flattenAzureRmVirtualMachineScaleSetOsProfileWindowsConfig(properties.VirtualMachineProfile.OsProfile.WindowsConfiguration)); err != nil { - return fmt.Errorf("[DEBUG] Error setting Virtual Machine Scale Set OS Profile Windows config error: %#v", err) - } - } + if secrets := osProfile.Secrets; secrets != nil { + flattenedSecrets := flattenAzureRmVirtualMachineScaleSetOsProfileSecrets(secrets) + if err := d.Set("os_profile_secrets", flattenedSecrets); err != nil { + return fmt.Errorf("[DEBUG] Error setting `os_profile_secrets`: %#v", err) + } - if properties.VirtualMachineProfile.OsProfile.LinuxConfiguration != nil { - if err := d.Set("os_profile_linux_config", flattenAzureRmVirtualMachineScaleSetOsProfileLinuxConfig(properties.VirtualMachineProfile.OsProfile.LinuxConfiguration)); err != nil { - return fmt.Errorf("[DEBUG] Error setting Virtual Machine Scale Set OS Profile Linux config error: %#v", err) - } - } + } - if err := d.Set("network_profile", flattenAzureRmVirtualMachineScaleSetNetworkProfile(properties.VirtualMachineProfile.NetworkProfile)); err != nil { - return fmt.Errorf("[DEBUG] Error setting Virtual Machine Scale Set Network Profile error: %#v", err) - } + if windowsConfiguration := osProfile.WindowsConfiguration; windowsConfiguration != nil { + flattenedWindowsConfiguration := flattenAzureRmVirtualMachineScaleSetOsProfileWindowsConfig(windowsConfiguration) + if err := d.Set("os_profile_windows_config", flattenedWindowsConfiguration); err != nil { + return fmt.Errorf("[DEBUG] Error setting `os_profile_windows_config`: %#v", err) + } + } + } - if properties.VirtualMachineProfile.StorageProfile.ImageReference != nil { - if err := d.Set("storage_profile_image_reference", flattenAzureRmVirtualMachineScaleSetStorageProfileImageReference(properties.VirtualMachineProfile.StorageProfile.ImageReference)); err != nil { - return fmt.Errorf("[DEBUG] Error setting Virtual Machine Scale Set Storage Profile Image Reference error: %#v", err) - } - } + if diagnosticsProfile := profile.DiagnosticsProfile; diagnosticsProfile != nil { + if bootDiagnostics := diagnosticsProfile.BootDiagnostics; bootDiagnostics != nil { + flattenedDiagnostics := flattenAzureRmVirtualMachineScaleSetBootDiagnostics(bootDiagnostics) + // TODO: rename this field to `diagnostics_profile` + if err := d.Set("boot_diagnostics", flattenedDiagnostics); err != nil { + return fmt.Errorf("[DEBUG] Error setting `boot_diagnostics`: %#v", err) + } + } + } - if err := d.Set("storage_profile_os_disk", flattenAzureRmVirtualMachineScaleSetStorageProfileOSDisk(properties.VirtualMachineProfile.StorageProfile.OsDisk)); err != nil { - return fmt.Errorf("[DEBUG] Error setting Virtual Machine Scale Set Storage Profile OS Disk error: %#v", err) - } + if networkProfile := profile.NetworkProfile; networkProfile != nil { + flattenedNetworkProfile := flattenAzureRmVirtualMachineScaleSetNetworkProfile(networkProfile) + if err := d.Set("network_profile", flattenedNetworkProfile); err != nil { + return fmt.Errorf("[DEBUG] Error setting `network_profile`: %#v", err) + } + } - if resp.VirtualMachineProfile.StorageProfile.DataDisks != nil { - if err := d.Set("storage_profile_data_disk", flattenAzureRmVirtualMachineScaleSetStorageProfileDataDisk(properties.VirtualMachineProfile.StorageProfile.DataDisks)); err != nil { - return fmt.Errorf("[DEBUG] Error setting Virtual Machine Scale Set Storage Profile Data Disk error: %#v", err) - } - } + if storageProfile := profile.StorageProfile; storageProfile != nil { + if dataDisks := resp.VirtualMachineProfile.StorageProfile.DataDisks; dataDisks != nil { + flattenedDataDisks := flattenAzureRmVirtualMachineScaleSetStorageProfileDataDisk(dataDisks) + if err := d.Set("storage_profile_data_disk", flattenedDataDisks); err != nil { + return fmt.Errorf("[DEBUG] Error setting `storage_profile_data_disk`: %#v", err) + } + } - if properties.VirtualMachineProfile.ExtensionProfile != nil { - extension, err := flattenAzureRmVirtualMachineScaleSetExtensionProfile(properties.VirtualMachineProfile.ExtensionProfile) - if err != nil { - return fmt.Errorf("[DEBUG] Error setting Virtual Machine Scale Set Extension Profile error: %#v", err) + if imageRef := storageProfile.ImageReference; imageRef != nil { + flattenedImageRef := flattenAzureRmVirtualMachineScaleSetStorageProfileImageReference(imageRef) + if err := d.Set("storage_profile_image_reference", flattenedImageRef); err != nil { + return fmt.Errorf("[DEBUG] Error setting `storage_profile_image_reference`: %#v", err) + } + } + + if osDisk := storageProfile.OsDisk; osDisk != nil { + flattenedOSDisk := flattenAzureRmVirtualMachineScaleSetStorageProfileOSDisk(osDisk) + if err := d.Set("storage_profile_os_disk", flattenedOSDisk); err != nil { + return fmt.Errorf("[DEBUG] Error setting `storage_profile_os_disk`: %#v", err) + } + } + } + + if extensionProfile := properties.VirtualMachineProfile.ExtensionProfile; extensionProfile != nil { + extension, err := flattenAzureRmVirtualMachineScaleSetExtensionProfile(extensionProfile) + if err != nil { + return fmt.Errorf("[DEBUG] Error setting Virtual Machine Scale Set Extension Profile error: %#v", err) + } + if err := d.Set("extension", extension); err != nil { + return fmt.Errorf("[DEBUG] Error setting `extension`: %#v", err) + } + } } - d.Set("extension", extension) } - if resp.Plan != nil { - if err := d.Set("plan", flattenAzureRmVirtualMachineScaleSetPlan(resp.Plan)); err != nil { - return fmt.Errorf("[DEBUG] Error setting Virtual Machine Scale Set Plan. Error: %#v", err) + if plan := resp.Plan; plan != nil { + flattenedPlan := flattenAzureRmVirtualMachineScaleSetPlan(plan) + if err := d.Set("plan", flattenedPlan); err != nil { + return fmt.Errorf("[DEBUG] Error setting `plan`: %#v", err) } } @@ -1044,7 +1087,7 @@ func flattenAzureRmVirtualMachineScaleSetNetworkProfile(profile *compute.Virtual return result } -func flattenAzureRMVirtualMachineScaleSetOsProfile(d *schema.ResourceData, profile *compute.VirtualMachineScaleSetOSProfile) ([]interface{}, error) { +func flattenAzureRMVirtualMachineScaleSetOsProfile(d *schema.ResourceData, profile *compute.VirtualMachineScaleSetOSProfile) []interface{} { result := make(map[string]interface{}) result["computer_name_prefix"] = *profile.ComputerNamePrefix @@ -1067,7 +1110,7 @@ func flattenAzureRMVirtualMachineScaleSetOsProfile(d *schema.ResourceData, profi result["custom_data"] = value } - return []interface{}{result}, nil + return []interface{}{result} } func flattenAzureRmVirtualMachineScaleSetStorageProfileOSDisk(profile *compute.VirtualMachineScaleSetOSDisk) []interface{} { diff --git a/website/docs/r/virtual_machine_scale_set.html.markdown b/website/docs/r/virtual_machine_scale_set.html.markdown index a2d86c76afaf..da6b826350a4 100644 --- a/website/docs/r/virtual_machine_scale_set.html.markdown +++ b/website/docs/r/virtual_machine_scale_set.html.markdown @@ -248,6 +248,7 @@ The following arguments are supported: * `overprovision` - (Optional) Specifies whether the virtual machine scale set should be overprovisioned. * `single_placement_group` - (Optional) Specifies whether the scale set is limited to a single placement group with a maximum size of 100 virtual machines. If set to false, managed disks must be used. Default is true. Changing this forces a new resource to be created. See [documentation](http://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups) for more information. +* `license_type` - (Optional, when a Windows machine) Specifies the Windows OS license type. If supplied, the only allowed values are `Windows_Client` and `Windows_Server`. * `os_profile` - (Required) A Virtual Machine OS Profile block as documented below. * `os_profile_secrets` - (Optional) A collection of Secret blocks as documented below. * `os_profile_windows_config` - (Required, when a windows machine) A Windows config block as documented below. @@ -287,15 +288,15 @@ resource "azurerm_virtual_machine_scale_set" "test" { } identity { - type = "systemAssigned" + type = "systemAssigned" } extension { - name = "MSILinuxExtension" - publisher = "Microsoft.ManagedIdentity" - type = "ManagedIdentityExtensionForLinux" - type_handler_version = "1.0" - settings = "{\"port\": 50342}" + name = "MSILinuxExtension" + publisher = "Microsoft.ManagedIdentity" + type = "ManagedIdentityExtensionForLinux" + type_handler_version = "1.0" + settings = "{\"port\": 50342}" } output "principal_id" { From f8bd20a9e6a7a2e5e6d0127230f712a6f5ec6eb8 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 22 May 2018 02:29:44 +0100 Subject: [PATCH 153/320] Updating to include #1245 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b271a518f68d..297dc2e41230 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ IMPROVEMENTS: * `azurerm_dns_zone` - datasource's `resource_group` field is now optional [GH-1180] * `azurerm_public_ip` - computed values now default to an empy string [GH-1247] * `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` [GH-1235] - +* `azurerm_virtual_machine_scale_set` - adding the `licence_type` property [GH-1245] ## 1.5.0 (May 14, 2018) From a4e3fe5c656d7d10a9075a4e11050a6197da83c9 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 22 May 2018 02:30:47 +0100 Subject: [PATCH 154/320] Resource -> Data Source --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 297dc2e41230..efe28941e3e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,8 @@ UPGRADE NOTES: FEATURES: +* **New Data Source:** `azurerm_storage_account_sas` [GH-1011] * **New Resource:** `azurerm_data_lake_store` [GH-1219] -* **New Resource:** `azurerm_storage_account_sas` [GH-1011] * **New Resource:** `azurerm_relay_namespace` [GH-1233] BUG FIXES: From be381aaa9fde90788389c935715eaab3f984a449 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline Date: Mon, 21 May 2018 19:06:19 -0700 Subject: [PATCH 155/320] Updated documentation and test attribute from state file instead of API --- .../resource_arm_container_registry_test.go | 50 ++----------------- .../docs/r/container_registry.html.markdown | 2 +- 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/azurerm/resource_arm_container_registry_test.go b/azurerm/resource_arm_container_registry_test.go index 5afcd00f119a..76712201e1eb 100644 --- a/azurerm/resource_arm_container_registry_test.go +++ b/azurerm/resource_arm_container_registry_test.go @@ -145,6 +145,7 @@ func TestAccAzureRMContainerRegistry_basicPremium(t *testing.T) { } func TestAccAzureRMContainerRegistry_basicBasicUpgradePremium(t *testing.T) { + resourceName := "azurerm_container_registry.test" ri := acctest.RandInt() config := testAccAzureRMContainerRegistry_basicManaged(ri, testLocation(), "Basic") configUpdated := testAccAzureRMContainerRegistry_basicManaged(ri, testLocation(), "Premium") @@ -157,13 +158,15 @@ func TestAccAzureRMContainerRegistry_basicBasicUpgradePremium(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMContainerRegistryExistsValidateSkuValue("azurerm_container_registry.test", "Basic"), + testCheckAzureRMContainerRegistryExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "Basic"), ), }, { Config: configUpdated, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMContainerRegistryExistsValidateSkuValue("azurerm_container_registry.test", "Premium"), + testCheckAzureRMContainerRegistryExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "Premium"), ), }, }, @@ -273,49 +276,6 @@ func testCheckAzureRMContainerRegistryExists(name string) resource.TestCheckFunc } } -func testCheckAzureRMContainerRegistryExistsValidateSkuValue(name string, value string) resource.TestCheckFunc { - return func(s *terraform.State) error { - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[name] - if !ok { - return fmt.Errorf("Not found: %s", name) - } - - name := rs.Primary.Attributes["name"] - sku := rs.Primary.Attributes["sku"] - - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - resourceSku, hasResourceSku := rs.Primary.Attributes["sku"] - - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for Container Registry: %s", name) - } - - if !hasResourceSku { - return fmt.Errorf("Bad: no sku found in state for Container Registry: %s", resourceSku) - } - - conn := testAccProvider.Meta().(*ArmClient).containerRegistryClient - ctx := testAccProvider.Meta().(*ArmClient).StopContext - - resp, err := conn.Get(ctx, resourceGroup, name) - - if err != nil { - return fmt.Errorf("Bad: Get on containerRegistryClient: %+v", err) - } - - if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: Container Registry %q (resource group: %q) does not exist", name, resourceGroup) - } - - if sku != value { - return fmt.Errorf("Bad: Container Registry sku '%s' does not match expected sku of '%s'", sku, value) - } - - return nil - } -} - func testAccAzureRMContainerRegistry_basicManaged(rInt int, location string, sku string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/website/docs/r/container_registry.html.markdown b/website/docs/r/container_registry.html.markdown index 950dc5f53410..652d4e4183aa 100644 --- a/website/docs/r/container_registry.html.markdown +++ b/website/docs/r/container_registry.html.markdown @@ -55,7 +55,7 @@ The following arguments are supported: * `storage_account_id` - (Required for `Classic` Sku - Optional otherwise) The ID of a Storage Account which must be located in the same Azure Region as the Container Registry. -* `sku` - (Optional) The SKU name of the the container registry. Possible values are `Classic` (which was previously `Basic`), `Basic`, `Standard` and `Premium`. +* `sku` - (Optional) The SKU name of the the container registry. Possible values are `Classic` (which was previously `Basic`), `Basic`, `Standard` and `Premium`. Once provisioned changing the SKU will not force a new resource. * `tags` - (Optional) A mapping of tags to assign to the resource. From 5b7d8ce3f294bbeef27f19d7ef5afc2df079d130 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 21 May 2018 21:22:45 -0700 Subject: [PATCH 156/320] Update CHANGELOG.md to include #1264 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index efe28941e3e2..a17cb73d9319 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ BUG FIXES: IMPROVEMENTS: * `azurerm_app_service` - adding support for `ip_restriction`'s [GH-1231] +* `azurerm_container_registry` - no longer forces a new resource on SKU change [GH-1264] * `azurerm_dns_zone` - datasource's `resource_group` field is now optional [GH-1180] * `azurerm_public_ip` - computed values now default to an empy string [GH-1247] * `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` [GH-1235] From 7f485f03ccd06bcec02f6153e664c7212cf11e6c Mon Sep 17 00:00:00 2001 From: Jeffrey Cline Date: Tue, 22 May 2018 09:03:54 -0700 Subject: [PATCH 157/320] Update MySQL to GA 2017-12-01 API (#1154) * Update MySQL and PostgreSQL to support new pricing tier #1004 * Updated import tests to use new test name * Updated schema and tests * Update MySQL test to ignore create_mode * Revert changes from PostGreSQL changes due to bug in SDK * Reverted PostGre to Preview API and updated MySQL docs. * Addressing PR comments * Fix validator test * Fix validation test again * Fixed unit test for validator * Fix validation test * Fix test * Fix Unit test * Updated expected error count * Display error msg in test output * Fix test inputs * Fix test * Added test for Memory Optimized tier * Corrected formatting of test * Addresses the remaining issue in PR * Updated pointer refs * removed reference to GA postgreSQL API and preview MySQL API * Removing preview vendor files for MySql and GA files for PostgreSQL. * Upgrade Go SDK to v16.2.1 to match Master branch * Removed CreateMode from schema, updated tests and documentation to match * Missed the createmode in hcl example. DOH! * Removed createmode from import test and more documentation hcl * Updating the indentation to match other resources Minor fixes to make the spacing consistent for sub-resources --- azurerm/config.go | 2 +- azurerm/import_arm_mysql_server_test.go | 30 ++- azurerm/resource_arm_mysql_configuration.go | 2 +- .../resource_arm_mysql_configuration_test.go | 12 +- azurerm/resource_arm_mysql_database.go | 2 +- azurerm/resource_arm_mysql_database_test.go | 12 +- azurerm/resource_arm_mysql_firewall_rule.go | 2 +- .../resource_arm_mysql_firewall_rule_test.go | 14 +- azurerm/resource_arm_mysql_server.go | 194 ++++++++++----- azurerm/resource_arm_mysql_server_test.go | 97 +++++++- azurerm/validators.go | 25 ++ azurerm/validators_test.go | 54 +++++ .../mysql/performancetiers.go | 103 -------- .../mysql/checknameavailability.go | 9 +- .../mysql/client.go | 4 +- .../mysql/configurations.go | 35 +-- .../mysql/databases.go | 46 ++-- .../mysql/firewallrules.go | 46 ++-- .../mysql/locationbasedperformancetier.go | 8 +- .../mysql/logfiles.go | 12 +- .../mysql/models.go | 228 +++++++++++++----- .../mysql/operations.go | 5 +- .../mysql/servers.go | 85 +++---- .../mysql/version.go | 2 +- vendor/vendor.json | 4 +- .../docs/r/mysql_configuration.html.markdown | 12 +- website/docs/r/mysql_database.html.markdown | 12 +- website/docs/r/mysql_server.html.markdown | 58 ++--- 28 files changed, 713 insertions(+), 402 deletions(-) delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/performancetiers.go rename vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/{2017-04-30-preview => 2017-12-01}/mysql/checknameavailability.go (95%) rename vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/{2017-04-30-preview => 2017-12-01}/mysql/client.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/{2017-04-30-preview => 2017-12-01}/mysql/configurations.go (90%) rename vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/{2017-04-30-preview => 2017-12-01}/mysql/databases.go (90%) rename vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/{2017-04-30-preview => 2017-12-01}/mysql/firewallrules.go (91%) rename vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/{2017-04-30-preview => 2017-12-01}/mysql/locationbasedperformancetier.go (96%) rename vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/{2017-04-30-preview => 2017-12-01}/mysql/logfiles.go (92%) rename vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/{2017-04-30-preview => 2017-12-01}/mysql/models.go (85%) rename vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/{2017-04-30-preview => 2017-12-01}/mysql/operations.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/{2017-04-30-preview => 2017-12-01}/mysql/servers.go (85%) rename vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/{2017-04-30-preview => 2017-12-01}/mysql/version.go (93%) diff --git a/azurerm/config.go b/azurerm/config.go index d8cde1339365..9ec4a728eae9 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -28,7 +28,7 @@ import ( keyVault "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault" "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights" - "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql" + "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" "github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights" "github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement" diff --git a/azurerm/import_arm_mysql_server_test.go b/azurerm/import_arm_mysql_server_test.go index 4e4decfc64d3..c3d0ce6115c6 100644 --- a/azurerm/import_arm_mysql_server_test.go +++ b/azurerm/import_arm_mysql_server_test.go @@ -59,11 +59,37 @@ func TestAccAzureRMMySQLServer_importBasicFiveSeven(t *testing.T) { }) } -func TestAccAzureRMMySQLServer_importStandard(t *testing.T) { +func TestAccAzureRMMySQLServer_importGeneralPurpose(t *testing.T) { resourceName := "azurerm_mysql_server.test" ri := acctest.RandInt() - config := testAccAzureRMMySQLServer_standard(ri, testLocation()) + config := testAccAzureRMMySQLServer_generalPurpose(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMySQLServerDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "administrator_login_password", // not returned as sensitive + }, + }, + }, + }) +} + +func TestAccAzureRMMySqlServer_importMemoryOptimized(t *testing.T) { + resourceName := "azurerm_mysql_server.test" + + ri := acctest.RandInt() + config := testAccAzureRMMySQLServer_memoryOptimized(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/azurerm/resource_arm_mysql_configuration.go b/azurerm/resource_arm_mysql_configuration.go index 280d1efb587c..8a2dd1aa67cf 100644 --- a/azurerm/resource_arm_mysql_configuration.go +++ b/azurerm/resource_arm_mysql_configuration.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql" + "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) diff --git a/azurerm/resource_arm_mysql_configuration_test.go b/azurerm/resource_arm_mysql_configuration_test.go index cda838baca9c..7bc0d9ecbde6 100644 --- a/azurerm/resource_arm_mysql_configuration_test.go +++ b/azurerm/resource_arm_mysql_configuration_test.go @@ -223,15 +223,21 @@ resource "azurerm_mysql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "MYSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "5.7" - storage_mb = 51200 ssl_enforcement = "Enabled" } `, rInt, location, rInt) diff --git a/azurerm/resource_arm_mysql_database.go b/azurerm/resource_arm_mysql_database.go index cf11d980ad29..ccf10687bc62 100644 --- a/azurerm/resource_arm_mysql_database.go +++ b/azurerm/resource_arm_mysql_database.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql" + "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) diff --git a/azurerm/resource_arm_mysql_database_test.go b/azurerm/resource_arm_mysql_database_test.go index 7cafc19543d8..80562563c12b 100644 --- a/azurerm/resource_arm_mysql_database_test.go +++ b/azurerm/resource_arm_mysql_database_test.go @@ -99,15 +99,21 @@ resource "azurerm_mysql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "MYSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "5.6" - storage_mb = 51200 ssl_enforcement = "Enabled" } diff --git a/azurerm/resource_arm_mysql_firewall_rule.go b/azurerm/resource_arm_mysql_firewall_rule.go index 521bf8223c39..4d37864866b2 100644 --- a/azurerm/resource_arm_mysql_firewall_rule.go +++ b/azurerm/resource_arm_mysql_firewall_rule.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql" + "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) diff --git a/azurerm/resource_arm_mysql_firewall_rule_test.go b/azurerm/resource_arm_mysql_firewall_rule_test.go index 65e94d2a220c..b0e2a7efaaef 100644 --- a/azurerm/resource_arm_mysql_firewall_rule_test.go +++ b/azurerm/resource_arm_mysql_firewall_rule_test.go @@ -100,15 +100,21 @@ resource "azurerm_mysql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "MYSQLB50" - capacity = 50 - tier = "Basic" + name = "B_Gen4_2" + capacity = 2 + tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "5.6" - storage_mb = 51200 ssl_enforcement = "Enabled" } diff --git a/azurerm/resource_arm_mysql_server.go b/azurerm/resource_arm_mysql_server.go index e733722cb5ae..b632382f4fe8 100644 --- a/azurerm/resource_arm_mysql_server.go +++ b/azurerm/resource_arm_mysql_server.go @@ -3,9 +3,8 @@ package azurerm import ( "fmt" "log" - "strconv" - "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql" + "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -42,12 +41,24 @@ func resourceArmMySqlServer() *schema.Resource { Type: schema.TypeString, Required: true, ValidateFunc: validation.StringInSlice([]string{ - "MYSQLB50", - "MYSQLB100", - "MYSQLS100", - "MYSQLS200", - "MYSQLS400", - "MYSQLS800", + "B_Gen4_1", + "B_Gen4_2", + "B_Gen5_1", + "B_Gen5_2", + "GP_Gen4_2", + "GP_Gen4_4", + "GP_Gen4_8", + "GP_Gen4_16", + "GP_Gen4_32", + "GP_Gen5_2", + "GP_Gen5_4", + "GP_Gen5_8", + "GP_Gen5_16", + "GP_Gen5_32", + "MO_Gen5_2", + "MO_Gen5_4", + "MO_Gen5_8", + "MO_Gen5_16", }, true), DiffSuppressFunc: ignoreCaseDiffSuppressFunc, }, @@ -56,11 +67,11 @@ func resourceArmMySqlServer() *schema.Resource { Type: schema.TypeInt, Required: true, ValidateFunc: validateIntInSlice([]int{ - 50, - 100, - 200, - 400, - 800, + 2, + 4, + 8, + 16, + 32, }), }, @@ -69,7 +80,18 @@ func resourceArmMySqlServer() *schema.Resource { Required: true, ValidateFunc: validation.StringInSlice([]string{ string(mysql.Basic), - string(mysql.Standard), + string(mysql.GeneralPurpose), + string(mysql.MemoryOptimized), + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + + "family": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "Gen4", + "Gen5", }, true), DiffSuppressFunc: ignoreCaseDiffSuppressFunc, }, @@ -100,31 +122,34 @@ func resourceArmMySqlServer() *schema.Resource { ForceNew: true, }, - "storage_mb": { - Type: schema.TypeInt, + "storage_profile": { + Type: schema.TypeList, Required: true, - ForceNew: true, - ValidateFunc: validateIntInSlice([]int{ - // Basic SKU - 51200, - 179200, - 307200, - 435200, - 563200, - 691200, - 819200, - 947200, - - // Standard SKU - 128000, - 256000, - 384000, - 512000, - 640000, - 768000, - 896000, - 1024000, - }), + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "storage_mb": { + Type: schema.TypeInt, + Required: true, + ForceNew: true, + ValidateFunc: validateIntBetweenDivisibleBy(5120, 1048576, 1024), + }, + "backup_retention_days": { + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntBetween(7, 35), + }, + "geo_redundant_backup": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + "Enabled", + "Disabled", + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + }, + }, }, "ssl_enforcement": { @@ -161,26 +186,27 @@ func resourceArmMySqlServerCreate(d *schema.ResourceData, meta interface{}) erro adminLoginPassword := d.Get("administrator_login_password").(string) sslEnforcement := d.Get("ssl_enforcement").(string) version := d.Get("version").(string) - storageMB := d.Get("storage_mb").(int) - + createMode := "Default" tags := d.Get("tags").(map[string]interface{}) - sku := expandMySQLServerSku(d, storageMB) + sku := expandMySQLServerSku(d) + storageprofile := expandMySQLStorageProfile(d) properties := mysql.ServerForCreate{ Location: &location, - Sku: sku, Properties: &mysql.ServerPropertiesForDefaultCreate{ - Version: mysql.ServerVersion(version), - StorageMB: utils.Int64(int64(storageMB)), - SslEnforcement: mysql.SslEnforcementEnum(sslEnforcement), AdministratorLogin: utils.String(adminLogin), AdministratorLoginPassword: utils.String(adminLoginPassword), + Version: mysql.ServerVersion(version), + SslEnforcement: mysql.SslEnforcementEnum(sslEnforcement), + StorageProfile: storageprofile, + CreateMode: mysql.CreateMode(createMode), }, + Sku: sku, Tags: expandTags(tags), } - future, err := client.CreateOrUpdate(ctx, resourceGroup, name, properties) + future, err := client.Create(ctx, resourceGroup, name, properties) if err != nil { return err } @@ -215,19 +241,18 @@ func resourceArmMySqlServerUpdate(d *schema.ResourceData, meta interface{}) erro adminLoginPassword := d.Get("administrator_login_password").(string) sslEnforcement := d.Get("ssl_enforcement").(string) version := d.Get("version").(string) - storageMB := d.Get("storage_mb").(int) - sku := expandMySQLServerSku(d, storageMB) - + sku := expandMySQLServerSku(d) + storageprofile := expandMySQLStorageProfile(d) tags := d.Get("tags").(map[string]interface{}) properties := mysql.ServerUpdateParameters{ - Sku: sku, ServerUpdateParametersProperties: &mysql.ServerUpdateParametersProperties{ - SslEnforcement: mysql.SslEnforcementEnum(sslEnforcement), - StorageMB: utils.Int64(int64(storageMB)), - Version: mysql.ServerVersion(version), + StorageProfile: storageprofile, AdministratorLoginPassword: utils.String(adminLoginPassword), + Version: mysql.ServerVersion(version), + SslEnforcement: mysql.SslEnforcementEnum(sslEnforcement), }, + Sku: sku, Tags: expandTags(tags), } @@ -276,17 +301,21 @@ func resourceArmMySqlServerRead(d *schema.ResourceData, meta interface{}) error d.Set("name", resp.Name) d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { d.Set("location", azureRMNormalizeLocation(*location)) } d.Set("administrator_login", resp.AdministratorLogin) d.Set("version", string(resp.Version)) - d.Set("storage_mb", int(*resp.StorageMB)) d.Set("ssl_enforcement", string(resp.SslEnforcement)) if err := d.Set("sku", flattenMySQLServerSku(d, resp.Sku)); err != nil { - return err + return fmt.Errorf("Error flattening `sku`: %+v", err) + } + + if err := d.Set("storage_profile", flattenMySQLStorageProfile(d, resp.StorageProfile)); err != nil { + return fmt.Errorf("Error flattening `storage_profile`: %+v", err) } flattenAndSetTags(d, resp.Tags) @@ -321,29 +350,70 @@ func resourceArmMySqlServerDelete(d *schema.ResourceData, meta interface{}) erro return nil } -func expandMySQLServerSku(d *schema.ResourceData, storageMB int) *mysql.Sku { +func expandMySQLServerSku(d *schema.ResourceData) *mysql.Sku { skus := d.Get("sku").(*schema.Set).List() sku := skus[0].(map[string]interface{}) name := sku["name"].(string) capacity := sku["capacity"].(int) tier := sku["tier"].(string) + family := sku["family"].(string) return &mysql.Sku{ Name: utils.String(name), - Capacity: utils.Int32(int32(capacity)), Tier: mysql.SkuTier(tier), - Size: utils.String(strconv.Itoa(storageMB)), + Capacity: utils.Int32(int32(capacity)), + Family: utils.String(family), + } +} + +func expandMySQLStorageProfile(d *schema.ResourceData) *mysql.StorageProfile { + storageprofiles := d.Get("storage_profile").([]interface{}) + storageprofile := storageprofiles[0].(map[string]interface{}) + + backupRetentionDays := storageprofile["backup_retention_days"].(int) + geoRedundantBackup := storageprofile["geo_redundant_backup"].(string) + storageMB := storageprofile["storage_mb"].(int) + + return &mysql.StorageProfile{ + BackupRetentionDays: utils.Int32(int32(backupRetentionDays)), + GeoRedundantBackup: mysql.GeoRedundantBackup(geoRedundantBackup), + StorageMB: utils.Int32(int32(storageMB)), } } func flattenMySQLServerSku(d *schema.ResourceData, resp *mysql.Sku) []interface{} { values := map[string]interface{}{} - values["name"] = *resp.Name - values["capacity"] = int(*resp.Capacity) + if name := resp.Name; name != nil { + values["name"] = *name + } + + if capacity := resp.Capacity; capacity != nil { + values["capacity"] = *capacity + } + values["tier"] = string(resp.Tier) - sku := []interface{}{values} - return sku + if family := resp.Family; family != nil { + values["family"] = *family + } + + return []interface{}{values} +} + +func flattenMySQLStorageProfile(d *schema.ResourceData, resp *mysql.StorageProfile) []interface{} { + values := map[string]interface{}{} + + if storageMB := resp.StorageMB; storageMB != nil { + values["storage_mb"] = *storageMB + } + + if backupRetentionDays := resp.BackupRetentionDays; backupRetentionDays != nil { + values["backup_retention_days"] = *backupRetentionDays + } + + values["geo_redundant_backup"] = mysql.GeoRedundantBackup(resp.GeoRedundantBackup) + + return []interface{}{values} } diff --git a/azurerm/resource_arm_mysql_server_test.go b/azurerm/resource_arm_mysql_server_test.go index 830c85d09d93..82df525d9d5d 100644 --- a/azurerm/resource_arm_mysql_server_test.go +++ b/azurerm/resource_arm_mysql_server_test.go @@ -50,10 +50,30 @@ func TestAccAzureRMMySQLServer_basicFiveSeven(t *testing.T) { }) } -func TestAccAzureRMMySqlServer_standard(t *testing.T) { +func TestAccAzureRMMySqlServer_generalPurpose(t *testing.T) { resourceName := "azurerm_mysql_server.test" ri := acctest.RandInt() - config := testAccAzureRMMySQLServer_standard(ri, testLocation()) + config := testAccAzureRMMySQLServer_generalPurpose(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMySQLServerDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMySQLServerExists(resourceName), + ), + }, + }, + }) +} + +func TestAccAzureRMMySqlServer_memoryOptimized(t *testing.T) { + resourceName := "azurerm_mysql_server.test" + ri := acctest.RandInt() + config := testAccAzureRMMySQLServer_memoryOptimized(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -138,15 +158,21 @@ resource "azurerm_mysql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "MYSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "5.6" - storage_mb = 51200 ssl_enforcement = "Enabled" } `, rInt, location, rInt) @@ -165,21 +191,60 @@ resource "azurerm_mysql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "MYSQLB50" - capacity = 50 + name = "B_Gen5_2" + capacity = 2 tier = "Basic" + family = "Gen5" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "5.7" + ssl_enforcement = "Enabled" +} +`, rInt, location, rInt) +} + +func testAccAzureRMMySQLServer_generalPurpose(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_mysql_server" "test" { + name = "acctestmysqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "GP_Gen5_32" + capacity = 32 + tier = "GeneralPurpose" + family = "Gen5" + } + + storage_profile { + storage_mb = 640000 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "5.7" - storage_mb = 51200 ssl_enforcement = "Enabled" } `, rInt, location, rInt) } -func testAccAzureRMMySQLServer_standard(rInt int, location string) string { +func testAccAzureRMMySQLServer_memoryOptimized(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -192,15 +257,21 @@ resource "azurerm_mysql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "MYSQLS200" - capacity = 200 - tier = "Standard" + name = "MO_Gen5_16" + capacity = 16 + tier = "MemoryOptimized" + family = "Gen5" + } + + storage_profile { + storage_mb = 1048576, + backup_retention_days = 7 + geo_redundant_backup = "Enabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "5.7" - storage_mb = 640000 ssl_enforcement = "Enabled" } `, rInt, location, rInt) diff --git a/azurerm/validators.go b/azurerm/validators.go index 94df9dfa3519..5b567160f0c9 100644 --- a/azurerm/validators.go +++ b/azurerm/validators.go @@ -2,6 +2,7 @@ package azurerm import ( "fmt" + "math" "regexp" "time" @@ -74,3 +75,27 @@ func validateIso8601Duration() schema.SchemaValidateFunc { return } } + +// intBetweenDivisibleBy returns a SchemaValidateFunc which tests if the provided value +// is of type int and is between min and max (inclusive) and is divisible by a given number +func validateIntBetweenDivisibleBy(min, max, divisor int) schema.SchemaValidateFunc { + return func(i interface{}, k string) (s []string, es []error) { + v, ok := i.(int) + if !ok { + es = append(es, fmt.Errorf("expected type of %s to be int", k)) + return + } + + if v < min || v > max { + es = append(es, fmt.Errorf("expected %s to be in the range (%d - %d), got %d", k, min, max, v)) + return + } + + if math.Mod(float64(v), float64(divisor)) != 0 { + es = append(es, fmt.Errorf("expected %s to be divisible by %d", k, divisor)) + return + } + + return + } +} diff --git a/azurerm/validators_test.go b/azurerm/validators_test.go index 31adecdf6e6d..a6b379ee3160 100644 --- a/azurerm/validators_test.go +++ b/azurerm/validators_test.go @@ -1,6 +1,7 @@ package azurerm import ( + "strconv" "testing" ) @@ -128,3 +129,56 @@ func TestValidateIso8601Duration(t *testing.T) { } } } + +func TestValidateIntBetweenDivisibleBy(t *testing.T) { + cases := []struct { + Min int + Max int + Div int + Value interface{} + Errors int + }{ + { + Min: 1025, + Max: 2048, + Div: 1024, + Value: 1024, + Errors: 1, + }, + { + Min: 1025, + Max: 2048, + Div: 3, + Value: 1024, + Errors: 1, + }, + { + Min: 1024, + Max: 2048, + Div: 1024, + Value: 3072, + Errors: 1, + }, + { + Min: 1024, + Max: 2048, + Div: 1024, + Value: 2049, + Errors: 1, + }, + { + Min: 1024, + Max: 2048, + Div: 1024, + Value: 1024, + Errors: 0, + }, + } + + for _, tc := range cases { + _, errors := validateIntBetweenDivisibleBy(tc.Min, tc.Max, tc.Div)(tc.Value, strconv.Itoa(tc.Value.(int))) + if len(errors) != tc.Errors { + t.Fatalf("Expected intBetweenDivisibleBy to trigger '%d' errors for '%s' - got '%d' ['%s']", tc.Errors, tc.Value, len(errors), errors[0]) + } + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/performancetiers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/performancetiers.go deleted file mode 100644 index c7db15a3fee5..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/performancetiers.go +++ /dev/null @@ -1,103 +0,0 @@ -package mysql - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "context" - "github.com/Azure/go-autorest/autorest" - "github.com/Azure/go-autorest/autorest/azure" - "net/http" -) - -// PerformanceTiersClient is the the Microsoft Azure management API provides create, read, update, and delete -// functionality for Azure MySQL resources including servers, databases, firewall rules, log files and configurations. -type PerformanceTiersClient struct { - BaseClient -} - -// NewPerformanceTiersClient creates an instance of the PerformanceTiersClient client. -func NewPerformanceTiersClient(subscriptionID string) PerformanceTiersClient { - return NewPerformanceTiersClientWithBaseURI(DefaultBaseURI, subscriptionID) -} - -// NewPerformanceTiersClientWithBaseURI creates an instance of the PerformanceTiersClient client. -func NewPerformanceTiersClientWithBaseURI(baseURI string, subscriptionID string) PerformanceTiersClient { - return PerformanceTiersClient{NewWithBaseURI(baseURI, subscriptionID)} -} - -// List list all the performance tiers in a given subscription. -func (client PerformanceTiersClient) List(ctx context.Context) (result PerformanceTierListResult, err error) { - req, err := client.ListPreparer(ctx) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.PerformanceTiersClient", "List", nil, "Failure preparing request") - return - } - - resp, err := client.ListSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "mysql.PerformanceTiersClient", "List", resp, "Failure sending request") - return - } - - result, err = client.ListResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.PerformanceTiersClient", "List", resp, "Failure responding to request") - } - - return -} - -// ListPreparer prepares the List request. -func (client PerformanceTiersClient) ListPreparer(ctx context.Context) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2017-04-30-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.DBforMySQL/performanceTiers", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListSender sends the List request. The method will close the -// http.Response Body if it receives an error. -func (client PerformanceTiersClient) ListSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// ListResponder handles the response to the List request. The method always -// closes the http.Response Body. -func (client PerformanceTiersClient) ListResponder(resp *http.Response) (result PerformanceTierListResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/checknameavailability.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/checknameavailability.go similarity index 95% rename from vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/checknameavailability.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/checknameavailability.go index 022a9d003c1b..5260dd2a4418 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/checknameavailability.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/checknameavailability.go @@ -26,7 +26,8 @@ import ( ) // CheckNameAvailabilityClient is the the Microsoft Azure management API provides create, read, update, and delete -// functionality for Azure MySQL resources including servers, databases, firewall rules, log files and configurations. +// functionality for Azure MySQL resources including servers, databases, firewall rules, log files and configurations +// with new business model. type CheckNameAvailabilityClient struct { BaseClient } @@ -42,8 +43,8 @@ func NewCheckNameAvailabilityClientWithBaseURI(baseURI string, subscriptionID st } // Execute check the availability of name for resource -// -// nameAvailabilityRequest is the required parameters for checking if resource name is available. +// Parameters: +// nameAvailabilityRequest - the required parameters for checking if resource name is available. func (client CheckNameAvailabilityClient) Execute(ctx context.Context, nameAvailabilityRequest NameAvailabilityRequest) (result NameAvailability, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: nameAvailabilityRequest, @@ -78,7 +79,7 @@ func (client CheckNameAvailabilityClient) ExecutePreparer(ctx context.Context, n "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/client.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/client.go index 8fb41d952da2..296701a8b2af 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/client.go @@ -1,7 +1,7 @@ -// Package mysql implements the Azure ARM Mysql service API version 2017-04-30-preview. +// Package mysql implements the Azure ARM Mysql service API version 2017-12-01. // // The Microsoft Azure management API provides create, read, update, and delete functionality for Azure MySQL resources -// including servers, databases, firewall rules, log files and configurations. +// including servers, databases, firewall rules, log files and configurations with new business model. package mysql // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/configurations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/configurations.go similarity index 90% rename from vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/configurations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/configurations.go index 7840739c6593..f0b7b5b0e821 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/configurations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/configurations.go @@ -25,7 +25,8 @@ import ( ) // ConfigurationsClient is the the Microsoft Azure management API provides create, read, update, and delete -// functionality for Azure MySQL resources including servers, databases, firewall rules, log files and configurations. +// functionality for Azure MySQL resources including servers, databases, firewall rules, log files and configurations +// with new business model. type ConfigurationsClient struct { BaseClient } @@ -41,10 +42,12 @@ func NewConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) C } // CreateOrUpdate updates a configuration of a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. configurationName is the -// name of the server configuration. parameters is the required parameters for updating a server configuration. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// configurationName - the name of the server configuration. +// parameters - the required parameters for updating a server configuration. func (client ConfigurationsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, configurationName string, parameters Configuration) (result ConfigurationsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, configurationName, parameters) if err != nil { @@ -70,7 +73,7 @@ func (client ConfigurationsClient) CreateOrUpdatePreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -114,10 +117,11 @@ func (client ConfigurationsClient) CreateOrUpdateResponder(resp *http.Response) } // Get gets information about a configuration of server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. configurationName is the -// name of the server configuration. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// configurationName - the name of the server configuration. func (client ConfigurationsClient) Get(ctx context.Context, resourceGroupName string, serverName string, configurationName string) (result Configuration, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, configurationName) if err != nil { @@ -149,7 +153,7 @@ func (client ConfigurationsClient) GetPreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -183,9 +187,10 @@ func (client ConfigurationsClient) GetResponder(resp *http.Response) (result Con } // ListByServer list all the configurations in a given server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ConfigurationsClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result ConfigurationListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -216,7 +221,7 @@ func (client ConfigurationsClient) ListByServerPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/databases.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/databases.go similarity index 90% rename from vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/databases.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/databases.go index 52f2fbb2965a..35f97fe5411d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/databases.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/databases.go @@ -25,7 +25,8 @@ import ( ) // DatabasesClient is the the Microsoft Azure management API provides create, read, update, and delete functionality -// for Azure MySQL resources including servers, databases, firewall rules, log files and configurations. +// for Azure MySQL resources including servers, databases, firewall rules, log files and configurations with new +// business model. type DatabasesClient struct { BaseClient } @@ -41,10 +42,12 @@ func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) Databa } // CreateOrUpdate creates a new database or updates an existing database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. parameters is the required parameters for creating or updating a database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. +// parameters - the required parameters for creating or updating a database. func (client DatabasesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters Database) (result DatabasesCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, databaseName, parameters) if err != nil { @@ -70,7 +73,7 @@ func (client DatabasesClient) CreateOrUpdatePreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -114,10 +117,11 @@ func (client DatabasesClient) CreateOrUpdateResponder(resp *http.Response) (resu } // Delete deletes a database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. func (client DatabasesClient) Delete(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result DatabasesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -143,7 +147,7 @@ func (client DatabasesClient) DeletePreparer(ctx context.Context, resourceGroupN "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -184,10 +188,11 @@ func (client DatabasesClient) DeleteResponder(resp *http.Response) (result autor } // Get gets information about a database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. func (client DatabasesClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result Database, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -219,7 +224,7 @@ func (client DatabasesClient) GetPreparer(ctx context.Context, resourceGroupName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -253,9 +258,10 @@ func (client DatabasesClient) GetResponder(resp *http.Response) (result Database } // ListByServer list all the databases in a given server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client DatabasesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result DatabaseListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -286,7 +292,7 @@ func (client DatabasesClient) ListByServerPreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/firewallrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/firewallrules.go similarity index 91% rename from vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/firewallrules.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/firewallrules.go index 04bd6a3b6655..1d2a04d2a22d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/firewallrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/firewallrules.go @@ -26,7 +26,8 @@ import ( ) // FirewallRulesClient is the the Microsoft Azure management API provides create, read, update, and delete -// functionality for Azure MySQL resources including servers, databases, firewall rules, log files and configurations. +// functionality for Azure MySQL resources including servers, databases, firewall rules, log files and configurations +// with new business model. type FirewallRulesClient struct { BaseClient } @@ -42,10 +43,12 @@ func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) Fi } // CreateOrUpdate creates a new firewall rule or updates an existing firewall rule. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. firewallRuleName is the name -// of the server firewall rule. parameters is the required parameters for creating or updating a firewall rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// firewallRuleName - the name of the server firewall rule. +// parameters - the required parameters for creating or updating a firewall rule. func (client FirewallRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string, parameters FirewallRule) (result FirewallRulesCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -82,7 +85,7 @@ func (client FirewallRulesClient) CreateOrUpdatePreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -126,10 +129,11 @@ func (client FirewallRulesClient) CreateOrUpdateResponder(resp *http.Response) ( } // Delete deletes a server firewall rule. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. firewallRuleName is the name -// of the server firewall rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// firewallRuleName - the name of the server firewall rule. func (client FirewallRulesClient) Delete(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string) (result FirewallRulesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, firewallRuleName) if err != nil { @@ -155,7 +159,7 @@ func (client FirewallRulesClient) DeletePreparer(ctx context.Context, resourceGr "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -196,10 +200,11 @@ func (client FirewallRulesClient) DeleteResponder(resp *http.Response) (result a } // Get gets information about a server firewall rule. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. firewallRuleName is the name -// of the server firewall rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// firewallRuleName - the name of the server firewall rule. func (client FirewallRulesClient) Get(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string) (result FirewallRule, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, firewallRuleName) if err != nil { @@ -231,7 +236,7 @@ func (client FirewallRulesClient) GetPreparer(ctx context.Context, resourceGroup "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -265,9 +270,10 @@ func (client FirewallRulesClient) GetResponder(resp *http.Response) (result Fire } // ListByServer list all the firewall rules in a given server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client FirewallRulesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result FirewallRuleListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -298,7 +304,7 @@ func (client FirewallRulesClient) ListByServerPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/locationbasedperformancetier.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/locationbasedperformancetier.go similarity index 96% rename from vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/locationbasedperformancetier.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/locationbasedperformancetier.go index be6a669bbf66..7b056f0aa95b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/locationbasedperformancetier.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/locationbasedperformancetier.go @@ -26,7 +26,7 @@ import ( // LocationBasedPerformanceTierClient is the the Microsoft Azure management API provides create, read, update, and // delete functionality for Azure MySQL resources including servers, databases, firewall rules, log files and -// configurations. +// configurations with new business model. type LocationBasedPerformanceTierClient struct { BaseClient } @@ -43,8 +43,8 @@ func NewLocationBasedPerformanceTierClientWithBaseURI(baseURI string, subscripti } // List list all the performance tiers at specified location in a given subscription. -// -// locationName is the name of the location. +// Parameters: +// locationName - the name of the location. func (client LocationBasedPerformanceTierClient) List(ctx context.Context, locationName string) (result PerformanceTierListResult, err error) { req, err := client.ListPreparer(ctx, locationName) if err != nil { @@ -74,7 +74,7 @@ func (client LocationBasedPerformanceTierClient) ListPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/logfiles.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/logfiles.go similarity index 92% rename from vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/logfiles.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/logfiles.go index 85edf75deff7..15b1ad92144c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/logfiles.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/logfiles.go @@ -25,7 +25,8 @@ import ( ) // LogFilesClient is the the Microsoft Azure management API provides create, read, update, and delete functionality for -// Azure MySQL resources including servers, databases, firewall rules, log files and configurations. +// Azure MySQL resources including servers, databases, firewall rules, log files and configurations with new business +// model. type LogFilesClient struct { BaseClient } @@ -41,9 +42,10 @@ func NewLogFilesClientWithBaseURI(baseURI string, subscriptionID string) LogFile } // ListByServer list all the log files in a given server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client LogFilesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result LogFileListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -74,7 +76,7 @@ func (client LogFilesClient) ListByServerPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/models.go similarity index 85% rename from vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/models.go index c4196a8ad549..7c8afc8a4542 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/models.go @@ -31,6 +31,8 @@ type CreateMode string const ( // CreateModeDefault ... CreateModeDefault CreateMode = "Default" + // CreateModeGeoRestore ... + CreateModeGeoRestore CreateMode = "GeoRestore" // CreateModePointInTimeRestore ... CreateModePointInTimeRestore CreateMode = "PointInTimeRestore" // CreateModeServerPropertiesForCreate ... @@ -39,7 +41,22 @@ const ( // PossibleCreateModeValues returns an array of possible values for the CreateMode const type. func PossibleCreateModeValues() []CreateMode { - return []CreateMode{CreateModeDefault, CreateModePointInTimeRestore, CreateModeServerPropertiesForCreate} + return []CreateMode{CreateModeDefault, CreateModeGeoRestore, CreateModePointInTimeRestore, CreateModeServerPropertiesForCreate} +} + +// GeoRedundantBackup enumerates the values for geo redundant backup. +type GeoRedundantBackup string + +const ( + // Disabled ... + Disabled GeoRedundantBackup = "Disabled" + // Enabled ... + Enabled GeoRedundantBackup = "Enabled" +) + +// PossibleGeoRedundantBackupValues returns an array of possible values for the GeoRedundantBackup const type. +func PossibleGeoRedundantBackupValues() []GeoRedundantBackup { + return []GeoRedundantBackup{Disabled, Enabled} } // OperationOrigin enumerates the values for operation origin. @@ -63,17 +80,17 @@ func PossibleOperationOriginValues() []OperationOrigin { type ServerState string const ( - // Disabled ... - Disabled ServerState = "Disabled" - // Dropping ... - Dropping ServerState = "Dropping" - // Ready ... - Ready ServerState = "Ready" + // ServerStateDisabled ... + ServerStateDisabled ServerState = "Disabled" + // ServerStateDropping ... + ServerStateDropping ServerState = "Dropping" + // ServerStateReady ... + ServerStateReady ServerState = "Ready" ) // PossibleServerStateValues returns an array of possible values for the ServerState const type. func PossibleServerStateValues() []ServerState { - return []ServerState{Disabled, Dropping, Ready} + return []ServerState{ServerStateDisabled, ServerStateDropping, ServerStateReady} } // ServerVersion enumerates the values for server version. @@ -97,13 +114,15 @@ type SkuTier string const ( // Basic ... Basic SkuTier = "Basic" - // Standard ... - Standard SkuTier = "Standard" + // GeneralPurpose ... + GeneralPurpose SkuTier = "GeneralPurpose" + // MemoryOptimized ... + MemoryOptimized SkuTier = "MemoryOptimized" ) // PossibleSkuTierValues returns an array of possible values for the SkuTier const type. func PossibleSkuTierValues() []SkuTier { - return []SkuTier{Basic, Standard} + return []SkuTier{Basic, GeneralPurpose, MemoryOptimized} } // SslEnforcementEnum enumerates the values for ssl enforcement enum. @@ -753,8 +772,6 @@ type LogFileListResult struct { // LogFileProperties the properties of a log file. type LogFileProperties struct { - // Name - Log file name. - Name *string `json:"name,omitempty"` // SizeInKB - Size of the log file. SizeInKB *int64 `json:"sizeInKB,omitempty"` // CreatedTime - Creation timestamp of the log file. @@ -846,8 +863,6 @@ type PerformanceTierListResult struct { type PerformanceTierProperties struct { // ID - ID of the performance tier. ID *string `json:"id,omitempty"` - // BackupRetentionDays - Backup retention in days for the performance tier edition - BackupRetentionDays *int32 `json:"backupRetentionDays,omitempty"` // ServiceLevelObjectives - Service level objectives associated with the performance tier ServiceLevelObjectives *[]PerformanceTierServiceLevelObjectives `json:"serviceLevelObjectives,omitempty"` } @@ -858,10 +873,18 @@ type PerformanceTierServiceLevelObjectives struct { ID *string `json:"id,omitempty"` // Edition - Edition of the performance tier. Edition *string `json:"edition,omitempty"` - // Dtu - Database throughput unit associated with the service level objective - Dtu *int32 `json:"dtu,omitempty"` - // StorageMB - Maximum storage in MB associated with the service level objective - StorageMB *int32 `json:"storageMB,omitempty"` + // VCore - vCore associated with the service level objective + VCore *int32 `json:"vCore,omitempty"` + // HardwareGeneration - Hardware generation associated with the service level objective + HardwareGeneration *string `json:"hardwareGeneration,omitempty"` + // MaxBackupRetentionDays - Maximum Backup retention in days for the performance tier edition + MaxBackupRetentionDays *int32 `json:"maxBackupRetentionDays,omitempty"` + // MinBackupRetentionDays - Minimum Backup retention in days for the performance tier edition + MinBackupRetentionDays *int32 `json:"minBackupRetentionDays,omitempty"` + // MaxStorageMB - Max storage allowed for a server. + MaxStorageMB *int32 `json:"maxStorageMB,omitempty"` + // MinStorageMB - Max storage allowed for a server. + MinStorageMB *int32 `json:"minStorageMB,omitempty"` } // ProxyResource resource properties. @@ -1087,34 +1110,37 @@ type ServerListResult struct { type ServerProperties struct { // AdministratorLogin - The administrator's login name of a server. Can only be specified when the server is being created (and is required for creation). AdministratorLogin *string `json:"administratorLogin,omitempty"` - // StorageMB - The maximum storage allowed for a server. - StorageMB *int64 `json:"storageMB,omitempty"` // Version - Server version. Possible values include: 'FiveFullStopSix', 'FiveFullStopSeven' Version ServerVersion `json:"version,omitempty"` // SslEnforcement - Enable ssl enforcement or not when connect to server. Possible values include: 'SslEnforcementEnumEnabled', 'SslEnforcementEnumDisabled' SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` - // UserVisibleState - A state of a server that is visible to user. Possible values include: 'Ready', 'Dropping', 'Disabled' + // UserVisibleState - A state of a server that is visible to user. Possible values include: 'ServerStateReady', 'ServerStateDropping', 'ServerStateDisabled' UserVisibleState ServerState `json:"userVisibleState,omitempty"` // FullyQualifiedDomainName - The fully qualified domain name of a server. FullyQualifiedDomainName *string `json:"fullyQualifiedDomainName,omitempty"` + // EarliestRestoreDate - Earliest restore point creation time (ISO8601 format) + EarliestRestoreDate *date.Time `json:"earliestRestoreDate,omitempty"` + // StorageProfile - Storage profile of a server. + StorageProfile *StorageProfile `json:"storageProfile,omitempty"` } // BasicServerPropertiesForCreate the properties used to create a new server. type BasicServerPropertiesForCreate interface { AsServerPropertiesForDefaultCreate() (*ServerPropertiesForDefaultCreate, bool) AsServerPropertiesForRestore() (*ServerPropertiesForRestore, bool) + AsServerPropertiesForGeoRestore() (*ServerPropertiesForGeoRestore, bool) AsServerPropertiesForCreate() (*ServerPropertiesForCreate, bool) } // ServerPropertiesForCreate the properties used to create a new server. type ServerPropertiesForCreate struct { - // StorageMB - The maximum storage allowed for a server. - StorageMB *int64 `json:"storageMB,omitempty"` // Version - Server version. Possible values include: 'FiveFullStopSix', 'FiveFullStopSeven' Version ServerVersion `json:"version,omitempty"` // SslEnforcement - Enable ssl enforcement or not when connect to server. Possible values include: 'SslEnforcementEnumEnabled', 'SslEnforcementEnumDisabled' SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` - // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore' + // StorageProfile - Storage profile of a server. + StorageProfile *StorageProfile `json:"storageProfile,omitempty"` + // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore', 'CreateModeGeoRestore' CreateMode CreateMode `json:"createMode,omitempty"` } @@ -1134,6 +1160,10 @@ func unmarshalBasicServerPropertiesForCreate(body []byte) (BasicServerProperties var spfr ServerPropertiesForRestore err := json.Unmarshal(body, &spfr) return spfr, err + case string(CreateModeGeoRestore): + var spfgr ServerPropertiesForGeoRestore + err := json.Unmarshal(body, &spfgr) + return spfgr, err default: var spfc ServerPropertiesForCreate err := json.Unmarshal(body, &spfc) @@ -1163,15 +1193,15 @@ func unmarshalBasicServerPropertiesForCreateArray(body []byte) ([]BasicServerPro func (spfc ServerPropertiesForCreate) MarshalJSON() ([]byte, error) { spfc.CreateMode = CreateModeServerPropertiesForCreate objectMap := make(map[string]interface{}) - if spfc.StorageMB != nil { - objectMap["storageMB"] = spfc.StorageMB - } if spfc.Version != "" { objectMap["version"] = spfc.Version } if spfc.SslEnforcement != "" { objectMap["sslEnforcement"] = spfc.SslEnforcement } + if spfc.StorageProfile != nil { + objectMap["storageProfile"] = spfc.StorageProfile + } if spfc.CreateMode != "" { objectMap["createMode"] = spfc.CreateMode } @@ -1188,6 +1218,11 @@ func (spfc ServerPropertiesForCreate) AsServerPropertiesForRestore() (*ServerPro return nil, false } +// AsServerPropertiesForGeoRestore is the BasicServerPropertiesForCreate implementation for ServerPropertiesForCreate. +func (spfc ServerPropertiesForCreate) AsServerPropertiesForGeoRestore() (*ServerPropertiesForGeoRestore, bool) { + return nil, false +} + // AsServerPropertiesForCreate is the BasicServerPropertiesForCreate implementation for ServerPropertiesForCreate. func (spfc ServerPropertiesForCreate) AsServerPropertiesForCreate() (*ServerPropertiesForCreate, bool) { return &spfc, true @@ -1204,13 +1239,13 @@ type ServerPropertiesForDefaultCreate struct { AdministratorLogin *string `json:"administratorLogin,omitempty"` // AdministratorLoginPassword - The password of the administrator login. AdministratorLoginPassword *string `json:"administratorLoginPassword,omitempty"` - // StorageMB - The maximum storage allowed for a server. - StorageMB *int64 `json:"storageMB,omitempty"` // Version - Server version. Possible values include: 'FiveFullStopSix', 'FiveFullStopSeven' Version ServerVersion `json:"version,omitempty"` // SslEnforcement - Enable ssl enforcement or not when connect to server. Possible values include: 'SslEnforcementEnumEnabled', 'SslEnforcementEnumDisabled' SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` - // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore' + // StorageProfile - Storage profile of a server. + StorageProfile *StorageProfile `json:"storageProfile,omitempty"` + // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore', 'CreateModeGeoRestore' CreateMode CreateMode `json:"createMode,omitempty"` } @@ -1224,15 +1259,15 @@ func (spfdc ServerPropertiesForDefaultCreate) MarshalJSON() ([]byte, error) { if spfdc.AdministratorLoginPassword != nil { objectMap["administratorLoginPassword"] = spfdc.AdministratorLoginPassword } - if spfdc.StorageMB != nil { - objectMap["storageMB"] = spfdc.StorageMB - } if spfdc.Version != "" { objectMap["version"] = spfdc.Version } if spfdc.SslEnforcement != "" { objectMap["sslEnforcement"] = spfdc.SslEnforcement } + if spfdc.StorageProfile != nil { + objectMap["storageProfile"] = spfdc.StorageProfile + } if spfdc.CreateMode != "" { objectMap["createMode"] = spfdc.CreateMode } @@ -1249,6 +1284,11 @@ func (spfdc ServerPropertiesForDefaultCreate) AsServerPropertiesForRestore() (*S return nil, false } +// AsServerPropertiesForGeoRestore is the BasicServerPropertiesForCreate implementation for ServerPropertiesForDefaultCreate. +func (spfdc ServerPropertiesForDefaultCreate) AsServerPropertiesForGeoRestore() (*ServerPropertiesForGeoRestore, bool) { + return nil, false +} + // AsServerPropertiesForCreate is the BasicServerPropertiesForCreate implementation for ServerPropertiesForDefaultCreate. func (spfdc ServerPropertiesForDefaultCreate) AsServerPropertiesForCreate() (*ServerPropertiesForCreate, bool) { return nil, false @@ -1259,19 +1299,81 @@ func (spfdc ServerPropertiesForDefaultCreate) AsBasicServerPropertiesForCreate() return &spfdc, true } -// ServerPropertiesForRestore the properties to a new server by restoring from a backup. +// ServerPropertiesForGeoRestore the properties used to create a new server by restoring to a different region from +// a geo replicated backup. +type ServerPropertiesForGeoRestore struct { + // SourceServerID - The source server id to restore from. + SourceServerID *string `json:"sourceServerId,omitempty"` + // Version - Server version. Possible values include: 'FiveFullStopSix', 'FiveFullStopSeven' + Version ServerVersion `json:"version,omitempty"` + // SslEnforcement - Enable ssl enforcement or not when connect to server. Possible values include: 'SslEnforcementEnumEnabled', 'SslEnforcementEnumDisabled' + SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` + // StorageProfile - Storage profile of a server. + StorageProfile *StorageProfile `json:"storageProfile,omitempty"` + // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore', 'CreateModeGeoRestore' + CreateMode CreateMode `json:"createMode,omitempty"` +} + +// MarshalJSON is the custom marshaler for ServerPropertiesForGeoRestore. +func (spfgr ServerPropertiesForGeoRestore) MarshalJSON() ([]byte, error) { + spfgr.CreateMode = CreateModeGeoRestore + objectMap := make(map[string]interface{}) + if spfgr.SourceServerID != nil { + objectMap["sourceServerId"] = spfgr.SourceServerID + } + if spfgr.Version != "" { + objectMap["version"] = spfgr.Version + } + if spfgr.SslEnforcement != "" { + objectMap["sslEnforcement"] = spfgr.SslEnforcement + } + if spfgr.StorageProfile != nil { + objectMap["storageProfile"] = spfgr.StorageProfile + } + if spfgr.CreateMode != "" { + objectMap["createMode"] = spfgr.CreateMode + } + return json.Marshal(objectMap) +} + +// AsServerPropertiesForDefaultCreate is the BasicServerPropertiesForCreate implementation for ServerPropertiesForGeoRestore. +func (spfgr ServerPropertiesForGeoRestore) AsServerPropertiesForDefaultCreate() (*ServerPropertiesForDefaultCreate, bool) { + return nil, false +} + +// AsServerPropertiesForRestore is the BasicServerPropertiesForCreate implementation for ServerPropertiesForGeoRestore. +func (spfgr ServerPropertiesForGeoRestore) AsServerPropertiesForRestore() (*ServerPropertiesForRestore, bool) { + return nil, false +} + +// AsServerPropertiesForGeoRestore is the BasicServerPropertiesForCreate implementation for ServerPropertiesForGeoRestore. +func (spfgr ServerPropertiesForGeoRestore) AsServerPropertiesForGeoRestore() (*ServerPropertiesForGeoRestore, bool) { + return &spfgr, true +} + +// AsServerPropertiesForCreate is the BasicServerPropertiesForCreate implementation for ServerPropertiesForGeoRestore. +func (spfgr ServerPropertiesForGeoRestore) AsServerPropertiesForCreate() (*ServerPropertiesForCreate, bool) { + return nil, false +} + +// AsBasicServerPropertiesForCreate is the BasicServerPropertiesForCreate implementation for ServerPropertiesForGeoRestore. +func (spfgr ServerPropertiesForGeoRestore) AsBasicServerPropertiesForCreate() (BasicServerPropertiesForCreate, bool) { + return &spfgr, true +} + +// ServerPropertiesForRestore the properties used to create a new server by restoring from a backup. type ServerPropertiesForRestore struct { // SourceServerID - The source server id to restore from. SourceServerID *string `json:"sourceServerId,omitempty"` // RestorePointInTime - Restore point creation time (ISO8601 format), specifying the time to restore from. RestorePointInTime *date.Time `json:"restorePointInTime,omitempty"` - // StorageMB - The maximum storage allowed for a server. - StorageMB *int64 `json:"storageMB,omitempty"` // Version - Server version. Possible values include: 'FiveFullStopSix', 'FiveFullStopSeven' Version ServerVersion `json:"version,omitempty"` // SslEnforcement - Enable ssl enforcement or not when connect to server. Possible values include: 'SslEnforcementEnumEnabled', 'SslEnforcementEnumDisabled' SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` - // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore' + // StorageProfile - Storage profile of a server. + StorageProfile *StorageProfile `json:"storageProfile,omitempty"` + // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore', 'CreateModeGeoRestore' CreateMode CreateMode `json:"createMode,omitempty"` } @@ -1285,15 +1387,15 @@ func (spfr ServerPropertiesForRestore) MarshalJSON() ([]byte, error) { if spfr.RestorePointInTime != nil { objectMap["restorePointInTime"] = spfr.RestorePointInTime } - if spfr.StorageMB != nil { - objectMap["storageMB"] = spfr.StorageMB - } if spfr.Version != "" { objectMap["version"] = spfr.Version } if spfr.SslEnforcement != "" { objectMap["sslEnforcement"] = spfr.SslEnforcement } + if spfr.StorageProfile != nil { + objectMap["storageProfile"] = spfr.StorageProfile + } if spfr.CreateMode != "" { objectMap["createMode"] = spfr.CreateMode } @@ -1310,6 +1412,11 @@ func (spfr ServerPropertiesForRestore) AsServerPropertiesForRestore() (*ServerPr return &spfr, true } +// AsServerPropertiesForGeoRestore is the BasicServerPropertiesForCreate implementation for ServerPropertiesForRestore. +func (spfr ServerPropertiesForRestore) AsServerPropertiesForGeoRestore() (*ServerPropertiesForGeoRestore, bool) { + return nil, false +} + // AsServerPropertiesForCreate is the BasicServerPropertiesForCreate implementation for ServerPropertiesForRestore. func (spfr ServerPropertiesForRestore) AsServerPropertiesForCreate() (*ServerPropertiesForCreate, bool) { return nil, false @@ -1320,29 +1427,28 @@ func (spfr ServerPropertiesForRestore) AsBasicServerPropertiesForCreate() (Basic return &spfr, true } -// ServersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running -// operation. -type ServersCreateOrUpdateFuture struct { +// ServersCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type ServersCreateFuture struct { azure.Future req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServersCreateOrUpdateFuture) Result(client ServersClient) (s Server, err error) { +func (future ServersCreateFuture) Result(client ServersClient) (s Server, err error) { var done bool done, err = future.Done(client) if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") + err = autorest.NewErrorWithError(err, "mysql.ServersCreateFuture", "Result", future.Response(), "Polling failure") return } if !done { - return s, azure.NewAsyncOpIncompleteError("mysql.ServersCreateOrUpdateFuture") + return s, azure.NewAsyncOpIncompleteError("mysql.ServersCreateFuture") } if future.PollingMethod() == azure.PollingLocation { - s, err = client.CreateOrUpdateResponder(future.Response()) + s, err = client.CreateResponder(future.Response()) if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") + err = autorest.NewErrorWithError(err, "mysql.ServersCreateFuture", "Result", future.Response(), "Failure responding to request") } return } @@ -1359,12 +1465,12 @@ func (future ServersCreateOrUpdateFuture) Result(client ServersClient) (s Server resp, err = autorest.SendWithSender(client, req, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersCreateOrUpdateFuture", "Result", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "mysql.ServersCreateFuture", "Result", resp, "Failure sending request") return } - s, err = client.CreateOrUpdateResponder(resp) + s, err = client.CreateResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersCreateOrUpdateFuture", "Result", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "mysql.ServersCreateFuture", "Result", resp, "Failure responding to request") } return } @@ -1534,8 +1640,8 @@ func (sup *ServerUpdateParameters) UnmarshalJSON(body []byte) error { // ServerUpdateParametersProperties the properties that can be updated for a server. type ServerUpdateParametersProperties struct { - // StorageMB - The max storage allowed for a server. - StorageMB *int64 `json:"storageMB,omitempty"` + // StorageProfile - Storage profile of a server. + StorageProfile *StorageProfile `json:"storageProfile,omitempty"` // AdministratorLoginPassword - The password of the administrator login. AdministratorLoginPassword *string `json:"administratorLoginPassword,omitempty"` // Version - The version of a server. Possible values include: 'FiveFullStopSix', 'FiveFullStopSeven' @@ -1546,9 +1652,9 @@ type ServerUpdateParametersProperties struct { // Sku billing information related properties of a server. type Sku struct { - // Name - The name of the sku, typically, a letter + Number code, e.g. P3. + // Name - The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8. Name *string `json:"name,omitempty"` - // Tier - The tier of the particular SKU, e.g. Basic. Possible values include: 'Basic', 'Standard' + // Tier - The tier of the particular SKU, e.g. Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' Tier SkuTier `json:"tier,omitempty"` // Capacity - The scale up/out capacity, representing server's compute units. Capacity *int32 `json:"capacity,omitempty"` @@ -1558,6 +1664,16 @@ type Sku struct { Family *string `json:"family,omitempty"` } +// StorageProfile storage Profile properties of a server +type StorageProfile struct { + // BackupRetentionDays - Backup retention days for the server. + BackupRetentionDays *int32 `json:"backupRetentionDays,omitempty"` + // GeoRedundantBackup - Enable Geo-redundant or not for server backup. Possible values include: 'Enabled', 'Disabled' + GeoRedundantBackup GeoRedundantBackup `json:"geoRedundantBackup,omitempty"` + // StorageMB - Max storage allowed for a server. + StorageMB *int32 `json:"storageMB,omitempty"` +} + // TrackedResource resource properties including location and tags for track resources. type TrackedResource struct { // Location - The location the resource resides in. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/operations.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/operations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/operations.go index 921148785f33..22a04483fe1b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/operations.go @@ -25,7 +25,8 @@ import ( ) // OperationsClient is the the Microsoft Azure management API provides create, read, update, and delete functionality -// for Azure MySQL resources including servers, databases, firewall rules, log files and configurations. +// for Azure MySQL resources including servers, databases, firewall rules, log files and configurations with new +// business model. type OperationsClient struct { BaseClient } @@ -65,7 +66,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/servers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/servers.go similarity index 85% rename from vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/servers.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/servers.go index fc22975e6e6d..c64bcec73f7e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/servers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/servers.go @@ -26,7 +26,8 @@ import ( ) // ServersClient is the the Microsoft Azure management API provides create, read, update, and delete functionality for -// Azure MySQL resources including servers, databases, firewall rules, log files and configurations. +// Azure MySQL resources including servers, databases, firewall rules, log files and configurations with new business +// model. type ServersClient struct { BaseClient } @@ -41,51 +42,48 @@ func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersC return ServersClient{NewWithBaseURI(baseURI, subscriptionID)} } -// CreateOrUpdate creates a new server or updates an existing server. The update action will overwrite the existing -// server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. parameters is the required -// parameters for creating or updating a server. -func (client ServersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, parameters ServerForCreate) (result ServersCreateOrUpdateFuture, err error) { +// Create creates a new server or updates an existing server. The update action will overwrite the existing server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// parameters - the required parameters for creating or updating a server. +func (client ServersClient) Create(ctx context.Context, resourceGroupName string, serverName string, parameters ServerForCreate) (result ServersCreateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, Constraints: []validation.Constraint{{Target: "parameters.Sku", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.Sku.Capacity", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.Sku.Capacity", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}}}, }}, - {Target: "parameters.Properties", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "parameters.Properties.StorageMB", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "parameters.Properties.StorageMB", Name: validation.InclusiveMinimum, Rule: 1024, Chain: nil}}}, - }}, + {Target: "parameters.Properties", Name: validation.Null, Rule: true, Chain: nil}, {Target: "parameters.Location", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { - return result, validation.NewError("mysql.ServersClient", "CreateOrUpdate", err.Error()) + return result, validation.NewError("mysql.ServersClient", "Create", err.Error()) } - req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, parameters) + req, err := client.CreatePreparer(ctx, resourceGroupName, serverName, parameters) if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersClient", "CreateOrUpdate", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "mysql.ServersClient", "Create", nil, "Failure preparing request") return } - result, err = client.CreateOrUpdateSender(req) + result, err = client.CreateSender(req) if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersClient", "CreateOrUpdate", result.Response(), "Failure sending request") + err = autorest.NewErrorWithError(err, "mysql.ServersClient", "Create", result.Response(), "Failure sending request") return } return } -// CreateOrUpdatePreparer prepares the CreateOrUpdate request. -func (client ServersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters ServerForCreate) (*http.Request, error) { +// CreatePreparer prepares the Create request. +func (client ServersClient) CreatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters ServerForCreate) (*http.Request, error) { pathParameters := map[string]interface{}{ "resourceGroupName": autorest.Encode("path", resourceGroupName), "serverName": autorest.Encode("path", serverName), "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -100,9 +98,9 @@ func (client ServersClient) CreateOrUpdatePreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. -func (client ServersClient) CreateOrUpdateSender(req *http.Request) (future ServersCreateOrUpdateFuture, err error) { +func (client ServersClient) CreateSender(req *http.Request) (future ServersCreateFuture, err error) { sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) future.Future = azure.NewFuture(req) future.req = req @@ -115,9 +113,9 @@ func (client ServersClient) CreateOrUpdateSender(req *http.Request) (future Serv return } -// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// CreateResponder handles the response to the Create request. The method always // closes the http.Response Body. -func (client ServersClient) CreateOrUpdateResponder(resp *http.Response) (result Server, err error) { +func (client ServersClient) CreateResponder(resp *http.Response) (result Server, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -129,9 +127,10 @@ func (client ServersClient) CreateOrUpdateResponder(resp *http.Response) (result } // Delete deletes a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServersClient) Delete(ctx context.Context, resourceGroupName string, serverName string) (result ServersDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -156,7 +155,7 @@ func (client ServersClient) DeletePreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -197,9 +196,10 @@ func (client ServersClient) DeleteResponder(resp *http.Response) (result autores } // Get gets information about a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServersClient) Get(ctx context.Context, resourceGroupName string, serverName string) (result Server, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -230,7 +230,7 @@ func (client ServersClient) GetPreparer(ctx context.Context, resourceGroupName s "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -292,7 +292,7 @@ func (client ServersClient) ListPreparer(ctx context.Context) (*http.Request, er "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -326,9 +326,9 @@ func (client ServersClient) ListResponder(resp *http.Response) (result ServerLis } // ListByResourceGroup list all the servers in a given resource group. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. func (client ServersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ServerListResult, err error) { req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) if err != nil { @@ -358,7 +358,7 @@ func (client ServersClient) ListByResourceGroupPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -393,10 +393,11 @@ func (client ServersClient) ListByResourceGroupResponder(resp *http.Response) (r // Update updates an existing server. The request body can contain one to many of the properties present in the normal // server definition. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. parameters is the required -// parameters for updating a server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// parameters - the required parameters for updating a server. func (client ServersClient) Update(ctx context.Context, resourceGroupName string, serverName string, parameters ServerUpdateParameters) (result ServersUpdateFuture, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, serverName, parameters) if err != nil { @@ -421,7 +422,7 @@ func (client ServersClient) UpdatePreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/version.go similarity index 93% rename from vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/version.go index 91fde84c3b82..c59c0a27bf6d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/version.go @@ -21,7 +21,7 @@ import "github.com/Azure/azure-sdk-for-go/version" // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " mysql/2017-04-30-preview" + return "Azure-SDK-For-Go/" + version.Number + " mysql/2017-12-01" } // Version returns the semantic version (see http://semver.org) of the client. diff --git a/vendor/vendor.json b/vendor/vendor.json index da5ebdcdeb2d..1b534c7308d1 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -147,8 +147,8 @@ "versionExact": "v16.2.1" }, { - "checksumSHA1": "l5LiS1E96VhqOILV/TKh37eYbeg=", - "path": "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql", + "checksumSHA1": "k+eOq0DE2aRNVwLFElfc81YE18Y=", + "path": "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql", "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", "revisionTime": "2018-05-04T19:14:26Z", "version": "v16.2.1", diff --git a/website/docs/r/mysql_configuration.html.markdown b/website/docs/r/mysql_configuration.html.markdown index 33b82417d6b5..abe8ecb6cb38 100644 --- a/website/docs/r/mysql_configuration.html.markdown +++ b/website/docs/r/mysql_configuration.html.markdown @@ -24,15 +24,21 @@ resource "azurerm_mysql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "MYSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 5120 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "psqladminun" administrator_login_password = "H@Sh1CoR3!" version = "5.7" - storage_mb = "51200" ssl_enforcement = "Enabled" } diff --git a/website/docs/r/mysql_database.html.markdown b/website/docs/r/mysql_database.html.markdown index 5b11c0c105fe..72c1e31a21a8 100644 --- a/website/docs/r/mysql_database.html.markdown +++ b/website/docs/r/mysql_database.html.markdown @@ -24,15 +24,21 @@ resource "azurerm_mysql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "MYSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 5120 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "mysqladminun" administrator_login_password = "H@Sh1CoR3!" version = "5.7" - storage_mb = "51200" ssl_enforcement = "Enabled" } diff --git a/website/docs/r/mysql_server.html.markdown b/website/docs/r/mysql_server.html.markdown index 33bfe6b101ab..89c4f2e236c9 100644 --- a/website/docs/r/mysql_server.html.markdown +++ b/website/docs/r/mysql_server.html.markdown @@ -25,15 +25,21 @@ resource "azurerm_mysql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "MYSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 5120 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "mysqladminun" administrator_login_password = "H@Sh1CoR3!" version = "5.7" - storage_mb = "51200" ssl_enforcement = "Enabled" } ``` @@ -50,45 +56,39 @@ The following arguments are supported: * `sku` - (Required) A `sku` block as defined below. +* `storage_profile` - (Required) A `storage_profile` block as defined below. + * `administrator_login` - (Required) The Administrator Login for the MySQL Server. Changing this forces a new resource to be created. * `administrator_login_password` - (Required) The Password associated with the `administrator_login` for the MySQL Server. * `version` - (Required) Specifies the version of MySQL to use. Valid values are `5.6` and `5.7`. Changing this forces a new resource to be created. -* `storage_mb` - (Required) Specifies the amount of storage for the MySQL Server in Megabytes. Possible values are shown below. Changing this forces a new resource to be created. - -Possible values for `storage_mb` when using a SKU Name of `Basic` are: -- `51200` (50GB) -- `179200` (175GB) -- `307200` (300GB) -- `435200` (425GB) -- `563200` (550GB) -- `691200` (675GB) -- `819200` (800GB) -- `947200` (925GB) - -Possible values for `storage_mb` when using a SKU Name of `Standard` are: -- `128000` (125GB) -- `256000` (256GB) -- `384000` (384GB) -- `512000` (512GB) -- `640000` (640GB) -- `768000` (768GB) -- `896000` (896GB) -- `1024000` (1TB) - * `ssl_enforcement` - (Required) Specifies if SSL should be enforced on connections. Possible values are `Enforced` and `Disabled`. * `tags` - (Optional) A mapping of tags to assign to the resource. --- -* `sku` supports the following: +`sku` supports the following: + +* `name` - (Required) Specifies the SKU Name for this MySQL Server. The name of the SKU, follows the `tier` + `family` + `cores` pattern (e.g. B_Gen4_1, GP_Gen5_8). For more information see the [product documentation](https://docs.microsoft.com/en-us/rest/api/mysql/servers/create#sku). + +* `capacity` - (Required) The scale up/out capacity, representing server's compute units. + +* `tier` - (Required) The tier of the particular SKU. Possible values are `Basic`, `GeneralPurpose`, and `MemoryOptimized`. For more information see the [product documentation](https://docs.microsoft.com/en-us/azure/mysql/concepts-pricing-tiers). + +* `family` - (Required) The `family` of hardware `Gen4` or `Gen5`, before selecting your `family` check the [product documentation](https://docs.microsoft.com/en-us/azure/mysql/concepts-pricing-tiers#compute-generations-vcores-and-memory) for availability in your region. + +--- + +`storage_profile` supports the following: + +* `storage_mb` - (Required) Max storage allowed for a server, possible values are between `5120 MB` (5GB) and `1048576 MB` (1TB). The step for this value must be in `1024 MB` (1GB) increments. For more information see the [product documentation](https://docs.microsoft.com/en-us/rest/api/mysql/servers/create#StorageProfile). + +* `backup_retention_days` - (Optional) Backup retention days for the server, supported values are between `7` and `35` days. -* `name` - (Optional) Specifies the SKU Name for this MySQL Server. Possible values are: `MYSQLB50`, `MYSQLB100`, `MYSQLS100`, `MYSQLS200`, `MYSQLS400` and `MYSQLS800`. -* `capacity` - (Optional) Specifies the DTU's for this MySQL Server. Possible values are `50` and `100` DTU's when using a `Basic` SKU and `100`, `200`, `400` or `800` when using the `Standard` SKU. -* `tier` - (Optional) Specifies the SKU Tier for this MySQL Server. Possible values are `Basic` and `Standard`. +* `geo_redundant_backup` - (Optional) Enable Geo-redundant or not for server backup. Valid values for this property are `Enabled` or `Disabled`, not supported for the `basic` tier. ## Attributes Reference From d819d597531039823c1cf6dffd7f05a131153403 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 22 May 2018 17:04:42 +0100 Subject: [PATCH 158/320] Updating to include #1154 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a17cb73d9319..4312c5243066 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ UPGRADE NOTES: +~> **Please Note:** The `azurerm_mysql_server` resource has been updated from the Preview API's to the GA API's - which requires code changes in your Terraform Configuration to use the new Pricing SKU's. Upon updating to v1.6.0 - you'll need to update the configuration from the Preview SKU's to the GA SKU's. + * `azurerm_scheduler_job_collection` - the property `max_retry_interval` has been deprecated in favour of `max_recurrence_interval` to better match Azure [GH-1218] FEATURES: @@ -20,6 +22,7 @@ IMPROVEMENTS: * `azurerm_app_service` - adding support for `ip_restriction`'s [GH-1231] * `azurerm_container_registry` - no longer forces a new resource on SKU change [GH-1264] * `azurerm_dns_zone` - datasource's `resource_group` field is now optional [GH-1180] +* `azurerm_mysql_server` - support for the new GA Pricing SKU's [GH-1154] * `azurerm_public_ip` - computed values now default to an empy string [GH-1247] * `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` [GH-1235] * `azurerm_virtual_machine_scale_set` - adding the `licence_type` property [GH-1245] From 13a3f389ed0d9cfce1d4013416d846545fef3f00 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 22 May 2018 20:42:43 +0100 Subject: [PATCH 159/320] Refactoring of the container registry docs (#1273) --- website/docs/r/container_registry.html.markdown | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/website/docs/r/container_registry.html.markdown b/website/docs/r/container_registry.html.markdown index 652d4e4183aa..34cb23d6f557 100644 --- a/website/docs/r/container_registry.html.markdown +++ b/website/docs/r/container_registry.html.markdown @@ -3,12 +3,13 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_container_registry" sidebar_current: "docs-azurerm-resource-container-registry" description: |- - Create as an Azure Container Registry instance. + Manages an Azure Container Registry. + --- -# azurerm\_container\_registry +# azurerm_container_registry -Create as an Azure Container Registry instance. +Manages an Azure Container Registry. ~> **Note:** All arguments including the access key will be stored in the raw state as plain-text. [Read more about sensitive data in state](/docs/state/sensitive-data.html). @@ -43,11 +44,9 @@ resource "azurerm_container_registry" "test" { The following arguments are supported: -* `name` - (Required) Specifies the name of the Container Registry. Changing this forces a - new resource to be created. +* `name` - (Required) Specifies the name of the Container Registry. Changing this forces a new resource to be created. -* `resource_group_name` - (Required) The name of the resource group in which to - create the Container Registry. +* `resource_group_name` - (Required) The name of the resource group in which to create the Container Registry. Changing this forces a new resource to be created. * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. @@ -55,7 +54,7 @@ The following arguments are supported: * `storage_account_id` - (Required for `Classic` Sku - Optional otherwise) The ID of a Storage Account which must be located in the same Azure Region as the Container Registry. -* `sku` - (Optional) The SKU name of the the container registry. Possible values are `Classic` (which was previously `Basic`), `Basic`, `Standard` and `Premium`. Once provisioned changing the SKU will not force a new resource. +* `sku` - (Optional) The SKU name of the the container registry. Possible values are `Classic` (which was previously `Basic`), `Basic`, `Standard` and `Premium`. * `tags` - (Optional) A mapping of tags to assign to the resource. From 27ae7be738bcd2094b25ec8945bc7528c2e6e36e Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 23 May 2018 02:29:33 -0700 Subject: [PATCH 160/320] Mass update of docs to prevent propagating old mistakes (#1282) --- examples/vm-from-managed-image/README.md | 2 +- website/docs/r/application_gateway.html.markdown | 4 ++-- website/docs/r/application_insights.html.markdown | 2 +- website/docs/r/automation_account.html.markdown | 6 +++--- website/docs/r/automation_credential.html.markdown | 6 +++--- website/docs/r/automation_runbook.html.markdown | 6 +++--- website/docs/r/automation_schedule.html.markdown | 6 +++--- website/docs/r/cdn_profile.html.markdown | 2 +- website/docs/r/container_group.html.markdown | 2 +- website/docs/r/container_service.html.markdown | 6 +++--- website/docs/r/cosmosdb_account.html.markdown | 6 +++--- website/docs/r/dns_a_record.html.markdown | 2 +- website/docs/r/dns_aaaa_record.html.markdown | 2 +- website/docs/r/dns_cname_record.html.markdown | 2 +- website/docs/r/dns_mx_record.html.markdown | 2 +- website/docs/r/dns_ns_record.html.markdown | 2 +- website/docs/r/dns_ptr_record.html.markdown | 2 +- website/docs/r/dns_srv_record.html.markdown | 2 +- website/docs/r/dns_txt_record.html.markdown | 2 +- website/docs/r/dns_zone.html.markdown | 2 +- website/docs/r/eventgrid_topic.html.markdown | 2 +- website/docs/r/eventhub.html.markdown | 4 ++-- website/docs/r/eventhub_authorization_rule.html.markdown | 6 +++--- website/docs/r/eventhub_consumer_group.html.markdown | 6 +++--- website/docs/r/eventhub_namespace.html.markdown | 2 +- .../r/express_route_circuit_authorization.html.markdown | 4 ++-- website/docs/r/express_route_circuit_peering.html.markdown | 4 ++-- website/docs/r/image.html.markdown | 2 +- website/docs/r/iothub.html.markdown | 4 ++-- website/docs/r/kubernetes_cluster.html.markdown | 4 ++-- website/docs/r/loadbalancer.html.markdown | 2 +- .../docs/r/loadbalancer_backend_address_pool.html.markdown | 2 +- website/docs/r/loadbalancer_nat_pool.html.markdown | 2 +- website/docs/r/loadbalancer_nat_rule.html.markdown | 2 +- website/docs/r/loadbalancer_probe.html.markdown | 2 +- website/docs/r/loadbalancer_rule.html.markdown | 2 +- website/docs/r/local_network_gateway.html.markdown | 6 +++--- website/docs/r/log_analytics_solution.html.markdown | 4 ++-- website/docs/r/log_analytics_workspace.html.markdown | 4 ++-- website/docs/r/managed_disk.html.markdown | 2 +- website/docs/r/mysql_database.html.markdown | 4 ++-- website/docs/r/mysql_firewall_rule.html.markdown | 4 ++-- website/docs/r/policy_definition.html.markdown | 4 ++-- website/docs/r/postgresql_configuration.html.markdown | 2 +- website/docs/r/postgresql_database.html.markdown | 6 +++--- website/docs/r/postgresql_firewall_rule.html.markdown | 6 +++--- website/docs/r/postgresql_server.html.markdown | 2 +- website/docs/r/public_ip.html.markdown | 2 +- website/docs/r/resource_group.html.markdown | 6 +++--- website/docs/r/search_service.html.markdown | 2 +- website/docs/r/servicebus_namespace.html.markdown | 2 +- website/docs/r/servicebus_queue.html.markdown | 2 +- website/docs/r/servicebus_subscription.html.markdown | 2 +- website/docs/r/servicebus_topic.html.markdown | 2 +- .../r/servicebus_topic_authorization_rule.html.markdown | 4 ++-- website/docs/r/sql_database.html.markdown | 2 +- website/docs/r/sql_elasticpool.html.markdown | 2 +- website/docs/r/sql_server.html.markdown | 2 +- website/docs/r/storage_blob.html.markdown | 2 +- website/docs/r/storage_container.html.markdown | 2 +- website/docs/r/storage_queue.html.markdown | 2 +- website/docs/r/storage_share.html.markdown | 2 +- website/docs/r/storage_table.html.markdown | 2 +- website/docs/r/template_deployment.html.markdown | 2 +- website/docs/r/traffic_manager_endpoint.html.markdown | 4 ++-- website/docs/r/traffic_manager_profile.html.markdown | 4 ++-- website/docs/r/virtual_machine.html.markdown | 2 +- website/docs/r/virtual_machine_extension.html.markdown | 4 ++-- website/docs/r/virtual_network.html.markdown | 6 +++--- website/docs/r/virtual_network_gateway.html.markdown | 4 ++-- .../docs/r/virtual_network_gateway_connection.html.markdown | 4 ++-- website/docs/r/virtual_network_peering.html.markdown | 6 +++--- 72 files changed, 117 insertions(+), 117 deletions(-) diff --git a/examples/vm-from-managed-image/README.md b/examples/vm-from-managed-image/README.md index 5352a45c9b6c..7f15e8ebdf74 100644 --- a/examples/vm-from-managed-image/README.md +++ b/examples/vm-from-managed-image/README.md @@ -1,3 +1,3 @@ # Virtual Machine from a Managed Image -Creates a Virtual Machine from an Azure Managed Image (Golden Image) +Manages a Virtual Machine from an Azure Managed Image (Golden Image) diff --git a/website/docs/r/application_gateway.html.markdown b/website/docs/r/application_gateway.html.markdown index 86410247fd49..f1ffe196dcc8 100644 --- a/website/docs/r/application_gateway.html.markdown +++ b/website/docs/r/application_gateway.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azure_application_gateway" sidebar_current: "docs-azurerm-resource-application-gateway" description: |- - Creates a new application gateway based on a previously created virtual network with configured subnets. + Manages a new application gateway based on a previously created virtual network with configured subnets. --- # azurerm_application_gateway -Creates a new application gateway based on a previously created virtual network with configured subnets. +Manages a new application gateway based on a previously created virtual network with configured subnets. ## Example Usage diff --git a/website/docs/r/application_insights.html.markdown b/website/docs/r/application_insights.html.markdown index 4f82de909c59..69041b5c420a 100644 --- a/website/docs/r/application_insights.html.markdown +++ b/website/docs/r/application_insights.html.markdown @@ -6,7 +6,7 @@ description: |- Create an Application Insights component. --- -# azurerm\_application\_insights +# azurerm_application_insights Create an Application Insights component. diff --git a/website/docs/r/automation_account.html.markdown b/website/docs/r/automation_account.html.markdown index 3609a5814525..604ff51846b8 100644 --- a/website/docs/r/automation_account.html.markdown +++ b/website/docs/r/automation_account.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_automation_account" sidebar_current: "docs-azurerm-resource-automation-account" description: |- - Creates a new Automation Account. + Manages a new Automation Account. --- -# azurerm\_automation\_account +# azurerm_automation_account -Creates a new Automation Account. +Manages a new Automation Account. ## Example Usage diff --git a/website/docs/r/automation_credential.html.markdown b/website/docs/r/automation_credential.html.markdown index ed2ebcdedf4a..f7902e93e184 100644 --- a/website/docs/r/automation_credential.html.markdown +++ b/website/docs/r/automation_credential.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_automation_credential" sidebar_current: "docs-azurerm-resource-automation-credential" description: |- - Creates a new Automation Credential. + Manages a new Automation Credential. --- -# azurerm\_automation\_credential +# azurerm_automation_credential -Creates a new Automation Credential. +Manages a new Automation Credential. ## Example Usage diff --git a/website/docs/r/automation_runbook.html.markdown b/website/docs/r/automation_runbook.html.markdown index 80303da114b2..1af8f53649dc 100644 --- a/website/docs/r/automation_runbook.html.markdown +++ b/website/docs/r/automation_runbook.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_automation_runbook" sidebar_current: "docs-azurerm-resource-automation-runbook" description: |- - Creates a new Automation Runbook. + Manages a new Automation Runbook. --- -# azurerm\_automation\_runbook +# azurerm_automation_runbook -Creates a new Automation Runbook. +Manages a new Automation Runbook. ## Example Usage diff --git a/website/docs/r/automation_schedule.html.markdown b/website/docs/r/automation_schedule.html.markdown index 26ddfbc0f887..c28edbcd30a0 100644 --- a/website/docs/r/automation_schedule.html.markdown +++ b/website/docs/r/automation_schedule.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_automation_schedule" sidebar_current: "docs-azurerm-resource-automation-schedule" description: |- - Creates a new Automation Schedule. + Manages a new Automation Schedule. --- -# azurerm\_automation\_schedule +# azurerm_automation_schedule -Creates a new Automation Schedule. +Manages a new Automation Schedule. ## Example Usage diff --git a/website/docs/r/cdn_profile.html.markdown b/website/docs/r/cdn_profile.html.markdown index 3dff6de7826c..23127da2a2fc 100644 --- a/website/docs/r/cdn_profile.html.markdown +++ b/website/docs/r/cdn_profile.html.markdown @@ -6,7 +6,7 @@ description: |- Create a CDN Profile to create a collection of CDN Endpoints. --- -# azurerm\_cdn\_profile +# azurerm_cdn_profile Create a CDN Profile to create a collection of CDN Endpoints. diff --git a/website/docs/r/container_group.html.markdown b/website/docs/r/container_group.html.markdown index ed844d63f11c..2f98942e95a9 100644 --- a/website/docs/r/container_group.html.markdown +++ b/website/docs/r/container_group.html.markdown @@ -6,7 +6,7 @@ description: |- Create as an Azure Container Group instance. --- -# azurerm\_container\_group +# azurerm_container_group Create as an Azure Container Group instance. diff --git a/website/docs/r/container_service.html.markdown b/website/docs/r/container_service.html.markdown index 3bb626b8e33f..26c6bec3da54 100644 --- a/website/docs/r/container_service.html.markdown +++ b/website/docs/r/container_service.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_container_service" sidebar_current: "docs-azurerm-resource-container-service" description: |- - Creates an Azure Container Service instance. + Manages an Azure Container Service instance. --- -# azurerm\_container\_service +# azurerm_container_service -Creates an Azure Container Service Instance +Manages an Azure Container Service Instance ~> **Note:** All arguments including the client secret will be stored in the raw state as plain-text. [Read more about sensitive data in state](/docs/state/sensitive-data.html). diff --git a/website/docs/r/cosmosdb_account.html.markdown b/website/docs/r/cosmosdb_account.html.markdown index becd31c93e0e..4bfa0f8ffafc 100644 --- a/website/docs/r/cosmosdb_account.html.markdown +++ b/website/docs/r/cosmosdb_account.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_cosmosdb_account" sidebar_current: "docs-azurerm-resource-cosmosdb-account" description: |- - Creates a new CosmosDB (formally DocumentDB) Account. + Manages a new CosmosDB (formally DocumentDB) Account. --- -# azurerm\_cosmos\_db\_account +# azurerm_cosmos_db_account -Creates a new CosmosDB (formally DocumentDB) Account. +Manages a new CosmosDB (formally DocumentDB) Account. ## Example Usage diff --git a/website/docs/r/dns_a_record.html.markdown b/website/docs/r/dns_a_record.html.markdown index 1b932530d4e7..7c91781ec84e 100644 --- a/website/docs/r/dns_a_record.html.markdown +++ b/website/docs/r/dns_a_record.html.markdown @@ -6,7 +6,7 @@ description: |- Create a DNS A Record. --- -# azurerm\_dns\_a\_record +# azurerm_dns_a_record Enables you to manage DNS A Records within Azure DNS. diff --git a/website/docs/r/dns_aaaa_record.html.markdown b/website/docs/r/dns_aaaa_record.html.markdown index 0b226b14002e..bdbcc94fe03e 100644 --- a/website/docs/r/dns_aaaa_record.html.markdown +++ b/website/docs/r/dns_aaaa_record.html.markdown @@ -6,7 +6,7 @@ description: |- Create a DNS AAAA Record. --- -# azurerm\_dns\_aaaa\_record +# azurerm_dns_aaaa_record Enables you to manage DNS AAAA Records within Azure DNS. diff --git a/website/docs/r/dns_cname_record.html.markdown b/website/docs/r/dns_cname_record.html.markdown index 2dff886f9f98..ffbed2c4014d 100644 --- a/website/docs/r/dns_cname_record.html.markdown +++ b/website/docs/r/dns_cname_record.html.markdown @@ -6,7 +6,7 @@ description: |- Create a DNS CNAME Record. --- -# azurerm\_dns\_cname\_record +# azurerm_dns_cname_record Enables you to manage DNS CNAME Records within Azure DNS. diff --git a/website/docs/r/dns_mx_record.html.markdown b/website/docs/r/dns_mx_record.html.markdown index b96549bcf3b9..ec613cfa0e0a 100644 --- a/website/docs/r/dns_mx_record.html.markdown +++ b/website/docs/r/dns_mx_record.html.markdown @@ -6,7 +6,7 @@ description: |- Manage a DNS MX Record. --- -# azurerm\_dns\_mx\_record +# azurerm_dns_mx_record Enables you to manage DNS MX Records within Azure DNS. diff --git a/website/docs/r/dns_ns_record.html.markdown b/website/docs/r/dns_ns_record.html.markdown index 2a8b8f0f1f09..402d8c4e7030 100644 --- a/website/docs/r/dns_ns_record.html.markdown +++ b/website/docs/r/dns_ns_record.html.markdown @@ -6,7 +6,7 @@ description: |- Create a DNS NS Record. --- -# azurerm\_dns\_ns\_record +# azurerm_dns_ns_record Enables you to manage DNS NS Records within Azure DNS. diff --git a/website/docs/r/dns_ptr_record.html.markdown b/website/docs/r/dns_ptr_record.html.markdown index d0dd172209cb..c87294f44071 100644 --- a/website/docs/r/dns_ptr_record.html.markdown +++ b/website/docs/r/dns_ptr_record.html.markdown @@ -6,7 +6,7 @@ description: |- Create a DNS PTR Record. --- -# azurerm\_dns\_ptr\_record +# azurerm_dns_ptr_record Enables you to manage DNS PTR Records within Azure DNS. diff --git a/website/docs/r/dns_srv_record.html.markdown b/website/docs/r/dns_srv_record.html.markdown index f2d63ef72395..944c725c3120 100644 --- a/website/docs/r/dns_srv_record.html.markdown +++ b/website/docs/r/dns_srv_record.html.markdown @@ -6,7 +6,7 @@ description: |- Manage a DNS SRV Record. --- -# azurerm\_dns\_srv\_record +# azurerm_dns_srv_record Enables you to manage DNS SRV Records within Azure DNS. diff --git a/website/docs/r/dns_txt_record.html.markdown b/website/docs/r/dns_txt_record.html.markdown index 35af3834ed3b..de198b2ac3c7 100644 --- a/website/docs/r/dns_txt_record.html.markdown +++ b/website/docs/r/dns_txt_record.html.markdown @@ -6,7 +6,7 @@ description: |- Create a DNS TXT Record. --- -# azurerm\_dns\_txt\_record +# azurerm_dns_txt_record Enables you to manage DNS TXT Records within Azure DNS. diff --git a/website/docs/r/dns_zone.html.markdown b/website/docs/r/dns_zone.html.markdown index 2b0514351162..c7bd1ef0b07a 100644 --- a/website/docs/r/dns_zone.html.markdown +++ b/website/docs/r/dns_zone.html.markdown @@ -6,7 +6,7 @@ description: |- Create a DNS Zone. --- -# azurerm\_dns\_zone +# azurerm_dns_zone Enables you to manage DNS zones within Azure DNS. These zones are hosted on Azure's name servers to which you can delegate the zone from the parent domain. diff --git a/website/docs/r/eventgrid_topic.html.markdown b/website/docs/r/eventgrid_topic.html.markdown index 2493c5143651..2884a91df3cb 100644 --- a/website/docs/r/eventgrid_topic.html.markdown +++ b/website/docs/r/eventgrid_topic.html.markdown @@ -7,7 +7,7 @@ description: |- --- -# azurerm\_eventgrid\_topic +# azurerm_eventgrid_topic Manages an EventGrid Topic diff --git a/website/docs/r/eventhub.html.markdown b/website/docs/r/eventhub.html.markdown index d231eccce357..6ef9fae9ee48 100644 --- a/website/docs/r/eventhub.html.markdown +++ b/website/docs/r/eventhub.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_eventhub" sidebar_current: "docs-azurerm-resource-eventhub" description: |- - Creates a new Event Hubs as a nested resource within an Event Hubs namespace. + Manages a new Event Hubs as a nested resource within an Event Hubs namespace. --- # azurerm_eventhub -Creates a new Event Hubs as a nested resource within a Event Hubs namespace. +Manages a new Event Hubs as a nested resource within a Event Hubs namespace. ## Example Usage diff --git a/website/docs/r/eventhub_authorization_rule.html.markdown b/website/docs/r/eventhub_authorization_rule.html.markdown index 1a544267eec9..63b292b09c9c 100644 --- a/website/docs/r/eventhub_authorization_rule.html.markdown +++ b/website/docs/r/eventhub_authorization_rule.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_eventhub_authorization_rule" sidebar_current: "docs-azurerm-resource-eventhub-authorization-rule" description: |- - Creates a new Event Hubs authorization Rule within an Event Hub. + Manages a new Event Hubs authorization Rule within an Event Hub. --- -# azurerm\_eventhub\_authorization\_rule +# azurerm_eventhub_authorization_rule -Creates a new Event Hubs authorization Rule within an Event Hub. +Manages a new Event Hubs authorization Rule within an Event Hub. ## Example Usage diff --git a/website/docs/r/eventhub_consumer_group.html.markdown b/website/docs/r/eventhub_consumer_group.html.markdown index 7a03c5c0bed0..24a07289dd92 100644 --- a/website/docs/r/eventhub_consumer_group.html.markdown +++ b/website/docs/r/eventhub_consumer_group.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_eventhub_consumer_group" sidebar_current: "docs-azurerm-resource-eventhub-consumer-group" description: |- - Creates a new Event Hubs Consumer Group as a nested resource within an Event Hub. + Manages a new Event Hubs Consumer Group as a nested resource within an Event Hub. --- -# azurerm\_eventhub\_consumer\_group +# azurerm_eventhub_consumer_group -Creates a new Event Hubs Consumer Group as a nested resource within an Event Hub. +Manages a new Event Hubs Consumer Group as a nested resource within an Event Hub. ## Example Usage diff --git a/website/docs/r/eventhub_namespace.html.markdown b/website/docs/r/eventhub_namespace.html.markdown index 8d7b959eb3e1..282d9d01a6f8 100644 --- a/website/docs/r/eventhub_namespace.html.markdown +++ b/website/docs/r/eventhub_namespace.html.markdown @@ -6,7 +6,7 @@ description: |- Create an EventHub Namespace. --- -# azurerm\_eventhub\_namespace +# azurerm_eventhub_namespace Create an EventHub Namespace. diff --git a/website/docs/r/express_route_circuit_authorization.html.markdown b/website/docs/r/express_route_circuit_authorization.html.markdown index baa13d0ae666..c866a9689703 100644 --- a/website/docs/r/express_route_circuit_authorization.html.markdown +++ b/website/docs/r/express_route_circuit_authorization.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_express_route_circuit_authorization" sidebar_current: "docs-azurerm-resource-network-express-route-circuit-authorization" description: |- - Creates an ExpressRoute Circuit Authorization. + Manages an ExpressRoute Circuit Authorization. --- # azurerm_express_route_circuit_authorization -Creates an ExpressRoute Circuit Authorization. +Manages an ExpressRoute Circuit Authorization. ## Example Usage diff --git a/website/docs/r/express_route_circuit_peering.html.markdown b/website/docs/r/express_route_circuit_peering.html.markdown index 26aced162fe9..80fa178006d5 100644 --- a/website/docs/r/express_route_circuit_peering.html.markdown +++ b/website/docs/r/express_route_circuit_peering.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_express_route_circuit_peering" sidebar_current: "docs-azurerm-resource-network-express-route-circuit-peering" description: |- - Creates an ExpressRoute Circuit Peering. + Manages an ExpressRoute Circuit Peering. --- # azurerm_express_route_circuit_peering -Creates an ExpressRoute Circuit Peering. +Manages an ExpressRoute Circuit Peering. ## Example Usage (Creating a Microsoft Peering) diff --git a/website/docs/r/image.html.markdown b/website/docs/r/image.html.markdown index 3a1ecb31b1a4..5b7bc26e024b 100644 --- a/website/docs/r/image.html.markdown +++ b/website/docs/r/image.html.markdown @@ -6,7 +6,7 @@ description: |- Create a custom virtual machine image that can be used to create virtual machines. --- -# azurerm\_image +# azurerm_image Create a custom virtual machine image that can be used to create virtual machines. diff --git a/website/docs/r/iothub.html.markdown b/website/docs/r/iothub.html.markdown index 42cc4540efa5..729267da036c 100644 --- a/website/docs/r/iothub.html.markdown +++ b/website/docs/r/iothub.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_iothub" sidebar_current: "docs-azurerm-resource-iothub" description: |- - Creates a new IotHub resource + Manages a new IotHub resource --- # azurerm_iothub -Creates a new IotHub +Manages a new IotHub ## Example Usage diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown index 0be4d53c6f7e..5fdcffb9fc0d 100644 --- a/website/docs/r/kubernetes_cluster.html.markdown +++ b/website/docs/r/kubernetes_cluster.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_kubernetes_cluster" sidebar_current: "docs-azurerm-resource-container-kubernetes-cluster" description: |- - Creates a managed Kubernetes Cluster (AKS) + Manages a managed Kubernetes Cluster (AKS) --- # azurerm_kubernetes_cluster -Creates a managed Kubernetes Cluster (AKS) +Manages a managed Kubernetes Cluster (AKS) ~> **Note:** All arguments including the client secret will be stored in the raw state as plain-text. [Read more about sensitive data in state](/docs/state/sensitive-data.html). diff --git a/website/docs/r/loadbalancer.html.markdown b/website/docs/r/loadbalancer.html.markdown index 6cec31b2d9e5..04a18311c977 100644 --- a/website/docs/r/loadbalancer.html.markdown +++ b/website/docs/r/loadbalancer.html.markdown @@ -6,7 +6,7 @@ description: |- Create a LoadBalancer Resource. --- -# azurerm\_lb +# azurerm_lb Create a LoadBalancer Resource. diff --git a/website/docs/r/loadbalancer_backend_address_pool.html.markdown b/website/docs/r/loadbalancer_backend_address_pool.html.markdown index f463b45b7689..4761d9f4507c 100644 --- a/website/docs/r/loadbalancer_backend_address_pool.html.markdown +++ b/website/docs/r/loadbalancer_backend_address_pool.html.markdown @@ -6,7 +6,7 @@ description: |- Create a LoadBalancer Backend Address Pool. --- -# azurerm\_lb\_backend\_address\_pool +# azurerm_lb_backend_address_pool Create a LoadBalancer Backend Address Pool. diff --git a/website/docs/r/loadbalancer_nat_pool.html.markdown b/website/docs/r/loadbalancer_nat_pool.html.markdown index 4bbb5338be5f..c48f43af9a4c 100644 --- a/website/docs/r/loadbalancer_nat_pool.html.markdown +++ b/website/docs/r/loadbalancer_nat_pool.html.markdown @@ -6,7 +6,7 @@ description: |- Create a LoadBalancer NAT Pool. --- -# azurerm\_lb\_nat\_pool +# azurerm_lb_nat_pool Create a LoadBalancer NAT pool. diff --git a/website/docs/r/loadbalancer_nat_rule.html.markdown b/website/docs/r/loadbalancer_nat_rule.html.markdown index 7bed9d2f90ca..19f56d2d18db 100644 --- a/website/docs/r/loadbalancer_nat_rule.html.markdown +++ b/website/docs/r/loadbalancer_nat_rule.html.markdown @@ -6,7 +6,7 @@ description: |- Create a LoadBalancer NAT Rule. --- -# azurerm\_lb\_nat\_rule +# azurerm_lb_nat_rule Create a LoadBalancer NAT Rule. diff --git a/website/docs/r/loadbalancer_probe.html.markdown b/website/docs/r/loadbalancer_probe.html.markdown index 1bfc6f3179a1..934729ee7105 100644 --- a/website/docs/r/loadbalancer_probe.html.markdown +++ b/website/docs/r/loadbalancer_probe.html.markdown @@ -6,7 +6,7 @@ description: |- Create a LoadBalancer Probe Resource. --- -# azurerm\_lb\_probe +# azurerm_lb_probe Create a LoadBalancer Probe Resource. diff --git a/website/docs/r/loadbalancer_rule.html.markdown b/website/docs/r/loadbalancer_rule.html.markdown index 380fbd7c3709..a41da3145b5c 100644 --- a/website/docs/r/loadbalancer_rule.html.markdown +++ b/website/docs/r/loadbalancer_rule.html.markdown @@ -6,7 +6,7 @@ description: |- Create a LoadBalancer Rule. --- -# azurerm\_lb\_rule +# azurerm_lb_rule Create a LoadBalancer Rule. diff --git a/website/docs/r/local_network_gateway.html.markdown b/website/docs/r/local_network_gateway.html.markdown index aa70030af281..422855a59181 100644 --- a/website/docs/r/local_network_gateway.html.markdown +++ b/website/docs/r/local_network_gateway.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_local_network_gateway" sidebar_current: "docs-azurerm-resource-network-local-network-gateway" description: |- - Creates a new local network gateway connection over which specific connections can be configured. + Manages a new local network gateway connection over which specific connections can be configured. --- -# azurerm\_local\_network\_gateway +# azurerm_local_network_gateway -Creates a new local network gateway connection over which specific connections can be configured. +Manages a new local network gateway connection over which specific connections can be configured. ## Example Usage diff --git a/website/docs/r/log_analytics_solution.html.markdown b/website/docs/r/log_analytics_solution.html.markdown index 6738b1b719a1..12266c4b4bd9 100644 --- a/website/docs/r/log_analytics_solution.html.markdown +++ b/website/docs/r/log_analytics_solution.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_log_analytics_solution" sidebar_current: "docs-azurerm-resource-oms-log-analytics-solution" description: |- - Creates a new Log Analytics (formally Operational Insights) Solution. + Manages a new Log Analytics (formally Operational Insights) Solution. --- # azurerm_log_analytics_solution -Creates a new Log Analytics (formally Operational Insights) Solution. +Manages a new Log Analytics (formally Operational Insights) Solution. ## Example Usage diff --git a/website/docs/r/log_analytics_workspace.html.markdown b/website/docs/r/log_analytics_workspace.html.markdown index 690856f653c7..4cf7d0d198e8 100644 --- a/website/docs/r/log_analytics_workspace.html.markdown +++ b/website/docs/r/log_analytics_workspace.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_log_analytics_workspace" sidebar_current: "docs-azurerm-resource-oms-log-analytics-workspace" description: |- - Creates a new Log Analytics (formally Operational Insights) Workspace. + Manages a new Log Analytics (formally Operational Insights) Workspace. --- # azurerm_log_analytics_workspace -Creates a new Log Analytics (formally Operational Insights) Workspace. +Manages a new Log Analytics (formally Operational Insights) Workspace. ## Example Usage diff --git a/website/docs/r/managed_disk.html.markdown b/website/docs/r/managed_disk.html.markdown index 32f772106a46..fe2b89899b7c 100644 --- a/website/docs/r/managed_disk.html.markdown +++ b/website/docs/r/managed_disk.html.markdown @@ -6,7 +6,7 @@ description: |- Create a Managed Disk. --- -# azurerm\_managed\_disk +# azurerm_managed_disk Create a managed disk. diff --git a/website/docs/r/mysql_database.html.markdown b/website/docs/r/mysql_database.html.markdown index 72c1e31a21a8..aecd88df531e 100644 --- a/website/docs/r/mysql_database.html.markdown +++ b/website/docs/r/mysql_database.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_mysql_database" sidebar_current: "docs-azurerm-resource-database-mysql-database" description: |- - Creates a MySQL Database within a MySQL Server. + Manages a MySQL Database within a MySQL Server. --- # azurerm_mysql_database -Creates a MySQL Database within a MySQL Server +Manages a MySQL Database within a MySQL Server ## Example Usage diff --git a/website/docs/r/mysql_firewall_rule.html.markdown b/website/docs/r/mysql_firewall_rule.html.markdown index 20988719ffd9..4126aaf9b942 100644 --- a/website/docs/r/mysql_firewall_rule.html.markdown +++ b/website/docs/r/mysql_firewall_rule.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_mysql_firewall_rule" sidebar_current: "docs-azurerm-resource-database-mysql-firewall-rule" description: |- - Creates a Firewall Rule for a MySQL Server. + Manages a Firewall Rule for a MySQL Server. --- # azurerm_mysql_firewall_rule -Creates a Firewall Rule for a MySQL Server +Manages a Firewall Rule for a MySQL Server ## Example Usage (Single IP Address) diff --git a/website/docs/r/policy_definition.html.markdown b/website/docs/r/policy_definition.html.markdown index ffa102473857..8274f489554c 100644 --- a/website/docs/r/policy_definition.html.markdown +++ b/website/docs/r/policy_definition.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_policy_definition" sidebar_current: "docs-azurerm-resource-policy-definition" description: |- - Creates a policy for all of the resource groups under the subscription. + Manages a policy for all of the resource groups under the subscription. --- # azurerm_policy_definition -Creates a policy for all of the resource groups under the subscription. +Manages a policy for all of the resource groups under the subscription. ## Example Usage diff --git a/website/docs/r/postgresql_configuration.html.markdown b/website/docs/r/postgresql_configuration.html.markdown index 49c6181f9e8f..a8c09b3e1c6b 100644 --- a/website/docs/r/postgresql_configuration.html.markdown +++ b/website/docs/r/postgresql_configuration.html.markdown @@ -6,7 +6,7 @@ description: |- Sets a PostgreSQL Configuration value on a PostgreSQL Server. --- -# azurerm\_postgresql\_configuration +# azurerm_postgresql_configuration Sets a PostgreSQL Configuration value on a PostgreSQL Server. diff --git a/website/docs/r/postgresql_database.html.markdown b/website/docs/r/postgresql_database.html.markdown index 73f50efe14fe..341e1cc4a264 100644 --- a/website/docs/r/postgresql_database.html.markdown +++ b/website/docs/r/postgresql_database.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_postgresql_database" sidebar_current: "docs-azurerm-resource-database-postgresql-database" description: |- - Creates a PostgreSQL Database within a PostgreSQL Server. + Manages a PostgreSQL Database within a PostgreSQL Server. --- -# azurerm\_postgresql\_database +# azurerm_postgresql_database -Creates a PostgreSQL Database within a PostgreSQL Server +Manages a PostgreSQL Database within a PostgreSQL Server ## Example Usage diff --git a/website/docs/r/postgresql_firewall_rule.html.markdown b/website/docs/r/postgresql_firewall_rule.html.markdown index a93a07e370b0..340e58fbb1ca 100644 --- a/website/docs/r/postgresql_firewall_rule.html.markdown +++ b/website/docs/r/postgresql_firewall_rule.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_postgresql_firewall_rule" sidebar_current: "docs-azurerm-resource-database-postgresql-firewall-rule" description: |- - Creates a Firewall Rule for a PostgreSQL Server. + Manages a Firewall Rule for a PostgreSQL Server. --- -# azurerm\_postgresql\_firewall\_rule +# azurerm_postgresql_firewall_rule -Creates a Firewall Rule for a PostgreSQL Server +Manages a Firewall Rule for a PostgreSQL Server ## Example Usage (Single IP Address) diff --git a/website/docs/r/postgresql_server.html.markdown b/website/docs/r/postgresql_server.html.markdown index e9525b89a450..d4d46e66fd48 100644 --- a/website/docs/r/postgresql_server.html.markdown +++ b/website/docs/r/postgresql_server.html.markdown @@ -6,7 +6,7 @@ description: |- Create a PostgreSQL Server. --- -# azurerm\_postgresql\_server +# azurerm_postgresql_server Create a PostgreSQL Server. diff --git a/website/docs/r/public_ip.html.markdown b/website/docs/r/public_ip.html.markdown index d9f65278b73e..63bacd024fca 100644 --- a/website/docs/r/public_ip.html.markdown +++ b/website/docs/r/public_ip.html.markdown @@ -6,7 +6,7 @@ description: |- Create a Public IP Address. --- -# azurerm\_public\_ip +# azurerm_public_ip Create a Public IP Address. diff --git a/website/docs/r/resource_group.html.markdown b/website/docs/r/resource_group.html.markdown index 22b6af415391..a4d49cd98eeb 100644 --- a/website/docs/r/resource_group.html.markdown +++ b/website/docs/r/resource_group.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_resource_group" sidebar_current: "docs-azurerm-resource-resource-group" description: |- - Creates a new resource group on Azure. + Manages a new resource group on Azure. --- -# azurerm\_resource\_group +# azurerm_resource_group -Creates a new resource group on Azure. +Manages a new resource group on Azure. ## Example Usage diff --git a/website/docs/r/search_service.html.markdown b/website/docs/r/search_service.html.markdown index 52b2b3bc31b4..0cc2418edcee 100644 --- a/website/docs/r/search_service.html.markdown +++ b/website/docs/r/search_service.html.markdown @@ -6,7 +6,7 @@ description: |- Manage a Search Service. --- -# azurerm\_search\_service +# azurerm_search_service Allows you to manage an Azure Search Service diff --git a/website/docs/r/servicebus_namespace.html.markdown b/website/docs/r/servicebus_namespace.html.markdown index 26a5c6b06881..48f0a8882423 100644 --- a/website/docs/r/servicebus_namespace.html.markdown +++ b/website/docs/r/servicebus_namespace.html.markdown @@ -6,7 +6,7 @@ description: |- Create a ServiceBus Namespace. --- -# azurerm\_servicebus\_namespace +# azurerm_servicebus_namespace Create a ServiceBus Namespace. diff --git a/website/docs/r/servicebus_queue.html.markdown b/website/docs/r/servicebus_queue.html.markdown index cb042bbc182e..7e2cfae876e2 100644 --- a/website/docs/r/servicebus_queue.html.markdown +++ b/website/docs/r/servicebus_queue.html.markdown @@ -6,7 +6,7 @@ description: |- Create a ServiceBus Queue. --- -# azurerm\_servicebus\_queue +# azurerm_servicebus_queue Create and manage a ServiceBus Queue. diff --git a/website/docs/r/servicebus_subscription.html.markdown b/website/docs/r/servicebus_subscription.html.markdown index db0a6b21ee72..addc95781578 100644 --- a/website/docs/r/servicebus_subscription.html.markdown +++ b/website/docs/r/servicebus_subscription.html.markdown @@ -6,7 +6,7 @@ description: |- Create a ServiceBus Subscription. --- -# azurerm\_servicebus\_subscription +# azurerm_servicebus_subscription Create a ServiceBus Subscription. diff --git a/website/docs/r/servicebus_topic.html.markdown b/website/docs/r/servicebus_topic.html.markdown index 329b2a6409f6..22fea453c3da 100644 --- a/website/docs/r/servicebus_topic.html.markdown +++ b/website/docs/r/servicebus_topic.html.markdown @@ -6,7 +6,7 @@ description: |- Create a ServiceBus Topic. --- -# azurerm\_servicebus\_topic +# azurerm_servicebus_topic Create a ServiceBus Topic. diff --git a/website/docs/r/servicebus_topic_authorization_rule.html.markdown b/website/docs/r/servicebus_topic_authorization_rule.html.markdown index 2c98a44d8c0e..3d109d073f02 100644 --- a/website/docs/r/servicebus_topic_authorization_rule.html.markdown +++ b/website/docs/r/servicebus_topic_authorization_rule.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_servicebus_topic_authorization_rule" sidebar_current: "docs-azurerm-resource-servicebus-topic-authorization-rule" description: |- - Creates a new ServiceBus Topic authorization Rule within a ServiceBus Topic. + Manages a new ServiceBus Topic authorization Rule within a ServiceBus Topic. --- # azurerm_servicebus_topic_authorization_rule -Creates a new ServiceBus Topic authorization Rule within a ServiceBus Topic. +Manages a new ServiceBus Topic authorization Rule within a ServiceBus Topic. ## Example Usage diff --git a/website/docs/r/sql_database.html.markdown b/website/docs/r/sql_database.html.markdown index 8d7cd1937b9b..4d402d27db35 100644 --- a/website/docs/r/sql_database.html.markdown +++ b/website/docs/r/sql_database.html.markdown @@ -6,7 +6,7 @@ description: |- Create a SQL Database. --- -# azurerm\_sql\_database +# azurerm_sql_database Allows you to manage an Azure SQL Database diff --git a/website/docs/r/sql_elasticpool.html.markdown b/website/docs/r/sql_elasticpool.html.markdown index 1d5d5bc487cf..0bcff6338dfb 100644 --- a/website/docs/r/sql_elasticpool.html.markdown +++ b/website/docs/r/sql_elasticpool.html.markdown @@ -6,7 +6,7 @@ description: |- Create a SQL Elastic Pool. --- -# azurerm\_sql\_elasticpool +# azurerm_sql_elasticpool Allows you to manage an Azure SQL Elastic Pool. diff --git a/website/docs/r/sql_server.html.markdown b/website/docs/r/sql_server.html.markdown index 65be0be70249..8dc8c01a2e9c 100644 --- a/website/docs/r/sql_server.html.markdown +++ b/website/docs/r/sql_server.html.markdown @@ -7,7 +7,7 @@ description: |- --- -# azurerm\_sql\_server +# azurerm_sql_server Manages a SQL Azure Database Server. diff --git a/website/docs/r/storage_blob.html.markdown b/website/docs/r/storage_blob.html.markdown index 6daf615e3deb..5e6f7d382153 100644 --- a/website/docs/r/storage_blob.html.markdown +++ b/website/docs/r/storage_blob.html.markdown @@ -6,7 +6,7 @@ description: |- Create a Azure Storage Blob. --- -# azurerm\_storage\_blob +# azurerm_storage_blob Create an Azure Storage Blob. diff --git a/website/docs/r/storage_container.html.markdown b/website/docs/r/storage_container.html.markdown index 9a4ef200075e..da769ac8e3c7 100644 --- a/website/docs/r/storage_container.html.markdown +++ b/website/docs/r/storage_container.html.markdown @@ -6,7 +6,7 @@ description: |- Create a Azure Storage Container. --- -# azurerm\_storage\_container +# azurerm_storage_container Create an Azure Storage Container. diff --git a/website/docs/r/storage_queue.html.markdown b/website/docs/r/storage_queue.html.markdown index 2dbe1ae0686a..d0fb9b350db3 100644 --- a/website/docs/r/storage_queue.html.markdown +++ b/website/docs/r/storage_queue.html.markdown @@ -6,7 +6,7 @@ description: |- Create a Azure Storage Queue. --- -# azurerm\_storage\_queue +# azurerm_storage_queue Create an Azure Storage Queue. diff --git a/website/docs/r/storage_share.html.markdown b/website/docs/r/storage_share.html.markdown index 4fa69f3352f3..5553d108962b 100644 --- a/website/docs/r/storage_share.html.markdown +++ b/website/docs/r/storage_share.html.markdown @@ -6,7 +6,7 @@ description: |- Create an Azure Storage Share. --- -# azurerm\_storage\_share +# azurerm_storage_share Create an Azure Storage File Share. diff --git a/website/docs/r/storage_table.html.markdown b/website/docs/r/storage_table.html.markdown index 99343206c39d..181329510da3 100644 --- a/website/docs/r/storage_table.html.markdown +++ b/website/docs/r/storage_table.html.markdown @@ -6,7 +6,7 @@ description: |- Create a Azure Storage Table. --- -# azurerm\_storage\_table +# azurerm_storage_table Create an Azure Storage Table. diff --git a/website/docs/r/template_deployment.html.markdown b/website/docs/r/template_deployment.html.markdown index 88f454b4a44d..9a07e56ae189 100644 --- a/website/docs/r/template_deployment.html.markdown +++ b/website/docs/r/template_deployment.html.markdown @@ -6,7 +6,7 @@ description: |- Create a template deployment of resources. --- -# azurerm\_template\_deployment +# azurerm_template_deployment Create a template deployment of resources diff --git a/website/docs/r/traffic_manager_endpoint.html.markdown b/website/docs/r/traffic_manager_endpoint.html.markdown index f8f6492a5200..8b4c58d24680 100644 --- a/website/docs/r/traffic_manager_endpoint.html.markdown +++ b/website/docs/r/traffic_manager_endpoint.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_traffic_manager_endpoint" sidebar_current: "docs-azurerm-resource-network-traffic-manager-endpoint" description: |- - Creates a Traffic Manager Endpoint. + Manages a Traffic Manager Endpoint. --- # azurerm_traffic_manager_endpoint -Creates a Traffic Manager Endpoint. +Manages a Traffic Manager Endpoint. ## Example Usage diff --git a/website/docs/r/traffic_manager_profile.html.markdown b/website/docs/r/traffic_manager_profile.html.markdown index 967d655f0a91..7b03f7404675 100644 --- a/website/docs/r/traffic_manager_profile.html.markdown +++ b/website/docs/r/traffic_manager_profile.html.markdown @@ -3,13 +3,13 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_traffic_manager_profile" sidebar_current: "docs-azurerm-resource-network-traffic-manager-profile" description: |- - Creates a Traffic Manager Profile. + Manages a Traffic Manager Profile. --- # azurerm_traffic_manager_profile -Creates a Traffic Manager Profile to which multiple endpoints can be attached. +Manages a Traffic Manager Profile to which multiple endpoints can be attached. ## Example Usage diff --git a/website/docs/r/virtual_machine.html.markdown b/website/docs/r/virtual_machine.html.markdown index 43c948d44df1..aa029238e058 100644 --- a/website/docs/r/virtual_machine.html.markdown +++ b/website/docs/r/virtual_machine.html.markdown @@ -6,7 +6,7 @@ description: |- Create a Virtual Machine. --- -# azurerm\_virtual\_machine +# azurerm_virtual_machine Create a virtual machine. diff --git a/website/docs/r/virtual_machine_extension.html.markdown b/website/docs/r/virtual_machine_extension.html.markdown index 9316f9826cd2..3e7bb7064d02 100644 --- a/website/docs/r/virtual_machine_extension.html.markdown +++ b/website/docs/r/virtual_machine_extension.html.markdown @@ -3,13 +3,13 @@ layout: "azurerm" page_title: "Azure Resource Manager: azure_virtual_machine_extension" sidebar_current: "docs-azurerm-resource-compute-virtualmachine-extension" description: |- - Creates a new Virtual Machine Extension to provide post deployment + Manages a new Virtual Machine Extension to provide post deployment configuration and run automated tasks. --- # azurerm_virtual_machine_extension -Creates a new Virtual Machine Extension to provide post deployment configuration +Manages a new Virtual Machine Extension to provide post deployment configuration and run automated tasks. ~> **Please Note:** The CustomScript extensions for Linux & Windows require that the `commandToExecute` returns a `0` exit code to be classified as successfully deployed. You can achieve this by appending `exit 0` to the end of your `commandToExecute`. diff --git a/website/docs/r/virtual_network.html.markdown b/website/docs/r/virtual_network.html.markdown index 9c6c8d616823..e66e082930a4 100644 --- a/website/docs/r/virtual_network.html.markdown +++ b/website/docs/r/virtual_network.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azure_virtual_network" sidebar_current: "docs-azurerm-resource-network-virtual-network" description: |- - Creates a new virtual network including any configured subnets. Each subnet can optionally be configured with a security group to be associated with the subnet. + Manages a new virtual network including any configured subnets. Each subnet can optionally be configured with a security group to be associated with the subnet. --- -# azurerm\_virtual\_network +# azurerm_virtual_network -Creates a new virtual network including any configured subnets. Each subnet can +Manages a new virtual network including any configured subnets. Each subnet can optionally be configured with a security group to be associated with the subnet. ~> **NOTE on Virtual Networks and Subnet's:** Terraform currently diff --git a/website/docs/r/virtual_network_gateway.html.markdown b/website/docs/r/virtual_network_gateway.html.markdown index 40a0c1111ec7..bbb306f1c3bf 100644 --- a/website/docs/r/virtual_network_gateway.html.markdown +++ b/website/docs/r/virtual_network_gateway.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azure_virtual_network_gateway" sidebar_current: "docs-azurerm-resource-network-virtual-network-gateway-x" description: |- - Creates a new virtual network gateway to establish secure, cross-premises connectivity. + Manages a new virtual network gateway to establish secure, cross-premises connectivity. --- # azurerm_virtual_network_gateway -Creates a new Virtual Network Gateway to establish secure, cross-premises connectivity. +Manages a new Virtual Network Gateway to establish secure, cross-premises connectivity. -> **Note:** Please be aware that provisioning a Virtual Network Gateway takes a long time (between 30 minutes and 1 hour) diff --git a/website/docs/r/virtual_network_gateway_connection.html.markdown b/website/docs/r/virtual_network_gateway_connection.html.markdown index 85327a9397c9..9d5e9c28feb4 100644 --- a/website/docs/r/virtual_network_gateway_connection.html.markdown +++ b/website/docs/r/virtual_network_gateway_connection.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azure_virtual_network_gateway_connection" sidebar_current: "docs-azurerm-resource-network-virtual-network-gateway-connection" description: |- - Creates a new connection in an existing Virtual Network Gateway. + Manages a new connection in an existing Virtual Network Gateway. --- # azurerm_virtual_network_gateway_connection -Creates a new connection in an existing Virtual Network Gateway. +Manages a new connection in an existing Virtual Network Gateway. ## Example Usage diff --git a/website/docs/r/virtual_network_peering.html.markdown b/website/docs/r/virtual_network_peering.html.markdown index 7b362d2a103d..b3bd11280701 100644 --- a/website/docs/r/virtual_network_peering.html.markdown +++ b/website/docs/r/virtual_network_peering.html.markdown @@ -3,13 +3,13 @@ layout: "azurerm" page_title: "Azure Resource Manager: azure_virtual_network_peering" sidebar_current: "docs-azurerm-resource-network-virtual-network-peering" description: |- - Creates a new virtual network peering which allows resources to access other + Manages a new virtual network peering which allows resources to access other resources in the linked virtual network. --- -# azurerm\_virtual\_network\_peering +# azurerm_virtual_network_peering -Creates a new virtual network peering which allows resources to access other +Manages a new virtual network peering which allows resources to access other resources in the linked virtual network. ## Example Usage From 6868a7ca028a8d43d536498e8668418fa87db35d Mon Sep 17 00:00:00 2001 From: Jeffrey Cline Date: Wed, 23 May 2018 02:55:59 -0700 Subject: [PATCH 161/320] Update PostgreSQL to GA 2017-12-01 API (#1190) * Update PostgreSQL to GA 2017-12-01 API * Added TestCheckResourceAttr for create_mode to tests * Removed CreateMode from schema, updated tests and documentation to match * Removed createmode validation from tests * Removed createmode from two hcl sections * Refactoring * Documentation tweaks * Refactoring to handle updating SKU's - Switching SKU to a List instead of a Set - Support for updating the Capacity of a Given SKU - Tests to update the SKU's for Postgresql/MySql * Splitting password change out into it's own method --- azurerm/config.go | 2 +- azurerm/import_arm_postgresql_server_test.go | 30 +- azurerm/resource_arm_mysql_server.go | 46 ++-- azurerm/resource_arm_mysql_server_test.go | 63 +++++ .../resource_arm_postgresql_configuration.go | 2 +- ...ource_arm_postgresql_configuration_test.go | 12 +- azurerm/resource_arm_postgresql_database.go | 2 +- .../resource_arm_postgresql_database_test.go | 12 +- .../resource_arm_postgresql_firewall_rule.go | 2 +- ...ource_arm_postgresql_firewall_rule_test.go | 12 +- azurerm/resource_arm_postgresql_server.go | 257 ++++++++++++------ .../resource_arm_postgresql_server_test.go | 189 +++++++++++-- .../postgresql/performancetiers.go | 104 ------- .../postgresql/checknameavailability.go | 8 +- .../postgresql/client.go | 4 +- .../postgresql/configurations.go | 34 ++- .../postgresql/databases.go | 46 ++-- .../postgresql/firewallrules.go | 45 +-- .../locationbasedperformancetier.go | 8 +- .../postgresql/logfiles.go | 12 +- .../postgresql/models.go | 207 +++++++++++--- .../postgresql/operations.go | 5 +- .../postgresql/servers.go | 58 ++-- .../postgresql/version.go | 2 +- vendor/vendor.json | 12 +- .../r/postgresql_configuration.html.markdown | 11 +- .../docs/r/postgresql_database.html.markdown | 11 +- .../docs/r/postgresql_server.html.markdown | 62 ++--- 28 files changed, 819 insertions(+), 439 deletions(-) delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/performancetiers.go rename vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/{2017-04-30-preview => 2017-12-01}/postgresql/checknameavailability.go (96%) rename vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/{2017-04-30-preview => 2017-12-01}/postgresql/client.go (96%) rename vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/{2017-04-30-preview => 2017-12-01}/postgresql/configurations.go (90%) rename vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/{2017-04-30-preview => 2017-12-01}/postgresql/databases.go (90%) rename vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/{2017-04-30-preview => 2017-12-01}/postgresql/firewallrules.go (91%) rename vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/{2017-04-30-preview => 2017-12-01}/postgresql/locationbasedperformancetier.go (96%) rename vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/{2017-04-30-preview => 2017-12-01}/postgresql/logfiles.go (92%) rename vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/{2017-04-30-preview => 2017-12-01}/postgresql/models.go (86%) rename vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/{2017-04-30-preview => 2017-12-01}/postgresql/operations.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/{2017-04-30-preview => 2017-12-01}/postgresql/servers.go (91%) rename vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/{2017-04-30-preview => 2017-12-01}/postgresql/version.go (98%) diff --git a/azurerm/config.go b/azurerm/config.go index 9ec4a728eae9..b0f9851fb768 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -32,7 +32,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" "github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights" "github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement" - "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql" + "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql" "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices" "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis" "github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay" diff --git a/azurerm/import_arm_postgresql_server_test.go b/azurerm/import_arm_postgresql_server_test.go index 6a178b8ae860..b349e7759f0a 100644 --- a/azurerm/import_arm_postgresql_server_test.go +++ b/azurerm/import_arm_postgresql_server_test.go @@ -59,11 +59,37 @@ func TestAccAzureRMPostgreSQLServer_importBasicNinePointSix(t *testing.T) { }) } -func TestAccAzureRMPostgreSQLServer_importStandard(t *testing.T) { +func TestAccAzureRMPostgreSQLServer_importGeneralPurpose(t *testing.T) { resourceName := "azurerm_postgresql_server.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLServer_standard(ri, testLocation()) + config := testAccAzureRMPostgreSQLServer_generalPurpose(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLServerDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "administrator_login_password", // not returned as sensitive + }, + }, + }, + }) +} + +func TestAccAzureRMPostgreSQLServer_importMemoryOptimized(t *testing.T) { + resourceName := "azurerm_postgresql_server.test" + + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLServer_memoryOptimized(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/azurerm/resource_arm_mysql_server.go b/azurerm/resource_arm_mysql_server.go index b632382f4fe8..3044d1889a9c 100644 --- a/azurerm/resource_arm_mysql_server.go +++ b/azurerm/resource_arm_mysql_server.go @@ -32,7 +32,7 @@ func resourceArmMySqlServer() *schema.Resource { "resource_group_name": resourceGroupNameSchema(), "sku": { - Type: schema.TypeSet, + Type: schema.TypeList, Required: true, MaxItems: 1, Elem: &schema.Resource{ @@ -67,6 +67,7 @@ func resourceArmMySqlServer() *schema.Resource { Type: schema.TypeInt, Required: true, ValidateFunc: validateIntInSlice([]int{ + 1, 2, 4, 8, @@ -78,6 +79,7 @@ func resourceArmMySqlServer() *schema.Resource { "tier": { Type: schema.TypeString, Required: true, + ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ string(mysql.Basic), string(mysql.GeneralPurpose), @@ -89,6 +91,7 @@ func resourceArmMySqlServer() *schema.Resource { "family": { Type: schema.TypeString, Required: true, + ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ "Gen4", "Gen5", @@ -190,7 +193,7 @@ func resourceArmMySqlServerCreate(d *schema.ResourceData, meta interface{}) erro tags := d.Get("tags").(map[string]interface{}) sku := expandMySQLServerSku(d) - storageprofile := expandMySQLStorageProfile(d) + storageProfile := expandMySQLStorageProfile(d) properties := mysql.ServerForCreate{ Location: &location, @@ -199,7 +202,7 @@ func resourceArmMySqlServerCreate(d *schema.ResourceData, meta interface{}) erro AdministratorLoginPassword: utils.String(adminLoginPassword), Version: mysql.ServerVersion(version), SslEnforcement: mysql.SslEnforcementEnum(sslEnforcement), - StorageProfile: storageprofile, + StorageProfile: storageProfile, CreateMode: mysql.CreateMode(createMode), }, Sku: sku, @@ -208,20 +211,21 @@ func resourceArmMySqlServerCreate(d *schema.ResourceData, meta interface{}) erro future, err := client.Create(ctx, resourceGroup, name, properties) if err != nil { - return err + return fmt.Errorf("Error creating MySQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } err = future.WaitForCompletion(ctx, client.Client) if err != nil { - return err + return fmt.Errorf("Error waiting for creation of MySQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } read, err := client.Get(ctx, resourceGroup, name) if err != nil { - return err + return fmt.Errorf("Error retrieving MySQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } + if read.ID == nil { - return fmt.Errorf("Cannot read MySQL Server %q (resource group %q) ID", name, resourceGroup) + return fmt.Errorf("Cannot read MySQL Server %q (Resource Group %q) ID", name, resourceGroup) } d.SetId(*read.ID) @@ -242,12 +246,12 @@ func resourceArmMySqlServerUpdate(d *schema.ResourceData, meta interface{}) erro sslEnforcement := d.Get("ssl_enforcement").(string) version := d.Get("version").(string) sku := expandMySQLServerSku(d) - storageprofile := expandMySQLStorageProfile(d) + storageProfile := expandMySQLStorageProfile(d) tags := d.Get("tags").(map[string]interface{}) properties := mysql.ServerUpdateParameters{ ServerUpdateParametersProperties: &mysql.ServerUpdateParametersProperties{ - StorageProfile: storageprofile, + StorageProfile: storageProfile, AdministratorLoginPassword: utils.String(adminLoginPassword), Version: mysql.ServerVersion(version), SslEnforcement: mysql.SslEnforcementEnum(sslEnforcement), @@ -258,20 +262,21 @@ func resourceArmMySqlServerUpdate(d *schema.ResourceData, meta interface{}) erro future, err := client.Update(ctx, resourceGroup, name, properties) if err != nil { - return err + return fmt.Errorf("Error updating MySQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } err = future.WaitForCompletion(ctx, client.Client) if err != nil { - return err + return fmt.Errorf("Error waiting for MySQL Server %q (Resource Group %q) to finish updating: %+v", name, resourceGroup, err) } read, err := client.Get(ctx, resourceGroup, name) if err != nil { - return err + return fmt.Errorf("Error retrieving MySQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } + if read.ID == nil { - return fmt.Errorf("Cannot read MySQL Server %q (resource group %q) ID", name, resourceGroup) + return fmt.Errorf("Cannot read MySQL Server %q (Resource Group %q) ID", name, resourceGroup) } d.SetId(*read.ID) @@ -296,6 +301,7 @@ func resourceArmMySqlServerRead(d *schema.ResourceData, meta interface{}) error d.SetId("") return nil } + return fmt.Errorf("Error making Read request on Azure MySQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } @@ -310,11 +316,11 @@ func resourceArmMySqlServerRead(d *schema.ResourceData, meta interface{}) error d.Set("version", string(resp.Version)) d.Set("ssl_enforcement", string(resp.SslEnforcement)) - if err := d.Set("sku", flattenMySQLServerSku(d, resp.Sku)); err != nil { + if err := d.Set("sku", flattenMySQLServerSku(resp.Sku)); err != nil { return fmt.Errorf("Error flattening `sku`: %+v", err) } - if err := d.Set("storage_profile", flattenMySQLStorageProfile(d, resp.StorageProfile)); err != nil { + if err := d.Set("storage_profile", flattenMySQLStorageProfile(resp.StorageProfile)); err != nil { return fmt.Errorf("Error flattening `storage_profile`: %+v", err) } @@ -339,19 +345,19 @@ func resourceArmMySqlServerDelete(d *schema.ResourceData, meta interface{}) erro future, err := client.Delete(ctx, resourceGroup, name) if err != nil { - return err + return fmt.Errorf("Error deleting MySQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } err = future.WaitForCompletion(ctx, client.Client) if err != nil { - return err + return fmt.Errorf("Error waiting for deletion of MySQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } return nil } func expandMySQLServerSku(d *schema.ResourceData) *mysql.Sku { - skus := d.Get("sku").(*schema.Set).List() + skus := d.Get("sku").([]interface{}) sku := skus[0].(map[string]interface{}) name := sku["name"].(string) @@ -382,7 +388,7 @@ func expandMySQLStorageProfile(d *schema.ResourceData) *mysql.StorageProfile { } } -func flattenMySQLServerSku(d *schema.ResourceData, resp *mysql.Sku) []interface{} { +func flattenMySQLServerSku(resp *mysql.Sku) []interface{} { values := map[string]interface{}{} if name := resp.Name; name != nil { @@ -402,7 +408,7 @@ func flattenMySQLServerSku(d *schema.ResourceData, resp *mysql.Sku) []interface{ return []interface{}{values} } -func flattenMySQLStorageProfile(d *schema.ResourceData, resp *mysql.StorageProfile) []interface{} { +func flattenMySQLStorageProfile(resp *mysql.StorageProfile) []interface{} { values := map[string]interface{}{} if storageMB := resp.StorageMB; storageMB != nil { diff --git a/azurerm/resource_arm_mysql_server_test.go b/azurerm/resource_arm_mysql_server_test.go index 82df525d9d5d..c34fb5476313 100644 --- a/azurerm/resource_arm_mysql_server_test.go +++ b/azurerm/resource_arm_mysql_server_test.go @@ -90,6 +90,36 @@ func TestAccAzureRMMySqlServer_memoryOptimized(t *testing.T) { }) } +func TestAccAzureRMMySQLServer_basicFiveSevenUpdated(t *testing.T) { + resourceName := "azurerm_mysql_server.test" + ri := acctest.RandInt() + location := testLocation() + config := testAccAzureRMMySQLServer_basicFiveSeven(ri, location) + updatedConfig := testAccAzureRMMySQLServer_basicFiveSevenUpdated(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMySQLServerDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMySQLServerExists(resourceName), + ), + }, + { + Config: updatedConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMySQLServerExists(resourceName), + ), + }, + }, + }) +} + +// + func testCheckAzureRMMySQLServerExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API @@ -211,6 +241,39 @@ resource "azurerm_mysql_server" "test" { `, rInt, location, rInt) } +func testAccAzureRMMySQLServer_basicFiveSevenUpdated(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_mysql_server" "test" { + name = "acctestmysqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "B_Gen5_1" + capacity = 1 + tier = "Basic" + family = "Gen5" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "5.7" + ssl_enforcement = "Enabled" +} +`, rInt, location, rInt) +} + func testAccAzureRMMySQLServer_generalPurpose(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/azurerm/resource_arm_postgresql_configuration.go b/azurerm/resource_arm_postgresql_configuration.go index e26895e4e2b1..a4fb229bbef6 100644 --- a/azurerm/resource_arm_postgresql_configuration.go +++ b/azurerm/resource_arm_postgresql_configuration.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql" + "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go index 7073e87b5865..bd63d3ce5bfd 100644 --- a/azurerm/resource_arm_postgresql_configuration_test.go +++ b/azurerm/resource_arm_postgresql_configuration_test.go @@ -223,15 +223,21 @@ resource "azurerm_postgresql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "9.6" - storage_mb = 51200 ssl_enforcement = "Enabled" } `, rInt, location, rInt) diff --git a/azurerm/resource_arm_postgresql_database.go b/azurerm/resource_arm_postgresql_database.go index e0d4e968244a..a331e0257985 100644 --- a/azurerm/resource_arm_postgresql_database.go +++ b/azurerm/resource_arm_postgresql_database.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql" + "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" diff --git a/azurerm/resource_arm_postgresql_database_test.go b/azurerm/resource_arm_postgresql_database_test.go index c74294f26c33..2f59a69d82a9 100644 --- a/azurerm/resource_arm_postgresql_database_test.go +++ b/azurerm/resource_arm_postgresql_database_test.go @@ -105,15 +105,21 @@ resource "azurerm_postgresql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "9.6" - storage_mb = 51200 ssl_enforcement = "Enabled" } diff --git a/azurerm/resource_arm_postgresql_firewall_rule.go b/azurerm/resource_arm_postgresql_firewall_rule.go index 8e93fb4c65c7..2b06c3426360 100644 --- a/azurerm/resource_arm_postgresql_firewall_rule.go +++ b/azurerm/resource_arm_postgresql_firewall_rule.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql" + "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" diff --git a/azurerm/resource_arm_postgresql_firewall_rule_test.go b/azurerm/resource_arm_postgresql_firewall_rule_test.go index a7dce5b184d7..57e279e00ca3 100644 --- a/azurerm/resource_arm_postgresql_firewall_rule_test.go +++ b/azurerm/resource_arm_postgresql_firewall_rule_test.go @@ -105,15 +105,21 @@ resource "azurerm_postgresql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "9.6" - storage_mb = 51200 ssl_enforcement = "Enabled" } diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go index f4dc7ed0b37c..20efde417992 100644 --- a/azurerm/resource_arm_postgresql_server.go +++ b/azurerm/resource_arm_postgresql_server.go @@ -3,9 +3,8 @@ package azurerm import ( "fmt" "log" - "strconv" - "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql" + "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" @@ -34,7 +33,7 @@ func resourceArmPostgreSQLServer() *schema.Resource { "resource_group_name": resourceGroupNameSchema(), "sku": { - Type: schema.TypeSet, + Type: schema.TypeList, Required: true, MaxItems: 1, Elem: &schema.Resource{ @@ -43,12 +42,24 @@ func resourceArmPostgreSQLServer() *schema.Resource { Type: schema.TypeString, Required: true, ValidateFunc: validation.StringInSlice([]string{ - "PGSQLB50", - "PGSQLB100", - "PGSQLS100", - "PGSQLS200", - "PGSQLS400", - "PGSQLS800", + "B_Gen4_1", + "B_Gen4_2", + "B_Gen5_1", + "B_Gen5_2", + "GP_Gen4_2", + "GP_Gen4_4", + "GP_Gen4_8", + "GP_Gen4_16", + "GP_Gen4_32", + "GP_Gen5_2", + "GP_Gen5_4", + "GP_Gen5_8", + "GP_Gen5_16", + "GP_Gen5_32", + "MO_Gen5_2", + "MO_Gen5_4", + "MO_Gen5_8", + "MO_Gen5_16", }, true), DiffSuppressFunc: ignoreCaseDiffSuppressFunc, }, @@ -57,20 +68,34 @@ func resourceArmPostgreSQLServer() *schema.Resource { Type: schema.TypeInt, Required: true, ValidateFunc: validateIntInSlice([]int{ - 50, - 100, - 200, - 400, - 800, + 1, + 2, + 4, + 8, + 16, + 32, }), }, "tier": { Type: schema.TypeString, Required: true, + ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ string(postgresql.Basic), - string(postgresql.Standard), + string(postgresql.GeneralPurpose), + string(postgresql.MemoryOptimized), + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + + "family": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + "Gen4", + "Gen5", }, true), DiffSuppressFunc: ignoreCaseDiffSuppressFunc, }, @@ -93,39 +118,44 @@ func resourceArmPostgreSQLServer() *schema.Resource { "version": { Type: schema.TypeString, Required: true, + ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ string(postgresql.NineFullStopFive), string(postgresql.NineFullStopSix), }, true), DiffSuppressFunc: ignoreCaseDiffSuppressFunc, - ForceNew: true, }, - "storage_mb": { - Type: schema.TypeInt, + "storage_profile": { + Type: schema.TypeList, Required: true, - ForceNew: true, - ValidateFunc: validateIntInSlice([]int{ - // Basic SKU - 51200, - 179200, - 307200, - 435200, - 563200, - 691200, - 819200, - 947200, - - // Standard SKU - 128000, - 256000, - 384000, - 512000, - 640000, - 768000, - 896000, - 1024000, - }), + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "storage_mb": { + Type: schema.TypeInt, + Required: true, + ForceNew: true, + ValidateFunc: validateIntBetweenDivisibleBy(5120, 1048576, 1024), + }, + + "backup_retention_days": { + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntBetween(7, 35), + }, + + "geo_redundant_backup": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + "Enabled", + "Disabled", + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + }, + }, }, "ssl_enforcement": { @@ -156,48 +186,49 @@ func resourceArmPostgreSQLServerCreate(d *schema.ResourceData, meta interface{}) name := d.Get("name").(string) location := azureRMNormalizeLocation(d.Get("location").(string)) - resGroup := d.Get("resource_group_name").(string) + resourceGroup := d.Get("resource_group_name").(string) adminLogin := d.Get("administrator_login").(string) adminLoginPassword := d.Get("administrator_login_password").(string) sslEnforcement := d.Get("ssl_enforcement").(string) version := d.Get("version").(string) - storageMB := d.Get("storage_mb").(int) - + createMode := "Default" tags := d.Get("tags").(map[string]interface{}) - sku := expandAzureRmPostgreSQLServerSku(d, storageMB) + sku := expandAzureRmPostgreSQLServerSku(d) + storageProfile := expandAzureRmPostgreSQLStorageProfile(d) properties := postgresql.ServerForCreate{ Location: &location, - Sku: sku, Properties: &postgresql.ServerPropertiesForDefaultCreate{ - Version: postgresql.ServerVersion(version), - StorageMB: utils.Int64(int64(storageMB)), - SslEnforcement: postgresql.SslEnforcementEnum(sslEnforcement), AdministratorLogin: utils.String(adminLogin), AdministratorLoginPassword: utils.String(adminLoginPassword), - CreateMode: postgresql.CreateModeDefault, + Version: postgresql.ServerVersion(version), + SslEnforcement: postgresql.SslEnforcementEnum(sslEnforcement), + StorageProfile: storageProfile, + CreateMode: postgresql.CreateMode(createMode), }, + Sku: sku, Tags: expandTags(tags), } - future, err := client.Create(ctx, resGroup, name, properties) + future, err := client.Create(ctx, resourceGroup, name, properties) if err != nil { - return err + return fmt.Errorf("Error creating PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } err = future.WaitForCompletion(ctx, client.Client) if err != nil { - return err + return fmt.Errorf("Error waiting for creation of PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } - read, err := client.Get(ctx, resGroup, name) + read, err := client.Get(ctx, resourceGroup, name) if err != nil { - return err + return fmt.Errorf("Error retrieving PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } + if read.ID == nil { - return fmt.Errorf("Cannot read PostgreSQL Server %s (resource group %s) ID", name, resGroup) + return fmt.Errorf("Cannot read PostgreSQL Server %q (Resource Group %q) ID", name, resourceGroup) } d.SetId(*read.ID) @@ -212,43 +243,43 @@ func resourceArmPostgreSQLServerUpdate(d *schema.ResourceData, meta interface{}) log.Printf("[INFO] preparing arguments for AzureRM PostgreSQL Server update.") name := d.Get("name").(string) - resGroup := d.Get("resource_group_name").(string) + resourceGroup := d.Get("resource_group_name").(string) adminLoginPassword := d.Get("administrator_login_password").(string) sslEnforcement := d.Get("ssl_enforcement").(string) version := d.Get("version").(string) - storageMB := d.Get("storage_mb").(int) - sku := expandAzureRmPostgreSQLServerSku(d, storageMB) - + sku := expandAzureRmPostgreSQLServerSku(d) + storageProfile := expandAzureRmPostgreSQLStorageProfile(d) tags := d.Get("tags").(map[string]interface{}) properties := postgresql.ServerUpdateParameters{ - Sku: sku, ServerUpdateParametersProperties: &postgresql.ServerUpdateParametersProperties{ - SslEnforcement: postgresql.SslEnforcementEnum(sslEnforcement), - StorageMB: utils.Int64(int64(storageMB)), - Version: postgresql.ServerVersion(version), + StorageProfile: storageProfile, AdministratorLoginPassword: utils.String(adminLoginPassword), + Version: postgresql.ServerVersion(version), + SslEnforcement: postgresql.SslEnforcementEnum(sslEnforcement), }, + Sku: sku, Tags: expandTags(tags), } - future, err := client.Update(ctx, resGroup, name, properties) + future, err := client.Update(ctx, resourceGroup, name, properties) if err != nil { - return err + return fmt.Errorf("Error updating PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } err = future.WaitForCompletion(ctx, client.Client) if err != nil { - return err + return fmt.Errorf("Error waiting for update of PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } - read, err := client.Get(ctx, resGroup, name) + read, err := client.Get(ctx, resourceGroup, name) if err != nil { - return err + return fmt.Errorf("Error retrieving PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } + if read.ID == nil { - return fmt.Errorf("Cannot read PostgreSQL Server %s (resource group %s) ID", name, resGroup) + return fmt.Errorf("Cannot read PostgreSQL Server %s (resource group %s) ID", name, resourceGroup) } d.SetId(*read.ID) @@ -264,31 +295,38 @@ func resourceArmPostgreSQLServerRead(d *schema.ResourceData, meta interface{}) e if err != nil { return err } - resGroup := id.ResourceGroup + resourceGroup := id.ResourceGroup name := id.Path["servers"] - resp, err := client.Get(ctx, resGroup, name) + resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[WARN] PostgreSQL Server '%s' was not found (resource group '%s')", name, resGroup) + log.Printf("[WARN] PostgreSQL Server %q was not found (resource group %q)", name, resourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error making Read request on Azure PostgreSQL Server %s: %+v", name, err) + return fmt.Errorf("Error making Read request on Azure PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } d.Set("name", resp.Name) - d.Set("resource_group_name", resGroup) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { d.Set("location", azureRMNormalizeLocation(*location)) } d.Set("administrator_login", resp.AdministratorLogin) d.Set("version", string(resp.Version)) - d.Set("storage_mb", int(*resp.StorageMB)) d.Set("ssl_enforcement", string(resp.SslEnforcement)) - d.Set("sku", flattenPostgreSQLServerSku(resp.Sku)) + + if err := d.Set("sku", flattenPostgreSQLServerSku(resp.Sku)); err != nil { + return fmt.Errorf("Error flattening `sku`: %+v", err) + } + + if err := d.Set("storage_profile", flattenPostgreSQLStorageProfile(resp.StorageProfile)); err != nil { + return fmt.Errorf("Error flattening `storage_profile`: %+v", err) + } flattenAndSetTags(d, resp.Tags) @@ -306,15 +344,16 @@ func resourceArmPostgreSQLServerDelete(d *schema.ResourceData, meta interface{}) if err != nil { return err } - resGroup := id.ResourceGroup + resourceGroup := id.ResourceGroup name := id.Path["servers"] - future, err := client.Delete(ctx, resGroup, name) + future, err := client.Delete(ctx, resourceGroup, name) if err != nil { if response.WasNotFound(future.Response()) { return nil } - return err + + return fmt.Errorf("Error deleting PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } err = future.WaitForCompletion(ctx, client.Client) @@ -322,35 +361,77 @@ func resourceArmPostgreSQLServerDelete(d *schema.ResourceData, meta interface{}) if response.WasNotFound(future.Response()) { return nil } - return err + + return fmt.Errorf("Error waiting for deletion of PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } return nil } -func expandAzureRmPostgreSQLServerSku(d *schema.ResourceData, storageMB int) *postgresql.Sku { - skus := d.Get("sku").(*schema.Set).List() +func expandAzureRmPostgreSQLServerSku(d *schema.ResourceData) *postgresql.Sku { + skus := d.Get("sku").([]interface{}) sku := skus[0].(map[string]interface{}) name := sku["name"].(string) capacity := sku["capacity"].(int) tier := sku["tier"].(string) + family := sku["family"].(string) return &postgresql.Sku{ Name: utils.String(name), - Capacity: utils.Int32(int32(capacity)), Tier: postgresql.SkuTier(tier), - Size: utils.String(strconv.Itoa(storageMB)), + Capacity: utils.Int32(int32(capacity)), + Family: utils.String(family), + } +} + +func expandAzureRmPostgreSQLStorageProfile(d *schema.ResourceData) *postgresql.StorageProfile { + storageprofiles := d.Get("storage_profile").([]interface{}) + storageprofile := storageprofiles[0].(map[string]interface{}) + + backupRetentionDays := storageprofile["backup_retention_days"].(int) + geoRedundantBackup := storageprofile["geo_redundant_backup"].(string) + storageMB := storageprofile["storage_mb"].(int) + + return &postgresql.StorageProfile{ + BackupRetentionDays: utils.Int32(int32(backupRetentionDays)), + GeoRedundantBackup: postgresql.GeoRedundantBackup(geoRedundantBackup), + StorageMB: utils.Int32(int32(storageMB)), } } func flattenPostgreSQLServerSku(resp *postgresql.Sku) []interface{} { values := map[string]interface{}{} - values["name"] = *resp.Name - values["capacity"] = int(*resp.Capacity) + if name := resp.Name; name != nil { + values["name"] = *name + } + + if capacity := resp.Capacity; capacity != nil { + values["capacity"] = *capacity + } + values["tier"] = string(resp.Tier) - sku := []interface{}{values} - return sku + if family := resp.Family; family != nil { + values["family"] = *family + } + + return []interface{}{values} +} + +func flattenPostgreSQLStorageProfile(resp *postgresql.StorageProfile) []interface{} { + values := map[string]interface{}{} + + if storageMB := resp.StorageMB; storageMB != nil { + values["storage_mb"] = *storageMB + } + + if backupRetentionDays := resp.BackupRetentionDays; backupRetentionDays != nil { + values["backup_retention_days"] = *backupRetentionDays + } + + values["geo_redundant_backup"] = postgresql.GeoRedundantBackup(resp.GeoRedundantBackup) + + return []interface{}{values} } diff --git a/azurerm/resource_arm_postgresql_server_test.go b/azurerm/resource_arm_postgresql_server_test.go index 75b36592547e..053a5775f478 100644 --- a/azurerm/resource_arm_postgresql_server_test.go +++ b/azurerm/resource_arm_postgresql_server_test.go @@ -26,7 +26,6 @@ func TestAccAzureRMPostgreSQLServer_basicNinePointFive(t *testing.T) { testCheckAzureRMPostgreSQLServerExists(resourceName), resource.TestCheckResourceAttr(resourceName, "administrator_login", "acctestun"), resource.TestCheckResourceAttr(resourceName, "version", "9.5"), - resource.TestCheckResourceAttr(resourceName, "storage_mb", "51200"), resource.TestCheckResourceAttr(resourceName, "ssl_enforcement", "Enabled"), ), }, @@ -50,7 +49,6 @@ func TestAccAzureRMPostgreSQLServer_basicNinePointSix(t *testing.T) { testCheckAzureRMPostgreSQLServerExists(resourceName), resource.TestCheckResourceAttr(resourceName, "administrator_login", "acctestun"), resource.TestCheckResourceAttr(resourceName, "version", "9.6"), - resource.TestCheckResourceAttr(resourceName, "storage_mb", "51200"), resource.TestCheckResourceAttr(resourceName, "ssl_enforcement", "Enabled"), ), }, @@ -74,7 +72,6 @@ func TestAccAzureRMPostgreSQLServer_basicMaxStorage(t *testing.T) { testCheckAzureRMPostgreSQLServerExists(resourceName), resource.TestCheckResourceAttr(resourceName, "administrator_login", "acctestun"), resource.TestCheckResourceAttr(resourceName, "version", "9.6"), - resource.TestCheckResourceAttr(resourceName, "storage_mb", "947200"), resource.TestCheckResourceAttr(resourceName, "ssl_enforcement", "Enabled"), ), }, @@ -82,10 +79,30 @@ func TestAccAzureRMPostgreSQLServer_basicMaxStorage(t *testing.T) { }) } -func TestAccAzureRMPostgreSQLServer_standard(t *testing.T) { +func TestAccAzureRMPostgreSQLServer_generalPurpose(t *testing.T) { resourceName := "azurerm_postgresql_server.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLServer_standard(ri, testLocation()) + config := testAccAzureRMPostgreSQLServer_generalPurpose(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLServerDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPostgreSQLServerExists(resourceName), + ), + }, + }, + }) +} + +func TestAccAzureRMPostgreSQLServer_memoryOptimized(t *testing.T) { + resourceName := "azurerm_postgresql_server.test" + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLServer_memoryOptimized(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -107,7 +124,35 @@ func TestAccAzureRMPostgreSQLServer_updatePassword(t *testing.T) { ri := acctest.RandInt() location := testLocation() config := testAccAzureRMPostgreSQLServer_basicNinePointSix(ri, location) - updatedConfig := testAccAzureRMPostgreSQLServer_basicNinePointSixUpdated(ri, location) + updatedConfig := testAccAzureRMPostgreSQLServer_basicNinePointSixUpdatedPassword(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLServerDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPostgreSQLServerExists(resourceName), + ), + }, + { + Config: updatedConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPostgreSQLServerExists(resourceName), + ), + }, + }, + }) +} + +func TestAccAzureRMPostgreSQLServer_updateSKU(t *testing.T) { + resourceName := "azurerm_postgresql_server.test" + ri := acctest.RandInt() + location := testLocation() + config := testAccAzureRMPostgreSQLServer_basicNinePointSix(ri, location) + updatedConfig := testAccAzureRMPostgreSQLServer_basicNinePointSixUpdatedSKU(ri, location) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -201,15 +246,21 @@ resource "azurerm_postgresql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "9.5" - storage_mb = 51200 ssl_enforcement = "Enabled" } `, rInt, location, rInt) @@ -228,21 +279,27 @@ resource "azurerm_postgresql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "9.6" - storage_mb = 51200 ssl_enforcement = "Enabled" } `, rInt, location, rInt) } -func testAccAzureRMPostgreSQLServer_basicNinePointSixUpdated(rInt int, location string) string { +func testAccAzureRMPostgreSQLServer_basicNinePointSixUpdatedPassword(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -255,21 +312,60 @@ resource "azurerm_postgresql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "acctestun" administrator_login_password = "R3dH0TCh1l1P3pp3rs!" version = "9.6" - storage_mb = 51200 ssl_enforcement = "Disabled" } `, rInt, location, rInt) } +func testAccAzureRMPostgreSQLServer_basicNinePointSixUpdatedSKU(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_postgresql_server" "test" { + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "B_Gen4_1" + capacity = 1 + tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.6" + ssl_enforcement = "Enabled" +} +`, rInt, location, rInt) +} + func testAccAzureRMPostgreSQLServer_basicMaxStorage(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -283,21 +379,27 @@ resource "azurerm_postgresql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 947200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "9.6" - storage_mb = 947200 ssl_enforcement = "Enabled" } `, rInt, location, rInt) } -func testAccAzureRMPostgreSQLServer_standard(rInt int, location string) string { +func testAccAzureRMPostgreSQLServer_generalPurpose(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -310,15 +412,54 @@ resource "azurerm_postgresql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLS400" - capacity = 400 - tier = "Standard" + name = "GP_Gen5_32" + capacity = 32 + tier = "GeneralPurpose" + family = "Gen5" + } + + storage_profile { + storage_mb = 640000 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.6" + ssl_enforcement = "Enabled" +} +`, rInt, location, rInt) +} + +func testAccAzureRMPostgreSQLServer_memoryOptimized(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_postgresql_server" "test" { + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "MO_Gen5_16" + capacity = 16 + tier = "MemoryOptimized" + family = "Gen5" + } + + storage_profile { + storage_mb = 1048576 + backup_retention_days = 7 + geo_redundant_backup = "Enabled" } administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" version = "9.6" - storage_mb = 640000 ssl_enforcement = "Enabled" } `, rInt, location, rInt) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/performancetiers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/performancetiers.go deleted file mode 100644 index c55894d8af49..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/performancetiers.go +++ /dev/null @@ -1,104 +0,0 @@ -package postgresql - -// Copyright (c) Microsoft and contributors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is regenerated. - -import ( - "context" - "github.com/Azure/go-autorest/autorest" - "github.com/Azure/go-autorest/autorest/azure" - "net/http" -) - -// PerformanceTiersClient is the the Microsoft Azure management API provides create, read, update, and delete -// functionality for Azure PostgreSQL resources including servers, databases, firewall rules, log files and -// configurations. -type PerformanceTiersClient struct { - BaseClient -} - -// NewPerformanceTiersClient creates an instance of the PerformanceTiersClient client. -func NewPerformanceTiersClient(subscriptionID string) PerformanceTiersClient { - return NewPerformanceTiersClientWithBaseURI(DefaultBaseURI, subscriptionID) -} - -// NewPerformanceTiersClientWithBaseURI creates an instance of the PerformanceTiersClient client. -func NewPerformanceTiersClientWithBaseURI(baseURI string, subscriptionID string) PerformanceTiersClient { - return PerformanceTiersClient{NewWithBaseURI(baseURI, subscriptionID)} -} - -// List list all the performance tiers in a given subscription. -func (client PerformanceTiersClient) List(ctx context.Context) (result PerformanceTierListResult, err error) { - req, err := client.ListPreparer(ctx) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.PerformanceTiersClient", "List", nil, "Failure preparing request") - return - } - - resp, err := client.ListSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "postgresql.PerformanceTiersClient", "List", resp, "Failure sending request") - return - } - - result, err = client.ListResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.PerformanceTiersClient", "List", resp, "Failure responding to request") - } - - return -} - -// ListPreparer prepares the List request. -func (client PerformanceTiersClient) ListPreparer(ctx context.Context) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2017-04-30-preview" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.DBforPostgreSQL/performanceTiers", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListSender sends the List request. The method will close the -// http.Response Body if it receives an error. -func (client PerformanceTiersClient) ListSender(req *http.Request) (*http.Response, error) { - return autorest.SendWithSender(client, req, - azure.DoRetryWithRegistration(client.Client)) -} - -// ListResponder handles the response to the List request. The method always -// closes the http.Response Body. -func (client PerformanceTiersClient) ListResponder(resp *http.Response) (result PerformanceTierListResult, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/checknameavailability.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/checknameavailability.go similarity index 96% rename from vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/checknameavailability.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/checknameavailability.go index 970bbb831218..16b170eca333 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/checknameavailability.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/checknameavailability.go @@ -27,7 +27,7 @@ import ( // CheckNameAvailabilityClient is the the Microsoft Azure management API provides create, read, update, and delete // functionality for Azure PostgreSQL resources including servers, databases, firewall rules, log files and -// configurations. +// configurations with new business model. type CheckNameAvailabilityClient struct { BaseClient } @@ -43,8 +43,8 @@ func NewCheckNameAvailabilityClientWithBaseURI(baseURI string, subscriptionID st } // Execute check the availability of name for resource -// -// nameAvailabilityRequest is the required parameters for checking if resource name is available. +// Parameters: +// nameAvailabilityRequest - the required parameters for checking if resource name is available. func (client CheckNameAvailabilityClient) Execute(ctx context.Context, nameAvailabilityRequest NameAvailabilityRequest) (result NameAvailability, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: nameAvailabilityRequest, @@ -79,7 +79,7 @@ func (client CheckNameAvailabilityClient) ExecutePreparer(ctx context.Context, n "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/client.go similarity index 96% rename from vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/client.go index 6c97a46756e5..610ebe022c1a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/client.go @@ -1,7 +1,7 @@ -// Package postgresql implements the Azure ARM Postgresql service API version 2017-04-30-preview. +// Package postgresql implements the Azure ARM Postgresql service API version 2017-12-01. // // The Microsoft Azure management API provides create, read, update, and delete functionality for Azure PostgreSQL -// resources including servers, databases, firewall rules, log files and configurations. +// resources including servers, databases, firewall rules, log files and configurations with new business model. package postgresql // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/configurations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/configurations.go similarity index 90% rename from vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/configurations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/configurations.go index 91008239bbdc..11407a4e7fdd 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/configurations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/configurations.go @@ -26,7 +26,7 @@ import ( // ConfigurationsClient is the the Microsoft Azure management API provides create, read, update, and delete // functionality for Azure PostgreSQL resources including servers, databases, firewall rules, log files and -// configurations. +// configurations with new business model. type ConfigurationsClient struct { BaseClient } @@ -42,10 +42,12 @@ func NewConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) C } // CreateOrUpdate updates a configuration of a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. configurationName is the -// name of the server configuration. parameters is the required parameters for updating a server configuration. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// configurationName - the name of the server configuration. +// parameters - the required parameters for updating a server configuration. func (client ConfigurationsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, configurationName string, parameters Configuration) (result ConfigurationsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, configurationName, parameters) if err != nil { @@ -71,7 +73,7 @@ func (client ConfigurationsClient) CreateOrUpdatePreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -115,10 +117,11 @@ func (client ConfigurationsClient) CreateOrUpdateResponder(resp *http.Response) } // Get gets information about a configuration of server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. configurationName is the -// name of the server configuration. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// configurationName - the name of the server configuration. func (client ConfigurationsClient) Get(ctx context.Context, resourceGroupName string, serverName string, configurationName string) (result Configuration, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, configurationName) if err != nil { @@ -150,7 +153,7 @@ func (client ConfigurationsClient) GetPreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -184,9 +187,10 @@ func (client ConfigurationsClient) GetResponder(resp *http.Response) (result Con } // ListByServer list all the configurations in a given server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ConfigurationsClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result ConfigurationListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -217,7 +221,7 @@ func (client ConfigurationsClient) ListByServerPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/databases.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/databases.go similarity index 90% rename from vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/databases.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/databases.go index 37933fe3a8c0..26d6cf9c72c3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/databases.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/databases.go @@ -25,7 +25,8 @@ import ( ) // DatabasesClient is the the Microsoft Azure management API provides create, read, update, and delete functionality -// for Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations. +// for Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations with new +// business model. type DatabasesClient struct { BaseClient } @@ -41,10 +42,12 @@ func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) Databa } // CreateOrUpdate creates a new database or updates an existing database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. parameters is the required parameters for creating or updating a database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. +// parameters - the required parameters for creating or updating a database. func (client DatabasesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters Database) (result DatabasesCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, databaseName, parameters) if err != nil { @@ -70,7 +73,7 @@ func (client DatabasesClient) CreateOrUpdatePreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -114,10 +117,11 @@ func (client DatabasesClient) CreateOrUpdateResponder(resp *http.Response) (resu } // Delete deletes a database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. func (client DatabasesClient) Delete(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result DatabasesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -143,7 +147,7 @@ func (client DatabasesClient) DeletePreparer(ctx context.Context, resourceGroupN "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -184,10 +188,11 @@ func (client DatabasesClient) DeleteResponder(resp *http.Response) (result autor } // Get gets information about a database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. func (client DatabasesClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result Database, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -219,7 +224,7 @@ func (client DatabasesClient) GetPreparer(ctx context.Context, resourceGroupName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -253,9 +258,10 @@ func (client DatabasesClient) GetResponder(resp *http.Response) (result Database } // ListByServer list all the databases in a given server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client DatabasesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result DatabaseListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -286,7 +292,7 @@ func (client DatabasesClient) ListByServerPreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/firewallrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/firewallrules.go similarity index 91% rename from vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/firewallrules.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/firewallrules.go index e7a72bee7cbb..68d03021ee70 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/firewallrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/firewallrules.go @@ -27,7 +27,7 @@ import ( // FirewallRulesClient is the the Microsoft Azure management API provides create, read, update, and delete // functionality for Azure PostgreSQL resources including servers, databases, firewall rules, log files and -// configurations. +// configurations with new business model. type FirewallRulesClient struct { BaseClient } @@ -43,10 +43,12 @@ func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) Fi } // CreateOrUpdate creates a new firewall rule or updates an existing firewall rule. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. firewallRuleName is the name -// of the server firewall rule. parameters is the required parameters for creating or updating a firewall rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// firewallRuleName - the name of the server firewall rule. +// parameters - the required parameters for creating or updating a firewall rule. func (client FirewallRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string, parameters FirewallRule) (result FirewallRulesCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -83,7 +85,7 @@ func (client FirewallRulesClient) CreateOrUpdatePreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -127,10 +129,11 @@ func (client FirewallRulesClient) CreateOrUpdateResponder(resp *http.Response) ( } // Delete deletes a server firewall rule. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. firewallRuleName is the name -// of the server firewall rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// firewallRuleName - the name of the server firewall rule. func (client FirewallRulesClient) Delete(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string) (result FirewallRulesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, firewallRuleName) if err != nil { @@ -156,7 +159,7 @@ func (client FirewallRulesClient) DeletePreparer(ctx context.Context, resourceGr "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -197,10 +200,11 @@ func (client FirewallRulesClient) DeleteResponder(resp *http.Response) (result a } // Get gets information about a server firewall rule. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. firewallRuleName is the name -// of the server firewall rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// firewallRuleName - the name of the server firewall rule. func (client FirewallRulesClient) Get(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string) (result FirewallRule, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, firewallRuleName) if err != nil { @@ -232,7 +236,7 @@ func (client FirewallRulesClient) GetPreparer(ctx context.Context, resourceGroup "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -266,9 +270,10 @@ func (client FirewallRulesClient) GetResponder(resp *http.Response) (result Fire } // ListByServer list all the firewall rules in a given server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client FirewallRulesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result FirewallRuleListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -299,7 +304,7 @@ func (client FirewallRulesClient) ListByServerPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/locationbasedperformancetier.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/locationbasedperformancetier.go similarity index 96% rename from vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/locationbasedperformancetier.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/locationbasedperformancetier.go index 7e24e1ce81f8..e10c0dd75038 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/locationbasedperformancetier.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/locationbasedperformancetier.go @@ -26,7 +26,7 @@ import ( // LocationBasedPerformanceTierClient is the the Microsoft Azure management API provides create, read, update, and // delete functionality for Azure PostgreSQL resources including servers, databases, firewall rules, log files and -// configurations. +// configurations with new business model. type LocationBasedPerformanceTierClient struct { BaseClient } @@ -43,8 +43,8 @@ func NewLocationBasedPerformanceTierClientWithBaseURI(baseURI string, subscripti } // List list all the performance tiers at specified location in a given subscription. -// -// locationName is the name of the location. +// Parameters: +// locationName - the name of the location. func (client LocationBasedPerformanceTierClient) List(ctx context.Context, locationName string) (result PerformanceTierListResult, err error) { req, err := client.ListPreparer(ctx, locationName) if err != nil { @@ -74,7 +74,7 @@ func (client LocationBasedPerformanceTierClient) ListPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/logfiles.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/logfiles.go similarity index 92% rename from vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/logfiles.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/logfiles.go index 9a9e22cc41c5..e6213a5df282 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/logfiles.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/logfiles.go @@ -25,7 +25,8 @@ import ( ) // LogFilesClient is the the Microsoft Azure management API provides create, read, update, and delete functionality for -// Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations. +// Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations with new +// business model. type LogFilesClient struct { BaseClient } @@ -41,9 +42,10 @@ func NewLogFilesClientWithBaseURI(baseURI string, subscriptionID string) LogFile } // ListByServer list all the log files in a given server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client LogFilesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result LogFileListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -74,7 +76,7 @@ func (client LogFilesClient) ListByServerPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/models.go similarity index 86% rename from vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/models.go index 5306cbd160bb..229fc1302c98 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/models.go @@ -31,6 +31,8 @@ type CreateMode string const ( // CreateModeDefault ... CreateModeDefault CreateMode = "Default" + // CreateModeGeoRestore ... + CreateModeGeoRestore CreateMode = "GeoRestore" // CreateModePointInTimeRestore ... CreateModePointInTimeRestore CreateMode = "PointInTimeRestore" // CreateModeServerPropertiesForCreate ... @@ -39,7 +41,22 @@ const ( // PossibleCreateModeValues returns an array of possible values for the CreateMode const type. func PossibleCreateModeValues() []CreateMode { - return []CreateMode{CreateModeDefault, CreateModePointInTimeRestore, CreateModeServerPropertiesForCreate} + return []CreateMode{CreateModeDefault, CreateModeGeoRestore, CreateModePointInTimeRestore, CreateModeServerPropertiesForCreate} +} + +// GeoRedundantBackup enumerates the values for geo redundant backup. +type GeoRedundantBackup string + +const ( + // Disabled ... + Disabled GeoRedundantBackup = "Disabled" + // Enabled ... + Enabled GeoRedundantBackup = "Enabled" +) + +// PossibleGeoRedundantBackupValues returns an array of possible values for the GeoRedundantBackup const type. +func PossibleGeoRedundantBackupValues() []GeoRedundantBackup { + return []GeoRedundantBackup{Disabled, Enabled} } // OperationOrigin enumerates the values for operation origin. @@ -63,17 +80,17 @@ func PossibleOperationOriginValues() []OperationOrigin { type ServerState string const ( - // Disabled ... - Disabled ServerState = "Disabled" - // Dropping ... - Dropping ServerState = "Dropping" - // Ready ... - Ready ServerState = "Ready" + // ServerStateDisabled ... + ServerStateDisabled ServerState = "Disabled" + // ServerStateDropping ... + ServerStateDropping ServerState = "Dropping" + // ServerStateReady ... + ServerStateReady ServerState = "Ready" ) // PossibleServerStateValues returns an array of possible values for the ServerState const type. func PossibleServerStateValues() []ServerState { - return []ServerState{Disabled, Dropping, Ready} + return []ServerState{ServerStateDisabled, ServerStateDropping, ServerStateReady} } // ServerVersion enumerates the values for server version. @@ -97,13 +114,15 @@ type SkuTier string const ( // Basic ... Basic SkuTier = "Basic" - // Standard ... - Standard SkuTier = "Standard" + // GeneralPurpose ... + GeneralPurpose SkuTier = "GeneralPurpose" + // MemoryOptimized ... + MemoryOptimized SkuTier = "MemoryOptimized" ) // PossibleSkuTierValues returns an array of possible values for the SkuTier const type. func PossibleSkuTierValues() []SkuTier { - return []SkuTier{Basic, Standard} + return []SkuTier{Basic, GeneralPurpose, MemoryOptimized} } // SslEnforcementEnum enumerates the values for ssl enforcement enum. @@ -753,8 +772,6 @@ type LogFileListResult struct { // LogFileProperties the properties of a log file. type LogFileProperties struct { - // Name - Log file name. - Name *string `json:"name,omitempty"` // SizeInKB - Size of the log file. SizeInKB *int64 `json:"sizeInKB,omitempty"` // CreatedTime - Creation timestamp of the log file. @@ -846,8 +863,6 @@ type PerformanceTierListResult struct { type PerformanceTierProperties struct { // ID - ID of the performance tier. ID *string `json:"id,omitempty"` - // BackupRetentionDays - Backup retention in days for the performance tier edition - BackupRetentionDays *int32 `json:"backupRetentionDays,omitempty"` // ServiceLevelObjectives - Service level objectives associated with the performance tier ServiceLevelObjectives *[]PerformanceTierServiceLevelObjectives `json:"serviceLevelObjectives,omitempty"` } @@ -858,10 +873,18 @@ type PerformanceTierServiceLevelObjectives struct { ID *string `json:"id,omitempty"` // Edition - Edition of the performance tier. Edition *string `json:"edition,omitempty"` - // Dtu - Database throughput unit associated with the service level objective - Dtu *int32 `json:"dtu,omitempty"` - // StorageMB - Maximum storage in MB associated with the service level objective - StorageMB *int32 `json:"storageMB,omitempty"` + // VCore - vCore associated with the service level objective + VCore *int32 `json:"vCore,omitempty"` + // HardwareGeneration - Hardware generation associated with the service level objective + HardwareGeneration *string `json:"hardwareGeneration,omitempty"` + // MaxBackupRetentionDays - Maximum Backup retention in days for the performance tier edition + MaxBackupRetentionDays *int32 `json:"maxBackupRetentionDays,omitempty"` + // MinBackupRetentionDays - Minimum Backup retention in days for the performance tier edition + MinBackupRetentionDays *int32 `json:"minBackupRetentionDays,omitempty"` + // MaxStorageMB - Max storage allowed for a server. + MaxStorageMB *int32 `json:"maxStorageMB,omitempty"` + // MinStorageMB - Max storage allowed for a server. + MinStorageMB *int32 `json:"minStorageMB,omitempty"` } // ProxyResource resource properties. @@ -1087,34 +1110,37 @@ type ServerListResult struct { type ServerProperties struct { // AdministratorLogin - The administrator's login name of a server. Can only be specified when the server is being created (and is required for creation). AdministratorLogin *string `json:"administratorLogin,omitempty"` - // StorageMB - The maximum storage allowed for a server. - StorageMB *int64 `json:"storageMB,omitempty"` // Version - Server version. Possible values include: 'NineFullStopFive', 'NineFullStopSix' Version ServerVersion `json:"version,omitempty"` // SslEnforcement - Enable ssl enforcement or not when connect to server. Possible values include: 'SslEnforcementEnumEnabled', 'SslEnforcementEnumDisabled' SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` - // UserVisibleState - A state of a server that is visible to user. Possible values include: 'Ready', 'Dropping', 'Disabled' + // UserVisibleState - A state of a server that is visible to user. Possible values include: 'ServerStateReady', 'ServerStateDropping', 'ServerStateDisabled' UserVisibleState ServerState `json:"userVisibleState,omitempty"` // FullyQualifiedDomainName - The fully qualified domain name of a server. FullyQualifiedDomainName *string `json:"fullyQualifiedDomainName,omitempty"` + // EarliestRestoreDate - Earliest restore point creation time (ISO8601 format) + EarliestRestoreDate *date.Time `json:"earliestRestoreDate,omitempty"` + // StorageProfile - Storage profile of a server. + StorageProfile *StorageProfile `json:"storageProfile,omitempty"` } // BasicServerPropertiesForCreate the properties used to create a new server. type BasicServerPropertiesForCreate interface { AsServerPropertiesForDefaultCreate() (*ServerPropertiesForDefaultCreate, bool) AsServerPropertiesForRestore() (*ServerPropertiesForRestore, bool) + AsServerPropertiesForGeoRestore() (*ServerPropertiesForGeoRestore, bool) AsServerPropertiesForCreate() (*ServerPropertiesForCreate, bool) } // ServerPropertiesForCreate the properties used to create a new server. type ServerPropertiesForCreate struct { - // StorageMB - The maximum storage allowed for a server. - StorageMB *int64 `json:"storageMB,omitempty"` // Version - Server version. Possible values include: 'NineFullStopFive', 'NineFullStopSix' Version ServerVersion `json:"version,omitempty"` // SslEnforcement - Enable ssl enforcement or not when connect to server. Possible values include: 'SslEnforcementEnumEnabled', 'SslEnforcementEnumDisabled' SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` - // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore' + // StorageProfile - Storage profile of a server. + StorageProfile *StorageProfile `json:"storageProfile,omitempty"` + // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore', 'CreateModeGeoRestore' CreateMode CreateMode `json:"createMode,omitempty"` } @@ -1134,6 +1160,10 @@ func unmarshalBasicServerPropertiesForCreate(body []byte) (BasicServerProperties var spfr ServerPropertiesForRestore err := json.Unmarshal(body, &spfr) return spfr, err + case string(CreateModeGeoRestore): + var spfgr ServerPropertiesForGeoRestore + err := json.Unmarshal(body, &spfgr) + return spfgr, err default: var spfc ServerPropertiesForCreate err := json.Unmarshal(body, &spfc) @@ -1163,15 +1193,15 @@ func unmarshalBasicServerPropertiesForCreateArray(body []byte) ([]BasicServerPro func (spfc ServerPropertiesForCreate) MarshalJSON() ([]byte, error) { spfc.CreateMode = CreateModeServerPropertiesForCreate objectMap := make(map[string]interface{}) - if spfc.StorageMB != nil { - objectMap["storageMB"] = spfc.StorageMB - } if spfc.Version != "" { objectMap["version"] = spfc.Version } if spfc.SslEnforcement != "" { objectMap["sslEnforcement"] = spfc.SslEnforcement } + if spfc.StorageProfile != nil { + objectMap["storageProfile"] = spfc.StorageProfile + } if spfc.CreateMode != "" { objectMap["createMode"] = spfc.CreateMode } @@ -1188,6 +1218,11 @@ func (spfc ServerPropertiesForCreate) AsServerPropertiesForRestore() (*ServerPro return nil, false } +// AsServerPropertiesForGeoRestore is the BasicServerPropertiesForCreate implementation for ServerPropertiesForCreate. +func (spfc ServerPropertiesForCreate) AsServerPropertiesForGeoRestore() (*ServerPropertiesForGeoRestore, bool) { + return nil, false +} + // AsServerPropertiesForCreate is the BasicServerPropertiesForCreate implementation for ServerPropertiesForCreate. func (spfc ServerPropertiesForCreate) AsServerPropertiesForCreate() (*ServerPropertiesForCreate, bool) { return &spfc, true @@ -1204,13 +1239,13 @@ type ServerPropertiesForDefaultCreate struct { AdministratorLogin *string `json:"administratorLogin,omitempty"` // AdministratorLoginPassword - The password of the administrator login. AdministratorLoginPassword *string `json:"administratorLoginPassword,omitempty"` - // StorageMB - The maximum storage allowed for a server. - StorageMB *int64 `json:"storageMB,omitempty"` // Version - Server version. Possible values include: 'NineFullStopFive', 'NineFullStopSix' Version ServerVersion `json:"version,omitempty"` // SslEnforcement - Enable ssl enforcement or not when connect to server. Possible values include: 'SslEnforcementEnumEnabled', 'SslEnforcementEnumDisabled' SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` - // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore' + // StorageProfile - Storage profile of a server. + StorageProfile *StorageProfile `json:"storageProfile,omitempty"` + // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore', 'CreateModeGeoRestore' CreateMode CreateMode `json:"createMode,omitempty"` } @@ -1224,15 +1259,15 @@ func (spfdc ServerPropertiesForDefaultCreate) MarshalJSON() ([]byte, error) { if spfdc.AdministratorLoginPassword != nil { objectMap["administratorLoginPassword"] = spfdc.AdministratorLoginPassword } - if spfdc.StorageMB != nil { - objectMap["storageMB"] = spfdc.StorageMB - } if spfdc.Version != "" { objectMap["version"] = spfdc.Version } if spfdc.SslEnforcement != "" { objectMap["sslEnforcement"] = spfdc.SslEnforcement } + if spfdc.StorageProfile != nil { + objectMap["storageProfile"] = spfdc.StorageProfile + } if spfdc.CreateMode != "" { objectMap["createMode"] = spfdc.CreateMode } @@ -1249,6 +1284,11 @@ func (spfdc ServerPropertiesForDefaultCreate) AsServerPropertiesForRestore() (*S return nil, false } +// AsServerPropertiesForGeoRestore is the BasicServerPropertiesForCreate implementation for ServerPropertiesForDefaultCreate. +func (spfdc ServerPropertiesForDefaultCreate) AsServerPropertiesForGeoRestore() (*ServerPropertiesForGeoRestore, bool) { + return nil, false +} + // AsServerPropertiesForCreate is the BasicServerPropertiesForCreate implementation for ServerPropertiesForDefaultCreate. func (spfdc ServerPropertiesForDefaultCreate) AsServerPropertiesForCreate() (*ServerPropertiesForCreate, bool) { return nil, false @@ -1259,19 +1299,81 @@ func (spfdc ServerPropertiesForDefaultCreate) AsBasicServerPropertiesForCreate() return &spfdc, true } -// ServerPropertiesForRestore the properties to a new server by restoring from a backup. +// ServerPropertiesForGeoRestore the properties used to create a new server by restoring to a different region from +// a geo replicated backup. +type ServerPropertiesForGeoRestore struct { + // SourceServerID - The source server id to restore from. + SourceServerID *string `json:"sourceServerId,omitempty"` + // Version - Server version. Possible values include: 'NineFullStopFive', 'NineFullStopSix' + Version ServerVersion `json:"version,omitempty"` + // SslEnforcement - Enable ssl enforcement or not when connect to server. Possible values include: 'SslEnforcementEnumEnabled', 'SslEnforcementEnumDisabled' + SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` + // StorageProfile - Storage profile of a server. + StorageProfile *StorageProfile `json:"storageProfile,omitempty"` + // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore', 'CreateModeGeoRestore' + CreateMode CreateMode `json:"createMode,omitempty"` +} + +// MarshalJSON is the custom marshaler for ServerPropertiesForGeoRestore. +func (spfgr ServerPropertiesForGeoRestore) MarshalJSON() ([]byte, error) { + spfgr.CreateMode = CreateModeGeoRestore + objectMap := make(map[string]interface{}) + if spfgr.SourceServerID != nil { + objectMap["sourceServerId"] = spfgr.SourceServerID + } + if spfgr.Version != "" { + objectMap["version"] = spfgr.Version + } + if spfgr.SslEnforcement != "" { + objectMap["sslEnforcement"] = spfgr.SslEnforcement + } + if spfgr.StorageProfile != nil { + objectMap["storageProfile"] = spfgr.StorageProfile + } + if spfgr.CreateMode != "" { + objectMap["createMode"] = spfgr.CreateMode + } + return json.Marshal(objectMap) +} + +// AsServerPropertiesForDefaultCreate is the BasicServerPropertiesForCreate implementation for ServerPropertiesForGeoRestore. +func (spfgr ServerPropertiesForGeoRestore) AsServerPropertiesForDefaultCreate() (*ServerPropertiesForDefaultCreate, bool) { + return nil, false +} + +// AsServerPropertiesForRestore is the BasicServerPropertiesForCreate implementation for ServerPropertiesForGeoRestore. +func (spfgr ServerPropertiesForGeoRestore) AsServerPropertiesForRestore() (*ServerPropertiesForRestore, bool) { + return nil, false +} + +// AsServerPropertiesForGeoRestore is the BasicServerPropertiesForCreate implementation for ServerPropertiesForGeoRestore. +func (spfgr ServerPropertiesForGeoRestore) AsServerPropertiesForGeoRestore() (*ServerPropertiesForGeoRestore, bool) { + return &spfgr, true +} + +// AsServerPropertiesForCreate is the BasicServerPropertiesForCreate implementation for ServerPropertiesForGeoRestore. +func (spfgr ServerPropertiesForGeoRestore) AsServerPropertiesForCreate() (*ServerPropertiesForCreate, bool) { + return nil, false +} + +// AsBasicServerPropertiesForCreate is the BasicServerPropertiesForCreate implementation for ServerPropertiesForGeoRestore. +func (spfgr ServerPropertiesForGeoRestore) AsBasicServerPropertiesForCreate() (BasicServerPropertiesForCreate, bool) { + return &spfgr, true +} + +// ServerPropertiesForRestore the properties used to create a new server by restoring from a backup. type ServerPropertiesForRestore struct { // SourceServerID - The source server id to restore from. SourceServerID *string `json:"sourceServerId,omitempty"` // RestorePointInTime - Restore point creation time (ISO8601 format), specifying the time to restore from. RestorePointInTime *date.Time `json:"restorePointInTime,omitempty"` - // StorageMB - The maximum storage allowed for a server. - StorageMB *int64 `json:"storageMB,omitempty"` // Version - Server version. Possible values include: 'NineFullStopFive', 'NineFullStopSix' Version ServerVersion `json:"version,omitempty"` // SslEnforcement - Enable ssl enforcement or not when connect to server. Possible values include: 'SslEnforcementEnumEnabled', 'SslEnforcementEnumDisabled' SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` - // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore' + // StorageProfile - Storage profile of a server. + StorageProfile *StorageProfile `json:"storageProfile,omitempty"` + // CreateMode - Possible values include: 'CreateModeServerPropertiesForCreate', 'CreateModeDefault', 'CreateModePointInTimeRestore', 'CreateModeGeoRestore' CreateMode CreateMode `json:"createMode,omitempty"` } @@ -1285,15 +1387,15 @@ func (spfr ServerPropertiesForRestore) MarshalJSON() ([]byte, error) { if spfr.RestorePointInTime != nil { objectMap["restorePointInTime"] = spfr.RestorePointInTime } - if spfr.StorageMB != nil { - objectMap["storageMB"] = spfr.StorageMB - } if spfr.Version != "" { objectMap["version"] = spfr.Version } if spfr.SslEnforcement != "" { objectMap["sslEnforcement"] = spfr.SslEnforcement } + if spfr.StorageProfile != nil { + objectMap["storageProfile"] = spfr.StorageProfile + } if spfr.CreateMode != "" { objectMap["createMode"] = spfr.CreateMode } @@ -1310,6 +1412,11 @@ func (spfr ServerPropertiesForRestore) AsServerPropertiesForRestore() (*ServerPr return &spfr, true } +// AsServerPropertiesForGeoRestore is the BasicServerPropertiesForCreate implementation for ServerPropertiesForRestore. +func (spfr ServerPropertiesForRestore) AsServerPropertiesForGeoRestore() (*ServerPropertiesForGeoRestore, bool) { + return nil, false +} + // AsServerPropertiesForCreate is the BasicServerPropertiesForCreate implementation for ServerPropertiesForRestore. func (spfr ServerPropertiesForRestore) AsServerPropertiesForCreate() (*ServerPropertiesForCreate, bool) { return nil, false @@ -1533,8 +1640,8 @@ func (sup *ServerUpdateParameters) UnmarshalJSON(body []byte) error { // ServerUpdateParametersProperties the properties that can be updated for a server. type ServerUpdateParametersProperties struct { - // StorageMB - The max storage allowed for a server. - StorageMB *int64 `json:"storageMB,omitempty"` + // StorageProfile - Storage profile of a server. + StorageProfile *StorageProfile `json:"storageProfile,omitempty"` // AdministratorLoginPassword - The password of the administrator login. AdministratorLoginPassword *string `json:"administratorLoginPassword,omitempty"` // Version - The version of a server. Possible values include: 'NineFullStopFive', 'NineFullStopSix' @@ -1545,9 +1652,9 @@ type ServerUpdateParametersProperties struct { // Sku billing information related properties of a server. type Sku struct { - // Name - The name of the sku, typically, a letter + Number code, e.g. P3. + // Name - The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8. Name *string `json:"name,omitempty"` - // Tier - The tier of the particular SKU, e.g. Basic. Possible values include: 'Basic', 'Standard' + // Tier - The tier of the particular SKU, e.g. Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' Tier SkuTier `json:"tier,omitempty"` // Capacity - The scale up/out capacity, representing server's compute units. Capacity *int32 `json:"capacity,omitempty"` @@ -1557,6 +1664,16 @@ type Sku struct { Family *string `json:"family,omitempty"` } +// StorageProfile storage Profile properties of a server +type StorageProfile struct { + // BackupRetentionDays - Backup retention days for the server. + BackupRetentionDays *int32 `json:"backupRetentionDays,omitempty"` + // GeoRedundantBackup - Enable Geo-redundant or not for server backup. Possible values include: 'Enabled', 'Disabled' + GeoRedundantBackup GeoRedundantBackup `json:"geoRedundantBackup,omitempty"` + // StorageMB - Max storage allowed for a server. + StorageMB *int32 `json:"storageMB,omitempty"` +} + // TrackedResource resource properties including location and tags for track resources. type TrackedResource struct { // Location - The location the resource resides in. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/operations.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/operations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/operations.go index b9e3b4c75591..807f91ba9419 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/operations.go @@ -25,7 +25,8 @@ import ( ) // OperationsClient is the the Microsoft Azure management API provides create, read, update, and delete functionality -// for Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations. +// for Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations with new +// business model. type OperationsClient struct { BaseClient } @@ -65,7 +66,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/servers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/servers.go similarity index 91% rename from vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/servers.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/servers.go index f49618a34d72..5dfe1291ab55 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/servers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/servers.go @@ -26,7 +26,8 @@ import ( ) // ServersClient is the the Microsoft Azure management API provides create, read, update, and delete functionality for -// Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations. +// Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations with new +// business model. type ServersClient struct { BaseClient } @@ -42,10 +43,11 @@ func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersC } // Create creates a new server, or will overwrite an existing server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. parameters is the required -// parameters for creating or updating a server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// parameters - the required parameters for creating or updating a server. func (client ServersClient) Create(ctx context.Context, resourceGroupName string, serverName string, parameters ServerForCreate) (result ServersCreateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -53,10 +55,7 @@ func (client ServersClient) Create(ctx context.Context, resourceGroupName string Chain: []validation.Constraint{{Target: "parameters.Sku.Capacity", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.Sku.Capacity", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}}}, }}, - {Target: "parameters.Properties", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "parameters.Properties.StorageMB", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "parameters.Properties.StorageMB", Name: validation.InclusiveMinimum, Rule: 1024, Chain: nil}}}, - }}, + {Target: "parameters.Properties", Name: validation.Null, Rule: true, Chain: nil}, {Target: "parameters.Location", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { return result, validation.NewError("postgresql.ServersClient", "Create", err.Error()) } @@ -84,7 +83,7 @@ func (client ServersClient) CreatePreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -128,9 +127,10 @@ func (client ServersClient) CreateResponder(resp *http.Response) (result Server, } // Delete deletes a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServersClient) Delete(ctx context.Context, resourceGroupName string, serverName string) (result ServersDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -155,7 +155,7 @@ func (client ServersClient) DeletePreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -196,9 +196,10 @@ func (client ServersClient) DeleteResponder(resp *http.Response) (result autores } // Get gets information about a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServersClient) Get(ctx context.Context, resourceGroupName string, serverName string) (result Server, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -229,7 +230,7 @@ func (client ServersClient) GetPreparer(ctx context.Context, resourceGroupName s "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -291,7 +292,7 @@ func (client ServersClient) ListPreparer(ctx context.Context) (*http.Request, er "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -325,9 +326,9 @@ func (client ServersClient) ListResponder(resp *http.Response) (result ServerLis } // ListByResourceGroup list all the servers in a given resource group. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. func (client ServersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ServerListResult, err error) { req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) if err != nil { @@ -357,7 +358,7 @@ func (client ServersClient) ListByResourceGroupPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -392,10 +393,11 @@ func (client ServersClient) ListByResourceGroupResponder(resp *http.Response) (r // Update updates an existing server. The request body can contain one to many of the properties present in the normal // server definition. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. parameters is the required -// parameters for updating a server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// parameters - the required parameters for updating a server. func (client ServersClient) Update(ctx context.Context, resourceGroupName string, serverName string, parameters ServerUpdateParameters) (result ServersUpdateFuture, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, serverName, parameters) if err != nil { @@ -420,7 +422,7 @@ func (client ServersClient) UpdatePreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-30-preview" + const APIVersion = "2017-12-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/version.go similarity index 98% rename from vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/version.go index 66c6f027168b..87ed23008f03 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/version.go @@ -21,7 +21,7 @@ import "github.com/Azure/azure-sdk-for-go/version" // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " postgresql/2017-04-30-preview" + return "Azure-SDK-For-Go/" + version.Number + " postgresql/2017-12-01" } // Version returns the semantic version (see http://semver.org) of the client. diff --git a/vendor/vendor.json b/vendor/vendor.json index 1b534c7308d1..457583b07a61 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -75,16 +75,16 @@ "versionExact": "v16.2.1" }, { - "checksumSHA1": "cdSthV7hZqJYRvbNwWuC0VFzn14=", - "path": "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns", + "checksumSHA1": "MsygGK8s34NdTsbkzvaqHgPLs6I=", + "path": "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account", "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", "revisionTime": "2018-05-04T19:14:26Z", "version": "v16.2.1", "versionExact": "v16.2.1" }, { - "checksumSHA1": "MsygGK8s34NdTsbkzvaqHgPLs6I=", - "path": "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account", + "checksumSHA1": "cdSthV7hZqJYRvbNwWuC0VFzn14=", + "path": "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns", "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", "revisionTime": "2018-05-04T19:14:26Z", "version": "v16.2.1", @@ -179,8 +179,8 @@ "versionExact": "v16.2.1" }, { - "checksumSHA1": "d0AbZFEWBxTD9kTLApajDviAra8=", - "path": "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql", + "checksumSHA1": "q0OKr6uBD4lgnHN/EIDrv0GQWW8=", + "path": "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql", "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", "revisionTime": "2018-05-04T19:14:26Z", "version": "v16.2.1", diff --git a/website/docs/r/postgresql_configuration.html.markdown b/website/docs/r/postgresql_configuration.html.markdown index a8c09b3e1c6b..c8827eb4baa7 100644 --- a/website/docs/r/postgresql_configuration.html.markdown +++ b/website/docs/r/postgresql_configuration.html.markdown @@ -24,9 +24,16 @@ resource "azurerm_postgresql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 5120 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "psqladminun" diff --git a/website/docs/r/postgresql_database.html.markdown b/website/docs/r/postgresql_database.html.markdown index 341e1cc4a264..17bed096d195 100644 --- a/website/docs/r/postgresql_database.html.markdown +++ b/website/docs/r/postgresql_database.html.markdown @@ -24,9 +24,16 @@ resource "azurerm_postgresql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 5120 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "psqladminun" diff --git a/website/docs/r/postgresql_server.html.markdown b/website/docs/r/postgresql_server.html.markdown index d4d46e66fd48..695b6c830e21 100644 --- a/website/docs/r/postgresql_server.html.markdown +++ b/website/docs/r/postgresql_server.html.markdown @@ -24,9 +24,16 @@ resource "azurerm_postgresql_server" "test" { resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" - capacity = 50 + name = "B_Gen4_2" + capacity = 2 tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 5120 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" } administrator_login = "psqladminun" @@ -41,56 +48,47 @@ resource "azurerm_postgresql_server" "test" { The following arguments are supported: -* `name` - (Required) Specifies the name of the PostgreSQL Server. Changing this forces a - new resource to be created. +* `name` - (Required) Specifies the name of the PostgreSQL Server. Changing this forces a new resource to be created. -* `resource_group_name` - (Required) The name of the resource group in which to - create the PostgreSQL Server. +* `resource_group_name` - (Required) The name of the resource group in which to create the PostgreSQL Server. Changing this forces a new resource to be created. * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. * `sku` - (Required) A `sku` block as defined below. +* `storage_profile` - (Required) A `storage_profile` block as defined below. + * `administrator_login` - (Required) The Administrator Login for the PostgreSQL Server. Changing this forces a new resource to be created. * `administrator_login_password` - (Required) The Password associated with the `administrator_login` for the PostgreSQL Server. * `version` - (Required) Specifies the version of PostgreSQL to use. Valid values are `9.5` and `9.6`. Changing this forces a new resource to be created. -* `storage_mb` - (Required) Specifies the amount of storage for the PostgreSQL Server in Megabytes. Possible values are shown below. Changing this forces a new resource to be created. - -Possible values for `storage_mb` when using a SKU Name of `Basic` are: -- `51200` (50GB) -- `179200` (175GB) -- `307200` (300GB) -- `435200` (425GB) -- `563200` (550GB) -- `691200` (675GB) -- `819200` (800GB) -- `947200` (925GB) - -Possible values for `storage_mb` when using a SKU Name of `Standard` are: -- `128000` (125GB) -- `256000` (256GB) -- `384000` (384GB) -- `512000` (512GB) -- `640000` (640GB) -- `768000` (768GB) -- `896000` (896GB) -- `1024000` (1TB) - * `ssl_enforcement` - (Required) Specifies if SSL should be enforced on connections. Possible values are `Enabled` and `Disabled`. * `tags` - (Optional) A mapping of tags to assign to the resource. --- -* `sku` supports the following: +`sku` supports the following: + +* `name` - (Required) Specifies the SKU Name for this PostgreSQL Server. The name of the SKU, follows the `tier` + `family` + `cores` pattern (e.g. B_Gen4_1, GP_Gen5_8). For more information see the [product documentation](https://docs.microsoft.com/en-us/rest/api/postgresql/servers/create#sku). + +* `capacity` - (Required) The scale up/out capacity, representing server's compute units. + +* `tier` - (Required) The tier of the particular SKU. Possible values are `Basic`, `GeneralPurpose`, and `MemoryOptimized`. For more information see the [product documentation](https://docs.microsoft.com/en-us/azure/postgresql/concepts-pricing-tiers). + +* `family` - (Required) The `family` of hardware `Gen4` or `Gen5`, before selecting your `family` check the [product documentation](https://docs.microsoft.com/en-us/azure/postgresql/concepts-pricing-tiers#compute-generations-vcores-and-memory) for availability in your region. + +--- + +`storage_profile` supports the following: + +* `storage_mb` - (Required) Max storage allowed for a server, possible values are between `5120 MB` (5GB) and `1048576 MB` (1TB). The step for this value must be in `1024 MB` (1GB) increments. For more information see the [product documentation](https://docs.microsoft.com/en-us/rest/api/postgresql/servers/create#StorageProfile). -* `name` - (Optional) Specifies the SKU Name for this PostgreSQL Server. Possible values are: `PGSQLB50`, `PGSQLB100`, `PGSQLS100`, `PGSQLS200`, `PGSQLS400` and `PGSQLS800`. +* `backup_retention_days` - (Optional) Backup retention days for the server, supported values are between `7` and `35` days. -* `capacity` - (Optional) Specifies the DTU's for this PostgreSQL Server. Possible values are `50` and `100` DTU's when using a `Basic` SKU and `100`, `200`, `400` or `800` when using the `Standard` SKU. -* `tier` - (Optional) Specifies the SKU Tier for this PostgreSQL Server. Possible values are `Basic` and `Standard`. +* `geo_redundant_backup` - (Optional) Enable Geo-redundant or not for server backup. Valid values for this property are `Enabled` or `Disabled`, not supported for the `basic` tier. ## Attributes Reference From 8c9bfcb5936cff6fb96543eb3d27c5fb8d61041d Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Wed, 23 May 2018 10:56:45 +0100 Subject: [PATCH 162/320] Updating to include # ~> **Please Note:** The `azurerm_mysql_server` resource has been updated from the Preview API's to the GA API's - which requires code changes in your Terraform Configuration to use the new Pricing SKU's. Upon updating to v1.6.0 - you'll need to update the configuration from the Preview SKU's to the GA SKU's. --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4312c5243066..d4770bd9e136 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ UPGRADE NOTES: ~> **Please Note:** The `azurerm_mysql_server` resource has been updated from the Preview API's to the GA API's - which requires code changes in your Terraform Configuration to use the new Pricing SKU's. Upon updating to v1.6.0 - you'll need to update the configuration from the Preview SKU's to the GA SKU's. +~> **Please Note:** The `azurerm_postgresql_server` resource has been updated from the Preview API's to the GA API's - which requires code changes in your Terraform Configuration to use the new Pricing SKU's. Upon updating to v1.6.0 - you'll need to update the configuration from the Preview SKU's to the GA SKU's. + * `azurerm_scheduler_job_collection` - the property `max_retry_interval` has been deprecated in favour of `max_recurrence_interval` to better match Azure [GH-1218] FEATURES: @@ -23,6 +25,7 @@ IMPROVEMENTS: * `azurerm_container_registry` - no longer forces a new resource on SKU change [GH-1264] * `azurerm_dns_zone` - datasource's `resource_group` field is now optional [GH-1180] * `azurerm_mysql_server` - support for the new GA Pricing SKU's [GH-1154] +* `azurerm_postgresql_server` - support for the new GA Pricing SKU's [GH-1190] * `azurerm_public_ip` - computed values now default to an empy string [GH-1247] * `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` [GH-1235] * `azurerm_virtual_machine_scale_set` - adding the `licence_type` property [GH-1245] From 4efb0837eb705bfb1cba2de6ecc75209573b0a33 Mon Sep 17 00:00:00 2001 From: Khalid J Hosein Date: Wed, 23 May 2018 13:16:08 -0400 Subject: [PATCH 163/320] azurerm_sql_firewall_rule doc: fix Name description Typo in the `name` attribute's description. (Was set to the same as the `server_name`) --- website/docs/r/sql_firewall_rule.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/sql_firewall_rule.html.markdown b/website/docs/r/sql_firewall_rule.html.markdown index 9b8bd6046498..a0daf8718445 100644 --- a/website/docs/r/sql_firewall_rule.html.markdown +++ b/website/docs/r/sql_firewall_rule.html.markdown @@ -39,7 +39,7 @@ resource "azurerm_sql_firewall_rule" "test" { The following arguments are supported: -* `name` - (Required) The name of the SQL Server. +* `name` - (Required) The name of the firewall rule. * `resource_group_name` - (Required) The name of the resource group in which to create the sql server. From ab856d39a66c83bb1ba3bcd9a922c5d79f5ebb98 Mon Sep 17 00:00:00 2001 From: Damien Caro Date: Wed, 23 May 2018 11:05:45 -0700 Subject: [PATCH 164/320] fixed var name and typeset --- azurerm/resource_arm_virtual_network_gateway.go | 14 ++++++++++---- .../resource_arm_virtual_network_gateway_test.go | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/azurerm/resource_arm_virtual_network_gateway.go b/azurerm/resource_arm_virtual_network_gateway.go index 998e94704b3e..2da0aef16c21 100644 --- a/azurerm/resource_arm_virtual_network_gateway.go +++ b/azurerm/resource_arm_virtual_network_gateway.go @@ -6,6 +6,7 @@ import ( "log" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" + "github.com/hashicorp/terraform/helper/customdiff" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" @@ -137,16 +138,21 @@ func resourceArmVirtualNetworkGateway() *schema.Resource { Type: schema.TypeString, }, }, - "vpn_client_protocol": { - Type: schema.TypeList, + "vpn_client_protocols": { + Type: schema.TypeSet, Optional: true, Elem: &schema.Schema{ Type: schema.TypeString, + ValidateFunc: validation.StringInSlice([]string{ + string(network.IkeV2), + string(network.SSTP), + }, true), }, }, "root_certificate": { Type: schema.TypeSet, Optional: true, + ConflictsWith: []string{ "vpn_client_configuration.0.radius_server_address", "vpn_client_configuration.0.radius_server_secret", @@ -528,7 +534,7 @@ func expandArmVirtualNetworkGatewayVpnClientConfig(d *schema.ResourceData) *netw revokedCerts = append(revokedCerts, r) } - confVpnClientProtocol := conf["vpn_client_protocol"].([]interface{}) + confVpnClientProtocol := conf["vpn_client_protocols"].([]interface{}) vpnClientProtocols := make([]network.VpnClientProtocol, 0, len(confVpnClientProtocol)) for _, protocol := range confVpnClientProtocol { vpnClientProtocols = append(vpnClientProtocols, network.VpnClientProtocol(protocol.(string))) @@ -629,7 +635,7 @@ func flattenArmVirtualNetworkGatewayVpnClientConfig(cfg *network.VpnClientConfig vpnClientProtocol = append(vpnClientProtocol, vpnProtocol) } } - flat["vpn_client_protocol"] = vpnClientProtocol + flat["vpn_client_protocols"] = vpnClientProtocol return []interface{}{flat} } diff --git a/azurerm/resource_arm_virtual_network_gateway_test.go b/azurerm/resource_arm_virtual_network_gateway_test.go index 3e58b6cf9551..e5820bf0a536 100644 --- a/azurerm/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/resource_arm_virtual_network_gateway_test.go @@ -254,7 +254,7 @@ resource "azurerm_virtual_network_gateway" "test" { vpn_client_configuration { address_space = [ "11.2.0.0/24" ] - vpn_client_protocol = [ "SSTP", "IkeV2" ] + vpn_client_protocols = [ "SSTP", "IkeV2" ] radius_server_address = "1.2.3.4" radius_server_secret = "verysecretsecret" From e79b01e4b0156523502f4aadbee67b6b7653c7f2 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 23 May 2018 11:31:42 -0700 Subject: [PATCH 165/320] some namespace fixes --- azurerm/resource_arm_servicebus_namespace.go | 33 ++++++++----------- .../main.tf | 23 +++++++------ .../variables.tf | 5 +-- 3 files changed, 25 insertions(+), 36 deletions(-) diff --git a/azurerm/resource_arm_servicebus_namespace.go b/azurerm/resource_arm_servicebus_namespace.go index 3a8e115188a6..e22911e37e19 100644 --- a/azurerm/resource_arm_servicebus_namespace.go +++ b/azurerm/resource_arm_servicebus_namespace.go @@ -9,6 +9,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" + "regexp" ) // Default Authorization Rule/Policy created by Azure, used to populate the @@ -21,9 +22,11 @@ func resourceArmServiceBusNamespace() *schema.Resource { Read: resourceArmServiceBusNamespaceRead, Update: resourceArmServiceBusNamespaceCreate, Delete: resourceArmServiceBusNamespaceDelete, + Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, + MigrateState: resourceAzureRMServiceBusNamespaceMigrateState, SchemaVersion: 1, @@ -32,6 +35,10 @@ func resourceArmServiceBusNamespace() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, + ValidateFunc: validation.StringMatch( + regexp.MustCompile("^[a-zA-Z][-a-zA-Z0-9]{0,100}[a-zA-Z0-9]$"), + "The namespace can contain only letters, numbers, and hyphens. The namespace must start with a letter, and it must end with a letter or number.", + ), }, "location": locationSchema(), @@ -51,10 +58,10 @@ func resourceArmServiceBusNamespace() *schema.Resource { }, "capacity": { - Type: schema.TypeInt, - Optional: true, - ForceNew: true, - ValidateFunc: validateServiceBusNamespaceCapacity, + Type: schema.TypeInt, + Optional: true, + + ValidateFunc: validateIntInSlice([]int{1, 2, 4}), }, "default_primary_connection_string": { @@ -108,11 +115,11 @@ func resourceArmServiceBusNamespaceCreate(d *schema.ResourceData, meta interface capacity := d.Get("capacity").(int) if capacity > 0 { - skuName := strings.ToLower(string(parameters.Sku.Name)) + /*skuName := strings.ToLower(string(parameters.Sku.Name)) premiumSku := strings.ToLower(string(servicebus.Premium)) if skuName != premiumSku { return fmt.Errorf("`capacity` can only be set for a Premium SKU") - } + }*/ parameters.Sku.Capacity = utils.Int32(int32(capacity)) } @@ -205,17 +212,3 @@ func resourceArmServiceBusNamespaceDelete(d *schema.ResourceData, meta interface return nil } - -func validateServiceBusNamespaceCapacity(v interface{}, k string) (ws []string, errors []error) { - value := v.(int) - capacities := map[int]bool{ - 1: true, - 2: true, - 4: true, - } - - if !capacities[value] { - errors = append(errors, fmt.Errorf("ServiceBus Namespace Capacity can only be 1, 2 or 4")) - } - return -} diff --git a/examples/servicebus-create-topic-and-subscription/main.tf b/examples/servicebus-create-topic-and-subscription/main.tf index b96f78de4ae5..bcdb50a4aefd 100644 --- a/examples/servicebus-create-topic-and-subscription/main.tf +++ b/examples/servicebus-create-topic-and-subscription/main.tf @@ -1,26 +1,25 @@ -# provider "azurerm" { -# subscription_id = "REPLACE-WITH-YOUR-SUBSCRIPTION-ID" -# client_id = "REPLACE-WITH-YOUR-CLIENT-ID" -# client_secret = "REPLACE-WITH-YOUR-CLIENT-SECRET" -# tenant_id = "REPLACE-WITH-YOUR-TENANT-ID" -# } resource "azurerm_resource_group" "rg" { name = "${var.resource_group}" location = "${var.location}" } +resource "random_integer" "ri" { + min = 10000 + max = 99999 +} + resource "azurerm_servicebus_namespace" "test" { - depends_on = ["azurerm_resource_group.rg"] - name = "${var.unique}servicebus" + name = "tfex-servicebus${random_integer.ri.result}" location = "${var.location}" resource_group_name = "${var.resource_group}" - sku = "standard" + sku = "premium" + capacity = 1 } resource "azurerm_servicebus_topic" "test" { - name = "${var.unique}Topic" + name = "tfex_servicebus${random_integer.ri.result}_topic" resource_group_name = "${var.resource_group}" namespace_name = "${azurerm_servicebus_namespace.test.name}" @@ -28,7 +27,7 @@ resource "azurerm_servicebus_topic" "test" { } resource "azurerm_servicebus_subscription" "test" { - name = "${var.unique}Subscription" + name = "tfex_servicebus${random_integer.ri.result}_subscription" resource_group_name = "${var.resource_group}" namespace_name = "${azurerm_servicebus_namespace.test.name}" topic_name = "${azurerm_servicebus_topic.test.name}" @@ -38,7 +37,7 @@ resource "azurerm_servicebus_subscription" "test" { resource "azurerm_servicebus_topic" "forward_to" { - name = "${var.unique}Topic-forward_to" + name = "tfex_servicebus${random_integer.ri.result}_forwardto" resource_group_name = "${var.resource_group}" namespace_name = "${azurerm_servicebus_namespace.test.name}" diff --git a/examples/servicebus-create-topic-and-subscription/variables.tf b/examples/servicebus-create-topic-and-subscription/variables.tf index c3d4830be297..5fec1720c26d 100644 --- a/examples/servicebus-create-topic-and-subscription/variables.tf +++ b/examples/servicebus-create-topic-and-subscription/variables.tf @@ -1,12 +1,9 @@ variable "resource_group" { description = "The name of the resource group in which to create the Service Bus" + default = "tfex-servicebus-topic_subscription" } variable "location" { description = "The location/region where the Service Bus is created. Changing this forces a new resource to be created." default = "southcentralus" } - -variable "unique" { - description = "A unique string that will be used to comprise the names of the Service Bus, Topic, and Subscription name spaces" -} From 65f8ff25a58597c2197494bf9741b464eb21a4ee Mon Sep 17 00:00:00 2001 From: ShanePoint Date: Wed, 23 May 2018 15:25:04 -0700 Subject: [PATCH 166/320] Added domain_name_label to read to fix import. (#784) --- azurerm/import_arm_public_ip_test.go | 23 +++++++++++ azurerm/resource_arm_public_ip.go | 20 +++++---- azurerm/resource_arm_public_ip_test.go | 57 ++++++++++++++++++++++---- 3 files changed, 86 insertions(+), 14 deletions(-) diff --git a/azurerm/import_arm_public_ip_test.go b/azurerm/import_arm_public_ip_test.go index 77020be7dec6..027706e372b4 100644 --- a/azurerm/import_arm_public_ip_test.go +++ b/azurerm/import_arm_public_ip_test.go @@ -56,6 +56,29 @@ func TestAccAzureRMPublicIpStatic_importBasic_withZone(t *testing.T) { }) } +func TestAccAzureRMPublicIpStatic_importBasic_withDNSLabel(t *testing.T) { + resourceName := "azurerm_public_ip.test" + + ri := acctest.RandInt() + config := testAccAzureRMPublicIPStatic_basic_withDNSLabel(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPublicIpDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAzureRMPublicIpStatic_importIdError(t *testing.T) { resourceName := "azurerm_public_ip.test" diff --git a/azurerm/resource_arm_public_ip.go b/azurerm/resource_arm_public_ip.go index 9f9a9e34bf15..b9007d1ec906 100644 --- a/azurerm/resource_arm_public_ip.go +++ b/azurerm/resource_arm_public_ip.go @@ -46,6 +46,7 @@ func resourceArmPublicIp() *schema.Resource { "zones": singleZonesSchema(), + //should this perhaps be allocation_method? "public_ip_address_allocation": { Type: schema.TypeString, Required: true, @@ -128,18 +129,18 @@ func resourceArmPublicIpCreate(d *schema.ResourceData, meta interface{}) error { PublicIPAllocationMethod: ipAllocationMethod, } - dnl, hasDnl := d.GetOk("domain_name_label") - rfqdn, hasRfqdn := d.GetOk("reverse_fqdn") + dnl, dnlOk := d.GetOk("domain_name_label") + rfqdn, rfqdnOk := d.GetOk("reverse_fqdn") - if hasDnl || hasRfqdn { + if dnlOk || rfqdnOk { dnsSettings := network.PublicIPAddressDNSSettings{} - if hasRfqdn { + if rfqdnOk { reverseFqdn := rfqdn.(string) dnsSettings.ReverseFqdn = &reverseFqdn } - if hasDnl { + if dnlOk { domainNameLabel := dnl.(string) dnsSettings.DomainNameLabel = &domainNameLabel } @@ -148,8 +149,7 @@ func resourceArmPublicIpCreate(d *schema.ResourceData, meta interface{}) error { } if v, ok := d.GetOk("idle_timeout_in_minutes"); ok { - idleTimeout := int32(v.(int)) - properties.IdleTimeoutInMinutes = &idleTimeout + properties.IdleTimeoutInMinutes = utils.Int32(int32(v.(int))) } publicIp := network.PublicIPAddress{ @@ -227,6 +227,12 @@ func resourceArmPublicIpRead(d *schema.ResourceData, meta interface{}) error { } else { d.Set("fqdn", "") } + + if dnl := settings.DomainNameLabel; dnl != nil { + d.Set("domain_name_label", dnl) + } else { + d.Set("domain_name_label", "") + } } if ip := props.IPAddress; ip != nil { diff --git a/azurerm/resource_arm_public_ip_test.go b/azurerm/resource_arm_public_ip_test.go index 54765e0d536f..27763bf59fd6 100644 --- a/azurerm/resource_arm_public_ip_test.go +++ b/azurerm/resource_arm_public_ip_test.go @@ -64,6 +64,29 @@ func TestAccAzureRMPublicIpStatic_basic(t *testing.T) { }) } +func TestAccAzureRMPublicIpStatic_basic_withDNSLabel(t *testing.T) { + resourceName := "azurerm_public_ip.test" + ri := acctest.RandInt() + config := testAccAzureRMPublicIPStatic_basic_withDNSLabel(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPublicIpDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPublicIpExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "ip_address"), + resource.TestCheckResourceAttr(resourceName, "public_ip_address_allocation", "static"), + resource.TestCheckResourceAttr(resourceName, "domain_name_label", "dnstestlabel"), + ), + }, + }, + }) +} + func TestAccAzureRMPublicIpStatic_standard(t *testing.T) { ri := acctest.RandInt() config := testAccAzureRMPublicIPStatic_standard(ri, testLocation()) @@ -296,14 +319,15 @@ func testCheckAzureRMPublicIpDestroy(s *terraform.State) error { func testAccAzureRMPublicIPStatic_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-%d" location = "%s" } resource "azurerm_public_ip" "test" { - name = "acctestpublicip-%d" - location = "${azurerm_resource_group.test.location}" + name = "acctestpublicip-%d" + location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" + public_ip_address_allocation = "static" } `, rInt, location, rInt) @@ -312,20 +336,39 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_basic_withZone(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-%d" location = "%s" } resource "azurerm_public_ip" "test" { - name = "acctestpublicip-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + name = "acctestpublicip-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" public_ip_address_allocation = "static" + zones = ["1"] } `, rInt, location, rInt) } +func testAccAzureRMPublicIPStatic_basic_withDNSLabel(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_public_ip" "test" { + name = "acctestpublicip-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + public_ip_address_allocation = "static" + + domain_name_label = "dnstestlabel" +} +`, rInt, location, rInt) +} + func testAccAzureRMPublicIPStatic_standard(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From fb8a5cd862809edbb540d384585c25bfcb97153b Mon Sep 17 00:00:00 2001 From: ShanePoint Date: Wed, 23 May 2018 15:32:00 -0700 Subject: [PATCH 167/320] Update resource_arm_public_ip_test.go --- azurerm/resource_arm_public_ip_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_public_ip_test.go b/azurerm/resource_arm_public_ip_test.go index 27763bf59fd6..d84ed8c2b397 100644 --- a/azurerm/resource_arm_public_ip_test.go +++ b/azurerm/resource_arm_public_ip_test.go @@ -355,7 +355,7 @@ func testAccAzureRMPublicIPStatic_basic_withDNSLabel(rInt int, location string) return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" - location = "%s" + location = "%s" } resource "azurerm_public_ip" "test" { From b5c89a4fabc463fa9b9506e18be3d88cca5dae11 Mon Sep 17 00:00:00 2001 From: ShanePoint Date: Wed, 23 May 2018 15:52:17 -0700 Subject: [PATCH 168/320] Updated domain_name_label to include random int in name to ensure globally unique (#784) --- azurerm/resource_arm_public_ip_test.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/azurerm/resource_arm_public_ip_test.go b/azurerm/resource_arm_public_ip_test.go index d84ed8c2b397..1fcb55ac8501 100644 --- a/azurerm/resource_arm_public_ip_test.go +++ b/azurerm/resource_arm_public_ip_test.go @@ -67,7 +67,8 @@ func TestAccAzureRMPublicIpStatic_basic(t *testing.T) { func TestAccAzureRMPublicIpStatic_basic_withDNSLabel(t *testing.T) { resourceName := "azurerm_public_ip.test" ri := acctest.RandInt() - config := testAccAzureRMPublicIPStatic_basic_withDNSLabel(ri, testLocation()) + dnl := fmt.Sprintf("tfacc%d", ri) + config := testAccAzureRMPublicIPStatic_basic_withDNSLabel(ri, testLocation(), dnl) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -80,7 +81,7 @@ func TestAccAzureRMPublicIpStatic_basic_withDNSLabel(t *testing.T) { testCheckAzureRMPublicIpExists(resourceName), resource.TestCheckResourceAttrSet(resourceName, "ip_address"), resource.TestCheckResourceAttr(resourceName, "public_ip_address_allocation", "static"), - resource.TestCheckResourceAttr(resourceName, "domain_name_label", "dnstestlabel"), + resource.TestCheckResourceAttr(resourceName, "domain_name_label", dnl), ), }, }, @@ -351,7 +352,7 @@ resource "azurerm_public_ip" "test" { `, rInt, location, rInt) } -func testAccAzureRMPublicIPStatic_basic_withDNSLabel(rInt int, location string) string { +func testAccAzureRMPublicIPStatic_basic_withDNSLabel(rInt int, location, dnsNameLabel string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -364,9 +365,9 @@ resource "azurerm_public_ip" "test" { resource_group_name = "${azurerm_resource_group.test.name}" public_ip_address_allocation = "static" - domain_name_label = "dnstestlabel" + domain_name_label = "%s" } -`, rInt, location, rInt) +`, rInt, location, rInt, dnsNameLabel) } func testAccAzureRMPublicIPStatic_standard(rInt int, location string) string { From 6f3e6485c8bb7d7b585e4d8e681052a807c543ca Mon Sep 17 00:00:00 2001 From: ShanePoint Date: Wed, 23 May 2018 20:16:19 -0700 Subject: [PATCH 169/320] Updated import test to handle additional parameter. (#784) --- azurerm/import_arm_public_ip_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azurerm/import_arm_public_ip_test.go b/azurerm/import_arm_public_ip_test.go index 027706e372b4..9b157d52615b 100644 --- a/azurerm/import_arm_public_ip_test.go +++ b/azurerm/import_arm_public_ip_test.go @@ -60,7 +60,8 @@ func TestAccAzureRMPublicIpStatic_importBasic_withDNSLabel(t *testing.T) { resourceName := "azurerm_public_ip.test" ri := acctest.RandInt() - config := testAccAzureRMPublicIPStatic_basic_withDNSLabel(ri, testLocation()) + dnl := fmt.Sprintf("tfacc%d", ri) + config := testAccAzureRMPublicIPStatic_basic_withDNSLabel(ri, testLocation(), dnl) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, From 90d7ed5a5b8caca3ed4543e92bdc6406ea335891 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline Date: Wed, 23 May 2018 23:55:24 -0700 Subject: [PATCH 170/320] Fix for azurerm_mysql_database resource wants to re-create on every apply (#1281) * Fix for azurerm_mysql_database resource wants to re-create on apply * Added test cases for charset casing issue --- azurerm/resource_arm_mysql_database.go | 7 +- azurerm/resource_arm_mysql_database_test.go | 124 ++++++++++++++++++++ 2 files changed, 128 insertions(+), 3 deletions(-) diff --git a/azurerm/resource_arm_mysql_database.go b/azurerm/resource_arm_mysql_database.go index ccf10687bc62..e4cf22b02793 100644 --- a/azurerm/resource_arm_mysql_database.go +++ b/azurerm/resource_arm_mysql_database.go @@ -34,9 +34,10 @@ func resourceArmMySqlDatabase() *schema.Resource { }, "charset": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ForceNew: true, }, "collation": { diff --git a/azurerm/resource_arm_mysql_database_test.go b/azurerm/resource_arm_mysql_database_test.go index 80562563c12b..3d7e729eb428 100644 --- a/azurerm/resource_arm_mysql_database_test.go +++ b/azurerm/resource_arm_mysql_database_test.go @@ -30,6 +30,48 @@ func TestAccAzureRMMySQLDatabase_basic(t *testing.T) { }) } +func TestAccAzureRMMySQLDatabase_charsetUppercase(t *testing.T) { + resourceName := "azurerm_mysql_database.test" + ri := acctest.RandInt() + config := testAccAzureRMMySQLDatabase_charsetUppercase(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMySQLDatabaseDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMySQLDatabaseExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "charset", "utf8"), + ), + }, + }, + }) +} + +func TestAccAzureRMMySQLDatabase_charsetMixedcase(t *testing.T) { + resourceName := "azurerm_mysql_database.test" + ri := acctest.RandInt() + config := testAccAzureRMMySQLDatabase_charsetMixedcase(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMySQLDatabaseDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMySQLDatabaseExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "charset", "utf8"), + ), + }, + }, + }) +} + func testCheckAzureRMMySQLDatabaseExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API @@ -126,3 +168,85 @@ resource "azurerm_mysql_database" "test" { } `, rInt, location, rInt, rInt) } + +func testAccAzureRMMySQLDatabase_charsetUppercase(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_mysql_server" "test" { + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "B_Gen4_2" + capacity = 2 + tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "5.6" + ssl_enforcement = "Enabled" +} + +resource "azurerm_mysql_database" "test" { + name = "acctestdb_%d" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_mysql_server.test.name}" + charset = "UTF8" + collation = "utf8_unicode_ci" +} +`, rInt, location, rInt, rInt) +} + +func testAccAzureRMMySQLDatabase_charsetMixedcase(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_mysql_server" "test" { + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "B_Gen4_2" + capacity = 2 + tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "5.6" + ssl_enforcement = "Enabled" +} + +resource "azurerm_mysql_database" "test" { + name = "acctestdb_%d" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_mysql_server.test.name}" + charset = "Utf8" + collation = "utf8_unicode_ci" +} +`, rInt, location, rInt, rInt) +} From b841fdffeb19ed979c97a12e5d83d4c1dd76fe21 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 24 May 2018 07:55:48 +0100 Subject: [PATCH 171/320] Updating to include #1281 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4770bd9e136..51e6d36b4da6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ IMPROVEMENTS: * `azurerm_app_service` - adding support for `ip_restriction`'s [GH-1231] * `azurerm_container_registry` - no longer forces a new resource on SKU change [GH-1264] * `azurerm_dns_zone` - datasource's `resource_group` field is now optional [GH-1180] +* `azurerm_mysql_database` - ignoring casing for the `charset` field [GH-1281] * `azurerm_mysql_server` - support for the new GA Pricing SKU's [GH-1154] * `azurerm_postgresql_server` - support for the new GA Pricing SKU's [GH-1190] * `azurerm_public_ip` - computed values now default to an empy string [GH-1247] From 60701521e7d10a073f739f7ad20116dfb95deaeb Mon Sep 17 00:00:00 2001 From: Jeffrey Cline Date: Thu, 24 May 2018 00:05:15 -0700 Subject: [PATCH 172/320] [Bug Fix] Fixes PostgreSQL collation issues #396 and #760 (#1255) * Update PostgreSQL to GA 2017-12-01 API * Added TestCheckResourceAttr for create_mode to tests * Upgraded Go SDK to v16.2.1 to match Master Branch * Replaced 2017-04-30-preview postgreSQL API with 2017-12-01 GA API * Removed CreateMode from schema, updated tests and documentation to match * Removed createmode validation from tests * Removed createmode from two hcl sections * [Bug Fix] Fixes issues #396 and #760 * Updated validators to match master branch * Fixing a merge conflict * Removed debug fmt statement * Removed AzureRMNormalizeCollation util function * Updated replace methiod * Updated validator to use regex instead of string contains * Made charset case insensitive and added two test cases * Switching to use the fields within `.Properties` to match the API Also working around a potential crash. Tests pass: ``` $ acctests azurerm TestAccAzureRMPostgreSQLDatabase_ === RUN TestAccAzureRMPostgreSQLDatabase_importBasic --- PASS: TestAccAzureRMPostgreSQLDatabase_importBasic (402.40s) === RUN TestAccAzureRMPostgreSQLDatabase_basic --- PASS: TestAccAzureRMPostgreSQLDatabase_basic (486.39s) === RUN TestAccAzureRMPostgreSQLDatabase_charsetLowercase --- PASS: TestAccAzureRMPostgreSQLDatabase_charsetLowercase (424.71s) === RUN TestAccAzureRMPostgreSQLDatabase_charsetMixedcase --- PASS: TestAccAzureRMPostgreSQLDatabase_charsetMixedcase (424.97s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 1738.507s ``` --- azurerm/resource_arm_postgresql_database.go | 26 ++-- .../resource_arm_postgresql_database_test.go | 125 ++++++++++++++++++ azurerm/validators.go | 19 +++ azurerm/validators_test.go | 33 ++++- .../docs/r/postgresql_server.html.markdown | 2 +- 5 files changed, 195 insertions(+), 10 deletions(-) diff --git a/azurerm/resource_arm_postgresql_database.go b/azurerm/resource_arm_postgresql_database.go index a331e0257985..d05cce28919b 100644 --- a/azurerm/resource_arm_postgresql_database.go +++ b/azurerm/resource_arm_postgresql_database.go @@ -3,6 +3,7 @@ package azurerm import ( "fmt" "log" + "strings" "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql" "github.com/hashicorp/terraform/helper/schema" @@ -35,15 +36,17 @@ func resourceArmPostgreSQLDatabase() *schema.Resource { }, "charset": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ForceNew: true, }, "collation": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateCollation(), }, }, } @@ -118,8 +121,15 @@ func resourceArmPostgreSQLDatabaseRead(d *schema.ResourceData, meta interface{}) d.Set("name", resp.Name) d.Set("resource_group_name", resGroup) d.Set("server_name", serverName) - d.Set("charset", resp.Charset) - d.Set("collation", resp.Collation) + + if props := resp.DatabaseProperties; props != nil { + d.Set("charset", props.Charset) + + if collation := props.Collation; collation != nil { + v := strings.Replace(*collation, "-", "_", -1) + d.Set("collation", v) + } + } return nil } diff --git a/azurerm/resource_arm_postgresql_database_test.go b/azurerm/resource_arm_postgresql_database_test.go index 2f59a69d82a9..ccc438b05314 100644 --- a/azurerm/resource_arm_postgresql_database_test.go +++ b/azurerm/resource_arm_postgresql_database_test.go @@ -24,7 +24,50 @@ func TestAccAzureRMPostgreSQLDatabase_basic(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMPostgreSQLDatabaseExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "charset", "UTF8"), + resource.TestCheckResourceAttr(resourceName, "collation", "English_United States.1252"), + ), + }, + }, + }) +} +func TestAccAzureRMPostgreSQLDatabase_charsetLowercase(t *testing.T) { + resourceName := "azurerm_postgresql_database.test" + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLDatabase_charsetLowercase(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLDatabaseDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPostgreSQLDatabaseExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "charset", "UTF8"), + resource.TestCheckResourceAttr(resourceName, "collation", "English_United States.1252"), + ), + }, + }, + }) +} + +func TestAccAzureRMPostgreSQLDatabase_charsetMixedcase(t *testing.T) { + resourceName := "azurerm_postgresql_database.test" + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLDatabase_charsetMixedcase(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLDatabaseDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPostgreSQLDatabaseExists(resourceName), resource.TestCheckResourceAttr(resourceName, "charset", "UTF8"), resource.TestCheckResourceAttr(resourceName, "collation", "English_United States.1252"), ), @@ -132,3 +175,85 @@ resource "azurerm_postgresql_database" "test" { } `, rInt, location, rInt, rInt) } + +func testAccAzureRMPostgreSQLDatabase_charsetLowercase(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_postgresql_server" "test" { + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "B_Gen4_2" + capacity = 2 + tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.6" + ssl_enforcement = "Enabled" +} + +resource "azurerm_postgresql_database" "test" { + name = "acctestdb_%d" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_postgresql_server.test.name}" + charset = "utf8" + collation = "English_United States.1252" +} +`, rInt, location, rInt, rInt) +} + +func testAccAzureRMPostgreSQLDatabase_charsetMixedcase(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_postgresql_server" "test" { + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "B_Gen4_2" + capacity = 2 + tier = "Basic" + family = "Gen4" + } + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.6" + ssl_enforcement = "Enabled" +} + +resource "azurerm_postgresql_database" "test" { + name = "acctestdb_%d" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_postgresql_server.test.name}" + charset = "Utf8" + collation = "English_United States.1252" +} +`, rInt, location, rInt, rInt) +} diff --git a/azurerm/validators.go b/azurerm/validators.go index 5b567160f0c9..708cdaf2940b 100644 --- a/azurerm/validators.go +++ b/azurerm/validators.go @@ -99,3 +99,22 @@ func validateIntBetweenDivisibleBy(min, max, divisor int) schema.SchemaValidateF return } } + +func validateCollation() schema.SchemaValidateFunc { + return func(i interface{}, k string) (s []string, es []error) { + v, ok := i.(string) + if !ok { + es = append(es, fmt.Errorf("expected type of %s to be string", k)) + return + } + + matched, _ := regexp.MatchString(`^[A-Za-z0-9_. ]+$`, v) + + if !matched { + es = append(es, fmt.Errorf("%s contains invalid characters, only underscores are supported, got %s", k, v)) + return + } + + return + } +} diff --git a/azurerm/validators_test.go b/azurerm/validators_test.go index a6b379ee3160..0f130f48f388 100644 --- a/azurerm/validators_test.go +++ b/azurerm/validators_test.go @@ -178,7 +178,38 @@ func TestValidateIntBetweenDivisibleBy(t *testing.T) { for _, tc := range cases { _, errors := validateIntBetweenDivisibleBy(tc.Min, tc.Max, tc.Div)(tc.Value, strconv.Itoa(tc.Value.(int))) if len(errors) != tc.Errors { - t.Fatalf("Expected intBetweenDivisibleBy to trigger '%d' errors for '%s' - got '%d' ['%s']", tc.Errors, tc.Value, len(errors), errors[0]) + t.Fatalf("Expected intBetweenDivisibleBy to trigger '%d' errors for '%s' - got '%d'", tc.Errors, tc.Value, len(errors)) + } + } +} + +func TestValidateCollation(t *testing.T) { + cases := []struct { + Value string + Errors int + }{ + { + Value: "en-US", + Errors: 1, + }, + { + Value: "en_US", + Errors: 0, + }, + { + Value: "en US", + Errors: 0, + }, + { + Value: "English_United States.1252", + Errors: 0, + }, + } + + for _, tc := range cases { + _, errors := validateCollation()(tc.Value, "collation") + if len(errors) != tc.Errors { + t.Fatalf("Expected validateCollation to trigger '%d' errors for '%s' - got '%d'", tc.Errors, tc.Value, len(errors)) } } } diff --git a/website/docs/r/postgresql_server.html.markdown b/website/docs/r/postgresql_server.html.markdown index 695b6c830e21..a27378716e53 100644 --- a/website/docs/r/postgresql_server.html.markdown +++ b/website/docs/r/postgresql_server.html.markdown @@ -73,7 +73,7 @@ The following arguments are supported: `sku` supports the following: * `name` - (Required) Specifies the SKU Name for this PostgreSQL Server. The name of the SKU, follows the `tier` + `family` + `cores` pattern (e.g. B_Gen4_1, GP_Gen5_8). For more information see the [product documentation](https://docs.microsoft.com/en-us/rest/api/postgresql/servers/create#sku). - + * `capacity` - (Required) The scale up/out capacity, representing server's compute units. * `tier` - (Required) The tier of the particular SKU. Possible values are `Basic`, `GeneralPurpose`, and `MemoryOptimized`. For more information see the [product documentation](https://docs.microsoft.com/en-us/azure/postgresql/concepts-pricing-tiers). From c759933135b0ad456d18a18d0024fd8e346565f5 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 24 May 2018 08:05:42 +0100 Subject: [PATCH 173/320] Updating to include #1255 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51e6d36b4da6..d1b92e60029d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ IMPROVEMENTS: * `azurerm_dns_zone` - datasource's `resource_group` field is now optional [GH-1180] * `azurerm_mysql_database` - ignoring casing for the `charset` field [GH-1281] * `azurerm_mysql_server` - support for the new GA Pricing SKU's [GH-1154] +* `azurerm_postgresql_database` - ignoring the casing on the `collation` field [GH-1255] * `azurerm_postgresql_server` - support for the new GA Pricing SKU's [GH-1190] * `azurerm_public_ip` - computed values now default to an empy string [GH-1247] * `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` [GH-1235] From 3860a2e9195624bd924278f9699ae6c329ddc6a0 Mon Sep 17 00:00:00 2001 From: Bertrand Roussel Date: Wed, 16 May 2018 21:02:23 -0700 Subject: [PATCH 174/320] Add 'priority' property for VM scale set Purpose is to support low-priority VMs, which should partially address #1249. This is simply adding a 'priority' parameter that can be set to Low or Regular (=default). The evictionPolicy is not supported yet as it was introduced in a more recent version of the compute API (2018-04-01). Cf https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-use-low-priority --- .../resource_arm_virtual_machine_scale_set.go | 13 +++ ...urce_arm_virtual_machine_scale_set_test.go | 106 +++++++++++++++++- 2 files changed, 118 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_virtual_machine_scale_set.go b/azurerm/resource_arm_virtual_machine_scale_set.go index ce52e6ab3ff7..2e1470e87810 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set.go +++ b/azurerm/resource_arm_virtual_machine_scale_set.go @@ -115,6 +115,16 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { ForceNew: true, }, + "priority": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + string(compute.Low), + string(compute.Regular), + }, true), + }, + "os_profile": { Type: schema.TypeList, Required: true, @@ -651,6 +661,7 @@ func resourceArmVirtualMachineScaleSetCreate(d *schema.ResourceData, meta interf updatePolicy := d.Get("upgrade_policy_mode").(string) overprovision := d.Get("overprovision").(bool) singlePlacementGroup := d.Get("single_placement_group").(bool) + priority := d.Get("priority").(string) scaleSetProps := compute.VirtualMachineScaleSetProperties{ UpgradePolicy: &compute.UpgradePolicy{ @@ -661,6 +672,7 @@ func resourceArmVirtualMachineScaleSetCreate(d *schema.ResourceData, meta interf StorageProfile: &storageProfile, OsProfile: osProfile, ExtensionProfile: extensions, + Priority: compute.VirtualMachinePriorityTypes(priority), }, Overprovision: &overprovision, SinglePlacementGroup: &singlePlacementGroup, @@ -768,6 +780,7 @@ func resourceArmVirtualMachineScaleSetRead(d *schema.ResourceData, meta interfac if profile := properties.VirtualMachineProfile; profile != nil { d.Set("license_type", profile.LicenseType) + d.Set("priority", profile.Priority) osProfile := flattenAzureRMVirtualMachineScaleSetOsProfile(d, profile.OsProfile) if err := d.Set("os_profile", osProfile); err != nil { diff --git a/azurerm/resource_arm_virtual_machine_scale_set_test.go b/azurerm/resource_arm_virtual_machine_scale_set_test.go index d9bb0865d1e9..0a3359ed555d 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set_test.go +++ b/azurerm/resource_arm_virtual_machine_scale_set_test.go @@ -437,6 +437,26 @@ func TestAccAzureRMVirtualMachineScaleSet_overprovision(t *testing.T) { }) } +func TestAccAzureRMVirtualMachineScaleSet_priority(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" + ri := acctest.RandInt() + config := testAccAzureRMVirtualMachineScaleSetPriorityTemplate(ri, testLocation()) + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualMachineScaleSetDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "priority", "Low"), + ), + }, + }, + }) +} + func TestAccAzureRMVirtualMachineScaleSet_MSI(t *testing.T) { resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() @@ -820,7 +840,7 @@ func testCheckAzureRMVirtualMachineScaleSetSinglePlacementGroup(name string, exp } if *resp.SinglePlacementGroup != expectedSinglePlacementGroup { - return fmt.Errorf("Bad: Overprovision should have been %t for scale set %v", expectedSinglePlacementGroup, name) + return fmt.Errorf("Bad: SinglePlacementGroup should have been %t for scale set %v", expectedSinglePlacementGroup, name) } return nil @@ -2577,6 +2597,90 @@ resource "azurerm_virtual_machine_scale_set" "test" { `, rInt, location, rInt, rInt, rInt, rInt, rInt) } +func testAccAzureRMVirtualMachineScaleSetPriorityTemplate(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestrg-%[1]d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctvn-%[1]d" + address_space = ["10.0.0.0/16"] + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_subnet" "test" { + name = "acctsub-%[1]d" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_storage_account" "test" { + name = "accsa%[1]d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + account_tier = "Standard" + account_replication_type = "LRS" +} + +resource "azurerm_storage_container" "test" { + name = "vhds" + resource_group_name = "${azurerm_resource_group.test.name}" + storage_account_name = "${azurerm_storage_account.test.name}" + container_access_type = "private" +} + +resource "azurerm_virtual_machine_scale_set" "test" { + name = "acctvmss-%[1]d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + upgrade_policy_mode = "Manual" + overprovision = false + priority = "Low" + + sku { + name = "Standard_D1_v2" + tier = "Standard" + capacity = 1 + } + + os_profile { + computer_name_prefix = "testvm-%[1]d" + admin_username = "myadmin" + admin_password = "Passwword1234" + } + + network_profile { + name = "TestNetworkProfile" + primary = true + + ip_configuration { + name = "TestIPConfiguration" + subnet_id = "${azurerm_subnet.test.id}" + } + } + + storage_profile_os_disk { + name = "os-disk" + caching = "ReadWrite" + create_option = "FromImage" + vhd_containers = ["${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}"] + } + + storage_profile_image_reference { + publisher = "Canonical" + offer = "UbuntuServer" + sku = "16.04-LTS" + version = "latest" + } +} + +`, rInt, location) +} + func testAccAzureRMVirtualMachineScaleSetMSITemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From cd1a6016d158567b3b2ee6b1fc1b3eb876428ec1 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 24 May 2018 11:27:57 +0100 Subject: [PATCH 175/320] Authorization: upgrading to the `2018-01-01` Preview SDK (#1284) * Vendoring the Preview Authorization SDK * Upgrading to the Preview Authorization SDK * Switching out the role names to make the test runs unique. Tests pass ``` $ acctests azurerm TestAccAzureRMRole === RUN TestAccAzureRMRoleDefinition_importBasic --- PASS: TestAccAzureRMRoleDefinition_importBasic (24.38s) === RUN TestAccAzureRMRoleDefinition_importComplete --- PASS: TestAccAzureRMRoleDefinition_importComplete (14.14s) === RUN TestAccAzureRMRoleAssignment === RUN TestAccAzureRMRoleAssignment/basic === RUN TestAccAzureRMRoleAssignment/basic/roleName === RUN TestAccAzureRMRoleAssignment/basic/builtin === RUN TestAccAzureRMRoleAssignment/basic/custom === RUN TestAccAzureRMRoleAssignment/basic/emptyName === RUN TestAccAzureRMRoleAssignment/import === RUN TestAccAzureRMRoleAssignment/import/basic === RUN TestAccAzureRMRoleAssignment/import/custom --- PASS: TestAccAzureRMRoleAssignment (118.70s) --- PASS: TestAccAzureRMRoleAssignment/basic (77.01s) --- PASS: TestAccAzureRMRoleAssignment/basic/roleName (19.05s) --- PASS: TestAccAzureRMRoleAssignment/basic/builtin (17.87s) --- PASS: TestAccAzureRMRoleAssignment/basic/custom (22.59s) --- PASS: TestAccAzureRMRoleAssignment/basic/emptyName (17.51s) --- PASS: TestAccAzureRMRoleAssignment/import (41.69s) --- PASS: TestAccAzureRMRoleAssignment/import/basic (21.88s) --- PASS: TestAccAzureRMRoleAssignment/import/custom (19.80s) === RUN TestAccAzureRMRoleDefinition_basic --- PASS: TestAccAzureRMRoleDefinition_basic (14.59s) === RUN TestAccAzureRMRoleDefinition_complete --- PASS: TestAccAzureRMRoleDefinition_complete (12.99s) === RUN TestAccAzureRMRoleDefinition_update --- PASS: TestAccAzureRMRoleDefinition_update (22.03s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 206.861s ``` * Adding a test case for a role using DataActions Tests pass: ``` $ acctests azurerm TestAccAzureRMRole === RUN TestAccAzureRMRoleDefinition_importBasic --- PASS: TestAccAzureRMRoleDefinition_importBasic (24.71s) === RUN TestAccAzureRMRoleDefinition_importComplete --- PASS: TestAccAzureRMRoleDefinition_importComplete (14.30s) === RUN TestAccAzureRMRoleAssignment === RUN TestAccAzureRMRoleAssignment/basic === RUN TestAccAzureRMRoleAssignment/basic/emptyName === RUN TestAccAzureRMRoleAssignment/basic/roleName === RUN TestAccAzureRMRoleAssignment/basic/dataActions === RUN TestAccAzureRMRoleAssignment/basic/builtin === RUN TestAccAzureRMRoleAssignment/basic/custom === RUN TestAccAzureRMRoleAssignment/import === RUN TestAccAzureRMRoleAssignment/import/basic === RUN TestAccAzureRMRoleAssignment/import/custom --- PASS: TestAccAzureRMRoleAssignment (140.30s) --- PASS: TestAccAzureRMRoleAssignment/basic (95.32s) --- PASS: TestAccAzureRMRoleAssignment/basic/emptyName (19.34s) --- PASS: TestAccAzureRMRoleAssignment/basic/roleName (15.95s) --- PASS: TestAccAzureRMRoleAssignment/basic/dataActions (19.54s) --- PASS: TestAccAzureRMRoleAssignment/basic/builtin (17.11s) --- PASS: TestAccAzureRMRoleAssignment/basic/custom (23.38s) --- PASS: TestAccAzureRMRoleAssignment/import (44.98s) --- PASS: TestAccAzureRMRoleAssignment/import/basic (22.07s) --- PASS: TestAccAzureRMRoleAssignment/import/custom (22.91s) === RUN TestAccAzureRMRoleDefinition_basic --- PASS: TestAccAzureRMRoleDefinition_basic (13.78s) === RUN TestAccAzureRMRoleDefinition_complete --- PASS: TestAccAzureRMRoleDefinition_complete (12.98s) === RUN TestAccAzureRMRoleDefinition_update --- PASS: TestAccAzureRMRoleDefinition_update (23.25s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 229.356s ``` --- azurerm/config.go | 2 +- .../data_source_builtin_role_definition.go | 4 +- azurerm/data_source_role_definition.go | 4 +- azurerm/resource_arm_role_assignment.go | 6 +- azurerm/resource_arm_role_assignment_test.go | 51 +++- azurerm/resource_arm_role_definition.go | 9 +- .../authorization/classicadministrators.go | 2 +- .../authorization/client.go | 2 +- .../authorization/models.go | 275 +++++++++++++++++- .../authorization/permissions.go | 8 +- .../provideroperationsmetadata.go | 4 +- .../authorization/roleassignments.go | 65 ++--- .../authorization/roledefinitions.go | 22 +- .../authorization/version.go | 2 +- vendor/vendor.json | 16 +- 15 files changed, 377 insertions(+), 95 deletions(-) rename vendor/github.com/Azure/azure-sdk-for-go/services/{authorization/mgmt/2015-07-01 => preview/authorization/mgmt/2018-01-01-preview}/authorization/classicadministrators.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{authorization/mgmt/2015-07-01 => preview/authorization/mgmt/2018-01-01-preview}/authorization/client.go (98%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{authorization/mgmt/2015-07-01 => preview/authorization/mgmt/2018-01-01-preview}/authorization/models.go (77%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{authorization/mgmt/2015-07-01 => preview/authorization/mgmt/2018-01-01-preview}/authorization/permissions.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{authorization/mgmt/2015-07-01 => preview/authorization/mgmt/2018-01-01-preview}/authorization/provideroperationsmetadata.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{authorization/mgmt/2015-07-01 => preview/authorization/mgmt/2018-01-01-preview}/authorization/roleassignments.go (93%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{authorization/mgmt/2015-07-01 => preview/authorization/mgmt/2018-01-01-preview}/authorization/roledefinitions.go (96%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{authorization/mgmt/2015-07-01 => preview/authorization/mgmt/2018-01-01-preview}/authorization/version.go (98%) diff --git a/azurerm/config.go b/azurerm/config.go index b0f9851fb768..0c61e8f876cf 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -11,7 +11,6 @@ import ( "time" appinsights "github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights" - "github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization" "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation" "github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-12-01/compute" @@ -33,6 +32,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights" "github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement" "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql" + "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization" "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices" "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis" "github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay" diff --git a/azurerm/data_source_builtin_role_definition.go b/azurerm/data_source_builtin_role_definition.go index 7638b09ecdc5..47f84469df1c 100644 --- a/azurerm/data_source_builtin_role_definition.go +++ b/azurerm/data_source_builtin_role_definition.go @@ -83,10 +83,10 @@ func dataSourceArmBuiltInRoleDefinitionRead(d *schema.ResourceData, meta interfa return fmt.Errorf("Error loading Role Definition: %+v", err) } - if props := role.Properties; props != nil { + if props := role.RoleDefinitionProperties; props != nil { d.Set("name", props.RoleName) d.Set("description", props.Description) - d.Set("type", props.Type) + d.Set("type", props.RoleType) permissions := flattenRoleDefinitionPermissions(props.Permissions) if err := d.Set("permissions", permissions); err != nil { diff --git a/azurerm/data_source_role_definition.go b/azurerm/data_source_role_definition.go index 686dd0b3fe84..bf2c94bfaeca 100644 --- a/azurerm/data_source_role_definition.go +++ b/azurerm/data_source_role_definition.go @@ -79,10 +79,10 @@ func dataSourceArmRoleDefinitionRead(d *schema.ResourceData, meta interface{}) e d.SetId(*role.ID) - if props := role.Properties; props != nil { + if props := role.RoleDefinitionProperties; props != nil { d.Set("name", props.RoleName) d.Set("description", props.Description) - d.Set("type", props.Type) + d.Set("type", props.RoleType) permissions := flattenRoleDefinitionPermissions(props.Permissions) if err := d.Set("permissions", permissions); err != nil { diff --git a/azurerm/resource_arm_role_assignment.go b/azurerm/resource_arm_role_assignment.go index 34fce15b5623..113c57dd04de 100644 --- a/azurerm/resource_arm_role_assignment.go +++ b/azurerm/resource_arm_role_assignment.go @@ -5,7 +5,7 @@ import ( "log" "strings" - "github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization" + "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization" "github.com/hashicorp/go-uuid" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -99,7 +99,7 @@ func resourceArmRoleAssignmentCreate(d *schema.ResourceData, meta interface{}) e } properties := authorization.RoleAssignmentCreateParameters{ - Properties: &authorization.RoleAssignmentProperties{ + RoleAssignmentProperties: &authorization.RoleAssignmentProperties{ RoleDefinitionID: utils.String(roleDefinitionId), PrincipalID: utils.String(principalId), }, @@ -139,7 +139,7 @@ func resourceArmRoleAssignmentRead(d *schema.ResourceData, meta interface{}) err d.Set("name", resp.Name) - if props := resp.Properties; props != nil { + if props := resp.RoleAssignmentPropertiesWithScope; props != nil { d.Set("scope", props.Scope) d.Set("role_definition_id", props.RoleDefinitionID) d.Set("principal_id", props.PrincipalID) diff --git a/azurerm/resource_arm_role_assignment_test.go b/azurerm/resource_arm_role_assignment_test.go index c031b2d54b5c..0b8fc4ebbd22 100644 --- a/azurerm/resource_arm_role_assignment_test.go +++ b/azurerm/resource_arm_role_assignment_test.go @@ -16,10 +16,11 @@ func TestAccAzureRMRoleAssignment(t *testing.T) { // Azure only being happy about provisioning a couple at a time testCases := map[string]map[string]func(t *testing.T){ "basic": { - "emptyName": testAccAzureRMRoleAssignment_emptyName, - "roleName": testAccAzureRMRoleAssignment_roleName, - "builtin": testAccAzureRMRoleAssignment_builtin, - "custom": testAccAzureRMRoleAssignment_custom, + "emptyName": testAccAzureRMRoleAssignment_emptyName, + "roleName": testAccAzureRMRoleAssignment_roleName, + "dataActions": testAccAzureRMRoleAssignment_dataActions, + "builtin": testAccAzureRMRoleAssignment_builtin, + "custom": testAccAzureRMRoleAssignment_custom, }, "import": { "basic": testAccAzureRMRoleAssignment_importBasic, @@ -81,6 +82,27 @@ func testAccAzureRMRoleAssignment_roleName(t *testing.T) { }) } +func testAccAzureRMRoleAssignment_dataActions(t *testing.T) { + id := uuid.New().String() + resourceName := "azurerm_role_assignment.test" + config := testAccAzureRMRoleAssignment_dataActionsConfig(id) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRoleAssignmentDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMRoleAssignmentExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "role_definition_id"), + ), + }, + }, + }) +} + func testAccAzureRMRoleAssignment_builtin(t *testing.T) { id := uuid.New().String() config := testAccAzureRMRoleAssignment_builtinConfig(id) @@ -180,7 +202,7 @@ data "azurerm_subscription" "primary" {} data "azurerm_client_config" "test" {} data "azurerm_builtin_role_definition" "test" { - name = "Reader" + name = "Monitoring Reader" } resource "azurerm_role_assignment" "test" { @@ -200,7 +222,22 @@ data "azurerm_client_config" "test" {} resource "azurerm_role_assignment" "test" { name = "%s" scope = "${data.azurerm_subscription.primary.id}" - role_definition_name = "Reader" + role_definition_name = "Log Analytics Reader" + principal_id = "${data.azurerm_client_config.test.service_principal_object_id}" +} +`, id) +} + +func testAccAzureRMRoleAssignment_dataActionsConfig(id string) string { + return fmt.Sprintf(` +data "azurerm_subscription" "primary" {} + +data "azurerm_client_config" "test" {} + +resource "azurerm_role_assignment" "test" { + name = "%s" + scope = "${data.azurerm_subscription.primary.id}" + role_definition_name = "Virtual Machine User Login" principal_id = "${data.azurerm_client_config.test.service_principal_object_id}" } `, id) @@ -213,7 +250,7 @@ data "azurerm_subscription" "primary" {} data "azurerm_client_config" "test" {} data "azurerm_builtin_role_definition" "test" { - name = "Reader" + name = "Site Recovery Reader" } resource "azurerm_role_assignment" "test" { diff --git a/azurerm/resource_arm_role_definition.go b/azurerm/resource_arm_role_definition.go index f5386d9d6101..d3ce17c34fb1 100644 --- a/azurerm/resource_arm_role_definition.go +++ b/azurerm/resource_arm_role_definition.go @@ -2,10 +2,9 @@ package azurerm import ( "fmt" - "log" - "github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization" + "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -90,10 +89,10 @@ func resourceArmRoleDefinitionCreateUpdate(d *schema.ResourceData, meta interfac assignableScopes := expandRoleDefinitionAssignableScopes(d) properties := authorization.RoleDefinition{ - Properties: &authorization.RoleDefinitionProperties{ + RoleDefinitionProperties: &authorization.RoleDefinitionProperties{ RoleName: utils.String(name), Description: utils.String(description), - Type: utils.String(roleType), + RoleType: utils.String(roleType), Permissions: &permissions, AssignableScopes: &assignableScopes, }, @@ -131,7 +130,7 @@ func resourceArmRoleDefinitionRead(d *schema.ResourceData, meta interface{}) err return fmt.Errorf("Error loading Role Definition %q: %+v", d.Id(), err) } - if props := resp.Properties; props != nil { + if props := resp.RoleDefinitionProperties; props != nil { d.Set("name", props.RoleName) d.Set("description", props.Description) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/classicadministrators.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/classicadministrators.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/classicadministrators.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/classicadministrators.go index ef906747c7c6..5e46de7a5bf1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/classicadministrators.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/classicadministrators.go @@ -72,7 +72,7 @@ func (client ClassicAdministratorsClient) ListPreparer(ctx context.Context) (*ht "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2015-07-01" + const APIVersion = "2015-06-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/client.go similarity index 98% rename from vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/client.go index cdce45f42202..6b6f6de95ef0 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/client.go @@ -1,4 +1,4 @@ -// Package authorization implements the Azure ARM Authorization service API version 2015-07-01. +// Package authorization implements the Azure ARM Authorization service API version . // // Role based access control provides you a way to apply granular level policy administration down to individual // resources or resource groups. These operations enable you to manage role definitions and role assignments. A role diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/models.go similarity index 77% rename from vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/models.go index 47061d681ea9..4f279ec7f00d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/models.go @@ -18,6 +18,7 @@ package authorization // Changes may cause incorrect behavior and will be lost if the code is regenerated. import ( + "encoding/json" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" "net/http" @@ -31,8 +32,77 @@ type ClassicAdministrator struct { Name *string `json:"name,omitempty"` // Type - The type of the administrator. Type *string `json:"type,omitempty"` - // Properties - Properties for the classic administrator. - Properties *ClassicAdministratorProperties `json:"properties,omitempty"` + // ClassicAdministratorProperties - Properties for the classic administrator. + *ClassicAdministratorProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for ClassicAdministrator. +func (ca ClassicAdministrator) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ca.ID != nil { + objectMap["id"] = ca.ID + } + if ca.Name != nil { + objectMap["name"] = ca.Name + } + if ca.Type != nil { + objectMap["type"] = ca.Type + } + if ca.ClassicAdministratorProperties != nil { + objectMap["properties"] = ca.ClassicAdministratorProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for ClassicAdministrator struct. +func (ca *ClassicAdministrator) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + ca.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + ca.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + ca.Type = &typeVar + } + case "properties": + if v != nil { + var classicAdministratorProperties ClassicAdministratorProperties + err = json.Unmarshal(*v, &classicAdministratorProperties) + if err != nil { + return err + } + ca.ClassicAdministratorProperties = &classicAdministratorProperties + } + } + } + + return nil } // ClassicAdministratorListResult classicAdministrator list result information. @@ -151,6 +221,10 @@ type Permission struct { Actions *[]string `json:"actions,omitempty"` // NotActions - Denied actions. NotActions *[]string `json:"notActions,omitempty"` + // DataActions - Allowed Data actions. + DataActions *[]string `json:"dataActions,omitempty"` + // NotDataActions - Denied Data actions. + NotDataActions *[]string `json:"notDataActions,omitempty"` } // PermissionGetResult permissions information. @@ -267,6 +341,8 @@ type ProviderOperation struct { Origin *string `json:"origin,omitempty"` // Properties - The operation properties. Properties interface{} `json:"properties,omitempty"` + // IsDataAction - The dataAction flag to specify the operation type. + IsDataAction *bool `json:"isDataAction,omitempty"` } // ProviderOperationsMetadata provider Operations metadata @@ -408,20 +484,124 @@ type RoleAssignment struct { Name *string `json:"name,omitempty"` // Type - The role assignment type. Type *string `json:"type,omitempty"` - // Properties - Role assignment properties. - Properties *RoleAssignmentPropertiesWithScope `json:"properties,omitempty"` + // RoleAssignmentPropertiesWithScope - Role assignment properties. + *RoleAssignmentPropertiesWithScope `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for RoleAssignment. +func (ra RoleAssignment) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ra.ID != nil { + objectMap["id"] = ra.ID + } + if ra.Name != nil { + objectMap["name"] = ra.Name + } + if ra.Type != nil { + objectMap["type"] = ra.Type + } + if ra.RoleAssignmentPropertiesWithScope != nil { + objectMap["properties"] = ra.RoleAssignmentPropertiesWithScope + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for RoleAssignment struct. +func (ra *RoleAssignment) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + ra.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + ra.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + ra.Type = &typeVar + } + case "properties": + if v != nil { + var roleAssignmentPropertiesWithScope RoleAssignmentPropertiesWithScope + err = json.Unmarshal(*v, &roleAssignmentPropertiesWithScope) + if err != nil { + return err + } + ra.RoleAssignmentPropertiesWithScope = &roleAssignmentPropertiesWithScope + } + } + } + + return nil } // RoleAssignmentCreateParameters role assignment create parameters. type RoleAssignmentCreateParameters struct { - // Properties - Role assignment properties. - Properties *RoleAssignmentProperties `json:"properties,omitempty"` + // RoleAssignmentProperties - Role assignment properties. + *RoleAssignmentProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for RoleAssignmentCreateParameters. +func (racp RoleAssignmentCreateParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if racp.RoleAssignmentProperties != nil { + objectMap["properties"] = racp.RoleAssignmentProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for RoleAssignmentCreateParameters struct. +func (racp *RoleAssignmentCreateParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var roleAssignmentProperties RoleAssignmentProperties + err = json.Unmarshal(*v, &roleAssignmentProperties) + if err != nil { + return err + } + racp.RoleAssignmentProperties = &roleAssignmentProperties + } + } + } + + return nil } // RoleAssignmentFilter role Assignments filter type RoleAssignmentFilter struct { // PrincipalID - Returns role assignment of the specific principal. PrincipalID *string `json:"principalId,omitempty"` + // CanDelegate - The Delegation flag for the roleassignment + CanDelegate *bool `json:"canDelegate,omitempty"` } // RoleAssignmentListResult role assignment list operation result. @@ -532,6 +712,8 @@ type RoleAssignmentProperties struct { RoleDefinitionID *string `json:"roleDefinitionId,omitempty"` // PrincipalID - The principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group. PrincipalID *string `json:"principalId,omitempty"` + // CanDelegate - The delgation flag used for creating a role assignment + CanDelegate *bool `json:"canDelegate,omitempty"` } // RoleAssignmentPropertiesWithScope role assignment properties with scope. @@ -542,6 +724,8 @@ type RoleAssignmentPropertiesWithScope struct { RoleDefinitionID *string `json:"roleDefinitionId,omitempty"` // PrincipalID - The principal ID. PrincipalID *string `json:"principalId,omitempty"` + // CanDelegate - The Delegation flag for the roleassignment + CanDelegate *bool `json:"canDelegate,omitempty"` } // RoleDefinition role definition. @@ -553,14 +737,85 @@ type RoleDefinition struct { Name *string `json:"name,omitempty"` // Type - The role definition type. Type *string `json:"type,omitempty"` - // Properties - Role definition properties. - Properties *RoleDefinitionProperties `json:"properties,omitempty"` + // RoleDefinitionProperties - Role definition properties. + *RoleDefinitionProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for RoleDefinition. +func (rd RoleDefinition) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if rd.ID != nil { + objectMap["id"] = rd.ID + } + if rd.Name != nil { + objectMap["name"] = rd.Name + } + if rd.Type != nil { + objectMap["type"] = rd.Type + } + if rd.RoleDefinitionProperties != nil { + objectMap["properties"] = rd.RoleDefinitionProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for RoleDefinition struct. +func (rd *RoleDefinition) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + rd.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + rd.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + rd.Type = &typeVar + } + case "properties": + if v != nil { + var roleDefinitionProperties RoleDefinitionProperties + err = json.Unmarshal(*v, &roleDefinitionProperties) + if err != nil { + return err + } + rd.RoleDefinitionProperties = &roleDefinitionProperties + } + } + } + + return nil } // RoleDefinitionFilter role Definitions filter type RoleDefinitionFilter struct { // RoleName - Returns role definition with the specific name. RoleName *string `json:"roleName,omitempty"` + // Type - Returns role definition with the specific type. + Type *string `json:"type,omitempty"` } // RoleDefinitionListResult role definition list operation result. @@ -671,8 +926,8 @@ type RoleDefinitionProperties struct { RoleName *string `json:"roleName,omitempty"` // Description - The role definition description. Description *string `json:"description,omitempty"` - // Type - The role type. - Type *string `json:"type,omitempty"` + // RoleType - The role type. + RoleType *string `json:"type,omitempty"` // Permissions - Role definition permissions. Permissions *[]Permission `json:"permissions,omitempty"` // AssignableScopes - Role definition assignable scopes. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/permissions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/permissions.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/permissions.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/permissions.go index 75e37dac79ee..9c97551b1eb9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/permissions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/permissions.go @@ -44,7 +44,7 @@ func NewPermissionsClientWithBaseURI(baseURI string, subscriptionID string) Perm // ListForResource gets all permissions the caller has for a resource. // Parameters: -// resourceGroupName - the name of the resource group containing the resource. The name is case insensitive. +// resourceGroupName - the name of the resource group. // resourceProviderNamespace - the namespace of the resource provider. // parentResourcePath - the parent resource identity. // resourceType - the resource type of the resource. @@ -83,7 +83,7 @@ func (client PermissionsClient) ListForResourcePreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -145,7 +145,7 @@ func (client PermissionsClient) ListForResourceComplete(ctx context.Context, res // ListForResourceGroup gets all permissions the caller has for a resource group. // Parameters: -// resourceGroupName - the name of the resource group to get the permissions for. The name is case insensitive. +// resourceGroupName - the name of the resource group. func (client PermissionsClient) ListForResourceGroup(ctx context.Context, resourceGroupName string) (result PermissionGetResultPage, err error) { result.fn = client.listForResourceGroupNextResults req, err := client.ListForResourceGroupPreparer(ctx, resourceGroupName) @@ -176,7 +176,7 @@ func (client PermissionsClient) ListForResourceGroupPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/provideroperationsmetadata.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/provideroperationsmetadata.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/provideroperationsmetadata.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/provideroperationsmetadata.go index d8f0df2a99c2..939049ef037b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/provideroperationsmetadata.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/provideroperationsmetadata.go @@ -74,7 +74,7 @@ func (client ProviderOperationsMetadataClient) GetPreparer(ctx context.Context, "resourceProviderNamespace": autorest.Encode("path", resourceProviderNamespace), } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -140,7 +140,7 @@ func (client ProviderOperationsMetadataClient) List(ctx context.Context, expand // ListPreparer prepares the List request. func (client ProviderOperationsMetadataClient) ListPreparer(ctx context.Context, expand string) (*http.Request, error) { - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roleassignments.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/roleassignments.go similarity index 93% rename from vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roleassignments.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/roleassignments.go index 5a842663c477..0be885b475df 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roleassignments.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/roleassignments.go @@ -80,7 +80,7 @@ func (client RoleAssignmentsClient) CreatePreparer(ctx context.Context, scope st "scope": scope, } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -117,13 +117,10 @@ func (client RoleAssignmentsClient) CreateResponder(resp *http.Response) (result // CreateByID creates a role assignment by ID. // Parameters: -// roleAssignmentID - the fully qualified ID of the role assignment, including the scope, resource name and -// resource type. Use the format, -// /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. Example: -// /subscriptions/{subId}/resourcegroups/{rgname}//providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. +// roleID - the ID of the role assignment to create. // parameters - parameters for the role assignment. -func (client RoleAssignmentsClient) CreateByID(ctx context.Context, roleAssignmentID string, parameters RoleAssignmentCreateParameters) (result RoleAssignment, err error) { - req, err := client.CreateByIDPreparer(ctx, roleAssignmentID, parameters) +func (client RoleAssignmentsClient) CreateByID(ctx context.Context, roleID string, parameters RoleAssignmentCreateParameters) (result RoleAssignment, err error) { + req, err := client.CreateByIDPreparer(ctx, roleID, parameters) if err != nil { err = autorest.NewErrorWithError(err, "authorization.RoleAssignmentsClient", "CreateByID", nil, "Failure preparing request") return @@ -145,12 +142,12 @@ func (client RoleAssignmentsClient) CreateByID(ctx context.Context, roleAssignme } // CreateByIDPreparer prepares the CreateByID request. -func (client RoleAssignmentsClient) CreateByIDPreparer(ctx context.Context, roleAssignmentID string, parameters RoleAssignmentCreateParameters) (*http.Request, error) { +func (client RoleAssignmentsClient) CreateByIDPreparer(ctx context.Context, roleID string, parameters RoleAssignmentCreateParameters) (*http.Request, error) { pathParameters := map[string]interface{}{ - "roleAssignmentId": roleAssignmentID, + "roleId": roleID, } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -159,7 +156,7 @@ func (client RoleAssignmentsClient) CreateByIDPreparer(ctx context.Context, role autorest.AsContentType("application/json; charset=utf-8"), autorest.AsPut(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/{roleAssignmentId}", pathParameters), + autorest.WithPathParameters("/{roleId}", pathParameters), autorest.WithJSON(parameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) @@ -218,7 +215,7 @@ func (client RoleAssignmentsClient) DeletePreparer(ctx context.Context, scope st "scope": scope, } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -253,12 +250,9 @@ func (client RoleAssignmentsClient) DeleteResponder(resp *http.Response) (result // DeleteByID deletes a role assignment. // Parameters: -// roleAssignmentID - the fully qualified ID of the role assignment, including the scope, resource name and -// resource type. Use the format, -// /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. Example: -// /subscriptions/{subId}/resourcegroups/{rgname}//providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. -func (client RoleAssignmentsClient) DeleteByID(ctx context.Context, roleAssignmentID string) (result RoleAssignment, err error) { - req, err := client.DeleteByIDPreparer(ctx, roleAssignmentID) +// roleID - the ID of the role assignment to delete. +func (client RoleAssignmentsClient) DeleteByID(ctx context.Context, roleID string) (result RoleAssignment, err error) { + req, err := client.DeleteByIDPreparer(ctx, roleID) if err != nil { err = autorest.NewErrorWithError(err, "authorization.RoleAssignmentsClient", "DeleteByID", nil, "Failure preparing request") return @@ -280,12 +274,12 @@ func (client RoleAssignmentsClient) DeleteByID(ctx context.Context, roleAssignme } // DeleteByIDPreparer prepares the DeleteByID request. -func (client RoleAssignmentsClient) DeleteByIDPreparer(ctx context.Context, roleAssignmentID string) (*http.Request, error) { +func (client RoleAssignmentsClient) DeleteByIDPreparer(ctx context.Context, roleID string) (*http.Request, error) { pathParameters := map[string]interface{}{ - "roleAssignmentId": roleAssignmentID, + "roleId": roleID, } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -293,7 +287,7 @@ func (client RoleAssignmentsClient) DeleteByIDPreparer(ctx context.Context, role preparer := autorest.CreatePreparer( autorest.AsDelete(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/{roleAssignmentId}", pathParameters), + autorest.WithPathParameters("/{roleId}", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } @@ -351,7 +345,7 @@ func (client RoleAssignmentsClient) GetPreparer(ctx context.Context, scope strin "scope": scope, } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -386,12 +380,9 @@ func (client RoleAssignmentsClient) GetResponder(resp *http.Response) (result Ro // GetByID gets a role assignment by ID. // Parameters: -// roleAssignmentID - the fully qualified ID of the role assignment, including the scope, resource name and -// resource type. Use the format, -// /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. Example: -// /subscriptions/{subId}/resourcegroups/{rgname}//providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. -func (client RoleAssignmentsClient) GetByID(ctx context.Context, roleAssignmentID string) (result RoleAssignment, err error) { - req, err := client.GetByIDPreparer(ctx, roleAssignmentID) +// roleID - the ID of the role assignment to get. +func (client RoleAssignmentsClient) GetByID(ctx context.Context, roleID string) (result RoleAssignment, err error) { + req, err := client.GetByIDPreparer(ctx, roleID) if err != nil { err = autorest.NewErrorWithError(err, "authorization.RoleAssignmentsClient", "GetByID", nil, "Failure preparing request") return @@ -413,12 +404,12 @@ func (client RoleAssignmentsClient) GetByID(ctx context.Context, roleAssignmentI } // GetByIDPreparer prepares the GetByID request. -func (client RoleAssignmentsClient) GetByIDPreparer(ctx context.Context, roleAssignmentID string) (*http.Request, error) { +func (client RoleAssignmentsClient) GetByIDPreparer(ctx context.Context, roleID string) (*http.Request, error) { pathParameters := map[string]interface{}{ - "roleAssignmentId": roleAssignmentID, + "roleId": roleID, } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -426,7 +417,7 @@ func (client RoleAssignmentsClient) GetByIDPreparer(ctx context.Context, roleAss preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/{roleAssignmentId}", pathParameters), + autorest.WithPathParameters("/{roleId}", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } @@ -485,7 +476,7 @@ func (client RoleAssignmentsClient) ListPreparer(ctx context.Context, filter str "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -592,7 +583,7 @@ func (client RoleAssignmentsClient) ListForResourcePreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -691,7 +682,7 @@ func (client RoleAssignmentsClient) ListForResourceGroupPreparer(ctx context.Con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -789,7 +780,7 @@ func (client RoleAssignmentsClient) ListForScopePreparer(ctx context.Context, sc "scope": scope, } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roledefinitions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/roledefinitions.go similarity index 96% rename from vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roledefinitions.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/roledefinitions.go index a5e5afd5a721..6c1d3b537e49 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/roledefinitions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/roledefinitions.go @@ -76,7 +76,7 @@ func (client RoleDefinitionsClient) CreateOrUpdatePreparer(ctx context.Context, "scope": scope, } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -144,7 +144,7 @@ func (client RoleDefinitionsClient) DeletePreparer(ctx context.Context, scope st "scope": scope, } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -210,7 +210,7 @@ func (client RoleDefinitionsClient) GetPreparer(ctx context.Context, scope strin "scope": scope, } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -245,12 +245,12 @@ func (client RoleDefinitionsClient) GetResponder(resp *http.Response) (result Ro // GetByID gets a role definition by ID. // Parameters: -// roleDefinitionID - the fully qualified role definition ID. Use the format, +// roleID - the fully qualified role definition ID. Use the format, // /subscriptions/{guid}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId} for subscription // level role definitions, or /providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId} for tenant // level role definitions. -func (client RoleDefinitionsClient) GetByID(ctx context.Context, roleDefinitionID string) (result RoleDefinition, err error) { - req, err := client.GetByIDPreparer(ctx, roleDefinitionID) +func (client RoleDefinitionsClient) GetByID(ctx context.Context, roleID string) (result RoleDefinition, err error) { + req, err := client.GetByIDPreparer(ctx, roleID) if err != nil { err = autorest.NewErrorWithError(err, "authorization.RoleDefinitionsClient", "GetByID", nil, "Failure preparing request") return @@ -272,12 +272,12 @@ func (client RoleDefinitionsClient) GetByID(ctx context.Context, roleDefinitionI } // GetByIDPreparer prepares the GetByID request. -func (client RoleDefinitionsClient) GetByIDPreparer(ctx context.Context, roleDefinitionID string) (*http.Request, error) { +func (client RoleDefinitionsClient) GetByIDPreparer(ctx context.Context, roleID string) (*http.Request, error) { pathParameters := map[string]interface{}{ - "roleDefinitionId": roleDefinitionID, + "roleId": roleID, } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -285,7 +285,7 @@ func (client RoleDefinitionsClient) GetByIDPreparer(ctx context.Context, roleDef preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/{roleDefinitionId}", pathParameters), + autorest.WithPathParameters("/{roleId}", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } @@ -344,7 +344,7 @@ func (client RoleDefinitionsClient) ListPreparer(ctx context.Context, scope stri "scope": scope, } - const APIVersion = "2015-07-01" + const APIVersion = "2018-01-01-preview" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/version.go similarity index 98% rename from vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/version.go index 77a9c4f0562f..2833e0b21000 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization/version.go @@ -21,7 +21,7 @@ import "github.com/Azure/azure-sdk-for-go/version" // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " authorization/2015-07-01" + return "Azure-SDK-For-Go/" + version.Number + " authorization/2018-01-01-preview" } // Version returns the semantic version (see http://semver.org) of the client. diff --git a/vendor/vendor.json b/vendor/vendor.json index 457583b07a61..d7e6551911ab 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -10,14 +10,6 @@ "version": "v16.2.1", "versionExact": "v16.2.1" }, - { - "checksumSHA1": "jf0lz1wRA07ILyDujw/NzoU3kMA=", - "path": "github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" - }, { "checksumSHA1": "cL5VuAorqkBbkDvfOpB8Mh8Mm48=", "path": "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation", @@ -186,6 +178,14 @@ "version": "v16.2.1", "versionExact": "v16.2.1" }, + { + "checksumSHA1": "e4hCajXDSuWNkUvwA35jMHGm20E=", + "path": "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization", + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" + }, { "checksumSHA1": "UWSnIzZywuEpEevbPfbPNLk1dFk=", "path": "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices", From 6f942e989c93c291d02c0e05c7768ff666df01af Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 24 May 2018 11:28:27 +0100 Subject: [PATCH 176/320] Updating to include #1284 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1b92e60029d..aaffbf879325 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ BUG FIXES: IMPROVEMENTS: +* authorization: upgrading to API version `2018-01-01-preview` * `azurerm_app_service` - adding support for `ip_restriction`'s [GH-1231] * `azurerm_container_registry` - no longer forces a new resource on SKU change [GH-1264] * `azurerm_dns_zone` - datasource's `resource_group` field is now optional [GH-1180] @@ -29,6 +30,7 @@ IMPROVEMENTS: * `azurerm_postgresql_database` - ignoring the casing on the `collation` field [GH-1255] * `azurerm_postgresql_server` - support for the new GA Pricing SKU's [GH-1190] * `azurerm_public_ip` - computed values now default to an empy string [GH-1247] +* `azurerm_role_assignment` - support for roles containing DataActions [GH-1284] * `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` [GH-1235] * `azurerm_virtual_machine_scale_set` - adding the `licence_type` property [GH-1245] From 2f081ac0e78f21d7dc5d212f53dd1a842fae3ca3 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 24 May 2018 13:39:07 +0100 Subject: [PATCH 177/320] App Service: moving `ip_restrictions` within `site_config` block (#1246) * Moving `ip_restriction` within the `site_config` block * Adding support for `ip_restrictions` to App Service Slots ``` $ acctests azurerm TestAccAzureRMAppServiceSlot_oneIpRestriction === RUN TestAccAzureRMAppServiceSlot_oneIpRestriction --- PASS: TestAccAzureRMAppServiceSlot_oneIpRestriction (176.90s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 176.925s ``` ``` $ acctests azurerm TestAccAzureRMAppServiceSlot_manyIpRestrictions === RUN TestAccAzureRMAppServiceSlot_manyIpRestrictions --- PASS: TestAccAzureRMAppServiceSlot_manyIpRestrictions (173.68s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 173.717s ``` * Moving the Diff Supress Funcs into a new schema package * Combining the App Service "Site Config" Schema --- azurerm/data_source_app_service.go | 121 +----- azurerm/helpers/schema/app_service.go | 366 +++++++++++++++++ azurerm/helpers/schema/diff_suppress_func.go | 19 + azurerm/provider.go | 6 +- azurerm/resource_arm_app_service.go | 375 +----------------- azurerm/resource_arm_app_service_slot.go | 150 +------ azurerm/resource_arm_app_service_slot_test.go | 140 +++++++ azurerm/resource_arm_app_service_test.go | 48 ++- website/docs/d/app_service.html.markdown | 20 +- website/docs/r/app_service.html.markdown | 19 +- website/docs/r/app_service_slot.html.markdown | 9 + 11 files changed, 600 insertions(+), 673 deletions(-) create mode 100644 azurerm/helpers/schema/app_service.go create mode 100644 azurerm/helpers/schema/diff_suppress_func.go diff --git a/azurerm/data_source_app_service.go b/azurerm/data_source_app_service.go index ab575d8206ac..bf751dc24d4d 100644 --- a/azurerm/data_source_app_service.go +++ b/azurerm/data_source_app_service.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/hashicorp/terraform/helper/schema" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -27,125 +28,19 @@ func dataSourceArmAppService() *schema.Resource { Computed: true, }, - "site_config": { - Type: schema.TypeList, - Computed: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "always_on": { - Type: schema.TypeBool, - Computed: true, - }, - - "default_documents": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - - "dotnet_framework_version": { - Type: schema.TypeString, - Computed: true, - }, - - "http2_enabled": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - - "java_version": { - Type: schema.TypeString, - Computed: true, - }, - - "java_container": { - Type: schema.TypeString, - Computed: true, - }, - - "java_container_version": { - Type: schema.TypeString, - Computed: true, - }, - - "local_mysql_enabled": { - Type: schema.TypeBool, - Computed: true, - }, - - "managed_pipeline_mode": { - Type: schema.TypeString, - Computed: true, - }, - - "php_version": { - Type: schema.TypeString, - Computed: true, - }, - - "python_version": { - Type: schema.TypeString, - Computed: true, - }, - - "remote_debugging_enabled": { - Type: schema.TypeBool, - Computed: true, - }, - - "remote_debugging_version": { - Type: schema.TypeString, - Computed: true, - }, - - "scm_type": { - Type: schema.TypeString, - Computed: true, - }, - - "use_32_bit_worker_process": { - Type: schema.TypeBool, - Computed: true, - }, - - "websockets_enabled": { - Type: schema.TypeBool, - Computed: true, - }, - }, - }, - }, + "site_config": azSchema.AppServiceSiteConfigSchema(), "client_affinity_enabled": { Type: schema.TypeBool, Computed: true, }, - "ip_restriction": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "ip_address": { - Type: schema.TypeString, - Computed: true, - }, - "subnet_mask": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - - "https_only": { + "enabled": { Type: schema.TypeBool, Computed: true, }, - "enabled": { + "https_only": { Type: schema.TypeBool, Computed: true, }, @@ -205,6 +100,7 @@ func dataSourceArmAppService() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "source_control": { Type: schema.TypeList, Computed: true, @@ -296,16 +192,11 @@ func dataSourceArmAppServiceRead(d *schema.ResourceData, meta interface{}) error return err } - siteConfig := flattenAppServiceSiteConfig(configResp.SiteConfig) + siteConfig := azSchema.FlattenAppServiceSiteConfig(configResp.SiteConfig) if err := d.Set("site_config", siteConfig); err != nil { return err } - restrictions := flattenAppServiceIpRestrictions(configResp.SiteConfig.IPSecurityRestrictions) - if err := d.Set("ip_restriction", restrictions); err != nil { - return fmt.Errorf("Error setting `ip_restriction`: %s", err) - } - scm := flattenAppServiceSourceControl(scmResp.SiteSourceControlProperties) if err := d.Set("source_control", scm); err != nil { return err diff --git a/azurerm/helpers/schema/app_service.go b/azurerm/helpers/schema/app_service.go new file mode 100644 index 000000000000..243f9fbfe577 --- /dev/null +++ b/azurerm/helpers/schema/app_service.go @@ -0,0 +1,366 @@ +package schema + +import ( + "log" + + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web" + "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func AppServiceSiteConfigSchema() *schema.Schema { + return &schema.Schema{ + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "always_on": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + + "default_documents": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + + "dotnet_framework_version": { + Type: schema.TypeString, + Optional: true, + Default: "v4.0", + ValidateFunc: validation.StringInSlice([]string{ + "v2.0", + "v4.0", + }, true), + DiffSuppressFunc: IgnoreCaseDiffSuppressFunc, + }, + + "http2_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + + "ip_restriction": { + Type: schema.TypeList, + Optional: true, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "ip_address": { + Type: schema.TypeString, + Required: true, + }, + "subnet_mask": { + Type: schema.TypeString, + Optional: true, + Default: "255.255.255.255", + }, + }, + }, + }, + + "java_version": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + "1.7", + "1.8", + }, false), + }, + + "java_container": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + "JETTY", + "TOMCAT", + }, true), + DiffSuppressFunc: IgnoreCaseDiffSuppressFunc, + }, + + "java_container_version": { + Type: schema.TypeString, + Optional: true, + }, + + "local_mysql_enabled": { + Type: schema.TypeBool, + Optional: true, + Computed: true, + }, + + "managed_pipeline_mode": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validation.StringInSlice([]string{ + string(web.Classic), + string(web.Integrated), + }, true), + DiffSuppressFunc: IgnoreCaseDiffSuppressFunc, + }, + + "php_version": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + "5.5", + "5.6", + "7.0", + "7.1", + }, false), + }, + + "python_version": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + "2.7", + "3.4", + }, false), + }, + + "remote_debugging_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + + "remote_debugging_version": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validation.StringInSlice([]string{ + "VS2012", + "VS2013", + "VS2015", + "VS2017", + }, true), + DiffSuppressFunc: IgnoreCaseDiffSuppressFunc, + }, + + "scm_type": { + Type: schema.TypeString, + Optional: true, + Default: string(web.ScmTypeNone), + ValidateFunc: validation.StringInSlice([]string{ + string(web.ScmTypeNone), + string(web.ScmTypeLocalGit), + }, false), + }, + + "use_32_bit_worker_process": { + Type: schema.TypeBool, + Optional: true, + Computed: true, + }, + + "websockets_enabled": { + Type: schema.TypeBool, + Optional: true, + Computed: true, + }, + }, + }, + } +} + +func ExpandAppServiceSiteConfig(input interface{}) web.SiteConfig { + configs := input.([]interface{}) + siteConfig := web.SiteConfig{} + + if len(configs) == 0 { + return siteConfig + } + + config := configs[0].(map[string]interface{}) + + if v, ok := config["always_on"]; ok { + siteConfig.AlwaysOn = utils.Bool(v.(bool)) + } + + if v, ok := config["default_documents"]; ok { + input := v.([]interface{}) + + documents := make([]string, 0) + for _, document := range input { + documents = append(documents, document.(string)) + } + + siteConfig.DefaultDocuments = &documents + } + + if v, ok := config["dotnet_framework_version"]; ok { + siteConfig.NetFrameworkVersion = utils.String(v.(string)) + } + + if v, ok := config["java_version"]; ok { + siteConfig.JavaVersion = utils.String(v.(string)) + } + + if v, ok := config["java_container"]; ok { + siteConfig.JavaContainer = utils.String(v.(string)) + } + + if v, ok := config["java_container_version"]; ok { + siteConfig.JavaContainerVersion = utils.String(v.(string)) + } + + if v, ok := config["http2_enabled"]; ok { + siteConfig.HTTP20Enabled = utils.Bool(v.(bool)) + } + + if v, ok := config["ip_restriction"]; ok { + ipSecurityRestrictions := v.([]interface{}) + restrictions := make([]web.IPSecurityRestriction, 0) + + for _, ipSecurityRestriction := range ipSecurityRestrictions { + restriction := ipSecurityRestriction.(map[string]interface{}) + + ipAddress := restriction["ip_address"].(string) + mask := restriction["subnet_mask"].(string) + + restrictions = append(restrictions, web.IPSecurityRestriction{ + IPAddress: &ipAddress, + SubnetMask: &mask, + }) + } + siteConfig.IPSecurityRestrictions = &restrictions + } + + if v, ok := config["local_mysql_enabled"]; ok { + siteConfig.LocalMySQLEnabled = utils.Bool(v.(bool)) + } + + if v, ok := config["managed_pipeline_mode"]; ok { + siteConfig.ManagedPipelineMode = web.ManagedPipelineMode(v.(string)) + } + + if v, ok := config["php_version"]; ok { + siteConfig.PhpVersion = utils.String(v.(string)) + } + + if v, ok := config["python_version"]; ok { + siteConfig.PythonVersion = utils.String(v.(string)) + } + + if v, ok := config["remote_debugging_enabled"]; ok { + siteConfig.RemoteDebuggingEnabled = utils.Bool(v.(bool)) + } + + if v, ok := config["remote_debugging_version"]; ok { + siteConfig.RemoteDebuggingVersion = utils.String(v.(string)) + } + + if v, ok := config["use_32_bit_worker_process"]; ok { + siteConfig.Use32BitWorkerProcess = utils.Bool(v.(bool)) + } + + if v, ok := config["websockets_enabled"]; ok { + siteConfig.WebSocketsEnabled = utils.Bool(v.(bool)) + } + + if v, ok := config["scm_type"]; ok { + siteConfig.ScmType = web.ScmType(v.(string)) + } + + return siteConfig +} + +func FlattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} { + results := make([]interface{}, 0) + result := make(map[string]interface{}, 0) + + if input == nil { + log.Printf("[DEBUG] SiteConfig is nil") + return results + } + + if input.AlwaysOn != nil { + result["always_on"] = *input.AlwaysOn + } + + if input.DefaultDocuments != nil { + documents := make([]string, 0) + for _, document := range *input.DefaultDocuments { + documents = append(documents, document) + } + + result["default_documents"] = documents + } + + if input.NetFrameworkVersion != nil { + result["dotnet_framework_version"] = *input.NetFrameworkVersion + } + + if input.JavaVersion != nil { + result["java_version"] = *input.JavaVersion + } + + if input.JavaContainer != nil { + result["java_container"] = *input.JavaContainer + } + + if input.JavaContainerVersion != nil { + result["java_container_version"] = *input.JavaContainerVersion + } + + if input.LocalMySQLEnabled != nil { + result["local_mysql_enabled"] = *input.LocalMySQLEnabled + } + + if input.HTTP20Enabled != nil { + result["http2_enabled"] = *input.HTTP20Enabled + } + + restrictions := make([]interface{}, 0) + if vs := input.IPSecurityRestrictions; vs != nil { + for _, v := range *vs { + result := make(map[string]interface{}, 0) + if ip := v.IPAddress; ip != nil { + result["ip_address"] = *ip + } + if subnet := v.SubnetMask; subnet != nil { + result["subnet_mask"] = *subnet + } + restrictions = append(restrictions, result) + } + } + result["ip_restriction"] = restrictions + + result["managed_pipeline_mode"] = string(input.ManagedPipelineMode) + + if input.PhpVersion != nil { + result["php_version"] = *input.PhpVersion + } + + if input.PythonVersion != nil { + result["python_version"] = *input.PythonVersion + } + + if input.RemoteDebuggingEnabled != nil { + result["remote_debugging_enabled"] = *input.RemoteDebuggingEnabled + } + + if input.RemoteDebuggingVersion != nil { + result["remote_debugging_version"] = *input.RemoteDebuggingVersion + } + + if input.Use32BitWorkerProcess != nil { + result["use_32_bit_worker_process"] = *input.Use32BitWorkerProcess + } + + if input.WebSocketsEnabled != nil { + result["websockets_enabled"] = *input.WebSocketsEnabled + } + + result["scm_type"] = string(input.ScmType) + + return append(results, result) +} diff --git a/azurerm/helpers/schema/diff_suppress_func.go b/azurerm/helpers/schema/diff_suppress_func.go new file mode 100644 index 000000000000..a622ff7f74c0 --- /dev/null +++ b/azurerm/helpers/schema/diff_suppress_func.go @@ -0,0 +1,19 @@ +package schema + +import ( + "strings" + + "github.com/hashicorp/terraform/helper/schema" +) + +// ignoreCaseDiffSuppressFunc is a DiffSuppressFunc from helper/schema that is +// used to ignore any case-changes in a return value. +func IgnoreCaseDiffSuppressFunc(k, old, new string, d *schema.ResourceData) bool { + return strings.ToLower(old) == strings.ToLower(new) +} + +// ignoreCaseStateFunc is a StateFunc from helper/schema that converts the +// supplied value to lower before saving to state for consistency. +func IgnoreCaseStateFunc(val interface{}) string { + return strings.ToLower(val.(string)) +} diff --git a/azurerm/provider.go b/azurerm/provider.go index 6d46f0cfc191..d53daabbaf5a 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -16,6 +16,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/authentication" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/schema" ) // Provider returns a terraform.ResourceProvider. @@ -399,10 +400,9 @@ func registerAzureResourceProvidersWithSubscription(ctx context.Context, provide // armMutexKV is the instance of MutexKV for ARM resources var armMutexKV = mutexkv.NewMutexKV() -// ignoreCaseDiffSuppressFunc is a DiffSuppressFunc from helper/schema that is -// used to ignore any case-changes in a return value. +// Deprecated - use `azschema.IgnoreCaseDiffSuppressFunc` instead func ignoreCaseDiffSuppressFunc(k, old, new string, d *schema.ResourceData) bool { - return strings.ToLower(old) == strings.ToLower(new) + return azSchema.IgnoreCaseDiffSuppressFunc(k, old, new, d) } // ignoreCaseStateFunc is a StateFunc from helper/schema that converts the diff --git a/azurerm/resource_arm_app_service.go b/azurerm/resource_arm_app_service.go index 193f9a063d69..36a2368e7e81 100644 --- a/azurerm/resource_arm_app_service.go +++ b/azurerm/resource_arm_app_service.go @@ -8,6 +8,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -66,147 +67,7 @@ func resourceArmAppService() *schema.Resource { ForceNew: true, }, - // TODO: reusable schema - "site_config": { - Type: schema.TypeList, - Optional: true, - Computed: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "always_on": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - - "default_documents": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - - "dotnet_framework_version": { - Type: schema.TypeString, - Optional: true, - Default: "v4.0", - ValidateFunc: validation.StringInSlice([]string{ - "v2.0", - "v4.0", - }, true), - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, - }, - - "http2_enabled": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - - "java_version": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - "1.7", - "1.8", - }, false), - }, - - "java_container": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - "JETTY", - "TOMCAT", - }, true), - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, - }, - - "java_container_version": { - Type: schema.TypeString, - Optional: true, - }, - - "local_mysql_enabled": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - }, - - "managed_pipeline_mode": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: validation.StringInSlice([]string{ - string(web.Classic), - string(web.Integrated), - }, true), - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, - }, - - "php_version": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - "5.5", - "5.6", - "7.0", - "7.1", - }, false), - }, - - "python_version": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - "2.7", - "3.4", - }, false), - }, - - "remote_debugging_enabled": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - - "remote_debugging_version": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: validation.StringInSlice([]string{ - "VS2012", - "VS2013", - "VS2015", - "VS2017", - }, true), - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, - }, - - "scm_type": { - Type: schema.TypeString, - Optional: true, - Default: string(web.ScmTypeNone), - ValidateFunc: validation.StringInSlice([]string{ - string(web.ScmTypeNone), - string(web.ScmTypeLocalGit), - }, false), - }, - - "use_32_bit_worker_process": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - }, - - "websockets_enabled": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - }, - }, - }, - }, + "site_config": azSchema.AppServiceSiteConfigSchema(), "client_affinity_enabled": { Type: schema.TypeBool, @@ -214,25 +75,6 @@ func resourceArmAppService() *schema.Resource { Computed: true, }, - "ip_restriction": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "ip_address": { - Type: schema.TypeString, - Required: true, - }, - "subnet_mask": { - Type: schema.TypeString, - Optional: true, - Default: "255.255.255.255", - }, - }, - }, - }, - "https_only": { Type: schema.TypeBool, Optional: true, @@ -366,7 +208,7 @@ func resourceArmAppServiceCreate(d *schema.ResourceData, meta interface{}) error httpsOnly := d.Get("https_only").(bool) tags := d.Get("tags").(map[string]interface{}) - siteConfig := expandAppServiceSiteConfig(d) + siteConfig := azSchema.ExpandAppServiceSiteConfig(d.Get("site_config")) siteEnvelope := web.Site{ Location: &location, @@ -430,7 +272,7 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error httpsOnly := d.Get("https_only").(bool) tags := d.Get("tags").(map[string]interface{}) - siteConfig := expandAppServiceSiteConfig(d) + siteConfig := azSchema.ExpandAppServiceSiteConfig(d.Get("site_config")) siteEnvelope := web.Site{ Location: &location, Tags: expandTags(tags), @@ -452,9 +294,9 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error return err } - if d.HasChange("site_config") || d.HasChange("ip_restriction") { + if d.HasChange("site_config") { // update the main configuration - siteConfig := expandAppServiceSiteConfig(d) + siteConfig := azSchema.ExpandAppServiceSiteConfig(d.Get("site_config")) siteConfigResource := web.SiteConfigResource{ SiteConfig: &siteConfig, } @@ -609,16 +451,11 @@ func resourceArmAppServiceRead(d *schema.ResourceData, meta interface{}) error { return err } - siteConfig := flattenAppServiceSiteConfig(configResp.SiteConfig) + siteConfig := azSchema.FlattenAppServiceSiteConfig(configResp.SiteConfig) if err := d.Set("site_config", siteConfig); err != nil { return err } - restrictions := flattenAppServiceIpRestrictions(configResp.SiteConfig.IPSecurityRestrictions) - if err := d.Set("ip_restriction", restrictions); err != nil { - return fmt.Errorf("Error flattening `ip_restrictions`: %s", err) - } - scm := flattenAppServiceSourceControl(scmResp.SiteSourceControlProperties) if err := d.Set("source_control", scm); err != nil { return err @@ -664,170 +501,6 @@ func resourceArmAppServiceDelete(d *schema.ResourceData, meta interface{}) error return nil } -func expandAppServiceSiteConfig(d *schema.ResourceData) web.SiteConfig { - configs := d.Get("site_config").([]interface{}) - siteConfig := web.SiteConfig{} - - ipRestrictions := expandIpRestrictions(d) - siteConfig.IPSecurityRestrictions = ipRestrictions - - if len(configs) == 0 { - return siteConfig - } - - config := configs[0].(map[string]interface{}) - - if v, ok := config["always_on"]; ok { - siteConfig.AlwaysOn = utils.Bool(v.(bool)) - } - - if v, ok := config["default_documents"]; ok { - input := v.([]interface{}) - - documents := make([]string, 0) - for _, document := range input { - documents = append(documents, document.(string)) - } - - siteConfig.DefaultDocuments = &documents - } - - if v, ok := config["dotnet_framework_version"]; ok { - siteConfig.NetFrameworkVersion = utils.String(v.(string)) - } - - if v, ok := config["java_version"]; ok { - siteConfig.JavaVersion = utils.String(v.(string)) - } - - if v, ok := config["java_container"]; ok { - siteConfig.JavaContainer = utils.String(v.(string)) - } - - if v, ok := config["java_container_version"]; ok { - siteConfig.JavaContainerVersion = utils.String(v.(string)) - } - - if v, ok := config["http2_enabled"]; ok { - siteConfig.HTTP20Enabled = utils.Bool(v.(bool)) - } - - if v, ok := config["local_mysql_enabled"]; ok { - siteConfig.LocalMySQLEnabled = utils.Bool(v.(bool)) - } - - if v, ok := config["managed_pipeline_mode"]; ok { - siteConfig.ManagedPipelineMode = web.ManagedPipelineMode(v.(string)) - } - - if v, ok := config["php_version"]; ok { - siteConfig.PhpVersion = utils.String(v.(string)) - } - - if v, ok := config["python_version"]; ok { - siteConfig.PythonVersion = utils.String(v.(string)) - } - - if v, ok := config["remote_debugging_enabled"]; ok { - siteConfig.RemoteDebuggingEnabled = utils.Bool(v.(bool)) - } - - if v, ok := config["remote_debugging_version"]; ok { - siteConfig.RemoteDebuggingVersion = utils.String(v.(string)) - } - - if v, ok := config["use_32_bit_worker_process"]; ok { - siteConfig.Use32BitWorkerProcess = utils.Bool(v.(bool)) - } - - if v, ok := config["websockets_enabled"]; ok { - siteConfig.WebSocketsEnabled = utils.Bool(v.(bool)) - } - - if v, ok := config["scm_type"]; ok { - siteConfig.ScmType = web.ScmType(v.(string)) - } - - return siteConfig -} - -func flattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} { - results := make([]interface{}, 0) - result := make(map[string]interface{}, 0) - - if input == nil { - log.Printf("[DEBUG] SiteConfig is nil") - return results - } - - if input.AlwaysOn != nil { - result["always_on"] = *input.AlwaysOn - } - - if input.DefaultDocuments != nil { - documents := make([]string, 0) - for _, document := range *input.DefaultDocuments { - documents = append(documents, document) - } - - result["default_documents"] = documents - } - - if input.NetFrameworkVersion != nil { - result["dotnet_framework_version"] = *input.NetFrameworkVersion - } - - if input.JavaVersion != nil { - result["java_version"] = *input.JavaVersion - } - - if input.JavaContainer != nil { - result["java_container"] = *input.JavaContainer - } - - if input.JavaContainerVersion != nil { - result["java_container_version"] = *input.JavaContainerVersion - } - - if input.LocalMySQLEnabled != nil { - result["local_mysql_enabled"] = *input.LocalMySQLEnabled - } - - if input.HTTP20Enabled != nil { - result["http2_enabled"] = *input.HTTP20Enabled - } - - result["managed_pipeline_mode"] = string(input.ManagedPipelineMode) - - if input.PhpVersion != nil { - result["php_version"] = *input.PhpVersion - } - - if input.PythonVersion != nil { - result["python_version"] = *input.PythonVersion - } - - if input.RemoteDebuggingEnabled != nil { - result["remote_debugging_enabled"] = *input.RemoteDebuggingEnabled - } - - if input.RemoteDebuggingVersion != nil { - result["remote_debugging_version"] = *input.RemoteDebuggingVersion - } - - if input.Use32BitWorkerProcess != nil { - result["use_32_bit_worker_process"] = *input.Use32BitWorkerProcess - } - - if input.WebSocketsEnabled != nil { - result["websockets_enabled"] = *input.WebSocketsEnabled - } - - result["scm_type"] = string(input.ScmType) - - return append(results, result) -} - func flattenAppServiceSourceControl(input *web.SiteSourceControlProperties) []interface{} { results := make([]interface{}, 0) result := make(map[string]interface{}, 0) @@ -880,25 +553,6 @@ func expandAppServiceConnectionStrings(d *schema.ResourceData) map[string]*web.C return output } -func expandIpRestrictions(d *schema.ResourceData) *[]web.IPSecurityRestriction { - ipSecurityRestrictions := d.Get("ip_restriction").([]interface{}) - restrictions := make([]web.IPSecurityRestriction, 0) - - for _, ipSecurityRestriction := range ipSecurityRestrictions { - restriction := ipSecurityRestriction.(map[string]interface{}) - - ip_address := restriction["ip_address"].(string) - subnet_mask := restriction["subnet_mask"].(string) - - restrictions = append(restrictions, web.IPSecurityRestriction{ - IPAddress: &ip_address, - SubnetMask: &subnet_mask, - }) - } - - return &restrictions -} - func flattenAppServiceConnectionStrings(input map[string]*web.ConnStringValueTypePair) interface{} { results := make([]interface{}, 0) @@ -913,21 +567,6 @@ func flattenAppServiceConnectionStrings(input map[string]*web.ConnStringValueTyp return results } -func flattenAppServiceIpRestrictions(input *[]web.IPSecurityRestriction) interface{} { - results := make([]interface{}, 0) - - if input != nil { - for _, v := range *input { - result := make(map[string]interface{}, 0) - result["ip_address"] = *v.IPAddress - result["subnet_mask"] = *v.SubnetMask - results = append(results, result) - } - } - - return results -} - func flattenAppServiceAppSettings(input map[string]*string) map[string]string { output := make(map[string]string, 0) for k, v := range input { diff --git a/azurerm/resource_arm_app_service_slot.go b/azurerm/resource_arm_app_service_slot.go index 43a77f188b84..d57df006476f 100644 --- a/azurerm/resource_arm_app_service_slot.go +++ b/azurerm/resource_arm_app_service_slot.go @@ -7,6 +7,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -44,147 +45,7 @@ func resourceArmAppServiceSlot() *schema.Resource { ForceNew: true, }, - // TODO: reusable schema - "site_config": { - Type: schema.TypeList, - Optional: true, - Computed: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "always_on": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - - "default_documents": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - - "dotnet_framework_version": { - Type: schema.TypeString, - Optional: true, - Default: "v4.0", - ValidateFunc: validation.StringInSlice([]string{ - "v2.0", - "v4.0", - }, true), - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, - }, - - "http2_enabled": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - - "java_version": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - "1.7", - "1.8", - }, false), - }, - - "java_container": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - "JETTY", - "TOMCAT", - }, true), - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, - }, - - "java_container_version": { - Type: schema.TypeString, - Optional: true, - }, - - "local_mysql_enabled": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - }, - - "managed_pipeline_mode": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: validation.StringInSlice([]string{ - string(web.Classic), - string(web.Integrated), - }, true), - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, - }, - - "php_version": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - "5.5", - "5.6", - "7.0", - "7.1", - }, false), - }, - - "python_version": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - "2.7", - "3.4", - }, false), - }, - - "remote_debugging_enabled": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - - "remote_debugging_version": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: validation.StringInSlice([]string{ - "VS2012", - "VS2013", - "VS2015", - "VS2017", - }, true), - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, - }, - - "use_32_bit_worker_process": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - }, - - "websockets_enabled": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - }, - - "scm_type": { - Type: schema.TypeString, - Optional: true, - Default: string(web.ScmTypeNone), - ValidateFunc: validation.StringInSlice([]string{ - string(web.ScmTypeNone), - string(web.ScmTypeLocalGit), - }, false), - }, - }, - }, - }, + "site_config": azSchema.AppServiceSiteConfigSchema(), "client_affinity_enabled": { Type: schema.TypeBool, @@ -285,8 +146,7 @@ func resourceArmAppServiceSlotCreate(d *schema.ResourceData, meta interface{}) e httpsOnly := d.Get("https_only").(bool) tags := d.Get("tags").(map[string]interface{}) - siteConfig := expandAppServiceSiteConfig(d) - + siteConfig := azSchema.ExpandAppServiceSiteConfig(d.Get("site_config")) siteEnvelope := web.Site{ Location: &location, Tags: expandTags(tags), @@ -357,7 +217,7 @@ func resourceArmAppServiceSlotUpdate(d *schema.ResourceData, meta interface{}) e if d.HasChange("site_config") { // update the main configuration - siteConfig := expandAppServiceSiteConfig(d) + siteConfig := azSchema.ExpandAppServiceSiteConfig(d.Get("site_config")) siteConfigResource := web.SiteConfigResource{ SiteConfig: &siteConfig, } @@ -456,7 +316,7 @@ func resourceArmAppServiceSlotRead(d *schema.ResourceData, meta interface{}) err return err } - siteConfig := flattenAppServiceSiteConfig(configResp.SiteConfig) + siteConfig := azSchema.FlattenAppServiceSiteConfig(configResp.SiteConfig) if err := d.Set("site_config", siteConfig); err != nil { return err } diff --git a/azurerm/resource_arm_app_service_slot_test.go b/azurerm/resource_arm_app_service_slot_test.go index 2f427dbc5f63..bcf73038af54 100644 --- a/azurerm/resource_arm_app_service_slot_test.go +++ b/azurerm/resource_arm_app_service_slot_test.go @@ -223,6 +223,54 @@ func TestAccAzureRMAppServiceSlot_http2Enabled(t *testing.T) { }) } +func TestAccAzureRMAppServiceSlot_oneIpRestriction(t *testing.T) { + resourceName := "azurerm_app_service_slot.test" + ri := acctest.RandInt() + config := testAccAzureRMAppServiceSlot_oneIpRestriction(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAppServiceSlotDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceSlotExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.0.subnet_mask", "255.255.255.255"), + ), + }, + }, + }) +} + +func TestAccAzureRMAppServiceSlot_manyIpRestrictions(t *testing.T) { + resourceName := "azurerm_app_service_slot.test" + ri := acctest.RandInt() + config := testAccAzureRMAppServiceSlot_manyIpRestrictions(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAppServiceSlotDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceSlotExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.0.subnet_mask", "255.255.255.255"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.1.ip_address", "20.20.20.0"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.1.subnet_mask", "255.255.255.0"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.2.ip_address", "30.30.0.0"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.2.subnet_mask", "255.255.0.0"), + ), + }, + }, + }) +} + func TestAccAzureRMAppServiceSlot_localMySql(t *testing.T) { resourceName := "azurerm_app_service_slot.test" ri := acctest.RandInt() @@ -984,6 +1032,98 @@ resource "azurerm_app_service_slot" "test" { `, rInt, location, rInt, rInt, rInt) } +func testAccAzureRMAppServiceSlot_oneIpRestriction(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_app_service_plan" "test" { + name = "acctestASP-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + tier = "Standard" + size = "S1" + } +} + +resource "azurerm_app_service" "test" { + name = "acctestAS-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_plan_id = "${azurerm_app_service_plan.test.id}" +} + +resource "azurerm_app_service_slot" "test" { + name = "acctestASSlot-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_plan_id = "${azurerm_app_service_plan.test.id}" + app_service_name = "${azurerm_app_service.test.name}" + + site_config { + ip_restriction { + ip_address = "10.10.10.10" + } + } +} +`, rInt, location, rInt, rInt, rInt) +} + +func testAccAzureRMAppServiceSlot_manyIpRestrictions(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_app_service_plan" "test" { + name = "acctestASP-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + tier = "Standard" + size = "S1" + } +} + +resource "azurerm_app_service" "test" { + name = "acctestAS-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_plan_id = "${azurerm_app_service_plan.test.id}" +} + +resource "azurerm_app_service_slot" "test" { + name = "acctestASSlot-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_plan_id = "${azurerm_app_service_plan.test.id}" + app_service_name = "${azurerm_app_service.test.name}" + + site_config { + ip_restriction { + ip_address = "10.10.10.10" + } + + ip_restriction { + ip_address = "20.20.20.0" + subnet_mask = "255.255.255.0" + } + + ip_restriction { + ip_address = "30.30.0.0" + subnet_mask = "255.255.0.0" + } + } +} +`, rInt, location, rInt, rInt, rInt) +} + func testAccAzureRMAppServiceSlot_localMySql(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/azurerm/resource_arm_app_service_test.go b/azurerm/resource_arm_app_service_test.go index ddeed68f14be..2f48c459072c 100644 --- a/azurerm/resource_arm_app_service_test.go +++ b/azurerm/resource_arm_app_service_test.go @@ -385,8 +385,8 @@ func TestAccAzureRMAppService_oneIpRestriction(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMAppServiceExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "ip_restriction.0.ip_address", "10.10.10.10"), - resource.TestCheckResourceAttr(resourceName, "ip_restriction.0.subnet_mask", "255.255.255.255"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.0.subnet_mask", "255.255.255.255"), ), }, }, @@ -407,12 +407,12 @@ func TestAccAzureRMAppService_manyIpRestrictions(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMAppServiceExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "ip_restriction.0.ip_address", "10.10.10.10"), - resource.TestCheckResourceAttr(resourceName, "ip_restriction.0.subnet_mask", "255.255.255.255"), - resource.TestCheckResourceAttr(resourceName, "ip_restriction.1.ip_address", "20.20.20.0"), - resource.TestCheckResourceAttr(resourceName, "ip_restriction.1.subnet_mask", "255.255.255.0"), - resource.TestCheckResourceAttr(resourceName, "ip_restriction.2.ip_address", "30.30.0.0"), - resource.TestCheckResourceAttr(resourceName, "ip_restriction.2.subnet_mask", "255.255.0.0"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.0.subnet_mask", "255.255.255.255"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.1.ip_address", "20.20.20.0"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.1.subnet_mask", "255.255.255.0"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.2.ip_address", "30.30.0.0"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.ip_restriction.2.subnet_mask", "255.255.0.0"), ), }, }, @@ -1225,8 +1225,10 @@ resource "azurerm_app_service" "test" { resource_group_name = "${azurerm_resource_group.test.name}" app_service_plan_id = "${azurerm_app_service_plan.test.id}" - ip_restriction { - ip_address = "10.10.10.10" + site_config { + ip_restriction { + ip_address = "10.10.10.10" + } } } `, rInt, location, rInt, rInt) @@ -1256,18 +1258,20 @@ resource "azurerm_app_service" "test" { resource_group_name = "${azurerm_resource_group.test.name}" app_service_plan_id = "${azurerm_app_service_plan.test.id}" - ip_restriction { - ip_address = "10.10.10.10" - } - - ip_restriction { - ip_address = "20.20.20.0" - subnet_mask = "255.255.255.0" - } - - ip_restriction { - ip_address = "30.30.0.0" - subnet_mask = "255.255.0.0" + site_config { + ip_restriction { + ip_address = "10.10.10.10" + } + + ip_restriction { + ip_address = "20.20.20.0" + subnet_mask = "255.255.255.0" + } + + ip_restriction { + ip_address = "30.30.0.0" + subnet_mask = "255.255.0.0" + } } } `, rInt, location, rInt, rInt) diff --git a/website/docs/d/app_service.html.markdown b/website/docs/d/app_service.html.markdown index d8c24f8ad2fe..b8343f9cead6 100644 --- a/website/docs/d/app_service.html.markdown +++ b/website/docs/d/app_service.html.markdown @@ -47,8 +47,6 @@ output "app_service_id" { * `https_only` - Can the App Service only be accessed via HTTPS? -* `ip_restriction` - A `ip_restriction` block as defined below. - * `site_config` - A `site_config` block as defined below. * `tags` - A mapping of tags to assign to the resource. @@ -65,14 +63,6 @@ output "app_service_id" { --- -`ip_restriction` exports the following: - -* `ip_address` - The IP Address used for this IP Restriction. - -* `subnet_mask` - The Subnet mask used for this IP Restriction. - ---- - `site_config` supports the following: * `always_on` - Is the app be loaded at all times? @@ -83,6 +73,8 @@ output "app_service_id" { * `http2_enabled` - Is HTTP2 Enabled on this App Service? +* `ip_restriction` - One or more `ip_restriction` blocks as defined below. + * `java_version` - The version of Java in use. * `java_container` - The Java Container in use. @@ -106,3 +98,11 @@ output "app_service_id" { * `use_32_bit_worker_process` - Does the App Service run in 32 bit mode, rather than 64 bit mode? * `websockets_enabled` - Are WebSockets enabled for this App Service? + +--- + +`ip_restriction` exports the following: + +* `ip_address` - The IP Address used for this IP Restriction. + +* `subnet_mask` - The Subnet mask used for this IP Restriction. diff --git a/website/docs/r/app_service.html.markdown b/website/docs/r/app_service.html.markdown index 98a344a6a61b..5696d5abcc77 100644 --- a/website/docs/r/app_service.html.markdown +++ b/website/docs/r/app_service.html.markdown @@ -127,8 +127,6 @@ The following arguments are supported: * `https_only` - (Optional) Can the App Service only be accessed via HTTPS? Defaults to `false`. -* `ip_restriction` - (Optional) A `ip_restriction` block as defined below. - * `site_config` - (Optional) A `site_config` block as defined below. * `tags` - (Optional) A mapping of tags to assign to the resource. @@ -153,20 +151,13 @@ The following arguments are supported: --- -`ip_restriction` supports the following: - -* `ip_address` - (Required) The IP Address used for this IP Restriction. - -* `subnet_mask` - (Optional) The Subnet mask used for this IP Restriction. Defaults to `255.255.255.255`. - ---- - `site_config` supports the following: * `always_on` - (Optional) Should the app be loaded at all times? Defaults to `false`. * `default_documents` - (Optional) The ordering of default documents to load, if an address isn't specified. * `dotnet_framework_version` - (Optional) The version of the .net framework's CLR used in this App Service. Possible values are `v2.0` (which will use the latest version of the .net framework for the .net CLR v2 - currently `.net 3.5`) and `v4.0` (which corresponds to the latest version of the .net CLR v4 - which at the time of writing is `.net 4.7.1`). [For more information on which .net CLR version to use based on the .net framework you're targetting - please see this table](https://en.wikipedia.org/wiki/.NET_Framework_version_history#Overview). Defaults to `v4.0`. * `http2_enabled` - (Optional) Is HTTP2 Enabled on this App Service? Defaults to `false`. +* `ip_restriction` - (Optional) One or more `ip_restriction` blocks as defined below. * `java_version` - (Optional) The version of Java to use. If specified `java_container` and `java_container_version` must also be specified. Possible values are `1.7` and `1.8`. * `java_container` - (Optional) The Java Container to use. If specified `java_version` and `java_container_version` must also be specified. Possible values are `JETTY` and `TOMCAT`. * `java_container_version` - (Optional) The version of the Java Container to use. If specified `java_version` and `java_container` must also be specified. @@ -189,6 +180,14 @@ The following arguments are supported: ~> **NOTE:** Additional Source Control types will be added in the future, once support for them has been added in the Azure SDK for Go. +--- + +`ip_restriction` supports the following: + +* `ip_address` - (Required) The IP Address used for this IP Restriction. + +* `subnet_mask` - (Optional) The Subnet mask used for this IP Restriction. Defaults to `255.255.255.255`. + ## Attributes Reference The following attributes are exported: diff --git a/website/docs/r/app_service_slot.html.markdown b/website/docs/r/app_service_slot.html.markdown index f53326f69871..68d7e1a2fb55 100644 --- a/website/docs/r/app_service_slot.html.markdown +++ b/website/docs/r/app_service_slot.html.markdown @@ -184,6 +184,7 @@ The following arguments are supported: * `default_documents` - (Optional) The ordering of default documents to load, if an address isn't specified. * `dotnet_framework_version` - (Optional) The version of the .net framework's CLR used in this App Service Slot. Possible values are `v2.0` (which will use the latest version of the .net framework for the .net CLR v2 - currently `.net 3.5`) and `v4.0` (which corresponds to the latest version of the .net CLR v4 - which at the time of writing is `.net 4.7.1`). [For more information on which .net CLR version to use based on the .net framework you're targetting - please see this table](https://en.wikipedia.org/wiki/.NET_Framework_version_history#Overview). Defaults to `v4.0`. * `http2_enabled` - (Optional) Is HTTP2 Enabled on this App Service? Defaults to `false`. +* `ip_restriction` - (Optional) One or more `ip_restriction` blocks as defined below. * `java_version` - (Optional) The version of Java to use. If specified `java_container` and `java_container_version` must also be specified. Possible values are `1.7` and `1.8`. * `java_container` - (Optional) The Java Container to use. If specified `java_version` and `java_container_version` must also be specified. Possible values are `JETTY` and `TOMCAT`. * `java_container_version` - (Optional) The version of the Java Container to use. If specified `java_version` and `java_container` must also be specified. @@ -203,6 +204,14 @@ The following arguments are supported: * `websockets_enabled` - (Optional) Should WebSockets be enabled? +--- + +`ip_restriction` supports the following: + +* `ip_address` - (Required) The IP Address used for this IP Restriction. + +* `subnet_mask` - (Optional) The Subnet mask used for this IP Restriction. Defaults to `255.255.255.255`. + ## Attributes Reference The following attributes are exported: From 3501a86cd5d8643c611f691ed461e92e8a0c887f Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 24 May 2018 13:39:34 +0100 Subject: [PATCH 178/320] Updating to include #1246 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aaffbf879325..0f2506f2e444 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ IMPROVEMENTS: * authorization: upgrading to API version `2018-01-01-preview` * `azurerm_app_service` - adding support for `ip_restriction`'s [GH-1231] +* `azurerm_app_service_slot` - adding support for `ip_restriction`'s [GH-1246] * `azurerm_container_registry` - no longer forces a new resource on SKU change [GH-1264] * `azurerm_dns_zone` - datasource's `resource_group` field is now optional [GH-1180] * `azurerm_mysql_database` - ignoring casing for the `charset` field [GH-1281] From cbd41f268077ba525feed6fcdc51c37d566f275c Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 24 May 2018 09:44:36 -0700 Subject: [PATCH 179/320] Add missing docs for VMSS priority property --- website/docs/r/virtual_machine_scale_set.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/virtual_machine_scale_set.html.markdown b/website/docs/r/virtual_machine_scale_set.html.markdown index da6b826350a4..24b10aceaa62 100644 --- a/website/docs/r/virtual_machine_scale_set.html.markdown +++ b/website/docs/r/virtual_machine_scale_set.html.markdown @@ -260,6 +260,7 @@ The following arguments are supported: * `extension` - (Optional) Can be specified multiple times to add extension profiles to the scale set. Each `extension` block supports the fields documented below. * `boot_diagnostics` - (Optional) A boot diagnostics profile block as referenced below. * `plan` - (Optional) A plan block as documented below. +* `priority` - (Optional) Specifies the priority for the virtual machines in the scale set. Possible values are `Low` and `Regular`. * `tags` - (Optional) A mapping of tags to assign to the resource. * `zones` - (Optional) A collection of availability zones to spread the Virtual Machines over. From 5f910cb7de55ff9ed6361a55e8c73d3dae2697a6 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 24 May 2018 17:45:41 +0100 Subject: [PATCH 180/320] Documenting how to use the App Service Principal ID --- website/docs/r/app_service.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/docs/r/app_service.html.markdown b/website/docs/r/app_service.html.markdown index 5696d5abcc77..6b0f4506e6a2 100644 --- a/website/docs/r/app_service.html.markdown +++ b/website/docs/r/app_service.html.markdown @@ -212,6 +212,8 @@ The following attributes are exported: * `tenant_id` - The Tenant ID for the Service Principal associated with the Managed Service Identity of this App Service. +-> You can access the Principal ID via `${azurerm_app_service.test.identity.0.principal_id}` and the Tenant ID via `${azurerm_app_service.test.identity.0.principal_id}` + --- `site_credential` exports the following: From 054e3c27291f09bfa2464217b439dbcff0a69c18 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 24 May 2018 09:51:47 -0700 Subject: [PATCH 181/320] Add default value for VMSS priority --- azurerm/resource_arm_virtual_machine_scale_set.go | 1 + website/docs/r/virtual_machine_scale_set.html.markdown | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_virtual_machine_scale_set.go b/azurerm/resource_arm_virtual_machine_scale_set.go index 2e1470e87810..e14a462d2012 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set.go +++ b/azurerm/resource_arm_virtual_machine_scale_set.go @@ -119,6 +119,7 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: true, + Default: string(compute.Regular), ValidateFunc: validation.StringInSlice([]string{ string(compute.Low), string(compute.Regular), diff --git a/website/docs/r/virtual_machine_scale_set.html.markdown b/website/docs/r/virtual_machine_scale_set.html.markdown index 24b10aceaa62..b2abac74fda1 100644 --- a/website/docs/r/virtual_machine_scale_set.html.markdown +++ b/website/docs/r/virtual_machine_scale_set.html.markdown @@ -260,7 +260,7 @@ The following arguments are supported: * `extension` - (Optional) Can be specified multiple times to add extension profiles to the scale set. Each `extension` block supports the fields documented below. * `boot_diagnostics` - (Optional) A boot diagnostics profile block as referenced below. * `plan` - (Optional) A plan block as documented below. -* `priority` - (Optional) Specifies the priority for the virtual machines in the scale set. Possible values are `Low` and `Regular`. +* `priority` - (Optional) Specifies the priority for the virtual machines in the scale set. Possible values are `Low` and `Regular` with the default being `Regular`. * `tags` - (Optional) A mapping of tags to assign to the resource. * `zones` - (Optional) A collection of availability zones to spread the Virtual Machines over. From e682e58c3504228cdd3c2b15a14fb8ed71fd35f5 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 24 May 2018 10:36:57 -0700 Subject: [PATCH 182/320] VMSS priority docs, address PR comments --- azurerm/resource_arm_virtual_machine_scale_set.go | 2 +- website/docs/r/virtual_machine_scale_set.html.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/resource_arm_virtual_machine_scale_set.go b/azurerm/resource_arm_virtual_machine_scale_set.go index e14a462d2012..129926b0ce32 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set.go +++ b/azurerm/resource_arm_virtual_machine_scale_set.go @@ -119,7 +119,7 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: true, - Default: string(compute.Regular), + Default: string(compute.Regular), ValidateFunc: validation.StringInSlice([]string{ string(compute.Low), string(compute.Regular), diff --git a/website/docs/r/virtual_machine_scale_set.html.markdown b/website/docs/r/virtual_machine_scale_set.html.markdown index b2abac74fda1..0702352e6a7f 100644 --- a/website/docs/r/virtual_machine_scale_set.html.markdown +++ b/website/docs/r/virtual_machine_scale_set.html.markdown @@ -260,7 +260,7 @@ The following arguments are supported: * `extension` - (Optional) Can be specified multiple times to add extension profiles to the scale set. Each `extension` block supports the fields documented below. * `boot_diagnostics` - (Optional) A boot diagnostics profile block as referenced below. * `plan` - (Optional) A plan block as documented below. -* `priority` - (Optional) Specifies the priority for the virtual machines in the scale set. Possible values are `Low` and `Regular` with the default being `Regular`. +* `priority` - (Optional) Specifies the priority for the virtual machines in the scale set, defaults to `Regular`. Possible values are `Low` and `Regular`. * `tags` - (Optional) A mapping of tags to assign to the resource. * `zones` - (Optional) A collection of availability zones to spread the Virtual Machines over. From ba72f4f209e1521a6004590bc3ed1775f3b253de Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 24 May 2018 10:48:09 -0700 Subject: [PATCH 183/320] Update CHANGELOG.MD to include #1250 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f2506f2e444..81499298ef62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ IMPROVEMENTS: * `azurerm_role_assignment` - support for roles containing DataActions [GH-1284] * `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` [GH-1235] * `azurerm_virtual_machine_scale_set` - adding the `licence_type` property [GH-1245] +* `azurerm_virtual_machine_scale_set` - adding the `priority` property [GH-1250] ## 1.5.0 (May 14, 2018) From 36054c0f3a5102076fc2226594472b729abf870e Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 24 May 2018 15:32:14 -0700 Subject: [PATCH 184/320] azurerm_scheduler_job_collection: fixed missing property max_recurrence_interval --- azurerm/data_source_scheduler_job_collection.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/azurerm/data_source_scheduler_job_collection.go b/azurerm/data_source_scheduler_job_collection.go index 6141e5379c8d..8ae553a18403 100644 --- a/azurerm/data_source_scheduler_job_collection.go +++ b/azurerm/data_source_scheduler_job_collection.go @@ -54,12 +54,17 @@ func dataSourceArmSchedulerJobCollection() *schema.Resource { Computed: true, }, - //this is MaxRecurrance.Interval, property is named this as the documentation in the api states: - // Gets or sets the interval between retries. + // API documentation states the MaxRecurrance.Interval "Gets or sets the interval between retries." + // however it does appear it is the max interval allowed for recurrences "max_retry_interval": { Type: schema.TypeInt, Computed: true, }, + + "max_recurrence_interval": { + Type: schema.TypeInt, + Computed: true, + }, }, }, }, From 3583a08bb3bffa22213a5a23dd10602e93f32936 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 24 May 2018 16:07:05 -0700 Subject: [PATCH 185/320] azurerm_scheduler_job_collection datasource: deprecated max_retry_interval --- azurerm/data_source_scheduler_job_collection.go | 7 ++++--- azurerm/resource_arm_scheduler_job_collection.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/azurerm/data_source_scheduler_job_collection.go b/azurerm/data_source_scheduler_job_collection.go index 8ae553a18403..8ec72ea0e6ae 100644 --- a/azurerm/data_source_scheduler_job_collection.go +++ b/azurerm/data_source_scheduler_job_collection.go @@ -54,11 +54,12 @@ func dataSourceArmSchedulerJobCollection() *schema.Resource { Computed: true, }, - // API documentation states the MaxRecurrance.Interval "Gets or sets the interval between retries." + // API documentation states the MaxRecurrence.Interval "Gets or sets the interval between retries." // however it does appear it is the max interval allowed for recurrences "max_retry_interval": { - Type: schema.TypeInt, - Computed: true, + Type: schema.TypeInt, + Deprecated: "Renamed to `max_recurrence_interval` to match azure", + Computed: true, }, "max_recurrence_interval": { diff --git a/azurerm/resource_arm_scheduler_job_collection.go b/azurerm/resource_arm_scheduler_job_collection.go index 81d4aa1fb1a8..fa9fb1f19545 100644 --- a/azurerm/resource_arm_scheduler_job_collection.go +++ b/azurerm/resource_arm_scheduler_job_collection.go @@ -94,7 +94,7 @@ func resourceArmSchedulerJobCollection() *schema.Resource { }, true), }, - // API documentation states the MaxRecurrance.Interval "Gets or sets the interval between retries." + // API documentation states the MaxRecurrence.Interval "Gets or sets the interval between retries." // however it does appear it is the max interval allowed for recurrences "max_retry_interval": { Type: schema.TypeInt, From baf801305edcea793fe64cc3f9ac438d2fabb869 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 24 May 2018 16:27:42 -0700 Subject: [PATCH 186/320] Update CHANGELOG.md to reflect job collection property change --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81499298ef62..fe6244880010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ UPGRADE NOTES: ~> **Please Note:** The `azurerm_postgresql_server` resource has been updated from the Preview API's to the GA API's - which requires code changes in your Terraform Configuration to use the new Pricing SKU's. Upon updating to v1.6.0 - you'll need to update the configuration from the Preview SKU's to the GA SKU's. -* `azurerm_scheduler_job_collection` - the property `max_retry_interval` has been deprecated in favour of `max_recurrence_interval` to better match Azure [GH-1218] +* `azurerm_scheduler_job_collection` - the property `max_retry_interval` on both the resource and datasource has been deprecated in favour of `max_recurrence_interval` to better match Azure [GH-1218] FEATURES: From 93090f95e1f8e18972a94a20aa48e3991a62a7a7 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Thu, 24 May 2018 23:58:54 +0000 Subject: [PATCH 187/320] v1.6.0 --- CHANGELOG.md | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe6244880010..f2b02334297f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.6.0 (Unreleased) +## 1.6.0 (May 24, 2018) UPGRADE NOTES: @@ -6,35 +6,35 @@ UPGRADE NOTES: ~> **Please Note:** The `azurerm_postgresql_server` resource has been updated from the Preview API's to the GA API's - which requires code changes in your Terraform Configuration to use the new Pricing SKU's. Upon updating to v1.6.0 - you'll need to update the configuration from the Preview SKU's to the GA SKU's. -* `azurerm_scheduler_job_collection` - the property `max_retry_interval` on both the resource and datasource has been deprecated in favour of `max_recurrence_interval` to better match Azure [GH-1218] +* `azurerm_scheduler_job_collection` - the property `max_retry_interval` on both the resource and datasource has been deprecated in favour of `max_recurrence_interval` to better match Azure ([#1218](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1218)) FEATURES: -* **New Data Source:** `azurerm_storage_account_sas` [GH-1011] -* **New Resource:** `azurerm_data_lake_store` [GH-1219] -* **New Resource:** `azurerm_relay_namespace` [GH-1233] +* **New Data Source:** `azurerm_storage_account_sas` ([#1011](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1011)) +* **New Resource:** `azurerm_data_lake_store` ([#1219](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1219)) +* **New Resource:** `azurerm_relay_namespace` ([#1233](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1233)) BUG FIXES: -* across data-sources and resources: making Connection Strings, Keys and Passwords sensitive fields [GH-1242] -* `azurerm_virtual_machine_scale_set` - an empty `os_profile_windows_config` block no longer causes a panic [GH-1224] +* across data-sources and resources: making Connection Strings, Keys and Passwords sensitive fields ([#1242](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1242)) +* `azurerm_virtual_machine_scale_set` - an empty `os_profile_windows_config` block no longer causes a panic ([#1224](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1224)) IMPROVEMENTS: * authorization: upgrading to API version `2018-01-01-preview` -* `azurerm_app_service` - adding support for `ip_restriction`'s [GH-1231] -* `azurerm_app_service_slot` - adding support for `ip_restriction`'s [GH-1246] -* `azurerm_container_registry` - no longer forces a new resource on SKU change [GH-1264] -* `azurerm_dns_zone` - datasource's `resource_group` field is now optional [GH-1180] -* `azurerm_mysql_database` - ignoring casing for the `charset` field [GH-1281] -* `azurerm_mysql_server` - support for the new GA Pricing SKU's [GH-1154] -* `azurerm_postgresql_database` - ignoring the casing on the `collation` field [GH-1255] -* `azurerm_postgresql_server` - support for the new GA Pricing SKU's [GH-1190] -* `azurerm_public_ip` - computed values now default to an empy string [GH-1247] -* `azurerm_role_assignment` - support for roles containing DataActions [GH-1284] -* `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` [GH-1235] -* `azurerm_virtual_machine_scale_set` - adding the `licence_type` property [GH-1245] -* `azurerm_virtual_machine_scale_set` - adding the `priority` property [GH-1250] +* `azurerm_app_service` - adding support for `ip_restriction`'s ([#1231](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1231)) +* `azurerm_app_service_slot` - adding support for `ip_restriction`'s ([#1246](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1246)) +* `azurerm_container_registry` - no longer forces a new resource on SKU change ([#1264](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1264)) +* `azurerm_dns_zone` - datasource's `resource_group` field is now optional ([#1180](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1180)) +* `azurerm_mysql_database` - ignoring casing for the `charset` field ([#1281](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1281)) +* `azurerm_mysql_server` - support for the new GA Pricing SKU's ([#1154](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1154)) +* `azurerm_postgresql_database` - ignoring the casing on the `collation` field ([#1255](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1255)) +* `azurerm_postgresql_server` - support for the new GA Pricing SKU's ([#1190](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1190)) +* `azurerm_public_ip` - computed values now default to an empy string ([#1247](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1247)) +* `azurerm_role_assignment` - support for roles containing DataActions ([#1284](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1284)) +* `azurerm_servicebus_queue` - adding `dead_lettering_on_message_expiration` ([#1235](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1235)) +* `azurerm_virtual_machine_scale_set` - adding the `licence_type` property ([#1245](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1245)) +* `azurerm_virtual_machine_scale_set` - adding the `priority` property ([#1250](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1250)) ## 1.5.0 (May 14, 2018) From 179b3c00e04db048cc07f80b7181ffdaaa0c32b9 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 25 May 2018 00:04:28 +0000 Subject: [PATCH 188/320] Cleanup after v1.6.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2b02334297f..db630fa0c646 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 1.7.0 (Unreleased) ## 1.6.0 (May 24, 2018) UPGRADE NOTES: From 0cb75e6b829c8a8967b52a525133c4bb86d9b102 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Thu, 24 May 2018 18:21:33 -0700 Subject: [PATCH 189/320] Add 'content_type' to blob. --- azurerm/resource_arm_storage_blob.go | 61 ++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/azurerm/resource_arm_storage_blob.go b/azurerm/resource_arm_storage_blob.go index dffc59b68496..b7b498cd0249 100644 --- a/azurerm/resource_arm_storage_blob.go +++ b/azurerm/resource_arm_storage_blob.go @@ -20,6 +20,7 @@ func resourceArmStorageBlob() *schema.Resource { return &schema.Resource{ Create: resourceArmStorageBlobCreate, Read: resourceArmStorageBlobRead, + Update: resourceArmStorageBlobUpdate, Exists: resourceArmStorageBlobExists, Delete: resourceArmStorageBlobDelete, @@ -53,6 +54,12 @@ func resourceArmStorageBlob() *schema.Resource { Default: 0, ValidateFunc: validateArmStorageBlobSize, }, + "content_type": { + Type: schema.TypeString, + Optional: true, + Default: "application/octet-stream", + ConflictsWith: []string{"source_uri"}, + }, "source": { Type: schema.TypeString, Optional: true, @@ -149,6 +156,7 @@ func resourceArmStorageBlobCreate(d *schema.ResourceData, meta interface{}) erro blobType := d.Get("type").(string) cont := d.Get("storage_container_name").(string) sourceUri := d.Get("source_uri").(string) + contentType := d.Get("content_type").(string) log.Printf("[INFO] Creating blob %q in storage account %q", name, storageAccountName) if sourceUri != "" { @@ -174,7 +182,7 @@ func resourceArmStorageBlobCreate(d *schema.ResourceData, meta interface{}) erro if source != "" { parallelism := d.Get("parallelism").(int) attempts := d.Get("attempts").(int) - if err := resourceArmStorageBlobBlockUploadFromSource(cont, name, source, blobClient, parallelism, attempts); err != nil { + if err := resourceArmStorageBlobBlockUploadFromSource(cont, name, source, contentType, blobClient, parallelism, attempts); err != nil { return fmt.Errorf("Error creating storage blob on Azure: %s", err) } } @@ -183,7 +191,7 @@ func resourceArmStorageBlobCreate(d *schema.ResourceData, meta interface{}) erro if source != "" { parallelism := d.Get("parallelism").(int) attempts := d.Get("attempts").(int) - if err := resourceArmStorageBlobPageUploadFromSource(cont, name, source, blobClient, parallelism, attempts); err != nil { + if err := resourceArmStorageBlobPageUploadFromSource(cont, name, source, contentType, blobClient, parallelism, attempts); err != nil { return fmt.Errorf("Error creating storage blob on Azure: %s", err) } } else { @@ -193,6 +201,7 @@ func resourceArmStorageBlobCreate(d *schema.ResourceData, meta interface{}) erro container := blobClient.GetContainerReference(cont) blob := container.GetBlobReference(name) blob.Properties.ContentLength = size + blob.Properties.ContentType = contentType err := blob.PutPageBlob(options) if err != nil { return fmt.Errorf("Error creating storage blob on Azure: %s", err) @@ -210,7 +219,7 @@ type resourceArmStorageBlobPage struct { section *io.SectionReader } -func resourceArmStorageBlobPageUploadFromSource(container, name, source string, client *storage.BlobStorageClient, parallelism, attempts int) error { +func resourceArmStorageBlobPageUploadFromSource(container, name, source, contentType string, client *storage.BlobStorageClient, parallelism, attempts int) error { workerCount := parallelism * runtime.NumCPU() file, err := os.Open(source) @@ -228,6 +237,7 @@ func resourceArmStorageBlobPageUploadFromSource(container, name, source string, containerRef := client.GetContainerReference(container) blob := containerRef.GetBlobReference(name) blob.Properties.ContentLength = blobSize + blob.Properties.ContentType = contentType err = blob.PutPageBlob(options) if err != nil { return fmt.Errorf("Error creating storage blob on Azure: %s", err) @@ -387,7 +397,7 @@ type resourceArmStorageBlobBlock struct { id string } -func resourceArmStorageBlobBlockUploadFromSource(container, name, source string, client *storage.BlobStorageClient, parallelism, attempts int) error { +func resourceArmStorageBlobBlockUploadFromSource(container, name, source, contentType string, client *storage.BlobStorageClient, parallelism, attempts int) error { workerCount := parallelism * runtime.NumCPU() file, err := os.Open(source) @@ -432,6 +442,7 @@ func resourceArmStorageBlobBlockUploadFromSource(container, name, source string, containerReference := client.GetContainerReference(container) blobReference := containerReference.GetBlobReference(name) + blobReference.Properties.ContentType = contentType options := &storage.PutBlockListOptions{} err = blobReference.PutBlockList(blockList, options) if err != nil { @@ -524,6 +535,39 @@ func resourceArmStorageBlobBlockUploadWorker(ctx resourceArmStorageBlobBlockUplo } } +func resourceArmStorageBlobUpdate(d *schema.ResourceData, meta interface{}) error { + armClient := meta.(*ArmClient) + ctx := armClient.StopContext + + resourceGroupName := d.Get("resource_group_name").(string) + storageAccountName := d.Get("storage_account_name").(string) + + blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(ctx, resourceGroupName, storageAccountName) + if err != nil { + return fmt.Errorf("Error getting storage account %s: %+v", storageAccountName, err) + } + if !accountExists { + return fmt.Errorf("Storage account %s not found", storageAccountName) + } + + name := d.Get("name").(string) + storageContainerName := d.Get("storage_container_name").(string) + + container := blobClient.GetContainerReference(storageContainerName) + blob := container.GetBlobReference(name) + + if d.HasChange("content_type") { + blob.Properties.ContentType = d.Get("content_type").(string) + } + + err = blob.SetProperties(nil) + if err != nil { + return fmt.Errorf("Error setting properties of blob %s (container %s, storage account %s): %+v", name, storageContainerName, storageAccountName, err) + } + + return nil +} + func resourceArmStorageBlobRead(d *schema.ResourceData, meta interface{}) error { armClient := meta.(*ArmClient) ctx := armClient.StopContext @@ -556,6 +600,15 @@ func resourceArmStorageBlobRead(d *schema.ResourceData, meta interface{}) error container := blobClient.GetContainerReference(storageContainerName) blob := container.GetBlobReference(name) + + err = blob.GetProperties(nil) + if err != nil { + return fmt.Errorf("Error getting properties of blob %s (container %s, storage account %s): %+v", name, storageContainerName, storageAccountName, err) + } + if blob.Properties.ContentType != "" { + d.Set("content_type", blob.Properties.ContentType) + } + url := blob.GetURL() if url == "" { log.Printf("[INFO] URL for %q is empty", name) From 2b845d4a8ff98d39404065513c5f784b98e333b8 Mon Sep 17 00:00:00 2001 From: ShanePoint Date: Thu, 24 May 2018 19:22:22 -0700 Subject: [PATCH 190/320] Improved DomanNameLabel test account name and the setting of DomanNameLabel. --- azurerm/import_arm_public_ip_test.go | 2 +- azurerm/resource_arm_public_ip.go | 6 +----- azurerm/resource_arm_public_ip_test.go | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/azurerm/import_arm_public_ip_test.go b/azurerm/import_arm_public_ip_test.go index 9b157d52615b..629bd531e2a3 100644 --- a/azurerm/import_arm_public_ip_test.go +++ b/azurerm/import_arm_public_ip_test.go @@ -60,7 +60,7 @@ func TestAccAzureRMPublicIpStatic_importBasic_withDNSLabel(t *testing.T) { resourceName := "azurerm_public_ip.test" ri := acctest.RandInt() - dnl := fmt.Sprintf("tfacc%d", ri) + dnl := fmt.Sprintf("acctestdnl-%d", ri) config := testAccAzureRMPublicIPStatic_basic_withDNSLabel(ri, testLocation(), dnl) resource.Test(t, resource.TestCase{ diff --git a/azurerm/resource_arm_public_ip.go b/azurerm/resource_arm_public_ip.go index b9007d1ec906..550cfc0ca277 100644 --- a/azurerm/resource_arm_public_ip.go +++ b/azurerm/resource_arm_public_ip.go @@ -228,11 +228,7 @@ func resourceArmPublicIpRead(d *schema.ResourceData, meta interface{}) error { d.Set("fqdn", "") } - if dnl := settings.DomainNameLabel; dnl != nil { - d.Set("domain_name_label", dnl) - } else { - d.Set("domain_name_label", "") - } + d.Set("domain_name_label", settings.DomainNameLabel) } if ip := props.IPAddress; ip != nil { diff --git a/azurerm/resource_arm_public_ip_test.go b/azurerm/resource_arm_public_ip_test.go index 1fcb55ac8501..54315ce633ad 100644 --- a/azurerm/resource_arm_public_ip_test.go +++ b/azurerm/resource_arm_public_ip_test.go @@ -67,7 +67,7 @@ func TestAccAzureRMPublicIpStatic_basic(t *testing.T) { func TestAccAzureRMPublicIpStatic_basic_withDNSLabel(t *testing.T) { resourceName := "azurerm_public_ip.test" ri := acctest.RandInt() - dnl := fmt.Sprintf("tfacc%d", ri) + dnl := fmt.Sprintf("acctestdnl-%d", ri) config := testAccAzureRMPublicIPStatic_basic_withDNSLabel(ri, testLocation(), dnl) resource.Test(t, resource.TestCase{ From 9d8b5451c617d83b144dbe167a40af760d2a01e4 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 24 May 2018 20:31:41 -0700 Subject: [PATCH 191/320] Update CHANGELOG.md to include #1287 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db630fa0c646..49dfe9b62ea1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## 1.7.0 (Unreleased) + +BUG FIXES: + +* `azurerm_public_ip` - import not correctly reads the `domain_name_label` property into state [GH-1287] + ## 1.6.0 (May 24, 2018) UPGRADE NOTES: From 59f8415e8b94e8135212bdbdb8bb42b49b60bd8c Mon Sep 17 00:00:00 2001 From: ljmsc Date: Fri, 25 May 2018 14:53:31 +0200 Subject: [PATCH 192/320] azure vm size Standard_A0 is not working (#1299) the azure sample for AKS is not working cause the vm size Standard_A0 can't be used for AKS use Standard_DS1_v2 instead --- website/docs/r/kubernetes_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown index 5fdcffb9fc0d..f59168e84d0e 100644 --- a/website/docs/r/kubernetes_cluster.html.markdown +++ b/website/docs/r/kubernetes_cluster.html.markdown @@ -39,7 +39,7 @@ resource "azurerm_kubernetes_cluster" "test" { agent_pool_profile { name = "default" count = 1 - vm_size = "Standard_A0" + vm_size = "Standard_DS1_v2" os_type = "Linux" os_disk_size_gb = 30 } From a4001cf5c804f1fa579bac50d2cd8fbfda2a94f5 Mon Sep 17 00:00:00 2001 From: Roman Sokolkov Date: Fri, 25 May 2018 15:05:40 +0200 Subject: [PATCH 193/320] DOCS: Fixes typo in storage_account_sas example (#1300) --- website/docs/d/storage_account_sas.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/storage_account_sas.html.markdown b/website/docs/d/storage_account_sas.html.markdown index 0a1951c130dd..81decab5a6fc 100644 --- a/website/docs/d/storage_account_sas.html.markdown +++ b/website/docs/d/storage_account_sas.html.markdown @@ -65,7 +65,7 @@ data "azurerm_storage_account_sas" "test" { } output "sas_url_query_string" { - value = "${data.azurerm_storage_account_sas.sas}" + value = "${data.azurerm_storage_account_sas.test.sas}" } ``` From 57cfc2e48d0c1ba51c1dac0006140b09056b29d7 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Fri, 25 May 2018 18:45:43 -0700 Subject: [PATCH 194/320] Add test case for the new content type in blob. --- azurerm/resource_arm_storage_blob_test.go | 87 +++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/azurerm/resource_arm_storage_blob_test.go b/azurerm/resource_arm_storage_blob_test.go index 2fea86ff4850..345c8fa6fc29 100644 --- a/azurerm/resource_arm_storage_blob_test.go +++ b/azurerm/resource_arm_storage_blob_test.go @@ -314,6 +314,51 @@ func TestAccAzureRMStorageBlob_source_uri(t *testing.T) { }) } +func TestAccAzureRMStorageBlobBlock_blockContentType(t *testing.T) { + resourceName := "azurerm_storage_blob.source" + ri := acctest.RandInt() + rs1 := strings.ToLower(acctest.RandString(11)) + sourceBlob, err := ioutil.TempFile("", "") + if err != nil { + t.Fatalf("Failed to create local source blob file") + } + + _, err = io.CopyN(sourceBlob, rand.Reader, 25*1024*1024) + if err != nil { + t.Fatalf("Failed to write random test to source blob") + } + + err = sourceBlob.Close() + if err != nil { + t.Fatalf("Failed to close source blob") + } + + config := testAccAzureRMStorageBlobPage_blockContentType(ri, rs1, sourceBlob.Name(), testLocation(), "text/plain") + updateConfig := testAccAzureRMStorageBlobPage_blockContentType(ri, rs1, sourceBlob.Name(), testLocation(), "text/vnd.terraform.acctest.tmpfile") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMStorageBlobDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageBlobExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "content_type", "text/plain"), + ), + }, + { + Config: updateConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageBlobExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "content_type", "text/vnd.terraform.acctest.tmpfile"), + ), + }, + }, + }) +} + func testCheckAzureRMStorageBlobExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { @@ -666,3 +711,45 @@ resource "azurerm_storage_blob" "destination" { } `, rInt, location, rString, sourceBlobName) } + +func testAccAzureRMStorageBlobPage_blockContentType(rInt int, rString, sourceBlobName, location, contentType string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_storage_account" "source" { + name = "acctestacc%s" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + tags { + environment = "staging" + } +} + +resource "azurerm_storage_container" "source" { + name = "source" + resource_group_name = "${azurerm_resource_group.test.name}" + storage_account_name = "${azurerm_storage_account.source.name}" + container_access_type = "blob" +} + +resource "azurerm_storage_blob" "source" { + name = "source.vhd" + + resource_group_name = "${azurerm_resource_group.test.name}" + storage_account_name = "${azurerm_storage_account.source.name}" + storage_container_name = "${azurerm_storage_container.source.name}" + + type = "page" + source = "%s" + content_type = "%s" + parallelism = 3 + attempts = 3 +} +`, rInt, location, rString, sourceBlobName, contentType) +} From da7b3a5e1b2de8ab4838ab4f89f36ff1918dc0a6 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Fri, 25 May 2018 18:50:25 -0700 Subject: [PATCH 195/320] Remove the unneeded check. --- azurerm/resource_arm_storage_blob.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/azurerm/resource_arm_storage_blob.go b/azurerm/resource_arm_storage_blob.go index b7b498cd0249..47a7e28af916 100644 --- a/azurerm/resource_arm_storage_blob.go +++ b/azurerm/resource_arm_storage_blob.go @@ -605,9 +605,7 @@ func resourceArmStorageBlobRead(d *schema.ResourceData, meta interface{}) error if err != nil { return fmt.Errorf("Error getting properties of blob %s (container %s, storage account %s): %+v", name, storageContainerName, storageAccountName, err) } - if blob.Properties.ContentType != "" { - d.Set("content_type", blob.Properties.ContentType) - } + d.Set("content_type", blob.Properties.ContentType) url := blob.GetURL() if url == "" { From ab5be9e2a1f91615c4dcc6abb3dfb1b282ee455a Mon Sep 17 00:00:00 2001 From: Chang Li Date: Tue, 29 May 2018 14:30:46 +0800 Subject: [PATCH 196/320] Add some testcases to m2 resource --- azurerm/resource_arm_cdn_profile_test.go | 66 ++++++ ...source_arm_eventhub_consumer_group_test.go | 28 +++ .../resource_arm_eventhub_namespace_test.go | 216 ++++++++++++++++++ azurerm/resource_arm_eventhub_test.go | 53 +++++ ...source_arm_traffic_manager_profile_test.go | 72 ++++++ 5 files changed, 435 insertions(+) diff --git a/azurerm/resource_arm_cdn_profile_test.go b/azurerm/resource_arm_cdn_profile_test.go index c8e30c42f028..8ba1e492c619 100644 --- a/azurerm/resource_arm_cdn_profile_test.go +++ b/azurerm/resource_arm_cdn_profile_test.go @@ -138,6 +138,56 @@ func TestAccAzureRMCdnProfile_NonStandardCasing(t *testing.T) { }) } +func TestAccAzureRMCdnProfile_basicToStandardAkamai(t *testing.T) { + resourceName := "azurerm_cdn_profile.test" + ri := acctest.RandInt() + preConfig := testAccAzureRMCdnProfile_basic(ri, testLocation()) + postConfig := testAccAzureRMCdnProfile_standardAkamai(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMCdnProfileDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMCdnProfileExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "Standard_Verizon"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMCdnProfileExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "Standard_Akamai"), + ), + }, + }, + }) +} + +func TestAccAzureRMCdnProfile_standardAkamai(t *testing.T) { + resourceName := "azurerm_cdn_profile.test" + ri := acctest.RandInt() + config := testAccAzureRMCdnProfile_standardAkamai(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMCdnProfileDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMCdnProfileExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "Standard_Akamai"), + ), + }, + }, + }) +} + func testCheckAzureRMCdnProfileExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API @@ -266,3 +316,19 @@ resource "azurerm_cdn_profile" "test" { } `, rInt, location, rInt) } + +func testAccAzureRMCdnProfile_standardAkamai(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_cdn_profile" "test" { + name = "acctestcdnprof%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "Standard_Akamai" +} +`, rInt, location, rInt) +} diff --git a/azurerm/resource_arm_eventhub_consumer_group_test.go b/azurerm/resource_arm_eventhub_consumer_group_test.go index 7dc58a3be784..4d7bd62a0d79 100644 --- a/azurerm/resource_arm_eventhub_consumer_group_test.go +++ b/azurerm/resource_arm_eventhub_consumer_group_test.go @@ -50,6 +50,34 @@ func TestAccAzureRMEventHubConsumerGroup_complete(t *testing.T) { }) } +func TestAccAzureRMEventHubConsumerGroup_userMetadataUpdate(t *testing.T) { + resourceName := "azurerm_eventhub_consumer_group.test" + ri := acctest.RandInt() + preConfig := testAccAzureRMEventHubConsumerGroup_basic(ri, testLocation()) + postConfig := testAccAzureRMEventHubConsumerGroup_complete(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMEventHubConsumerGroupDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubConsumerGroupExists(resourceName), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubConsumerGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "user_metadata", "some-meta-data"), + ), + }, + }, + }) +} + func testCheckAzureRMEventHubConsumerGroupDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*ArmClient).eventHubConsumerGroupClient ctx := testAccProvider.Meta().(*ArmClient).StopContext diff --git a/azurerm/resource_arm_eventhub_namespace_test.go b/azurerm/resource_arm_eventhub_namespace_test.go index 30f0df8d96a9..87ef2f66eb63 100644 --- a/azurerm/resource_arm_eventhub_namespace_test.go +++ b/azurerm/resource_arm_eventhub_namespace_test.go @@ -118,6 +118,147 @@ func TestAccAzureRMEventHubNamespace_NonStandardCasing(t *testing.T) { }) } +func TestAccAzureRMEventHubNamespace_BasicWithTagsUpdate(t *testing.T) { + resourceName := "azurerm_eventhub_namespace.test" + ri := acctest.RandInt() + preConfig := testAccAzureRMEventHubNamespace_basic(ri, testLocation()) + postConfig := testAccAzureRMEventHubNamespace_basicWithTagsUpdate(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMEventHubNamespaceDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubNamespaceExists(resourceName), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubNamespaceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + ), + }, + }, + }) +} + +func TestAccAzureRMEventHubNamespace_BasicWithCapacity(t *testing.T) { + resourceName := "azurerm_eventhub_namespace.test" + ri := acctest.RandInt() + config := testAccAzureRMEventHubNamespace_basicWithCapacity(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMEventHubNamespaceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubNamespaceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "capacity", "20"), + ), + }, + }, + }) +} + +func TestAccAzureRMEventHubNamespace_BasicWithCapacityUpdate(t *testing.T) { + resourceName := "azurerm_eventhub_namespace.test" + ri := acctest.RandInt() + preConfig := testAccAzureRMEventHubNamespace_basicWithCapacity(ri, testLocation()) + postConfig := testAccAzureRMEventHubNamespace_basicWithCapacityUpdate(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMEventHubNamespaceDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubNamespaceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "capacity", "20"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubNamespaceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "capacity", "2"), + ), + }, + }, + }) +} + +func TestAccAzureRMEventHubNamespace_BasicWithSkuUpdate(t *testing.T) { + resourceName := "azurerm_eventhub_namespace.test" + ri := acctest.RandInt() + preConfig := testAccAzureRMEventHubNamespace_basic(ri, testLocation()) + postConfig := testAccAzureRMEventHubNamespace_standard(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMEventHubNamespaceDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubNamespaceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "Basic"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubNamespaceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "Standard"), + resource.TestCheckResourceAttr(resourceName, "capacity", "2"), + ), + }, + }, + }) +} + +func TestAccAzureRMEventHubNamespace_maximumThroughputUnitsUpdate(t *testing.T) { + resourceName := "azurerm_eventhub_namespace.test" + ri := acctest.RandInt() + preConfig := testAccAzureRMEventHubNamespace_maximumThroughputUnits(ri, testLocation()) + postConfig := testAccAzureRMEventHubNamespace_maximumThroughputUnitsUpdate(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMEventHubNamespaceDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubNamespaceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "Standard"), + resource.TestCheckResourceAttr(resourceName, "capacity", "2"), + resource.TestCheckResourceAttr(resourceName, "maximum_throughput_units", "20"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubNamespaceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "Standard"), + resource.TestCheckResourceAttr(resourceName, "capacity", "1"), + resource.TestCheckResourceAttr(resourceName, "maximum_throughput_units", "1"), + ), + }, + }, + }) +} + func testCheckAzureRMEventHubNamespaceDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*ArmClient).eventHubNamespacesClient ctx := testAccProvider.Meta().(*ArmClient).StopContext @@ -241,3 +382,78 @@ resource "azurerm_eventhub_namespace" "test" { } `, rInt, location, rInt) } + +func testAccAzureRMEventHubNamespace_basicWithTagsUpdate(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_eventhub_namespace" "test" { + name = "acctesteventhubnamespace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "Basic" + tags { + environment = "Production" + } +} +`, rInt, location, rInt) +} + +func testAccAzureRMEventHubNamespace_basicWithCapacity(rInt int, location string) string { + return fmt.Sprintf(` + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_eventhub_namespace" "test" { + name = "acctesteventhubnamespace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "Basic" + capacity = "20" +} +`, rInt, location, rInt) +} + +func testAccAzureRMEventHubNamespace_basicWithCapacityUpdate(rInt int, location string) string { + return fmt.Sprintf(` + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_eventhub_namespace" "test" { + name = "acctesteventhubnamespace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "Basic" + capacity = "2" +} +`, rInt, location, rInt) +} + +func testAccAzureRMEventHubNamespace_maximumThroughputUnitsUpdate(rInt int, location string) string { + return fmt.Sprintf(` + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_eventhub_namespace" "test" { + name = "acctesteventhubnamespace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "Standard" + capacity = "1" + auto_inflate_enabled = true + maximum_throughput_units = "1" +} +`, rInt, location, rInt) +} diff --git a/azurerm/resource_arm_eventhub_test.go b/azurerm/resource_arm_eventhub_test.go index c488305f80df..a68fcbe8c6bc 100644 --- a/azurerm/resource_arm_eventhub_test.go +++ b/azurerm/resource_arm_eventhub_test.go @@ -258,6 +258,35 @@ func TestAccAzureRMEventHub_captureDescriptionDisabled(t *testing.T) { }) } +func TestAccAzureRMEventHub_messageRetentionUpdate(t *testing.T) { + resourceName := "azurerm_eventhub.test" + ri := acctest.RandInt() + preConfig := testAccAzureRMEventHub_standard(ri, testLocation()) + postConfig := testAccAzureRMEventHub_messageRetentionUpdate(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMEventHubDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "message_retention", "7"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "message_retention", "5"), + ), + }, + }, + }) +} + func testCheckAzureRMEventHubDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*ArmClient).eventHubClient ctx := testAccProvider.Meta().(*ArmClient).StopContext @@ -417,3 +446,27 @@ resource "azurerm_eventhub" "test" { } `, rInt, location, rString, rInt, rInt, enabledString) } + +func testAccAzureRMEventHub_messageRetentionUpdate(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_eventhub_namespace" "test" { + name = "acctesteventhubnamespace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "Standard" +} + +resource "azurerm_eventhub" "test" { + name = "acctesteventhub-%d" + namespace_name = "${azurerm_eventhub_namespace.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + partition_count = 2 + message_retention = 5 +} +`, rInt, location, rInt, rInt) +} diff --git a/azurerm/resource_arm_traffic_manager_profile_test.go b/azurerm/resource_arm_traffic_manager_profile_test.go index e251fe18f5c0..ea1576aa9989 100644 --- a/azurerm/resource_arm_traffic_manager_profile_test.go +++ b/azurerm/resource_arm_traffic_manager_profile_test.go @@ -181,6 +181,78 @@ func TestAccAzureRMTrafficManagerProfile_withTags(t *testing.T) { }) } +func TestAccAzureRMTrafficManagerProfile_performanceToGeographic(t *testing.T) { + resourceName := "azurerm_traffic_manager_profile.test" + ri := acctest.RandInt() + preConfig := testAccAzureRMTrafficManagerProfile_performance(ri, testLocation()) + postConfig := testAccAzureRMTrafficManagerProfile_geographic(ri, testLocation()) + + fqdn, err := getTrafficManagerFQDN(fmt.Sprintf("acctesttmp%d", ri)) + if err != nil { + t.Fatalf("Error obtaining Azure Region: %+v", err) + } + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMTrafficManagerProfileDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMTrafficManagerProfileExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "traffic_routing_method", "Performance"), + resource.TestCheckResourceAttr(resourceName, "fqdn", fqdn), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMTrafficManagerProfileExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "traffic_routing_method", "Geographic"), + resource.TestCheckResourceAttr(resourceName, "fqdn", fqdn), + ), + }, + }, + }) +} + +func TestAccAzureRMTrafficManagerProfile_priorityToWeighted(t *testing.T) { + resourceName := "azurerm_traffic_manager_profile.test" + ri := acctest.RandInt() + preConfig := testAccAzureRMTrafficManagerProfile_priority(ri, testLocation()) + postConfig := testAccAzureRMTrafficManagerProfile_weighted(ri, testLocation()) + + fqdn, err := getTrafficManagerFQDN(fmt.Sprintf("acctesttmp%d", ri)) + if err != nil { + t.Fatalf("Error obtaining Azure Region: %+v", err) + } + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMTrafficManagerProfileDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMTrafficManagerProfileExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "traffic_routing_method", "Priority"), + resource.TestCheckResourceAttr(resourceName, "fqdn", fqdn), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMTrafficManagerProfileExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "traffic_routing_method", "Weighted"), + resource.TestCheckResourceAttr(resourceName, "fqdn", fqdn), + ), + }, + }, + }) +} + func testCheckAzureRMTrafficManagerProfileExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API From 850ab60ca50bd0353cfbcb7680863e0ba4b3b3fe Mon Sep 17 00:00:00 2001 From: Khalid Dermoumi Date: Tue, 29 May 2018 12:56:03 +0200 Subject: [PATCH 197/320] Clarify usage of "ssh_keys" section (#1305) The "ssh_keys" parameters usage documentation is obscure . A web search shows many users don't get it quickly. I think this is better now. --- website/docs/r/virtual_machine.html.markdown | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/website/docs/r/virtual_machine.html.markdown b/website/docs/r/virtual_machine.html.markdown index aa029238e058..334d39d82104 100644 --- a/website/docs/r/virtual_machine.html.markdown +++ b/website/docs/r/virtual_machine.html.markdown @@ -491,8 +491,13 @@ output "principal_id" { `os_profile_linux_config` supports the following: * `disable_password_authentication` - (Required) Specifies whether password authentication should be disabled. If set to `false`, an `admin_password` must be specified. -* `ssh_keys` - (Optional) Specifies a collection of `path` and `key_data` to be placed on the virtual machine. - +* `ssh_keys` - (Optional) Specifies a collection of `path` and `key_data` to be placed on the virtual machine. The `path` attribute sets the path of the destination file on the virtual machine, and the `key_data`-attribute sets the content of the destination file. An example of a working configuration (`` needs to be replaced with the actual username): +```hcl + ssh_keys { + key_data = "${file("/home//.ssh/authorized_keys")}" + path = "/home//.ssh/authorized_keys" + } +``` ~> **Note:** Please note that the only allowed `path` is `/home//.ssh/authorized_keys` due to a limitation of Azure. `os_profile_secrets` supports the following: From aab882f476253e05bae288062c42421d7bf77746 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 29 May 2018 13:50:45 +0100 Subject: [PATCH 198/320] Updating the docs --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49dfe9b62ea1..4095cbb64d31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ BUG FIXES: -* `azurerm_public_ip` - import not correctly reads the `domain_name_label` property into state [GH-1287] +* `azurerm_public_ip` - setting the `domain_name_label` property into state [GH-1287] ## 1.6.0 (May 24, 2018) From ea863d42b2283942d0882ac179302206ff2efeae Mon Sep 17 00:00:00 2001 From: Chang Li Date: Wed, 30 May 2018 07:51:46 +0800 Subject: [PATCH 199/320] Fix quotes around integer in additional testcases --- azurerm/resource_arm_eventhub_namespace_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azurerm/resource_arm_eventhub_namespace_test.go b/azurerm/resource_arm_eventhub_namespace_test.go index 87ef2f66eb63..cc6cc0b80685 100644 --- a/azurerm/resource_arm_eventhub_namespace_test.go +++ b/azurerm/resource_arm_eventhub_namespace_test.go @@ -397,7 +397,7 @@ resource "azurerm_eventhub_namespace" "test" { sku = "Basic" tags { environment = "Production" - } + } } `, rInt, location, rInt) } @@ -415,7 +415,7 @@ resource "azurerm_eventhub_namespace" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku = "Basic" - capacity = "20" + capacity = 20 } `, rInt, location, rInt) } @@ -433,7 +433,7 @@ resource "azurerm_eventhub_namespace" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku = "Basic" - capacity = "2" + capacity = 2 } `, rInt, location, rInt) } @@ -451,9 +451,9 @@ resource "azurerm_eventhub_namespace" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku = "Standard" - capacity = "1" + capacity = 1 auto_inflate_enabled = true - maximum_throughput_units = "1" + maximum_throughput_units = 1 } `, rInt, location, rInt) } From ac0ccbe60c0c4b12a7c75bf41c0f3c95ceb2072a Mon Sep 17 00:00:00 2001 From: lstolyarov Date: Thu, 31 May 2018 15:55:13 +0100 Subject: [PATCH 200/320] Add the storage account object id as an output --- azurerm/resource_arm_storage_account.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index c95c8839d337..508c45dfcebb 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -223,6 +223,11 @@ func resourceArmStorageAccount() *schema.Resource { Sensitive: true, }, + "object_id": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tagsSchema(), }, } @@ -495,6 +500,11 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err } d.Set("account_kind", resp.Kind) + log.Printf("[INFO] Identity is %q", resp.Identity) + if identity := resp.Identity; identity != nil { + d.Set("object_id", identity.PrincipalID) + } + if sku := resp.Sku; sku != nil { d.Set("account_type", sku.Name) d.Set("account_tier", sku.Tier) From 08ff58cf19ada969a8b8bb6bd884f474dc84047e Mon Sep 17 00:00:00 2001 From: Chang Li Date: Fri, 1 Jun 2018 14:32:03 +0800 Subject: [PATCH 201/320] Combine testAccAzureRMEventHubNamespace_capacity --- .../resource_arm_eventhub_namespace_test.go | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/azurerm/resource_arm_eventhub_namespace_test.go b/azurerm/resource_arm_eventhub_namespace_test.go index cc6cc0b80685..978ef5e5a9b7 100644 --- a/azurerm/resource_arm_eventhub_namespace_test.go +++ b/azurerm/resource_arm_eventhub_namespace_test.go @@ -149,7 +149,7 @@ func TestAccAzureRMEventHubNamespace_BasicWithTagsUpdate(t *testing.T) { func TestAccAzureRMEventHubNamespace_BasicWithCapacity(t *testing.T) { resourceName := "azurerm_eventhub_namespace.test" ri := acctest.RandInt() - config := testAccAzureRMEventHubNamespace_basicWithCapacity(ri, testLocation()) + config := testAccAzureRMEventHubNamespace_capacity(ri, testLocation(), 20) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -170,8 +170,8 @@ func TestAccAzureRMEventHubNamespace_BasicWithCapacity(t *testing.T) { func TestAccAzureRMEventHubNamespace_BasicWithCapacityUpdate(t *testing.T) { resourceName := "azurerm_eventhub_namespace.test" ri := acctest.RandInt() - preConfig := testAccAzureRMEventHubNamespace_basicWithCapacity(ri, testLocation()) - postConfig := testAccAzureRMEventHubNamespace_basicWithCapacityUpdate(ri, testLocation()) + preConfig := testAccAzureRMEventHubNamespace_capacity(ri, testLocation(), 20) + postConfig := testAccAzureRMEventHubNamespace_capacity(ri, testLocation(), 2) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -402,7 +402,7 @@ resource "azurerm_eventhub_namespace" "test" { `, rInt, location, rInt) } -func testAccAzureRMEventHubNamespace_basicWithCapacity(rInt int, location string) string { +func testAccAzureRMEventHubNamespace_capacity(rInt int, location string, capacity int) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -415,27 +415,9 @@ resource "azurerm_eventhub_namespace" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku = "Basic" - capacity = 20 + capacity = %d } -`, rInt, location, rInt) -} - -func testAccAzureRMEventHubNamespace_basicWithCapacityUpdate(rInt int, location string) string { - return fmt.Sprintf(` - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_eventhub_namespace" "test" { - name = "acctesteventhubnamespace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Basic" - capacity = 2 -} -`, rInt, location, rInt) +`, rInt, location, rInt, capacity) } func testAccAzureRMEventHubNamespace_maximumThroughputUnitsUpdate(rInt int, location string) string { From 5a911754a3ca2cfc703b41b648735fbf6cf8077d Mon Sep 17 00:00:00 2001 From: Vaijanath Angadihiremath Date: Fri, 1 Jun 2018 03:45:47 -0700 Subject: [PATCH 202/320] Fixing issue 1286 : We are unable to disassociate a PIP once attached (#1295) * Fixing issue 1286 : We are unable to disassociate a PIP once attached because of this * Added the test case for Bug 1286 * Ensuring the fields are reset to nothing --- azurerm/resource_arm_network_interface.go | 2 - .../resource_arm_network_interface_test.go | 116 ++++++++++++++++++ 2 files changed, 116 insertions(+), 2 deletions(-) diff --git a/azurerm/resource_arm_network_interface.go b/azurerm/resource_arm_network_interface.go index 8e58696425b7..d4ab01c1f20d 100644 --- a/azurerm/resource_arm_network_interface.go +++ b/azurerm/resource_arm_network_interface.go @@ -68,7 +68,6 @@ func resourceArmNetworkInterface() *schema.Resource { "private_ip_address": { Type: schema.TypeString, Optional: true, - Computed: true, }, "private_ip_address_allocation": { @@ -85,7 +84,6 @@ func resourceArmNetworkInterface() *schema.Resource { "public_ip_address_id": { Type: schema.TypeString, Optional: true, - Computed: true, }, "application_gateway_backend_address_pools_ids": { diff --git a/azurerm/resource_arm_network_interface_test.go b/azurerm/resource_arm_network_interface_test.go index 91c52b95d067..362b5f4c22c9 100644 --- a/azurerm/resource_arm_network_interface_test.go +++ b/azurerm/resource_arm_network_interface_test.go @@ -333,6 +333,34 @@ func TestAccAzureRMNetworkInterface_withTags(t *testing.T) { }) } +func TestAccAzureRMNetworkInterface_IPAddressesBug1286(t *testing.T) { + resourceName := "azurerm_network_interface.test" + rInt := acctest.RandInt() + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMNetworkInterface_withIPAddresses(rInt, testLocation()), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "ip_configuration.0.private_ip_address"), + resource.TestCheckResourceAttrSet(resourceName, "ip_configuration.0.public_ip_address_id"), + ), + }, + { + Config: testAccAzureRMNetworkInterface_withIPAddressesUpdate(rInt, testLocation()), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "ip_configuration.0.private_ip_address", ""), + resource.TestCheckResourceAttr(resourceName, "ip_configuration.0.public_ip_address_id", ""), + ), + }, + }, + }) +} + func TestAccAzureRMNetworkInterface_bug7986(t *testing.T) { rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ @@ -790,6 +818,94 @@ resource "azurerm_network_interface" "test" { `, rInt, location, rInt, rInt) } +func testAccAzureRMNetworkInterface_withIPAddresses(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctest-rg-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvn-%d" + address_space = ["10.0.0.0/16"] + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_subnet" "test" { + name = "testsubnet" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_public_ip" "test" { + name = "test-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + public_ip_address_allocation = "static" + domain_name_label = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + ip_configuration { + name = "testconfiguration1" + subnet_id = "${azurerm_subnet.test.id}" + private_ip_address_allocation = "static" + private_ip_address = "10.0.2.9" + public_ip_address_id = "${azurerm_public_ip.test.id}" + } +} +`, rInt, location, rInt, rInt, rInt) +} + +func testAccAzureRMNetworkInterface_withIPAddressesUpdate(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctest-rg-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvn-%d" + address_space = ["10.0.0.0/16"] + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_subnet" "test" { + name = "testsubnet" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_public_ip" "test" { + name = "test-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + public_ip_address_allocation = "static" + domain_name_label = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + ip_configuration { + name = "testconfiguration1" + subnet_id = "${azurerm_subnet.test.id}" + private_ip_address_allocation = "dynamic" + } +} +`, rInt, location, rInt, rInt, rInt) +} + func testAccAzureRMNetworkInterface_multipleLoadBalancers(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From 52c3bcd2715a797037f197a522fc90914d8fd553 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 1 Jun 2018 12:46:28 +0200 Subject: [PATCH 203/320] Updating to include #1295 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4095cbb64d31..cfca160fabfa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ BUG FIXES: +* `azurerm_network_interface` - ensuring that Public IP's/Private IP Addresses can be removed once assigned [GH-1295] * `azurerm_public_ip` - setting the `domain_name_label` property into state [GH-1287] ## 1.6.0 (May 24, 2018) From 8de4693a34d6631bfbe998430b0d42c01430323d Mon Sep 17 00:00:00 2001 From: Vaijanath Angadihiremath Date: Fri, 1 Jun 2018 03:54:17 -0700 Subject: [PATCH 204/320] =?UTF-8?q?Overprovision=20should=20be=20default?= =?UTF-8?q?=20true.=20Terraform=20and=20the=20service=20back=20=E2=80=A6?= =?UTF-8?q?=20(#1322)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Overprovision should be default true. Terraform and the service back end is considering this as default false when nothing is specified. * Updating the documentation to reflect the change * Changing the sentence based on code review * Quoting the `true` values --- azurerm/resource_arm_virtual_machine_scale_set.go | 1 + website/docs/r/virtual_machine_scale_set.html.markdown | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/azurerm/resource_arm_virtual_machine_scale_set.go b/azurerm/resource_arm_virtual_machine_scale_set.go index 129926b0ce32..1f5b8259536d 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set.go +++ b/azurerm/resource_arm_virtual_machine_scale_set.go @@ -106,6 +106,7 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { "overprovision": { Type: schema.TypeBool, Optional: true, + Default: true, }, "single_placement_group": { diff --git a/website/docs/r/virtual_machine_scale_set.html.markdown b/website/docs/r/virtual_machine_scale_set.html.markdown index 0702352e6a7f..7d3c93151961 100644 --- a/website/docs/r/virtual_machine_scale_set.html.markdown +++ b/website/docs/r/virtual_machine_scale_set.html.markdown @@ -245,8 +245,8 @@ The following arguments are supported: * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. * `sku` - (Required) A sku block as documented below. * `upgrade_policy_mode` - (Required) Specifies the mode of an upgrade to virtual machines in the scale set. Possible values, `Manual` or `Automatic`. -* `overprovision` - (Optional) Specifies whether the virtual machine scale set should be overprovisioned. -* `single_placement_group` - (Optional) Specifies whether the scale set is limited to a single placement group with a maximum size of 100 virtual machines. If set to false, managed disks must be used. Default is true. Changing this forces a +* `overprovision` - (Optional) Specifies whether the virtual machine scale set should be overprovisioned. Defaults to `true`. +* `single_placement_group` - (Optional) Specifies whether the scale set is limited to a single placement group with a maximum size of 100 virtual machines. If set to false, managed disks must be used. Defaults to `true`. Changing this forces a new resource to be created. See [documentation](http://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups) for more information. * `license_type` - (Optional, when a Windows machine) Specifies the Windows OS license type. If supplied, the only allowed values are `Windows_Client` and `Windows_Server`. * `os_profile` - (Required) A Virtual Machine OS Profile block as documented below. From 5bae6deb4e52469102e8418d9211da7275a9e80f Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 1 Jun 2018 12:54:52 +0200 Subject: [PATCH 205/320] Updating to include #1322 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfca160fabfa..cfd43abbb0cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,14 @@ ## 1.7.0 (Unreleased) +UPGRADE NOTES: + +~> **Please Note:** The field `overprovision` on the `azurerm_virtual_machine_scale_set` resource has changed from `false` to `true` to match the behaviour of Azure in this release. [GH-1322] + BUG FIXES: * `azurerm_network_interface` - ensuring that Public IP's/Private IP Addresses can be removed once assigned [GH-1295] * `azurerm_public_ip` - setting the `domain_name_label` property into state [GH-1287] +* `azurerm_virtual_machine_scale_set` - the field `overprovision` has been updated to `true` by default rather than `false` to match Azure [GH-1322] ## 1.6.0 (May 24, 2018) From f3dedf5eb276d744681a9491b069a4344a7a10f1 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 1 Jun 2018 05:00:25 -0700 Subject: [PATCH 206/320] azurerm_virtual_machine - add support for write_accelerator_enabled to disks (#964) * Added the write_accelerator_enabled property to azurerm_virtual_machine disks * Updated WriteAccelerator tests * fix acc tests * Add write_accelerator_enabled to os disk * vm write accelerator property: addressing PR comments --- azurerm/resource_arm_virtual_machine.go | 36 ++- ..._arm_virtual_machine_managed_disks_test.go | 247 +++++++++++++++++- website/docs/r/virtual_machine.html.markdown | 2 + 3 files changed, 279 insertions(+), 6 deletions(-) diff --git a/azurerm/resource_arm_virtual_machine.go b/azurerm/resource_arm_virtual_machine.go index e5fb9e52dc51..51eb75daa852 100644 --- a/azurerm/resource_arm_virtual_machine.go +++ b/azurerm/resource_arm_virtual_machine.go @@ -229,6 +229,12 @@ func resourceArmVirtualMachine() *schema.Resource { Computed: true, ValidateFunc: validateDiskSizeGB, }, + + "write_accelerator_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, }, }, }, @@ -294,6 +300,12 @@ func resourceArmVirtualMachine() *schema.Resource { Type: schema.TypeInt, Required: true, }, + + "write_accelerator_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, }, }, }, @@ -990,6 +1002,10 @@ func flattenAzureRmVirtualMachineDataDisk(disks *[]compute.DataDisk, disksInfo [ } l["lun"] = *disk.Lun + if v := disk.WriteAcceleratorEnabled; v != nil { + l["write_accelerator_enabled"] = *disk.WriteAcceleratorEnabled + } + flattenAzureRmVirtualMachineReviseDiskInfo(l, disksInfo[i]) result[i] = l @@ -1099,6 +1115,10 @@ func flattenAzureRmVirtualMachineOsDisk(disk *compute.OSDisk, diskInfo *compute. } result["os_type"] = string(disk.OsType) + if v := disk.WriteAcceleratorEnabled; v != nil { + result["write_accelerator_enabled"] = *disk.WriteAcceleratorEnabled + } + flattenAzureRmVirtualMachineReviseDiskInfo(result, diskInfo) return []interface{}{result} @@ -1393,9 +1413,12 @@ func expandAzureRmVirtualMachineDataDisk(d *schema.ResourceData) ([]compute.Data data_disk.Caching = compute.CachingTypes(v) } - if v := config["disk_size_gb"]; v != nil { - diskSize := int32(config["disk_size_gb"].(int)) - data_disk.DiskSizeGB = &diskSize + if v, ok := config["disk_size_gb"].(int); ok { + data_disk.DiskSizeGB = utils.Int32(int32(v)) + } + + if v, ok := config["write_accelerator_enabled"].(bool); ok { + data_disk.WriteAcceleratorEnabled = utils.Bool(v) } data_disks = append(data_disks, data_disk) @@ -1542,8 +1565,11 @@ func expandAzureRmVirtualMachineOsDisk(d *schema.ResourceData) (*compute.OSDisk, } if v := config["disk_size_gb"].(int); v != 0 { - diskSize := int32(v) - osDisk.DiskSizeGB = &diskSize + osDisk.DiskSizeGB = utils.Int32(int32(v)) + } + + if v, ok := config["write_accelerator_enabled"].(bool); ok { + osDisk.WriteAcceleratorEnabled = utils.Bool(v) } return osDisk, nil diff --git a/azurerm/resource_arm_virtual_machine_managed_disks_test.go b/azurerm/resource_arm_virtual_machine_managed_disks_test.go index 25416804d469..f2ee63e9adfa 100644 --- a/azurerm/resource_arm_virtual_machine_managed_disks_test.go +++ b/azurerm/resource_arm_virtual_machine_managed_disks_test.go @@ -352,7 +352,7 @@ func TestAccAzureRMVirtualMachine_enableAnWithVM(t *testing.T) { CheckDestroy: testCheckAzureRMVirtualMachineDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMVirtualMachine_anWithVM(rInt, testLocation()), + Config: testAccAzureRMVirtualMachine_anWithVM(rInt, testAltLocation()), Check: resource.ComposeTestCheckFunc( testCheckAzureRMVirtualMachineExists(resourceName, &vm), ), @@ -361,6 +361,83 @@ func TestAccAzureRMVirtualMachine_enableAnWithVM(t *testing.T) { }) } +func TestAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_changeOsWriteAcceleratorEnabled(t *testing.T) { + resourceName := "azurerm_virtual_machine.test" + rInt := acctest.RandInt() + var vm compute.VirtualMachine + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualMachineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_withOsWriteAcceleratorEnabled(rInt, testAltLocation(), "true"), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualMachineExists(resourceName, &vm), + resource.TestCheckResourceAttr(resourceName, "storage_os_disk.0.write_accelerator_enabled", "true"), + ), + }, + { + Config: testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_withOsWriteAcceleratorEnabled(rInt, testAltLocation(), "false"), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualMachineExists(resourceName, &vm), + resource.TestCheckResourceAttr(resourceName, "storage_os_disk.0.write_accelerator_enabled", "false"), + ), + }, + }, + }) +} + +func TestAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_withWriteAcceleratorEnabled(t *testing.T) { + resourceName := "azurerm_virtual_machine.test" + rInt := acctest.RandInt() + var vm compute.VirtualMachine + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualMachineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_withWriteAcceleratorEnabled(rInt, testAltLocation(), "true"), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualMachineExists(resourceName, &vm), + resource.TestCheckResourceAttr(resourceName, "storage_data_disk.0.write_accelerator_enabled", "true"), + ), + }, + }, + }) +} + +func TestAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_changeWriteAcceleratorEnabled(t *testing.T) { + resourceName := "azurerm_virtual_machine.test" + rInt := acctest.RandInt() + var vm compute.VirtualMachine + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualMachineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_withWriteAcceleratorEnabled(rInt, testAltLocation(), "false"), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualMachineExists(resourceName, &vm), + resource.TestCheckResourceAttr(resourceName, "storage_data_disk.0.write_accelerator_enabled", "false"), + ), + }, + { + Config: testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_withWriteAcceleratorEnabled(rInt, testAltLocation(), "true"), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualMachineExists(resourceName, &vm), + resource.TestCheckResourceAttr(resourceName, "storage_data_disk.0.write_accelerator_enabled", "true"), + ), + }, + }, + }) +} + func TestAccAzureRMVirtualMachine_winRMCerts(t *testing.T) { var vm compute.VirtualMachine resourceName := "azurerm_virtual_machine.test" @@ -437,6 +514,174 @@ func testCheckAndStopAzureRMVirtualMachine(vm *compute.VirtualMachine) resource. } } +func testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_withOsWriteAcceleratorEnabled(rInt int, location, enabled string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctvn-%d" + address_space = ["10.0.0.0/16"] + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_subnet" "test" { + name = "acctsub-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_network_interface" "test" { + name = "acctni-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + ip_configuration { + name = "testconfiguration1" + subnet_id = "${azurerm_subnet.test.id}" + private_ip_address_allocation = "dynamic" + } +} + +resource "azurerm_virtual_machine" "test" { + name = "acctvm-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + network_interface_ids = ["${azurerm_network_interface.test.id}"] + vm_size = "Standard_M64s" + + delete_os_disk_on_termination = true + + storage_image_reference { + publisher = "Canonical" + offer = "UbuntuServer" + sku = "16.04-LTS" + version = "latest" + } + + storage_os_disk { + name = "osd-%d" + create_option = "FromImage" + caching = "None" + disk_size_gb = "50" + managed_disk_type = "Premium_LRS" + write_accelerator_enabled = %s + } + + storage_data_disk { + name = "acctmd-%d" + create_option = "Empty" + disk_size_gb = "1" + managed_disk_type = "Standard_LRS" + lun = 0 + } + + os_profile { + computer_name = "hn%d" + admin_username = "testadmin" + admin_password = "Password1234!" + } + + os_profile_linux_config { + disable_password_authentication = false + } + + tags { + environment = "Production" + cost-center = "Ops" + } +} +`, rInt, location, rInt, rInt, rInt, rInt, rInt, enabled, rInt, rInt) +} + +func testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_withWriteAcceleratorEnabled(rInt int, location, enabled string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctvn-%d" + address_space = ["10.0.0.0/16"] + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_subnet" "test" { + name = "acctsub-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_network_interface" "test" { + name = "acctni-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + ip_configuration { + name = "testconfiguration1" + subnet_id = "${azurerm_subnet.test.id}" + private_ip_address_allocation = "dynamic" + } +} + +resource "azurerm_virtual_machine" "test" { + name = "acctvm-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + network_interface_ids = ["${azurerm_network_interface.test.id}"] + vm_size = "Standard_M64s" + + delete_os_disk_on_termination = true + + storage_image_reference { + publisher = "Canonical" + offer = "UbuntuServer" + sku = "16.04-LTS" + version = "latest" + } + + storage_os_disk { + name = "osd-%d" + caching = "ReadWrite" + create_option = "FromImage" + disk_size_gb = "50" + managed_disk_type = "Standard_LRS" + } + + storage_data_disk { + name = "acctmd-%d" + create_option = "Empty" + disk_size_gb = "1" + managed_disk_type = "Premium_LRS" + lun = 0 + write_accelerator_enabled = %s + } + + os_profile { + computer_name = "hn%d" + admin_username = "testadmin" + admin_password = "Password1234!" + } + + os_profile_linux_config { + disable_password_authentication = false + } + + tags { + environment = "Production" + cost-center = "Ops" + } +} +`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, enabled, rInt) +} + func testAccAzureRMVirtualMachine_winRMCerts(rString string, location string) string { return fmt.Sprintf(` variable "prefix" { diff --git a/website/docs/r/virtual_machine.html.markdown b/website/docs/r/virtual_machine.html.markdown index 334d39d82104..2a636ecc1d53 100644 --- a/website/docs/r/virtual_machine.html.markdown +++ b/website/docs/r/virtual_machine.html.markdown @@ -412,6 +412,7 @@ resource "azurerm_virtual_machine" "test" { * `image_uri` - (Optional) Specifies the image_uri in the form publisherName:offer:skus:version. `image_uri` can also specify the [VHD uri](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-cli-deploy-templates/#create-a-custom-vm-image) of a custom VM image to clone. When cloning a custom disk image the `os_type` documented below becomes required. * `os_type` - (Optional) Specifies the operating system Type, valid values are windows, linux. * `disk_size_gb` - (Optional) Specifies the size of the os disk in gigabytes. +* `write_accelerator_enabled` - (Optional) Specifies if Write Accelerator is enabled on the disk. This can only be enabled on `Premium_LRS` managed disks with no caching and [M-Series VMs](https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/how-to-enable-write-accelerator). Defaults to `false`. `storage_data_disk` supports the following: @@ -423,6 +424,7 @@ resource "azurerm_virtual_machine" "test" { * `disk_size_gb` - (Required) Specifies the size of the data disk in gigabytes. * `caching` - (Optional) Specifies the caching requirements. * `lun` - (Required) Specifies the logical unit number of the data disk. +* `write_accelerator_enabled` - (Optional) Specifies if Write Accelerator is enabled on the disk. This can only be enabled on `Premium_LRS` managed disks with no caching and [M-Series VMs](https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/how-to-enable-write-accelerator). Defaults to `false`. `os_profile` supports the following: From 91e4562440f9a8a1bb5ea58947e28dd1134d9e63 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 1 Jun 2018 14:00:54 +0200 Subject: [PATCH 207/320] Updating to include #964 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfd43abbb0cb..bf0d89a4c180 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ BUG FIXES: * `azurerm_public_ip` - setting the `domain_name_label` property into state [GH-1287] * `azurerm_virtual_machine_scale_set` - the field `overprovision` has been updated to `true` by default rather than `false` to match Azure [GH-1322] +FEATURES: + +* `azurerm_virtual_machine` - support for `write_accelerator_enabled` on Premium disks attached to MS-series machines [GH-964] + ## 1.6.0 (May 24, 2018) UPGRADE NOTES: From 73110aaa4631d2673c228de053ec25d1ef3ab2d5 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 1 Jun 2018 19:35:35 +0200 Subject: [PATCH 208/320] r/kubernetes_cluster: making the `dns_prefix` field Required (#1333) --- azurerm/resource_arm_kubernetes_cluster.go | 3 +-- website/docs/r/kubernetes_cluster.html.markdown | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/azurerm/resource_arm_kubernetes_cluster.go b/azurerm/resource_arm_kubernetes_cluster.go index 555ba2aaa3e7..ba519748f6e2 100644 --- a/azurerm/resource_arm_kubernetes_cluster.go +++ b/azurerm/resource_arm_kubernetes_cluster.go @@ -37,8 +37,7 @@ func resourceArmKubernetesCluster() *schema.Resource { "dns_prefix": { Type: schema.TypeString, - Optional: true, - Computed: true, + Required: true, }, "fqdn": { diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown index f59168e84d0e..d7f3c5ee6eb1 100644 --- a/website/docs/r/kubernetes_cluster.html.markdown +++ b/website/docs/r/kubernetes_cluster.html.markdown @@ -89,7 +89,7 @@ The following arguments are supported: * `resource_group_name` - (Required) Specifies the resource group where the resource exists. Changing this forces a new resource to be created. -* `dns_prefix` - (Optional) DNS prefix specified when creating the managed cluster. +* `dns_prefix` - (Required) DNS prefix specified when creating the managed cluster. * `kubernetes_version` - (Optional) Version of Kubernetes specified when creating the AKS managed cluster. If not specified, the latest recommended version will be used at provisioning time (but won't auto-upgrade). From 6af0cac1a4b0da9eebcf619d9c1a91b20c9f7b82 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 1 Jun 2018 19:36:03 +0200 Subject: [PATCH 209/320] Updating to include #1333 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf0d89a4c180..115e7797ac97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ UPGRADE NOTES: BUG FIXES: +* `azurerm_kubernetes_cluster` - `dns_prefix` is now required [GH-1333] * `azurerm_network_interface` - ensuring that Public IP's/Private IP Addresses can be removed once assigned [GH-1295] * `azurerm_public_ip` - setting the `domain_name_label` property into state [GH-1287] * `azurerm_virtual_machine_scale_set` - the field `overprovision` has been updated to `true` by default rather than `false` to match Azure [GH-1322] From 293a04ce7668fb259b6cb7f50f444e97b79900b8 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 1 Jun 2018 19:52:14 +0200 Subject: [PATCH 210/320] SDK: moving off deprecated SDK's (#1332) * Moving to the undeprecated Container Instance SDK * Moving to the non-preview version of the Container Instance API * Moving to the GA version of the EventGrid API * Moving to an stable version of the Monitor API's * Moving to the undeprecated Preview API for Operational Insights * Moving to an undeprecated version of the Operations Management SDK * Moving to a non-deprecated version of the SQL SDK --- azurerm/config.go | 12 +- azurerm/resource_arm_container_group.go | 2 +- azurerm/resource_arm_eventgrid_topic.go | 2 +- .../resource_arm_log_analytics_solution.go | 2 +- .../resource_arm_log_analytics_workspace.go | 2 +- azurerm/resource_arm_metric_alertrule.go | 3 +- azurerm/resource_arm_sql_administrator.go | 2 +- azurerm/resource_arm_sql_database.go | 2 +- azurerm/resource_arm_sql_elasticpool.go | 2 +- azurerm/resource_arm_sql_firewall_rule.go | 2 +- azurerm/resource_arm_sql_server.go | 2 +- .../resource_arm_sql_virtual_network_rule.go | 2 +- .../containerinstance/client.go | 5 +- .../containerinstance/containergroups.go | 69 +- .../containerinstance/containergroupusage.go | 13 +- .../containerinstance/containerlogs.go | 19 +- .../containerinstance/models.go | 69 +- .../containerinstance/operations.go | 9 +- .../containerinstance/startcontainer.go | 17 +- .../containerinstance/version.go | 5 +- .../eventgrid/client.go | 5 +- .../eventgrid/eventsubscriptions.go | 205 ++- .../eventgrid/models.go | 127 +- .../eventgrid/operations.go | 9 +- .../eventgrid/topics.go | 109 +- .../eventgrid/topictypes.go | 29 +- .../eventgrid/version.go | 5 +- .../insights/actiongroups.go | 77 +- .../insights/activitylogalerts.go | 54 +- .../mgmt/2018-03-01/insights/activitylogs.go | 160 +++ .../insights/alertruleincidents.go | 22 +- .../insights/alertrules.go | 46 +- .../insights/autoscalesettings.go | 48 +- .../insights/client.go | 6 +- .../insights/diagnosticsettings.go | 46 +- .../insights/diagnosticsettingscategory.go | 26 +- .../2018-03-01/insights/eventcategories.go | 106 ++ .../insights/logprofiles.go | 46 +- .../2018-03-01/insights/metricbaseline.go | 217 ++++ .../2018-03-01/insights/metricdefinitions.go | 111 ++ .../mgmt/2018-03-01/insights/metrics.go | 149 +++ .../insights/models.go | 1146 +++++++++++++---- .../insights/operations.go | 14 +- .../2018-03-01/insights/tenantactivitylogs.go | 160 +++ .../mgmt/2018-03-01/insights}/version.go | 8 +- .../operationalinsights/client.go | 3 - .../operationalinsights/datasources.go | 52 +- .../operationalinsights/linkedservices.go | 50 +- .../operationalinsights/models.go | 63 - .../operationalinsights/operations.go | 8 - .../operationalinsights/version.go | 3 +- .../operationalinsights/workspaces.go | 119 +- .../operationsmanagement/client.go | 3 - .../managementassociations.go | 39 +- .../managementconfigurations.go | 39 +- .../operationsmanagement/models.go | 16 - .../operationsmanagement/operations.go | 7 - .../operationsmanagement/solutions.go | 46 +- .../operationsmanagement/version.go | 3 +- .../sql/backuplongtermretentionpolicies.go | 43 +- .../sql/backuplongtermretentionvaults.go | 38 +- .../2015-05-01-preview/sql/capabilities.go | 11 +- .../sql/mgmt/2015-05-01-preview/sql/client.go | 3 - .../sql/databaseblobauditingpolicies.go | 31 +- .../mgmt/2015-05-01-preview/sql/databases.go | 225 ++-- .../sql/databasethreatdetectionpolicies.go | 31 +- .../2015-05-01-preview/sql/databaseusages.go | 16 +- .../sql/datamaskingpolicies.go | 30 +- .../sql/datamaskingrules.go | 32 +- .../sql/elasticpoolactivities.go | 16 +- .../sql/elasticpooldatabaseactivities.go | 16 +- .../2015-05-01-preview/sql/elasticpools.go | 96 +- .../sql/encryptionprotectors.go | 39 +- .../2015-05-01-preview/sql/failovergroups.go | 96 +- .../2015-05-01-preview/sql/firewallrules.go | 54 +- .../sql/geobackuppolicies.go | 43 +- .../sql/managedinstances.go | 517 ++++++++ .../sql/mgmt/2015-05-01-preview/sql/models.go | 1052 +++++++-------- .../mgmt/2015-05-01-preview/sql/operations.go | 8 - .../sql/recoverabledatabases.go | 27 +- .../sql/replicationlinks.go | 75 +- .../sql/restorabledroppeddatabases.go | 27 +- .../2015-05-01-preview/sql/restorepoints.go | 16 +- .../sql/serverazureadadministrators.go | 49 +- .../sql/servercommunicationlinks.go | 55 +- .../sql/serverconnectionpolicies.go | 27 +- .../mgmt/2015-05-01-preview/sql/serverkeys.go | 60 +- .../mgmt/2015-05-01-preview/sql/servers.go | 75 +- .../2015-05-01-preview/sql/serverusages.go | 14 +- .../sql/serviceobjectives.go | 27 +- .../sql/servicetieradvisors.go | 30 +- .../sql/subscriptionusages.go | 22 +- .../mgmt/2015-05-01-preview/sql/syncagents.go | 83 +- .../mgmt/2015-05-01-preview/sql/syncgroups.go | 164 +-- .../2015-05-01-preview/sql/syncmembers.go | 119 +- .../transparentdataencryptionactivities.go | 16 +- .../sql/transparentdataencryptions.go | 31 +- .../mgmt/2015-05-01-preview/sql}/version.go | 7 +- .../sql/virtualnetworkrules.go | 55 +- vendor/vendor.json | 44 +- 100 files changed, 4014 insertions(+), 3029 deletions(-) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/{2018-02-01-preview => 2018-04-01}/containerinstance/client.go (76%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/{2018-02-01-preview => 2018-04-01}/containerinstance/containergroups.go (80%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/{2018-02-01-preview => 2018-04-01}/containerinstance/containergroupusage.go (77%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/{2018-02-01-preview => 2018-04-01}/containerinstance/containerlogs.go (75%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/{2018-02-01-preview => 2018-04-01}/containerinstance/models.go (73%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/{2018-02-01-preview => 2018-04-01}/containerinstance/operations.go (76%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/{2018-02-01-preview => 2018-04-01}/containerinstance/startcontainer.go (77%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/{2018-02-01-preview => 2018-04-01}/containerinstance/version.go (77%) rename vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/{2017-09-15-preview => 2018-01-01}/eventgrid/client.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/{2017-09-15-preview => 2018-01-01}/eventgrid/eventsubscriptions.go (77%) rename vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/{2017-09-15-preview => 2018-01-01}/eventgrid/models.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/{2017-09-15-preview => 2018-01-01}/eventgrid/operations.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/{2017-09-15-preview => 2018-01-01}/eventgrid/topics.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/{2017-09-15-preview => 2018-01-01}/eventgrid/topictypes.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/{2017-09-15-preview => 2018-01-01}/eventgrid/version.go (75%) rename vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/{2017-05-01-preview => 2018-03-01}/insights/actiongroups.go (90%) rename vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/{2017-05-01-preview => 2018-03-01}/insights/activitylogalerts.go (91%) create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/activitylogs.go rename vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/{2017-05-01-preview => 2018-03-01}/insights/alertruleincidents.go (91%) rename vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/{2017-05-01-preview => 2018-03-01}/insights/alertrules.go (91%) rename vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/{2017-05-01-preview => 2018-03-01}/insights/autoscalesettings.go (92%) rename vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/{2017-05-01-preview => 2018-03-01}/insights/client.go (89%) rename vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/{2017-05-01-preview => 2018-03-01}/insights/diagnosticsettings.go (89%) rename vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/{2017-05-01-preview => 2018-03-01}/insights/diagnosticsettingscategory.go (89%) create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/eventcategories.go rename vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/{2017-05-01-preview => 2018-03-01}/insights/logprofiles.go (90%) create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/metricbaseline.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/metricdefinitions.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/metrics.go rename vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/{2017-05-01-preview => 2018-03-01}/insights/models.go (71%) rename vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/{2017-05-01-preview => 2018-03-01}/insights/operations.go (89%) create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/tenantactivitylogs.go rename vendor/github.com/Azure/azure-sdk-for-go/services/{sql/mgmt/2015-05-01-preview/sql => monitor/mgmt/2018-03-01/insights}/version.go (84%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/client.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/datasources.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/linkedservices.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go (74%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/operations.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/version.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go (80%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/client.go (81%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementassociations.go (81%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementconfigurations.go (80%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/models.go (76%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/operations.go (77%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/solutions.go (80%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/version.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go (81%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go (81%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/capabilities.go (81%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/client.go (82%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/databases.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/databasethreatdetectionpolicies.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/databaseusages.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/datamaskingpolicies.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/datamaskingrules.go (81%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/elasticpoolactivities.go (80%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/elasticpooldatabaseactivities.go (81%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/elasticpools.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go (81%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/failovergroups.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/firewallrules.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/geobackuppolicies.go (79%) create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/managedinstances.go rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/models.go (82%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/operations.go (83%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/recoverabledatabases.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/restorabledroppeddatabases.go (80%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/restorepoints.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go (81%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/serverconnectionpolicies.go (80%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/serverkeys.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/servers.go (80%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/serverusages.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/serviceobjectives.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/servicetieradvisors.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/subscriptionusages.go (82%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/syncagents.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/syncgroups.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/syncmembers.go (78%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptionactivities.go (81%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptions.go (79%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{monitor/mgmt/2017-05-01-preview/insights => preview/sql/mgmt/2015-05-01-preview/sql}/version.go (74%) rename vendor/github.com/Azure/azure-sdk-for-go/services/{ => preview}/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go (80%) diff --git a/azurerm/config.go b/azurerm/config.go index 0c61e8f876cf..fd23c447d24f 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -14,25 +14,26 @@ import ( "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation" "github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-12-01/compute" - "github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance" + "github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance" "github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry" "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice" "github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb" "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account" "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns" - "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid" + "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid" "github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub" "github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac" "github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices" keyVault "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault" - "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights" + "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights" "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" - "github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights" - "github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement" "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql" "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization" + "github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights" + "github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement" + "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql" "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices" "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis" "github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay" @@ -43,7 +44,6 @@ import ( "github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler" "github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search" "github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus" - "github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage" "github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-05-01/trafficmanager" "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web" diff --git a/azurerm/resource_arm_container_group.go b/azurerm/resource_arm_container_group.go index 2199f3be5104..5e11908d934d 100644 --- a/azurerm/resource_arm_container_group.go +++ b/azurerm/resource_arm_container_group.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance" + "github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" diff --git a/azurerm/resource_arm_eventgrid_topic.go b/azurerm/resource_arm_eventgrid_topic.go index 6af3e90cb908..d037094cc0a5 100644 --- a/azurerm/resource_arm_eventgrid_topic.go +++ b/azurerm/resource_arm_eventgrid_topic.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid" + "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" diff --git a/azurerm/resource_arm_log_analytics_solution.go b/azurerm/resource_arm_log_analytics_solution.go index 9e5fd9f8fe74..077967c036a6 100644 --- a/azurerm/resource_arm_log_analytics_solution.go +++ b/azurerm/resource_arm_log_analytics_solution.go @@ -5,7 +5,7 @@ import ( "log" "strings" - "github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement" + "github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" diff --git a/azurerm/resource_arm_log_analytics_workspace.go b/azurerm/resource_arm_log_analytics_workspace.go index 236922f636e4..cc7a295fdd8e 100644 --- a/azurerm/resource_arm_log_analytics_workspace.go +++ b/azurerm/resource_arm_log_analytics_workspace.go @@ -5,7 +5,7 @@ import ( "log" "regexp" - "github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights" + "github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" diff --git a/azurerm/resource_arm_metric_alertrule.go b/azurerm/resource_arm_metric_alertrule.go index a8d0150fa6c8..8032073e4adb 100644 --- a/azurerm/resource_arm_metric_alertrule.go +++ b/azurerm/resource_arm_metric_alertrule.go @@ -3,10 +3,9 @@ package azurerm import ( "fmt" "log" - "strings" - "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights" + "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" diff --git a/azurerm/resource_arm_sql_administrator.go b/azurerm/resource_arm_sql_administrator.go index 9e065ab3c7d3..d7b9e0fa93a2 100644 --- a/azurerm/resource_arm_sql_administrator.go +++ b/azurerm/resource_arm_sql_administrator.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql" + "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql" "github.com/hashicorp/terraform/helper/schema" uuid "github.com/satori/go.uuid" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" diff --git a/azurerm/resource_arm_sql_database.go b/azurerm/resource_arm_sql_database.go index 847e6e35165e..30f2b03a184f 100644 --- a/azurerm/resource_arm_sql_database.go +++ b/azurerm/resource_arm_sql_database.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql" + "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql" "github.com/Azure/go-autorest/autorest/date" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" diff --git a/azurerm/resource_arm_sql_elasticpool.go b/azurerm/resource_arm_sql_elasticpool.go index 7e4aafdac3e9..bf1e1add7141 100644 --- a/azurerm/resource_arm_sql_elasticpool.go +++ b/azurerm/resource_arm_sql_elasticpool.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql" + "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" diff --git a/azurerm/resource_arm_sql_firewall_rule.go b/azurerm/resource_arm_sql_firewall_rule.go index dc09817706df..24f501f1e350 100644 --- a/azurerm/resource_arm_sql_firewall_rule.go +++ b/azurerm/resource_arm_sql_firewall_rule.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql" + "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) diff --git a/azurerm/resource_arm_sql_server.go b/azurerm/resource_arm_sql_server.go index c7eafb23ac50..50805b167db2 100644 --- a/azurerm/resource_arm_sql_server.go +++ b/azurerm/resource_arm_sql_server.go @@ -5,7 +5,7 @@ import ( "log" "regexp" - "github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql" + "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" diff --git a/azurerm/resource_arm_sql_virtual_network_rule.go b/azurerm/resource_arm_sql_virtual_network_rule.go index 19fbef32df86..6b8be15a7844 100644 --- a/azurerm/resource_arm_sql_virtual_network_rule.go +++ b/azurerm/resource_arm_sql_virtual_network_rule.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql" + "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/client.go similarity index 76% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/client.go index b76c496f31ac..b494c2a07bfa 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/client.go @@ -1,4 +1,4 @@ -// Package containerinstance implements the Azure ARM Containerinstance service API version 2018-02-01-preview. +// Package containerinstance implements the Azure ARM Containerinstance service API version 2018-04-01. // // package containerinstance @@ -29,7 +29,6 @@ const ( DefaultBaseURI = "https://management.azure.com" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // BaseClient is the base client for Containerinstance. type BaseClient struct { autorest.Client @@ -37,13 +36,11 @@ type BaseClient struct { SubscriptionID string } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // New creates an instance of the BaseClient client. func New(subscriptionID string) BaseClient { return NewWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewWithBaseURI creates an instance of the BaseClient client. func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { return BaseClient{ diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containergroups.go similarity index 80% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroups.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containergroups.go index 485f65477681..d8e167188ae3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containergroups.go @@ -25,29 +25,26 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupsClient is the client for the ContainerGroups methods of the Containerinstance service. type ContainerGroupsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewContainerGroupsClient creates an instance of the ContainerGroupsClient client. func NewContainerGroupsClient(subscriptionID string) ContainerGroupsClient { return NewContainerGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewContainerGroupsClientWithBaseURI creates an instance of the ContainerGroupsClient client. func NewContainerGroupsClientWithBaseURI(baseURI string, subscriptionID string) ContainerGroupsClient { return ContainerGroupsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // CreateOrUpdate create or update container groups with specified configurations. -// -// resourceGroupName is the name of the resource group. containerGroupName is the name of the container group. -// containerGroup is the properties of the container group to be created or updated. +// Parameters: +// resourceGroupName - the name of the resource group. +// containerGroupName - the name of the container group. +// containerGroup - the properties of the container group to be created or updated. func (client ContainerGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, containerGroupName string, containerGroup ContainerGroup) (result ContainerGroupsCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: containerGroup, @@ -76,7 +73,6 @@ func (client ContainerGroupsClient) CreateOrUpdate(ctx context.Context, resource return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ContainerGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, containerGroupName string, containerGroup ContainerGroup) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -85,7 +81,7 @@ func (client ContainerGroupsClient) CreateOrUpdatePreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01-preview" + const APIVersion = "2018-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -100,7 +96,6 @@ func (client ContainerGroupsClient) CreateOrUpdatePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) CreateOrUpdateSender(req *http.Request) (future ContainerGroupsCreateOrUpdateFuture, err error) { @@ -116,7 +111,6 @@ func (client ContainerGroupsClient) CreateOrUpdateSender(req *http.Request) (fut return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ContainerGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result ContainerGroup, err error) { @@ -130,11 +124,11 @@ func (client ContainerGroupsClient) CreateOrUpdateResponder(resp *http.Response) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Delete delete the specified container group in the specified subscription and resource group. The operation does not // delete other resources provided by the user, such as volumes. -// -// resourceGroupName is the name of the resource group. containerGroupName is the name of the container group. +// Parameters: +// resourceGroupName - the name of the resource group. +// containerGroupName - the name of the container group. func (client ContainerGroupsClient) Delete(ctx context.Context, resourceGroupName string, containerGroupName string) (result ContainerGroup, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, containerGroupName) if err != nil { @@ -157,7 +151,6 @@ func (client ContainerGroupsClient) Delete(ctx context.Context, resourceGroupNam return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // DeletePreparer prepares the Delete request. func (client ContainerGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, containerGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -166,7 +159,7 @@ func (client ContainerGroupsClient) DeletePreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01-preview" + const APIVersion = "2018-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -179,7 +172,6 @@ func (client ContainerGroupsClient) DeletePreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -187,7 +179,6 @@ func (client ContainerGroupsClient) DeleteSender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ContainerGroupsClient) DeleteResponder(resp *http.Response) (result ContainerGroup, err error) { @@ -201,12 +192,12 @@ func (client ContainerGroupsClient) DeleteResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Get gets the properties of the specified container group in the specified subscription and resource group. The // operation returns the properties of each container group including containers, image registry credentials, restart // policy, IP address type, OS type, state, and volumes. -// -// resourceGroupName is the name of the resource group. containerGroupName is the name of the container group. +// Parameters: +// resourceGroupName - the name of the resource group. +// containerGroupName - the name of the container group. func (client ContainerGroupsClient) Get(ctx context.Context, resourceGroupName string, containerGroupName string) (result ContainerGroup, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, containerGroupName) if err != nil { @@ -229,7 +220,6 @@ func (client ContainerGroupsClient) Get(ctx context.Context, resourceGroupName s return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // GetPreparer prepares the Get request. func (client ContainerGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, containerGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -238,7 +228,7 @@ func (client ContainerGroupsClient) GetPreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01-preview" + const APIVersion = "2018-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -251,7 +241,6 @@ func (client ContainerGroupsClient) GetPreparer(ctx context.Context, resourceGro return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -259,7 +248,6 @@ func (client ContainerGroupsClient) GetSender(req *http.Request) (*http.Response azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ContainerGroupsClient) GetResponder(resp *http.Response) (result ContainerGroup, err error) { @@ -273,7 +261,6 @@ func (client ContainerGroupsClient) GetResponder(resp *http.Response) (result Co return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // List get a list of container groups in the specified subscription. This operation returns properties of each // container group including containers, image registry credentials, restart policy, IP address type, OS type, state, // and volumes. @@ -300,14 +287,13 @@ func (client ContainerGroupsClient) List(ctx context.Context) (result ContainerG return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListPreparer prepares the List request. func (client ContainerGroupsClient) ListPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01-preview" + const APIVersion = "2018-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -320,7 +306,6 @@ func (client ContainerGroupsClient) ListPreparer(ctx context.Context) (*http.Req return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -328,7 +313,6 @@ func (client ContainerGroupsClient) ListSender(req *http.Request) (*http.Respons azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client ContainerGroupsClient) ListResponder(resp *http.Response) (result ContainerGroupListResult, err error) { @@ -363,19 +347,17 @@ func (client ContainerGroupsClient) listNextResults(lastResults ContainerGroupLi return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListComplete enumerates all values, automatically crossing page boundaries as required. func (client ContainerGroupsClient) ListComplete(ctx context.Context) (result ContainerGroupListResultIterator, err error) { result.page, err = client.List(ctx) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListByResourceGroup get a list of container groups in a specified subscription and resource group. This operation // returns properties of each container group including containers, image registry credentials, restart policy, IP // address type, OS type, state, and volumes. -// -// resourceGroupName is the name of the resource group. +// Parameters: +// resourceGroupName - the name of the resource group. func (client ContainerGroupsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ContainerGroupListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) @@ -399,7 +381,6 @@ func (client ContainerGroupsClient) ListByResourceGroup(ctx context.Context, res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client ContainerGroupsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -407,7 +388,7 @@ func (client ContainerGroupsClient) ListByResourceGroupPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01-preview" + const APIVersion = "2018-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -420,7 +401,6 @@ func (client ContainerGroupsClient) ListByResourceGroupPreparer(ctx context.Cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -428,7 +408,6 @@ func (client ContainerGroupsClient) ListByResourceGroupSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client ContainerGroupsClient) ListByResourceGroupResponder(resp *http.Response) (result ContainerGroupListResult, err error) { @@ -463,18 +442,17 @@ func (client ContainerGroupsClient) listByResourceGroupNextResults(lastResults C return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. func (client ContainerGroupsClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result ContainerGroupListResultIterator, err error) { result.page, err = client.ListByResourceGroup(ctx, resourceGroupName) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Update updates container group tags with specified values. -// -// resourceGroupName is the name of the resource group. containerGroupName is the name of the container group. -// resource is the container group resource with just the tags to be updated. +// Parameters: +// resourceGroupName - the name of the resource group. +// containerGroupName - the name of the container group. +// resource - the container group resource with just the tags to be updated. func (client ContainerGroupsClient) Update(ctx context.Context, resourceGroupName string, containerGroupName string, resource Resource) (result ContainerGroup, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, containerGroupName, resource) if err != nil { @@ -497,7 +475,6 @@ func (client ContainerGroupsClient) Update(ctx context.Context, resourceGroupNam return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UpdatePreparer prepares the Update request. func (client ContainerGroupsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, containerGroupName string, resource Resource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -506,7 +483,7 @@ func (client ContainerGroupsClient) UpdatePreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01-preview" + const APIVersion = "2018-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -521,7 +498,6 @@ func (client ContainerGroupsClient) UpdatePreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -529,7 +505,6 @@ func (client ContainerGroupsClient) UpdateSender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client ContainerGroupsClient) UpdateResponder(resp *http.Response) (result ContainerGroup, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroupusage.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containergroupusage.go similarity index 77% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroupusage.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containergroupusage.go index a75432e4e1d2..4e9f5b52c18d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containergroupusage.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containergroupusage.go @@ -24,28 +24,24 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupUsageClient is the client for the ContainerGroupUsage methods of the Containerinstance service. type ContainerGroupUsageClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewContainerGroupUsageClient creates an instance of the ContainerGroupUsageClient client. func NewContainerGroupUsageClient(subscriptionID string) ContainerGroupUsageClient { return NewContainerGroupUsageClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewContainerGroupUsageClientWithBaseURI creates an instance of the ContainerGroupUsageClient client. func NewContainerGroupUsageClientWithBaseURI(baseURI string, subscriptionID string) ContainerGroupUsageClient { return ContainerGroupUsageClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // List get the usage for a subscription -// -// location is the identifier for the physical azure location. +// Parameters: +// location - the identifier for the physical azure location. func (client ContainerGroupUsageClient) List(ctx context.Context, location string) (result UsageListResult, err error) { req, err := client.ListPreparer(ctx, location) if err != nil { @@ -68,7 +64,6 @@ func (client ContainerGroupUsageClient) List(ctx context.Context, location strin return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListPreparer prepares the List request. func (client ContainerGroupUsageClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -76,7 +71,7 @@ func (client ContainerGroupUsageClient) ListPreparer(ctx context.Context, locati "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01-preview" + const APIVersion = "2018-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -89,7 +84,6 @@ func (client ContainerGroupUsageClient) ListPreparer(ctx context.Context, locati return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupUsageClient) ListSender(req *http.Request) (*http.Response, error) { @@ -97,7 +91,6 @@ func (client ContainerGroupUsageClient) ListSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client ContainerGroupUsageClient) ListResponder(resp *http.Response) (result UsageListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containerlogs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containerlogs.go similarity index 75% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containerlogs.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containerlogs.go index 794f39a193cc..0b975f92862b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/containerlogs.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containerlogs.go @@ -24,30 +24,28 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerLogsClient is the client for the ContainerLogs methods of the Containerinstance service. type ContainerLogsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewContainerLogsClient creates an instance of the ContainerLogsClient client. func NewContainerLogsClient(subscriptionID string) ContainerLogsClient { return NewContainerLogsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewContainerLogsClientWithBaseURI creates an instance of the ContainerLogsClient client. func NewContainerLogsClientWithBaseURI(baseURI string, subscriptionID string) ContainerLogsClient { return ContainerLogsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // List get the logs for a specified container instance in a specified resource group and container group. -// -// resourceGroupName is the name of the resource group. containerGroupName is the name of the container group. -// containerName is the name of the container instance. tail is the number of lines to show from the tail of the -// container instance log. If not provided, all available logs are shown up to 4mb. +// Parameters: +// resourceGroupName - the name of the resource group. +// containerGroupName - the name of the container group. +// containerName - the name of the container instance. +// tail - the number of lines to show from the tail of the container instance log. If not provided, all +// available logs are shown up to 4mb. func (client ContainerLogsClient) List(ctx context.Context, resourceGroupName string, containerGroupName string, containerName string, tail *int32) (result Logs, err error) { req, err := client.ListPreparer(ctx, resourceGroupName, containerGroupName, containerName, tail) if err != nil { @@ -70,7 +68,6 @@ func (client ContainerLogsClient) List(ctx context.Context, resourceGroupName st return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListPreparer prepares the List request. func (client ContainerLogsClient) ListPreparer(ctx context.Context, resourceGroupName string, containerGroupName string, containerName string, tail *int32) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -80,7 +77,7 @@ func (client ContainerLogsClient) ListPreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01-preview" + const APIVersion = "2018-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -96,7 +93,6 @@ func (client ContainerLogsClient) ListPreparer(ctx context.Context, resourceGrou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client ContainerLogsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -104,7 +100,6 @@ func (client ContainerLogsClient) ListSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client ContainerLogsClient) ListResponder(resp *http.Response) (result Logs, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/models.go similarity index 73% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/models.go index c6f73c8c6df3..8a95c8ffd29b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/models.go @@ -26,7 +26,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupNetworkProtocol enumerates the values for container group network protocol. type ContainerGroupNetworkProtocol string @@ -37,13 +36,11 @@ const ( UDP ContainerGroupNetworkProtocol = "UDP" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // PossibleContainerGroupNetworkProtocolValues returns an array of possible values for the ContainerGroupNetworkProtocol const type. func PossibleContainerGroupNetworkProtocolValues() []ContainerGroupNetworkProtocol { return []ContainerGroupNetworkProtocol{TCP, UDP} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupRestartPolicy enumerates the values for container group restart policy. type ContainerGroupRestartPolicy string @@ -56,13 +53,11 @@ const ( OnFailure ContainerGroupRestartPolicy = "OnFailure" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // PossibleContainerGroupRestartPolicyValues returns an array of possible values for the ContainerGroupRestartPolicy const type. func PossibleContainerGroupRestartPolicyValues() []ContainerGroupRestartPolicy { return []ContainerGroupRestartPolicy{Always, Never, OnFailure} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerNetworkProtocol enumerates the values for container network protocol. type ContainerNetworkProtocol string @@ -73,13 +68,11 @@ const ( ContainerNetworkProtocolUDP ContainerNetworkProtocol = "UDP" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // PossibleContainerNetworkProtocolValues returns an array of possible values for the ContainerNetworkProtocol const type. func PossibleContainerNetworkProtocolValues() []ContainerNetworkProtocol { return []ContainerNetworkProtocol{ContainerNetworkProtocolTCP, ContainerNetworkProtocolUDP} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // OperatingSystemTypes enumerates the values for operating system types. type OperatingSystemTypes string @@ -90,13 +83,11 @@ const ( Windows OperatingSystemTypes = "Windows" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // PossibleOperatingSystemTypesValues returns an array of possible values for the OperatingSystemTypes const type. func PossibleOperatingSystemTypesValues() []OperatingSystemTypes { return []OperatingSystemTypes{Linux, Windows} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // OperationsOrigin enumerates the values for operations origin. type OperationsOrigin string @@ -107,13 +98,11 @@ const ( User OperationsOrigin = "User" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // PossibleOperationsOriginValues returns an array of possible values for the OperationsOrigin const type. func PossibleOperationsOriginValues() []OperationsOrigin { return []OperationsOrigin{System, User} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // AzureFileVolume the properties of the Azure File volume. Azure File shares are mounted as volumes. type AzureFileVolume struct { // ShareName - The name of the Azure File share to be mounted as a volume. @@ -126,7 +115,6 @@ type AzureFileVolume struct { StorageAccountKey *string `json:"storageAccountKey,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Container a container instance. type Container struct { // Name - The user-provided name of the container instance. @@ -135,7 +123,6 @@ type Container struct { *ContainerProperties `json:"properties,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // MarshalJSON is the custom marshaler for Container. func (c Container) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -148,7 +135,6 @@ func (c Container) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UnmarshalJSON is the custom unmarshaler for Container struct. func (c *Container) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -182,7 +168,6 @@ func (c *Container) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerExecRequest the start container exec request. type ContainerExecRequest struct { // Command - The command to be executed. @@ -191,16 +176,14 @@ type ContainerExecRequest struct { TerminalSize *ContainerExecRequestTerminalSize `json:"terminalSize,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerExecRequestTerminalSize the size of the terminal. type ContainerExecRequestTerminalSize struct { - // Rows - The row size of the terminal - Rows *int32 `json:"rows,omitempty"` - // Cols - The column size of the terminal - Cols *int32 `json:"cols,omitempty"` + // Row - The row size of the terminal + Row *int32 `json:"row,omitempty"` + // Column - The column size of the terminal + Column *int32 `json:"column,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerExecResponse the information for the container exec command. type ContainerExecResponse struct { autorest.Response `json:"-"` @@ -210,7 +193,6 @@ type ContainerExecResponse struct { Password *string `json:"password,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroup a container group. type ContainerGroup struct { autorest.Response `json:"-"` @@ -227,7 +209,6 @@ type ContainerGroup struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // MarshalJSON is the custom marshaler for ContainerGroup. func (cg ContainerGroup) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -252,7 +233,6 @@ func (cg ContainerGroup) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UnmarshalJSON is the custom unmarshaler for ContainerGroup struct. func (cg *ContainerGroup) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -322,7 +302,6 @@ func (cg *ContainerGroup) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupListResult the container group list response that contains the container group properties. type ContainerGroupListResult struct { autorest.Response `json:"-"` @@ -332,14 +311,12 @@ type ContainerGroupListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupListResultIterator provides access to a complete listing of ContainerGroup values. type ContainerGroupListResultIterator struct { i int page ContainerGroupListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *ContainerGroupListResultIterator) Next() error { @@ -356,19 +333,16 @@ func (iter *ContainerGroupListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter ContainerGroupListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Response returns the raw server response from the last page request. func (iter ContainerGroupListResultIterator) Response() ContainerGroupListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter ContainerGroupListResultIterator) Value() ContainerGroup { @@ -378,7 +352,6 @@ func (iter ContainerGroupListResultIterator) Value() ContainerGroup { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // IsEmpty returns true if the ListResult contains no values. func (cglr ContainerGroupListResult) IsEmpty() bool { return cglr.Value == nil || len(*cglr.Value) == 0 @@ -396,14 +369,12 @@ func (cglr ContainerGroupListResult) containerGroupListResultPreparer() (*http.R autorest.WithBaseURL(to.String(cglr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupListResultPage contains a page of ContainerGroup values. type ContainerGroupListResultPage struct { fn func(ContainerGroupListResult) (ContainerGroupListResult, error) cglr ContainerGroupListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *ContainerGroupListResultPage) Next() error { @@ -415,19 +386,16 @@ func (page *ContainerGroupListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page ContainerGroupListResultPage) NotDone() bool { return !page.cglr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Response returns the raw server response from the last page request. func (page ContainerGroupListResultPage) Response() ContainerGroupListResult { return page.cglr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Values returns the slice of values for the current page or nil if there are no values. func (page ContainerGroupListResultPage) Values() []ContainerGroup { if page.cglr.IsEmpty() { @@ -436,7 +404,6 @@ func (page ContainerGroupListResultPage) Values() []ContainerGroup { return *page.cglr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupProperties ... type ContainerGroupProperties struct { // ProvisioningState - The provisioning state of the container group. This only appears in the response. @@ -461,7 +428,6 @@ type ContainerGroupProperties struct { InstanceView *ContainerGroupPropertiesInstanceView `json:"instanceView,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupPropertiesInstanceView the instance view of the container group. Only valid in response. type ContainerGroupPropertiesInstanceView struct { // Events - The events of this container group. @@ -470,7 +436,6 @@ type ContainerGroupPropertiesInstanceView struct { State *string `json:"state,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ContainerGroupsCreateOrUpdateFuture struct { @@ -478,7 +443,6 @@ type ContainerGroupsCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ContainerGroupsCreateOrUpdateFuture) Result(client ContainerGroupsClient) (cg ContainerGroup, err error) { @@ -521,7 +485,6 @@ func (future ContainerGroupsCreateOrUpdateFuture) Result(client ContainerGroupsC return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerPort the port exposed on the container instance. type ContainerPort struct { // Protocol - The protocol associated with the port. Possible values include: 'ContainerNetworkProtocolTCP', 'ContainerNetworkProtocolUDP' @@ -530,7 +493,6 @@ type ContainerPort struct { Port *int32 `json:"port,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerProperties the container instance properties. type ContainerProperties struct { // Image - The name of the image used to create the container instance. @@ -549,7 +511,6 @@ type ContainerProperties struct { VolumeMounts *[]VolumeMount `json:"volumeMounts,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerPropertiesInstanceView the instance view of the container instance. Only valid in response. type ContainerPropertiesInstanceView struct { // RestartCount - The number of times that the container instance has been restarted. @@ -562,7 +523,6 @@ type ContainerPropertiesInstanceView struct { Events *[]Event `json:"events,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ContainerState the container instance state. type ContainerState struct { // State - The state of the container instance. @@ -577,7 +537,6 @@ type ContainerState struct { DetailStatus *string `json:"detailStatus,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // EnvironmentVariable the environment variable to set within the container instance. type EnvironmentVariable struct { // Name - The name of the environment variable. @@ -586,7 +545,6 @@ type EnvironmentVariable struct { Value *string `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Event a container group or container instance event. type Event struct { // Count - The count of the event. @@ -603,7 +561,6 @@ type Event struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // GitRepoVolume represents a volume that is populated with the contents of a git repository type GitRepoVolume struct { // Directory - Target directory name. Must not contain or start with '..'. If '.' is supplied, the volume directory will be the git repository. Otherwise, if specified, the volume will contain the git repository in the subdirectory with the given name. @@ -614,7 +571,6 @@ type GitRepoVolume struct { Revision *string `json:"revision,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ImageRegistryCredential image registry credential. type ImageRegistryCredential struct { // Server - The Docker image registry server without a protocol such as "http" and "https". @@ -625,7 +581,6 @@ type ImageRegistryCredential struct { Password *string `json:"password,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // IPAddress IP address for the container group. type IPAddress struct { // Ports - The list of ports exposed on the container group. @@ -640,7 +595,6 @@ type IPAddress struct { Fqdn *string `json:"fqdn,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Logs the logs. type Logs struct { autorest.Response `json:"-"` @@ -648,7 +602,6 @@ type Logs struct { Content *string `json:"content,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Operation an operation for Azure Container Instance service. type Operation struct { // Name - The name of the operation. @@ -659,7 +612,6 @@ type Operation struct { Origin OperationsOrigin `json:"origin,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // OperationDisplay the display information of the operation. type OperationDisplay struct { // Provider - The name of the provider of the operation. @@ -672,7 +624,6 @@ type OperationDisplay struct { Description *string `json:"description,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // OperationListResult the operation list response that contains all operations for Azure Container Instance // service. type OperationListResult struct { @@ -683,7 +634,6 @@ type OperationListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Port the port exposed on the container group. type Port struct { // Protocol - The protocol associated with the port. Possible values include: 'TCP', 'UDP' @@ -692,7 +642,6 @@ type Port struct { Port *int32 `json:"port,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Resource the Resource model definition. type Resource struct { // ID - The resource id. @@ -707,7 +656,6 @@ type Resource struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // MarshalJSON is the custom marshaler for Resource. func (r Resource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -729,7 +677,6 @@ func (r Resource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ResourceLimits the resource limits. type ResourceLimits struct { // MemoryInGB - The memory limit in GB of this container instance. @@ -738,7 +685,6 @@ type ResourceLimits struct { CPU *float64 `json:"cpu,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ResourceRequests the resource requests. type ResourceRequests struct { // MemoryInGB - The memory request in GB of this container instance. @@ -747,7 +693,6 @@ type ResourceRequests struct { CPU *float64 `json:"cpu,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ResourceRequirements the resource requirements. type ResourceRequirements struct { // Requests - The resource requests of this container instance. @@ -756,7 +701,6 @@ type ResourceRequirements struct { Limits *ResourceLimits `json:"limits,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Usage a single usage result type Usage struct { // Unit - Unit of the usage result @@ -769,14 +713,12 @@ type Usage struct { Name *UsageName `json:"name,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UsageListResult the response containing the usage data type UsageListResult struct { autorest.Response `json:"-"` Value *[]Usage `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // UsageName the name object of the resource type UsageName struct { // Value - The name of the resource @@ -785,7 +727,6 @@ type UsageName struct { LocalizedValue *string `json:"localizedValue,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Volume the properties of the volume. type Volume struct { // Name - The name of the volume. @@ -800,7 +741,6 @@ type Volume struct { GitRepo *GitRepoVolume `json:"gitRepo,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // MarshalJSON is the custom marshaler for Volume. func (vVar Volume) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -820,7 +760,6 @@ func (vVar Volume) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // VolumeMount the properties of the volume mount. type VolumeMount struct { // Name - The name of the volume mount. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/operations.go similarity index 76% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/operations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/operations.go index c95180c46294..559a24c8f992 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/operations.go @@ -24,25 +24,21 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // OperationsClient is the client for the Operations methods of the Containerinstance service. type OperationsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewOperationsClient creates an instance of the OperationsClient client. func NewOperationsClient(subscriptionID string) OperationsClient { return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // List list the operations for Azure Container Instance service. func (client OperationsClient) List(ctx context.Context) (result OperationListResult, err error) { req, err := client.ListPreparer(ctx) @@ -66,10 +62,9 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2018-02-01-preview" + const APIVersion = "2018-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -82,7 +77,6 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -90,7 +84,6 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/startcontainer.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/startcontainer.go similarity index 77% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/startcontainer.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/startcontainer.go index 751cf72f5e34..2a4a4c55017d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/startcontainer.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/startcontainer.go @@ -24,30 +24,28 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // StartContainerClient is the client for the StartContainer methods of the Containerinstance service. type StartContainerClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewStartContainerClient creates an instance of the StartContainerClient client. func NewStartContainerClient(subscriptionID string) StartContainerClient { return NewStartContainerClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // NewStartContainerClientWithBaseURI creates an instance of the StartContainerClient client. func NewStartContainerClientWithBaseURI(baseURI string, subscriptionID string) StartContainerClient { return StartContainerClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // LaunchExec starts the exec command for a specified container instance in a specified resource group and container // group. -// -// resourceGroupName is the name of the resource group. containerGroupName is the name of the container group. -// containerName is the name of the container instance. containerExecRequest is the request for the exec command. +// Parameters: +// resourceGroupName - the name of the resource group. +// containerGroupName - the name of the container group. +// containerName - the name of the container instance. +// containerExecRequest - the request for the exec command. func (client StartContainerClient) LaunchExec(ctx context.Context, resourceGroupName string, containerGroupName string, containerName string, containerExecRequest ContainerExecRequest) (result ContainerExecResponse, err error) { req, err := client.LaunchExecPreparer(ctx, resourceGroupName, containerGroupName, containerName, containerExecRequest) if err != nil { @@ -70,7 +68,6 @@ func (client StartContainerClient) LaunchExec(ctx context.Context, resourceGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // LaunchExecPreparer prepares the LaunchExec request. func (client StartContainerClient) LaunchExecPreparer(ctx context.Context, resourceGroupName string, containerGroupName string, containerName string, containerExecRequest ContainerExecRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -80,7 +77,7 @@ func (client StartContainerClient) LaunchExecPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01-preview" + const APIVersion = "2018-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -95,7 +92,6 @@ func (client StartContainerClient) LaunchExecPreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // LaunchExecSender sends the LaunchExec request. The method will close the // http.Response Body if it receives an error. func (client StartContainerClient) LaunchExecSender(req *http.Request) (*http.Response, error) { @@ -103,7 +99,6 @@ func (client StartContainerClient) LaunchExecSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // LaunchExecResponder handles the response to the LaunchExec request. The method always // closes the http.Response Body. func (client StartContainerClient) LaunchExecResponder(resp *http.Response) (result ContainerExecResponse, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/version.go similarity index 77% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/version.go index 718810b207e5..df5d7da41d05 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/version.go @@ -18,13 +18,12 @@ import "github.com/Azure/azure-sdk-for-go/version" // // Code generated by Microsoft (R) AutoRest Code Generator. // Changes may cause incorrect behavior and will be lost if the code is regenerated. -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. + // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " containerinstance/2018-02-01-preview" + return "Azure-SDK-For-Go/" + version.Number + " containerinstance/2018-04-01" } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance instead. // Version returns the semantic version (see http://semver.org) of the client. func Version() string { return version.Number diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/client.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/client.go index 7151f5f4a2ba..677813b81fba 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/client.go @@ -1,4 +1,4 @@ -// Package eventgrid implements the Azure ARM Eventgrid service API version 2017-09-15-preview. +// Package eventgrid implements the Azure ARM Eventgrid service API version 2018-01-01. // // Azure EventGrid Management Client package eventgrid @@ -29,7 +29,6 @@ const ( DefaultBaseURI = "https://management.azure.com" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // BaseClient is the base client for Eventgrid. type BaseClient struct { autorest.Client @@ -37,13 +36,11 @@ type BaseClient struct { SubscriptionID string } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // New creates an instance of the BaseClient client. func New(subscriptionID string) BaseClient { return NewWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewWithBaseURI creates an instance of the BaseClient client. func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { return BaseClient{ diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/eventsubscriptions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/eventsubscriptions.go similarity index 77% rename from vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/eventsubscriptions.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/eventsubscriptions.go index 51ea2ae7ec67..a5487f7d7275 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/eventsubscriptions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/eventsubscriptions.go @@ -24,63 +24,59 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionsClient is the azure EventGrid Management Client type EventSubscriptionsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewEventSubscriptionsClient creates an instance of the EventSubscriptionsClient client. func NewEventSubscriptionsClient(subscriptionID string) EventSubscriptionsClient { return NewEventSubscriptionsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewEventSubscriptionsClientWithBaseURI creates an instance of the EventSubscriptionsClient client. func NewEventSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) EventSubscriptionsClient { return EventSubscriptionsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. -// Create asynchronously creates a new event subscription to the specified scope. Existing event subscriptions cannot -// be updated with this API and should instead use the Update event subscription API. -// -// scope is the scope of the resource to which the event subscription needs to be created. The scope can be a -// subscription, or a resource group, or a top level resource belonging to a resource provider namespace, or an -// EventGrid topic. For example, use '/subscriptions/{subscriptionId}/' for a subscription, +// CreateOrUpdate asynchronously creates a new event subscription or updates an existing event subscription based on +// the specified scope. +// Parameters: +// scope - the identifier of the resource to which the event subscription needs to be created or updated. The +// scope can be a subscription, or a resource group, or a top level resource belonging to a resource provider +// namespace, or an EventGrid topic. For example, use '/subscriptions/{subscriptionId}/' for a subscription, // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for a resource group, and // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}' // for a resource, and // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/topics/{topicName}' -// for an EventGrid topic. eventSubscriptionName is name of the event subscription to be created. Event -// subscription names must be between 3 and 64 characters in length and use alphanumeric letters only. -// eventSubscriptionInfo is event subscription properties containing the destination and filter information -func (client EventSubscriptionsClient) Create(ctx context.Context, scope string, eventSubscriptionName string, eventSubscriptionInfo EventSubscription) (result EventSubscriptionsCreateFuture, err error) { - req, err := client.CreatePreparer(ctx, scope, eventSubscriptionName, eventSubscriptionInfo) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsClient", "Create", nil, "Failure preparing request") +// for an EventGrid topic. +// eventSubscriptionName - name of the event subscription. Event subscription names must be between 3 and 64 +// characters in length and should use alphanumeric letters only. +// eventSubscriptionInfo - event subscription properties containing the destination and filter information +func (client EventSubscriptionsClient) CreateOrUpdate(ctx context.Context, scope string, eventSubscriptionName string, eventSubscriptionInfo EventSubscription) (result EventSubscriptionsCreateOrUpdateFuture, err error) { + req, err := client.CreateOrUpdatePreparer(ctx, scope, eventSubscriptionName, eventSubscriptionInfo) + if err != nil { + err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsClient", "CreateOrUpdate", nil, "Failure preparing request") return } - result, err = client.CreateSender(req) + result, err = client.CreateOrUpdateSender(req) if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsClient", "Create", result.Response(), "Failure sending request") + err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsClient", "CreateOrUpdate", result.Response(), "Failure sending request") return } return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. -// CreatePreparer prepares the Create request. -func (client EventSubscriptionsClient) CreatePreparer(ctx context.Context, scope string, eventSubscriptionName string, eventSubscriptionInfo EventSubscription) (*http.Request, error) { +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client EventSubscriptionsClient) CreateOrUpdatePreparer(ctx context.Context, scope string, eventSubscriptionName string, eventSubscriptionInfo EventSubscription) (*http.Request, error) { pathParameters := map[string]interface{}{ "eventSubscriptionName": autorest.Encode("path", eventSubscriptionName), "scope": scope, } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -95,10 +91,9 @@ func (client EventSubscriptionsClient) CreatePreparer(ctx context.Context, scope return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. -// CreateSender sends the Create request. The method will close the +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. -func (client EventSubscriptionsClient) CreateSender(req *http.Request) (future EventSubscriptionsCreateFuture, err error) { +func (client EventSubscriptionsClient) CreateOrUpdateSender(req *http.Request) (future EventSubscriptionsCreateOrUpdateFuture, err error) { sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) future.Future = azure.NewFuture(req) future.req = req @@ -111,10 +106,9 @@ func (client EventSubscriptionsClient) CreateSender(req *http.Request) (future E return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. -// CreateResponder handles the response to the Create request. The method always +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. -func (client EventSubscriptionsClient) CreateResponder(resp *http.Response) (result EventSubscription, err error) { +func (client EventSubscriptionsClient) CreateOrUpdateResponder(resp *http.Response) (result EventSubscription, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -125,17 +119,17 @@ func (client EventSubscriptionsClient) CreateResponder(resp *http.Response) (res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Delete delete an existing event subscription -// -// scope is the scope of the event subscription. The scope can be a subscription, or a resource group, or a top +// Parameters: +// scope - the scope of the event subscription. The scope can be a subscription, or a resource group, or a top // level resource belonging to a resource provider namespace, or an EventGrid topic. For example, use // '/subscriptions/{subscriptionId}/' for a subscription, // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for a resource group, and // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}' // for a resource, and // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/topics/{topicName}' -// for an EventGrid topic. eventSubscriptionName is name of the event subscription +// for an EventGrid topic. +// eventSubscriptionName - name of the event subscription func (client EventSubscriptionsClient) Delete(ctx context.Context, scope string, eventSubscriptionName string) (result EventSubscriptionsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, scope, eventSubscriptionName) if err != nil { @@ -152,7 +146,6 @@ func (client EventSubscriptionsClient) Delete(ctx context.Context, scope string, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // DeletePreparer prepares the Delete request. func (client EventSubscriptionsClient) DeletePreparer(ctx context.Context, scope string, eventSubscriptionName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -160,7 +153,7 @@ func (client EventSubscriptionsClient) DeletePreparer(ctx context.Context, scope "scope": scope, } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -173,7 +166,6 @@ func (client EventSubscriptionsClient) DeletePreparer(ctx context.Context, scope return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) DeleteSender(req *http.Request) (future EventSubscriptionsDeleteFuture, err error) { @@ -189,7 +181,6 @@ func (client EventSubscriptionsClient) DeleteSender(req *http.Request) (future E return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -202,17 +193,17 @@ func (client EventSubscriptionsClient) DeleteResponder(resp *http.Response) (res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Get get properties of an event subscription -// -// scope is the scope of the event subscription. The scope can be a subscription, or a resource group, or a top +// Parameters: +// scope - the scope of the event subscription. The scope can be a subscription, or a resource group, or a top // level resource belonging to a resource provider namespace, or an EventGrid topic. For example, use // '/subscriptions/{subscriptionId}/' for a subscription, // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for a resource group, and // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}' // for a resource, and // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/topics/{topicName}' -// for an EventGrid topic. eventSubscriptionName is name of the event subscription +// for an EventGrid topic. +// eventSubscriptionName - name of the event subscription func (client EventSubscriptionsClient) Get(ctx context.Context, scope string, eventSubscriptionName string) (result EventSubscription, err error) { req, err := client.GetPreparer(ctx, scope, eventSubscriptionName) if err != nil { @@ -235,7 +226,6 @@ func (client EventSubscriptionsClient) Get(ctx context.Context, scope string, ev return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetPreparer prepares the Get request. func (client EventSubscriptionsClient) GetPreparer(ctx context.Context, scope string, eventSubscriptionName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -243,7 +233,7 @@ func (client EventSubscriptionsClient) GetPreparer(ctx context.Context, scope st "scope": scope, } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -256,7 +246,6 @@ func (client EventSubscriptionsClient) GetPreparer(ctx context.Context, scope st return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -264,7 +253,6 @@ func (client EventSubscriptionsClient) GetSender(req *http.Request) (*http.Respo autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) GetResponder(resp *http.Response) (result EventSubscription, err error) { @@ -278,17 +266,17 @@ func (client EventSubscriptionsClient) GetResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetFullURL get the full endpoint URL for an event subscription -// -// scope is the scope of the event subscription. The scope can be a subscription, or a resource group, or a top +// Parameters: +// scope - the scope of the event subscription. The scope can be a subscription, or a resource group, or a top // level resource belonging to a resource provider namespace, or an EventGrid topic. For example, use // '/subscriptions/{subscriptionId}/' for a subscription, // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for a resource group, and // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}' // for a resource, and // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/topics/{topicName}' -// for an EventGrid topic. eventSubscriptionName is name of the event subscription +// for an EventGrid topic. +// eventSubscriptionName - name of the event subscription func (client EventSubscriptionsClient) GetFullURL(ctx context.Context, scope string, eventSubscriptionName string) (result EventSubscriptionFullURL, err error) { req, err := client.GetFullURLPreparer(ctx, scope, eventSubscriptionName) if err != nil { @@ -311,7 +299,6 @@ func (client EventSubscriptionsClient) GetFullURL(ctx context.Context, scope str return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetFullURLPreparer prepares the GetFullURL request. func (client EventSubscriptionsClient) GetFullURLPreparer(ctx context.Context, scope string, eventSubscriptionName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -319,7 +306,7 @@ func (client EventSubscriptionsClient) GetFullURLPreparer(ctx context.Context, s "scope": scope, } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -332,7 +319,6 @@ func (client EventSubscriptionsClient) GetFullURLPreparer(ctx context.Context, s return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetFullURLSender sends the GetFullURL request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) GetFullURLSender(req *http.Request) (*http.Response, error) { @@ -340,7 +326,6 @@ func (client EventSubscriptionsClient) GetFullURLSender(req *http.Request) (*htt autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetFullURLResponder handles the response to the GetFullURL request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) GetFullURLResponder(resp *http.Response) (result EventSubscriptionFullURL, err error) { @@ -354,12 +339,12 @@ func (client EventSubscriptionsClient) GetFullURLResponder(resp *http.Response) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResource list all event subscriptions that have been created for a specific topic -// -// resourceGroupName is the name of the resource group within the user's subscription. providerNamespace is -// namespace of the provider of the topic resourceTypeName is name of the resource type resourceName is name of the -// resource +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. +// providerNamespace - namespace of the provider of the topic +// resourceTypeName - name of the resource type +// resourceName - name of the resource func (client EventSubscriptionsClient) ListByResource(ctx context.Context, resourceGroupName string, providerNamespace string, resourceTypeName string, resourceName string) (result EventSubscriptionsListResult, err error) { req, err := client.ListByResourcePreparer(ctx, resourceGroupName, providerNamespace, resourceTypeName, resourceName) if err != nil { @@ -382,7 +367,6 @@ func (client EventSubscriptionsClient) ListByResource(ctx context.Context, resou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourcePreparer prepares the ListByResource request. func (client EventSubscriptionsClient) ListByResourcePreparer(ctx context.Context, resourceGroupName string, providerNamespace string, resourceTypeName string, resourceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -393,7 +377,7 @@ func (client EventSubscriptionsClient) ListByResourcePreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -406,7 +390,6 @@ func (client EventSubscriptionsClient) ListByResourcePreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourceSender sends the ListByResource request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListByResourceSender(req *http.Request) (*http.Response, error) { @@ -414,7 +397,6 @@ func (client EventSubscriptionsClient) ListByResourceSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourceResponder handles the response to the ListByResource request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListByResourceResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -428,10 +410,9 @@ func (client EventSubscriptionsClient) ListByResourceResponder(resp *http.Respon return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroup list all global event subscriptions under a specific Azure subscription and resource group -// -// resourceGroupName is the name of the resource group within the user's subscription. +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. func (client EventSubscriptionsClient) ListGlobalByResourceGroup(ctx context.Context, resourceGroupName string) (result EventSubscriptionsListResult, err error) { req, err := client.ListGlobalByResourceGroupPreparer(ctx, resourceGroupName) if err != nil { @@ -454,7 +435,6 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroup(ctx context.Con return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupPreparer prepares the ListGlobalByResourceGroup request. func (client EventSubscriptionsClient) ListGlobalByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -462,7 +442,7 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupPreparer(ctx con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -475,7 +455,6 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupPreparer(ctx con return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupSender sends the ListGlobalByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListGlobalByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -483,7 +462,6 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupSender(req *http azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupResponder handles the response to the ListGlobalByResourceGroup request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListGlobalByResourceGroupResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -497,12 +475,11 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupResponder(resp * return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupForTopicType list all global event subscriptions under a resource group for a specific // topic type. -// -// resourceGroupName is the name of the resource group within the user's subscription. topicTypeName is name of the -// topic type +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. +// topicTypeName - name of the topic type func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicType(ctx context.Context, resourceGroupName string, topicTypeName string) (result EventSubscriptionsListResult, err error) { req, err := client.ListGlobalByResourceGroupForTopicTypePreparer(ctx, resourceGroupName, topicTypeName) if err != nil { @@ -525,7 +502,6 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicType(ctx return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupForTopicTypePreparer prepares the ListGlobalByResourceGroupForTopicType request. func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypePreparer(ctx context.Context, resourceGroupName string, topicTypeName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -534,7 +510,7 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypePrep "topicTypeName": autorest.Encode("path", topicTypeName), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -547,7 +523,6 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypePrep return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupForTopicTypeSender sends the ListGlobalByResourceGroupForTopicType request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypeSender(req *http.Request) (*http.Response, error) { @@ -555,7 +530,6 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypeSend azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalByResourceGroupForTopicTypeResponder handles the response to the ListGlobalByResourceGroupForTopicType request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypeResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -569,7 +543,6 @@ func (client EventSubscriptionsClient) ListGlobalByResourceGroupForTopicTypeResp return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscription list all aggregated global event subscriptions under a specific Azure subscription func (client EventSubscriptionsClient) ListGlobalBySubscription(ctx context.Context) (result EventSubscriptionsListResult, err error) { req, err := client.ListGlobalBySubscriptionPreparer(ctx) @@ -593,14 +566,13 @@ func (client EventSubscriptionsClient) ListGlobalBySubscription(ctx context.Cont return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionPreparer prepares the ListGlobalBySubscription request. func (client EventSubscriptionsClient) ListGlobalBySubscriptionPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -613,7 +585,6 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionPreparer(ctx cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionSender sends the ListGlobalBySubscription request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListGlobalBySubscriptionSender(req *http.Request) (*http.Response, error) { @@ -621,7 +592,6 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionSender(req *http. azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionResponder handles the response to the ListGlobalBySubscription request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListGlobalBySubscriptionResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -635,11 +605,10 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionResponder(resp *h return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionForTopicType list all global event subscriptions under an Azure subscription for a topic // type. -// -// topicTypeName is name of the topic type +// Parameters: +// topicTypeName - name of the topic type func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicType(ctx context.Context, topicTypeName string) (result EventSubscriptionsListResult, err error) { req, err := client.ListGlobalBySubscriptionForTopicTypePreparer(ctx, topicTypeName) if err != nil { @@ -662,7 +631,6 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicType(ctx return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionForTopicTypePreparer prepares the ListGlobalBySubscriptionForTopicType request. func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypePreparer(ctx context.Context, topicTypeName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -670,7 +638,7 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypePrepa "topicTypeName": autorest.Encode("path", topicTypeName), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -683,7 +651,6 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypePrepa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionForTopicTypeSender sends the ListGlobalBySubscriptionForTopicType request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypeSender(req *http.Request) (*http.Response, error) { @@ -691,7 +658,6 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypeSende azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListGlobalBySubscriptionForTopicTypeResponder handles the response to the ListGlobalBySubscriptionForTopicType request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypeResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -705,12 +671,11 @@ func (client EventSubscriptionsClient) ListGlobalBySubscriptionForTopicTypeRespo return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroup list all event subscriptions from the given location under a specific Azure subscription // and resource group -// -// resourceGroupName is the name of the resource group within the user's subscription. location is name of the -// location +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. +// location - name of the location func (client EventSubscriptionsClient) ListRegionalByResourceGroup(ctx context.Context, resourceGroupName string, location string) (result EventSubscriptionsListResult, err error) { req, err := client.ListRegionalByResourceGroupPreparer(ctx, resourceGroupName, location) if err != nil { @@ -733,7 +698,6 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroup(ctx context.C return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupPreparer prepares the ListRegionalByResourceGroup request. func (client EventSubscriptionsClient) ListRegionalByResourceGroupPreparer(ctx context.Context, resourceGroupName string, location string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -742,7 +706,7 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupPreparer(ctx c "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -755,7 +719,6 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupPreparer(ctx c return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupSender sends the ListRegionalByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListRegionalByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -763,7 +726,6 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupSender(req *ht azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupResponder handles the response to the ListRegionalByResourceGroup request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListRegionalByResourceGroupResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -777,12 +739,12 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupResponder(resp return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupForTopicType list all event subscriptions from the given location under a specific Azure // subscription and resource group and topic type -// -// resourceGroupName is the name of the resource group within the user's subscription. location is name of the -// location topicTypeName is name of the topic type +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. +// location - name of the location +// topicTypeName - name of the topic type func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicType(ctx context.Context, resourceGroupName string, location string, topicTypeName string) (result EventSubscriptionsListResult, err error) { req, err := client.ListRegionalByResourceGroupForTopicTypePreparer(ctx, resourceGroupName, location, topicTypeName) if err != nil { @@ -805,7 +767,6 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicType(c return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupForTopicTypePreparer prepares the ListRegionalByResourceGroupForTopicType request. func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypePreparer(ctx context.Context, resourceGroupName string, location string, topicTypeName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -815,7 +776,7 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypePr "topicTypeName": autorest.Encode("path", topicTypeName), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -828,7 +789,6 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypePr return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupForTopicTypeSender sends the ListRegionalByResourceGroupForTopicType request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypeSender(req *http.Request) (*http.Response, error) { @@ -836,7 +796,6 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypeSe azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalByResourceGroupForTopicTypeResponder handles the response to the ListRegionalByResourceGroupForTopicType request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypeResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -850,10 +809,9 @@ func (client EventSubscriptionsClient) ListRegionalByResourceGroupForTopicTypeRe return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscription list all event subscriptions from the given location under a specific Azure subscription -// -// location is name of the location +// Parameters: +// location - name of the location func (client EventSubscriptionsClient) ListRegionalBySubscription(ctx context.Context, location string) (result EventSubscriptionsListResult, err error) { req, err := client.ListRegionalBySubscriptionPreparer(ctx, location) if err != nil { @@ -876,7 +834,6 @@ func (client EventSubscriptionsClient) ListRegionalBySubscription(ctx context.Co return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionPreparer prepares the ListRegionalBySubscription request. func (client EventSubscriptionsClient) ListRegionalBySubscriptionPreparer(ctx context.Context, location string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -884,7 +841,7 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionPreparer(ctx co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -897,7 +854,6 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionPreparer(ctx co return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionSender sends the ListRegionalBySubscription request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListRegionalBySubscriptionSender(req *http.Request) (*http.Response, error) { @@ -905,7 +861,6 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionSender(req *htt azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionResponder handles the response to the ListRegionalBySubscription request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListRegionalBySubscriptionResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -919,11 +874,11 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionResponder(resp return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionForTopicType list all event subscriptions from the given location under a specific Azure // subscription and topic type. -// -// location is name of the location topicTypeName is name of the topic type +// Parameters: +// location - name of the location +// topicTypeName - name of the topic type func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicType(ctx context.Context, location string, topicTypeName string) (result EventSubscriptionsListResult, err error) { req, err := client.ListRegionalBySubscriptionForTopicTypePreparer(ctx, location, topicTypeName) if err != nil { @@ -946,7 +901,6 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicType(ct return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionForTopicTypePreparer prepares the ListRegionalBySubscriptionForTopicType request. func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypePreparer(ctx context.Context, location string, topicTypeName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -955,7 +909,7 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypePre "topicTypeName": autorest.Encode("path", topicTypeName), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -968,7 +922,6 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypePre return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionForTopicTypeSender sends the ListRegionalBySubscriptionForTopicType request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypeSender(req *http.Request) (*http.Response, error) { @@ -976,7 +929,6 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypeSen azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListRegionalBySubscriptionForTopicTypeResponder handles the response to the ListRegionalBySubscriptionForTopicType request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypeResponder(resp *http.Response) (result EventSubscriptionsListResult, err error) { @@ -990,18 +942,18 @@ func (client EventSubscriptionsClient) ListRegionalBySubscriptionForTopicTypeRes return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Update asynchronously updates an existing event subscription. -// -// scope is the scope of existing event subscription. The scope can be a subscription, or a resource group, or a +// Parameters: +// scope - the scope of existing event subscription. The scope can be a subscription, or a resource group, or a // top level resource belonging to a resource provider namespace, or an EventGrid topic. For example, use // '/subscriptions/{subscriptionId}/' for a subscription, // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for a resource group, and // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}' // for a resource, and // '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/topics/{topicName}' -// for an EventGrid topic. eventSubscriptionName is name of the event subscription to be created -// eventSubscriptionUpdateParameters is updated event subscription information +// for an EventGrid topic. +// eventSubscriptionName - name of the event subscription to be created +// eventSubscriptionUpdateParameters - updated event subscription information func (client EventSubscriptionsClient) Update(ctx context.Context, scope string, eventSubscriptionName string, eventSubscriptionUpdateParameters EventSubscriptionUpdateParameters) (result EventSubscriptionsUpdateFuture, err error) { req, err := client.UpdatePreparer(ctx, scope, eventSubscriptionName, eventSubscriptionUpdateParameters) if err != nil { @@ -1018,7 +970,6 @@ func (client EventSubscriptionsClient) Update(ctx context.Context, scope string, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UpdatePreparer prepares the Update request. func (client EventSubscriptionsClient) UpdatePreparer(ctx context.Context, scope string, eventSubscriptionName string, eventSubscriptionUpdateParameters EventSubscriptionUpdateParameters) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -1026,7 +977,7 @@ func (client EventSubscriptionsClient) UpdatePreparer(ctx context.Context, scope "scope": scope, } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1041,7 +992,6 @@ func (client EventSubscriptionsClient) UpdatePreparer(ctx context.Context, scope return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) UpdateSender(req *http.Request) (future EventSubscriptionsUpdateFuture, err error) { @@ -1057,7 +1007,6 @@ func (client EventSubscriptionsClient) UpdateSender(req *http.Request) (future E return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client EventSubscriptionsClient) UpdateResponder(resp *http.Response) (result EventSubscription, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/models.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/models.go index aeec2b1758aa..8a264027fee7 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/models.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EndpointType enumerates the values for endpoint type. type EndpointType string @@ -37,13 +36,11 @@ const ( EndpointTypeWebHook EndpointType = "WebHook" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // PossibleEndpointTypeValues returns an array of possible values for the EndpointType const type. func PossibleEndpointTypeValues() []EndpointType { return []EndpointType{EndpointTypeEventHub, EndpointTypeEventSubscriptionDestination, EndpointTypeWebHook} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionProvisioningState enumerates the values for event subscription provisioning state. type EventSubscriptionProvisioningState string @@ -62,32 +59,11 @@ const ( Updating EventSubscriptionProvisioningState = "Updating" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // PossibleEventSubscriptionProvisioningStateValues returns an array of possible values for the EventSubscriptionProvisioningState const type. func PossibleEventSubscriptionProvisioningStateValues() []EventSubscriptionProvisioningState { return []EventSubscriptionProvisioningState{Canceled, Creating, Deleting, Failed, Succeeded, Updating} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. -// OperationOrigin enumerates the values for operation origin. -type OperationOrigin string - -const ( - // System ... - System OperationOrigin = "System" - // User ... - User OperationOrigin = "User" - // UserAndSystem ... - UserAndSystem OperationOrigin = "UserAndSystem" -) - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. -// PossibleOperationOriginValues returns an array of possible values for the OperationOrigin const type. -func PossibleOperationOriginValues() []OperationOrigin { - return []OperationOrigin{System, User, UserAndSystem} -} - -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ResourceRegionType enumerates the values for resource region type. type ResourceRegionType string @@ -98,13 +74,11 @@ const ( RegionalResource ResourceRegionType = "RegionalResource" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // PossibleResourceRegionTypeValues returns an array of possible values for the ResourceRegionType const type. func PossibleResourceRegionTypeValues() []ResourceRegionType { return []ResourceRegionType{GlobalResource, RegionalResource} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicProvisioningState enumerates the values for topic provisioning state. type TopicProvisioningState string @@ -123,13 +97,11 @@ const ( TopicProvisioningStateUpdating TopicProvisioningState = "Updating" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // PossibleTopicProvisioningStateValues returns an array of possible values for the TopicProvisioningState const type. func PossibleTopicProvisioningStateValues() []TopicProvisioningState { return []TopicProvisioningState{TopicProvisioningStateCanceled, TopicProvisioningStateCreating, TopicProvisioningStateDeleting, TopicProvisioningStateFailed, TopicProvisioningStateSucceeded, TopicProvisioningStateUpdating} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicTypeProvisioningState enumerates the values for topic type provisioning state. type TopicTypeProvisioningState string @@ -148,13 +120,11 @@ const ( TopicTypeProvisioningStateUpdating TopicTypeProvisioningState = "Updating" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // PossibleTopicTypeProvisioningStateValues returns an array of possible values for the TopicTypeProvisioningState const type. func PossibleTopicTypeProvisioningStateValues() []TopicTypeProvisioningState { return []TopicTypeProvisioningState{TopicTypeProvisioningStateCanceled, TopicTypeProvisioningStateCreating, TopicTypeProvisioningStateDeleting, TopicTypeProvisioningStateFailed, TopicTypeProvisioningStateSucceeded, TopicTypeProvisioningStateUpdating} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventHubEventSubscriptionDestination information about the event hub destination for an event subscription type EventHubEventSubscriptionDestination struct { // EventHubEventSubscriptionDestinationProperties - Event Hub Properties of the event subscription destination @@ -163,7 +133,6 @@ type EventHubEventSubscriptionDestination struct { EndpointType EndpointType `json:"endpointType,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for EventHubEventSubscriptionDestination. func (ehesd EventHubEventSubscriptionDestination) MarshalJSON() ([]byte, error) { ehesd.EndpointType = EndpointTypeEventHub @@ -177,31 +146,26 @@ func (ehesd EventHubEventSubscriptionDestination) MarshalJSON() ([]byte, error) return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsWebHookEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventHubEventSubscriptionDestination. func (ehesd EventHubEventSubscriptionDestination) AsWebHookEventSubscriptionDestination() (*WebHookEventSubscriptionDestination, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsEventHubEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventHubEventSubscriptionDestination. func (ehesd EventHubEventSubscriptionDestination) AsEventHubEventSubscriptionDestination() (*EventHubEventSubscriptionDestination, bool) { return &ehesd, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventHubEventSubscriptionDestination. func (ehesd EventHubEventSubscriptionDestination) AsEventSubscriptionDestination() (*EventSubscriptionDestination, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsBasicEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventHubEventSubscriptionDestination. func (ehesd EventHubEventSubscriptionDestination) AsBasicEventSubscriptionDestination() (BasicEventSubscriptionDestination, bool) { return &ehesd, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for EventHubEventSubscriptionDestination struct. func (ehesd *EventHubEventSubscriptionDestination) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -235,14 +199,12 @@ func (ehesd *EventHubEventSubscriptionDestination) UnmarshalJSON(body []byte) er return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventHubEventSubscriptionDestinationProperties the properties for a event hub destination. type EventHubEventSubscriptionDestinationProperties struct { // ResourceID - The Azure Resource Id that represents the endpoint of an Event Hub destination of an event subscription. ResourceID *string `json:"resourceId,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscription event Subscription type EventSubscription struct { autorest.Response `json:"-"` @@ -256,7 +218,6 @@ type EventSubscription struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for EventSubscription. func (es EventSubscription) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -275,7 +236,6 @@ func (es EventSubscription) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for EventSubscription struct. func (es *EventSubscription) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -327,7 +287,6 @@ func (es *EventSubscription) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // BasicEventSubscriptionDestination information about the destination for an event subscription type BasicEventSubscriptionDestination interface { AsWebHookEventSubscriptionDestination() (*WebHookEventSubscriptionDestination, bool) @@ -335,7 +294,6 @@ type BasicEventSubscriptionDestination interface { AsEventSubscriptionDestination() (*EventSubscriptionDestination, bool) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionDestination information about the destination for an event subscription type EventSubscriptionDestination struct { // EndpointType - Possible values include: 'EndpointTypeEventSubscriptionDestination', 'EndpointTypeWebHook', 'EndpointTypeEventHub' @@ -383,7 +341,6 @@ func unmarshalBasicEventSubscriptionDestinationArray(body []byte) ([]BasicEventS return esdArray, nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for EventSubscriptionDestination. func (esd EventSubscriptionDestination) MarshalJSON() ([]byte, error) { esd.EndpointType = EndpointTypeEventSubscriptionDestination @@ -394,31 +351,26 @@ func (esd EventSubscriptionDestination) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsWebHookEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventSubscriptionDestination. func (esd EventSubscriptionDestination) AsWebHookEventSubscriptionDestination() (*WebHookEventSubscriptionDestination, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsEventHubEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventSubscriptionDestination. func (esd EventSubscriptionDestination) AsEventHubEventSubscriptionDestination() (*EventHubEventSubscriptionDestination, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventSubscriptionDestination. func (esd EventSubscriptionDestination) AsEventSubscriptionDestination() (*EventSubscriptionDestination, bool) { return &esd, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsBasicEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for EventSubscriptionDestination. func (esd EventSubscriptionDestination) AsBasicEventSubscriptionDestination() (BasicEventSubscriptionDestination, bool) { return &esd, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionFilter filter for the Event Subscription type EventSubscriptionFilter struct { // SubjectBeginsWith - An optional string to filter events for an event subscription based on a resource path prefix. @@ -436,7 +388,6 @@ type EventSubscriptionFilter struct { IsSubjectCaseSensitive *bool `json:"isSubjectCaseSensitive,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionFullURL full endpoint url of an event subscription type EventSubscriptionFullURL struct { autorest.Response `json:"-"` @@ -444,7 +395,6 @@ type EventSubscriptionFullURL struct { EndpointURL *string `json:"endpointUrl,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionProperties properties of the Event Subscription type EventSubscriptionProperties struct { // Topic - Name of the topic of the event subscription. @@ -459,7 +409,6 @@ type EventSubscriptionProperties struct { Labels *[]string `json:"labels,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for EventSubscriptionProperties struct. func (esp *EventSubscriptionProperties) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -519,31 +468,29 @@ func (esp *EventSubscriptionProperties) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. -// EventSubscriptionsCreateFuture an abstraction for monitoring and retrieving the results of a long-running -// operation. -type EventSubscriptionsCreateFuture struct { +// EventSubscriptionsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a +// long-running operation. +type EventSubscriptionsCreateOrUpdateFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future EventSubscriptionsCreateFuture) Result(client EventSubscriptionsClient) (es EventSubscription, err error) { +func (future EventSubscriptionsCreateOrUpdateFuture) Result(client EventSubscriptionsClient) (es EventSubscription, err error) { var done bool done, err = future.Done(client) if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsCreateFuture", "Result", future.Response(), "Polling failure") + err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") return } if !done { - return es, azure.NewAsyncOpIncompleteError("eventgrid.EventSubscriptionsCreateFuture") + return es, azure.NewAsyncOpIncompleteError("eventgrid.EventSubscriptionsCreateOrUpdateFuture") } if future.PollingMethod() == azure.PollingLocation { - es, err = client.CreateResponder(future.Response()) + es, err = client.CreateOrUpdateResponder(future.Response()) if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsCreateFuture", "Result", future.Response(), "Failure responding to request") + err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") } return } @@ -560,17 +507,16 @@ func (future EventSubscriptionsCreateFuture) Result(client EventSubscriptionsCli resp, err = autorest.SendWithSender(client, req, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsCreateFuture", "Result", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsCreateOrUpdateFuture", "Result", resp, "Failure sending request") return } - es, err = client.CreateResponder(resp) + es, err = client.CreateOrUpdateResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsCreateFuture", "Result", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type EventSubscriptionsDeleteFuture struct { @@ -578,7 +524,6 @@ type EventSubscriptionsDeleteFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future EventSubscriptionsDeleteFuture) Result(client EventSubscriptionsClient) (ar autorest.Response, err error) { @@ -621,7 +566,6 @@ func (future EventSubscriptionsDeleteFuture) Result(client EventSubscriptionsCli return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionsListResult result of the List EventSubscriptions operation type EventSubscriptionsListResult struct { autorest.Response `json:"-"` @@ -629,7 +573,6 @@ type EventSubscriptionsListResult struct { Value *[]EventSubscription `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type EventSubscriptionsUpdateFuture struct { @@ -637,7 +580,6 @@ type EventSubscriptionsUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future EventSubscriptionsUpdateFuture) Result(client EventSubscriptionsClient) (es EventSubscription, err error) { @@ -680,7 +622,6 @@ func (future EventSubscriptionsUpdateFuture) Result(client EventSubscriptionsCli return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventSubscriptionUpdateParameters properties of the Event Subscription update type EventSubscriptionUpdateParameters struct { // Destination - Information about the destination where events have to be delivered for the event subscription. @@ -691,7 +632,6 @@ type EventSubscriptionUpdateParameters struct { Labels *[]string `json:"labels,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for EventSubscriptionUpdateParameters struct. func (esup *EventSubscriptionUpdateParameters) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -733,7 +673,6 @@ func (esup *EventSubscriptionUpdateParameters) UnmarshalJSON(body []byte) error return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventType event Type for a subject under a topic type EventType struct { // EventTypeProperties - Properties of the event type. @@ -746,7 +685,6 @@ type EventType struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for EventType. func (et EventType) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -765,7 +703,6 @@ func (et EventType) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for EventType struct. func (et *EventType) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -817,7 +754,6 @@ func (et *EventType) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventTypeProperties properties of the event type type EventTypeProperties struct { // DisplayName - Display name of the event type. @@ -828,7 +764,6 @@ type EventTypeProperties struct { SchemaURL *string `json:"schemaUrl,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // EventTypesListResult result of the List Event Types operation type EventTypesListResult struct { autorest.Response `json:"-"` @@ -836,20 +771,18 @@ type EventTypesListResult struct { Value *[]EventType `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Operation represents an operation returned by the GetOperations request type Operation struct { // Name - Name of the operation Name *string `json:"name,omitempty"` // Display - Display name of the operation Display *OperationInfo `json:"display,omitempty"` - // Origin - Origin of the operation. Possible values include: 'User', 'System', 'UserAndSystem' - Origin OperationOrigin `json:"origin,omitempty"` + // Origin - Origin of the operation + Origin *string `json:"origin,omitempty"` // Properties - Properties of the operation Properties interface{} `json:"properties,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // OperationInfo information about an operation type OperationInfo struct { // Provider - Name of the provider @@ -862,7 +795,6 @@ type OperationInfo struct { Description *string `json:"description,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // OperationsListResult result of the List Operations operation type OperationsListResult struct { autorest.Response `json:"-"` @@ -870,7 +802,6 @@ type OperationsListResult struct { Value *[]Operation `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Resource definition of a Resource type Resource struct { // ID - Fully qualified identifier of the resource @@ -881,7 +812,6 @@ type Resource struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Topic eventGrid Topic type Topic struct { autorest.Response `json:"-"` @@ -899,7 +829,6 @@ type Topic struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for Topic. func (t Topic) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -924,7 +853,6 @@ func (t Topic) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for Topic struct. func (t *Topic) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -994,7 +922,6 @@ func (t *Topic) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicProperties properties of the Topic type TopicProperties struct { // ProvisioningState - Provisioning state of the topic. Possible values include: 'TopicProvisioningStateCreating', 'TopicProvisioningStateUpdating', 'TopicProvisioningStateDeleting', 'TopicProvisioningStateSucceeded', 'TopicProvisioningStateCanceled', 'TopicProvisioningStateFailed' @@ -1003,21 +930,18 @@ type TopicProperties struct { Endpoint *string `json:"endpoint,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicRegenerateKeyRequest topic regenerate share access key key request type TopicRegenerateKeyRequest struct { // KeyName - Key name to regenerate key1 or key2 KeyName *string `json:"keyName,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type TopicsCreateOrUpdateFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future TopicsCreateOrUpdateFuture) Result(client TopicsClient) (t Topic, err error) { @@ -1060,14 +984,12 @@ func (future TopicsCreateOrUpdateFuture) Result(client TopicsClient) (t Topic, e return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type TopicsDeleteFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future TopicsDeleteFuture) Result(client TopicsClient) (ar autorest.Response, err error) { @@ -1110,7 +1032,6 @@ func (future TopicsDeleteFuture) Result(client TopicsClient) (ar autorest.Respon return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicSharedAccessKeys shared access keys of the Topic type TopicSharedAccessKeys struct { autorest.Response `json:"-"` @@ -1120,7 +1041,6 @@ type TopicSharedAccessKeys struct { Key2 *string `json:"key2,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicsListResult result of the List Topics operation type TopicsListResult struct { autorest.Response `json:"-"` @@ -1128,14 +1048,12 @@ type TopicsListResult struct { Value *[]Topic `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type TopicsUpdateFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future TopicsUpdateFuture) Result(client TopicsClient) (t Topic, err error) { @@ -1178,7 +1096,6 @@ func (future TopicsUpdateFuture) Result(client TopicsClient) (t Topic, err error return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicTypeInfo properties of a topic type info. type TopicTypeInfo struct { autorest.Response `json:"-"` @@ -1192,7 +1109,6 @@ type TopicTypeInfo struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for TopicTypeInfo. func (tti TopicTypeInfo) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1211,7 +1127,6 @@ func (tti TopicTypeInfo) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for TopicTypeInfo struct. func (tti *TopicTypeInfo) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1263,7 +1178,6 @@ func (tti *TopicTypeInfo) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicTypeProperties properties of a topic type. type TopicTypeProperties struct { // Provider - Namespace of the provider of the topic type. @@ -1280,7 +1194,6 @@ type TopicTypeProperties struct { SupportedLocations *[]string `json:"supportedLocations,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicTypesListResult result of the List Topic Types operation type TopicTypesListResult struct { autorest.Response `json:"-"` @@ -1288,14 +1201,12 @@ type TopicTypesListResult struct { Value *[]TopicTypeInfo `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicUpdateParameters properties of the Topic update type TopicUpdateParameters struct { // Tags - Tags of the resource Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for TopicUpdateParameters. func (tup TopicUpdateParameters) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1305,7 +1216,6 @@ func (tup TopicUpdateParameters) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TrackedResource definition of a Tracked Resource type TrackedResource struct { // Location - Location of the resource @@ -1320,7 +1230,6 @@ type TrackedResource struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for TrackedResource. func (tr TrackedResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1342,7 +1251,6 @@ func (tr TrackedResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // WebHookEventSubscriptionDestination information about the webhook destination for an event subscription type WebHookEventSubscriptionDestination struct { // WebHookEventSubscriptionDestinationProperties - WebHook Properties of the event subscription destination @@ -1351,7 +1259,6 @@ type WebHookEventSubscriptionDestination struct { EndpointType EndpointType `json:"endpointType,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // MarshalJSON is the custom marshaler for WebHookEventSubscriptionDestination. func (whesd WebHookEventSubscriptionDestination) MarshalJSON() ([]byte, error) { whesd.EndpointType = EndpointTypeWebHook @@ -1365,31 +1272,26 @@ func (whesd WebHookEventSubscriptionDestination) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsWebHookEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for WebHookEventSubscriptionDestination. func (whesd WebHookEventSubscriptionDestination) AsWebHookEventSubscriptionDestination() (*WebHookEventSubscriptionDestination, bool) { return &whesd, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsEventHubEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for WebHookEventSubscriptionDestination. func (whesd WebHookEventSubscriptionDestination) AsEventHubEventSubscriptionDestination() (*EventHubEventSubscriptionDestination, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for WebHookEventSubscriptionDestination. func (whesd WebHookEventSubscriptionDestination) AsEventSubscriptionDestination() (*EventSubscriptionDestination, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // AsBasicEventSubscriptionDestination is the BasicEventSubscriptionDestination implementation for WebHookEventSubscriptionDestination. func (whesd WebHookEventSubscriptionDestination) AsBasicEventSubscriptionDestination() (BasicEventSubscriptionDestination, bool) { return &whesd, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UnmarshalJSON is the custom unmarshaler for WebHookEventSubscriptionDestination struct. func (whesd *WebHookEventSubscriptionDestination) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1423,9 +1325,8 @@ func (whesd *WebHookEventSubscriptionDestination) UnmarshalJSON(body []byte) err return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // WebHookEventSubscriptionDestinationProperties information about the webhook destination properties for an event -// subscription +// subscription. type WebHookEventSubscriptionDestinationProperties struct { // EndpointURL - The URL that represents the endpoint of the destination of an event subscription. EndpointURL *string `json:"endpointUrl,omitempty"` diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/operations.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/operations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/operations.go index 14ae5d15eb90..0be33e3d5588 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/operations.go @@ -24,25 +24,21 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // OperationsClient is the azure EventGrid Management Client type OperationsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewOperationsClient creates an instance of the OperationsClient client. func NewOperationsClient(subscriptionID string) OperationsClient { return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // List list the available operations supported by the Microsoft.EventGrid resource provider func (client OperationsClient) List(ctx context.Context) (result OperationsListResult, err error) { req, err := client.ListPreparer(ctx) @@ -66,10 +62,9 @@ func (client OperationsClient) List(ctx context.Context) (result OperationsListR return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -82,7 +77,6 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -90,7 +84,6 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client OperationsClient) ListResponder(resp *http.Response) (result OperationsListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topics.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/topics.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topics.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/topics.go index a954373b1259..eb1f890547d6 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topics.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/topics.go @@ -25,29 +25,26 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicsClient is the azure EventGrid Management Client type TopicsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewTopicsClient creates an instance of the TopicsClient client. func NewTopicsClient(subscriptionID string) TopicsClient { return NewTopicsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewTopicsClientWithBaseURI creates an instance of the TopicsClient client. func NewTopicsClientWithBaseURI(baseURI string, subscriptionID string) TopicsClient { return TopicsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // CreateOrUpdate asynchronously creates a new topic with the specified parameters. -// -// resourceGroupName is the name of the resource group within the user's subscription. topicName is name of the -// topic topicInfo is topic information +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. +// topicName - name of the topic +// topicInfo - topic information func (client TopicsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, topicName string, topicInfo Topic) (result TopicsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, topicName, topicInfo) if err != nil { @@ -64,7 +61,6 @@ func (client TopicsClient) CreateOrUpdate(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client TopicsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, topicName string, topicInfo Topic) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -73,7 +69,7 @@ func (client TopicsClient) CreateOrUpdatePreparer(ctx context.Context, resourceG "topicName": autorest.Encode("path", topicName), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -88,7 +84,6 @@ func (client TopicsClient) CreateOrUpdatePreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) CreateOrUpdateSender(req *http.Request) (future TopicsCreateOrUpdateFuture, err error) { @@ -104,7 +99,6 @@ func (client TopicsClient) CreateOrUpdateSender(req *http.Request) (future Topic return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client TopicsClient) CreateOrUpdateResponder(resp *http.Response) (result Topic, err error) { @@ -118,11 +112,10 @@ func (client TopicsClient) CreateOrUpdateResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Delete delete existing topic -// -// resourceGroupName is the name of the resource group within the user's subscription. topicName is name of the -// topic +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. +// topicName - name of the topic func (client TopicsClient) Delete(ctx context.Context, resourceGroupName string, topicName string) (result TopicsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, topicName) if err != nil { @@ -139,7 +132,6 @@ func (client TopicsClient) Delete(ctx context.Context, resourceGroupName string, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // DeletePreparer prepares the Delete request. func (client TopicsClient) DeletePreparer(ctx context.Context, resourceGroupName string, topicName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -148,7 +140,7 @@ func (client TopicsClient) DeletePreparer(ctx context.Context, resourceGroupName "topicName": autorest.Encode("path", topicName), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -161,7 +153,6 @@ func (client TopicsClient) DeletePreparer(ctx context.Context, resourceGroupName return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) DeleteSender(req *http.Request) (future TopicsDeleteFuture, err error) { @@ -177,7 +168,6 @@ func (client TopicsClient) DeleteSender(req *http.Request) (future TopicsDeleteF return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client TopicsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -190,11 +180,10 @@ func (client TopicsClient) DeleteResponder(resp *http.Response) (result autorest return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Get get properties of a topic -// -// resourceGroupName is the name of the resource group within the user's subscription. topicName is name of the -// topic +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. +// topicName - name of the topic func (client TopicsClient) Get(ctx context.Context, resourceGroupName string, topicName string) (result Topic, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, topicName) if err != nil { @@ -217,7 +206,6 @@ func (client TopicsClient) Get(ctx context.Context, resourceGroupName string, to return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetPreparer prepares the Get request. func (client TopicsClient) GetPreparer(ctx context.Context, resourceGroupName string, topicName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -226,7 +214,7 @@ func (client TopicsClient) GetPreparer(ctx context.Context, resourceGroupName st "topicName": autorest.Encode("path", topicName), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -239,7 +227,6 @@ func (client TopicsClient) GetPreparer(ctx context.Context, resourceGroupName st return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -247,7 +234,6 @@ func (client TopicsClient) GetSender(req *http.Request) (*http.Response, error) azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client TopicsClient) GetResponder(resp *http.Response) (result Topic, err error) { @@ -261,10 +247,9 @@ func (client TopicsClient) GetResponder(resp *http.Response) (result Topic, err return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourceGroup list all the topics under a resource group -// -// resourceGroupName is the name of the resource group within the user's subscription. +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. func (client TopicsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result TopicsListResult, err error) { req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) if err != nil { @@ -287,7 +272,6 @@ func (client TopicsClient) ListByResourceGroup(ctx context.Context, resourceGrou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client TopicsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -295,7 +279,7 @@ func (client TopicsClient) ListByResourceGroupPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -308,7 +292,6 @@ func (client TopicsClient) ListByResourceGroupPreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -316,7 +299,6 @@ func (client TopicsClient) ListByResourceGroupSender(req *http.Request) (*http.R azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client TopicsClient) ListByResourceGroupResponder(resp *http.Response) (result TopicsListResult, err error) { @@ -330,7 +312,6 @@ func (client TopicsClient) ListByResourceGroupResponder(resp *http.Response) (re return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListBySubscription list all the topics under an Azure subscription func (client TopicsClient) ListBySubscription(ctx context.Context) (result TopicsListResult, err error) { req, err := client.ListBySubscriptionPreparer(ctx) @@ -354,14 +335,13 @@ func (client TopicsClient) ListBySubscription(ctx context.Context) (result Topic return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListBySubscriptionPreparer prepares the ListBySubscription request. func (client TopicsClient) ListBySubscriptionPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -374,7 +354,6 @@ func (client TopicsClient) ListBySubscriptionPreparer(ctx context.Context) (*htt return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListBySubscriptionSender sends the ListBySubscription request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) ListBySubscriptionSender(req *http.Request) (*http.Response, error) { @@ -382,7 +361,6 @@ func (client TopicsClient) ListBySubscriptionSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListBySubscriptionResponder handles the response to the ListBySubscription request. The method always // closes the http.Response Body. func (client TopicsClient) ListBySubscriptionResponder(resp *http.Response) (result TopicsListResult, err error) { @@ -396,12 +374,12 @@ func (client TopicsClient) ListBySubscriptionResponder(resp *http.Response) (res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypes list event types for a topic -// -// resourceGroupName is the name of the resource group within the user's subscription. providerNamespace is -// namespace of the provider of the topic resourceTypeName is name of the topic type resourceName is name of the -// topic +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. +// providerNamespace - namespace of the provider of the topic +// resourceTypeName - name of the topic type +// resourceName - name of the topic func (client TopicsClient) ListEventTypes(ctx context.Context, resourceGroupName string, providerNamespace string, resourceTypeName string, resourceName string) (result EventTypesListResult, err error) { req, err := client.ListEventTypesPreparer(ctx, resourceGroupName, providerNamespace, resourceTypeName, resourceName) if err != nil { @@ -424,7 +402,6 @@ func (client TopicsClient) ListEventTypes(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypesPreparer prepares the ListEventTypes request. func (client TopicsClient) ListEventTypesPreparer(ctx context.Context, resourceGroupName string, providerNamespace string, resourceTypeName string, resourceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -435,7 +412,7 @@ func (client TopicsClient) ListEventTypesPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -448,7 +425,6 @@ func (client TopicsClient) ListEventTypesPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypesSender sends the ListEventTypes request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) ListEventTypesSender(req *http.Request) (*http.Response, error) { @@ -456,7 +432,6 @@ func (client TopicsClient) ListEventTypesSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypesResponder handles the response to the ListEventTypes request. The method always // closes the http.Response Body. func (client TopicsClient) ListEventTypesResponder(resp *http.Response) (result EventTypesListResult, err error) { @@ -470,11 +445,10 @@ func (client TopicsClient) ListEventTypesResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListSharedAccessKeys list the two keys used to publish to a topic -// -// resourceGroupName is the name of the resource group within the user's subscription. topicName is name of the -// topic +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. +// topicName - name of the topic func (client TopicsClient) ListSharedAccessKeys(ctx context.Context, resourceGroupName string, topicName string) (result TopicSharedAccessKeys, err error) { req, err := client.ListSharedAccessKeysPreparer(ctx, resourceGroupName, topicName) if err != nil { @@ -497,7 +471,6 @@ func (client TopicsClient) ListSharedAccessKeys(ctx context.Context, resourceGro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListSharedAccessKeysPreparer prepares the ListSharedAccessKeys request. func (client TopicsClient) ListSharedAccessKeysPreparer(ctx context.Context, resourceGroupName string, topicName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -506,7 +479,7 @@ func (client TopicsClient) ListSharedAccessKeysPreparer(ctx context.Context, res "topicName": autorest.Encode("path", topicName), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -519,7 +492,6 @@ func (client TopicsClient) ListSharedAccessKeysPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListSharedAccessKeysSender sends the ListSharedAccessKeys request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) ListSharedAccessKeysSender(req *http.Request) (*http.Response, error) { @@ -527,7 +499,6 @@ func (client TopicsClient) ListSharedAccessKeysSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListSharedAccessKeysResponder handles the response to the ListSharedAccessKeys request. The method always // closes the http.Response Body. func (client TopicsClient) ListSharedAccessKeysResponder(resp *http.Response) (result TopicSharedAccessKeys, err error) { @@ -541,11 +512,11 @@ func (client TopicsClient) ListSharedAccessKeysResponder(resp *http.Response) (r return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // RegenerateKey regenerate a shared access key for a topic -// -// resourceGroupName is the name of the resource group within the user's subscription. topicName is name of the -// topic regenerateKeyRequest is request body to regenerate key +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. +// topicName - name of the topic +// regenerateKeyRequest - request body to regenerate key func (client TopicsClient) RegenerateKey(ctx context.Context, resourceGroupName string, topicName string, regenerateKeyRequest TopicRegenerateKeyRequest) (result TopicSharedAccessKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: regenerateKeyRequest, @@ -574,7 +545,6 @@ func (client TopicsClient) RegenerateKey(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // RegenerateKeyPreparer prepares the RegenerateKey request. func (client TopicsClient) RegenerateKeyPreparer(ctx context.Context, resourceGroupName string, topicName string, regenerateKeyRequest TopicRegenerateKeyRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -583,7 +553,7 @@ func (client TopicsClient) RegenerateKeyPreparer(ctx context.Context, resourceGr "topicName": autorest.Encode("path", topicName), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -598,7 +568,6 @@ func (client TopicsClient) RegenerateKeyPreparer(ctx context.Context, resourceGr return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // RegenerateKeySender sends the RegenerateKey request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) RegenerateKeySender(req *http.Request) (*http.Response, error) { @@ -606,7 +575,6 @@ func (client TopicsClient) RegenerateKeySender(req *http.Request) (*http.Respons azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // RegenerateKeyResponder handles the response to the RegenerateKey request. The method always // closes the http.Response Body. func (client TopicsClient) RegenerateKeyResponder(resp *http.Response) (result TopicSharedAccessKeys, err error) { @@ -620,11 +588,11 @@ func (client TopicsClient) RegenerateKeyResponder(resp *http.Response) (result T return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Update asynchronously updates a topic with the specified parameters. -// -// resourceGroupName is the name of the resource group within the user's subscription. topicName is name of the -// topic topicUpdateParameters is topic update information +// Parameters: +// resourceGroupName - the name of the resource group within the user's subscription. +// topicName - name of the topic +// topicUpdateParameters - topic update information func (client TopicsClient) Update(ctx context.Context, resourceGroupName string, topicName string, topicUpdateParameters TopicUpdateParameters) (result TopicsUpdateFuture, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, topicName, topicUpdateParameters) if err != nil { @@ -641,7 +609,6 @@ func (client TopicsClient) Update(ctx context.Context, resourceGroupName string, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UpdatePreparer prepares the Update request. func (client TopicsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, topicName string, topicUpdateParameters TopicUpdateParameters) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -650,7 +617,7 @@ func (client TopicsClient) UpdatePreparer(ctx context.Context, resourceGroupName "topicName": autorest.Encode("path", topicName), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -665,7 +632,6 @@ func (client TopicsClient) UpdatePreparer(ctx context.Context, resourceGroupName return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) UpdateSender(req *http.Request) (future TopicsUpdateFuture, err error) { @@ -681,7 +647,6 @@ func (client TopicsClient) UpdateSender(req *http.Request) (future TopicsUpdateF return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client TopicsClient) UpdateResponder(resp *http.Response) (result Topic, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topictypes.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/topictypes.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topictypes.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/topictypes.go index 80f888d16903..46adad4ad74b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/topictypes.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/topictypes.go @@ -24,28 +24,24 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // TopicTypesClient is the azure EventGrid Management Client type TopicTypesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewTopicTypesClient creates an instance of the TopicTypesClient client. func NewTopicTypesClient(subscriptionID string) TopicTypesClient { return NewTopicTypesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // NewTopicTypesClientWithBaseURI creates an instance of the TopicTypesClient client. func NewTopicTypesClientWithBaseURI(baseURI string, subscriptionID string) TopicTypesClient { return TopicTypesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Get get information about a topic type -// -// topicTypeName is name of the topic type +// Parameters: +// topicTypeName - name of the topic type func (client TopicTypesClient) Get(ctx context.Context, topicTypeName string) (result TopicTypeInfo, err error) { req, err := client.GetPreparer(ctx, topicTypeName) if err != nil { @@ -68,14 +64,13 @@ func (client TopicTypesClient) Get(ctx context.Context, topicTypeName string) (r return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetPreparer prepares the Get request. func (client TopicTypesClient) GetPreparer(ctx context.Context, topicTypeName string) (*http.Request, error) { pathParameters := map[string]interface{}{ "topicTypeName": autorest.Encode("path", topicTypeName), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -88,7 +83,6 @@ func (client TopicTypesClient) GetPreparer(ctx context.Context, topicTypeName st return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client TopicTypesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -96,7 +90,6 @@ func (client TopicTypesClient) GetSender(req *http.Request) (*http.Response, err autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client TopicTypesClient) GetResponder(resp *http.Response) (result TopicTypeInfo, err error) { @@ -110,7 +103,6 @@ func (client TopicTypesClient) GetResponder(resp *http.Response) (result TopicTy return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // List list all registered topic types func (client TopicTypesClient) List(ctx context.Context) (result TopicTypesListResult, err error) { req, err := client.ListPreparer(ctx) @@ -134,10 +126,9 @@ func (client TopicTypesClient) List(ctx context.Context) (result TopicTypesListR return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListPreparer prepares the List request. func (client TopicTypesClient) ListPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -150,7 +141,6 @@ func (client TopicTypesClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client TopicTypesClient) ListSender(req *http.Request) (*http.Response, error) { @@ -158,7 +148,6 @@ func (client TopicTypesClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client TopicTypesClient) ListResponder(resp *http.Response) (result TopicTypesListResult, err error) { @@ -172,10 +161,9 @@ func (client TopicTypesClient) ListResponder(resp *http.Response) (result TopicT return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypes list event types for a topic type -// -// topicTypeName is name of the topic type +// Parameters: +// topicTypeName - name of the topic type func (client TopicTypesClient) ListEventTypes(ctx context.Context, topicTypeName string) (result EventTypesListResult, err error) { req, err := client.ListEventTypesPreparer(ctx, topicTypeName) if err != nil { @@ -198,14 +186,13 @@ func (client TopicTypesClient) ListEventTypes(ctx context.Context, topicTypeName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypesPreparer prepares the ListEventTypes request. func (client TopicTypesClient) ListEventTypesPreparer(ctx context.Context, topicTypeName string) (*http.Request, error) { pathParameters := map[string]interface{}{ "topicTypeName": autorest.Encode("path", topicTypeName), } - const APIVersion = "2017-09-15-preview" + const APIVersion = "2018-01-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -218,7 +205,6 @@ func (client TopicTypesClient) ListEventTypesPreparer(ctx context.Context, topic return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypesSender sends the ListEventTypes request. The method will close the // http.Response Body if it receives an error. func (client TopicTypesClient) ListEventTypesSender(req *http.Request) (*http.Response, error) { @@ -226,7 +212,6 @@ func (client TopicTypesClient) ListEventTypesSender(req *http.Request) (*http.Re autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // ListEventTypesResponder handles the response to the ListEventTypes request. The method always // closes the http.Response Body. func (client TopicTypesClient) ListEventTypesResponder(resp *http.Response) (result EventTypesListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/version.go similarity index 75% rename from vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/version.go index 62d31fdb7876..12eed0452075 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/version.go @@ -18,13 +18,12 @@ import "github.com/Azure/azure-sdk-for-go/version" // // Code generated by Microsoft (R) AutoRest Code Generator. // Changes may cause incorrect behavior and will be lost if the code is regenerated. -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. + // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " eventgrid/2017-09-15-preview" + return "Azure-SDK-For-Go/" + version.Number + " eventgrid/2018-01-01" } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid instead. // Version returns the semantic version (see http://semver.org) of the client. func Version() string { return version.Number diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/actiongroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/actiongroups.go similarity index 90% rename from vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/actiongroups.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/actiongroups.go index 0d3031bab37b..73ce7da423be 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/actiongroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/actiongroups.go @@ -25,25 +25,25 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActionGroupsClient is the monitor Management Client type ActionGroupsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewActionGroupsClient creates an instance of the ActionGroupsClient client. func NewActionGroupsClient(subscriptionID string) ActionGroupsClient { return NewActionGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewActionGroupsClientWithBaseURI creates an instance of the ActionGroupsClient client. func NewActionGroupsClientWithBaseURI(baseURI string, subscriptionID string) ActionGroupsClient { return ActionGroupsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdate create a new action group or update an existing one. // // resourceGroupName is the name of the resource group. actionGroupName is the name of the action group. @@ -80,7 +80,7 @@ func (client ActionGroupsClient) CreateOrUpdate(ctx context.Context, resourceGro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ActionGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, actionGroupName string, actionGroup ActionGroupResource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -89,7 +89,7 @@ func (client ActionGroupsClient) CreateOrUpdatePreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-01" + const APIVersion = "2018-03-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -104,7 +104,7 @@ func (client ActionGroupsClient) CreateOrUpdatePreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -112,7 +112,7 @@ func (client ActionGroupsClient) CreateOrUpdateSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ActionGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result ActionGroupResource, err error) { @@ -126,7 +126,7 @@ func (client ActionGroupsClient) CreateOrUpdateResponder(resp *http.Response) (r return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Delete delete an action group. // // resourceGroupName is the name of the resource group. actionGroupName is the name of the action group. @@ -152,7 +152,7 @@ func (client ActionGroupsClient) Delete(ctx context.Context, resourceGroupName s return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeletePreparer prepares the Delete request. func (client ActionGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, actionGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -161,7 +161,7 @@ func (client ActionGroupsClient) DeletePreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-01" + const APIVersion = "2018-03-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -174,7 +174,7 @@ func (client ActionGroupsClient) DeletePreparer(ctx context.Context, resourceGro return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -182,7 +182,7 @@ func (client ActionGroupsClient) DeleteSender(req *http.Request) (*http.Response azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ActionGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -195,8 +195,9 @@ func (client ActionGroupsClient) DeleteResponder(resp *http.Response) (result au return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // EnableReceiver enable a receiver in an action group. This changes the receiver's status from Disabled to Enabled. +// This operation is only supported for Email or SMS receivers. // // resourceGroupName is the name of the resource group. actionGroupName is the name of the action group. // enableRequest is the receiver to re-enable. @@ -228,7 +229,7 @@ func (client ActionGroupsClient) EnableReceiver(ctx context.Context, resourceGro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // EnableReceiverPreparer prepares the EnableReceiver request. func (client ActionGroupsClient) EnableReceiverPreparer(ctx context.Context, resourceGroupName string, actionGroupName string, enableRequest EnableRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -237,7 +238,7 @@ func (client ActionGroupsClient) EnableReceiverPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-01" + const APIVersion = "2018-03-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -252,7 +253,7 @@ func (client ActionGroupsClient) EnableReceiverPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // EnableReceiverSender sends the EnableReceiver request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) EnableReceiverSender(req *http.Request) (*http.Response, error) { @@ -260,7 +261,7 @@ func (client ActionGroupsClient) EnableReceiverSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // EnableReceiverResponder handles the response to the EnableReceiver request. The method always // closes the http.Response Body. func (client ActionGroupsClient) EnableReceiverResponder(resp *http.Response) (result autorest.Response, err error) { @@ -273,7 +274,7 @@ func (client ActionGroupsClient) EnableReceiverResponder(resp *http.Response) (r return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Get get an action group. // // resourceGroupName is the name of the resource group. actionGroupName is the name of the action group. @@ -299,7 +300,7 @@ func (client ActionGroupsClient) Get(ctx context.Context, resourceGroupName stri return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetPreparer prepares the Get request. func (client ActionGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, actionGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -308,7 +309,7 @@ func (client ActionGroupsClient) GetPreparer(ctx context.Context, resourceGroupN "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-01" + const APIVersion = "2018-03-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -321,7 +322,7 @@ func (client ActionGroupsClient) GetPreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -329,7 +330,7 @@ func (client ActionGroupsClient) GetSender(req *http.Request) (*http.Response, e azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ActionGroupsClient) GetResponder(resp *http.Response) (result ActionGroupResource, err error) { @@ -343,7 +344,7 @@ func (client ActionGroupsClient) GetResponder(resp *http.Response) (result Actio return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroup get a list of all action groups in a resource group. // // resourceGroupName is the name of the resource group. @@ -369,7 +370,7 @@ func (client ActionGroupsClient) ListByResourceGroup(ctx context.Context, resour return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client ActionGroupsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -377,7 +378,7 @@ func (client ActionGroupsClient) ListByResourceGroupPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-01" + const APIVersion = "2018-03-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -390,7 +391,7 @@ func (client ActionGroupsClient) ListByResourceGroupPreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -398,7 +399,7 @@ func (client ActionGroupsClient) ListByResourceGroupSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client ActionGroupsClient) ListByResourceGroupResponder(resp *http.Response) (result ActionGroupList, err error) { @@ -412,7 +413,7 @@ func (client ActionGroupsClient) ListByResourceGroupResponder(resp *http.Respons return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListBySubscriptionID get a list of all action groups in a subscription. func (client ActionGroupsClient) ListBySubscriptionID(ctx context.Context) (result ActionGroupList, err error) { req, err := client.ListBySubscriptionIDPreparer(ctx) @@ -436,14 +437,14 @@ func (client ActionGroupsClient) ListBySubscriptionID(ctx context.Context) (resu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListBySubscriptionIDPreparer prepares the ListBySubscriptionID request. func (client ActionGroupsClient) ListBySubscriptionIDPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-01" + const APIVersion = "2018-03-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -456,7 +457,7 @@ func (client ActionGroupsClient) ListBySubscriptionIDPreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListBySubscriptionIDSender sends the ListBySubscriptionID request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) ListBySubscriptionIDSender(req *http.Request) (*http.Response, error) { @@ -464,7 +465,7 @@ func (client ActionGroupsClient) ListBySubscriptionIDSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListBySubscriptionIDResponder handles the response to the ListBySubscriptionID request. The method always // closes the http.Response Body. func (client ActionGroupsClient) ListBySubscriptionIDResponder(resp *http.Response) (result ActionGroupList, err error) { @@ -478,7 +479,7 @@ func (client ActionGroupsClient) ListBySubscriptionIDResponder(resp *http.Respon return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Update updates an existing action group's tags. To update other fields use the CreateOrUpdate method. // // resourceGroupName is the name of the resource group. actionGroupName is the name of the action group. @@ -505,7 +506,7 @@ func (client ActionGroupsClient) Update(ctx context.Context, resourceGroupName s return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdatePreparer prepares the Update request. func (client ActionGroupsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, actionGroupName string, actionGroupPatch ActionGroupPatchBody) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -514,7 +515,7 @@ func (client ActionGroupsClient) UpdatePreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2017-04-01" + const APIVersion = "2018-03-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -529,7 +530,7 @@ func (client ActionGroupsClient) UpdatePreparer(ctx context.Context, resourceGro return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ActionGroupsClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -537,7 +538,7 @@ func (client ActionGroupsClient) UpdateSender(req *http.Request) (*http.Response azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client ActionGroupsClient) UpdateResponder(resp *http.Response) (result ActionGroupResource, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/activitylogalerts.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/activitylogalerts.go similarity index 91% rename from vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/activitylogalerts.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/activitylogalerts.go index ce4ed0650ab5..39607aa23c69 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/activitylogalerts.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/activitylogalerts.go @@ -25,25 +25,25 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActivityLogAlertsClient is the monitor Management Client type ActivityLogAlertsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewActivityLogAlertsClient creates an instance of the ActivityLogAlertsClient client. func NewActivityLogAlertsClient(subscriptionID string) ActivityLogAlertsClient { return NewActivityLogAlertsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewActivityLogAlertsClientWithBaseURI creates an instance of the ActivityLogAlertsClient client. func NewActivityLogAlertsClientWithBaseURI(baseURI string, subscriptionID string) ActivityLogAlertsClient { return ActivityLogAlertsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdate create a new activity log alert or update an existing one. // // resourceGroupName is the name of the resource group. activityLogAlertName is the name of the activity log alert. @@ -81,7 +81,7 @@ func (client ActivityLogAlertsClient) CreateOrUpdate(ctx context.Context, resour return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ActivityLogAlertsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, activityLogAlertName string, activityLogAlert ActivityLogAlertResource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -105,7 +105,7 @@ func (client ActivityLogAlertsClient) CreateOrUpdatePreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ActivityLogAlertsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -113,7 +113,7 @@ func (client ActivityLogAlertsClient) CreateOrUpdateSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ActivityLogAlertsClient) CreateOrUpdateResponder(resp *http.Response) (result ActivityLogAlertResource, err error) { @@ -127,7 +127,7 @@ func (client ActivityLogAlertsClient) CreateOrUpdateResponder(resp *http.Respons return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Delete delete an activity log alert. // // resourceGroupName is the name of the resource group. activityLogAlertName is the name of the activity log alert. @@ -153,7 +153,7 @@ func (client ActivityLogAlertsClient) Delete(ctx context.Context, resourceGroupN return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeletePreparer prepares the Delete request. func (client ActivityLogAlertsClient) DeletePreparer(ctx context.Context, resourceGroupName string, activityLogAlertName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -175,7 +175,7 @@ func (client ActivityLogAlertsClient) DeletePreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ActivityLogAlertsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -183,7 +183,7 @@ func (client ActivityLogAlertsClient) DeleteSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ActivityLogAlertsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -196,7 +196,7 @@ func (client ActivityLogAlertsClient) DeleteResponder(resp *http.Response) (resu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Get get an activity log alert. // // resourceGroupName is the name of the resource group. activityLogAlertName is the name of the activity log alert. @@ -222,7 +222,7 @@ func (client ActivityLogAlertsClient) Get(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetPreparer prepares the Get request. func (client ActivityLogAlertsClient) GetPreparer(ctx context.Context, resourceGroupName string, activityLogAlertName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -244,7 +244,7 @@ func (client ActivityLogAlertsClient) GetPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ActivityLogAlertsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -252,7 +252,7 @@ func (client ActivityLogAlertsClient) GetSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ActivityLogAlertsClient) GetResponder(resp *http.Response) (result ActivityLogAlertResource, err error) { @@ -266,7 +266,7 @@ func (client ActivityLogAlertsClient) GetResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroup get a list of all activity log alerts in a resource group. // // resourceGroupName is the name of the resource group. @@ -292,7 +292,7 @@ func (client ActivityLogAlertsClient) ListByResourceGroup(ctx context.Context, r return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client ActivityLogAlertsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -313,7 +313,7 @@ func (client ActivityLogAlertsClient) ListByResourceGroupPreparer(ctx context.Co return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client ActivityLogAlertsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -321,7 +321,7 @@ func (client ActivityLogAlertsClient) ListByResourceGroupSender(req *http.Reques azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client ActivityLogAlertsClient) ListByResourceGroupResponder(resp *http.Response) (result ActivityLogAlertList, err error) { @@ -335,7 +335,7 @@ func (client ActivityLogAlertsClient) ListByResourceGroupResponder(resp *http.Re return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListBySubscriptionID get a list of all activity log alerts in a subscription. func (client ActivityLogAlertsClient) ListBySubscriptionID(ctx context.Context) (result ActivityLogAlertList, err error) { req, err := client.ListBySubscriptionIDPreparer(ctx) @@ -359,7 +359,7 @@ func (client ActivityLogAlertsClient) ListBySubscriptionID(ctx context.Context) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListBySubscriptionIDPreparer prepares the ListBySubscriptionID request. func (client ActivityLogAlertsClient) ListBySubscriptionIDPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -379,7 +379,7 @@ func (client ActivityLogAlertsClient) ListBySubscriptionIDPreparer(ctx context.C return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListBySubscriptionIDSender sends the ListBySubscriptionID request. The method will close the // http.Response Body if it receives an error. func (client ActivityLogAlertsClient) ListBySubscriptionIDSender(req *http.Request) (*http.Response, error) { @@ -387,7 +387,7 @@ func (client ActivityLogAlertsClient) ListBySubscriptionIDSender(req *http.Reque azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListBySubscriptionIDResponder handles the response to the ListBySubscriptionID request. The method always // closes the http.Response Body. func (client ActivityLogAlertsClient) ListBySubscriptionIDResponder(resp *http.Response) (result ActivityLogAlertList, err error) { @@ -401,7 +401,7 @@ func (client ActivityLogAlertsClient) ListBySubscriptionIDResponder(resp *http.R return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Update updates an existing ActivityLogAlertResource's tags. To update other fields use the CreateOrUpdate method. // // resourceGroupName is the name of the resource group. activityLogAlertName is the name of the activity log alert. @@ -428,7 +428,7 @@ func (client ActivityLogAlertsClient) Update(ctx context.Context, resourceGroupN return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdatePreparer prepares the Update request. func (client ActivityLogAlertsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, activityLogAlertName string, activityLogAlertPatch ActivityLogAlertPatchBody) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -452,7 +452,7 @@ func (client ActivityLogAlertsClient) UpdatePreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ActivityLogAlertsClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -460,7 +460,7 @@ func (client ActivityLogAlertsClient) UpdateSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client ActivityLogAlertsClient) UpdateResponder(resp *http.Response) (result ActivityLogAlertResource, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/activitylogs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/activitylogs.go new file mode 100644 index 000000000000..a3dc0a685444 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/activitylogs.go @@ -0,0 +1,160 @@ +package insights + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ActivityLogsClient is the monitor Management Client +type ActivityLogsClient struct { + BaseClient +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NewActivityLogsClient creates an instance of the ActivityLogsClient client. +func NewActivityLogsClient(subscriptionID string) ActivityLogsClient { + return NewActivityLogsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NewActivityLogsClientWithBaseURI creates an instance of the ActivityLogsClient client. +func NewActivityLogsClientWithBaseURI(baseURI string, subscriptionID string) ActivityLogsClient { + return ActivityLogsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// List provides the list of records from the activity logs. +// +// filter is reduces the set of data collected.
    The **$filter** argument is very restricted and allows only the +// following patterns.
    - *List events for a resource group*: $filter=eventTimestamp ge +// '2014-07-16T04:36:37.6407898Z' and eventTimestamp le '2014-07-20T04:36:37.6407898Z' and resourceGroupName eq +// 'resourceGroupName'.
    - *List events for resource*: $filter=eventTimestamp ge '2014-07-16T04:36:37.6407898Z' +// and eventTimestamp le '2014-07-20T04:36:37.6407898Z' and resourceUri eq 'resourceURI'.
    - *List events for a +// subscription in a time range*: $filter=eventTimestamp ge '2014-07-16T04:36:37.6407898Z' and eventTimestamp le +// '2014-07-20T04:36:37.6407898Z'.
    - *List events for a resource provider*: $filter=eventTimestamp ge +// '2014-07-16T04:36:37.6407898Z' and eventTimestamp le '2014-07-20T04:36:37.6407898Z' and resourceProvider eq +// 'resourceProviderName'.
    - *List events for a correlation Id*: $filter=eventTimestamp ge +// '2014-07-16T04:36:37.6407898Z' and eventTimestamp le '2014-07-20T04:36:37.6407898Z' and correlationId eq +// 'correlationID'.

    **NOTE**: No other syntax is allowed. selectParameter is used to fetch events with only +// the given properties.
    The **$select** argument is a comma separated list of property names to be returned. +// Possible values are: *authorization*, *claims*, *correlationId*, *description*, *eventDataId*, *eventName*, +// *eventTimestamp*, *httpRequest*, *level*, *operationId*, *operationName*, *properties*, *resourceGroupName*, +// *resourceProviderName*, *resourceId*, *status*, *submissionTimestamp*, *subStatus*, *subscriptionId* +func (client ActivityLogsClient) List(ctx context.Context, filter string, selectParameter string) (result EventDataCollectionPage, err error) { + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx, filter, selectParameter) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.ActivityLogsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.edc.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.ActivityLogsClient", "List", resp, "Failure sending request") + return + } + + result.edc, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.ActivityLogsClient", "List", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListPreparer prepares the List request. +func (client ActivityLogsClient) ListPreparer(ctx context.Context, filter string, selectParameter string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(filter) > 0 { + queryParameters["$filter"] = autorest.Encode("query", filter) + } + if len(selectParameter) > 0 { + queryParameters["$select"] = autorest.Encode("query", selectParameter) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/microsoft.insights/eventtypes/management/values", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client ActivityLogsClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client ActivityLogsClient) ListResponder(resp *http.Response) (result EventDataCollection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client ActivityLogsClient) listNextResults(lastResults EventDataCollection) (result EventDataCollection, err error) { + req, err := lastResults.eventDataCollectionPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "insights.ActivityLogsClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "insights.ActivityLogsClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.ActivityLogsClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client ActivityLogsClient) ListComplete(ctx context.Context, filter string, selectParameter string) (result EventDataCollectionIterator, err error) { + result.page, err = client.List(ctx, filter, selectParameter) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertruleincidents.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/alertruleincidents.go similarity index 91% rename from vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertruleincidents.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/alertruleincidents.go index 5a14d2e05375..dd61e7141934 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertruleincidents.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/alertruleincidents.go @@ -24,25 +24,25 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AlertRuleIncidentsClient is the monitor Management Client type AlertRuleIncidentsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewAlertRuleIncidentsClient creates an instance of the AlertRuleIncidentsClient client. func NewAlertRuleIncidentsClient(subscriptionID string) AlertRuleIncidentsClient { return NewAlertRuleIncidentsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewAlertRuleIncidentsClientWithBaseURI creates an instance of the AlertRuleIncidentsClient client. func NewAlertRuleIncidentsClientWithBaseURI(baseURI string, subscriptionID string) AlertRuleIncidentsClient { return AlertRuleIncidentsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Get gets an incident associated to an alert rule // // resourceGroupName is the name of the resource group. ruleName is the name of the rule. incidentName is the name @@ -69,7 +69,7 @@ func (client AlertRuleIncidentsClient) Get(ctx context.Context, resourceGroupNam return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetPreparer prepares the Get request. func (client AlertRuleIncidentsClient) GetPreparer(ctx context.Context, resourceGroupName string, ruleName string, incidentName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -92,7 +92,7 @@ func (client AlertRuleIncidentsClient) GetPreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client AlertRuleIncidentsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -100,7 +100,7 @@ func (client AlertRuleIncidentsClient) GetSender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client AlertRuleIncidentsClient) GetResponder(resp *http.Response) (result Incident, err error) { @@ -114,7 +114,7 @@ func (client AlertRuleIncidentsClient) GetResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByAlertRule gets a list of incidents associated to an alert rule // // resourceGroupName is the name of the resource group. ruleName is the name of the rule. @@ -140,7 +140,7 @@ func (client AlertRuleIncidentsClient) ListByAlertRule(ctx context.Context, reso return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByAlertRulePreparer prepares the ListByAlertRule request. func (client AlertRuleIncidentsClient) ListByAlertRulePreparer(ctx context.Context, resourceGroupName string, ruleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -162,7 +162,7 @@ func (client AlertRuleIncidentsClient) ListByAlertRulePreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByAlertRuleSender sends the ListByAlertRule request. The method will close the // http.Response Body if it receives an error. func (client AlertRuleIncidentsClient) ListByAlertRuleSender(req *http.Request) (*http.Response, error) { @@ -170,7 +170,7 @@ func (client AlertRuleIncidentsClient) ListByAlertRuleSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByAlertRuleResponder handles the response to the ListByAlertRule request. The method always // closes the http.Response Body. func (client AlertRuleIncidentsClient) ListByAlertRuleResponder(resp *http.Response) (result IncidentListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/alertrules.go similarity index 91% rename from vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertrules.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/alertrules.go index f31713af2eaf..37b44ad183dc 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/alertrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/alertrules.go @@ -25,25 +25,25 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AlertRulesClient is the monitor Management Client type AlertRulesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewAlertRulesClient creates an instance of the AlertRulesClient client. func NewAlertRulesClient(subscriptionID string) AlertRulesClient { return NewAlertRulesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewAlertRulesClientWithBaseURI creates an instance of the AlertRulesClient client. func NewAlertRulesClientWithBaseURI(baseURI string, subscriptionID string) AlertRulesClient { return AlertRulesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdate creates or updates an alert rule. // // resourceGroupName is the name of the resource group. ruleName is the name of the rule. parameters is the @@ -80,7 +80,7 @@ func (client AlertRulesClient) CreateOrUpdate(ctx context.Context, resourceGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client AlertRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, ruleName string, parameters AlertRuleResource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -104,7 +104,7 @@ func (client AlertRulesClient) CreateOrUpdatePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client AlertRulesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -112,7 +112,7 @@ func (client AlertRulesClient) CreateOrUpdateSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client AlertRulesClient) CreateOrUpdateResponder(resp *http.Response) (result AlertRuleResource, err error) { @@ -126,7 +126,7 @@ func (client AlertRulesClient) CreateOrUpdateResponder(resp *http.Response) (res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Delete deletes an alert rule // // resourceGroupName is the name of the resource group. ruleName is the name of the rule. @@ -152,7 +152,7 @@ func (client AlertRulesClient) Delete(ctx context.Context, resourceGroupName str return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeletePreparer prepares the Delete request. func (client AlertRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, ruleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -174,7 +174,7 @@ func (client AlertRulesClient) DeletePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client AlertRulesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -182,7 +182,7 @@ func (client AlertRulesClient) DeleteSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client AlertRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -195,7 +195,7 @@ func (client AlertRulesClient) DeleteResponder(resp *http.Response) (result auto return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Get gets an alert rule // // resourceGroupName is the name of the resource group. ruleName is the name of the rule. @@ -221,7 +221,7 @@ func (client AlertRulesClient) Get(ctx context.Context, resourceGroupName string return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetPreparer prepares the Get request. func (client AlertRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, ruleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -243,7 +243,7 @@ func (client AlertRulesClient) GetPreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client AlertRulesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -251,7 +251,7 @@ func (client AlertRulesClient) GetSender(req *http.Request) (*http.Response, err azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client AlertRulesClient) GetResponder(resp *http.Response) (result AlertRuleResource, err error) { @@ -265,7 +265,7 @@ func (client AlertRulesClient) GetResponder(resp *http.Response) (result AlertRu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroup list the alert rules within a resource group. // // resourceGroupName is the name of the resource group. @@ -291,7 +291,7 @@ func (client AlertRulesClient) ListByResourceGroup(ctx context.Context, resource return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client AlertRulesClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -312,7 +312,7 @@ func (client AlertRulesClient) ListByResourceGroupPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client AlertRulesClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -320,7 +320,7 @@ func (client AlertRulesClient) ListByResourceGroupSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client AlertRulesClient) ListByResourceGroupResponder(resp *http.Response) (result AlertRuleResourceCollection, err error) { @@ -334,7 +334,7 @@ func (client AlertRulesClient) ListByResourceGroupResponder(resp *http.Response) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Update updates an existing AlertRuleResource. To update other fields use the CreateOrUpdate method. // // resourceGroupName is the name of the resource group. ruleName is the name of the rule. alertRulesResource is @@ -361,7 +361,7 @@ func (client AlertRulesClient) Update(ctx context.Context, resourceGroupName str return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdatePreparer prepares the Update request. func (client AlertRulesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, ruleName string, alertRulesResource AlertRuleResourcePatch) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -385,7 +385,7 @@ func (client AlertRulesClient) UpdatePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client AlertRulesClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -393,7 +393,7 @@ func (client AlertRulesClient) UpdateSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client AlertRulesClient) UpdateResponder(resp *http.Response) (result AlertRuleResource, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/autoscalesettings.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/autoscalesettings.go similarity index 92% rename from vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/autoscalesettings.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/autoscalesettings.go index 679a101c7b8e..5214fcb457e5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/autoscalesettings.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/autoscalesettings.go @@ -25,25 +25,25 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AutoscaleSettingsClient is the monitor Management Client type AutoscaleSettingsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewAutoscaleSettingsClient creates an instance of the AutoscaleSettingsClient client. func NewAutoscaleSettingsClient(subscriptionID string) AutoscaleSettingsClient { return NewAutoscaleSettingsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewAutoscaleSettingsClientWithBaseURI creates an instance of the AutoscaleSettingsClient client. func NewAutoscaleSettingsClientWithBaseURI(baseURI string, subscriptionID string) AutoscaleSettingsClient { return AutoscaleSettingsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdate creates or updates an autoscale setting. // // resourceGroupName is the name of the resource group. autoscaleSettingName is the autoscale setting name. @@ -79,7 +79,7 @@ func (client AutoscaleSettingsClient) CreateOrUpdate(ctx context.Context, resour return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client AutoscaleSettingsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, autoscaleSettingName string, parameters AutoscaleSettingResource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -103,7 +103,7 @@ func (client AutoscaleSettingsClient) CreateOrUpdatePreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client AutoscaleSettingsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -111,7 +111,7 @@ func (client AutoscaleSettingsClient) CreateOrUpdateSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client AutoscaleSettingsClient) CreateOrUpdateResponder(resp *http.Response) (result AutoscaleSettingResource, err error) { @@ -125,7 +125,7 @@ func (client AutoscaleSettingsClient) CreateOrUpdateResponder(resp *http.Respons return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Delete deletes and autoscale setting // // resourceGroupName is the name of the resource group. autoscaleSettingName is the autoscale setting name. @@ -151,7 +151,7 @@ func (client AutoscaleSettingsClient) Delete(ctx context.Context, resourceGroupN return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeletePreparer prepares the Delete request. func (client AutoscaleSettingsClient) DeletePreparer(ctx context.Context, resourceGroupName string, autoscaleSettingName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -173,7 +173,7 @@ func (client AutoscaleSettingsClient) DeletePreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client AutoscaleSettingsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -181,7 +181,7 @@ func (client AutoscaleSettingsClient) DeleteSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client AutoscaleSettingsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -194,7 +194,7 @@ func (client AutoscaleSettingsClient) DeleteResponder(resp *http.Response) (resu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Get gets an autoscale setting // // resourceGroupName is the name of the resource group. autoscaleSettingName is the autoscale setting name. @@ -220,7 +220,7 @@ func (client AutoscaleSettingsClient) Get(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetPreparer prepares the Get request. func (client AutoscaleSettingsClient) GetPreparer(ctx context.Context, resourceGroupName string, autoscaleSettingName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -242,7 +242,7 @@ func (client AutoscaleSettingsClient) GetPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client AutoscaleSettingsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -250,7 +250,7 @@ func (client AutoscaleSettingsClient) GetSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client AutoscaleSettingsClient) GetResponder(resp *http.Response) (result AutoscaleSettingResource, err error) { @@ -264,7 +264,7 @@ func (client AutoscaleSettingsClient) GetResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroup lists the autoscale settings for a resource group // // resourceGroupName is the name of the resource group. @@ -291,7 +291,7 @@ func (client AutoscaleSettingsClient) ListByResourceGroup(ctx context.Context, r return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client AutoscaleSettingsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -312,7 +312,7 @@ func (client AutoscaleSettingsClient) ListByResourceGroupPreparer(ctx context.Co return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client AutoscaleSettingsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -320,7 +320,7 @@ func (client AutoscaleSettingsClient) ListByResourceGroupSender(req *http.Reques azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client AutoscaleSettingsClient) ListByResourceGroupResponder(resp *http.Response) (result AutoscaleSettingResourceCollection, err error) { @@ -355,14 +355,14 @@ func (client AutoscaleSettingsClient) listByResourceGroupNextResults(lastResults return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. func (client AutoscaleSettingsClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result AutoscaleSettingResourceCollectionIterator, err error) { result.page, err = client.ListByResourceGroup(ctx, resourceGroupName) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Update updates an existing AutoscaleSettingsResource. To update other fields use the CreateOrUpdate method. // // resourceGroupName is the name of the resource group. autoscaleSettingName is the autoscale setting name. @@ -389,7 +389,7 @@ func (client AutoscaleSettingsClient) Update(ctx context.Context, resourceGroupN return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdatePreparer prepares the Update request. func (client AutoscaleSettingsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, autoscaleSettingName string, autoscaleSettingResource AutoscaleSettingResourcePatch) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -413,7 +413,7 @@ func (client AutoscaleSettingsClient) UpdatePreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client AutoscaleSettingsClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -421,7 +421,7 @@ func (client AutoscaleSettingsClient) UpdateSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client AutoscaleSettingsClient) UpdateResponder(resp *http.Response) (result AutoscaleSettingResource, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/client.go similarity index 89% rename from vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/client.go index bf56ea6ed5e9..c5a0ad53b020 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/client.go @@ -29,7 +29,7 @@ const ( DefaultBaseURI = "https://management.azure.com" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // BaseClient is the base client for Insights. type BaseClient struct { autorest.Client @@ -37,13 +37,13 @@ type BaseClient struct { SubscriptionID string } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // New creates an instance of the BaseClient client. func New(subscriptionID string) BaseClient { return NewWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewWithBaseURI creates an instance of the BaseClient client. func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { return BaseClient{ diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettings.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/diagnosticsettings.go similarity index 89% rename from vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettings.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/diagnosticsettings.go index 0655ffd3f034..d1d90bf0416a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettings.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/diagnosticsettings.go @@ -24,25 +24,25 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DiagnosticSettingsClient is the monitor Management Client type DiagnosticSettingsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewDiagnosticSettingsClient creates an instance of the DiagnosticSettingsClient client. func NewDiagnosticSettingsClient(subscriptionID string) DiagnosticSettingsClient { return NewDiagnosticSettingsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewDiagnosticSettingsClientWithBaseURI creates an instance of the DiagnosticSettingsClient client. func NewDiagnosticSettingsClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticSettingsClient { return DiagnosticSettingsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdate creates or updates diagnostic settings for the specified resource. // // resourceURI is the identifier of the resource. parameters is parameters supplied to the operation. name is the @@ -69,12 +69,12 @@ func (client DiagnosticSettingsClient) CreateOrUpdate(ctx context.Context, resou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DiagnosticSettingsClient) CreateOrUpdatePreparer(ctx context.Context, resourceURI string, parameters DiagnosticSettingsResource, name string) (*http.Request, error) { pathParameters := map[string]interface{}{ "name": autorest.Encode("path", name), - "resourceUri": autorest.Encode("path", resourceURI), + "resourceUri": resourceURI, } const APIVersion = "2017-05-01-preview" @@ -92,7 +92,7 @@ func (client DiagnosticSettingsClient) CreateOrUpdatePreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DiagnosticSettingsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -100,7 +100,7 @@ func (client DiagnosticSettingsClient) CreateOrUpdateSender(req *http.Request) ( autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DiagnosticSettingsClient) CreateOrUpdateResponder(resp *http.Response) (result DiagnosticSettingsResource, err error) { @@ -114,7 +114,7 @@ func (client DiagnosticSettingsClient) CreateOrUpdateResponder(resp *http.Respon return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Delete deletes existing diagnostic settings for the specified resource. // // resourceURI is the identifier of the resource. name is the name of the diagnostic setting. @@ -140,12 +140,12 @@ func (client DiagnosticSettingsClient) Delete(ctx context.Context, resourceURI s return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeletePreparer prepares the Delete request. func (client DiagnosticSettingsClient) DeletePreparer(ctx context.Context, resourceURI string, name string) (*http.Request, error) { pathParameters := map[string]interface{}{ "name": autorest.Encode("path", name), - "resourceUri": autorest.Encode("path", resourceURI), + "resourceUri": resourceURI, } const APIVersion = "2017-05-01-preview" @@ -161,7 +161,7 @@ func (client DiagnosticSettingsClient) DeletePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client DiagnosticSettingsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -169,7 +169,7 @@ func (client DiagnosticSettingsClient) DeleteSender(req *http.Request) (*http.Re autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client DiagnosticSettingsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -182,7 +182,7 @@ func (client DiagnosticSettingsClient) DeleteResponder(resp *http.Response) (res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Get gets the active diagnostic settings for the specified resource. // // resourceURI is the identifier of the resource. name is the name of the diagnostic setting. @@ -208,12 +208,12 @@ func (client DiagnosticSettingsClient) Get(ctx context.Context, resourceURI stri return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetPreparer prepares the Get request. func (client DiagnosticSettingsClient) GetPreparer(ctx context.Context, resourceURI string, name string) (*http.Request, error) { pathParameters := map[string]interface{}{ "name": autorest.Encode("path", name), - "resourceUri": autorest.Encode("path", resourceURI), + "resourceUri": resourceURI, } const APIVersion = "2017-05-01-preview" @@ -229,7 +229,7 @@ func (client DiagnosticSettingsClient) GetPreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DiagnosticSettingsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -237,7 +237,7 @@ func (client DiagnosticSettingsClient) GetSender(req *http.Request) (*http.Respo autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DiagnosticSettingsClient) GetResponder(resp *http.Response) (result DiagnosticSettingsResource, err error) { @@ -251,7 +251,7 @@ func (client DiagnosticSettingsClient) GetResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // List gets the active diagnostic settings list for the specified resource. // // resourceURI is the identifier of the resource. @@ -277,11 +277,11 @@ func (client DiagnosticSettingsClient) List(ctx context.Context, resourceURI str return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListPreparer prepares the List request. func (client DiagnosticSettingsClient) ListPreparer(ctx context.Context, resourceURI string) (*http.Request, error) { pathParameters := map[string]interface{}{ - "resourceUri": autorest.Encode("path", resourceURI), + "resourceUri": resourceURI, } const APIVersion = "2017-05-01-preview" @@ -297,7 +297,7 @@ func (client DiagnosticSettingsClient) ListPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client DiagnosticSettingsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -305,7 +305,7 @@ func (client DiagnosticSettingsClient) ListSender(req *http.Request) (*http.Resp autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client DiagnosticSettingsClient) ListResponder(resp *http.Response) (result DiagnosticSettingsResourceCollection, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettingscategory.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/diagnosticsettingscategory.go similarity index 89% rename from vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettingscategory.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/diagnosticsettingscategory.go index a93d8a64bd4b..c45ce4c2181e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/diagnosticsettingscategory.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/diagnosticsettingscategory.go @@ -24,25 +24,25 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DiagnosticSettingsCategoryClient is the monitor Management Client type DiagnosticSettingsCategoryClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewDiagnosticSettingsCategoryClient creates an instance of the DiagnosticSettingsCategoryClient client. func NewDiagnosticSettingsCategoryClient(subscriptionID string) DiagnosticSettingsCategoryClient { return NewDiagnosticSettingsCategoryClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewDiagnosticSettingsCategoryClientWithBaseURI creates an instance of the DiagnosticSettingsCategoryClient client. func NewDiagnosticSettingsCategoryClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticSettingsCategoryClient { return DiagnosticSettingsCategoryClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Get gets the diagnostic settings category for the specified resource. // // resourceURI is the identifier of the resource. name is the name of the diagnostic setting. @@ -68,12 +68,12 @@ func (client DiagnosticSettingsCategoryClient) Get(ctx context.Context, resource return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetPreparer prepares the Get request. func (client DiagnosticSettingsCategoryClient) GetPreparer(ctx context.Context, resourceURI string, name string) (*http.Request, error) { pathParameters := map[string]interface{}{ "name": autorest.Encode("path", name), - "resourceUri": autorest.Encode("path", resourceURI), + "resourceUri": resourceURI, } const APIVersion = "2017-05-01-preview" @@ -89,7 +89,7 @@ func (client DiagnosticSettingsCategoryClient) GetPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DiagnosticSettingsCategoryClient) GetSender(req *http.Request) (*http.Response, error) { @@ -97,7 +97,7 @@ func (client DiagnosticSettingsCategoryClient) GetSender(req *http.Request) (*ht autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DiagnosticSettingsCategoryClient) GetResponder(resp *http.Response) (result DiagnosticSettingsCategoryResource, err error) { @@ -111,7 +111,7 @@ func (client DiagnosticSettingsCategoryClient) GetResponder(resp *http.Response) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // List lists the diagnostic settings categories for the specified resource. // // resourceURI is the identifier of the resource. @@ -137,11 +137,11 @@ func (client DiagnosticSettingsCategoryClient) List(ctx context.Context, resourc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListPreparer prepares the List request. func (client DiagnosticSettingsCategoryClient) ListPreparer(ctx context.Context, resourceURI string) (*http.Request, error) { pathParameters := map[string]interface{}{ - "resourceUri": autorest.Encode("path", resourceURI), + "resourceUri": resourceURI, } const APIVersion = "2017-05-01-preview" @@ -157,7 +157,7 @@ func (client DiagnosticSettingsCategoryClient) ListPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client DiagnosticSettingsCategoryClient) ListSender(req *http.Request) (*http.Response, error) { @@ -165,7 +165,7 @@ func (client DiagnosticSettingsCategoryClient) ListSender(req *http.Request) (*h autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client DiagnosticSettingsCategoryClient) ListResponder(resp *http.Response) (result DiagnosticSettingsCategoryResourceCollection, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/eventcategories.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/eventcategories.go new file mode 100644 index 000000000000..2fb56d4e3089 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/eventcategories.go @@ -0,0 +1,106 @@ +package insights + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// EventCategoriesClient is the monitor Management Client +type EventCategoriesClient struct { + BaseClient +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NewEventCategoriesClient creates an instance of the EventCategoriesClient client. +func NewEventCategoriesClient(subscriptionID string) EventCategoriesClient { + return NewEventCategoriesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NewEventCategoriesClientWithBaseURI creates an instance of the EventCategoriesClient client. +func NewEventCategoriesClientWithBaseURI(baseURI string, subscriptionID string) EventCategoriesClient { + return EventCategoriesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// List get the list of available event categories supported in the Activity Logs Service.
    The current list includes +// the following: Administrative, Security, ServiceHealth, Alert, Recommendation, Policy. +func (client EventCategoriesClient) List(ctx context.Context) (result EventCategoryCollection, err error) { + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.EventCategoriesClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.EventCategoriesClient", "List", resp, "Failure sending request") + return + } + + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.EventCategoriesClient", "List", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListPreparer prepares the List request. +func (client EventCategoriesClient) ListPreparer(ctx context.Context) (*http.Request, error) { + const APIVersion = "2015-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPath("/providers/microsoft.insights/eventcategories"), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client EventCategoriesClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client EventCategoriesClient) ListResponder(resp *http.Response) (result EventCategoryCollection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/logprofiles.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/logprofiles.go similarity index 90% rename from vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/logprofiles.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/logprofiles.go index fa976b3f1577..a591b5b334c2 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/logprofiles.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/logprofiles.go @@ -25,25 +25,25 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // LogProfilesClient is the monitor Management Client type LogProfilesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewLogProfilesClient creates an instance of the LogProfilesClient client. func NewLogProfilesClient(subscriptionID string) LogProfilesClient { return NewLogProfilesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewLogProfilesClientWithBaseURI creates an instance of the LogProfilesClient client. func NewLogProfilesClientWithBaseURI(baseURI string, subscriptionID string) LogProfilesClient { return LogProfilesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdate create or update a log profile in Azure Monitoring REST API. // // logProfileName is the name of the log profile. parameters is parameters supplied to the operation. @@ -83,7 +83,7 @@ func (client LogProfilesClient) CreateOrUpdate(ctx context.Context, logProfileNa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client LogProfilesClient) CreateOrUpdatePreparer(ctx context.Context, logProfileName string, parameters LogProfileResource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -106,7 +106,7 @@ func (client LogProfilesClient) CreateOrUpdatePreparer(ctx context.Context, logP return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client LogProfilesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -114,7 +114,7 @@ func (client LogProfilesClient) CreateOrUpdateSender(req *http.Request) (*http.R azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client LogProfilesClient) CreateOrUpdateResponder(resp *http.Response) (result LogProfileResource, err error) { @@ -128,7 +128,7 @@ func (client LogProfilesClient) CreateOrUpdateResponder(resp *http.Response) (re return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Delete deletes the log profile. // // logProfileName is the name of the log profile. @@ -154,7 +154,7 @@ func (client LogProfilesClient) Delete(ctx context.Context, logProfileName strin return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeletePreparer prepares the Delete request. func (client LogProfilesClient) DeletePreparer(ctx context.Context, logProfileName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -175,7 +175,7 @@ func (client LogProfilesClient) DeletePreparer(ctx context.Context, logProfileNa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client LogProfilesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -183,7 +183,7 @@ func (client LogProfilesClient) DeleteSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client LogProfilesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -196,7 +196,7 @@ func (client LogProfilesClient) DeleteResponder(resp *http.Response) (result aut return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Get gets the log profile. // // logProfileName is the name of the log profile. @@ -222,7 +222,7 @@ func (client LogProfilesClient) Get(ctx context.Context, logProfileName string) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetPreparer prepares the Get request. func (client LogProfilesClient) GetPreparer(ctx context.Context, logProfileName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -243,7 +243,7 @@ func (client LogProfilesClient) GetPreparer(ctx context.Context, logProfileName return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client LogProfilesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -251,7 +251,7 @@ func (client LogProfilesClient) GetSender(req *http.Request) (*http.Response, er azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client LogProfilesClient) GetResponder(resp *http.Response) (result LogProfileResource, err error) { @@ -265,7 +265,7 @@ func (client LogProfilesClient) GetResponder(resp *http.Response) (result LogPro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // List list the log profiles. func (client LogProfilesClient) List(ctx context.Context) (result LogProfileCollection, err error) { req, err := client.ListPreparer(ctx) @@ -289,7 +289,7 @@ func (client LogProfilesClient) List(ctx context.Context) (result LogProfileColl return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListPreparer prepares the List request. func (client LogProfilesClient) ListPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -309,7 +309,7 @@ func (client LogProfilesClient) ListPreparer(ctx context.Context) (*http.Request return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client LogProfilesClient) ListSender(req *http.Request) (*http.Response, error) { @@ -317,7 +317,7 @@ func (client LogProfilesClient) ListSender(req *http.Request) (*http.Response, e azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client LogProfilesClient) ListResponder(resp *http.Response) (result LogProfileCollection, err error) { @@ -331,7 +331,7 @@ func (client LogProfilesClient) ListResponder(resp *http.Response) (result LogPr return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Update updates an existing LogProfilesResource. To update other fields use the CreateOrUpdate method. // // logProfileName is the name of the log profile. logProfilesResource is parameters supplied to the operation. @@ -357,7 +357,7 @@ func (client LogProfilesClient) Update(ctx context.Context, logProfileName strin return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdatePreparer prepares the Update request. func (client LogProfilesClient) UpdatePreparer(ctx context.Context, logProfileName string, logProfilesResource LogProfileResourcePatch) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -380,7 +380,7 @@ func (client LogProfilesClient) UpdatePreparer(ctx context.Context, logProfileNa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client LogProfilesClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -388,7 +388,7 @@ func (client LogProfilesClient) UpdateSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client LogProfilesClient) UpdateResponder(resp *http.Response) (result LogProfileResource, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/metricbaseline.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/metricbaseline.go new file mode 100644 index 000000000000..ead5eb4c3375 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/metricbaseline.go @@ -0,0 +1,217 @@ +package insights + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// MetricBaselineClient is the monitor Management Client +type MetricBaselineClient struct { + BaseClient +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NewMetricBaselineClient creates an instance of the MetricBaselineClient client. +func NewMetricBaselineClient(subscriptionID string) MetricBaselineClient { + return NewMetricBaselineClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NewMetricBaselineClientWithBaseURI creates an instance of the MetricBaselineClient client. +func NewMetricBaselineClientWithBaseURI(baseURI string, subscriptionID string) MetricBaselineClient { + return MetricBaselineClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// CalculateBaseline **Lists the baseline values for a resource**. +// +// resourceURI is the identifier of the resource. It has the following structure: +// subscriptions/{subscriptionName}/resourceGroups/{resourceGroupName}/providers/{providerName}/{resourceName}. For +// example: +// subscriptions/b368ca2f-e298-46b7-b0ab-012281956afa/resourceGroups/vms/providers/Microsoft.Compute/virtualMachines/vm1 +// timeSeriesInformation is information that need to be specified to calculate a baseline on a time series. +func (client MetricBaselineClient) CalculateBaseline(ctx context.Context, resourceURI string, timeSeriesInformation TimeSeriesInformation) (result CalculateBaselineResponse, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: timeSeriesInformation, + Constraints: []validation.Constraint{{Target: "timeSeriesInformation.Sensitivities", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "timeSeriesInformation.Values", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { + return result, validation.NewError("insights.MetricBaselineClient", "CalculateBaseline", err.Error()) + } + + req, err := client.CalculateBaselinePreparer(ctx, resourceURI, timeSeriesInformation) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.MetricBaselineClient", "CalculateBaseline", nil, "Failure preparing request") + return + } + + resp, err := client.CalculateBaselineSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.MetricBaselineClient", "CalculateBaseline", resp, "Failure sending request") + return + } + + result, err = client.CalculateBaselineResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.MetricBaselineClient", "CalculateBaseline", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// CalculateBaselinePreparer prepares the CalculateBaseline request. +func (client MetricBaselineClient) CalculateBaselinePreparer(ctx context.Context, resourceURI string, timeSeriesInformation TimeSeriesInformation) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceUri": resourceURI, + } + + const APIVersion = "2017-11-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/{resourceUri}/providers/microsoft.insights/calculatebaseline", pathParameters), + autorest.WithJSON(timeSeriesInformation), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// CalculateBaselineSender sends the CalculateBaseline request. The method will close the +// http.Response Body if it receives an error. +func (client MetricBaselineClient) CalculateBaselineSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// CalculateBaselineResponder handles the response to the CalculateBaseline request. The method always +// closes the http.Response Body. +func (client MetricBaselineClient) CalculateBaselineResponder(resp *http.Response) (result CalculateBaselineResponse, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// Get **Gets the baseline values for a specific metric**. +// +// resourceURI is the identifier of the resource. It has the following structure: +// subscriptions/{subscriptionName}/resourceGroups/{resourceGroupName}/providers/{providerName}/{resourceName}. For +// example: +// subscriptions/b368ca2f-e298-46b7-b0ab-012281956afa/resourceGroups/vms/providers/Microsoft.Compute/virtualMachines/vm1 +// metricName is the name of the metric to retrieve the baseline for. timespan is the timespan of the query. It is +// a string with the following format 'startDateTime_ISO/endDateTime_ISO'. interval is the interval (i.e. +// timegrain) of the query. aggregation is the aggregation type of the metric to retrieve the baseline for. +// sensitivities is the list of sensitivities (comma separated) to retrieve. resultType is allows retrieving only +// metadata of the baseline. On data request all information is retrieved. +func (client MetricBaselineClient) Get(ctx context.Context, resourceURI string, metricName string, timespan string, interval *string, aggregation string, sensitivities string, resultType ResultType) (result BaselineResponse, err error) { + req, err := client.GetPreparer(ctx, resourceURI, metricName, timespan, interval, aggregation, sensitivities, resultType) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.MetricBaselineClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.MetricBaselineClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.MetricBaselineClient", "Get", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// GetPreparer prepares the Get request. +func (client MetricBaselineClient) GetPreparer(ctx context.Context, resourceURI string, metricName string, timespan string, interval *string, aggregation string, sensitivities string, resultType ResultType) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "metricName": autorest.Encode("path", metricName), + "resourceUri": resourceURI, + } + + const APIVersion = "2017-11-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(timespan) > 0 { + queryParameters["timespan"] = autorest.Encode("query", timespan) + } + if interval != nil { + queryParameters["interval"] = autorest.Encode("query", *interval) + } + if len(aggregation) > 0 { + queryParameters["aggregation"] = autorest.Encode("query", aggregation) + } + if len(sensitivities) > 0 { + queryParameters["sensitivities"] = autorest.Encode("query", sensitivities) + } + if len(string(resultType)) > 0 { + queryParameters["resultType"] = autorest.Encode("query", resultType) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/{resourceUri}/providers/microsoft.insights/baseline/{metricName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client MetricBaselineClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client MetricBaselineClient) GetResponder(resp *http.Response) (result BaselineResponse, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/metricdefinitions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/metricdefinitions.go new file mode 100644 index 000000000000..c825a5700f77 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/metricdefinitions.go @@ -0,0 +1,111 @@ +package insights + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// MetricDefinitionsClient is the monitor Management Client +type MetricDefinitionsClient struct { + BaseClient +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NewMetricDefinitionsClient creates an instance of the MetricDefinitionsClient client. +func NewMetricDefinitionsClient(subscriptionID string) MetricDefinitionsClient { + return NewMetricDefinitionsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NewMetricDefinitionsClientWithBaseURI creates an instance of the MetricDefinitionsClient client. +func NewMetricDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) MetricDefinitionsClient { + return MetricDefinitionsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// List lists the metric definitions for the resource. +// +// resourceURI is the identifier of the resource. +func (client MetricDefinitionsClient) List(ctx context.Context, resourceURI string) (result MetricDefinitionCollection, err error) { + req, err := client.ListPreparer(ctx, resourceURI) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.MetricDefinitionsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.MetricDefinitionsClient", "List", resp, "Failure sending request") + return + } + + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.MetricDefinitionsClient", "List", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListPreparer prepares the List request. +func (client MetricDefinitionsClient) ListPreparer(ctx context.Context, resourceURI string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceUri": resourceURI, + } + + const APIVersion = "2017-05-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/{resourceUri}/providers/microsoft.insights/metricDefinitions", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client MetricDefinitionsClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client MetricDefinitionsClient) ListResponder(resp *http.Response) (result MetricDefinitionCollection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/metrics.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/metrics.go new file mode 100644 index 000000000000..a5d100355bd6 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/metrics.go @@ -0,0 +1,149 @@ +package insights + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// MetricsClient is the monitor Management Client +type MetricsClient struct { + BaseClient +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NewMetricsClient creates an instance of the MetricsClient client. +func NewMetricsClient(subscriptionID string) MetricsClient { + return NewMetricsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NewMetricsClientWithBaseURI creates an instance of the MetricsClient client. +func NewMetricsClientWithBaseURI(baseURI string, subscriptionID string) MetricsClient { + return MetricsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// List **Lists the metric values for a resource**. +// +// resourceURI is the identifier of the resource. timespan is the timespan of the query. It is a string with the +// following format 'startDateTime_ISO/endDateTime_ISO'. interval is the interval (i.e. timegrain) of the query. +// metric is the name of the metric to retrieve. aggregation is the list of aggregation types (comma separated) to +// retrieve. top is the maximum number of records to retrieve. +// Valid only if $filter is specified. +// Defaults to 10. orderby is the aggregation to use for sorting results and the direction of the sort. +// Only one order can be specified. +// Examples: sum asc. filter is the **$filter** is used to reduce the set of metric data +// returned.
    Example:
    Metric contains metadata A, B and C.
    - Return all time series of C where A = a1 and +// B = b1 or b2
    **$filter=A eq ‘a1’ and B eq ‘b1’ or B eq ‘b2’ and C eq ‘*’**
    - Invalid +// variant:
    **$filter=A eq ‘a1’ and B eq ‘b1’ and C eq ‘*’ or B = ‘b2’**
    This is invalid because the logical +// or operator cannot separate two different metadata names.
    - Return all time series where A = a1, B = b1 and C +// = c1:
    **$filter=A eq ‘a1’ and B eq ‘b1’ and C eq ‘c1’**
    - Return all time series where A = +// a1
    **$filter=A eq ‘a1’ and B eq ‘*’ and C eq ‘*’**. resultType is reduces the set of data collected. The +// syntax allowed depends on the operation. See the operation's description for details. +func (client MetricsClient) List(ctx context.Context, resourceURI string, timespan string, interval *string, metric string, aggregation string, top *float64, orderby string, filter string, resultType ResultType) (result Response, err error) { + req, err := client.ListPreparer(ctx, resourceURI, timespan, interval, metric, aggregation, top, orderby, filter, resultType) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.MetricsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.MetricsClient", "List", resp, "Failure sending request") + return + } + + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.MetricsClient", "List", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListPreparer prepares the List request. +func (client MetricsClient) ListPreparer(ctx context.Context, resourceURI string, timespan string, interval *string, metric string, aggregation string, top *float64, orderby string, filter string, resultType ResultType) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceUri": resourceURI, + } + + const APIVersion = "2017-05-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(timespan) > 0 { + queryParameters["timespan"] = autorest.Encode("query", timespan) + } + if interval != nil { + queryParameters["interval"] = autorest.Encode("query", *interval) + } + if len(metric) > 0 { + queryParameters["metric"] = autorest.Encode("query", metric) + } + if len(aggregation) > 0 { + queryParameters["aggregation"] = autorest.Encode("query", aggregation) + } + if top != nil { + queryParameters["$top"] = autorest.Encode("query", *top) + } + if len(orderby) > 0 { + queryParameters["$orderby"] = autorest.Encode("query", orderby) + } + if len(filter) > 0 { + queryParameters["$filter"] = autorest.Encode("query", filter) + } + if len(string(resultType)) > 0 { + queryParameters["resultType"] = autorest.Encode("query", resultType) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/{resourceUri}/providers/microsoft.insights/metrics", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client MetricsClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client MetricsClient) ListResponder(resp *http.Response) (result Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/models.go similarity index 71% rename from vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/models.go index aece5f5fa3c1..82401666820e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/models.go @@ -25,7 +25,32 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// AggregationType enumerates the values for aggregation type. +type AggregationType string + +const ( + // Average ... + Average AggregationType = "Average" + // Count ... + Count AggregationType = "Count" + // Maximum ... + Maximum AggregationType = "Maximum" + // Minimum ... + Minimum AggregationType = "Minimum" + // None ... + None AggregationType = "None" + // Total ... + Total AggregationType = "Total" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// PossibleAggregationTypeValues returns an array of possible values for the AggregationType const type. +func PossibleAggregationTypeValues() []AggregationType { + return []AggregationType{Average, Count, Maximum, Minimum, None, Total} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // CategoryType enumerates the values for category type. type CategoryType string @@ -36,13 +61,13 @@ const ( Metrics CategoryType = "Metrics" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleCategoryTypeValues returns an array of possible values for the CategoryType const type. func PossibleCategoryTypeValues() []CategoryType { return []CategoryType{Logs, Metrics} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ComparisonOperationType enumerates the values for comparison operation type. type ComparisonOperationType string @@ -61,13 +86,13 @@ const ( NotEquals ComparisonOperationType = "NotEquals" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleComparisonOperationTypeValues returns an array of possible values for the ComparisonOperationType const type. func PossibleComparisonOperationTypeValues() []ComparisonOperationType { return []ComparisonOperationType{Equals, GreaterThan, GreaterThanOrEqual, LessThan, LessThanOrEqual, NotEquals} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ConditionOperator enumerates the values for condition operator. type ConditionOperator string @@ -82,34 +107,57 @@ const ( ConditionOperatorLessThanOrEqual ConditionOperator = "LessThanOrEqual" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleConditionOperatorValues returns an array of possible values for the ConditionOperator const type. func PossibleConditionOperatorValues() []ConditionOperator { return []ConditionOperator{ConditionOperatorGreaterThan, ConditionOperatorGreaterThanOrEqual, ConditionOperatorLessThan, ConditionOperatorLessThanOrEqual} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// EventLevel enumerates the values for event level. +type EventLevel string + +const ( + // Critical ... + Critical EventLevel = "Critical" + // Error ... + Error EventLevel = "Error" + // Informational ... + Informational EventLevel = "Informational" + // Verbose ... + Verbose EventLevel = "Verbose" + // Warning ... + Warning EventLevel = "Warning" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// PossibleEventLevelValues returns an array of possible values for the EventLevel const type. +func PossibleEventLevelValues() []EventLevel { + return []EventLevel{Critical, Error, Informational, Verbose, Warning} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MetricStatisticType enumerates the values for metric statistic type. type MetricStatisticType string const ( - // Average ... - Average MetricStatisticType = "Average" - // Max ... - Max MetricStatisticType = "Max" - // Min ... - Min MetricStatisticType = "Min" - // Sum ... - Sum MetricStatisticType = "Sum" + // MetricStatisticTypeAverage ... + MetricStatisticTypeAverage MetricStatisticType = "Average" + // MetricStatisticTypeMax ... + MetricStatisticTypeMax MetricStatisticType = "Max" + // MetricStatisticTypeMin ... + MetricStatisticTypeMin MetricStatisticType = "Min" + // MetricStatisticTypeSum ... + MetricStatisticTypeSum MetricStatisticType = "Sum" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleMetricStatisticTypeValues returns an array of possible values for the MetricStatisticType const type. func PossibleMetricStatisticTypeValues() []MetricStatisticType { - return []MetricStatisticType{Average, Max, Min, Sum} + return []MetricStatisticType{MetricStatisticTypeAverage, MetricStatisticTypeMax, MetricStatisticTypeMin, MetricStatisticTypeSum} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // OdataType enumerates the values for odata type. type OdataType string @@ -122,13 +170,13 @@ const ( OdataTypeRuleDataSource OdataType = "RuleDataSource" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleOdataTypeValues returns an array of possible values for the OdataType const type. func PossibleOdataTypeValues() []OdataType { return []OdataType{OdataTypeMicrosoftAzureManagementInsightsModelsRuleManagementEventDataSource, OdataTypeMicrosoftAzureManagementInsightsModelsRuleMetricDataSource, OdataTypeRuleDataSource} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // OdataTypeBasicRuleAction enumerates the values for odata type basic rule action. type OdataTypeBasicRuleAction string @@ -141,13 +189,13 @@ const ( OdataTypeRuleAction OdataTypeBasicRuleAction = "RuleAction" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleOdataTypeBasicRuleActionValues returns an array of possible values for the OdataTypeBasicRuleAction const type. func PossibleOdataTypeBasicRuleActionValues() []OdataTypeBasicRuleAction { return []OdataTypeBasicRuleAction{OdataTypeMicrosoftAzureManagementInsightsModelsRuleEmailAction, OdataTypeMicrosoftAzureManagementInsightsModelsRuleWebhookAction, OdataTypeRuleAction} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // OdataTypeBasicRuleCondition enumerates the values for odata type basic rule condition. type OdataTypeBasicRuleCondition string @@ -162,13 +210,13 @@ const ( OdataTypeRuleCondition OdataTypeBasicRuleCondition = "RuleCondition" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleOdataTypeBasicRuleConditionValues returns an array of possible values for the OdataTypeBasicRuleCondition const type. func PossibleOdataTypeBasicRuleConditionValues() []OdataTypeBasicRuleCondition { return []OdataTypeBasicRuleCondition{OdataTypeMicrosoftAzureManagementInsightsModelsLocationThresholdRuleCondition, OdataTypeMicrosoftAzureManagementInsightsModelsManagementEventRuleCondition, OdataTypeMicrosoftAzureManagementInsightsModelsThresholdRuleCondition, OdataTypeRuleCondition} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ReceiverStatus enumerates the values for receiver status. type ReceiverStatus string @@ -181,42 +229,59 @@ const ( NotSpecified ReceiverStatus = "NotSpecified" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleReceiverStatusValues returns an array of possible values for the ReceiverStatus const type. func PossibleReceiverStatusValues() []ReceiverStatus { return []ReceiverStatus{Disabled, Enabled, NotSpecified} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // RecurrenceFrequency enumerates the values for recurrence frequency. type RecurrenceFrequency string const ( - // Day ... - Day RecurrenceFrequency = "Day" - // Hour ... - Hour RecurrenceFrequency = "Hour" - // Minute ... - Minute RecurrenceFrequency = "Minute" - // Month ... - Month RecurrenceFrequency = "Month" - // None ... - None RecurrenceFrequency = "None" - // Second ... - Second RecurrenceFrequency = "Second" - // Week ... - Week RecurrenceFrequency = "Week" - // Year ... - Year RecurrenceFrequency = "Year" + // RecurrenceFrequencyDay ... + RecurrenceFrequencyDay RecurrenceFrequency = "Day" + // RecurrenceFrequencyHour ... + RecurrenceFrequencyHour RecurrenceFrequency = "Hour" + // RecurrenceFrequencyMinute ... + RecurrenceFrequencyMinute RecurrenceFrequency = "Minute" + // RecurrenceFrequencyMonth ... + RecurrenceFrequencyMonth RecurrenceFrequency = "Month" + // RecurrenceFrequencyNone ... + RecurrenceFrequencyNone RecurrenceFrequency = "None" + // RecurrenceFrequencySecond ... + RecurrenceFrequencySecond RecurrenceFrequency = "Second" + // RecurrenceFrequencyWeek ... + RecurrenceFrequencyWeek RecurrenceFrequency = "Week" + // RecurrenceFrequencyYear ... + RecurrenceFrequencyYear RecurrenceFrequency = "Year" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleRecurrenceFrequencyValues returns an array of possible values for the RecurrenceFrequency const type. func PossibleRecurrenceFrequencyValues() []RecurrenceFrequency { - return []RecurrenceFrequency{Day, Hour, Minute, Month, None, Second, Week, Year} + return []RecurrenceFrequency{RecurrenceFrequencyDay, RecurrenceFrequencyHour, RecurrenceFrequencyMinute, RecurrenceFrequencyMonth, RecurrenceFrequencyNone, RecurrenceFrequencySecond, RecurrenceFrequencyWeek, RecurrenceFrequencyYear} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ResultType enumerates the values for result type. +type ResultType string + +const ( + // Data ... + Data ResultType = "Data" + // Metadata ... + Metadata ResultType = "Metadata" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// PossibleResultTypeValues returns an array of possible values for the ResultType const type. +func PossibleResultTypeValues() []ResultType { + return []ResultType{Data, Metadata} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ScaleDirection enumerates the values for scale direction. type ScaleDirection string @@ -229,13 +294,13 @@ const ( ScaleDirectionNone ScaleDirection = "None" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleScaleDirectionValues returns an array of possible values for the ScaleDirection const type. func PossibleScaleDirectionValues() []ScaleDirection { return []ScaleDirection{ScaleDirectionDecrease, ScaleDirectionIncrease, ScaleDirectionNone} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ScaleType enumerates the values for scale type. type ScaleType string @@ -248,13 +313,32 @@ const ( PercentChangeCount ScaleType = "PercentChangeCount" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleScaleTypeValues returns an array of possible values for the ScaleType const type. func PossibleScaleTypeValues() []ScaleType { return []ScaleType{ChangeCount, ExactCount, PercentChangeCount} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// Sensitivity enumerates the values for sensitivity. +type Sensitivity string + +const ( + // High ... + High Sensitivity = "High" + // Low ... + Low Sensitivity = "Low" + // Medium ... + Medium Sensitivity = "Medium" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// PossibleSensitivityValues returns an array of possible values for the Sensitivity const type. +func PossibleSensitivityValues() []Sensitivity { + return []Sensitivity{High, Low, Medium} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // TimeAggregationOperator enumerates the values for time aggregation operator. type TimeAggregationOperator string @@ -271,13 +355,13 @@ const ( TimeAggregationOperatorTotal TimeAggregationOperator = "Total" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleTimeAggregationOperatorValues returns an array of possible values for the TimeAggregationOperator const type. func PossibleTimeAggregationOperatorValues() []TimeAggregationOperator { return []TimeAggregationOperator{TimeAggregationOperatorAverage, TimeAggregationOperatorLast, TimeAggregationOperatorMaximum, TimeAggregationOperatorMinimum, TimeAggregationOperatorTotal} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // TimeAggregationType enumerates the values for time aggregation type. type TimeAggregationType string @@ -294,13 +378,44 @@ const ( TimeAggregationTypeTotal TimeAggregationType = "Total" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // PossibleTimeAggregationTypeValues returns an array of possible values for the TimeAggregationType const type. func PossibleTimeAggregationTypeValues() []TimeAggregationType { return []TimeAggregationType{TimeAggregationTypeAverage, TimeAggregationTypeCount, TimeAggregationTypeMaximum, TimeAggregationTypeMinimum, TimeAggregationTypeTotal} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// Unit enumerates the values for unit. +type Unit string + +const ( + // UnitBytes ... + UnitBytes Unit = "Bytes" + // UnitByteSeconds ... + UnitByteSeconds Unit = "ByteSeconds" + // UnitBytesPerSecond ... + UnitBytesPerSecond Unit = "BytesPerSecond" + // UnitCount ... + UnitCount Unit = "Count" + // UnitCountPerSecond ... + UnitCountPerSecond Unit = "CountPerSecond" + // UnitMilliSeconds ... + UnitMilliSeconds Unit = "MilliSeconds" + // UnitPercent ... + UnitPercent Unit = "Percent" + // UnitSeconds ... + UnitSeconds Unit = "Seconds" + // UnitUnspecified ... + UnitUnspecified Unit = "Unspecified" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// PossibleUnitValues returns an array of possible values for the Unit const type. +func PossibleUnitValues() []Unit { + return []Unit{UnitBytes, UnitByteSeconds, UnitBytesPerSecond, UnitCount, UnitCountPerSecond, UnitMilliSeconds, UnitPercent, UnitSeconds, UnitUnspecified} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActionGroup an Azure action group. type ActionGroup struct { // GroupShortName - The short name of the action group. This will be used in SMS messages. @@ -319,9 +434,15 @@ type ActionGroup struct { AzureAppPushReceivers *[]AzureAppPushReceiver `json:"azureAppPushReceivers,omitempty"` // AutomationRunbookReceivers - The list of AutomationRunbook receivers that are part of this action group. AutomationRunbookReceivers *[]AutomationRunbookReceiver `json:"automationRunbookReceivers,omitempty"` + // VoiceReceivers - The list of voice receivers that are part of this action group. + VoiceReceivers *[]VoiceReceiver `json:"voiceReceivers,omitempty"` + // LogicAppReceivers - The list of logic app receivers that are part of this action group. + LogicAppReceivers *[]LogicAppReceiver `json:"logicAppReceivers,omitempty"` + // AzureFunctionReceivers - The list of azure function receivers that are part of this action group. + AzureFunctionReceivers *[]AzureFunctionReceiver `json:"azureFunctionReceivers,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActionGroupList a list of action groups. type ActionGroupList struct { autorest.Response `json:"-"` @@ -331,14 +452,14 @@ type ActionGroupList struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActionGroupPatch an Azure action group for patch operations. type ActionGroupPatch struct { // Enabled - Indicates whether this action group is enabled. If an action group is not enabled, then none of its actions will be activated. Enabled *bool `json:"enabled,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActionGroupPatchBody an action group object for the body of patch operations. type ActionGroupPatchBody struct { // Tags - Resource tags @@ -347,7 +468,7 @@ type ActionGroupPatchBody struct { *ActionGroupPatch `json:"properties,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for ActionGroupPatchBody. func (agpb ActionGroupPatchBody) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -360,7 +481,7 @@ func (agpb ActionGroupPatchBody) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for ActionGroupPatchBody struct. func (agpb *ActionGroupPatchBody) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -394,7 +515,7 @@ func (agpb *ActionGroupPatchBody) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActionGroupResource an action group resource. type ActionGroupResource struct { autorest.Response `json:"-"` @@ -412,7 +533,7 @@ type ActionGroupResource struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for ActionGroupResource. func (agr ActionGroupResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -437,7 +558,7 @@ func (agr ActionGroupResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for ActionGroupResource struct. func (agr *ActionGroupResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -507,7 +628,7 @@ func (agr *ActionGroupResource) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActivityLogAlert an Azure activity log alert. type ActivityLogAlert struct { // Scopes - A list of resourceIds that will be used as prefixes. The alert will only apply to activityLogs with resourceIds that fall under one of these prefixes. This list must include at least one item. @@ -522,7 +643,7 @@ type ActivityLogAlert struct { Description *string `json:"description,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActivityLogAlertActionGroup a pointer to an Azure Action Group. type ActivityLogAlertActionGroup struct { // ActionGroupID - The resourceId of the action group. This cannot be null or empty. @@ -531,7 +652,7 @@ type ActivityLogAlertActionGroup struct { WebhookProperties map[string]*string `json:"webhookProperties"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for ActivityLogAlertActionGroup. func (alaag ActivityLogAlertActionGroup) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -544,14 +665,14 @@ func (alaag ActivityLogAlertActionGroup) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActivityLogAlertActionList a list of activity log alert actions. type ActivityLogAlertActionList struct { // ActionGroups - The list of activity log alerts. ActionGroups *[]ActivityLogAlertActionGroup `json:"actionGroups,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActivityLogAlertAllOfCondition an Activity Log alert condition that is met when all its member conditions are // met. type ActivityLogAlertAllOfCondition struct { @@ -559,7 +680,7 @@ type ActivityLogAlertAllOfCondition struct { AllOf *[]ActivityLogAlertLeafCondition `json:"allOf,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActivityLogAlertLeafCondition an Activity Log alert condition that is met by comparing an activity log field and // value. type ActivityLogAlertLeafCondition struct { @@ -569,7 +690,7 @@ type ActivityLogAlertLeafCondition struct { Equals *string `json:"equals,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActivityLogAlertList a list of activity log alerts. type ActivityLogAlertList struct { autorest.Response `json:"-"` @@ -579,14 +700,14 @@ type ActivityLogAlertList struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActivityLogAlertPatch an Azure activity log alert for patch operations. type ActivityLogAlertPatch struct { // Enabled - Indicates whether this activity log alert is enabled. If an activity log alert is not enabled, then none of its actions will be activated. Enabled *bool `json:"enabled,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActivityLogAlertPatchBody an activity log alert object for the body of patch operations. type ActivityLogAlertPatchBody struct { // Tags - Resource tags @@ -595,7 +716,7 @@ type ActivityLogAlertPatchBody struct { *ActivityLogAlertPatch `json:"properties,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for ActivityLogAlertPatchBody. func (alapb ActivityLogAlertPatchBody) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -608,7 +729,7 @@ func (alapb ActivityLogAlertPatchBody) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for ActivityLogAlertPatchBody struct. func (alapb *ActivityLogAlertPatchBody) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -642,7 +763,7 @@ func (alapb *ActivityLogAlertPatchBody) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ActivityLogAlertResource an activity log alert resource. type ActivityLogAlertResource struct { autorest.Response `json:"-"` @@ -660,7 +781,7 @@ type ActivityLogAlertResource struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for ActivityLogAlertResource. func (alar ActivityLogAlertResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -685,7 +806,7 @@ func (alar ActivityLogAlertResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for ActivityLogAlertResource struct. func (alar *ActivityLogAlertResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -755,7 +876,7 @@ func (alar *ActivityLogAlertResource) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AlertRule an alert rule. type AlertRule struct { // Name - the name of the alert rule. @@ -772,7 +893,7 @@ type AlertRule struct { LastUpdatedTime *date.Time `json:"lastUpdatedTime,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for AlertRule struct. func (ar *AlertRule) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -840,7 +961,7 @@ func (ar *AlertRule) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AlertRuleResource the alert rule resource. type AlertRuleResource struct { autorest.Response `json:"-"` @@ -858,7 +979,7 @@ type AlertRuleResource struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for AlertRuleResource. func (arr AlertRuleResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -883,7 +1004,7 @@ func (arr AlertRuleResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for AlertRuleResource struct. func (arr *AlertRuleResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -953,7 +1074,7 @@ func (arr *AlertRuleResource) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AlertRuleResourceCollection represents a collection of alert rule resources. type AlertRuleResourceCollection struct { autorest.Response `json:"-"` @@ -961,7 +1082,7 @@ type AlertRuleResourceCollection struct { Value *[]AlertRuleResource `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AlertRuleResourcePatch the alert rule object for patch operations. type AlertRuleResourcePatch struct { // Tags - Resource tags @@ -970,7 +1091,7 @@ type AlertRuleResourcePatch struct { *AlertRule `json:"properties,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for AlertRuleResourcePatch. func (arrp AlertRuleResourcePatch) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -983,7 +1104,7 @@ func (arrp AlertRuleResourcePatch) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for AlertRuleResourcePatch struct. func (arrp *AlertRuleResourcePatch) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1017,7 +1138,7 @@ func (arrp *AlertRuleResourcePatch) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AutomationRunbookReceiver the Azure Automation Runbook notification receiver. type AutomationRunbookReceiver struct { // AutomationAccountID - The Azure automation account Id which holds this runbook and authenticate to Azure resource. @@ -1034,7 +1155,7 @@ type AutomationRunbookReceiver struct { ServiceURI *string `json:"serviceUri,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AutoscaleNotification autoscale notification. type AutoscaleNotification struct { // Operation - the operation associated with the notification and its value must be "scale" @@ -1045,7 +1166,7 @@ type AutoscaleNotification struct { Webhooks *[]WebhookNotification `json:"webhooks,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AutoscaleProfile autoscale profile. type AutoscaleProfile struct { // Name - the name of the profile. @@ -1060,7 +1181,7 @@ type AutoscaleProfile struct { Recurrence *Recurrence `json:"recurrence,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AutoscaleSetting a setting that contains all of the configuration for the automatic scaling of a resource. type AutoscaleSetting struct { // Profiles - the collection of automatic scaling profiles that specify different scaling parameters for different time periods. A maximum of 20 profiles can be specified. @@ -1075,7 +1196,7 @@ type AutoscaleSetting struct { TargetResourceURI *string `json:"targetResourceUri,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AutoscaleSettingResource the autoscale setting resource. type AutoscaleSettingResource struct { autorest.Response `json:"-"` @@ -1093,7 +1214,7 @@ type AutoscaleSettingResource struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for AutoscaleSettingResource. func (asr AutoscaleSettingResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1118,7 +1239,7 @@ func (asr AutoscaleSettingResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for AutoscaleSettingResource struct. func (asr *AutoscaleSettingResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1188,7 +1309,7 @@ func (asr *AutoscaleSettingResource) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AutoscaleSettingResourceCollection represents a collection of autoscale setting resources. type AutoscaleSettingResourceCollection struct { autorest.Response `json:"-"` @@ -1198,7 +1319,7 @@ type AutoscaleSettingResourceCollection struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AutoscaleSettingResourceCollectionIterator provides access to a complete listing of AutoscaleSettingResource // values. type AutoscaleSettingResourceCollectionIterator struct { @@ -1206,7 +1327,7 @@ type AutoscaleSettingResourceCollectionIterator struct { page AutoscaleSettingResourceCollectionPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *AutoscaleSettingResourceCollectionIterator) Next() error { @@ -1223,19 +1344,19 @@ func (iter *AutoscaleSettingResourceCollectionIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter AutoscaleSettingResourceCollectionIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Response returns the raw server response from the last page request. func (iter AutoscaleSettingResourceCollectionIterator) Response() AutoscaleSettingResourceCollection { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter AutoscaleSettingResourceCollectionIterator) Value() AutoscaleSettingResource { @@ -1245,7 +1366,7 @@ func (iter AutoscaleSettingResourceCollectionIterator) Value() AutoscaleSettingR return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // IsEmpty returns true if the ListResult contains no values. func (asrc AutoscaleSettingResourceCollection) IsEmpty() bool { return asrc.Value == nil || len(*asrc.Value) == 0 @@ -1263,14 +1384,14 @@ func (asrc AutoscaleSettingResourceCollection) autoscaleSettingResourceCollectio autorest.WithBaseURL(to.String(asrc.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AutoscaleSettingResourceCollectionPage contains a page of AutoscaleSettingResource values. type AutoscaleSettingResourceCollectionPage struct { fn func(AutoscaleSettingResourceCollection) (AutoscaleSettingResourceCollection, error) asrc AutoscaleSettingResourceCollection } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *AutoscaleSettingResourceCollectionPage) Next() error { @@ -1282,19 +1403,19 @@ func (page *AutoscaleSettingResourceCollectionPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page AutoscaleSettingResourceCollectionPage) NotDone() bool { return !page.asrc.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Response returns the raw server response from the last page request. func (page AutoscaleSettingResourceCollectionPage) Response() AutoscaleSettingResourceCollection { return page.asrc } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Values returns the slice of values for the current page or nil if there are no values. func (page AutoscaleSettingResourceCollectionPage) Values() []AutoscaleSettingResource { if page.asrc.IsEmpty() { @@ -1303,7 +1424,7 @@ func (page AutoscaleSettingResourceCollectionPage) Values() []AutoscaleSettingRe return *page.asrc.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AutoscaleSettingResourcePatch the autoscale setting object for patch operations. type AutoscaleSettingResourcePatch struct { // Tags - Resource tags @@ -1312,7 +1433,7 @@ type AutoscaleSettingResourcePatch struct { *AutoscaleSetting `json:"properties,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for AutoscaleSettingResourcePatch. func (asrp AutoscaleSettingResourcePatch) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1325,7 +1446,7 @@ func (asrp AutoscaleSettingResourcePatch) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for AutoscaleSettingResourcePatch struct. func (asrp *AutoscaleSettingResourcePatch) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1359,7 +1480,7 @@ func (asrp *AutoscaleSettingResourcePatch) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AzureAppPushReceiver the Azure mobile App push notification receiver. type AzureAppPushReceiver struct { // Name - The name of the Azure mobile app push receiver. Names must be unique across all receivers within an action group. @@ -1368,7 +1489,154 @@ type AzureAppPushReceiver struct { EmailAddress *string `json:"emailAddress,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// AzureFunctionReceiver an azure function receiver. +type AzureFunctionReceiver struct { + // Name - The name of the azure function receiver. Names must be unique across all receivers within an action group. + Name *string `json:"name,omitempty"` + // FunctionAppResourceID - The azure resource id of the function app. + FunctionAppResourceID *string `json:"functionAppResourceId,omitempty"` + // FunctionName - The function name in the function app. + FunctionName *string `json:"functionName,omitempty"` + // HTTPTriggerURL - The http trigger url where http request sent to. + HTTPTriggerURL *string `json:"httpTriggerUrl,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// Baseline the baseline values for a single sensitivity value. +type Baseline struct { + // Sensitivity - the sensitivity of the baseline. Possible values include: 'Low', 'Medium', 'High' + Sensitivity Sensitivity `json:"sensitivity,omitempty"` + // LowThresholds - The low thresholds of the baseline. + LowThresholds *[]float64 `json:"lowThresholds,omitempty"` + // HighThresholds - The high thresholds of the baseline. + HighThresholds *[]float64 `json:"highThresholds,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// BaselineMetadataValue represents a baseline metadata value. +type BaselineMetadataValue struct { + // Name - the name of the metadata. + Name *LocalizableString `json:"name,omitempty"` + // Value - the value of the metadata. + Value *string `json:"value,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// BaselineProperties the baseline properties class. +type BaselineProperties struct { + // Timespan - The timespan for which the data was retrieved. Its value consists of two datatimes concatenated, separated by '/'. This may be adjusted in the future and returned back from what was originally requested. + Timespan *string `json:"timespan,omitempty"` + // Interval - The interval (window size) for which the metric data was returned in. This may be adjusted in the future and returned back from what was originally requested. This is not present if a metadata request was made. + Interval *string `json:"interval,omitempty"` + // Aggregation - The aggregation type of the metric. + Aggregation *string `json:"aggregation,omitempty"` + // Timestamps - the array of timestamps of the baselines. + Timestamps *[]date.Time `json:"timestamps,omitempty"` + // Baseline - the baseline values for each sensitivity. + Baseline *[]Baseline `json:"baseline,omitempty"` + // Metadata - the baseline metadata values. + Metadata *[]BaselineMetadataValue `json:"metadata,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// BaselineResponse the response to a baseline query. +type BaselineResponse struct { + autorest.Response `json:"-"` + // ID - the metric baseline Id. + ID *string `json:"id,omitempty"` + // Type - the resource type of the baseline resource. + Type *string `json:"type,omitempty"` + // Name - the name and the display name of the metric, i.e. it is localizable string. + Name *LocalizableString `json:"name,omitempty"` + // BaselineProperties - the properties of the baseline. + *BaselineProperties `json:"properties,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// MarshalJSON is the custom marshaler for BaselineResponse. +func (br BaselineResponse) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if br.ID != nil { + objectMap["id"] = br.ID + } + if br.Type != nil { + objectMap["type"] = br.Type + } + if br.Name != nil { + objectMap["name"] = br.Name + } + if br.BaselineProperties != nil { + objectMap["properties"] = br.BaselineProperties + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// UnmarshalJSON is the custom unmarshaler for BaselineResponse struct. +func (br *BaselineResponse) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + br.ID = &ID + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + br.Type = &typeVar + } + case "name": + if v != nil { + var name LocalizableString + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + br.Name = &name + } + case "properties": + if v != nil { + var baselineProperties BaselineProperties + err = json.Unmarshal(*v, &baselineProperties) + if err != nil { + return err + } + br.BaselineProperties = &baselineProperties + } + } + } + + return nil +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// CalculateBaselineResponse the response to a calcualte baseline call. +type CalculateBaselineResponse struct { + autorest.Response `json:"-"` + // Type - the resource type of the baseline resource. + Type *string `json:"type,omitempty"` + // Timestamps - the array of timestamps of the baselines. + Timestamps *[]date.Time `json:"timestamps,omitempty"` + // Baseline - the baseline values for each sensitivity. + Baseline *[]Baseline `json:"baseline,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DiagnosticSettings the diagnostic settings. type DiagnosticSettings struct { // StorageAccountID - The resource ID of the storage account to which you would like to send Diagnostic Logs. @@ -1385,14 +1653,14 @@ type DiagnosticSettings struct { WorkspaceID *string `json:"workspaceId,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DiagnosticSettingsCategory the diagnostic settings Category. type DiagnosticSettingsCategory struct { // CategoryType - The type of the diagnostic settings category. Possible values include: 'Metrics', 'Logs' CategoryType CategoryType `json:"categoryType,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DiagnosticSettingsCategoryResource the diagnostic settings category resource. type DiagnosticSettingsCategoryResource struct { autorest.Response `json:"-"` @@ -1405,7 +1673,7 @@ type DiagnosticSettingsCategoryResource struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for DiagnosticSettingsCategoryResource. func (dscr DiagnosticSettingsCategoryResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1424,7 +1692,7 @@ func (dscr DiagnosticSettingsCategoryResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for DiagnosticSettingsCategoryResource struct. func (dscr *DiagnosticSettingsCategoryResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1476,7 +1744,7 @@ func (dscr *DiagnosticSettingsCategoryResource) UnmarshalJSON(body []byte) error return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DiagnosticSettingsCategoryResourceCollection represents a collection of diagnostic setting category resources. type DiagnosticSettingsCategoryResourceCollection struct { autorest.Response `json:"-"` @@ -1484,7 +1752,7 @@ type DiagnosticSettingsCategoryResourceCollection struct { Value *[]DiagnosticSettingsCategoryResource `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DiagnosticSettingsResource the diagnostic setting resource. type DiagnosticSettingsResource struct { autorest.Response `json:"-"` @@ -1497,7 +1765,7 @@ type DiagnosticSettingsResource struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for DiagnosticSettingsResource. func (dsr DiagnosticSettingsResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1516,7 +1784,7 @@ func (dsr DiagnosticSettingsResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for DiagnosticSettingsResource struct. func (dsr *DiagnosticSettingsResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1568,7 +1836,7 @@ func (dsr *DiagnosticSettingsResource) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // DiagnosticSettingsResourceCollection represents a collection of alert rule resources. type DiagnosticSettingsResourceCollection struct { autorest.Response `json:"-"` @@ -1576,7 +1844,7 @@ type DiagnosticSettingsResourceCollection struct { Value *[]DiagnosticSettingsResource `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // EmailNotification email notification of an autoscale event. type EmailNotification struct { // SendToSubscriptionAdministrator - a value indicating whether to send email to subscription administrator. @@ -1587,7 +1855,7 @@ type EmailNotification struct { CustomEmails *[]string `json:"customEmails,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // EmailReceiver an email receiver. type EmailReceiver struct { // Name - The name of the email receiver. Names must be unique across all receivers within an action group. @@ -1598,14 +1866,14 @@ type EmailReceiver struct { Status ReceiverStatus `json:"status,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // EnableRequest describes a receiver that should be resubscribed. type EnableRequest struct { // ReceiverName - The name of the receiver to resubscribe. ReceiverName *string `json:"receiverName,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ErrorResponse describes the format of Error response. type ErrorResponse struct { // Code - Error code @@ -1614,7 +1882,274 @@ type ErrorResponse struct { Message *string `json:"message,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// EventCategoryCollection a collection of event categories. Currently possible values are: Administrative, +// Security, ServiceHealth, Alert, Recommendation, Policy. +type EventCategoryCollection struct { + autorest.Response `json:"-"` + // Value - the list that includes the Azure event categories. + Value *[]LocalizableString `json:"value,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// EventData the Azure event log entries are of type EventData +type EventData struct { + Authorization *SenderAuthorization `json:"authorization,omitempty"` + // Claims - key value pairs to identify ARM permissions. + Claims map[string]*string `json:"claims"` + // Caller - the email address of the user who has performed the operation, the UPN claim or SPN claim based on availability. + Caller *string `json:"caller,omitempty"` + // Description - the description of the event. + Description *string `json:"description,omitempty"` + // ID - the Id of this event as required by ARM for RBAC. It contains the EventDataID and a timestamp information. + ID *string `json:"id,omitempty"` + // EventDataID - the event data Id. This is a unique identifier for an event. + EventDataID *string `json:"eventDataId,omitempty"` + // CorrelationID - the correlation Id, usually a GUID in the string format. The correlation Id is shared among the events that belong to the same uber operation. + CorrelationID *string `json:"correlationId,omitempty"` + // EventName - the event name. This value should not be confused with OperationName. For practical purposes, OperationName might be more appealing to end users. + EventName *LocalizableString `json:"eventName,omitempty"` + // Category - the event category. + Category *LocalizableString `json:"category,omitempty"` + // HTTPRequest - the HTTP request info. Usually includes the 'clientRequestId', 'clientIpAddress' (IP address of the user who initiated the event) and 'method' (HTTP method e.g. PUT). + HTTPRequest *HTTPRequestInfo `json:"httpRequest,omitempty"` + // Level - the event level. Possible values include: 'Critical', 'Error', 'Warning', 'Informational', 'Verbose' + Level EventLevel `json:"level,omitempty"` + // ResourceGroupName - the resource group name of the impacted resource. + ResourceGroupName *string `json:"resourceGroupName,omitempty"` + // ResourceProviderName - the resource provider name of the impacted resource. + ResourceProviderName *LocalizableString `json:"resourceProviderName,omitempty"` + // ResourceID - the resource uri that uniquely identifies the resource that caused this event. + ResourceID *string `json:"resourceId,omitempty"` + // ResourceType - the resource type + ResourceType *LocalizableString `json:"resourceType,omitempty"` + // OperationID - It is usually a GUID shared among the events corresponding to single operation. This value should not be confused with EventName. + OperationID *string `json:"operationId,omitempty"` + // OperationName - the operation name. + OperationName *LocalizableString `json:"operationName,omitempty"` + // Properties - the set of pairs (usually a Dictionary) that includes details about the event. + Properties map[string]*string `json:"properties"` + // Status - a string describing the status of the operation. Some typical values are: Started, In progress, Succeeded, Failed, Resolved. + Status *LocalizableString `json:"status,omitempty"` + // SubStatus - the event sub status. Most of the time, when included, this captures the HTTP status code of the REST call. Common values are: OK (HTTP Status Code: 200), Created (HTTP Status Code: 201), Accepted (HTTP Status Code: 202), No Content (HTTP Status Code: 204), Bad Request(HTTP Status Code: 400), Not Found (HTTP Status Code: 404), Conflict (HTTP Status Code: 409), Internal Server Error (HTTP Status Code: 500), Service Unavailable (HTTP Status Code:503), Gateway Timeout (HTTP Status Code: 504) + SubStatus *LocalizableString `json:"subStatus,omitempty"` + // EventTimestamp - the timestamp of when the event was generated by the Azure service processing the request corresponding the event. It in ISO 8601 format. + EventTimestamp *date.Time `json:"eventTimestamp,omitempty"` + // SubmissionTimestamp - the timestamp of when the event became available for querying via this API. It is in ISO 8601 format. This value should not be confused eventTimestamp. As there might be a delay between the occurrence time of the event, and the time that the event is submitted to the Azure logging infrastructure. + SubmissionTimestamp *date.Time `json:"submissionTimestamp,omitempty"` + // SubscriptionID - the Azure subscription Id usually a GUID. + SubscriptionID *string `json:"subscriptionId,omitempty"` + // TenantID - the Azure tenant Id + TenantID *string `json:"tenantId,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// MarshalJSON is the custom marshaler for EventData. +func (ed EventData) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ed.Authorization != nil { + objectMap["authorization"] = ed.Authorization + } + if ed.Claims != nil { + objectMap["claims"] = ed.Claims + } + if ed.Caller != nil { + objectMap["caller"] = ed.Caller + } + if ed.Description != nil { + objectMap["description"] = ed.Description + } + if ed.ID != nil { + objectMap["id"] = ed.ID + } + if ed.EventDataID != nil { + objectMap["eventDataId"] = ed.EventDataID + } + if ed.CorrelationID != nil { + objectMap["correlationId"] = ed.CorrelationID + } + if ed.EventName != nil { + objectMap["eventName"] = ed.EventName + } + if ed.Category != nil { + objectMap["category"] = ed.Category + } + if ed.HTTPRequest != nil { + objectMap["httpRequest"] = ed.HTTPRequest + } + if ed.Level != "" { + objectMap["level"] = ed.Level + } + if ed.ResourceGroupName != nil { + objectMap["resourceGroupName"] = ed.ResourceGroupName + } + if ed.ResourceProviderName != nil { + objectMap["resourceProviderName"] = ed.ResourceProviderName + } + if ed.ResourceID != nil { + objectMap["resourceId"] = ed.ResourceID + } + if ed.ResourceType != nil { + objectMap["resourceType"] = ed.ResourceType + } + if ed.OperationID != nil { + objectMap["operationId"] = ed.OperationID + } + if ed.OperationName != nil { + objectMap["operationName"] = ed.OperationName + } + if ed.Properties != nil { + objectMap["properties"] = ed.Properties + } + if ed.Status != nil { + objectMap["status"] = ed.Status + } + if ed.SubStatus != nil { + objectMap["subStatus"] = ed.SubStatus + } + if ed.EventTimestamp != nil { + objectMap["eventTimestamp"] = ed.EventTimestamp + } + if ed.SubmissionTimestamp != nil { + objectMap["submissionTimestamp"] = ed.SubmissionTimestamp + } + if ed.SubscriptionID != nil { + objectMap["subscriptionId"] = ed.SubscriptionID + } + if ed.TenantID != nil { + objectMap["tenantId"] = ed.TenantID + } + return json.Marshal(objectMap) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// EventDataCollection represents collection of events. +type EventDataCollection struct { + autorest.Response `json:"-"` + // Value - this list that includes the Azure audit logs. + Value *[]EventData `json:"value,omitempty"` + // NextLink - Provides the link to retrieve the next set of events. + NextLink *string `json:"nextLink,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// EventDataCollectionIterator provides access to a complete listing of EventData values. +type EventDataCollectionIterator struct { + i int + page EventDataCollectionPage +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *EventDataCollectionIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter EventDataCollectionIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// Response returns the raw server response from the last page request. +func (iter EventDataCollectionIterator) Response() EventDataCollection { + return iter.page.Response() +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter EventDataCollectionIterator) Value() EventData { + if !iter.page.NotDone() { + return EventData{} + } + return iter.page.Values()[iter.i] +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// IsEmpty returns true if the ListResult contains no values. +func (edc EventDataCollection) IsEmpty() bool { + return edc.Value == nil || len(*edc.Value) == 0 +} + +// eventDataCollectionPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (edc EventDataCollection) eventDataCollectionPreparer() (*http.Request, error) { + if edc.NextLink == nil || len(to.String(edc.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(edc.NextLink))) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// EventDataCollectionPage contains a page of EventData values. +type EventDataCollectionPage struct { + fn func(EventDataCollection) (EventDataCollection, error) + edc EventDataCollection +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *EventDataCollectionPage) Next() error { + next, err := page.fn(page.edc) + if err != nil { + return err + } + page.edc = next + return nil +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page EventDataCollectionPage) NotDone() bool { + return !page.edc.IsEmpty() +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// Response returns the raw server response from the last page request. +func (page EventDataCollectionPage) Response() EventDataCollection { + return page.edc +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// Values returns the slice of values for the current page or nil if there are no values. +func (page EventDataCollectionPage) Values() []EventData { + if page.edc.IsEmpty() { + return nil + } + return *page.edc.Value +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// HTTPRequestInfo the Http request info. +type HTTPRequestInfo struct { + // ClientRequestID - the client request id. + ClientRequestID *string `json:"clientRequestId,omitempty"` + // ClientIPAddress - the client Ip Address + ClientIPAddress *string `json:"clientIpAddress,omitempty"` + // Method - the Http request method. + Method *string `json:"method,omitempty"` + // URI - the Uri. + URI *string `json:"uri,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Incident an alert incident indicates the activation status of an alert rule. type Incident struct { autorest.Response `json:"-"` @@ -1630,7 +2165,7 @@ type Incident struct { ResolvedTime *date.Time `json:"resolvedTime,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // IncidentListResult the List incidents operation response. type IncidentListResult struct { autorest.Response `json:"-"` @@ -1638,7 +2173,7 @@ type IncidentListResult struct { Value *[]Incident `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ItsmReceiver an Itsm receiver. type ItsmReceiver struct { // Name - The name of the Itsm receiver. Names must be unique across all receivers within an action group. @@ -1653,7 +2188,16 @@ type ItsmReceiver struct { Region *string `json:"region,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// LocalizableString the localizable string class. +type LocalizableString struct { + // Value - the invariant value. + Value *string `json:"value,omitempty"` + // LocalizedValue - the locale specific value. + LocalizedValue *string `json:"localizedValue,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // LocationThresholdRuleCondition a rule condition based on a certain number of locations failing. type LocationThresholdRuleCondition struct { // WindowSize - the period of time (in ISO 8601 duration format) that is used to monitor alert activity based on the threshold. If specified then it must be between 5 minutes and 1 day. @@ -1666,7 +2210,7 @@ type LocationThresholdRuleCondition struct { OdataType OdataTypeBasicRuleCondition `json:"odata.type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for LocationThresholdRuleCondition. func (ltrc LocationThresholdRuleCondition) MarshalJSON() ([]byte, error) { ltrc.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsLocationThresholdRuleCondition @@ -1684,37 +2228,37 @@ func (ltrc LocationThresholdRuleCondition) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsThresholdRuleCondition is the BasicRuleCondition implementation for LocationThresholdRuleCondition. func (ltrc LocationThresholdRuleCondition) AsThresholdRuleCondition() (*ThresholdRuleCondition, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsLocationThresholdRuleCondition is the BasicRuleCondition implementation for LocationThresholdRuleCondition. func (ltrc LocationThresholdRuleCondition) AsLocationThresholdRuleCondition() (*LocationThresholdRuleCondition, bool) { return <rc, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsManagementEventRuleCondition is the BasicRuleCondition implementation for LocationThresholdRuleCondition. func (ltrc LocationThresholdRuleCondition) AsManagementEventRuleCondition() (*ManagementEventRuleCondition, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleCondition is the BasicRuleCondition implementation for LocationThresholdRuleCondition. func (ltrc LocationThresholdRuleCondition) AsRuleCondition() (*RuleCondition, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsBasicRuleCondition is the BasicRuleCondition implementation for LocationThresholdRuleCondition. func (ltrc LocationThresholdRuleCondition) AsBasicRuleCondition() (BasicRuleCondition, bool) { return <rc, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for LocationThresholdRuleCondition struct. func (ltrc *LocationThresholdRuleCondition) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1765,7 +2309,18 @@ func (ltrc *LocationThresholdRuleCondition) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// LogicAppReceiver a logic app receiver. +type LogicAppReceiver struct { + // Name - The name of the logic app receiver. Names must be unique across all receivers within an action group. + Name *string `json:"name,omitempty"` + // ResourceID - The azure resource id of the logic app receiver. + ResourceID *string `json:"resourceId,omitempty"` + // CallbackURL - The callback url where http request sent to. + CallbackURL *string `json:"callbackUrl,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // LogProfileCollection represents a collection of log profiles. type LogProfileCollection struct { autorest.Response `json:"-"` @@ -1773,7 +2328,7 @@ type LogProfileCollection struct { Value *[]LogProfileResource `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // LogProfileProperties the log profile properties. type LogProfileProperties struct { // StorageAccountID - the resource id of the storage account to which you would like to send the Activity Log. @@ -1788,7 +2343,7 @@ type LogProfileProperties struct { RetentionPolicy *RetentionPolicy `json:"retentionPolicy,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // LogProfileResource the log profile resource. type LogProfileResource struct { autorest.Response `json:"-"` @@ -1806,7 +2361,7 @@ type LogProfileResource struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for LogProfileResource. func (lpr LogProfileResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1831,7 +2386,7 @@ func (lpr LogProfileResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for LogProfileResource struct. func (lpr *LogProfileResource) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1901,7 +2456,7 @@ func (lpr *LogProfileResource) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // LogProfileResourcePatch the log profile resource for patch operations. type LogProfileResourcePatch struct { // Tags - Resource tags @@ -1910,7 +2465,7 @@ type LogProfileResourcePatch struct { *LogProfileProperties `json:"properties,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for LogProfileResourcePatch. func (lprp LogProfileResourcePatch) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1923,7 +2478,7 @@ func (lprp LogProfileResourcePatch) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for LogProfileResourcePatch struct. func (lprp *LogProfileResourcePatch) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1957,7 +2512,7 @@ func (lprp *LogProfileResourcePatch) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // LogSettings part of MultiTenantDiagnosticSettings. Specifies the settings for a particular log. type LogSettings struct { // Category - Name of a Diagnostic Log category for a resource type this setting is applied to. To obtain the list of Diagnostic Log categories for a resource, first perform a GET diagnostic settings operation. @@ -1968,7 +2523,7 @@ type LogSettings struct { RetentionPolicy *RetentionPolicy `json:"retentionPolicy,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ManagementEventAggregationCondition how the data that is collected should be combined over time. type ManagementEventAggregationCondition struct { // Operator - the condition operator. Possible values include: 'ConditionOperatorGreaterThan', 'ConditionOperatorGreaterThanOrEqual', 'ConditionOperatorLessThan', 'ConditionOperatorLessThanOrEqual' @@ -1979,7 +2534,7 @@ type ManagementEventAggregationCondition struct { WindowSize *string `json:"windowSize,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ManagementEventRuleCondition a management event rule condition. type ManagementEventRuleCondition struct { // Aggregation - How the data that is collected should be combined over time and when the alert is activated. Note that for management event alerts aggregation is optional – if it is not provided then any event will cause the alert to activate. @@ -1990,7 +2545,7 @@ type ManagementEventRuleCondition struct { OdataType OdataTypeBasicRuleCondition `json:"odata.type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for ManagementEventRuleCondition. func (merc ManagementEventRuleCondition) MarshalJSON() ([]byte, error) { merc.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsManagementEventRuleCondition @@ -2005,37 +2560,37 @@ func (merc ManagementEventRuleCondition) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsThresholdRuleCondition is the BasicRuleCondition implementation for ManagementEventRuleCondition. func (merc ManagementEventRuleCondition) AsThresholdRuleCondition() (*ThresholdRuleCondition, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsLocationThresholdRuleCondition is the BasicRuleCondition implementation for ManagementEventRuleCondition. func (merc ManagementEventRuleCondition) AsLocationThresholdRuleCondition() (*LocationThresholdRuleCondition, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsManagementEventRuleCondition is the BasicRuleCondition implementation for ManagementEventRuleCondition. func (merc ManagementEventRuleCondition) AsManagementEventRuleCondition() (*ManagementEventRuleCondition, bool) { return &merc, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleCondition is the BasicRuleCondition implementation for ManagementEventRuleCondition. func (merc ManagementEventRuleCondition) AsRuleCondition() (*RuleCondition, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsBasicRuleCondition is the BasicRuleCondition implementation for ManagementEventRuleCondition. func (merc ManagementEventRuleCondition) AsBasicRuleCondition() (BasicRuleCondition, bool) { return &merc, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for ManagementEventRuleCondition struct. func (merc *ManagementEventRuleCondition) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2077,7 +2632,70 @@ func (merc *ManagementEventRuleCondition) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// MetadataValue represents a metric metadata value. +type MetadataValue struct { + // Name - the name of the metadata. + Name *LocalizableString `json:"name,omitempty"` + // Value - the value of the metadata. + Value *string `json:"value,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// Metric the result data of a query. +type Metric struct { + // ID - the metric Id. + ID *string `json:"id,omitempty"` + // Type - the resource type of the metric resource. + Type *string `json:"type,omitempty"` + // Name - the name and the display name of the metric, i.e. it is localizable string. + Name *LocalizableString `json:"name,omitempty"` + // Unit - the unit of the metric. Possible values include: 'UnitCount', 'UnitBytes', 'UnitSeconds', 'UnitCountPerSecond', 'UnitBytesPerSecond', 'UnitPercent', 'UnitMilliSeconds', 'UnitByteSeconds', 'UnitUnspecified' + Unit Unit `json:"unit,omitempty"` + // Timeseries - the time series returned when a data query is performed. + Timeseries *[]TimeSeriesElement `json:"timeseries,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// MetricAvailability metric availability specifies the time grain (aggregation interval or frequency) and the +// retention period for that time grain. +type MetricAvailability struct { + // TimeGrain - the time grain specifies the aggregation interval for the metric. Expressed as a duration 'PT1M', 'P1D', etc. + TimeGrain *string `json:"timeGrain,omitempty"` + // Retention - the retention period for the metric at the specified timegrain. Expressed as a duration 'PT1M', 'P1D', etc. + Retention *string `json:"retention,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// MetricDefinition metric definition class specifies the metadata for a metric. +type MetricDefinition struct { + // IsDimensionRequired - Flag to indicate whether the dimension is required. + IsDimensionRequired *bool `json:"isDimensionRequired,omitempty"` + // ResourceID - the resource identifier of the resource that emitted the metric. + ResourceID *string `json:"resourceId,omitempty"` + // Name - the name and the display name of the metric, i.e. it is a localizable string. + Name *LocalizableString `json:"name,omitempty"` + // Unit - the unit of the metric. Possible values include: 'UnitCount', 'UnitBytes', 'UnitSeconds', 'UnitCountPerSecond', 'UnitBytesPerSecond', 'UnitPercent', 'UnitMilliSeconds', 'UnitByteSeconds', 'UnitUnspecified' + Unit Unit `json:"unit,omitempty"` + // PrimaryAggregationType - the primary aggregation type value defining how to use the values for display. Possible values include: 'None', 'Average', 'Count', 'Minimum', 'Maximum', 'Total' + PrimaryAggregationType AggregationType `json:"primaryAggregationType,omitempty"` + // MetricAvailabilities - the collection of what aggregation intervals are available to be queried. + MetricAvailabilities *[]MetricAvailability `json:"metricAvailabilities,omitempty"` + // ID - the resource identifier of the metric definition. + ID *string `json:"id,omitempty"` + // Dimensions - the name and the display name of the dimension, i.e. it is a localizable string. + Dimensions *[]LocalizableString `json:"dimensions,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// MetricDefinitionCollection represents collection of metric definitions. +type MetricDefinitionCollection struct { + autorest.Response `json:"-"` + // Value - the values for the metric definitions. + Value *[]MetricDefinition `json:"value,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MetricSettings part of MultiTenantDiagnosticSettings. Specifies the settings for a particular metric. type MetricSettings struct { // TimeGrain - the timegrain of the metric in ISO8601 format. @@ -2090,7 +2708,7 @@ type MetricSettings struct { RetentionPolicy *RetentionPolicy `json:"retentionPolicy,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MetricTrigger the trigger that results in a scaling action. type MetricTrigger struct { // MetricName - the name of the metric that defines what the rule monitors. @@ -2099,7 +2717,7 @@ type MetricTrigger struct { MetricResourceURI *string `json:"metricResourceUri,omitempty"` // TimeGrain - the granularity of metrics the rule monitors. Must be one of the predefined values returned from metric definitions for the metric. Must be between 12 hours and 1 minute. TimeGrain *string `json:"timeGrain,omitempty"` - // Statistic - the metric statistic type. How the metrics from multiple instances are combined. Possible values include: 'Average', 'Min', 'Max', 'Sum' + // Statistic - the metric statistic type. How the metrics from multiple instances are combined. Possible values include: 'MetricStatisticTypeAverage', 'MetricStatisticTypeMin', 'MetricStatisticTypeMax', 'MetricStatisticTypeSum' Statistic MetricStatisticType `json:"statistic,omitempty"` // TimeWindow - the range of time in which instance data is collected. This value must be greater than the delay in metric collection, which can vary from resource-to-resource. Must be between 12 hours and 5 minutes. TimeWindow *string `json:"timeWindow,omitempty"` @@ -2111,7 +2729,24 @@ type MetricTrigger struct { Threshold *float64 `json:"threshold,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// MetricValue represents a metric value. +type MetricValue struct { + // TimeStamp - the timestamp for the metric value in ISO 8601 format. + TimeStamp *date.Time `json:"timeStamp,omitempty"` + // Average - the average value in the time range. + Average *float64 `json:"average,omitempty"` + // Minimum - the least value in the time range. + Minimum *float64 `json:"minimum,omitempty"` + // Maximum - the greatest value in the time range. + Maximum *float64 `json:"maximum,omitempty"` + // Total - the sum of all of the values in the time range. + Total *float64 `json:"total,omitempty"` + // Count - the number of samples in the time range. Can be used to determine the number of values that contributed to the average value. + Count *int64 `json:"count,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Operation microsoft Insights API operation definition. type Operation struct { // Name - Operation name: {provider}/{resource}/{operation} @@ -2120,7 +2755,7 @@ type Operation struct { Display *OperationDisplay `json:"display,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // OperationDisplay display metadata associated with the operation. type OperationDisplay struct { // Provider - Service provider: Microsoft.Insights @@ -2131,7 +2766,7 @@ type OperationDisplay struct { Operation *string `json:"operation,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // OperationListResult result of the request to list Microsoft.Insights operations. It contains a list of // operations and a URL link to get the next set of results. type OperationListResult struct { @@ -2142,7 +2777,7 @@ type OperationListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ProxyOnlyResource a proxy only azure resource object type ProxyOnlyResource struct { // ID - Azure resource Id @@ -2153,17 +2788,17 @@ type ProxyOnlyResource struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Recurrence the repeating times at which this profile begins. This element is not used if the FixedDate element // is used. type Recurrence struct { - // Frequency - the recurrence frequency. How often the schedule profile should take effect. This value must be Week, meaning each week will have the same set of profiles. Possible values include: 'None', 'Second', 'Minute', 'Hour', 'Day', 'Week', 'Month', 'Year' + // Frequency - the recurrence frequency. How often the schedule profile should take effect. This value must be Week, meaning each week will have the same set of profiles. Possible values include: 'RecurrenceFrequencyNone', 'RecurrenceFrequencySecond', 'RecurrenceFrequencyMinute', 'RecurrenceFrequencyHour', 'RecurrenceFrequencyDay', 'RecurrenceFrequencyWeek', 'RecurrenceFrequencyMonth', 'RecurrenceFrequencyYear' Frequency RecurrenceFrequency `json:"frequency,omitempty"` // Schedule - the scheduling constraints for when the profile begins. Schedule *RecurrentSchedule `json:"schedule,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // RecurrentSchedule the scheduling constraints for when the profile begins. type RecurrentSchedule struct { // TimeZone - the timezone for the hours of the profile. Some examples of valid timezones are: Dateline Standard Time, UTC-11, Hawaiian Standard Time, Alaskan Standard Time, Pacific Standard Time (Mexico), Pacific Standard Time, US Mountain Standard Time, Mountain Standard Time (Mexico), Mountain Standard Time, Central America Standard Time, Central Standard Time, Central Standard Time (Mexico), Canada Central Standard Time, SA Pacific Standard Time, Eastern Standard Time, US Eastern Standard Time, Venezuela Standard Time, Paraguay Standard Time, Atlantic Standard Time, Central Brazilian Standard Time, SA Western Standard Time, Pacific SA Standard Time, Newfoundland Standard Time, E. South America Standard Time, Argentina Standard Time, SA Eastern Standard Time, Greenland Standard Time, Montevideo Standard Time, Bahia Standard Time, UTC-02, Mid-Atlantic Standard Time, Azores Standard Time, Cape Verde Standard Time, Morocco Standard Time, UTC, GMT Standard Time, Greenwich Standard Time, W. Europe Standard Time, Central Europe Standard Time, Romance Standard Time, Central European Standard Time, W. Central Africa Standard Time, Namibia Standard Time, Jordan Standard Time, GTB Standard Time, Middle East Standard Time, Egypt Standard Time, Syria Standard Time, E. Europe Standard Time, South Africa Standard Time, FLE Standard Time, Turkey Standard Time, Israel Standard Time, Kaliningrad Standard Time, Libya Standard Time, Arabic Standard Time, Arab Standard Time, Belarus Standard Time, Russian Standard Time, E. Africa Standard Time, Iran Standard Time, Arabian Standard Time, Azerbaijan Standard Time, Russia Time Zone 3, Mauritius Standard Time, Georgian Standard Time, Caucasus Standard Time, Afghanistan Standard Time, West Asia Standard Time, Ekaterinburg Standard Time, Pakistan Standard Time, India Standard Time, Sri Lanka Standard Time, Nepal Standard Time, Central Asia Standard Time, Bangladesh Standard Time, N. Central Asia Standard Time, Myanmar Standard Time, SE Asia Standard Time, North Asia Standard Time, China Standard Time, North Asia East Standard Time, Singapore Standard Time, W. Australia Standard Time, Taipei Standard Time, Ulaanbaatar Standard Time, Tokyo Standard Time, Korea Standard Time, Yakutsk Standard Time, Cen. Australia Standard Time, AUS Central Standard Time, E. Australia Standard Time, AUS Eastern Standard Time, West Pacific Standard Time, Tasmania Standard Time, Magadan Standard Time, Vladivostok Standard Time, Russia Time Zone 10, Central Pacific Standard Time, Russia Time Zone 11, New Zealand Standard Time, UTC+12, Fiji Standard Time, Kamchatka Standard Time, Tonga Standard Time, Samoa Standard Time, Line Islands Standard Time @@ -2176,7 +2811,7 @@ type RecurrentSchedule struct { Minutes *[]int32 `json:"minutes,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Resource an azure resource object type Resource struct { // ID - Azure resource Id @@ -2191,7 +2826,7 @@ type Resource struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for Resource. func (r Resource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2213,7 +2848,21 @@ func (r Resource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// Response the response to a metrics query. +type Response struct { + autorest.Response `json:"-"` + // Cost - The integer value representing the cost of the query, for data case. + Cost *float64 `json:"cost,omitempty"` + // Timespan - The timespan for which the data was retrieved. Its value consists of two datatimes concatenated, separated by '/'. This may be adjusted in the future and returned back from what was originally requested. + Timespan *string `json:"timespan,omitempty"` + // Interval - The interval (window size) for which the metric data was returned in. This may be adjusted in the future and returned back from what was originally requested. This is not present if a metadata request was made. + Interval *string `json:"interval,omitempty"` + // Value - the value of the collection. + Value *[]Metric `json:"value,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // RetentionPolicy specifies the retention policy for the log. type RetentionPolicy struct { // Enabled - a value indicating whether the retention policy is enabled. @@ -2222,7 +2871,7 @@ type RetentionPolicy struct { Days *int32 `json:"days,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // BasicRuleAction the action that is performed when the alert rule becomes active, and when an alert condition is // resolved. type BasicRuleAction interface { @@ -2231,7 +2880,7 @@ type BasicRuleAction interface { AsRuleAction() (*RuleAction, bool) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // RuleAction the action that is performed when the alert rule becomes active, and when an alert condition is // resolved. type RuleAction struct { @@ -2280,7 +2929,7 @@ func unmarshalBasicRuleActionArray(body []byte) ([]BasicRuleAction, error) { return raArray, nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for RuleAction. func (ra RuleAction) MarshalJSON() ([]byte, error) { ra.OdataType = OdataTypeRuleAction @@ -2291,31 +2940,31 @@ func (ra RuleAction) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleEmailAction is the BasicRuleAction implementation for RuleAction. func (ra RuleAction) AsRuleEmailAction() (*RuleEmailAction, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleWebhookAction is the BasicRuleAction implementation for RuleAction. func (ra RuleAction) AsRuleWebhookAction() (*RuleWebhookAction, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleAction is the BasicRuleAction implementation for RuleAction. func (ra RuleAction) AsRuleAction() (*RuleAction, bool) { return &ra, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsBasicRuleAction is the BasicRuleAction implementation for RuleAction. func (ra RuleAction) AsBasicRuleAction() (BasicRuleAction, bool) { return &ra, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // BasicRuleCondition the condition that results in the alert rule being activated. type BasicRuleCondition interface { AsThresholdRuleCondition() (*ThresholdRuleCondition, bool) @@ -2324,7 +2973,7 @@ type BasicRuleCondition interface { AsRuleCondition() (*RuleCondition, bool) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // RuleCondition the condition that results in the alert rule being activated. type RuleCondition struct { // DataSource - the resource from which the rule collects its data. For this type dataSource will always be of type RuleMetricDataSource. @@ -2378,7 +3027,7 @@ func unmarshalBasicRuleConditionArray(body []byte) ([]BasicRuleCondition, error) return rcArray, nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for RuleCondition. func (rc RuleCondition) MarshalJSON() ([]byte, error) { rc.OdataType = OdataTypeRuleCondition @@ -2390,37 +3039,37 @@ func (rc RuleCondition) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsThresholdRuleCondition is the BasicRuleCondition implementation for RuleCondition. func (rc RuleCondition) AsThresholdRuleCondition() (*ThresholdRuleCondition, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsLocationThresholdRuleCondition is the BasicRuleCondition implementation for RuleCondition. func (rc RuleCondition) AsLocationThresholdRuleCondition() (*LocationThresholdRuleCondition, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsManagementEventRuleCondition is the BasicRuleCondition implementation for RuleCondition. func (rc RuleCondition) AsManagementEventRuleCondition() (*ManagementEventRuleCondition, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleCondition is the BasicRuleCondition implementation for RuleCondition. func (rc RuleCondition) AsRuleCondition() (*RuleCondition, bool) { return &rc, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsBasicRuleCondition is the BasicRuleCondition implementation for RuleCondition. func (rc RuleCondition) AsBasicRuleCondition() (BasicRuleCondition, bool) { return &rc, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for RuleCondition struct. func (rc *RuleCondition) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2453,7 +3102,7 @@ func (rc *RuleCondition) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // BasicRuleDataSource the resource from which the rule collects its data. type BasicRuleDataSource interface { AsRuleMetricDataSource() (*RuleMetricDataSource, bool) @@ -2461,7 +3110,7 @@ type BasicRuleDataSource interface { AsRuleDataSource() (*RuleDataSource, bool) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // RuleDataSource the resource from which the rule collects its data. type RuleDataSource struct { // ResourceURI - the resource identifier of the resource the rule monitors. **NOTE**: this property cannot be updated for an existing rule. @@ -2511,7 +3160,7 @@ func unmarshalBasicRuleDataSourceArray(body []byte) ([]BasicRuleDataSource, erro return rdsArray, nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for RuleDataSource. func (rds RuleDataSource) MarshalJSON() ([]byte, error) { rds.OdataType = OdataTypeRuleDataSource @@ -2525,31 +3174,31 @@ func (rds RuleDataSource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleMetricDataSource is the BasicRuleDataSource implementation for RuleDataSource. func (rds RuleDataSource) AsRuleMetricDataSource() (*RuleMetricDataSource, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleManagementEventDataSource is the BasicRuleDataSource implementation for RuleDataSource. func (rds RuleDataSource) AsRuleManagementEventDataSource() (*RuleManagementEventDataSource, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleDataSource is the BasicRuleDataSource implementation for RuleDataSource. func (rds RuleDataSource) AsRuleDataSource() (*RuleDataSource, bool) { return &rds, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsBasicRuleDataSource is the BasicRuleDataSource implementation for RuleDataSource. func (rds RuleDataSource) AsBasicRuleDataSource() (BasicRuleDataSource, bool) { return &rds, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // RuleEmailAction specifies the action to send email when the rule condition is evaluated. The discriminator is // always RuleEmailAction in this case. type RuleEmailAction struct { @@ -2561,7 +3210,7 @@ type RuleEmailAction struct { OdataType OdataTypeBasicRuleAction `json:"odata.type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for RuleEmailAction. func (rea RuleEmailAction) MarshalJSON() ([]byte, error) { rea.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsRuleEmailAction @@ -2578,38 +3227,38 @@ func (rea RuleEmailAction) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleEmailAction is the BasicRuleAction implementation for RuleEmailAction. func (rea RuleEmailAction) AsRuleEmailAction() (*RuleEmailAction, bool) { return &rea, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleWebhookAction is the BasicRuleAction implementation for RuleEmailAction. func (rea RuleEmailAction) AsRuleWebhookAction() (*RuleWebhookAction, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleAction is the BasicRuleAction implementation for RuleEmailAction. func (rea RuleEmailAction) AsRuleAction() (*RuleAction, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsBasicRuleAction is the BasicRuleAction implementation for RuleEmailAction. func (rea RuleEmailAction) AsBasicRuleAction() (BasicRuleAction, bool) { return &rea, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // RuleManagementEventClaimsDataSource the claims for a rule management event data source. type RuleManagementEventClaimsDataSource struct { // EmailAddress - the email address. EmailAddress *string `json:"emailAddress,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // RuleManagementEventDataSource a rule management event data source. The discriminator fields is always // RuleManagementEventDataSource in this case. type RuleManagementEventDataSource struct { @@ -2637,7 +3286,7 @@ type RuleManagementEventDataSource struct { OdataType OdataType `json:"odata.type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for RuleManagementEventDataSource. func (rmeds RuleManagementEventDataSource) MarshalJSON() ([]byte, error) { rmeds.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsRuleManagementEventDataSource @@ -2678,31 +3327,31 @@ func (rmeds RuleManagementEventDataSource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleMetricDataSource is the BasicRuleDataSource implementation for RuleManagementEventDataSource. func (rmeds RuleManagementEventDataSource) AsRuleMetricDataSource() (*RuleMetricDataSource, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleManagementEventDataSource is the BasicRuleDataSource implementation for RuleManagementEventDataSource. func (rmeds RuleManagementEventDataSource) AsRuleManagementEventDataSource() (*RuleManagementEventDataSource, bool) { return &rmeds, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleDataSource is the BasicRuleDataSource implementation for RuleManagementEventDataSource. func (rmeds RuleManagementEventDataSource) AsRuleDataSource() (*RuleDataSource, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsBasicRuleDataSource is the BasicRuleDataSource implementation for RuleManagementEventDataSource. func (rmeds RuleManagementEventDataSource) AsBasicRuleDataSource() (BasicRuleDataSource, bool) { return &rmeds, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // RuleMetricDataSource a rule metric data source. The discriminator value is always RuleMetricDataSource in this // case. type RuleMetricDataSource struct { @@ -2714,7 +3363,7 @@ type RuleMetricDataSource struct { OdataType OdataType `json:"odata.type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for RuleMetricDataSource. func (rmds RuleMetricDataSource) MarshalJSON() ([]byte, error) { rmds.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsRuleMetricDataSource @@ -2731,31 +3380,31 @@ func (rmds RuleMetricDataSource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleMetricDataSource is the BasicRuleDataSource implementation for RuleMetricDataSource. func (rmds RuleMetricDataSource) AsRuleMetricDataSource() (*RuleMetricDataSource, bool) { return &rmds, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleManagementEventDataSource is the BasicRuleDataSource implementation for RuleMetricDataSource. func (rmds RuleMetricDataSource) AsRuleManagementEventDataSource() (*RuleManagementEventDataSource, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleDataSource is the BasicRuleDataSource implementation for RuleMetricDataSource. func (rmds RuleMetricDataSource) AsRuleDataSource() (*RuleDataSource, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsBasicRuleDataSource is the BasicRuleDataSource implementation for RuleMetricDataSource. func (rmds RuleMetricDataSource) AsBasicRuleDataSource() (BasicRuleDataSource, bool) { return &rmds, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // RuleWebhookAction specifies the action to post to service when the rule condition is evaluated. The // discriminator is always RuleWebhookAction in this case. type RuleWebhookAction struct { @@ -2767,7 +3416,7 @@ type RuleWebhookAction struct { OdataType OdataTypeBasicRuleAction `json:"odata.type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for RuleWebhookAction. func (rwa RuleWebhookAction) MarshalJSON() ([]byte, error) { rwa.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsRuleWebhookAction @@ -2784,31 +3433,31 @@ func (rwa RuleWebhookAction) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleEmailAction is the BasicRuleAction implementation for RuleWebhookAction. func (rwa RuleWebhookAction) AsRuleEmailAction() (*RuleEmailAction, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleWebhookAction is the BasicRuleAction implementation for RuleWebhookAction. func (rwa RuleWebhookAction) AsRuleWebhookAction() (*RuleWebhookAction, bool) { return &rwa, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleAction is the BasicRuleAction implementation for RuleWebhookAction. func (rwa RuleWebhookAction) AsRuleAction() (*RuleAction, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsBasicRuleAction is the BasicRuleAction implementation for RuleWebhookAction. func (rwa RuleWebhookAction) AsBasicRuleAction() (BasicRuleAction, bool) { return &rwa, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ScaleAction the parameters for the scaling action. type ScaleAction struct { // Direction - the scale direction. Whether the scaling action increases or decreases the number of instances. Possible values include: 'ScaleDirectionNone', 'ScaleDirectionIncrease', 'ScaleDirectionDecrease' @@ -2821,7 +3470,7 @@ type ScaleAction struct { Cooldown *string `json:"cooldown,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ScaleCapacity the number of instances that can be used during this profile. type ScaleCapacity struct { // Minimum - the minimum number of instances for the resource. @@ -2832,7 +3481,7 @@ type ScaleCapacity struct { Default *string `json:"default,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ScaleRule a rule that provide the triggers and parameters for the scaling action. type ScaleRule struct { // MetricTrigger - the trigger that results in a scaling action. @@ -2841,7 +3490,19 @@ type ScaleRule struct { ScaleAction *ScaleAction `json:"scaleAction,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// SenderAuthorization the authorization used by the user who has performed the operation that led to this event. +// This captures the RBAC properties of the event. These usually include the 'action', 'role' and the 'scope' +type SenderAuthorization struct { + // Action - the permissible actions. For instance: microsoft.support/supporttickets/write + Action *string `json:"action,omitempty"` + // Role - the role of the user. For instance: Subscription Admin + Role *string `json:"role,omitempty"` + // Scope - the scope. + Scope *string `json:"scope,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // SmsReceiver an SMS receiver. type SmsReceiver struct { // Name - The name of the SMS receiver. Names must be unique across all receivers within an action group. @@ -2854,7 +3515,7 @@ type SmsReceiver struct { Status ReceiverStatus `json:"status,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ThresholdRuleCondition a rule condition based on a metric crossing a threshold. type ThresholdRuleCondition struct { // Operator - the operator used to compare the data and the threshold. Possible values include: 'ConditionOperatorGreaterThan', 'ConditionOperatorGreaterThanOrEqual', 'ConditionOperatorLessThan', 'ConditionOperatorLessThanOrEqual' @@ -2871,7 +3532,7 @@ type ThresholdRuleCondition struct { OdataType OdataTypeBasicRuleCondition `json:"odata.type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for ThresholdRuleCondition. func (trc ThresholdRuleCondition) MarshalJSON() ([]byte, error) { trc.OdataType = OdataTypeMicrosoftAzureManagementInsightsModelsThresholdRuleCondition @@ -2895,37 +3556,37 @@ func (trc ThresholdRuleCondition) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsThresholdRuleCondition is the BasicRuleCondition implementation for ThresholdRuleCondition. func (trc ThresholdRuleCondition) AsThresholdRuleCondition() (*ThresholdRuleCondition, bool) { return &trc, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsLocationThresholdRuleCondition is the BasicRuleCondition implementation for ThresholdRuleCondition. func (trc ThresholdRuleCondition) AsLocationThresholdRuleCondition() (*LocationThresholdRuleCondition, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsManagementEventRuleCondition is the BasicRuleCondition implementation for ThresholdRuleCondition. func (trc ThresholdRuleCondition) AsManagementEventRuleCondition() (*ManagementEventRuleCondition, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsRuleCondition is the BasicRuleCondition implementation for ThresholdRuleCondition. func (trc ThresholdRuleCondition) AsRuleCondition() (*RuleCondition, bool) { return nil, false } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // AsBasicRuleCondition is the BasicRuleCondition implementation for ThresholdRuleCondition. func (trc ThresholdRuleCondition) AsBasicRuleCondition() (BasicRuleCondition, bool) { return &trc, true } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UnmarshalJSON is the custom unmarshaler for ThresholdRuleCondition struct. func (trc *ThresholdRuleCondition) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2994,7 +3655,27 @@ func (trc *ThresholdRuleCondition) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// TimeSeriesElement a time series result type. The discriminator value is always TimeSeries in this case. +type TimeSeriesElement struct { + // Metadatavalues - the metadata values returned if $filter was specified in the call. + Metadatavalues *[]MetadataValue `json:"metadatavalues,omitempty"` + // Data - An array of data points representing the metric values. This is only returned if a result type of data is specified. + Data *[]MetricValue `json:"data,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// TimeSeriesInformation the time series info needed for calculating the baseline. +type TimeSeriesInformation struct { + // Sensitivities - the list of sensitivities for calculating the baseline. + Sensitivities *[]string `json:"sensitivities,omitempty"` + // Values - The metric values to calculate the baseline. + Values *[]float64 `json:"values,omitempty"` + // Timestamps - the array of timestamps of the baselines. + Timestamps *[]date.Time `json:"timestamps,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // TimeWindow a specific date-time for the profile. type TimeWindow struct { // TimeZone - the timezone of the start and end times for the profile. Some examples of valid timezones are: Dateline Standard Time, UTC-11, Hawaiian Standard Time, Alaskan Standard Time, Pacific Standard Time (Mexico), Pacific Standard Time, US Mountain Standard Time, Mountain Standard Time (Mexico), Mountain Standard Time, Central America Standard Time, Central Standard Time, Central Standard Time (Mexico), Canada Central Standard Time, SA Pacific Standard Time, Eastern Standard Time, US Eastern Standard Time, Venezuela Standard Time, Paraguay Standard Time, Atlantic Standard Time, Central Brazilian Standard Time, SA Western Standard Time, Pacific SA Standard Time, Newfoundland Standard Time, E. South America Standard Time, Argentina Standard Time, SA Eastern Standard Time, Greenland Standard Time, Montevideo Standard Time, Bahia Standard Time, UTC-02, Mid-Atlantic Standard Time, Azores Standard Time, Cape Verde Standard Time, Morocco Standard Time, UTC, GMT Standard Time, Greenwich Standard Time, W. Europe Standard Time, Central Europe Standard Time, Romance Standard Time, Central European Standard Time, W. Central Africa Standard Time, Namibia Standard Time, Jordan Standard Time, GTB Standard Time, Middle East Standard Time, Egypt Standard Time, Syria Standard Time, E. Europe Standard Time, South Africa Standard Time, FLE Standard Time, Turkey Standard Time, Israel Standard Time, Kaliningrad Standard Time, Libya Standard Time, Arabic Standard Time, Arab Standard Time, Belarus Standard Time, Russian Standard Time, E. Africa Standard Time, Iran Standard Time, Arabian Standard Time, Azerbaijan Standard Time, Russia Time Zone 3, Mauritius Standard Time, Georgian Standard Time, Caucasus Standard Time, Afghanistan Standard Time, West Asia Standard Time, Ekaterinburg Standard Time, Pakistan Standard Time, India Standard Time, Sri Lanka Standard Time, Nepal Standard Time, Central Asia Standard Time, Bangladesh Standard Time, N. Central Asia Standard Time, Myanmar Standard Time, SE Asia Standard Time, North Asia Standard Time, China Standard Time, North Asia East Standard Time, Singapore Standard Time, W. Australia Standard Time, Taipei Standard Time, Ulaanbaatar Standard Time, Tokyo Standard Time, Korea Standard Time, Yakutsk Standard Time, Cen. Australia Standard Time, AUS Central Standard Time, E. Australia Standard Time, AUS Eastern Standard Time, West Pacific Standard Time, Tasmania Standard Time, Magadan Standard Time, Vladivostok Standard Time, Russia Time Zone 10, Central Pacific Standard Time, Russia Time Zone 11, New Zealand Standard Time, UTC+12, Fiji Standard Time, Kamchatka Standard Time, Tonga Standard Time, Samoa Standard Time, Line Islands Standard Time @@ -3005,7 +3686,18 @@ type TimeWindow struct { End *date.Time `json:"end,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// VoiceReceiver a voice receiver. +type VoiceReceiver struct { + // Name - The name of the voice receiver. Names must be unique across all receivers within an action group. + Name *string `json:"name,omitempty"` + // CountryCode - The country code of the voice receiver. + CountryCode *string `json:"countryCode,omitempty"` + // PhoneNumber - The phone number of the voice receiver. + PhoneNumber *string `json:"phoneNumber,omitempty"` +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // WebhookNotification webhook notification of an autoscale event. type WebhookNotification struct { // ServiceURI - the service address to receive the notification. @@ -3014,7 +3706,7 @@ type WebhookNotification struct { Properties map[string]*string `json:"properties"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // MarshalJSON is the custom marshaler for WebhookNotification. func (wn WebhookNotification) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -3027,7 +3719,7 @@ func (wn WebhookNotification) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // WebhookReceiver a webhook receiver. type WebhookReceiver struct { // Name - The name of the webhook receiver. Names must be unique across all receivers within an action group. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/operations.go similarity index 89% rename from vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/operations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/operations.go index 0f8daa94860a..beb2e31aa8ed 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/operations.go @@ -24,25 +24,25 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // OperationsClient is the monitor Management Client type OperationsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewOperationsClient creates an instance of the OperationsClient client. func NewOperationsClient(subscriptionID string) OperationsClient { return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // List lists all of the available operations from Microsoft.Insights provider. func (client OperationsClient) List(ctx context.Context) (result OperationListResult, err error) { req, err := client.ListPreparer(ctx) @@ -66,7 +66,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2015-04-01" @@ -82,7 +82,7 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -90,7 +90,7 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/tenantactivitylogs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/tenantactivitylogs.go new file mode 100644 index 000000000000..474a715d9327 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/tenantactivitylogs.go @@ -0,0 +1,160 @@ +package insights + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// TenantActivityLogsClient is the monitor Management Client +type TenantActivityLogsClient struct { + BaseClient +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NewTenantActivityLogsClient creates an instance of the TenantActivityLogsClient client. +func NewTenantActivityLogsClient(subscriptionID string) TenantActivityLogsClient { + return NewTenantActivityLogsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// NewTenantActivityLogsClientWithBaseURI creates an instance of the TenantActivityLogsClient client. +func NewTenantActivityLogsClientWithBaseURI(baseURI string, subscriptionID string) TenantActivityLogsClient { + return TenantActivityLogsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// List gets the Activity Logs for the Tenant.
    Everything that is applicable to the API to get the Activity Logs for +// the subscription is applicable to this API (the parameters, $filter, etc.).
    One thing to point out here is that +// this API does *not* retrieve the logs at the individual subscription of the tenant but only surfaces the logs that +// were generated at the tenant level. +// +// filter is reduces the set of data collected.
    The **$filter** is very restricted and allows only the +// following patterns.
    - List events for a resource group: $filter=eventTimestamp ge '' and +// eventTimestamp le '' and eventChannels eq 'Admin, Operation' and resourceGroupName eq +// ''.
    - List events for resource: $filter=eventTimestamp ge '' and +// eventTimestamp le '' and eventChannels eq 'Admin, Operation' and resourceUri eq ''.
    - +// List events for a subscription: $filter=eventTimestamp ge '' and eventTimestamp le '' and +// eventChannels eq 'Admin, Operation'.
    - List events for a resource provider: $filter=eventTimestamp ge '' and eventTimestamp le '' and eventChannels eq 'Admin, Operation' and resourceProvider eq +// ''.
    - List events for a correlation Id: api-version=2014-04-01&$filter=eventTimestamp +// ge '2014-07-16T04:36:37.6407898Z' and eventTimestamp le '2014-07-20T04:36:37.6407898Z' and eventChannels eq +// 'Admin, Operation' and correlationId eq ''.
    **NOTE**: No other syntax is allowed. +// selectParameter is used to fetch events with only the given properties.
    The **$select** argument is a comma +// separated list of property names to be returned. Possible values are: *authorization*, *claims*, +// *correlationId*, *description*, *eventDataId*, *eventName*, *eventTimestamp*, *httpRequest*, *level*, +// *operationId*, *operationName*, *properties*, *resourceGroupName*, *resourceProviderName*, *resourceId*, +// *status*, *submissionTimestamp*, *subStatus*, *subscriptionId* +func (client TenantActivityLogsClient) List(ctx context.Context, filter string, selectParameter string) (result EventDataCollectionPage, err error) { + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx, filter, selectParameter) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.TenantActivityLogsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.edc.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.TenantActivityLogsClient", "List", resp, "Failure sending request") + return + } + + result.edc, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.TenantActivityLogsClient", "List", resp, "Failure responding to request") + } + + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListPreparer prepares the List request. +func (client TenantActivityLogsClient) ListPreparer(ctx context.Context, filter string, selectParameter string) (*http.Request, error) { + const APIVersion = "2015-04-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(filter) > 0 { + queryParameters["$filter"] = autorest.Encode("query", filter) + } + if len(selectParameter) > 0 { + queryParameters["$select"] = autorest.Encode("query", selectParameter) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPath("/providers/microsoft.insights/eventtypes/management/values"), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client TenantActivityLogsClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client TenantActivityLogsClient) ListResponder(resp *http.Response) (result EventDataCollection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client TenantActivityLogsClient) listNextResults(lastResults EventDataCollection) (result EventDataCollection, err error) { + req, err := lastResults.eventDataCollectionPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "insights.TenantActivityLogsClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "insights.TenantActivityLogsClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.TenantActivityLogsClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client TenantActivityLogsClient) ListComplete(ctx context.Context, filter string, selectParameter string) (result EventDataCollectionIterator, err error) { + result.page, err = client.List(ctx, filter, selectParameter) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/version.go similarity index 84% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/version.go index 1403fb37098c..c37c069c8367 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights/version.go @@ -1,4 +1,4 @@ -package sql +package insights import "github.com/Azure/azure-sdk-for-go/version" @@ -18,13 +18,13 @@ import "github.com/Azure/azure-sdk-for-go/version" // // Code generated by Microsoft (R) AutoRest Code Generator. // Changes may cause incorrect behavior and will be lost if the code is regenerated. -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " sql/2015-05-01-preview" + return "Azure-SDK-For-Go/" + version.Number + " insights/2018-03-01" } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. +// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights instead. // Version returns the semantic version (see http://semver.org) of the client. func Version() string { return version.Number diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/client.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/client.go index c771ab075150..2cbc44bf4686 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/client.go @@ -29,7 +29,6 @@ const ( DefaultBaseURI = "https://management.azure.com" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // BaseClient is the base client for Operationalinsights. type BaseClient struct { autorest.Client @@ -37,13 +36,11 @@ type BaseClient struct { SubscriptionID string } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // New creates an instance of the BaseClient client. func New(subscriptionID string) BaseClient { return NewWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewWithBaseURI creates an instance of the BaseClient client. func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { return BaseClient{ diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/datasources.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/datasources.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/datasources.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/datasources.go index 342b185e2e81..346cc10d73a9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/datasources.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/datasources.go @@ -25,30 +25,27 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSourcesClient is the operational Insights Client type DataSourcesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewDataSourcesClient creates an instance of the DataSourcesClient client. func NewDataSourcesClient(subscriptionID string) DataSourcesClient { return NewDataSourcesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewDataSourcesClientWithBaseURI creates an instance of the DataSourcesClient client. func NewDataSourcesClientWithBaseURI(baseURI string, subscriptionID string) DataSourcesClient { return DataSourcesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdate create or update a data source. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name -// of the Log Analytics Workspace that will contain the datasource dataSourceName is the name of the datasource -// resource. parameters is the parameters required to create or update a datasource. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - name of the Log Analytics Workspace that will contain the datasource +// dataSourceName - the name of the datasource resource. +// parameters - the parameters required to create or update a datasource. func (client DataSourcesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, workspaceName string, dataSourceName string, parameters DataSource) (result DataSource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -81,7 +78,6 @@ func (client DataSourcesClient) CreateOrUpdate(ctx context.Context, resourceGrou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DataSourcesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, workspaceName string, dataSourceName string, parameters DataSource) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -106,7 +102,6 @@ func (client DataSourcesClient) CreateOrUpdatePreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DataSourcesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -114,7 +109,6 @@ func (client DataSourcesClient) CreateOrUpdateSender(req *http.Request) (*http.R azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DataSourcesClient) CreateOrUpdateResponder(resp *http.Response) (result DataSource, err error) { @@ -128,11 +122,11 @@ func (client DataSourcesClient) CreateOrUpdateResponder(resp *http.Response) (re return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Delete deletes a data source instance. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name -// of the Log Analytics Workspace that contains the datasource. dataSourceName is name of the datasource. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - name of the Log Analytics Workspace that contains the datasource. +// dataSourceName - name of the datasource. func (client DataSourcesClient) Delete(ctx context.Context, resourceGroupName string, workspaceName string, dataSourceName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -163,7 +157,6 @@ func (client DataSourcesClient) Delete(ctx context.Context, resourceGroupName st return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeletePreparer prepares the Delete request. func (client DataSourcesClient) DeletePreparer(ctx context.Context, resourceGroupName string, workspaceName string, dataSourceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -186,7 +179,6 @@ func (client DataSourcesClient) DeletePreparer(ctx context.Context, resourceGrou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client DataSourcesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -194,7 +186,6 @@ func (client DataSourcesClient) DeleteSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client DataSourcesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -207,11 +198,11 @@ func (client DataSourcesClient) DeleteResponder(resp *http.Response) (result aut return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Get gets a datasource instance. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name -// of the Log Analytics Workspace that contains the datasource. dataSourceName is name of the datasource +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - name of the Log Analytics Workspace that contains the datasource. +// dataSourceName - name of the datasource func (client DataSourcesClient) Get(ctx context.Context, resourceGroupName string, workspaceName string, dataSourceName string) (result DataSource, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -242,7 +233,6 @@ func (client DataSourcesClient) Get(ctx context.Context, resourceGroupName strin return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetPreparer prepares the Get request. func (client DataSourcesClient) GetPreparer(ctx context.Context, resourceGroupName string, workspaceName string, dataSourceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -265,7 +255,6 @@ func (client DataSourcesClient) GetPreparer(ctx context.Context, resourceGroupNa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DataSourcesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -273,7 +262,6 @@ func (client DataSourcesClient) GetSender(req *http.Request) (*http.Response, er azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DataSourcesClient) GetResponder(resp *http.Response) (result DataSource, err error) { @@ -287,12 +275,12 @@ func (client DataSourcesClient) GetResponder(resp *http.Response) (result DataSo return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspace gets the first page of data source instances in a workspace with the link to the next page. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is the -// workspace that contains the data sources. filter is the filter to apply on the operation. skiptoken is starting -// point of the collection of data source instances. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - the workspace that contains the data sources. +// filter - the filter to apply on the operation. +// skiptoken - starting point of the collection of data source instances. func (client DataSourcesClient) ListByWorkspace(ctx context.Context, resourceGroupName string, workspaceName string, filter string, skiptoken string) (result DataSourceListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -324,7 +312,6 @@ func (client DataSourcesClient) ListByWorkspace(ctx context.Context, resourceGro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspacePreparer prepares the ListByWorkspace request. func (client DataSourcesClient) ListByWorkspacePreparer(ctx context.Context, resourceGroupName string, workspaceName string, filter string, skiptoken string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -350,7 +337,6 @@ func (client DataSourcesClient) ListByWorkspacePreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspaceSender sends the ListByWorkspace request. The method will close the // http.Response Body if it receives an error. func (client DataSourcesClient) ListByWorkspaceSender(req *http.Request) (*http.Response, error) { @@ -358,7 +344,6 @@ func (client DataSourcesClient) ListByWorkspaceSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspaceResponder handles the response to the ListByWorkspace request. The method always // closes the http.Response Body. func (client DataSourcesClient) ListByWorkspaceResponder(resp *http.Response) (result DataSourceListResult, err error) { @@ -393,7 +378,6 @@ func (client DataSourcesClient) listByWorkspaceNextResults(lastResults DataSourc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspaceComplete enumerates all values, automatically crossing page boundaries as required. func (client DataSourcesClient) ListByWorkspaceComplete(ctx context.Context, resourceGroupName string, workspaceName string, filter string, skiptoken string) (result DataSourceListResultIterator, err error) { result.page, err = client.ListByWorkspace(ctx, resourceGroupName, workspaceName, filter, skiptoken) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/linkedservices.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/linkedservices.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/linkedservices.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/linkedservices.go index fbf8bfcf8171..ea3417d519a8 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/linkedservices.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/linkedservices.go @@ -25,30 +25,27 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // LinkedServicesClient is the operational Insights Client type LinkedServicesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewLinkedServicesClient creates an instance of the LinkedServicesClient client. func NewLinkedServicesClient(subscriptionID string) LinkedServicesClient { return NewLinkedServicesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewLinkedServicesClientWithBaseURI creates an instance of the LinkedServicesClient client. func NewLinkedServicesClientWithBaseURI(baseURI string, subscriptionID string) LinkedServicesClient { return LinkedServicesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdate create or update a linked service. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name -// of the Log Analytics Workspace that will contain the linkedServices resource linkedServiceName is name of the -// linkedServices resource parameters is the parameters required to create or update a linked service. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - name of the Log Analytics Workspace that will contain the linkedServices resource +// linkedServiceName - name of the linkedServices resource +// parameters - the parameters required to create or update a linked service. func (client LinkedServicesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, workspaceName string, linkedServiceName string, parameters LinkedService) (result LinkedService, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -82,7 +79,6 @@ func (client LinkedServicesClient) CreateOrUpdate(ctx context.Context, resourceG return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client LinkedServicesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, workspaceName string, linkedServiceName string, parameters LinkedService) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -107,7 +103,6 @@ func (client LinkedServicesClient) CreateOrUpdatePreparer(ctx context.Context, r return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client LinkedServicesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -115,7 +110,6 @@ func (client LinkedServicesClient) CreateOrUpdateSender(req *http.Request) (*htt azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client LinkedServicesClient) CreateOrUpdateResponder(resp *http.Response) (result LinkedService, err error) { @@ -129,12 +123,11 @@ func (client LinkedServicesClient) CreateOrUpdateResponder(resp *http.Response) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Delete deletes a linked service instance. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name -// of the Log Analytics Workspace that contains the linkedServices resource linkedServiceName is name of the linked -// service. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - name of the Log Analytics Workspace that contains the linkedServices resource +// linkedServiceName - name of the linked service. func (client LinkedServicesClient) Delete(ctx context.Context, resourceGroupName string, workspaceName string, linkedServiceName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -165,7 +158,6 @@ func (client LinkedServicesClient) Delete(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeletePreparer prepares the Delete request. func (client LinkedServicesClient) DeletePreparer(ctx context.Context, resourceGroupName string, workspaceName string, linkedServiceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -188,7 +180,6 @@ func (client LinkedServicesClient) DeletePreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client LinkedServicesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -196,7 +187,6 @@ func (client LinkedServicesClient) DeleteSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client LinkedServicesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -209,12 +199,11 @@ func (client LinkedServicesClient) DeleteResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Get gets a linked service instance. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name -// of the Log Analytics Workspace that contains the linkedServices resource linkedServiceName is name of the linked -// service. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - name of the Log Analytics Workspace that contains the linkedServices resource +// linkedServiceName - name of the linked service. func (client LinkedServicesClient) Get(ctx context.Context, resourceGroupName string, workspaceName string, linkedServiceName string) (result LinkedService, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -245,7 +234,6 @@ func (client LinkedServicesClient) Get(ctx context.Context, resourceGroupName st return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetPreparer prepares the Get request. func (client LinkedServicesClient) GetPreparer(ctx context.Context, resourceGroupName string, workspaceName string, linkedServiceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -268,7 +256,6 @@ func (client LinkedServicesClient) GetPreparer(ctx context.Context, resourceGrou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client LinkedServicesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -276,7 +263,6 @@ func (client LinkedServicesClient) GetSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client LinkedServicesClient) GetResponder(resp *http.Response) (result LinkedService, err error) { @@ -290,11 +276,10 @@ func (client LinkedServicesClient) GetResponder(resp *http.Response) (result Lin return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspace gets the linked services instances in a workspace. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name -// of the Log Analytics Workspace that contains the linked services. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - name of the Log Analytics Workspace that contains the linked services. func (client LinkedServicesClient) ListByWorkspace(ctx context.Context, resourceGroupName string, workspaceName string) (result LinkedServiceListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -325,7 +310,6 @@ func (client LinkedServicesClient) ListByWorkspace(ctx context.Context, resource return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspacePreparer prepares the ListByWorkspace request. func (client LinkedServicesClient) ListByWorkspacePreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -347,7 +331,6 @@ func (client LinkedServicesClient) ListByWorkspacePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspaceSender sends the ListByWorkspace request. The method will close the // http.Response Body if it receives an error. func (client LinkedServicesClient) ListByWorkspaceSender(req *http.Request) (*http.Response, error) { @@ -355,7 +338,6 @@ func (client LinkedServicesClient) ListByWorkspaceSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByWorkspaceResponder handles the response to the ListByWorkspace request. The method always // closes the http.Response Body. func (client LinkedServicesClient) ListByWorkspaceResponder(resp *http.Response) (result LinkedServiceListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go similarity index 74% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go index 2b1707a29313..d13266704458 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go @@ -26,7 +26,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSourceKind enumerates the values for data source kind. type DataSourceKind string @@ -63,13 +62,11 @@ const ( WindowsPerformanceCounter DataSourceKind = "WindowsPerformanceCounter" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // PossibleDataSourceKindValues returns an array of possible values for the DataSourceKind const type. func PossibleDataSourceKindValues() []DataSourceKind { return []DataSourceKind{AzureActivityLog, ChangeTrackingCustomRegistry, ChangeTrackingDefaultPath, ChangeTrackingDefaultRegistry, ChangeTrackingPath, CustomLog, CustomLogCollection, GenericDataSource, IISLogs, LinuxPerformanceCollection, LinuxPerformanceObject, LinuxSyslog, LinuxSyslogCollection, WindowsEvent, WindowsPerformanceCounter} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // EntityStatus enumerates the values for entity status. type EntityStatus string @@ -88,13 +85,11 @@ const ( Succeeded EntityStatus = "Succeeded" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // PossibleEntityStatusValues returns an array of possible values for the EntityStatus const type. func PossibleEntityStatusValues() []EntityStatus { return []EntityStatus{Canceled, Creating, Deleting, Failed, ProvisioningAccount, Succeeded} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // SkuNameEnum enumerates the values for sku name enum. type SkuNameEnum string @@ -115,13 +110,11 @@ const ( Unlimited SkuNameEnum = "Unlimited" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // PossibleSkuNameEnumValues returns an array of possible values for the SkuNameEnum const type. func PossibleSkuNameEnumValues() []SkuNameEnum { return []SkuNameEnum{Free, PerGB2018, PerNode, Premium, Standalone, Standard, Unlimited} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSource datasources under OMS Workspace. type DataSource struct { autorest.Response `json:"-"` @@ -141,7 +134,6 @@ type DataSource struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MarshalJSON is the custom marshaler for DataSource. func (ds DataSource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -167,14 +159,12 @@ func (ds DataSource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSourceFilter dataSource filter. Right now, only filter by kind is supported. type DataSourceFilter struct { // Kind - Possible values include: 'AzureActivityLog', 'ChangeTrackingPath', 'ChangeTrackingDefaultPath', 'ChangeTrackingDefaultRegistry', 'ChangeTrackingCustomRegistry', 'CustomLog', 'CustomLogCollection', 'GenericDataSource', 'IISLogs', 'LinuxPerformanceObject', 'LinuxPerformanceCollection', 'LinuxSyslog', 'LinuxSyslogCollection', 'WindowsEvent', 'WindowsPerformanceCounter' Kind DataSourceKind `json:"kind,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSourceListResult the list data source by workspace operation response. type DataSourceListResult struct { autorest.Response `json:"-"` @@ -184,14 +174,12 @@ type DataSourceListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSourceListResultIterator provides access to a complete listing of DataSource values. type DataSourceListResultIterator struct { i int page DataSourceListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *DataSourceListResultIterator) Next() error { @@ -208,19 +196,16 @@ func (iter *DataSourceListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter DataSourceListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Response returns the raw server response from the last page request. func (iter DataSourceListResultIterator) Response() DataSourceListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter DataSourceListResultIterator) Value() DataSource { @@ -230,7 +215,6 @@ func (iter DataSourceListResultIterator) Value() DataSource { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // IsEmpty returns true if the ListResult contains no values. func (dslr DataSourceListResult) IsEmpty() bool { return dslr.Value == nil || len(*dslr.Value) == 0 @@ -248,14 +232,12 @@ func (dslr DataSourceListResult) dataSourceListResultPreparer() (*http.Request, autorest.WithBaseURL(to.String(dslr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DataSourceListResultPage contains a page of DataSource values. type DataSourceListResultPage struct { fn func(DataSourceListResult) (DataSourceListResult, error) dslr DataSourceListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *DataSourceListResultPage) Next() error { @@ -267,19 +249,16 @@ func (page *DataSourceListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page DataSourceListResultPage) NotDone() bool { return !page.dslr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Response returns the raw server response from the last page request. func (page DataSourceListResultPage) Response() DataSourceListResult { return page.dslr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Values returns the slice of values for the current page or nil if there are no values. func (page DataSourceListResultPage) Values() []DataSource { if page.dslr.IsEmpty() { @@ -288,7 +267,6 @@ func (page DataSourceListResultPage) Values() []DataSource { return *page.dslr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // IntelligencePack intelligence Pack containing a string name and boolean indicating if it's enabled. type IntelligencePack struct { // Name - The name of the intelligence pack. @@ -299,7 +277,6 @@ type IntelligencePack struct { DisplayName *string `json:"displayName,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // LinkedService the top level Linked service resource container. type LinkedService struct { autorest.Response `json:"-"` @@ -315,7 +292,6 @@ type LinkedService struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MarshalJSON is the custom marshaler for LinkedService. func (ls LinkedService) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -337,7 +313,6 @@ func (ls LinkedService) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UnmarshalJSON is the custom unmarshaler for LinkedService struct. func (ls *LinkedService) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -398,7 +373,6 @@ func (ls *LinkedService) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // LinkedServiceListResult the list linked service operation response. type LinkedServiceListResult struct { autorest.Response `json:"-"` @@ -406,28 +380,24 @@ type LinkedServiceListResult struct { Value *[]LinkedService `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // LinkedServiceProperties linked service properties. type LinkedServiceProperties struct { // ResourceID - The resource id of the resource that will be linked to the workspace. ResourceID *string `json:"resourceId,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListIntelligencePack ... type ListIntelligencePack struct { autorest.Response `json:"-"` Value *[]IntelligencePack `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ManagementGroup a management group that is connected to a workspace type ManagementGroup struct { // ManagementGroupProperties - The properties of the management group. *ManagementGroupProperties `json:"properties,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MarshalJSON is the custom marshaler for ManagementGroup. func (mg ManagementGroup) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -437,7 +407,6 @@ func (mg ManagementGroup) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UnmarshalJSON is the custom unmarshaler for ManagementGroup struct. func (mg *ManagementGroup) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -462,7 +431,6 @@ func (mg *ManagementGroup) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ManagementGroupProperties management group properties. type ManagementGroupProperties struct { // ServerCount - The number of servers connected to the management group. @@ -483,7 +451,6 @@ type ManagementGroupProperties struct { Sku *string `json:"sku,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MetricName the name of a metric. type MetricName struct { // Value - The system name of the metric. @@ -492,7 +459,6 @@ type MetricName struct { LocalizedValue *string `json:"localizedValue,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Operation supported operation of OperationalInsights resource provider. type Operation struct { // Name - Operation name: {provider}/{resource}/{operation} @@ -501,7 +467,6 @@ type Operation struct { Display *OperationDisplay `json:"display,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // OperationDisplay display metadata associated with the operation. type OperationDisplay struct { // Provider - Service provider: Microsoft OperationsManagement. @@ -512,7 +477,6 @@ type OperationDisplay struct { Operation *string `json:"operation,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // OperationListResult result of the request to list solution operations. type OperationListResult struct { autorest.Response `json:"-"` @@ -522,14 +486,12 @@ type OperationListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // OperationListResultIterator provides access to a complete listing of Operation values. type OperationListResultIterator struct { i int page OperationListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *OperationListResultIterator) Next() error { @@ -546,19 +508,16 @@ func (iter *OperationListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter OperationListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Response returns the raw server response from the last page request. func (iter OperationListResultIterator) Response() OperationListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter OperationListResultIterator) Value() Operation { @@ -568,7 +527,6 @@ func (iter OperationListResultIterator) Value() Operation { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // IsEmpty returns true if the ListResult contains no values. func (olr OperationListResult) IsEmpty() bool { return olr.Value == nil || len(*olr.Value) == 0 @@ -586,14 +544,12 @@ func (olr OperationListResult) operationListResultPreparer() (*http.Request, err autorest.WithBaseURL(to.String(olr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // OperationListResultPage contains a page of Operation values. type OperationListResultPage struct { fn func(OperationListResult) (OperationListResult, error) olr OperationListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *OperationListResultPage) Next() error { @@ -605,19 +561,16 @@ func (page *OperationListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page OperationListResultPage) NotDone() bool { return !page.olr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Response returns the raw server response from the last page request. func (page OperationListResultPage) Response() OperationListResult { return page.olr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Values returns the slice of values for the current page or nil if there are no values. func (page OperationListResultPage) Values() []Operation { if page.olr.IsEmpty() { @@ -626,7 +579,6 @@ func (page OperationListResultPage) Values() []Operation { return *page.olr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ProxyResource common properties of proxy resource. type ProxyResource struct { // ID - Resource ID. @@ -639,7 +591,6 @@ type ProxyResource struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MarshalJSON is the custom marshaler for ProxyResource. func (pr ProxyResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -658,7 +609,6 @@ func (pr ProxyResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Resource the resource definition. type Resource struct { // ID - Resource Id @@ -673,7 +623,6 @@ type Resource struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MarshalJSON is the custom marshaler for Resource. func (r Resource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -695,7 +644,6 @@ func (r Resource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // SharedKeys the shared keys for a workspace. type SharedKeys struct { autorest.Response `json:"-"` @@ -705,14 +653,12 @@ type SharedKeys struct { SecondarySharedKey *string `json:"secondarySharedKey,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Sku the SKU (tier) of a workspace. type Sku struct { // Name - The name of the SKU. Possible values include: 'Free', 'Standard', 'Premium', 'Unlimited', 'PerNode', 'PerGB2018', 'Standalone' Name SkuNameEnum `json:"name,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UsageMetric a metric describing the usage of a resource. type UsageMetric struct { // Name - The name of the metric. @@ -729,7 +675,6 @@ type UsageMetric struct { QuotaPeriod *string `json:"quotaPeriod,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Workspace the top level Workspace resource container. type Workspace struct { autorest.Response `json:"-"` @@ -749,7 +694,6 @@ type Workspace struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // MarshalJSON is the custom marshaler for Workspace. func (w Workspace) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -777,7 +721,6 @@ func (w Workspace) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UnmarshalJSON is the custom unmarshaler for Workspace struct. func (w *Workspace) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -856,7 +799,6 @@ func (w *Workspace) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // WorkspaceListManagementGroupsResult the list workspace managmement groups operation response. type WorkspaceListManagementGroupsResult struct { autorest.Response `json:"-"` @@ -864,7 +806,6 @@ type WorkspaceListManagementGroupsResult struct { Value *[]ManagementGroup `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // WorkspaceListResult the list workspaces operation response. type WorkspaceListResult struct { autorest.Response `json:"-"` @@ -872,7 +813,6 @@ type WorkspaceListResult struct { Value *[]Workspace `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // WorkspaceListUsagesResult the list workspace usages operation response. type WorkspaceListUsagesResult struct { autorest.Response `json:"-"` @@ -880,7 +820,6 @@ type WorkspaceListUsagesResult struct { Value *[]UsageMetric `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // WorkspaceProperties workspace properties. type WorkspaceProperties struct { // ProvisioningState - The provisioning state of the workspace. Possible values include: 'Creating', 'Succeeded', 'Failed', 'Canceled', 'Deleting', 'ProvisioningAccount' @@ -897,7 +836,6 @@ type WorkspaceProperties struct { RetentionInDays *int32 `json:"retentionInDays,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // WorkspacesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type WorkspacesCreateOrUpdateFuture struct { @@ -905,7 +843,6 @@ type WorkspacesCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future WorkspacesCreateOrUpdateFuture) Result(client WorkspacesClient) (w Workspace, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/operations.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/operations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/operations.go index acbf0e1e8146..3df445e34f5f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/operations.go @@ -24,25 +24,21 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // OperationsClient is the operational Insights Client type OperationsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewOperationsClient creates an instance of the OperationsClient client. func NewOperationsClient(subscriptionID string) OperationsClient { return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // List lists all of the available OperationalInsights Rest API operations. func (client OperationsClient) List(ctx context.Context) (result OperationListResultPage, err error) { result.fn = client.listNextResults @@ -67,7 +63,6 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2015-11-01-preview" @@ -83,7 +78,6 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -91,7 +85,6 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { @@ -126,7 +119,6 @@ func (client OperationsClient) listNextResults(lastResults OperationListResult) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListComplete enumerates all values, automatically crossing page boundaries as required. func (client OperationsClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) { result.page, err = client.List(ctx) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/version.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/version.go index 32430ea08157..d15046da501b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/version.go @@ -18,13 +18,12 @@ import "github.com/Azure/azure-sdk-for-go/version" // // Code generated by Microsoft (R) AutoRest Code Generator. // Changes may cause incorrect behavior and will be lost if the code is regenerated. -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. + // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { return "Azure-SDK-For-Go/" + version.Number + " operationalinsights/2015-11-01-preview" } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Version returns the semantic version (see http://semver.org) of the client. func Version() string { return version.Number diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go similarity index 80% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go index 5a1ac4043a4d..91278e3cccc5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go @@ -25,29 +25,26 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // WorkspacesClient is the operational Insights Client type WorkspacesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewWorkspacesClient creates an instance of the WorkspacesClient client. func NewWorkspacesClient(subscriptionID string) WorkspacesClient { return NewWorkspacesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // NewWorkspacesClientWithBaseURI creates an instance of the WorkspacesClient client. func NewWorkspacesClientWithBaseURI(baseURI string, subscriptionID string) WorkspacesClient { return WorkspacesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdate create or update a workspace. -// -// resourceGroupName is the resource group name of the workspace. workspaceName is the name of the workspace. -// parameters is the parameters required to create or update a workspace. +// Parameters: +// resourceGroupName - the resource group name of the workspace. +// workspaceName - the name of the workspace. +// parameters - the parameters required to create or update a workspace. func (client WorkspacesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, workspaceName string, parameters Workspace) (result WorkspacesCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: workspaceName, @@ -79,7 +76,6 @@ func (client WorkspacesClient) CreateOrUpdate(ctx context.Context, resourceGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client WorkspacesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, workspaceName string, parameters Workspace) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -103,7 +99,6 @@ func (client WorkspacesClient) CreateOrUpdatePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) CreateOrUpdateSender(req *http.Request) (future WorkspacesCreateOrUpdateFuture, err error) { @@ -119,7 +114,6 @@ func (client WorkspacesClient) CreateOrUpdateSender(req *http.Request) (future W return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client WorkspacesClient) CreateOrUpdateResponder(resp *http.Response) (result Workspace, err error) { @@ -133,11 +127,10 @@ func (client WorkspacesClient) CreateOrUpdateResponder(resp *http.Response) (res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Delete deletes a workspace instance. -// -// resourceGroupName is the resource group name of the workspace. workspaceName is name of the Log Analytics -// Workspace. +// Parameters: +// resourceGroupName - the resource group name of the workspace. +// workspaceName - name of the Log Analytics Workspace. func (client WorkspacesClient) Delete(ctx context.Context, resourceGroupName string, workspaceName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, workspaceName) if err != nil { @@ -160,7 +153,6 @@ func (client WorkspacesClient) Delete(ctx context.Context, resourceGroupName str return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeletePreparer prepares the Delete request. func (client WorkspacesClient) DeletePreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -182,7 +174,6 @@ func (client WorkspacesClient) DeletePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -190,7 +181,6 @@ func (client WorkspacesClient) DeleteSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client WorkspacesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -203,11 +193,11 @@ func (client WorkspacesClient) DeleteResponder(resp *http.Response) (result auto return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DisableIntelligencePack disables an intelligence pack for a given workspace. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name -// of the Log Analytics Workspace. intelligencePackName is the name of the intelligence pack to be disabled. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - name of the Log Analytics Workspace. +// intelligencePackName - the name of the intelligence pack to be disabled. func (client WorkspacesClient) DisableIntelligencePack(ctx context.Context, resourceGroupName string, workspaceName string, intelligencePackName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -238,7 +228,6 @@ func (client WorkspacesClient) DisableIntelligencePack(ctx context.Context, reso return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DisableIntelligencePackPreparer prepares the DisableIntelligencePack request. func (client WorkspacesClient) DisableIntelligencePackPreparer(ctx context.Context, resourceGroupName string, workspaceName string, intelligencePackName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -261,7 +250,6 @@ func (client WorkspacesClient) DisableIntelligencePackPreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DisableIntelligencePackSender sends the DisableIntelligencePack request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) DisableIntelligencePackSender(req *http.Request) (*http.Response, error) { @@ -269,7 +257,6 @@ func (client WorkspacesClient) DisableIntelligencePackSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // DisableIntelligencePackResponder handles the response to the DisableIntelligencePack request. The method always // closes the http.Response Body. func (client WorkspacesClient) DisableIntelligencePackResponder(resp *http.Response) (result autorest.Response, err error) { @@ -282,11 +269,11 @@ func (client WorkspacesClient) DisableIntelligencePackResponder(resp *http.Respo return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // EnableIntelligencePack enables an intelligence pack for a given workspace. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name -// of the Log Analytics Workspace. intelligencePackName is the name of the intelligence pack to be enabled. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - name of the Log Analytics Workspace. +// intelligencePackName - the name of the intelligence pack to be enabled. func (client WorkspacesClient) EnableIntelligencePack(ctx context.Context, resourceGroupName string, workspaceName string, intelligencePackName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -317,7 +304,6 @@ func (client WorkspacesClient) EnableIntelligencePack(ctx context.Context, resou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // EnableIntelligencePackPreparer prepares the EnableIntelligencePack request. func (client WorkspacesClient) EnableIntelligencePackPreparer(ctx context.Context, resourceGroupName string, workspaceName string, intelligencePackName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -340,7 +326,6 @@ func (client WorkspacesClient) EnableIntelligencePackPreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // EnableIntelligencePackSender sends the EnableIntelligencePack request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) EnableIntelligencePackSender(req *http.Request) (*http.Response, error) { @@ -348,7 +333,6 @@ func (client WorkspacesClient) EnableIntelligencePackSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // EnableIntelligencePackResponder handles the response to the EnableIntelligencePack request. The method always // closes the http.Response Body. func (client WorkspacesClient) EnableIntelligencePackResponder(resp *http.Response) (result autorest.Response, err error) { @@ -361,11 +345,10 @@ func (client WorkspacesClient) EnableIntelligencePackResponder(resp *http.Respon return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Get gets a workspace instance. -// -// resourceGroupName is the resource group name of the workspace. workspaceName is name of the Log Analytics -// Workspace. +// Parameters: +// resourceGroupName - the resource group name of the workspace. +// workspaceName - name of the Log Analytics Workspace. func (client WorkspacesClient) Get(ctx context.Context, resourceGroupName string, workspaceName string) (result Workspace, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, workspaceName) if err != nil { @@ -388,7 +371,6 @@ func (client WorkspacesClient) Get(ctx context.Context, resourceGroupName string return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetPreparer prepares the Get request. func (client WorkspacesClient) GetPreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -410,7 +392,6 @@ func (client WorkspacesClient) GetPreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -418,7 +399,6 @@ func (client WorkspacesClient) GetSender(req *http.Request) (*http.Response, err azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client WorkspacesClient) GetResponder(resp *http.Response) (result Workspace, err error) { @@ -432,11 +412,10 @@ func (client WorkspacesClient) GetResponder(resp *http.Response) (result Workspa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSharedKeys gets the shared keys for a workspace. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name -// of the Log Analytics Workspace. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - name of the Log Analytics Workspace. func (client WorkspacesClient) GetSharedKeys(ctx context.Context, resourceGroupName string, workspaceName string) (result SharedKeys, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -467,7 +446,6 @@ func (client WorkspacesClient) GetSharedKeys(ctx context.Context, resourceGroupN return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSharedKeysPreparer prepares the GetSharedKeys request. func (client WorkspacesClient) GetSharedKeysPreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -489,7 +467,6 @@ func (client WorkspacesClient) GetSharedKeysPreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSharedKeysSender sends the GetSharedKeys request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) GetSharedKeysSender(req *http.Request) (*http.Response, error) { @@ -497,7 +474,6 @@ func (client WorkspacesClient) GetSharedKeysSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // GetSharedKeysResponder handles the response to the GetSharedKeys request. The method always // closes the http.Response Body. func (client WorkspacesClient) GetSharedKeysResponder(resp *http.Response) (result SharedKeys, err error) { @@ -511,7 +487,6 @@ func (client WorkspacesClient) GetSharedKeysResponder(resp *http.Response) (resu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // List gets the workspaces in a subscription. func (client WorkspacesClient) List(ctx context.Context) (result WorkspaceListResult, err error) { req, err := client.ListPreparer(ctx) @@ -535,7 +510,6 @@ func (client WorkspacesClient) List(ctx context.Context) (result WorkspaceListRe return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListPreparer prepares the List request. func (client WorkspacesClient) ListPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -555,7 +529,6 @@ func (client WorkspacesClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) ListSender(req *http.Request) (*http.Response, error) { @@ -563,7 +536,6 @@ func (client WorkspacesClient) ListSender(req *http.Request) (*http.Response, er azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client WorkspacesClient) ListResponder(resp *http.Response) (result WorkspaceListResult, err error) { @@ -577,10 +549,9 @@ func (client WorkspacesClient) ListResponder(resp *http.Response) (result Worksp return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByResourceGroup gets workspaces in a resource group. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. func (client WorkspacesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result WorkspaceListResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -611,7 +582,6 @@ func (client WorkspacesClient) ListByResourceGroup(ctx context.Context, resource return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client WorkspacesClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -632,7 +602,6 @@ func (client WorkspacesClient) ListByResourceGroupPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -640,7 +609,6 @@ func (client WorkspacesClient) ListByResourceGroupSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client WorkspacesClient) ListByResourceGroupResponder(resp *http.Response) (result WorkspaceListResult, err error) { @@ -654,12 +622,11 @@ func (client WorkspacesClient) ListByResourceGroupResponder(resp *http.Response) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListIntelligencePacks lists all the intelligence packs possible and whether they are enabled or disabled for a given // workspace. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is name -// of the Log Analytics Workspace. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - name of the Log Analytics Workspace. func (client WorkspacesClient) ListIntelligencePacks(ctx context.Context, resourceGroupName string, workspaceName string) (result ListIntelligencePack, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -690,7 +657,6 @@ func (client WorkspacesClient) ListIntelligencePacks(ctx context.Context, resour return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListIntelligencePacksPreparer prepares the ListIntelligencePacks request. func (client WorkspacesClient) ListIntelligencePacksPreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -712,7 +678,6 @@ func (client WorkspacesClient) ListIntelligencePacksPreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListIntelligencePacksSender sends the ListIntelligencePacks request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) ListIntelligencePacksSender(req *http.Request) (*http.Response, error) { @@ -720,7 +685,6 @@ func (client WorkspacesClient) ListIntelligencePacksSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListIntelligencePacksResponder handles the response to the ListIntelligencePacks request. The method always // closes the http.Response Body. func (client WorkspacesClient) ListIntelligencePacksResponder(resp *http.Response) (result ListIntelligencePack, err error) { @@ -734,11 +698,10 @@ func (client WorkspacesClient) ListIntelligencePacksResponder(resp *http.Respons return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListManagementGroups gets a list of management groups connected to a workspace. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is the -// name of the workspace. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - the name of the workspace. func (client WorkspacesClient) ListManagementGroups(ctx context.Context, resourceGroupName string, workspaceName string) (result WorkspaceListManagementGroupsResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -769,7 +732,6 @@ func (client WorkspacesClient) ListManagementGroups(ctx context.Context, resourc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListManagementGroupsPreparer prepares the ListManagementGroups request. func (client WorkspacesClient) ListManagementGroupsPreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -791,7 +753,6 @@ func (client WorkspacesClient) ListManagementGroupsPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListManagementGroupsSender sends the ListManagementGroups request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) ListManagementGroupsSender(req *http.Request) (*http.Response, error) { @@ -799,7 +760,6 @@ func (client WorkspacesClient) ListManagementGroupsSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListManagementGroupsResponder handles the response to the ListManagementGroups request. The method always // closes the http.Response Body. func (client WorkspacesClient) ListManagementGroupsResponder(resp *http.Response) (result WorkspaceListManagementGroupsResult, err error) { @@ -813,11 +773,10 @@ func (client WorkspacesClient) ListManagementGroupsResponder(resp *http.Response return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListUsages gets a list of usage metrics for a workspace. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. workspaceName is the -// name of the workspace. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// workspaceName - the name of the workspace. func (client WorkspacesClient) ListUsages(ctx context.Context, resourceGroupName string, workspaceName string) (result WorkspaceListUsagesResult, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -848,7 +807,6 @@ func (client WorkspacesClient) ListUsages(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListUsagesPreparer prepares the ListUsages request. func (client WorkspacesClient) ListUsagesPreparer(ctx context.Context, resourceGroupName string, workspaceName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -870,7 +828,6 @@ func (client WorkspacesClient) ListUsagesPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListUsagesSender sends the ListUsages request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) ListUsagesSender(req *http.Request) (*http.Response, error) { @@ -878,7 +835,6 @@ func (client WorkspacesClient) ListUsagesSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // ListUsagesResponder handles the response to the ListUsages request. The method always // closes the http.Response Body. func (client WorkspacesClient) ListUsagesResponder(resp *http.Response) (result WorkspaceListUsagesResult, err error) { @@ -892,11 +848,11 @@ func (client WorkspacesClient) ListUsagesResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // Update updates a workspace. -// -// resourceGroupName is the resource group name of the workspace. workspaceName is the name of the workspace. -// parameters is the parameters required to patch a workspace. +// Parameters: +// resourceGroupName - the resource group name of the workspace. +// workspaceName - the name of the workspace. +// parameters - the parameters required to patch a workspace. func (client WorkspacesClient) Update(ctx context.Context, resourceGroupName string, workspaceName string, parameters Workspace) (result Workspace, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: workspaceName, @@ -927,7 +883,6 @@ func (client WorkspacesClient) Update(ctx context.Context, resourceGroupName str return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UpdatePreparer prepares the Update request. func (client WorkspacesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, workspaceName string, parameters Workspace) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -951,7 +906,6 @@ func (client WorkspacesClient) UpdatePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) UpdateSender(req *http.Request) (*http.Response, error) { @@ -959,7 +913,6 @@ func (client WorkspacesClient) UpdateSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client WorkspacesClient) UpdateResponder(resp *http.Response) (result Workspace, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/client.go similarity index 81% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/client.go index a8ab93f0c720..819be16528c8 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/client.go @@ -29,7 +29,6 @@ const ( DefaultBaseURI = "https://management.azure.com" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // BaseClient is the base client for Operationsmanagement. type BaseClient struct { autorest.Client @@ -40,13 +39,11 @@ type BaseClient struct { ResourceName string } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // New creates an instance of the BaseClient client. func New(subscriptionID string, providerName string, resourceType string, resourceName string) BaseClient { return NewWithBaseURI(DefaultBaseURI, subscriptionID, providerName, resourceType, resourceName) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewWithBaseURI creates an instance of the BaseClient client. func NewWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) BaseClient { return BaseClient{ diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementassociations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementassociations.go similarity index 81% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementassociations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementassociations.go index 209e0a50691f..74c4f0a3b112 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementassociations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementassociations.go @@ -25,30 +25,26 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementAssociationsClient is the operations Management Client type ManagementAssociationsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewManagementAssociationsClient creates an instance of the ManagementAssociationsClient client. func NewManagementAssociationsClient(subscriptionID string, providerName string, resourceType string, resourceName string) ManagementAssociationsClient { return NewManagementAssociationsClientWithBaseURI(DefaultBaseURI, subscriptionID, providerName, resourceType, resourceName) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewManagementAssociationsClientWithBaseURI creates an instance of the ManagementAssociationsClient client. func NewManagementAssociationsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) ManagementAssociationsClient { return ManagementAssociationsClient{NewWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdate creates or updates the ManagementAssociation. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. -// managementAssociationName is user ManagementAssociation Name. parameters is the parameters required to create -// ManagementAssociation extension. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// managementAssociationName - user ManagementAssociation Name. +// parameters - the parameters required to create ManagementAssociation extension. func (client ManagementAssociationsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, managementAssociationName string, parameters ManagementAssociation) (result ManagementAssociation, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -82,7 +78,6 @@ func (client ManagementAssociationsClient) CreateOrUpdate(ctx context.Context, r return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ManagementAssociationsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, managementAssociationName string, parameters ManagementAssociation) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -109,7 +104,6 @@ func (client ManagementAssociationsClient) CreateOrUpdatePreparer(ctx context.Co return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ManagementAssociationsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -117,7 +111,6 @@ func (client ManagementAssociationsClient) CreateOrUpdateSender(req *http.Reques azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ManagementAssociationsClient) CreateOrUpdateResponder(resp *http.Response) (result ManagementAssociation, err error) { @@ -131,11 +124,10 @@ func (client ManagementAssociationsClient) CreateOrUpdateResponder(resp *http.Re return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Delete deletes the ManagementAssociation in the subscription. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. -// managementAssociationName is user ManagementAssociation Name. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// managementAssociationName - user ManagementAssociation Name. func (client ManagementAssociationsClient) Delete(ctx context.Context, resourceGroupName string, managementAssociationName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -166,7 +158,6 @@ func (client ManagementAssociationsClient) Delete(ctx context.Context, resourceG return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeletePreparer prepares the Delete request. func (client ManagementAssociationsClient) DeletePreparer(ctx context.Context, resourceGroupName string, managementAssociationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -191,7 +182,6 @@ func (client ManagementAssociationsClient) DeletePreparer(ctx context.Context, r return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ManagementAssociationsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -199,7 +189,6 @@ func (client ManagementAssociationsClient) DeleteSender(req *http.Request) (*htt azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ManagementAssociationsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -212,11 +201,10 @@ func (client ManagementAssociationsClient) DeleteResponder(resp *http.Response) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Get retrieves the user ManagementAssociation. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. -// managementAssociationName is user ManagementAssociation Name. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// managementAssociationName - user ManagementAssociation Name. func (client ManagementAssociationsClient) Get(ctx context.Context, resourceGroupName string, managementAssociationName string) (result ManagementAssociation, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -247,7 +235,6 @@ func (client ManagementAssociationsClient) Get(ctx context.Context, resourceGrou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetPreparer prepares the Get request. func (client ManagementAssociationsClient) GetPreparer(ctx context.Context, resourceGroupName string, managementAssociationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -272,7 +259,6 @@ func (client ManagementAssociationsClient) GetPreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ManagementAssociationsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -280,7 +266,6 @@ func (client ManagementAssociationsClient) GetSender(req *http.Request) (*http.R azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ManagementAssociationsClient) GetResponder(resp *http.Response) (result ManagementAssociation, err error) { @@ -294,7 +279,6 @@ func (client ManagementAssociationsClient) GetResponder(resp *http.Response) (re return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscription retrieves the ManagementAssociatons list. func (client ManagementAssociationsClient) ListBySubscription(ctx context.Context) (result ManagementAssociationPropertiesList, err error) { req, err := client.ListBySubscriptionPreparer(ctx) @@ -318,7 +302,6 @@ func (client ManagementAssociationsClient) ListBySubscription(ctx context.Contex return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionPreparer prepares the ListBySubscription request. func (client ManagementAssociationsClient) ListBySubscriptionPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -338,7 +321,6 @@ func (client ManagementAssociationsClient) ListBySubscriptionPreparer(ctx contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionSender sends the ListBySubscription request. The method will close the // http.Response Body if it receives an error. func (client ManagementAssociationsClient) ListBySubscriptionSender(req *http.Request) (*http.Response, error) { @@ -346,7 +328,6 @@ func (client ManagementAssociationsClient) ListBySubscriptionSender(req *http.Re azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionResponder handles the response to the ListBySubscription request. The method always // closes the http.Response Body. func (client ManagementAssociationsClient) ListBySubscriptionResponder(resp *http.Response) (result ManagementAssociationPropertiesList, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementconfigurations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementconfigurations.go similarity index 80% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementconfigurations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementconfigurations.go index cbeb266e4e84..e6f3d1edd137 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementconfigurations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/managementconfigurations.go @@ -25,30 +25,26 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementConfigurationsClient is the operations Management Client type ManagementConfigurationsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewManagementConfigurationsClient creates an instance of the ManagementConfigurationsClient client. func NewManagementConfigurationsClient(subscriptionID string, providerName string, resourceType string, resourceName string) ManagementConfigurationsClient { return NewManagementConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID, providerName, resourceType, resourceName) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewManagementConfigurationsClientWithBaseURI creates an instance of the ManagementConfigurationsClient client. func NewManagementConfigurationsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) ManagementConfigurationsClient { return ManagementConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdate creates or updates the ManagementConfiguration. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. -// managementConfigurationName is user Management Configuration Name. parameters is the parameters required to -// create OMS Solution. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// managementConfigurationName - user Management Configuration Name. +// parameters - the parameters required to create OMS Solution. func (client ManagementConfigurationsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, managementConfigurationName string, parameters ManagementConfiguration) (result ManagementConfiguration, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -85,7 +81,6 @@ func (client ManagementConfigurationsClient) CreateOrUpdate(ctx context.Context, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ManagementConfigurationsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, managementConfigurationName string, parameters ManagementConfiguration) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -109,7 +104,6 @@ func (client ManagementConfigurationsClient) CreateOrUpdatePreparer(ctx context. return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ManagementConfigurationsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -117,7 +111,6 @@ func (client ManagementConfigurationsClient) CreateOrUpdateSender(req *http.Requ azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ManagementConfigurationsClient) CreateOrUpdateResponder(resp *http.Response) (result ManagementConfiguration, err error) { @@ -131,11 +124,10 @@ func (client ManagementConfigurationsClient) CreateOrUpdateResponder(resp *http. return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Delete deletes the ManagementConfiguration in the subscription. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. -// managementConfigurationName is user Management Configuration Name. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// managementConfigurationName - user Management Configuration Name. func (client ManagementConfigurationsClient) Delete(ctx context.Context, resourceGroupName string, managementConfigurationName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -166,7 +158,6 @@ func (client ManagementConfigurationsClient) Delete(ctx context.Context, resourc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeletePreparer prepares the Delete request. func (client ManagementConfigurationsClient) DeletePreparer(ctx context.Context, resourceGroupName string, managementConfigurationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -188,7 +179,6 @@ func (client ManagementConfigurationsClient) DeletePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ManagementConfigurationsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -196,7 +186,6 @@ func (client ManagementConfigurationsClient) DeleteSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ManagementConfigurationsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -209,11 +198,10 @@ func (client ManagementConfigurationsClient) DeleteResponder(resp *http.Response return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Get retrieves the user ManagementConfiguration. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. -// managementConfigurationName is user Management Configuration Name. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// managementConfigurationName - user Management Configuration Name. func (client ManagementConfigurationsClient) Get(ctx context.Context, resourceGroupName string, managementConfigurationName string) (result ManagementConfiguration, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -244,7 +232,6 @@ func (client ManagementConfigurationsClient) Get(ctx context.Context, resourceGr return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetPreparer prepares the Get request. func (client ManagementConfigurationsClient) GetPreparer(ctx context.Context, resourceGroupName string, managementConfigurationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -266,7 +253,6 @@ func (client ManagementConfigurationsClient) GetPreparer(ctx context.Context, re return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ManagementConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -274,7 +260,6 @@ func (client ManagementConfigurationsClient) GetSender(req *http.Request) (*http azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ManagementConfigurationsClient) GetResponder(resp *http.Response) (result ManagementConfiguration, err error) { @@ -288,7 +273,6 @@ func (client ManagementConfigurationsClient) GetResponder(resp *http.Response) ( return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscription retrieves the ManagementConfigurations list. func (client ManagementConfigurationsClient) ListBySubscription(ctx context.Context) (result ManagementConfigurationPropertiesList, err error) { req, err := client.ListBySubscriptionPreparer(ctx) @@ -312,7 +296,6 @@ func (client ManagementConfigurationsClient) ListBySubscription(ctx context.Cont return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionPreparer prepares the ListBySubscription request. func (client ManagementConfigurationsClient) ListBySubscriptionPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -332,7 +315,6 @@ func (client ManagementConfigurationsClient) ListBySubscriptionPreparer(ctx cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionSender sends the ListBySubscription request. The method will close the // http.Response Body if it receives an error. func (client ManagementConfigurationsClient) ListBySubscriptionSender(req *http.Request) (*http.Response, error) { @@ -340,7 +322,6 @@ func (client ManagementConfigurationsClient) ListBySubscriptionSender(req *http. azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionResponder handles the response to the ListBySubscription request. The method always // closes the http.Response Body. func (client ManagementConfigurationsClient) ListBySubscriptionResponder(resp *http.Response) (result ManagementConfigurationPropertiesList, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/models.go similarity index 76% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/models.go index e55b77ea52da..34fc539c9135 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/models.go @@ -21,7 +21,6 @@ import ( "github.com/Azure/go-autorest/autorest" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ArmTemplateParameter parameter to pass to ARM template type ArmTemplateParameter struct { // Name - name of the parameter. @@ -30,14 +29,12 @@ type ArmTemplateParameter struct { Value *string `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CodeMessageError the error body contract. type CodeMessageError struct { // Error - The error details for a failed request. Error *CodeMessageErrorError `json:"error,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CodeMessageErrorError the error details for a failed request. type CodeMessageErrorError struct { // Code - The error type. @@ -46,7 +43,6 @@ type CodeMessageErrorError struct { Message *string `json:"message,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementAssociation the container for solution. type ManagementAssociation struct { autorest.Response `json:"-"` @@ -62,7 +58,6 @@ type ManagementAssociation struct { Properties *ManagementAssociationProperties `json:"properties,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementAssociationProperties managementAssociation properties supported by the OperationsManagement resource // provider. type ManagementAssociationProperties struct { @@ -70,7 +65,6 @@ type ManagementAssociationProperties struct { ApplicationID *string `json:"applicationId,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementAssociationPropertiesList the list of ManagementAssociation response type ManagementAssociationPropertiesList struct { autorest.Response `json:"-"` @@ -78,7 +72,6 @@ type ManagementAssociationPropertiesList struct { Value *[]ManagementAssociation `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementConfiguration the container for solution. type ManagementConfiguration struct { autorest.Response `json:"-"` @@ -94,7 +87,6 @@ type ManagementConfiguration struct { Properties *ManagementConfigurationProperties `json:"properties,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementConfigurationProperties managementConfiguration properties supported by the OperationsManagement // resource provider. type ManagementConfigurationProperties struct { @@ -110,7 +102,6 @@ type ManagementConfigurationProperties struct { Template interface{} `json:"template,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ManagementConfigurationPropertiesList the list of ManagementConfiguration response type ManagementConfigurationPropertiesList struct { autorest.Response `json:"-"` @@ -118,7 +109,6 @@ type ManagementConfigurationPropertiesList struct { Value *[]ManagementConfiguration `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Operation supported operation of OperationsManagement resource provider. type Operation struct { // Name - Operation name: {provider}/{resource}/{operation} @@ -127,7 +117,6 @@ type Operation struct { Display *OperationDisplay `json:"display,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // OperationDisplay display metadata associated with the operation. type OperationDisplay struct { // Provider - Service provider: Microsoft OperationsManagement. @@ -138,7 +127,6 @@ type OperationDisplay struct { Operation *string `json:"operation,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // OperationListResult result of the request to list solution operations. type OperationListResult struct { autorest.Response `json:"-"` @@ -146,7 +134,6 @@ type OperationListResult struct { Value *[]Operation `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Solution the container for solution. type Solution struct { autorest.Response `json:"-"` @@ -164,7 +151,6 @@ type Solution struct { Properties *SolutionProperties `json:"properties,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // SolutionPlan plan for solution object supported by the OperationsManagement resource provider. type SolutionPlan struct { // Name - name of the solution to be created. For Microsoft published solution it should be in the format of solutionType(workspaceName). SolutionType part is case sensitive. For third party solution, it can be anything. @@ -177,7 +163,6 @@ type SolutionPlan struct { Product *string `json:"product,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // SolutionProperties solution properties supported by the OperationsManagement resource provider. type SolutionProperties struct { // WorkspaceResourceID - The azure resourceId for the workspace where the solution will be deployed/enabled. @@ -190,7 +175,6 @@ type SolutionProperties struct { ReferencedResources *[]string `json:"referencedResources,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // SolutionPropertiesList the list of solution response type SolutionPropertiesList struct { autorest.Response `json:"-"` diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/operations.go similarity index 77% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/operations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/operations.go index dd78b1cb4f1f..f64d685b2d26 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/operations.go @@ -24,25 +24,21 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // OperationsClient is the operations Management Client type OperationsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewOperationsClient creates an instance of the OperationsClient client. func NewOperationsClient(subscriptionID string, providerName string, resourceType string, resourceName string) OperationsClient { return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID, providerName, resourceType, resourceName) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) OperationsClient { return OperationsClient{NewWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // List lists all of the available OperationsManagement Rest API operations. func (client OperationsClient) List(ctx context.Context) (result OperationListResult, err error) { req, err := client.ListPreparer(ctx) @@ -66,7 +62,6 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2015-11-01-preview" @@ -82,7 +77,6 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -90,7 +84,6 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/solutions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/solutions.go similarity index 80% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/solutions.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/solutions.go index 3389e157f9c1..91c0b6a4c3ff 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/solutions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/solutions.go @@ -25,29 +25,26 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // SolutionsClient is the operations Management Client type SolutionsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewSolutionsClient creates an instance of the SolutionsClient client. func NewSolutionsClient(subscriptionID string, providerName string, resourceType string, resourceName string) SolutionsClient { return NewSolutionsClientWithBaseURI(DefaultBaseURI, subscriptionID, providerName, resourceType, resourceName) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // NewSolutionsClientWithBaseURI creates an instance of the SolutionsClient client. func NewSolutionsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) SolutionsClient { return SolutionsClient{NewWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdate creates or updates the Solution. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. solutionName is user -// Solution Name. parameters is the parameters required to create OMS Solution. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// solutionName - user Solution Name. +// parameters - the parameters required to create OMS Solution. func (client SolutionsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, solutionName string, parameters Solution) (result Solution, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -81,7 +78,6 @@ func (client SolutionsClient) CreateOrUpdate(ctx context.Context, resourceGroupN return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client SolutionsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, solutionName string, parameters Solution) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -105,7 +101,6 @@ func (client SolutionsClient) CreateOrUpdatePreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SolutionsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -113,7 +108,6 @@ func (client SolutionsClient) CreateOrUpdateSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client SolutionsClient) CreateOrUpdateResponder(resp *http.Response) (result Solution, err error) { @@ -127,11 +121,10 @@ func (client SolutionsClient) CreateOrUpdateResponder(resp *http.Response) (resu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Delete deletes the solution in the subscription. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. solutionName is user -// Solution Name. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// solutionName - user Solution Name. func (client SolutionsClient) Delete(ctx context.Context, resourceGroupName string, solutionName string) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -162,7 +155,6 @@ func (client SolutionsClient) Delete(ctx context.Context, resourceGroupName stri return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeletePreparer prepares the Delete request. func (client SolutionsClient) DeletePreparer(ctx context.Context, resourceGroupName string, solutionName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -184,7 +176,6 @@ func (client SolutionsClient) DeletePreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SolutionsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -192,7 +183,6 @@ func (client SolutionsClient) DeleteSender(req *http.Request) (*http.Response, e azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client SolutionsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -205,11 +195,10 @@ func (client SolutionsClient) DeleteResponder(resp *http.Response) (result autor return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Get retrieves the user solution. -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. solutionName is user -// Solution Name. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. +// solutionName - user Solution Name. func (client SolutionsClient) Get(ctx context.Context, resourceGroupName string, solutionName string) (result Solution, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -240,7 +229,6 @@ func (client SolutionsClient) Get(ctx context.Context, resourceGroupName string, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetPreparer prepares the Get request. func (client SolutionsClient) GetPreparer(ctx context.Context, resourceGroupName string, solutionName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -262,7 +250,6 @@ func (client SolutionsClient) GetPreparer(ctx context.Context, resourceGroupName return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client SolutionsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -270,7 +257,6 @@ func (client SolutionsClient) GetSender(req *http.Request) (*http.Response, erro azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client SolutionsClient) GetResponder(resp *http.Response) (result Solution, err error) { @@ -284,10 +270,9 @@ func (client SolutionsClient) GetResponder(resp *http.Response) (result Solution return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListByResourceGroup retrieves the solution list. It will retrieve both first party and third party solutions -// -// resourceGroupName is the name of the resource group to get. The name is case insensitive. +// Parameters: +// resourceGroupName - the name of the resource group to get. The name is case insensitive. func (client SolutionsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result SolutionPropertiesList, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, @@ -318,7 +303,6 @@ func (client SolutionsClient) ListByResourceGroup(ctx context.Context, resourceG return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client SolutionsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -339,7 +323,6 @@ func (client SolutionsClient) ListByResourceGroupPreparer(ctx context.Context, r return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client SolutionsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -347,7 +330,6 @@ func (client SolutionsClient) ListByResourceGroupSender(req *http.Request) (*htt azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client SolutionsClient) ListByResourceGroupResponder(resp *http.Response) (result SolutionPropertiesList, err error) { @@ -361,7 +343,6 @@ func (client SolutionsClient) ListByResourceGroupResponder(resp *http.Response) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscription retrieves the solution list. It will retrieve both first party and third party solutions func (client SolutionsClient) ListBySubscription(ctx context.Context) (result SolutionPropertiesList, err error) { req, err := client.ListBySubscriptionPreparer(ctx) @@ -385,7 +366,6 @@ func (client SolutionsClient) ListBySubscription(ctx context.Context) (result So return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionPreparer prepares the ListBySubscription request. func (client SolutionsClient) ListBySubscriptionPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -405,7 +385,6 @@ func (client SolutionsClient) ListBySubscriptionPreparer(ctx context.Context) (* return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionSender sends the ListBySubscription request. The method will close the // http.Response Body if it receives an error. func (client SolutionsClient) ListBySubscriptionSender(req *http.Request) (*http.Response, error) { @@ -413,7 +392,6 @@ func (client SolutionsClient) ListBySubscriptionSender(req *http.Request) (*http azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // ListBySubscriptionResponder handles the response to the ListBySubscription request. The method always // closes the http.Response Body. func (client SolutionsClient) ListBySubscriptionResponder(resp *http.Response) (result SolutionPropertiesList, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/version.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/version.go index 714ccbcdda6a..f33e0e91aa51 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement/version.go @@ -18,13 +18,12 @@ import "github.com/Azure/azure-sdk-for-go/version" // // Code generated by Microsoft (R) AutoRest Code Generator. // Changes may cause incorrect behavior and will be lost if the code is regenerated. -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. + // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { return "Azure-SDK-For-Go/" + version.Number + " operationsmanagement/2015-11-01-preview" } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement instead. // Version returns the semantic version (see http://semver.org) of the client. func Version() string { return version.Number diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go similarity index 81% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go index 31557e2a2a52..faae3cc0990f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go @@ -25,7 +25,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionPoliciesClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -33,25 +32,24 @@ type BackupLongTermRetentionPoliciesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewBackupLongTermRetentionPoliciesClient creates an instance of the BackupLongTermRetentionPoliciesClient client. func NewBackupLongTermRetentionPoliciesClient(subscriptionID string) BackupLongTermRetentionPoliciesClient { return NewBackupLongTermRetentionPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewBackupLongTermRetentionPoliciesClientWithBaseURI creates an instance of the BackupLongTermRetentionPoliciesClient // client. func NewBackupLongTermRetentionPoliciesClientWithBaseURI(baseURI string, subscriptionID string) BackupLongTermRetentionPoliciesClient { return BackupLongTermRetentionPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a database backup long term retention policy -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database parameters is the required parameters to update a backup long term retention policy +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database +// parameters - the required parameters to update a backup long term retention policy func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters BackupLongTermRetentionPolicy) (result BackupLongTermRetentionPoliciesCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -75,7 +73,6 @@ func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdate(ctx context.C return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters BackupLongTermRetentionPolicy) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -101,7 +98,6 @@ func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdatePreparer(ctx c return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdateSender(req *http.Request) (future BackupLongTermRetentionPoliciesCreateOrUpdateFuture, err error) { @@ -117,7 +113,6 @@ func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdateSender(req *ht return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result BackupLongTermRetentionPolicy, err error) { @@ -131,12 +126,12 @@ func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdateResponder(resp return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get returns a database backup long term retention policy -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. func (client BackupLongTermRetentionPoliciesClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result BackupLongTermRetentionPolicy, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -159,7 +154,6 @@ func (client BackupLongTermRetentionPoliciesClient) Get(ctx context.Context, res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client BackupLongTermRetentionPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -183,7 +177,6 @@ func (client BackupLongTermRetentionPoliciesClient) GetPreparer(ctx context.Cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -191,7 +184,6 @@ func (client BackupLongTermRetentionPoliciesClient) GetSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client BackupLongTermRetentionPoliciesClient) GetResponder(resp *http.Response) (result BackupLongTermRetentionPolicy, err error) { @@ -205,12 +197,12 @@ func (client BackupLongTermRetentionPoliciesClient) GetResponder(resp *http.Resp return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase returns a database backup long term retention policy -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. func (client BackupLongTermRetentionPoliciesClient) ListByDatabase(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result BackupLongTermRetentionPolicyListResult, err error) { req, err := client.ListByDatabasePreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -233,7 +225,6 @@ func (client BackupLongTermRetentionPoliciesClient) ListByDatabase(ctx context.C return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client BackupLongTermRetentionPoliciesClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -256,7 +247,6 @@ func (client BackupLongTermRetentionPoliciesClient) ListByDatabasePreparer(ctx c return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionPoliciesClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -264,7 +254,6 @@ func (client BackupLongTermRetentionPoliciesClient) ListByDatabaseSender(req *ht azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client BackupLongTermRetentionPoliciesClient) ListByDatabaseResponder(resp *http.Response) (result BackupLongTermRetentionPolicyListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go similarity index 81% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go index 0f79b0981d15..b3d59e262403 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go @@ -25,7 +25,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionVaultsClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -33,25 +32,23 @@ type BackupLongTermRetentionVaultsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewBackupLongTermRetentionVaultsClient creates an instance of the BackupLongTermRetentionVaultsClient client. func NewBackupLongTermRetentionVaultsClient(subscriptionID string) BackupLongTermRetentionVaultsClient { return NewBackupLongTermRetentionVaultsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewBackupLongTermRetentionVaultsClientWithBaseURI creates an instance of the BackupLongTermRetentionVaultsClient // client. func NewBackupLongTermRetentionVaultsClientWithBaseURI(baseURI string, subscriptionID string) BackupLongTermRetentionVaultsClient { return BackupLongTermRetentionVaultsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate updates a server backup long term retention vault -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. parameters is the required -// parameters to update a backup long term retention vault +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// parameters - the required parameters to update a backup long term retention vault func (client BackupLongTermRetentionVaultsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, parameters BackupLongTermRetentionVault) (result BackupLongTermRetentionVaultsCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -75,7 +72,6 @@ func (client BackupLongTermRetentionVaultsClient) CreateOrUpdate(ctx context.Con return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client BackupLongTermRetentionVaultsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters BackupLongTermRetentionVault) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -100,7 +96,6 @@ func (client BackupLongTermRetentionVaultsClient) CreateOrUpdatePreparer(ctx con return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionVaultsClient) CreateOrUpdateSender(req *http.Request) (future BackupLongTermRetentionVaultsCreateOrUpdateFuture, err error) { @@ -116,7 +111,6 @@ func (client BackupLongTermRetentionVaultsClient) CreateOrUpdateSender(req *http return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client BackupLongTermRetentionVaultsClient) CreateOrUpdateResponder(resp *http.Response) (result BackupLongTermRetentionVault, err error) { @@ -130,11 +124,11 @@ func (client BackupLongTermRetentionVaultsClient) CreateOrUpdateResponder(resp * return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a server backup long term retention vault -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client BackupLongTermRetentionVaultsClient) Get(ctx context.Context, resourceGroupName string, serverName string) (result BackupLongTermRetentionVault, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -157,7 +151,6 @@ func (client BackupLongTermRetentionVaultsClient) Get(ctx context.Context, resou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client BackupLongTermRetentionVaultsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -180,7 +173,6 @@ func (client BackupLongTermRetentionVaultsClient) GetPreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionVaultsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -188,7 +180,6 @@ func (client BackupLongTermRetentionVaultsClient) GetSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client BackupLongTermRetentionVaultsClient) GetResponder(resp *http.Response) (result BackupLongTermRetentionVault, err error) { @@ -202,11 +193,11 @@ func (client BackupLongTermRetentionVaultsClient) GetResponder(resp *http.Respon return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets server backup long term retention vaults in a server -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client BackupLongTermRetentionVaultsClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result BackupLongTermRetentionVaultListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -229,7 +220,6 @@ func (client BackupLongTermRetentionVaultsClient) ListByServer(ctx context.Conte return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client BackupLongTermRetentionVaultsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -251,7 +241,6 @@ func (client BackupLongTermRetentionVaultsClient) ListByServerPreparer(ctx conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionVaultsClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -259,7 +248,6 @@ func (client BackupLongTermRetentionVaultsClient) ListByServerSender(req *http.R azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client BackupLongTermRetentionVaultsClient) ListByServerResponder(resp *http.Response) (result BackupLongTermRetentionVaultListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/capabilities.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/capabilities.go similarity index 81% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/capabilities.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/capabilities.go index 9e478bec88d5..eacb96270f4f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/capabilities.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/capabilities.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CapabilitiesClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -32,22 +31,19 @@ type CapabilitiesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewCapabilitiesClient creates an instance of the CapabilitiesClient client. func NewCapabilitiesClient(subscriptionID string) CapabilitiesClient { return NewCapabilitiesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewCapabilitiesClientWithBaseURI creates an instance of the CapabilitiesClient client. func NewCapabilitiesClientWithBaseURI(baseURI string, subscriptionID string) CapabilitiesClient { return CapabilitiesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocation gets the subscription capabilities available for the specified location. -// -// locationName is the location name whose capabilities are retrieved. +// Parameters: +// locationName - the location name whose capabilities are retrieved. func (client CapabilitiesClient) ListByLocation(ctx context.Context, locationName string) (result LocationCapabilities, err error) { req, err := client.ListByLocationPreparer(ctx, locationName) if err != nil { @@ -70,7 +66,6 @@ func (client CapabilitiesClient) ListByLocation(ctx context.Context, locationNam return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationPreparer prepares the ListByLocation request. func (client CapabilitiesClient) ListByLocationPreparer(ctx context.Context, locationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -91,7 +86,6 @@ func (client CapabilitiesClient) ListByLocationPreparer(ctx context.Context, loc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationSender sends the ListByLocation request. The method will close the // http.Response Body if it receives an error. func (client CapabilitiesClient) ListByLocationSender(req *http.Request) (*http.Response, error) { @@ -99,7 +93,6 @@ func (client CapabilitiesClient) ListByLocationSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationResponder handles the response to the ListByLocation request. The method always // closes the http.Response Body. func (client CapabilitiesClient) ListByLocationResponder(resp *http.Response) (result LocationCapabilities, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/client.go similarity index 82% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/client.go index 3bb66c3c5b2a..40ec57b36bab 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/client.go @@ -30,7 +30,6 @@ const ( DefaultBaseURI = "https://management.azure.com" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BaseClient is the base client for Sql. type BaseClient struct { autorest.Client @@ -38,13 +37,11 @@ type BaseClient struct { SubscriptionID string } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // New creates an instance of the BaseClient client. func New(subscriptionID string) BaseClient { return NewWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewWithBaseURI creates an instance of the BaseClient client. func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { return BaseClient{ diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go index 9202465200b9..1b9d2fae1576 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseBlobAuditingPoliciesClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -32,26 +31,24 @@ type DatabaseBlobAuditingPoliciesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabaseBlobAuditingPoliciesClient creates an instance of the DatabaseBlobAuditingPoliciesClient client. func NewDatabaseBlobAuditingPoliciesClient(subscriptionID string) DatabaseBlobAuditingPoliciesClient { return NewDatabaseBlobAuditingPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabaseBlobAuditingPoliciesClientWithBaseURI creates an instance of the DatabaseBlobAuditingPoliciesClient // client. func NewDatabaseBlobAuditingPoliciesClientWithBaseURI(baseURI string, subscriptionID string) DatabaseBlobAuditingPoliciesClient { return DatabaseBlobAuditingPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a database's blob auditing policy. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database for which the blob auditing policy will be defined. parameters is the database blob auditing -// policy. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database for which the blob auditing policy will be defined. +// parameters - the database blob auditing policy. func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DatabaseBlobAuditingPolicy) (result DatabaseBlobAuditingPolicy, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, databaseName, parameters) if err != nil { @@ -74,7 +71,6 @@ func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdate(ctx context.Cont return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DatabaseBlobAuditingPolicy) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -100,7 +96,6 @@ func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdatePreparer(ctx cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -108,7 +103,6 @@ func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdateSender(req *http. azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result DatabaseBlobAuditingPolicy, err error) { @@ -122,12 +116,12 @@ func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdateResponder(resp *h return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database's blob auditing policy. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database for which the blob audit policy is defined. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database for which the blob audit policy is defined. func (client DatabaseBlobAuditingPoliciesClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result DatabaseBlobAuditingPolicy, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -150,7 +144,6 @@ func (client DatabaseBlobAuditingPoliciesClient) Get(ctx context.Context, resour return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client DatabaseBlobAuditingPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -174,7 +167,6 @@ func (client DatabaseBlobAuditingPoliciesClient) GetPreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DatabaseBlobAuditingPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -182,7 +174,6 @@ func (client DatabaseBlobAuditingPoliciesClient) GetSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DatabaseBlobAuditingPoliciesClient) GetResponder(resp *http.Response) (result DatabaseBlobAuditingPolicy, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databases.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databases.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databases.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databases.go index 06581bab7ca9..58a2cf31f9a2 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databases.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databases.go @@ -25,7 +25,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -33,25 +32,24 @@ type DatabasesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabasesClient creates an instance of the DatabasesClient client. func NewDatabasesClient(subscriptionID string) DatabasesClient { return NewDatabasesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabasesClientWithBaseURI creates an instance of the DatabasesClient client. func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient { return DatabasesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateImportOperation creates an import operation that imports a bacpac into an existing database. The existing // database must be empty. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database to import into parameters is the required parameters for importing a Bacpac into a database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database to import into +// parameters - the required parameters for importing a Bacpac into a database. func (client DatabasesClient) CreateImportOperation(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters ImportExtensionRequest) (result DatabasesCreateImportOperationFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -75,7 +73,6 @@ func (client DatabasesClient) CreateImportOperation(ctx context.Context, resourc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateImportOperationPreparer prepares the CreateImportOperation request. func (client DatabasesClient) CreateImportOperationPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters ImportExtensionRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -101,7 +98,6 @@ func (client DatabasesClient) CreateImportOperationPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateImportOperationSender sends the CreateImportOperation request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) CreateImportOperationSender(req *http.Request) (future DatabasesCreateImportOperationFuture, err error) { @@ -117,7 +113,6 @@ func (client DatabasesClient) CreateImportOperationSender(req *http.Request) (fu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateImportOperationResponder handles the response to the CreateImportOperation request. The method always // closes the http.Response Body. func (client DatabasesClient) CreateImportOperationResponder(resp *http.Response) (result ImportExportResponse, err error) { @@ -131,13 +126,13 @@ func (client DatabasesClient) CreateImportOperationResponder(resp *http.Response return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates a new database or updates an existing database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database to be operated on (updated or created). parameters is the required parameters for creating or -// updating a database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database to be operated on (updated or created). +// parameters - the required parameters for creating or updating a database. func (client DatabasesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters Database) (result DatabasesCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, databaseName, parameters) if err != nil { @@ -154,7 +149,6 @@ func (client DatabasesClient) CreateOrUpdate(ctx context.Context, resourceGroupN return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DatabasesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters Database) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -179,7 +173,6 @@ func (client DatabasesClient) CreateOrUpdatePreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) CreateOrUpdateSender(req *http.Request) (future DatabasesCreateOrUpdateFuture, err error) { @@ -195,7 +188,6 @@ func (client DatabasesClient) CreateOrUpdateSender(req *http.Request) (future Da return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DatabasesClient) CreateOrUpdateResponder(resp *http.Response) (result Database, err error) { @@ -209,12 +201,12 @@ func (client DatabasesClient) CreateOrUpdateResponder(resp *http.Response) (resu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database to be deleted. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database to be deleted. func (client DatabasesClient) Delete(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -237,7 +229,6 @@ func (client DatabasesClient) Delete(ctx context.Context, resourceGroupName stri return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client DatabasesClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -260,7 +251,6 @@ func (client DatabasesClient) DeletePreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -268,7 +258,6 @@ func (client DatabasesClient) DeleteSender(req *http.Request) (*http.Response, e azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client DatabasesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -281,12 +270,13 @@ func (client DatabasesClient) DeleteResponder(resp *http.Response) (result autor return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Export exports a database to a bacpac. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database to be exported. parameters is the required parameters for exporting a database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database to be exported. +// parameters - the required parameters for exporting a database. func (client DatabasesClient) Export(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters ExportRequest) (result DatabasesExportFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -312,7 +302,6 @@ func (client DatabasesClient) Export(ctx context.Context, resourceGroupName stri return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ExportPreparer prepares the Export request. func (client DatabasesClient) ExportPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters ExportRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -337,7 +326,6 @@ func (client DatabasesClient) ExportPreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ExportSender sends the Export request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ExportSender(req *http.Request) (future DatabasesExportFuture, err error) { @@ -353,7 +341,6 @@ func (client DatabasesClient) ExportSender(req *http.Request) (future DatabasesE return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ExportResponder handles the response to the Export request. The method always // closes the http.Response Body. func (client DatabasesClient) ExportResponder(resp *http.Response) (result ImportExportResponse, err error) { @@ -367,13 +354,14 @@ func (client DatabasesClient) ExportResponder(resp *http.Response) (result Impor return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database to be retrieved. expand is a comma separated list of child objects to expand in the response. -// Possible properties: serviceTierAdvisors, transparentDataEncryption. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database to be retrieved. +// expand - a comma separated list of child objects to expand in the response. Possible properties: +// serviceTierAdvisors, transparentDataEncryption. func (client DatabasesClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string, expand string) (result Database, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName, expand) if err != nil { @@ -396,7 +384,6 @@ func (client DatabasesClient) Get(ctx context.Context, resourceGroupName string, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client DatabasesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, expand string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -422,7 +409,6 @@ func (client DatabasesClient) GetPreparer(ctx context.Context, resourceGroupName return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -430,7 +416,6 @@ func (client DatabasesClient) GetSender(req *http.Request) (*http.Response, erro azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DatabasesClient) GetResponder(resp *http.Response) (result Database, err error) { @@ -444,12 +429,13 @@ func (client DatabasesClient) GetResponder(resp *http.Response) (result Database return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByElasticPool gets a database inside of an elastic pool. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. elasticPoolName is the name -// of the elastic pool to be retrieved. databaseName is the name of the database to be retrieved. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// elasticPoolName - the name of the elastic pool to be retrieved. +// databaseName - the name of the database to be retrieved. func (client DatabasesClient) GetByElasticPool(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string, databaseName string) (result Database, err error) { req, err := client.GetByElasticPoolPreparer(ctx, resourceGroupName, serverName, elasticPoolName, databaseName) if err != nil { @@ -472,7 +458,6 @@ func (client DatabasesClient) GetByElasticPool(ctx context.Context, resourceGrou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByElasticPoolPreparer prepares the GetByElasticPool request. func (client DatabasesClient) GetByElasticPoolPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -496,7 +481,6 @@ func (client DatabasesClient) GetByElasticPoolPreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByElasticPoolSender sends the GetByElasticPool request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) GetByElasticPoolSender(req *http.Request) (*http.Response, error) { @@ -504,7 +488,6 @@ func (client DatabasesClient) GetByElasticPoolSender(req *http.Request) (*http.R azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByElasticPoolResponder handles the response to the GetByElasticPool request. The method always // closes the http.Response Body. func (client DatabasesClient) GetByElasticPoolResponder(resp *http.Response) (result Database, err error) { @@ -518,12 +501,13 @@ func (client DatabasesClient) GetByElasticPoolResponder(resp *http.Response) (re return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByRecommendedElasticPool gets a database inside of a recommented elastic pool. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. recommendedElasticPoolName -// is the name of the elastic pool to be retrieved. databaseName is the name of the database to be retrieved. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// recommendedElasticPoolName - the name of the elastic pool to be retrieved. +// databaseName - the name of the database to be retrieved. func (client DatabasesClient) GetByRecommendedElasticPool(ctx context.Context, resourceGroupName string, serverName string, recommendedElasticPoolName string, databaseName string) (result Database, err error) { req, err := client.GetByRecommendedElasticPoolPreparer(ctx, resourceGroupName, serverName, recommendedElasticPoolName, databaseName) if err != nil { @@ -546,7 +530,6 @@ func (client DatabasesClient) GetByRecommendedElasticPool(ctx context.Context, r return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByRecommendedElasticPoolPreparer prepares the GetByRecommendedElasticPool request. func (client DatabasesClient) GetByRecommendedElasticPoolPreparer(ctx context.Context, resourceGroupName string, serverName string, recommendedElasticPoolName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -570,7 +553,6 @@ func (client DatabasesClient) GetByRecommendedElasticPoolPreparer(ctx context.Co return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByRecommendedElasticPoolSender sends the GetByRecommendedElasticPool request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) GetByRecommendedElasticPoolSender(req *http.Request) (*http.Response, error) { @@ -578,7 +560,6 @@ func (client DatabasesClient) GetByRecommendedElasticPoolSender(req *http.Reques azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetByRecommendedElasticPoolResponder handles the response to the GetByRecommendedElasticPool request. The method always // closes the http.Response Body. func (client DatabasesClient) GetByRecommendedElasticPoolResponder(resp *http.Response) (result Database, err error) { @@ -592,12 +573,12 @@ func (client DatabasesClient) GetByRecommendedElasticPoolResponder(resp *http.Re return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Import imports a bacpac into a new database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. parameters is the required -// parameters for importing a Bacpac into a database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// parameters - the required parameters for importing a Bacpac into a database. func (client DatabasesClient) Import(ctx context.Context, resourceGroupName string, serverName string, parameters ImportRequest) (result DatabasesImportFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -621,7 +602,6 @@ func (client DatabasesClient) Import(ctx context.Context, resourceGroupName stri return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportPreparer prepares the Import request. func (client DatabasesClient) ImportPreparer(ctx context.Context, resourceGroupName string, serverName string, parameters ImportRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -645,7 +625,6 @@ func (client DatabasesClient) ImportPreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportSender sends the Import request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ImportSender(req *http.Request) (future DatabasesImportFuture, err error) { @@ -661,7 +640,6 @@ func (client DatabasesClient) ImportSender(req *http.Request) (future DatabasesI return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportResponder handles the response to the Import request. The method always // closes the http.Response Body. func (client DatabasesClient) ImportResponder(resp *http.Response) (result ImportExportResponse, err error) { @@ -675,12 +653,12 @@ func (client DatabasesClient) ImportResponder(resp *http.Response) (result Impor return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPool returns a list of databases in an elastic pool. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. elasticPoolName is the name -// of the elastic pool to be retrieved. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// elasticPoolName - the name of the elastic pool to be retrieved. func (client DatabasesClient) ListByElasticPool(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (result DatabaseListResult, err error) { req, err := client.ListByElasticPoolPreparer(ctx, resourceGroupName, serverName, elasticPoolName) if err != nil { @@ -703,7 +681,6 @@ func (client DatabasesClient) ListByElasticPool(ctx context.Context, resourceGro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolPreparer prepares the ListByElasticPool request. func (client DatabasesClient) ListByElasticPoolPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -726,7 +703,6 @@ func (client DatabasesClient) ListByElasticPoolPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolSender sends the ListByElasticPool request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ListByElasticPoolSender(req *http.Request) (*http.Response, error) { @@ -734,7 +710,6 @@ func (client DatabasesClient) ListByElasticPoolSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolResponder handles the response to the ListByElasticPool request. The method always // closes the http.Response Body. func (client DatabasesClient) ListByElasticPoolResponder(resp *http.Response) (result DatabaseListResult, err error) { @@ -748,12 +723,12 @@ func (client DatabasesClient) ListByElasticPoolResponder(resp *http.Response) (r return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByRecommendedElasticPool returns a list of databases inside a recommented elastic pool. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. recommendedElasticPoolName -// is the name of the recommended elastic pool to be retrieved. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// recommendedElasticPoolName - the name of the recommended elastic pool to be retrieved. func (client DatabasesClient) ListByRecommendedElasticPool(ctx context.Context, resourceGroupName string, serverName string, recommendedElasticPoolName string) (result DatabaseListResult, err error) { req, err := client.ListByRecommendedElasticPoolPreparer(ctx, resourceGroupName, serverName, recommendedElasticPoolName) if err != nil { @@ -776,7 +751,6 @@ func (client DatabasesClient) ListByRecommendedElasticPool(ctx context.Context, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByRecommendedElasticPoolPreparer prepares the ListByRecommendedElasticPool request. func (client DatabasesClient) ListByRecommendedElasticPoolPreparer(ctx context.Context, resourceGroupName string, serverName string, recommendedElasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -799,7 +773,6 @@ func (client DatabasesClient) ListByRecommendedElasticPoolPreparer(ctx context.C return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByRecommendedElasticPoolSender sends the ListByRecommendedElasticPool request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ListByRecommendedElasticPoolSender(req *http.Request) (*http.Response, error) { @@ -807,7 +780,6 @@ func (client DatabasesClient) ListByRecommendedElasticPoolSender(req *http.Reque azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByRecommendedElasticPoolResponder handles the response to the ListByRecommendedElasticPool request. The method always // closes the http.Response Body. func (client DatabasesClient) ListByRecommendedElasticPoolResponder(resp *http.Response) (result DatabaseListResult, err error) { @@ -821,13 +793,14 @@ func (client DatabasesClient) ListByRecommendedElasticPoolResponder(resp *http.R return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer returns a list of databases in a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. expand is a comma separated -// list of child objects to expand in the response. Possible properties: serviceTierAdvisors, -// transparentDataEncryption. filter is an OData filter expression that describes a subset of databases to return. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// expand - a comma separated list of child objects to expand in the response. Possible properties: +// serviceTierAdvisors, transparentDataEncryption. +// filter - an OData filter expression that describes a subset of databases to return. func (client DatabasesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string, expand string, filter string) (result DatabaseListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName, expand, filter) if err != nil { @@ -850,7 +823,6 @@ func (client DatabasesClient) ListByServer(ctx context.Context, resourceGroupNam return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client DatabasesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string, expand string, filter string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -878,7 +850,6 @@ func (client DatabasesClient) ListByServerPreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -886,7 +857,6 @@ func (client DatabasesClient) ListByServerSender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client DatabasesClient) ListByServerResponder(resp *http.Response) (result DatabaseListResult, err error) { @@ -900,12 +870,12 @@ func (client DatabasesClient) ListByServerResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitions returns database metric definitions. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. func (client DatabasesClient) ListMetricDefinitions(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result MetricDefinitionListResult, err error) { req, err := client.ListMetricDefinitionsPreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -928,7 +898,6 @@ func (client DatabasesClient) ListMetricDefinitions(ctx context.Context, resourc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitionsPreparer prepares the ListMetricDefinitions request. func (client DatabasesClient) ListMetricDefinitionsPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -951,7 +920,6 @@ func (client DatabasesClient) ListMetricDefinitionsPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitionsSender sends the ListMetricDefinitions request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ListMetricDefinitionsSender(req *http.Request) (*http.Response, error) { @@ -959,7 +927,6 @@ func (client DatabasesClient) ListMetricDefinitionsSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitionsResponder handles the response to the ListMetricDefinitions request. The method always // closes the http.Response Body. func (client DatabasesClient) ListMetricDefinitionsResponder(resp *http.Response) (result MetricDefinitionListResult, err error) { @@ -973,12 +940,13 @@ func (client DatabasesClient) ListMetricDefinitionsResponder(resp *http.Response return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetrics returns database metrics. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. filter is an OData filter expression that describes a subset of metrics to return. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. +// filter - an OData filter expression that describes a subset of metrics to return. func (client DatabasesClient) ListMetrics(ctx context.Context, resourceGroupName string, serverName string, databaseName string, filter string) (result MetricListResult, err error) { req, err := client.ListMetricsPreparer(ctx, resourceGroupName, serverName, databaseName, filter) if err != nil { @@ -1001,7 +969,6 @@ func (client DatabasesClient) ListMetrics(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricsPreparer prepares the ListMetrics request. func (client DatabasesClient) ListMetricsPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, filter string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -1025,7 +992,6 @@ func (client DatabasesClient) ListMetricsPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricsSender sends the ListMetrics request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ListMetricsSender(req *http.Request) (*http.Response, error) { @@ -1033,7 +999,6 @@ func (client DatabasesClient) ListMetricsSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricsResponder handles the response to the ListMetrics request. The method always // closes the http.Response Body. func (client DatabasesClient) ListMetricsResponder(resp *http.Response) (result MetricListResult, err error) { @@ -1047,12 +1012,12 @@ func (client DatabasesClient) ListMetricsResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Pause pauses a data warehouse. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the data warehouse to pause. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the data warehouse to pause. func (client DatabasesClient) Pause(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result DatabasesPauseFuture, err error) { req, err := client.PausePreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -1069,7 +1034,6 @@ func (client DatabasesClient) Pause(ctx context.Context, resourceGroupName strin return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PausePreparer prepares the Pause request. func (client DatabasesClient) PausePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -1092,7 +1056,6 @@ func (client DatabasesClient) PausePreparer(ctx context.Context, resourceGroupNa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PauseSender sends the Pause request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) PauseSender(req *http.Request) (future DatabasesPauseFuture, err error) { @@ -1108,7 +1071,6 @@ func (client DatabasesClient) PauseSender(req *http.Request) (future DatabasesPa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PauseResponder handles the response to the Pause request. The method always // closes the http.Response Body. func (client DatabasesClient) PauseResponder(resp *http.Response) (result autorest.Response, err error) { @@ -1121,12 +1083,12 @@ func (client DatabasesClient) PauseResponder(resp *http.Response) (result autore return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Resume resumes a data warehouse. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the data warehouse to resume. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the data warehouse to resume. func (client DatabasesClient) Resume(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result DatabasesResumeFuture, err error) { req, err := client.ResumePreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -1143,7 +1105,6 @@ func (client DatabasesClient) Resume(ctx context.Context, resourceGroupName stri return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ResumePreparer prepares the Resume request. func (client DatabasesClient) ResumePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -1166,7 +1127,6 @@ func (client DatabasesClient) ResumePreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ResumeSender sends the Resume request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ResumeSender(req *http.Request) (future DatabasesResumeFuture, err error) { @@ -1182,7 +1142,6 @@ func (client DatabasesClient) ResumeSender(req *http.Request) (future DatabasesR return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ResumeResponder handles the response to the Resume request. The method always // closes the http.Response Body. func (client DatabasesClient) ResumeResponder(resp *http.Response) (result autorest.Response, err error) { @@ -1195,12 +1154,13 @@ func (client DatabasesClient) ResumeResponder(resp *http.Response) (result autor return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Update updates an existing database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database to be updated. parameters is the required parameters for updating a database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database to be updated. +// parameters - the required parameters for updating a database. func (client DatabasesClient) Update(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DatabaseUpdate) (result DatabasesUpdateFuture, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, serverName, databaseName, parameters) if err != nil { @@ -1217,7 +1177,6 @@ func (client DatabasesClient) Update(ctx context.Context, resourceGroupName stri return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdatePreparer prepares the Update request. func (client DatabasesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DatabaseUpdate) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -1242,7 +1201,6 @@ func (client DatabasesClient) UpdatePreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) UpdateSender(req *http.Request) (future DatabasesUpdateFuture, err error) { @@ -1258,7 +1216,6 @@ func (client DatabasesClient) UpdateSender(req *http.Request) (future DatabasesU return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client DatabasesClient) UpdateResponder(resp *http.Response) (result Database, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databasethreatdetectionpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databasethreatdetectionpolicies.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databasethreatdetectionpolicies.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databasethreatdetectionpolicies.go index 73bc6a5dfdef..ff201caadaeb 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databasethreatdetectionpolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databasethreatdetectionpolicies.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseThreatDetectionPoliciesClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -32,26 +31,24 @@ type DatabaseThreatDetectionPoliciesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabaseThreatDetectionPoliciesClient creates an instance of the DatabaseThreatDetectionPoliciesClient client. func NewDatabaseThreatDetectionPoliciesClient(subscriptionID string) DatabaseThreatDetectionPoliciesClient { return NewDatabaseThreatDetectionPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabaseThreatDetectionPoliciesClientWithBaseURI creates an instance of the DatabaseThreatDetectionPoliciesClient // client. func NewDatabaseThreatDetectionPoliciesClientWithBaseURI(baseURI string, subscriptionID string) DatabaseThreatDetectionPoliciesClient { return DatabaseThreatDetectionPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a database's threat detection policy. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database for which database Threat Detection policy is defined. parameters is the database Threat Detection -// policy. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database for which database Threat Detection policy is defined. +// parameters - the database Threat Detection policy. func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DatabaseSecurityAlertPolicy) (result DatabaseSecurityAlertPolicy, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, databaseName, parameters) if err != nil { @@ -74,7 +71,6 @@ func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdate(ctx context.C return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DatabaseSecurityAlertPolicy) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -100,7 +96,6 @@ func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdatePreparer(ctx c return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -108,7 +103,6 @@ func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdateSender(req *ht azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result DatabaseSecurityAlertPolicy, err error) { @@ -122,12 +116,12 @@ func (client DatabaseThreatDetectionPoliciesClient) CreateOrUpdateResponder(resp return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database's threat detection policy. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database for which database Threat Detection policy is defined. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database for which database Threat Detection policy is defined. func (client DatabaseThreatDetectionPoliciesClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result DatabaseSecurityAlertPolicy, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -150,7 +144,6 @@ func (client DatabaseThreatDetectionPoliciesClient) Get(ctx context.Context, res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client DatabaseThreatDetectionPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -174,7 +167,6 @@ func (client DatabaseThreatDetectionPoliciesClient) GetPreparer(ctx context.Cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DatabaseThreatDetectionPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -182,7 +174,6 @@ func (client DatabaseThreatDetectionPoliciesClient) GetSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DatabaseThreatDetectionPoliciesClient) GetResponder(resp *http.Response) (result DatabaseSecurityAlertPolicy, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseusages.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databaseusages.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseusages.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databaseusages.go index 3cbb944e1814..cfca64ba5220 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/databaseusages.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databaseusages.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseUsagesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,24 +31,22 @@ type DatabaseUsagesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabaseUsagesClient creates an instance of the DatabaseUsagesClient client. func NewDatabaseUsagesClient(subscriptionID string) DatabaseUsagesClient { return NewDatabaseUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDatabaseUsagesClientWithBaseURI creates an instance of the DatabaseUsagesClient client. func NewDatabaseUsagesClientWithBaseURI(baseURI string, subscriptionID string) DatabaseUsagesClient { return DatabaseUsagesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase returns database usages. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. func (client DatabaseUsagesClient) ListByDatabase(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result DatabaseUsageListResult, err error) { req, err := client.ListByDatabasePreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -72,7 +69,6 @@ func (client DatabaseUsagesClient) ListByDatabase(ctx context.Context, resourceG return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client DatabaseUsagesClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,7 +91,6 @@ func (client DatabaseUsagesClient) ListByDatabasePreparer(ctx context.Context, r return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client DatabaseUsagesClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -103,7 +98,6 @@ func (client DatabaseUsagesClient) ListByDatabaseSender(req *http.Request) (*htt azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client DatabaseUsagesClient) ListByDatabaseResponder(resp *http.Response) (result DatabaseUsageListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/datamaskingpolicies.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingpolicies.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/datamaskingpolicies.go index 82a0a7000069..886e172f4573 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingpolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/datamaskingpolicies.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingPoliciesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,24 +31,23 @@ type DataMaskingPoliciesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDataMaskingPoliciesClient creates an instance of the DataMaskingPoliciesClient client. func NewDataMaskingPoliciesClient(subscriptionID string) DataMaskingPoliciesClient { return NewDataMaskingPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDataMaskingPoliciesClientWithBaseURI creates an instance of the DataMaskingPoliciesClient client. func NewDataMaskingPoliciesClientWithBaseURI(baseURI string, subscriptionID string) DataMaskingPoliciesClient { return DataMaskingPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a database data masking policy -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. parameters is parameters for creating or updating a data masking policy. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. +// parameters - parameters for creating or updating a data masking policy. func (client DataMaskingPoliciesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DataMaskingPolicy) (result DataMaskingPolicy, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, databaseName, parameters) if err != nil { @@ -72,7 +70,6 @@ func (client DataMaskingPoliciesClient) CreateOrUpdate(ctx context.Context, reso return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DataMaskingPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DataMaskingPolicy) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -98,7 +95,6 @@ func (client DataMaskingPoliciesClient) CreateOrUpdatePreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DataMaskingPoliciesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -106,7 +102,6 @@ func (client DataMaskingPoliciesClient) CreateOrUpdateSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DataMaskingPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result DataMaskingPolicy, err error) { @@ -120,12 +115,12 @@ func (client DataMaskingPoliciesClient) CreateOrUpdateResponder(resp *http.Respo return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database data masking policy. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. func (client DataMaskingPoliciesClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result DataMaskingPolicy, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -148,7 +143,6 @@ func (client DataMaskingPoliciesClient) Get(ctx context.Context, resourceGroupNa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client DataMaskingPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -172,7 +166,6 @@ func (client DataMaskingPoliciesClient) GetPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client DataMaskingPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -180,7 +173,6 @@ func (client DataMaskingPoliciesClient) GetSender(req *http.Request) (*http.Resp azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client DataMaskingPoliciesClient) GetResponder(resp *http.Response) (result DataMaskingPolicy, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/datamaskingrules.go similarity index 81% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingrules.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/datamaskingrules.go index 0b8b90df4056..8655ec37bdaf 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/datamaskingrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/datamaskingrules.go @@ -25,7 +25,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingRulesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -33,25 +32,24 @@ type DataMaskingRulesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDataMaskingRulesClient creates an instance of the DataMaskingRulesClient client. func NewDataMaskingRulesClient(subscriptionID string) DataMaskingRulesClient { return NewDataMaskingRulesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewDataMaskingRulesClientWithBaseURI creates an instance of the DataMaskingRulesClient client. func NewDataMaskingRulesClientWithBaseURI(baseURI string, subscriptionID string) DataMaskingRulesClient { return DataMaskingRulesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a database data masking rule. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. dataMaskingRuleName is the name of the data masking rule. parameters is the required parameters -// for creating or updating a data masking rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. +// dataMaskingRuleName - the name of the data masking rule. +// parameters - the required parameters for creating or updating a data masking rule. func (client DataMaskingRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, dataMaskingRuleName string, parameters DataMaskingRule) (result DataMaskingRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -84,7 +82,6 @@ func (client DataMaskingRulesClient) CreateOrUpdate(ctx context.Context, resourc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client DataMaskingRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, dataMaskingRuleName string, parameters DataMaskingRule) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -111,7 +108,6 @@ func (client DataMaskingRulesClient) CreateOrUpdatePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DataMaskingRulesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -119,7 +115,6 @@ func (client DataMaskingRulesClient) CreateOrUpdateSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client DataMaskingRulesClient) CreateOrUpdateResponder(resp *http.Response) (result DataMaskingRule, err error) { @@ -133,12 +128,12 @@ func (client DataMaskingRulesClient) CreateOrUpdateResponder(resp *http.Response return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase gets a list of database data masking rules. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. func (client DataMaskingRulesClient) ListByDatabase(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result DataMaskingRuleListResult, err error) { req, err := client.ListByDatabasePreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -161,7 +156,6 @@ func (client DataMaskingRulesClient) ListByDatabase(ctx context.Context, resourc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client DataMaskingRulesClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -185,7 +179,6 @@ func (client DataMaskingRulesClient) ListByDatabasePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client DataMaskingRulesClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -193,7 +186,6 @@ func (client DataMaskingRulesClient) ListByDatabaseSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client DataMaskingRulesClient) ListByDatabaseResponder(resp *http.Response) (result DataMaskingRuleListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpoolactivities.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpoolactivities.go similarity index 80% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpoolactivities.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpoolactivities.go index 3b493028d779..1ddcca4d4f4f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpoolactivities.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpoolactivities.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolActivitiesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,24 +31,22 @@ type ElasticPoolActivitiesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewElasticPoolActivitiesClient creates an instance of the ElasticPoolActivitiesClient client. func NewElasticPoolActivitiesClient(subscriptionID string) ElasticPoolActivitiesClient { return NewElasticPoolActivitiesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewElasticPoolActivitiesClientWithBaseURI creates an instance of the ElasticPoolActivitiesClient client. func NewElasticPoolActivitiesClientWithBaseURI(baseURI string, subscriptionID string) ElasticPoolActivitiesClient { return ElasticPoolActivitiesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPool returns elastic pool activities. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. elasticPoolName is the name -// of the elastic pool for which to get the current activity. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// elasticPoolName - the name of the elastic pool for which to get the current activity. func (client ElasticPoolActivitiesClient) ListByElasticPool(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (result ElasticPoolActivityListResult, err error) { req, err := client.ListByElasticPoolPreparer(ctx, resourceGroupName, serverName, elasticPoolName) if err != nil { @@ -72,7 +69,6 @@ func (client ElasticPoolActivitiesClient) ListByElasticPool(ctx context.Context, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolPreparer prepares the ListByElasticPool request. func (client ElasticPoolActivitiesClient) ListByElasticPoolPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,7 +91,6 @@ func (client ElasticPoolActivitiesClient) ListByElasticPoolPreparer(ctx context. return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolSender sends the ListByElasticPool request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolActivitiesClient) ListByElasticPoolSender(req *http.Request) (*http.Response, error) { @@ -103,7 +98,6 @@ func (client ElasticPoolActivitiesClient) ListByElasticPoolSender(req *http.Requ azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolResponder handles the response to the ListByElasticPool request. The method always // closes the http.Response Body. func (client ElasticPoolActivitiesClient) ListByElasticPoolResponder(resp *http.Response) (result ElasticPoolActivityListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpooldatabaseactivities.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpooldatabaseactivities.go similarity index 81% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpooldatabaseactivities.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpooldatabaseactivities.go index 1b1d28e0cfcd..4aa8be207f7a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpooldatabaseactivities.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpooldatabaseactivities.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolDatabaseActivitiesClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -32,25 +31,23 @@ type ElasticPoolDatabaseActivitiesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewElasticPoolDatabaseActivitiesClient creates an instance of the ElasticPoolDatabaseActivitiesClient client. func NewElasticPoolDatabaseActivitiesClient(subscriptionID string) ElasticPoolDatabaseActivitiesClient { return NewElasticPoolDatabaseActivitiesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewElasticPoolDatabaseActivitiesClientWithBaseURI creates an instance of the ElasticPoolDatabaseActivitiesClient // client. func NewElasticPoolDatabaseActivitiesClientWithBaseURI(baseURI string, subscriptionID string) ElasticPoolDatabaseActivitiesClient { return ElasticPoolDatabaseActivitiesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPool returns activity on databases inside of an elastic pool. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. elasticPoolName is the name -// of the elastic pool. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// elasticPoolName - the name of the elastic pool. func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPool(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (result ElasticPoolDatabaseActivityListResult, err error) { req, err := client.ListByElasticPoolPreparer(ctx, resourceGroupName, serverName, elasticPoolName) if err != nil { @@ -73,7 +70,6 @@ func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPool(ctx context. return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolPreparer prepares the ListByElasticPool request. func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPoolPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -96,7 +92,6 @@ func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPoolPreparer(ctx return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolSender sends the ListByElasticPool request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPoolSender(req *http.Request) (*http.Response, error) { @@ -104,7 +99,6 @@ func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPoolSender(req *h azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByElasticPoolResponder handles the response to the ListByElasticPool request. The method always // closes the http.Response Body. func (client ElasticPoolDatabaseActivitiesClient) ListByElasticPoolResponder(resp *http.Response) (result ElasticPoolDatabaseActivityListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpools.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpools.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpools.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpools.go index d4cb52a2e526..f22c556db196 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/elasticpools.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpools.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolsClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -32,25 +31,23 @@ type ElasticPoolsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewElasticPoolsClient creates an instance of the ElasticPoolsClient client. func NewElasticPoolsClient(subscriptionID string) ElasticPoolsClient { return NewElasticPoolsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewElasticPoolsClientWithBaseURI creates an instance of the ElasticPoolsClient client. func NewElasticPoolsClientWithBaseURI(baseURI string, subscriptionID string) ElasticPoolsClient { return ElasticPoolsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates a new elastic pool or updates an existing elastic pool. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. elasticPoolName is the name -// of the elastic pool to be operated on (updated or created). parameters is the required parameters for creating -// or updating an elastic pool. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// elasticPoolName - the name of the elastic pool to be operated on (updated or created). +// parameters - the required parameters for creating or updating an elastic pool. func (client ElasticPoolsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string, parameters ElasticPool) (result ElasticPoolsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, elasticPoolName, parameters) if err != nil { @@ -67,7 +64,6 @@ func (client ElasticPoolsClient) CreateOrUpdate(ctx context.Context, resourceGro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ElasticPoolsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string, parameters ElasticPool) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -92,7 +88,6 @@ func (client ElasticPoolsClient) CreateOrUpdatePreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) CreateOrUpdateSender(req *http.Request) (future ElasticPoolsCreateOrUpdateFuture, err error) { @@ -108,7 +103,6 @@ func (client ElasticPoolsClient) CreateOrUpdateSender(req *http.Request) (future return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) CreateOrUpdateResponder(resp *http.Response) (result ElasticPool, err error) { @@ -122,12 +116,12 @@ func (client ElasticPoolsClient) CreateOrUpdateResponder(resp *http.Response) (r return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes the elastic pool. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. elasticPoolName is the name -// of the elastic pool to be deleted. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// elasticPoolName - the name of the elastic pool to be deleted. func (client ElasticPoolsClient) Delete(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, elasticPoolName) if err != nil { @@ -150,7 +144,6 @@ func (client ElasticPoolsClient) Delete(ctx context.Context, resourceGroupName s return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client ElasticPoolsClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -173,7 +166,6 @@ func (client ElasticPoolsClient) DeletePreparer(ctx context.Context, resourceGro return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -181,7 +173,6 @@ func (client ElasticPoolsClient) DeleteSender(req *http.Request) (*http.Response azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -194,12 +185,12 @@ func (client ElasticPoolsClient) DeleteResponder(resp *http.Response) (result au return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets an elastic pool. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. elasticPoolName is the name -// of the elastic pool to be retrieved. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// elasticPoolName - the name of the elastic pool to be retrieved. func (client ElasticPoolsClient) Get(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (result ElasticPool, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, elasticPoolName) if err != nil { @@ -222,7 +213,6 @@ func (client ElasticPoolsClient) Get(ctx context.Context, resourceGroupName stri return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ElasticPoolsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -245,7 +235,6 @@ func (client ElasticPoolsClient) GetPreparer(ctx context.Context, resourceGroupN return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -253,7 +242,6 @@ func (client ElasticPoolsClient) GetSender(req *http.Request) (*http.Response, e azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) GetResponder(resp *http.Response) (result ElasticPool, err error) { @@ -267,11 +255,11 @@ func (client ElasticPoolsClient) GetResponder(resp *http.Response) (result Elast return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer returns a list of elastic pools in a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ElasticPoolsClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result ElasticPoolListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -294,7 +282,6 @@ func (client ElasticPoolsClient) ListByServer(ctx context.Context, resourceGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client ElasticPoolsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -316,7 +303,6 @@ func (client ElasticPoolsClient) ListByServerPreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -324,7 +310,6 @@ func (client ElasticPoolsClient) ListByServerSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) ListByServerResponder(resp *http.Response) (result ElasticPoolListResult, err error) { @@ -338,12 +323,12 @@ func (client ElasticPoolsClient) ListByServerResponder(resp *http.Response) (res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitions returns elastic pool metric definitions. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. elasticPoolName is the name -// of the elastic pool. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// elasticPoolName - the name of the elastic pool. func (client ElasticPoolsClient) ListMetricDefinitions(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (result MetricDefinitionListResult, err error) { req, err := client.ListMetricDefinitionsPreparer(ctx, resourceGroupName, serverName, elasticPoolName) if err != nil { @@ -366,7 +351,6 @@ func (client ElasticPoolsClient) ListMetricDefinitions(ctx context.Context, reso return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitionsPreparer prepares the ListMetricDefinitions request. func (client ElasticPoolsClient) ListMetricDefinitionsPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -389,7 +373,6 @@ func (client ElasticPoolsClient) ListMetricDefinitionsPreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitionsSender sends the ListMetricDefinitions request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) ListMetricDefinitionsSender(req *http.Request) (*http.Response, error) { @@ -397,7 +380,6 @@ func (client ElasticPoolsClient) ListMetricDefinitionsSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricDefinitionsResponder handles the response to the ListMetricDefinitions request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) ListMetricDefinitionsResponder(resp *http.Response) (result MetricDefinitionListResult, err error) { @@ -411,12 +393,13 @@ func (client ElasticPoolsClient) ListMetricDefinitionsResponder(resp *http.Respo return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetrics returns elastic pool metrics. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. elasticPoolName is the name -// of the elastic pool. filter is an OData filter expression that describes a subset of metrics to return. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// elasticPoolName - the name of the elastic pool. +// filter - an OData filter expression that describes a subset of metrics to return. func (client ElasticPoolsClient) ListMetrics(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string, filter string) (result MetricListResult, err error) { req, err := client.ListMetricsPreparer(ctx, resourceGroupName, serverName, elasticPoolName, filter) if err != nil { @@ -439,7 +422,6 @@ func (client ElasticPoolsClient) ListMetrics(ctx context.Context, resourceGroupN return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricsPreparer prepares the ListMetrics request. func (client ElasticPoolsClient) ListMetricsPreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string, filter string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -463,7 +445,6 @@ func (client ElasticPoolsClient) ListMetricsPreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricsSender sends the ListMetrics request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) ListMetricsSender(req *http.Request) (*http.Response, error) { @@ -471,7 +452,6 @@ func (client ElasticPoolsClient) ListMetricsSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMetricsResponder handles the response to the ListMetrics request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) ListMetricsResponder(resp *http.Response) (result MetricListResult, err error) { @@ -485,12 +465,13 @@ func (client ElasticPoolsClient) ListMetricsResponder(resp *http.Response) (resu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Update updates an existing elastic pool. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. elasticPoolName is the name -// of the elastic pool to be updated. parameters is the required parameters for updating an elastic pool. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// elasticPoolName - the name of the elastic pool to be updated. +// parameters - the required parameters for updating an elastic pool. func (client ElasticPoolsClient) Update(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string, parameters ElasticPoolUpdate) (result ElasticPoolsUpdateFuture, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, serverName, elasticPoolName, parameters) if err != nil { @@ -507,7 +488,6 @@ func (client ElasticPoolsClient) Update(ctx context.Context, resourceGroupName s return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdatePreparer prepares the Update request. func (client ElasticPoolsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, elasticPoolName string, parameters ElasticPoolUpdate) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -532,7 +512,6 @@ func (client ElasticPoolsClient) UpdatePreparer(ctx context.Context, resourceGro return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) UpdateSender(req *http.Request) (future ElasticPoolsUpdateFuture, err error) { @@ -548,7 +527,6 @@ func (client ElasticPoolsClient) UpdateSender(req *http.Request) (future Elastic return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client ElasticPoolsClient) UpdateResponder(resp *http.Response) (result ElasticPool, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go similarity index 81% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go index dd8349e7399a..1fb5984331c4 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtectorsClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,24 +31,22 @@ type EncryptionProtectorsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewEncryptionProtectorsClient creates an instance of the EncryptionProtectorsClient client. func NewEncryptionProtectorsClient(subscriptionID string) EncryptionProtectorsClient { return NewEncryptionProtectorsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewEncryptionProtectorsClientWithBaseURI creates an instance of the EncryptionProtectorsClient client. func NewEncryptionProtectorsClientWithBaseURI(baseURI string, subscriptionID string) EncryptionProtectorsClient { return EncryptionProtectorsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate updates an existing encryption protector. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. parameters is the requested -// encryption protector resource state. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// parameters - the requested encryption protector resource state. func (client EncryptionProtectorsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, parameters EncryptionProtector) (result EncryptionProtectorsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, parameters) if err != nil { @@ -66,7 +63,6 @@ func (client EncryptionProtectorsClient) CreateOrUpdate(ctx context.Context, res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client EncryptionProtectorsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters EncryptionProtector) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -91,7 +87,6 @@ func (client EncryptionProtectorsClient) CreateOrUpdatePreparer(ctx context.Cont return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client EncryptionProtectorsClient) CreateOrUpdateSender(req *http.Request) (future EncryptionProtectorsCreateOrUpdateFuture, err error) { @@ -107,7 +102,6 @@ func (client EncryptionProtectorsClient) CreateOrUpdateSender(req *http.Request) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client EncryptionProtectorsClient) CreateOrUpdateResponder(resp *http.Response) (result EncryptionProtector, err error) { @@ -121,11 +115,11 @@ func (client EncryptionProtectorsClient) CreateOrUpdateResponder(resp *http.Resp return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a server encryption protector. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client EncryptionProtectorsClient) Get(ctx context.Context, resourceGroupName string, serverName string) (result EncryptionProtector, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -148,7 +142,6 @@ func (client EncryptionProtectorsClient) Get(ctx context.Context, resourceGroupN return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client EncryptionProtectorsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -171,7 +164,6 @@ func (client EncryptionProtectorsClient) GetPreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client EncryptionProtectorsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -179,7 +171,6 @@ func (client EncryptionProtectorsClient) GetSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client EncryptionProtectorsClient) GetResponder(resp *http.Response) (result EncryptionProtector, err error) { @@ -193,11 +184,11 @@ func (client EncryptionProtectorsClient) GetResponder(resp *http.Response) (resu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets a list of server encryption protectors -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client EncryptionProtectorsClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result EncryptionProtectorListResultPage, err error) { result.fn = client.listByServerNextResults req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) @@ -221,7 +212,6 @@ func (client EncryptionProtectorsClient) ListByServer(ctx context.Context, resou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client EncryptionProtectorsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -243,7 +233,6 @@ func (client EncryptionProtectorsClient) ListByServerPreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client EncryptionProtectorsClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -251,7 +240,6 @@ func (client EncryptionProtectorsClient) ListByServerSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client EncryptionProtectorsClient) ListByServerResponder(resp *http.Response) (result EncryptionProtectorListResult, err error) { @@ -286,7 +274,6 @@ func (client EncryptionProtectorsClient) listByServerNextResults(lastResults Enc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerComplete enumerates all values, automatically crossing page boundaries as required. func (client EncryptionProtectorsClient) ListByServerComplete(ctx context.Context, resourceGroupName string, serverName string) (result EncryptionProtectorListResultIterator, err error) { result.page, err = client.ListByServer(ctx, resourceGroupName, serverName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/failovergroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/failovergroups.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/failovergroups.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/failovergroups.go index 0768049eb37d..5e6afe4aa96f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/failovergroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/failovergroups.go @@ -25,7 +25,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupsClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -33,24 +32,23 @@ type FailoverGroupsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewFailoverGroupsClient creates an instance of the FailoverGroupsClient client. func NewFailoverGroupsClient(subscriptionID string) FailoverGroupsClient { return NewFailoverGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewFailoverGroupsClientWithBaseURI creates an instance of the FailoverGroupsClient client. func NewFailoverGroupsClientWithBaseURI(baseURI string, subscriptionID string) FailoverGroupsClient { return FailoverGroupsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a failover group. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server containing the failover -// group. failoverGroupName is the name of the failover group. parameters is the failover group parameters. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server containing the failover group. +// failoverGroupName - the name of the failover group. +// parameters - the failover group parameters. func (client FailoverGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string, parameters FailoverGroup) (result FailoverGroupsCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -76,7 +74,6 @@ func (client FailoverGroupsClient) CreateOrUpdate(ctx context.Context, resourceG return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client FailoverGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string, parameters FailoverGroup) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -101,7 +98,6 @@ func (client FailoverGroupsClient) CreateOrUpdatePreparer(ctx context.Context, r return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) CreateOrUpdateSender(req *http.Request) (future FailoverGroupsCreateOrUpdateFuture, err error) { @@ -117,7 +113,6 @@ func (client FailoverGroupsClient) CreateOrUpdateSender(req *http.Request) (futu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result FailoverGroup, err error) { @@ -131,12 +126,12 @@ func (client FailoverGroupsClient) CreateOrUpdateResponder(resp *http.Response) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a failover group. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server containing the failover -// group. failoverGroupName is the name of the failover group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server containing the failover group. +// failoverGroupName - the name of the failover group. func (client FailoverGroupsClient) Delete(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string) (result FailoverGroupsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, failoverGroupName) if err != nil { @@ -153,7 +148,6 @@ func (client FailoverGroupsClient) Delete(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client FailoverGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -176,7 +170,6 @@ func (client FailoverGroupsClient) DeletePreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) DeleteSender(req *http.Request) (future FailoverGroupsDeleteFuture, err error) { @@ -192,7 +185,6 @@ func (client FailoverGroupsClient) DeleteSender(req *http.Request) (future Failo return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -205,12 +197,12 @@ func (client FailoverGroupsClient) DeleteResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Failover fails over from the current primary server to this server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server containing the failover -// group. failoverGroupName is the name of the failover group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server containing the failover group. +// failoverGroupName - the name of the failover group. func (client FailoverGroupsClient) Failover(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string) (result FailoverGroupsFailoverFuture, err error) { req, err := client.FailoverPreparer(ctx, resourceGroupName, serverName, failoverGroupName) if err != nil { @@ -227,7 +219,6 @@ func (client FailoverGroupsClient) Failover(ctx context.Context, resourceGroupNa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverPreparer prepares the Failover request. func (client FailoverGroupsClient) FailoverPreparer(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -250,7 +241,6 @@ func (client FailoverGroupsClient) FailoverPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverSender sends the Failover request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) FailoverSender(req *http.Request) (future FailoverGroupsFailoverFuture, err error) { @@ -266,7 +256,6 @@ func (client FailoverGroupsClient) FailoverSender(req *http.Request) (future Fai return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverResponder handles the response to the Failover request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) FailoverResponder(resp *http.Response) (result FailoverGroup, err error) { @@ -280,13 +269,13 @@ func (client FailoverGroupsClient) FailoverResponder(resp *http.Response) (resul return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ForceFailoverAllowDataLoss fails over from the current primary server to this server. This operation might result in // data loss. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server containing the failover -// group. failoverGroupName is the name of the failover group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server containing the failover group. +// failoverGroupName - the name of the failover group. func (client FailoverGroupsClient) ForceFailoverAllowDataLoss(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string) (result FailoverGroupsForceFailoverAllowDataLossFuture, err error) { req, err := client.ForceFailoverAllowDataLossPreparer(ctx, resourceGroupName, serverName, failoverGroupName) if err != nil { @@ -303,7 +292,6 @@ func (client FailoverGroupsClient) ForceFailoverAllowDataLoss(ctx context.Contex return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ForceFailoverAllowDataLossPreparer prepares the ForceFailoverAllowDataLoss request. func (client FailoverGroupsClient) ForceFailoverAllowDataLossPreparer(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -326,7 +314,6 @@ func (client FailoverGroupsClient) ForceFailoverAllowDataLossPreparer(ctx contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ForceFailoverAllowDataLossSender sends the ForceFailoverAllowDataLoss request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) ForceFailoverAllowDataLossSender(req *http.Request) (future FailoverGroupsForceFailoverAllowDataLossFuture, err error) { @@ -342,7 +329,6 @@ func (client FailoverGroupsClient) ForceFailoverAllowDataLossSender(req *http.Re return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ForceFailoverAllowDataLossResponder handles the response to the ForceFailoverAllowDataLoss request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) ForceFailoverAllowDataLossResponder(resp *http.Response) (result FailoverGroup, err error) { @@ -356,12 +342,12 @@ func (client FailoverGroupsClient) ForceFailoverAllowDataLossResponder(resp *htt return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a failover group. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server containing the failover -// group. failoverGroupName is the name of the failover group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server containing the failover group. +// failoverGroupName - the name of the failover group. func (client FailoverGroupsClient) Get(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string) (result FailoverGroup, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, failoverGroupName) if err != nil { @@ -384,7 +370,6 @@ func (client FailoverGroupsClient) Get(ctx context.Context, resourceGroupName st return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client FailoverGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -407,7 +392,6 @@ func (client FailoverGroupsClient) GetPreparer(ctx context.Context, resourceGrou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -415,7 +399,6 @@ func (client FailoverGroupsClient) GetSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) GetResponder(resp *http.Response) (result FailoverGroup, err error) { @@ -429,12 +412,11 @@ func (client FailoverGroupsClient) GetResponder(resp *http.Response) (result Fai return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer lists the failover groups in a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server containing the failover -// group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server containing the failover group. func (client FailoverGroupsClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result FailoverGroupListResultPage, err error) { result.fn = client.listByServerNextResults req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) @@ -458,7 +440,6 @@ func (client FailoverGroupsClient) ListByServer(ctx context.Context, resourceGro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client FailoverGroupsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -480,7 +461,6 @@ func (client FailoverGroupsClient) ListByServerPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -488,7 +468,6 @@ func (client FailoverGroupsClient) ListByServerSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) ListByServerResponder(resp *http.Response) (result FailoverGroupListResult, err error) { @@ -523,19 +502,19 @@ func (client FailoverGroupsClient) listByServerNextResults(lastResults FailoverG return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerComplete enumerates all values, automatically crossing page boundaries as required. func (client FailoverGroupsClient) ListByServerComplete(ctx context.Context, resourceGroupName string, serverName string) (result FailoverGroupListResultIterator, err error) { result.page, err = client.ListByServer(ctx, resourceGroupName, serverName) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Update updates a failover group. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server containing the failover -// group. failoverGroupName is the name of the failover group. parameters is the failover group parameters. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server containing the failover group. +// failoverGroupName - the name of the failover group. +// parameters - the failover group parameters. func (client FailoverGroupsClient) Update(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string, parameters FailoverGroupUpdate) (result FailoverGroupsUpdateFuture, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, serverName, failoverGroupName, parameters) if err != nil { @@ -552,7 +531,6 @@ func (client FailoverGroupsClient) Update(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdatePreparer prepares the Update request. func (client FailoverGroupsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, failoverGroupName string, parameters FailoverGroupUpdate) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -577,7 +555,6 @@ func (client FailoverGroupsClient) UpdatePreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) UpdateSender(req *http.Request) (future FailoverGroupsUpdateFuture, err error) { @@ -593,7 +570,6 @@ func (client FailoverGroupsClient) UpdateSender(req *http.Request) (future Failo return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client FailoverGroupsClient) UpdateResponder(resp *http.Response) (result FailoverGroup, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/firewallrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/firewallrules.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/firewallrules.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/firewallrules.go index 6ddb67e969e0..1f1b7f8a49f4 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/firewallrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/firewallrules.go @@ -25,7 +25,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FirewallRulesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -33,24 +32,23 @@ type FirewallRulesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewFirewallRulesClient creates an instance of the FirewallRulesClient client. func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient { return NewFirewallRulesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewFirewallRulesClientWithBaseURI creates an instance of the FirewallRulesClient client. func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient { return FirewallRulesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a firewall rule. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. firewallRuleName is the name -// of the firewall rule. parameters is the required parameters for creating or updating a firewall rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// firewallRuleName - the name of the firewall rule. +// parameters - the required parameters for creating or updating a firewall rule. func (client FirewallRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string, parameters FirewallRule) (result FirewallRule, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -82,7 +80,6 @@ func (client FirewallRulesClient) CreateOrUpdate(ctx context.Context, resourceGr return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client FirewallRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string, parameters FirewallRule) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -107,7 +104,6 @@ func (client FirewallRulesClient) CreateOrUpdatePreparer(ctx context.Context, re return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client FirewallRulesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -115,7 +111,6 @@ func (client FirewallRulesClient) CreateOrUpdateSender(req *http.Request) (*http azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client FirewallRulesClient) CreateOrUpdateResponder(resp *http.Response) (result FirewallRule, err error) { @@ -129,12 +124,12 @@ func (client FirewallRulesClient) CreateOrUpdateResponder(resp *http.Response) ( return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a firewall rule. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. firewallRuleName is the name -// of the firewall rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// firewallRuleName - the name of the firewall rule. func (client FirewallRulesClient) Delete(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, firewallRuleName) if err != nil { @@ -157,7 +152,6 @@ func (client FirewallRulesClient) Delete(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client FirewallRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -180,7 +174,6 @@ func (client FirewallRulesClient) DeletePreparer(ctx context.Context, resourceGr return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client FirewallRulesClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -188,7 +181,6 @@ func (client FirewallRulesClient) DeleteSender(req *http.Request) (*http.Respons azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client FirewallRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -201,12 +193,12 @@ func (client FirewallRulesClient) DeleteResponder(resp *http.Response) (result a return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a firewall rule. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. firewallRuleName is the name -// of the firewall rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// firewallRuleName - the name of the firewall rule. func (client FirewallRulesClient) Get(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string) (result FirewallRule, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, firewallRuleName) if err != nil { @@ -229,7 +221,6 @@ func (client FirewallRulesClient) Get(ctx context.Context, resourceGroupName str return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client FirewallRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, firewallRuleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -252,7 +243,6 @@ func (client FirewallRulesClient) GetPreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client FirewallRulesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -260,7 +250,6 @@ func (client FirewallRulesClient) GetSender(req *http.Request) (*http.Response, azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client FirewallRulesClient) GetResponder(resp *http.Response) (result FirewallRule, err error) { @@ -274,11 +263,11 @@ func (client FirewallRulesClient) GetResponder(resp *http.Response) (result Fire return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer returns a list of firewall rules. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client FirewallRulesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result FirewallRuleListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -301,7 +290,6 @@ func (client FirewallRulesClient) ListByServer(ctx context.Context, resourceGrou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client FirewallRulesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -323,7 +311,6 @@ func (client FirewallRulesClient) ListByServerPreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client FirewallRulesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -331,7 +318,6 @@ func (client FirewallRulesClient) ListByServerSender(req *http.Request) (*http.R azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client FirewallRulesClient) ListByServerResponder(resp *http.Response) (result FirewallRuleListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/geobackuppolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/geobackuppolicies.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/geobackuppolicies.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/geobackuppolicies.go index 83e4f2688266..3e4c95df43e2 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/geobackuppolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/geobackuppolicies.go @@ -25,7 +25,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GeoBackupPoliciesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -33,24 +32,23 @@ type GeoBackupPoliciesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewGeoBackupPoliciesClient creates an instance of the GeoBackupPoliciesClient client. func NewGeoBackupPoliciesClient(subscriptionID string) GeoBackupPoliciesClient { return NewGeoBackupPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewGeoBackupPoliciesClientWithBaseURI creates an instance of the GeoBackupPoliciesClient client. func NewGeoBackupPoliciesClientWithBaseURI(baseURI string, subscriptionID string) GeoBackupPoliciesClient { return GeoBackupPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate updates a database geo backup policy. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. parameters is the required parameters for creating or updating the geo backup policy. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. +// parameters - the required parameters for creating or updating the geo backup policy. func (client GeoBackupPoliciesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters GeoBackupPolicy) (result GeoBackupPolicy, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -79,7 +77,6 @@ func (client GeoBackupPoliciesClient) CreateOrUpdate(ctx context.Context, resour return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client GeoBackupPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters GeoBackupPolicy) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -105,7 +102,6 @@ func (client GeoBackupPoliciesClient) CreateOrUpdatePreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client GeoBackupPoliciesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -113,7 +109,6 @@ func (client GeoBackupPoliciesClient) CreateOrUpdateSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client GeoBackupPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result GeoBackupPolicy, err error) { @@ -127,12 +122,12 @@ func (client GeoBackupPoliciesClient) CreateOrUpdateResponder(resp *http.Respons return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a geo backup policy. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. func (client GeoBackupPoliciesClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result GeoBackupPolicy, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -155,7 +150,6 @@ func (client GeoBackupPoliciesClient) Get(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client GeoBackupPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -179,7 +173,6 @@ func (client GeoBackupPoliciesClient) GetPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client GeoBackupPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -187,7 +180,6 @@ func (client GeoBackupPoliciesClient) GetSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client GeoBackupPoliciesClient) GetResponder(resp *http.Response) (result GeoBackupPolicy, err error) { @@ -201,12 +193,12 @@ func (client GeoBackupPoliciesClient) GetResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase returns a list of geo backup policies. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database. func (client GeoBackupPoliciesClient) ListByDatabase(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result GeoBackupPolicyListResult, err error) { req, err := client.ListByDatabasePreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -229,7 +221,6 @@ func (client GeoBackupPoliciesClient) ListByDatabase(ctx context.Context, resour return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client GeoBackupPoliciesClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -252,7 +243,6 @@ func (client GeoBackupPoliciesClient) ListByDatabasePreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client GeoBackupPoliciesClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -260,7 +250,6 @@ func (client GeoBackupPoliciesClient) ListByDatabaseSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client GeoBackupPoliciesClient) ListByDatabaseResponder(resp *http.Response) (result GeoBackupPolicyListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/managedinstances.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/managedinstances.go new file mode 100644 index 000000000000..974afbfb3141 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/managedinstances.go @@ -0,0 +1,517 @@ +package sql + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// ManagedInstancesClient is the the Azure SQL Database management API provides a RESTful set of web services that +// interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, +// and delete databases. +type ManagedInstancesClient struct { + BaseClient +} + +// NewManagedInstancesClient creates an instance of the ManagedInstancesClient client. +func NewManagedInstancesClient(subscriptionID string) ManagedInstancesClient { + return NewManagedInstancesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewManagedInstancesClientWithBaseURI creates an instance of the ManagedInstancesClient client. +func NewManagedInstancesClientWithBaseURI(baseURI string, subscriptionID string) ManagedInstancesClient { + return ManagedInstancesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate creates or updates a managed instance. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// managedInstanceName - the name of the managed instance. +// parameters - the requested managed instance resource state. +func (client ManagedInstancesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, managedInstanceName string, parameters ManagedInstance) (result ManagedInstancesCreateOrUpdateFuture, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.Sku", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.Sku.Name", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil { + return result, validation.NewError("sql.ManagedInstancesClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, managedInstanceName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + result, err = client.CreateOrUpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "CreateOrUpdate", result.Response(), "Failure sending request") + return + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client ManagedInstancesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, managedInstanceName string, parameters ManagedInstance) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "managedInstanceName": autorest.Encode("path", managedInstanceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client ManagedInstancesClient) CreateOrUpdateSender(req *http.Request) (future ManagedInstancesCreateOrUpdateFuture, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + return +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client ManagedInstancesClient) CreateOrUpdateResponder(resp *http.Response) (result ManagedInstance, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes a managed instance. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// managedInstanceName - the name of the managed instance. +func (client ManagedInstancesClient) Delete(ctx context.Context, resourceGroupName string, managedInstanceName string) (result ManagedInstancesDeleteFuture, err error) { + req, err := client.DeletePreparer(ctx, resourceGroupName, managedInstanceName) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "Delete", nil, "Failure preparing request") + return + } + + result, err = client.DeleteSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "Delete", result.Response(), "Failure sending request") + return + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client ManagedInstancesClient) DeletePreparer(ctx context.Context, resourceGroupName string, managedInstanceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "managedInstanceName": autorest.Encode("path", managedInstanceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client ManagedInstancesClient) DeleteSender(req *http.Request) (future ManagedInstancesDeleteFuture, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + return +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client ManagedInstancesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get gets a managed instance. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// managedInstanceName - the name of the managed instance. +func (client ManagedInstancesClient) Get(ctx context.Context, resourceGroupName string, managedInstanceName string) (result ManagedInstance, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, managedInstanceName) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client ManagedInstancesClient) GetPreparer(ctx context.Context, resourceGroupName string, managedInstanceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "managedInstanceName": autorest.Encode("path", managedInstanceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client ManagedInstancesClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client ManagedInstancesClient) GetResponder(resp *http.Response) (result ManagedInstance, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// List gets a list of all managed instances in the subscription. +func (client ManagedInstancesClient) List(ctx context.Context) (result ManagedInstanceListResultPage, err error) { + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.milr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "List", resp, "Failure sending request") + return + } + + result.milr, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client ManagedInstancesClient) ListPreparer(ctx context.Context) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Sql/managedInstances", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client ManagedInstancesClient) ListSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client ManagedInstancesClient) ListResponder(resp *http.Response) (result ManagedInstanceListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client ManagedInstancesClient) listNextResults(lastResults ManagedInstanceListResult) (result ManagedInstanceListResult, err error) { + req, err := lastResults.managedInstanceListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client ManagedInstancesClient) ListComplete(ctx context.Context) (result ManagedInstanceListResultIterator, err error) { + result.page, err = client.List(ctx) + return +} + +// ListByResourceGroup gets a list of managed instances in a resource group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +func (client ManagedInstancesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ManagedInstanceListResultPage, err error) { + result.fn = client.listByResourceGroupNextResults + req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "ListByResourceGroup", nil, "Failure preparing request") + return + } + + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.milr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "ListByResourceGroup", resp, "Failure sending request") + return + } + + result.milr, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "ListByResourceGroup", resp, "Failure responding to request") + } + + return +} + +// ListByResourceGroupPreparer prepares the ListByResourceGroup request. +func (client ManagedInstancesClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the +// http.Response Body if it receives an error. +func (client ManagedInstancesClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always +// closes the http.Response Body. +func (client ManagedInstancesClient) ListByResourceGroupResponder(resp *http.Response) (result ManagedInstanceListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByResourceGroupNextResults retrieves the next set of results, if any. +func (client ManagedInstancesClient) listByResourceGroupNextResults(lastResults ManagedInstanceListResult) (result ManagedInstanceListResult, err error) { + req, err := lastResults.managedInstanceListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "listByResourceGroupNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. +func (client ManagedInstancesClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result ManagedInstanceListResultIterator, err error) { + result.page, err = client.ListByResourceGroup(ctx, resourceGroupName) + return +} + +// Update updates a managed instance. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// managedInstanceName - the name of the managed instance. +// parameters - the requested managed instance resource state. +func (client ManagedInstancesClient) Update(ctx context.Context, resourceGroupName string, managedInstanceName string, parameters ManagedInstanceUpdate) (result ManagedInstancesUpdateFuture, err error) { + req, err := client.UpdatePreparer(ctx, resourceGroupName, managedInstanceName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "Update", nil, "Failure preparing request") + return + } + + result, err = client.UpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesClient", "Update", result.Response(), "Failure sending request") + return + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client ManagedInstancesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, managedInstanceName string, parameters ManagedInstanceUpdate) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "managedInstanceName": autorest.Encode("path", managedInstanceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client ManagedInstancesClient) UpdateSender(req *http.Request) (future ManagedInstancesUpdateFuture, err error) { + sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) + future.Future = azure.NewFuture(req) + future.req = req + _, err = future.Done(sender) + if err != nil { + return + } + err = autorest.Respond(future.Response(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + return +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client ManagedInstancesClient) UpdateResponder(resp *http.Response) (result ManagedInstance, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/models.go similarity index 82% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/models.go index 595240bbddea..8e20a0065a76 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/models.go @@ -27,7 +27,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // AuthenticationType enumerates the values for authentication type. type AuthenticationType string @@ -38,13 +37,11 @@ const ( SQL AuthenticationType = "SQL" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleAuthenticationTypeValues returns an array of possible values for the AuthenticationType const type. func PossibleAuthenticationTypeValues() []AuthenticationType { return []AuthenticationType{ADPassword, SQL} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionPolicyState enumerates the values for backup long term retention policy state. type BackupLongTermRetentionPolicyState string @@ -55,13 +52,11 @@ const ( Enabled BackupLongTermRetentionPolicyState = "Enabled" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleBackupLongTermRetentionPolicyStateValues returns an array of possible values for the BackupLongTermRetentionPolicyState const type. func PossibleBackupLongTermRetentionPolicyStateValues() []BackupLongTermRetentionPolicyState { return []BackupLongTermRetentionPolicyState{Disabled, Enabled} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BlobAuditingPolicyState enumerates the values for blob auditing policy state. type BlobAuditingPolicyState string @@ -72,13 +67,11 @@ const ( BlobAuditingPolicyStateEnabled BlobAuditingPolicyState = "Enabled" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleBlobAuditingPolicyStateValues returns an array of possible values for the BlobAuditingPolicyState const type. func PossibleBlobAuditingPolicyStateValues() []BlobAuditingPolicyState { return []BlobAuditingPolicyState{BlobAuditingPolicyStateDisabled, BlobAuditingPolicyStateEnabled} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CapabilityStatus enumerates the values for capability status. type CapabilityStatus string @@ -93,13 +86,11 @@ const ( CapabilityStatusVisible CapabilityStatus = "Visible" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleCapabilityStatusValues returns an array of possible values for the CapabilityStatus const type. func PossibleCapabilityStatusValues() []CapabilityStatus { return []CapabilityStatus{CapabilityStatusAvailable, CapabilityStatusDefault, CapabilityStatusDisabled, CapabilityStatusVisible} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailabilityReason enumerates the values for check name availability reason. type CheckNameAvailabilityReason string @@ -110,13 +101,11 @@ const ( Invalid CheckNameAvailabilityReason = "Invalid" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleCheckNameAvailabilityReasonValues returns an array of possible values for the CheckNameAvailabilityReason const type. func PossibleCheckNameAvailabilityReasonValues() []CheckNameAvailabilityReason { return []CheckNameAvailabilityReason{AlreadyExists, Invalid} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateMode enumerates the values for create mode. type CreateMode string @@ -139,13 +128,11 @@ const ( RestoreLongTermRetentionBackup CreateMode = "RestoreLongTermRetentionBackup" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleCreateModeValues returns an array of possible values for the CreateMode const type. func PossibleCreateModeValues() []CreateMode { return []CreateMode{Copy, Default, NonReadableSecondary, OnlineSecondary, PointInTimeRestore, Recovery, Restore, RestoreLongTermRetentionBackup} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseEdition enumerates the values for database edition. type DatabaseEdition string @@ -174,13 +161,11 @@ const ( Web DatabaseEdition = "Web" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleDatabaseEditionValues returns an array of possible values for the DatabaseEdition const type. func PossibleDatabaseEditionValues() []DatabaseEdition { return []DatabaseEdition{Basic, Business, DataWarehouse, Free, Premium, PremiumRS, Standard, Stretch, System, System2, Web} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingFunction enumerates the values for data masking function. type DataMaskingFunction string @@ -199,13 +184,11 @@ const ( DataMaskingFunctionText DataMaskingFunction = "Text" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleDataMaskingFunctionValues returns an array of possible values for the DataMaskingFunction const type. func PossibleDataMaskingFunctionValues() []DataMaskingFunction { return []DataMaskingFunction{DataMaskingFunctionCCN, DataMaskingFunctionDefault, DataMaskingFunctionEmail, DataMaskingFunctionNumber, DataMaskingFunctionSSN, DataMaskingFunctionText} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingRuleState enumerates the values for data masking rule state. type DataMaskingRuleState string @@ -216,13 +199,11 @@ const ( DataMaskingRuleStateEnabled DataMaskingRuleState = "Enabled" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleDataMaskingRuleStateValues returns an array of possible values for the DataMaskingRuleState const type. func PossibleDataMaskingRuleStateValues() []DataMaskingRuleState { return []DataMaskingRuleState{DataMaskingRuleStateDisabled, DataMaskingRuleStateEnabled} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingState enumerates the values for data masking state. type DataMaskingState string @@ -233,13 +214,11 @@ const ( DataMaskingStateEnabled DataMaskingState = "Enabled" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleDataMaskingStateValues returns an array of possible values for the DataMaskingState const type. func PossibleDataMaskingStateValues() []DataMaskingState { return []DataMaskingState{DataMaskingStateDisabled, DataMaskingStateEnabled} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolEdition enumerates the values for elastic pool edition. type ElasticPoolEdition string @@ -252,13 +231,11 @@ const ( ElasticPoolEditionStandard ElasticPoolEdition = "Standard" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleElasticPoolEditionValues returns an array of possible values for the ElasticPoolEdition const type. func PossibleElasticPoolEditionValues() []ElasticPoolEdition { return []ElasticPoolEdition{ElasticPoolEditionBasic, ElasticPoolEditionPremium, ElasticPoolEditionStandard} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolState enumerates the values for elastic pool state. type ElasticPoolState string @@ -271,13 +248,11 @@ const ( ElasticPoolStateReady ElasticPoolState = "Ready" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleElasticPoolStateValues returns an array of possible values for the ElasticPoolState const type. func PossibleElasticPoolStateValues() []ElasticPoolState { return []ElasticPoolState{ElasticPoolStateCreating, ElasticPoolStateDisabled, ElasticPoolStateReady} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupReplicationRole enumerates the values for failover group replication role. type FailoverGroupReplicationRole string @@ -288,13 +263,11 @@ const ( Secondary FailoverGroupReplicationRole = "Secondary" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleFailoverGroupReplicationRoleValues returns an array of possible values for the FailoverGroupReplicationRole const type. func PossibleFailoverGroupReplicationRoleValues() []FailoverGroupReplicationRole { return []FailoverGroupReplicationRole{Primary, Secondary} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GeoBackupPolicyState enumerates the values for geo backup policy state. type GeoBackupPolicyState string @@ -305,13 +278,11 @@ const ( GeoBackupPolicyStateEnabled GeoBackupPolicyState = "Enabled" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleGeoBackupPolicyStateValues returns an array of possible values for the GeoBackupPolicyState const type. func PossibleGeoBackupPolicyStateValues() []GeoBackupPolicyState { return []GeoBackupPolicyState{GeoBackupPolicyStateDisabled, GeoBackupPolicyStateEnabled} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IdentityType enumerates the values for identity type. type IdentityType string @@ -320,13 +291,11 @@ const ( SystemAssigned IdentityType = "SystemAssigned" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleIdentityTypeValues returns an array of possible values for the IdentityType const type. func PossibleIdentityTypeValues() []IdentityType { return []IdentityType{SystemAssigned} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MaxSizeUnits enumerates the values for max size units. type MaxSizeUnits string @@ -341,13 +310,11 @@ const ( Terabytes MaxSizeUnits = "Terabytes" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleMaxSizeUnitsValues returns an array of possible values for the MaxSizeUnits const type. func PossibleMaxSizeUnitsValues() []MaxSizeUnits { return []MaxSizeUnits{Gigabytes, Megabytes, Petabytes, Terabytes} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationOrigin enumerates the values for operation origin. type OperationOrigin string @@ -358,13 +325,11 @@ const ( OperationOriginUser OperationOrigin = "user" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleOperationOriginValues returns an array of possible values for the OperationOrigin const type. func PossibleOperationOriginValues() []OperationOrigin { return []OperationOrigin{OperationOriginSystem, OperationOriginUser} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PerformanceLevelUnit enumerates the values for performance level unit. type PerformanceLevelUnit string @@ -373,13 +338,11 @@ const ( DTU PerformanceLevelUnit = "DTU" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossiblePerformanceLevelUnitValues returns an array of possible values for the PerformanceLevelUnit const type. func PossiblePerformanceLevelUnitValues() []PerformanceLevelUnit { return []PerformanceLevelUnit{DTU} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PrimaryAggregationType enumerates the values for primary aggregation type. type PrimaryAggregationType string @@ -398,13 +361,11 @@ const ( Total PrimaryAggregationType = "Total" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossiblePrimaryAggregationTypeValues returns an array of possible values for the PrimaryAggregationType const type. func PossiblePrimaryAggregationTypeValues() []PrimaryAggregationType { return []PrimaryAggregationType{Average, Count, Maximum, Minimum, None, Total} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReadOnlyEndpointFailoverPolicy enumerates the values for read only endpoint failover policy. type ReadOnlyEndpointFailoverPolicy string @@ -415,13 +376,11 @@ const ( ReadOnlyEndpointFailoverPolicyEnabled ReadOnlyEndpointFailoverPolicy = "Enabled" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleReadOnlyEndpointFailoverPolicyValues returns an array of possible values for the ReadOnlyEndpointFailoverPolicy const type. func PossibleReadOnlyEndpointFailoverPolicyValues() []ReadOnlyEndpointFailoverPolicy { return []ReadOnlyEndpointFailoverPolicy{ReadOnlyEndpointFailoverPolicyDisabled, ReadOnlyEndpointFailoverPolicyEnabled} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReadScale enumerates the values for read scale. type ReadScale string @@ -432,13 +391,11 @@ const ( ReadScaleEnabled ReadScale = "Enabled" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleReadScaleValues returns an array of possible values for the ReadScale const type. func PossibleReadScaleValues() []ReadScale { return []ReadScale{ReadScaleDisabled, ReadScaleEnabled} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReadWriteEndpointFailoverPolicy enumerates the values for read write endpoint failover policy. type ReadWriteEndpointFailoverPolicy string @@ -449,13 +406,11 @@ const ( Manual ReadWriteEndpointFailoverPolicy = "Manual" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleReadWriteEndpointFailoverPolicyValues returns an array of possible values for the ReadWriteEndpointFailoverPolicy const type. func PossibleReadWriteEndpointFailoverPolicyValues() []ReadWriteEndpointFailoverPolicy { return []ReadWriteEndpointFailoverPolicy{Automatic, Manual} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecommendedIndexAction enumerates the values for recommended index action. type RecommendedIndexAction string @@ -468,13 +423,11 @@ const ( Rebuild RecommendedIndexAction = "Rebuild" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleRecommendedIndexActionValues returns an array of possible values for the RecommendedIndexAction const type. func PossibleRecommendedIndexActionValues() []RecommendedIndexAction { return []RecommendedIndexAction{Create, Drop, Rebuild} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecommendedIndexState enumerates the values for recommended index state. type RecommendedIndexState string @@ -503,13 +456,11 @@ const ( Verifying RecommendedIndexState = "Verifying" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleRecommendedIndexStateValues returns an array of possible values for the RecommendedIndexState const type. func PossibleRecommendedIndexStateValues() []RecommendedIndexState { return []RecommendedIndexState{Active, Blocked, Executing, Expired, Ignored, Pending, PendingRevert, Reverted, Reverting, Success, Verifying} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecommendedIndexType enumerates the values for recommended index type. type RecommendedIndexType string @@ -524,13 +475,11 @@ const ( NONCLUSTERED RecommendedIndexType = "NONCLUSTERED" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleRecommendedIndexTypeValues returns an array of possible values for the RecommendedIndexType const type. func PossibleRecommendedIndexTypeValues() []RecommendedIndexType { return []RecommendedIndexType{CLUSTERED, CLUSTEREDCOLUMNSTORE, COLUMNSTORE, NONCLUSTERED} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationRole enumerates the values for replication role. type ReplicationRole string @@ -547,13 +496,11 @@ const ( ReplicationRoleSource ReplicationRole = "Source" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleReplicationRoleValues returns an array of possible values for the ReplicationRole const type. func PossibleReplicationRoleValues() []ReplicationRole { return []ReplicationRole{ReplicationRoleCopy, ReplicationRoleNonReadableSecondary, ReplicationRolePrimary, ReplicationRoleSecondary, ReplicationRoleSource} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationState enumerates the values for replication state. type ReplicationState string @@ -568,13 +515,11 @@ const ( SUSPENDED ReplicationState = "SUSPENDED" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleReplicationStateValues returns an array of possible values for the ReplicationState const type. func PossibleReplicationStateValues() []ReplicationState { return []ReplicationState{CATCHUP, PENDING, SEEDING, SUSPENDED} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorePointType enumerates the values for restore point type. type RestorePointType string @@ -585,13 +530,11 @@ const ( DISCRETE RestorePointType = "DISCRETE" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleRestorePointTypeValues returns an array of possible values for the RestorePointType const type. func PossibleRestorePointTypeValues() []RestorePointType { return []RestorePointType{CONTINUOUS, DISCRETE} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SampleName enumerates the values for sample name. type SampleName string @@ -600,13 +543,11 @@ const ( AdventureWorksLT SampleName = "AdventureWorksLT" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSampleNameValues returns an array of possible values for the SampleName const type. func PossibleSampleNameValues() []SampleName { return []SampleName{AdventureWorksLT} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SecurityAlertPolicyEmailAccountAdmins enumerates the values for security alert policy email account admins. type SecurityAlertPolicyEmailAccountAdmins string @@ -617,13 +558,11 @@ const ( SecurityAlertPolicyEmailAccountAdminsEnabled SecurityAlertPolicyEmailAccountAdmins = "Enabled" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSecurityAlertPolicyEmailAccountAdminsValues returns an array of possible values for the SecurityAlertPolicyEmailAccountAdmins const type. func PossibleSecurityAlertPolicyEmailAccountAdminsValues() []SecurityAlertPolicyEmailAccountAdmins { return []SecurityAlertPolicyEmailAccountAdmins{SecurityAlertPolicyEmailAccountAdminsDisabled, SecurityAlertPolicyEmailAccountAdminsEnabled} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SecurityAlertPolicyState enumerates the values for security alert policy state. type SecurityAlertPolicyState string @@ -636,13 +575,11 @@ const ( SecurityAlertPolicyStateNew SecurityAlertPolicyState = "New" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSecurityAlertPolicyStateValues returns an array of possible values for the SecurityAlertPolicyState const type. func PossibleSecurityAlertPolicyStateValues() []SecurityAlertPolicyState { return []SecurityAlertPolicyState{SecurityAlertPolicyStateDisabled, SecurityAlertPolicyStateEnabled, SecurityAlertPolicyStateNew} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SecurityAlertPolicyUseServerDefault enumerates the values for security alert policy use server default. type SecurityAlertPolicyUseServerDefault string @@ -653,13 +590,11 @@ const ( SecurityAlertPolicyUseServerDefaultEnabled SecurityAlertPolicyUseServerDefault = "Enabled" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSecurityAlertPolicyUseServerDefaultValues returns an array of possible values for the SecurityAlertPolicyUseServerDefault const type. func PossibleSecurityAlertPolicyUseServerDefaultValues() []SecurityAlertPolicyUseServerDefault { return []SecurityAlertPolicyUseServerDefault{SecurityAlertPolicyUseServerDefaultDisabled, SecurityAlertPolicyUseServerDefaultEnabled} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerConnectionType enumerates the values for server connection type. type ServerConnectionType string @@ -672,13 +607,11 @@ const ( ServerConnectionTypeRedirect ServerConnectionType = "Redirect" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleServerConnectionTypeValues returns an array of possible values for the ServerConnectionType const type. func PossibleServerConnectionTypeValues() []ServerConnectionType { return []ServerConnectionType{ServerConnectionTypeDefault, ServerConnectionTypeProxy, ServerConnectionTypeRedirect} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeyType enumerates the values for server key type. type ServerKeyType string @@ -689,13 +622,11 @@ const ( ServiceManaged ServerKeyType = "ServiceManaged" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleServerKeyTypeValues returns an array of possible values for the ServerKeyType const type. func PossibleServerKeyTypeValues() []ServerKeyType { return []ServerKeyType{AzureKeyVault, ServiceManaged} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceObjectiveName enumerates the values for service objective name. type ServiceObjectiveName string @@ -832,13 +763,11 @@ const ( ServiceObjectiveNameSystem4L ServiceObjectiveName = "System4L" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleServiceObjectiveNameValues returns an array of possible values for the ServiceObjectiveName const type. func PossibleServiceObjectiveNameValues() []ServiceObjectiveName { return []ServiceObjectiveName{ServiceObjectiveNameBasic, ServiceObjectiveNameDS100, ServiceObjectiveNameDS1000, ServiceObjectiveNameDS1200, ServiceObjectiveNameDS1500, ServiceObjectiveNameDS200, ServiceObjectiveNameDS2000, ServiceObjectiveNameDS300, ServiceObjectiveNameDS400, ServiceObjectiveNameDS500, ServiceObjectiveNameDS600, ServiceObjectiveNameDW100, ServiceObjectiveNameDW1000, ServiceObjectiveNameDW10000c, ServiceObjectiveNameDW1000c, ServiceObjectiveNameDW1200, ServiceObjectiveNameDW1500, ServiceObjectiveNameDW15000c, ServiceObjectiveNameDW1500c, ServiceObjectiveNameDW200, ServiceObjectiveNameDW2000, ServiceObjectiveNameDW2000c, ServiceObjectiveNameDW2500c, ServiceObjectiveNameDW300, ServiceObjectiveNameDW3000, ServiceObjectiveNameDW30000c, ServiceObjectiveNameDW3000c, ServiceObjectiveNameDW400, ServiceObjectiveNameDW500, ServiceObjectiveNameDW5000c, ServiceObjectiveNameDW600, ServiceObjectiveNameDW6000, ServiceObjectiveNameDW6000c, ServiceObjectiveNameDW7500c, ServiceObjectiveNameElasticPool, ServiceObjectiveNameFree, ServiceObjectiveNameP1, ServiceObjectiveNameP11, ServiceObjectiveNameP15, ServiceObjectiveNameP2, ServiceObjectiveNameP3, ServiceObjectiveNameP4, ServiceObjectiveNameP6, ServiceObjectiveNamePRS1, ServiceObjectiveNamePRS2, ServiceObjectiveNamePRS4, ServiceObjectiveNamePRS6, ServiceObjectiveNameS0, ServiceObjectiveNameS1, ServiceObjectiveNameS12, ServiceObjectiveNameS2, ServiceObjectiveNameS3, ServiceObjectiveNameS4, ServiceObjectiveNameS6, ServiceObjectiveNameS7, ServiceObjectiveNameS9, ServiceObjectiveNameSystem, ServiceObjectiveNameSystem0, ServiceObjectiveNameSystem1, ServiceObjectiveNameSystem2, ServiceObjectiveNameSystem2L, ServiceObjectiveNameSystem3, ServiceObjectiveNameSystem3L, ServiceObjectiveNameSystem4, ServiceObjectiveNameSystem4L} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // StorageKeyType enumerates the values for storage key type. type StorageKeyType string @@ -849,13 +778,11 @@ const ( StorageAccessKey StorageKeyType = "StorageAccessKey" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleStorageKeyTypeValues returns an array of possible values for the StorageKeyType const type. func PossibleStorageKeyTypeValues() []StorageKeyType { return []StorageKeyType{SharedAccessKey, StorageAccessKey} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentState enumerates the values for sync agent state. type SyncAgentState string @@ -868,13 +795,11 @@ const ( Online SyncAgentState = "Online" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncAgentStateValues returns an array of possible values for the SyncAgentState const type. func PossibleSyncAgentStateValues() []SyncAgentState { return []SyncAgentState{NeverConnected, Offline, Online} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncConflictResolutionPolicy enumerates the values for sync conflict resolution policy. type SyncConflictResolutionPolicy string @@ -885,13 +810,11 @@ const ( MemberWin SyncConflictResolutionPolicy = "MemberWin" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncConflictResolutionPolicyValues returns an array of possible values for the SyncConflictResolutionPolicy const type. func PossibleSyncConflictResolutionPolicyValues() []SyncConflictResolutionPolicy { return []SyncConflictResolutionPolicy{HubWin, MemberWin} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncDirection enumerates the values for sync direction. type SyncDirection string @@ -904,13 +827,11 @@ const ( OneWayMemberToHub SyncDirection = "OneWayMemberToHub" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncDirectionValues returns an array of possible values for the SyncDirection const type. func PossibleSyncDirectionValues() []SyncDirection { return []SyncDirection{Bidirectional, OneWayHubToMember, OneWayMemberToHub} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupLogType enumerates the values for sync group log type. type SyncGroupLogType string @@ -925,13 +846,11 @@ const ( SyncGroupLogTypeWarning SyncGroupLogType = "Warning" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncGroupLogTypeValues returns an array of possible values for the SyncGroupLogType const type. func PossibleSyncGroupLogTypeValues() []SyncGroupLogType { return []SyncGroupLogType{SyncGroupLogTypeAll, SyncGroupLogTypeError, SyncGroupLogTypeSuccess, SyncGroupLogTypeWarning} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupState enumerates the values for sync group state. type SyncGroupState string @@ -948,13 +867,11 @@ const ( Warning SyncGroupState = "Warning" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncGroupStateValues returns an array of possible values for the SyncGroupState const type. func PossibleSyncGroupStateValues() []SyncGroupState { return []SyncGroupState{Error, Good, NotReady, Progressing, Warning} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMemberDbType enumerates the values for sync member db type. type SyncMemberDbType string @@ -965,13 +882,11 @@ const ( SQLServerDatabase SyncMemberDbType = "SqlServerDatabase" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncMemberDbTypeValues returns an array of possible values for the SyncMemberDbType const type. func PossibleSyncMemberDbTypeValues() []SyncMemberDbType { return []SyncMemberDbType{AzureSQLDatabase, SQLServerDatabase} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMemberState enumerates the values for sync member state. type SyncMemberState string @@ -1014,13 +929,11 @@ const ( UnReprovisioned SyncMemberState = "UnReprovisioned" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleSyncMemberStateValues returns an array of possible values for the SyncMemberState const type. func PossibleSyncMemberStateValues() []SyncMemberState { return []SyncMemberState{DeProvisioned, DeProvisionFailed, DeProvisioning, DisabledBackupRestore, DisabledTombstoneCleanup, Provisioned, ProvisionFailed, Provisioning, ReprovisionFailed, Reprovisioning, SyncCancelled, SyncCancelling, SyncFailed, SyncInProgress, SyncSucceeded, SyncSucceededWithWarnings, UnProvisioned, UnReprovisioned} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionActivityStatus enumerates the values for transparent data encryption activity // status. type TransparentDataEncryptionActivityStatus string @@ -1032,13 +945,11 @@ const ( Encrypting TransparentDataEncryptionActivityStatus = "Encrypting" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleTransparentDataEncryptionActivityStatusValues returns an array of possible values for the TransparentDataEncryptionActivityStatus const type. func PossibleTransparentDataEncryptionActivityStatusValues() []TransparentDataEncryptionActivityStatus { return []TransparentDataEncryptionActivityStatus{Decrypting, Encrypting} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionStatus enumerates the values for transparent data encryption status. type TransparentDataEncryptionStatus string @@ -1049,13 +960,11 @@ const ( TransparentDataEncryptionStatusEnabled TransparentDataEncryptionStatus = "Enabled" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleTransparentDataEncryptionStatusValues returns an array of possible values for the TransparentDataEncryptionStatus const type. func PossibleTransparentDataEncryptionStatusValues() []TransparentDataEncryptionStatus { return []TransparentDataEncryptionStatus{TransparentDataEncryptionStatusDisabled, TransparentDataEncryptionStatusEnabled} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnitDefinitionType enumerates the values for unit definition type. type UnitDefinitionType string @@ -1074,13 +983,11 @@ const ( UnitDefinitionTypeSeconds UnitDefinitionType = "Seconds" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleUnitDefinitionTypeValues returns an array of possible values for the UnitDefinitionType const type. func PossibleUnitDefinitionTypeValues() []UnitDefinitionType { return []UnitDefinitionType{UnitDefinitionTypeBytes, UnitDefinitionTypeBytesPerSecond, UnitDefinitionTypeCount, UnitDefinitionTypeCountPerSecond, UnitDefinitionTypePercent, UnitDefinitionTypeSeconds} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnitType enumerates the values for unit type. type UnitType string @@ -1099,13 +1006,11 @@ const ( UnitTypeSeconds UnitType = "seconds" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleUnitTypeValues returns an array of possible values for the UnitType const type. func PossibleUnitTypeValues() []UnitType { return []UnitType{UnitTypeBytes, UnitTypeBytesPerSecond, UnitTypeCount, UnitTypeCountPerSecond, UnitTypePercent, UnitTypeSeconds} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRuleState enumerates the values for virtual network rule state. type VirtualNetworkRuleState string @@ -1122,13 +1027,11 @@ const ( Unknown VirtualNetworkRuleState = "Unknown" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PossibleVirtualNetworkRuleStateValues returns an array of possible values for the VirtualNetworkRuleState const type. func PossibleVirtualNetworkRuleStateValues() []VirtualNetworkRuleState { return []VirtualNetworkRuleState{Deleting, Initializing, InProgress, Ready, Unknown} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionPoliciesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of // a long-running operation. type BackupLongTermRetentionPoliciesCreateOrUpdateFuture struct { @@ -1136,7 +1039,6 @@ type BackupLongTermRetentionPoliciesCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future BackupLongTermRetentionPoliciesCreateOrUpdateFuture) Result(client BackupLongTermRetentionPoliciesClient) (bltrp BackupLongTermRetentionPolicy, err error) { @@ -1179,7 +1081,6 @@ func (future BackupLongTermRetentionPoliciesCreateOrUpdateFuture) Result(client return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionPolicy a backup long term retention policy type BackupLongTermRetentionPolicy struct { autorest.Response `json:"-"` @@ -1195,7 +1096,6 @@ type BackupLongTermRetentionPolicy struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for BackupLongTermRetentionPolicy. func (bltrp BackupLongTermRetentionPolicy) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1217,7 +1117,6 @@ func (bltrp BackupLongTermRetentionPolicy) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for BackupLongTermRetentionPolicy struct. func (bltrp *BackupLongTermRetentionPolicy) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1278,7 +1177,6 @@ func (bltrp *BackupLongTermRetentionPolicy) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionPolicyListResult represents the response to a list long-term retention policies request. type BackupLongTermRetentionPolicyListResult struct { autorest.Response `json:"-"` @@ -1286,7 +1184,6 @@ type BackupLongTermRetentionPolicyListResult struct { Value *[]BackupLongTermRetentionPolicy `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionPolicyProperties the properties of a backup long term retention policy type BackupLongTermRetentionPolicyProperties struct { // State - The status of the backup long term retention policy. Possible values include: 'Disabled', 'Enabled' @@ -1295,7 +1192,6 @@ type BackupLongTermRetentionPolicyProperties struct { RecoveryServicesBackupPolicyResourceID *string `json:"recoveryServicesBackupPolicyResourceId,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionVault a backup long term retention vault type BackupLongTermRetentionVault struct { autorest.Response `json:"-"` @@ -1311,7 +1207,6 @@ type BackupLongTermRetentionVault struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for BackupLongTermRetentionVault. func (bltrv BackupLongTermRetentionVault) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1333,7 +1228,6 @@ func (bltrv BackupLongTermRetentionVault) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for BackupLongTermRetentionVault struct. func (bltrv *BackupLongTermRetentionVault) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1394,7 +1288,6 @@ func (bltrv *BackupLongTermRetentionVault) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionVaultListResult represents the response to a list vaults request. type BackupLongTermRetentionVaultListResult struct { autorest.Response `json:"-"` @@ -1402,14 +1295,12 @@ type BackupLongTermRetentionVaultListResult struct { Value *[]BackupLongTermRetentionVault `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionVaultProperties the properties of a backup long term retention vault. type BackupLongTermRetentionVaultProperties struct { // RecoveryServicesVaultResourceID - The azure recovery services vault resource id RecoveryServicesVaultResourceID *string `json:"recoveryServicesVaultResourceId,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // BackupLongTermRetentionVaultsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type BackupLongTermRetentionVaultsCreateOrUpdateFuture struct { @@ -1417,7 +1308,6 @@ type BackupLongTermRetentionVaultsCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future BackupLongTermRetentionVaultsCreateOrUpdateFuture) Result(client BackupLongTermRetentionVaultsClient) (bltrv BackupLongTermRetentionVault, err error) { @@ -1460,7 +1350,6 @@ func (future BackupLongTermRetentionVaultsCreateOrUpdateFuture) Result(client Ba return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailabilityRequest a request to check whether the specified name for a resource is available. type CheckNameAvailabilityRequest struct { // Name - The name whose availability is to be checked. @@ -1469,7 +1358,6 @@ type CheckNameAvailabilityRequest struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailabilityResponse a response indicating whether the specified name for a resource is available. type CheckNameAvailabilityResponse struct { autorest.Response `json:"-"` @@ -1483,7 +1371,6 @@ type CheckNameAvailabilityResponse struct { Reason CheckNameAvailabilityReason `json:"reason,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Database represents a database. type Database struct { autorest.Response `json:"-"` @@ -1503,7 +1390,6 @@ type Database struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for Database. func (d Database) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1531,7 +1417,6 @@ func (d Database) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for Database struct. func (d *Database) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1610,7 +1495,6 @@ func (d *Database) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseBlobAuditingPolicy a database blob auditing policy. type DatabaseBlobAuditingPolicy struct { autorest.Response `json:"-"` @@ -1626,7 +1510,6 @@ type DatabaseBlobAuditingPolicy struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for DatabaseBlobAuditingPolicy. func (dbap DatabaseBlobAuditingPolicy) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1648,7 +1531,6 @@ func (dbap DatabaseBlobAuditingPolicy) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for DatabaseBlobAuditingPolicy struct. func (dbap *DatabaseBlobAuditingPolicy) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -1709,7 +1591,6 @@ func (dbap *DatabaseBlobAuditingPolicy) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseBlobAuditingPolicyProperties properties of a database blob auditing policy. type DatabaseBlobAuditingPolicyProperties struct { // State - Specifies the state of the policy. If state is Enabled, storageEndpoint and storageAccountAccessKey are required. Possible values include: 'BlobAuditingPolicyStateEnabled', 'BlobAuditingPolicyStateDisabled' @@ -1728,7 +1609,6 @@ type DatabaseBlobAuditingPolicyProperties struct { IsStorageSecondaryKeyInUse *bool `json:"isStorageSecondaryKeyInUse,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseListResult represents the response to a list database request. type DatabaseListResult struct { autorest.Response `json:"-"` @@ -1736,7 +1616,6 @@ type DatabaseListResult struct { Value *[]Database `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseProperties represents the properties of a database. type DatabaseProperties struct { // Collation - The collation of the database. If createMode is not Default, this value is ignored. @@ -1801,7 +1680,6 @@ type DatabaseProperties struct { ZoneRedundant *bool `json:"zoneRedundant,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesCreateImportOperationFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type DatabasesCreateImportOperationFuture struct { @@ -1809,7 +1687,6 @@ type DatabasesCreateImportOperationFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesCreateImportOperationFuture) Result(client DatabasesClient) (ier ImportExportResponse, err error) { @@ -1852,7 +1729,6 @@ func (future DatabasesCreateImportOperationFuture) Result(client DatabasesClient return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type DatabasesCreateOrUpdateFuture struct { @@ -1860,7 +1736,6 @@ type DatabasesCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Database, err error) { @@ -1903,7 +1778,6 @@ func (future DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Da return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseSecurityAlertPolicy contains information about a database Threat Detection policy. type DatabaseSecurityAlertPolicy struct { autorest.Response `json:"-"` @@ -1921,7 +1795,6 @@ type DatabaseSecurityAlertPolicy struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for DatabaseSecurityAlertPolicy. func (dsap DatabaseSecurityAlertPolicy) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -1946,7 +1819,6 @@ func (dsap DatabaseSecurityAlertPolicy) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for DatabaseSecurityAlertPolicy struct. func (dsap *DatabaseSecurityAlertPolicy) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2016,7 +1888,6 @@ func (dsap *DatabaseSecurityAlertPolicy) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseSecurityAlertPolicyProperties properties for a database Threat Detection policy. type DatabaseSecurityAlertPolicyProperties struct { // State - Specifies the state of the policy. If state is Enabled, storageEndpoint and storageAccountAccessKey are required. Possible values include: 'SecurityAlertPolicyStateNew', 'SecurityAlertPolicyStateEnabled', 'SecurityAlertPolicyStateDisabled' @@ -2037,14 +1908,12 @@ type DatabaseSecurityAlertPolicyProperties struct { UseServerDefault SecurityAlertPolicyUseServerDefault `json:"useServerDefault,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesExportFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesExportFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesExportFuture) Result(client DatabasesClient) (ier ImportExportResponse, err error) { @@ -2087,14 +1956,12 @@ func (future DatabasesExportFuture) Result(client DatabasesClient) (ier ImportEx return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesImportFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesImportFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesImportFuture) Result(client DatabasesClient) (ier ImportExportResponse, err error) { @@ -2137,14 +2004,12 @@ func (future DatabasesImportFuture) Result(client DatabasesClient) (ier ImportEx return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesPauseFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesPauseFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesPauseFuture) Result(client DatabasesClient) (ar autorest.Response, err error) { @@ -2187,14 +2052,12 @@ func (future DatabasesPauseFuture) Result(client DatabasesClient) (ar autorest.R return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesResumeFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesResumeFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesResumeFuture) Result(client DatabasesClient) (ar autorest.Response, err error) { @@ -2237,14 +2100,12 @@ func (future DatabasesResumeFuture) Result(client DatabasesClient) (ar autorest. return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabasesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesUpdateFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future DatabasesUpdateFuture) Result(client DatabasesClient) (d Database, err error) { @@ -2287,7 +2148,6 @@ func (future DatabasesUpdateFuture) Result(client DatabasesClient) (d Database, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseUpdate represents a database update. type DatabaseUpdate struct { // Tags - Resource tags. @@ -2302,7 +2162,6 @@ type DatabaseUpdate struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for DatabaseUpdate. func (du DatabaseUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2324,7 +2183,6 @@ func (du DatabaseUpdate) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for DatabaseUpdate struct. func (du *DatabaseUpdate) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2385,7 +2243,6 @@ func (du *DatabaseUpdate) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseUsage the database usages. type DatabaseUsage struct { // Name - The name of the usage metric. @@ -2404,7 +2261,6 @@ type DatabaseUsage struct { NextResetTime *date.Time `json:"nextResetTime,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DatabaseUsageListResult the response to a list database metrics request. type DatabaseUsageListResult struct { autorest.Response `json:"-"` @@ -2412,7 +2268,6 @@ type DatabaseUsageListResult struct { Value *[]DatabaseUsage `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingPolicy represents a database data masking policy. type DataMaskingPolicy struct { autorest.Response `json:"-"` @@ -2430,7 +2285,6 @@ type DataMaskingPolicy struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for DataMaskingPolicy. func (dmp DataMaskingPolicy) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2455,7 +2309,6 @@ func (dmp DataMaskingPolicy) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for DataMaskingPolicy struct. func (dmp *DataMaskingPolicy) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2525,7 +2378,6 @@ func (dmp *DataMaskingPolicy) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingPolicyProperties the properties of a database data masking policy. type DataMaskingPolicyProperties struct { // DataMaskingState - The state of the data masking policy. Possible values include: 'DataMaskingStateDisabled', 'DataMaskingStateEnabled' @@ -2538,7 +2390,6 @@ type DataMaskingPolicyProperties struct { MaskingLevel *string `json:"maskingLevel,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingRule represents a database data masking rule. type DataMaskingRule struct { autorest.Response `json:"-"` @@ -2556,7 +2407,6 @@ type DataMaskingRule struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for DataMaskingRule. func (dmr DataMaskingRule) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2581,7 +2431,6 @@ func (dmr DataMaskingRule) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for DataMaskingRule struct. func (dmr *DataMaskingRule) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2651,7 +2500,6 @@ func (dmr *DataMaskingRule) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingRuleListResult the response to a list data masking rules request. type DataMaskingRuleListResult struct { autorest.Response `json:"-"` @@ -2659,7 +2507,6 @@ type DataMaskingRuleListResult struct { Value *[]DataMaskingRule `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DataMaskingRuleProperties the properties of a database data masking rule. type DataMaskingRuleProperties struct { // ID - The rule Id. @@ -2688,7 +2535,6 @@ type DataMaskingRuleProperties struct { ReplacementString *string `json:"replacementString,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EditionCapability the edition capability. type EditionCapability struct { // Name - The database edition name. @@ -2701,7 +2547,6 @@ type EditionCapability struct { Reason *string `json:"reason,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPool represents a database elastic pool. type ElasticPool struct { autorest.Response `json:"-"` @@ -2721,7 +2566,6 @@ type ElasticPool struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ElasticPool. func (ep ElasticPool) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2749,7 +2593,6 @@ func (ep ElasticPool) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ElasticPool struct. func (ep *ElasticPool) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2828,7 +2671,6 @@ func (ep *ElasticPool) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolActivity represents the activity on an elastic pool. type ElasticPoolActivity struct { // Location - The geo-location where the resource lives @@ -2843,7 +2685,6 @@ type ElasticPoolActivity struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ElasticPoolActivity. func (epa ElasticPoolActivity) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -2865,7 +2706,6 @@ func (epa ElasticPoolActivity) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ElasticPoolActivity struct. func (epa *ElasticPoolActivity) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -2926,7 +2766,6 @@ func (epa *ElasticPoolActivity) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolActivityListResult represents the response to a list elastic pool activity request. type ElasticPoolActivityListResult struct { autorest.Response `json:"-"` @@ -2934,7 +2773,6 @@ type ElasticPoolActivityListResult struct { Value *[]ElasticPoolActivity `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolActivityProperties represents the properties of an elastic pool. type ElasticPoolActivityProperties struct { // EndTime - The time the operation finished (ISO8601 format). @@ -2979,7 +2817,6 @@ type ElasticPoolActivityProperties struct { RequestedDtuGuarantee *int32 `json:"requestedDtuGuarantee,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolDatabaseActivity represents the activity on an elastic pool. type ElasticPoolDatabaseActivity struct { // Location - The geo-location where the resource lives @@ -2994,7 +2831,6 @@ type ElasticPoolDatabaseActivity struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ElasticPoolDatabaseActivity. func (epda ElasticPoolDatabaseActivity) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -3016,7 +2852,6 @@ func (epda ElasticPoolDatabaseActivity) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ElasticPoolDatabaseActivity struct. func (epda *ElasticPoolDatabaseActivity) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -3077,7 +2912,6 @@ func (epda *ElasticPoolDatabaseActivity) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolDatabaseActivityListResult represents the response to a list elastic pool database activity request. type ElasticPoolDatabaseActivityListResult struct { autorest.Response `json:"-"` @@ -3085,7 +2919,6 @@ type ElasticPoolDatabaseActivityListResult struct { Value *[]ElasticPoolDatabaseActivity `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolDatabaseActivityProperties represents the properties of an elastic pool database activity. type ElasticPoolDatabaseActivityProperties struct { // DatabaseName - The database name. @@ -3120,7 +2953,6 @@ type ElasticPoolDatabaseActivityProperties struct { State *string `json:"state,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolDtuCapability the Elastic Pool DTU capability. type ElasticPoolDtuCapability struct { // Limit - The DTU limit for the pool. @@ -3141,7 +2973,6 @@ type ElasticPoolDtuCapability struct { Reason *string `json:"reason,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolEditionCapability the elastic pool edition capability. type ElasticPoolEditionCapability struct { // Name - The elastic pool edition name. @@ -3154,7 +2985,6 @@ type ElasticPoolEditionCapability struct { Reason *string `json:"reason,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolListResult represents the response to a list elastic pool request. type ElasticPoolListResult struct { autorest.Response `json:"-"` @@ -3162,7 +2992,6 @@ type ElasticPoolListResult struct { Value *[]ElasticPool `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolPerDatabaseMaxDtuCapability the max per-database DTU capability. type ElasticPoolPerDatabaseMaxDtuCapability struct { // Limit - The maximum DTUs per database. @@ -3175,7 +3004,6 @@ type ElasticPoolPerDatabaseMaxDtuCapability struct { Reason *string `json:"reason,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolPerDatabaseMinDtuCapability the minimum per-database DTU capability. type ElasticPoolPerDatabaseMinDtuCapability struct { // Limit - The minimum DTUs per database. @@ -3186,7 +3014,6 @@ type ElasticPoolPerDatabaseMinDtuCapability struct { Reason *string `json:"reason,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolProperties represents the properties of an elastic pool. type ElasticPoolProperties struct { // CreationDate - The creation date of the elastic pool (ISO8601 format). @@ -3207,7 +3034,6 @@ type ElasticPoolProperties struct { ZoneRedundant *bool `json:"zoneRedundant,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ElasticPoolsCreateOrUpdateFuture struct { @@ -3215,7 +3041,6 @@ type ElasticPoolsCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ElasticPoolsCreateOrUpdateFuture) Result(client ElasticPoolsClient) (ep ElasticPool, err error) { @@ -3258,14 +3083,12 @@ func (future ElasticPoolsCreateOrUpdateFuture) Result(client ElasticPoolsClient) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ElasticPoolsUpdateFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ElasticPoolsUpdateFuture) Result(client ElasticPoolsClient) (ep ElasticPool, err error) { @@ -3308,7 +3131,6 @@ func (future ElasticPoolsUpdateFuture) Result(client ElasticPoolsClient) (ep Ela return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ElasticPoolUpdate represents an elastic pool update. type ElasticPoolUpdate struct { // Tags - Resource tags. @@ -3323,7 +3145,6 @@ type ElasticPoolUpdate struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ElasticPoolUpdate. func (epu ElasticPoolUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -3345,7 +3166,6 @@ func (epu ElasticPoolUpdate) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ElasticPoolUpdate struct. func (epu *ElasticPoolUpdate) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -3406,7 +3226,6 @@ func (epu *ElasticPoolUpdate) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtector the server encryption protector. type EncryptionProtector struct { autorest.Response `json:"-"` @@ -3424,7 +3243,6 @@ type EncryptionProtector struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for EncryptionProtector. func (ep EncryptionProtector) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -3449,7 +3267,6 @@ func (ep EncryptionProtector) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for EncryptionProtector struct. func (ep *EncryptionProtector) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -3519,7 +3336,6 @@ func (ep *EncryptionProtector) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtectorListResult a list of server encryption protectors. type EncryptionProtectorListResult struct { autorest.Response `json:"-"` @@ -3529,14 +3345,12 @@ type EncryptionProtectorListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtectorListResultIterator provides access to a complete listing of EncryptionProtector values. type EncryptionProtectorListResultIterator struct { i int page EncryptionProtectorListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *EncryptionProtectorListResultIterator) Next() error { @@ -3553,19 +3367,16 @@ func (iter *EncryptionProtectorListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter EncryptionProtectorListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter EncryptionProtectorListResultIterator) Response() EncryptionProtectorListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter EncryptionProtectorListResultIterator) Value() EncryptionProtector { @@ -3575,7 +3386,6 @@ func (iter EncryptionProtectorListResultIterator) Value() EncryptionProtector { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (eplr EncryptionProtectorListResult) IsEmpty() bool { return eplr.Value == nil || len(*eplr.Value) == 0 @@ -3593,14 +3403,12 @@ func (eplr EncryptionProtectorListResult) encryptionProtectorListResultPreparer( autorest.WithBaseURL(to.String(eplr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtectorListResultPage contains a page of EncryptionProtector values. type EncryptionProtectorListResultPage struct { fn func(EncryptionProtectorListResult) (EncryptionProtectorListResult, error) eplr EncryptionProtectorListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *EncryptionProtectorListResultPage) Next() error { @@ -3612,19 +3420,16 @@ func (page *EncryptionProtectorListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page EncryptionProtectorListResultPage) NotDone() bool { return !page.eplr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page EncryptionProtectorListResultPage) Response() EncryptionProtectorListResult { return page.eplr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page EncryptionProtectorListResultPage) Values() []EncryptionProtector { if page.eplr.IsEmpty() { @@ -3633,7 +3438,6 @@ func (page EncryptionProtectorListResultPage) Values() []EncryptionProtector { return *page.eplr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtectorProperties properties for an encryption protector execution. type EncryptionProtectorProperties struct { // Subregion - Subregion of the encryption protector. @@ -3648,7 +3452,6 @@ type EncryptionProtectorProperties struct { Thumbprint *string `json:"thumbprint,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // EncryptionProtectorsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type EncryptionProtectorsCreateOrUpdateFuture struct { @@ -3656,7 +3459,6 @@ type EncryptionProtectorsCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future EncryptionProtectorsCreateOrUpdateFuture) Result(client EncryptionProtectorsClient) (ep EncryptionProtector, err error) { @@ -3699,7 +3501,6 @@ func (future EncryptionProtectorsCreateOrUpdateFuture) Result(client EncryptionP return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ExportRequest export database parameters. type ExportRequest struct { // StorageKeyType - The type of the storage key to use. Possible values include: 'StorageAccessKey', 'SharedAccessKey' @@ -3716,7 +3517,6 @@ type ExportRequest struct { AuthenticationType AuthenticationType `json:"authenticationType,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroup a failover group. type FailoverGroup struct { autorest.Response `json:"-"` @@ -3734,7 +3534,6 @@ type FailoverGroup struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for FailoverGroup. func (fg FailoverGroup) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -3759,7 +3558,6 @@ func (fg FailoverGroup) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for FailoverGroup struct. func (fg *FailoverGroup) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -3829,7 +3627,6 @@ func (fg *FailoverGroup) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupListResult a list of failover groups. type FailoverGroupListResult struct { autorest.Response `json:"-"` @@ -3839,14 +3636,12 @@ type FailoverGroupListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupListResultIterator provides access to a complete listing of FailoverGroup values. type FailoverGroupListResultIterator struct { i int page FailoverGroupListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *FailoverGroupListResultIterator) Next() error { @@ -3863,19 +3658,16 @@ func (iter *FailoverGroupListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter FailoverGroupListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter FailoverGroupListResultIterator) Response() FailoverGroupListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter FailoverGroupListResultIterator) Value() FailoverGroup { @@ -3885,7 +3677,6 @@ func (iter FailoverGroupListResultIterator) Value() FailoverGroup { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (fglr FailoverGroupListResult) IsEmpty() bool { return fglr.Value == nil || len(*fglr.Value) == 0 @@ -3903,14 +3694,12 @@ func (fglr FailoverGroupListResult) failoverGroupListResultPreparer() (*http.Req autorest.WithBaseURL(to.String(fglr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupListResultPage contains a page of FailoverGroup values. type FailoverGroupListResultPage struct { fn func(FailoverGroupListResult) (FailoverGroupListResult, error) fglr FailoverGroupListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *FailoverGroupListResultPage) Next() error { @@ -3922,19 +3711,16 @@ func (page *FailoverGroupListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page FailoverGroupListResultPage) NotDone() bool { return !page.fglr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page FailoverGroupListResultPage) Response() FailoverGroupListResult { return page.fglr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page FailoverGroupListResultPage) Values() []FailoverGroup { if page.fglr.IsEmpty() { @@ -3943,7 +3729,6 @@ func (page FailoverGroupListResultPage) Values() []FailoverGroup { return *page.fglr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupProperties properties of a failover group. type FailoverGroupProperties struct { // ReadWriteEndpoint - Read-write endpoint of the failover group instance. @@ -3960,14 +3745,12 @@ type FailoverGroupProperties struct { Databases *[]string `json:"databases,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupReadOnlyEndpoint read-only endpoint of the failover group instance. type FailoverGroupReadOnlyEndpoint struct { // FailoverPolicy - Failover policy of the read-only endpoint for the failover group. Possible values include: 'ReadOnlyEndpointFailoverPolicyDisabled', 'ReadOnlyEndpointFailoverPolicyEnabled' FailoverPolicy ReadOnlyEndpointFailoverPolicy `json:"failoverPolicy,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupReadWriteEndpoint read-write endpoint of the failover group instance. type FailoverGroupReadWriteEndpoint struct { // FailoverPolicy - Failover policy of the read-write endpoint for the failover group. If failoverPolicy is Automatic then failoverWithDataLossGracePeriodMinutes is required. Possible values include: 'Manual', 'Automatic' @@ -3976,7 +3759,6 @@ type FailoverGroupReadWriteEndpoint struct { FailoverWithDataLossGracePeriodMinutes *int32 `json:"failoverWithDataLossGracePeriodMinutes,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type FailoverGroupsCreateOrUpdateFuture struct { @@ -3984,7 +3766,6 @@ type FailoverGroupsCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future FailoverGroupsCreateOrUpdateFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { @@ -4027,14 +3808,12 @@ func (future FailoverGroupsCreateOrUpdateFuture) Result(client FailoverGroupsCli return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type FailoverGroupsDeleteFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future FailoverGroupsDeleteFuture) Result(client FailoverGroupsClient) (ar autorest.Response, err error) { @@ -4077,7 +3856,6 @@ func (future FailoverGroupsDeleteFuture) Result(client FailoverGroupsClient) (ar return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupsFailoverFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type FailoverGroupsFailoverFuture struct { @@ -4085,7 +3863,6 @@ type FailoverGroupsFailoverFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future FailoverGroupsFailoverFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { @@ -4128,7 +3905,6 @@ func (future FailoverGroupsFailoverFuture) Result(client FailoverGroupsClient) ( return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupsForceFailoverAllowDataLossFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type FailoverGroupsForceFailoverAllowDataLossFuture struct { @@ -4136,7 +3912,6 @@ type FailoverGroupsForceFailoverAllowDataLossFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future FailoverGroupsForceFailoverAllowDataLossFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { @@ -4179,14 +3954,12 @@ func (future FailoverGroupsForceFailoverAllowDataLossFuture) Result(client Failo return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type FailoverGroupsUpdateFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future FailoverGroupsUpdateFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { @@ -4229,7 +4002,6 @@ func (future FailoverGroupsUpdateFuture) Result(client FailoverGroupsClient) (fg return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupUpdate a failover group update request. type FailoverGroupUpdate struct { // FailoverGroupUpdateProperties - Resource properties. @@ -4238,7 +4010,6 @@ type FailoverGroupUpdate struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for FailoverGroupUpdate. func (fgu FailoverGroupUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4251,7 +4022,6 @@ func (fgu FailoverGroupUpdate) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for FailoverGroupUpdate struct. func (fgu *FailoverGroupUpdate) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -4285,7 +4055,6 @@ func (fgu *FailoverGroupUpdate) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverGroupUpdateProperties properties of a failover group update. type FailoverGroupUpdateProperties struct { // ReadWriteEndpoint - Read-write endpoint of the failover group instance. @@ -4296,7 +4065,6 @@ type FailoverGroupUpdateProperties struct { Databases *[]string `json:"databases,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FirewallRule represents a server firewall rule. type FirewallRule struct { autorest.Response `json:"-"` @@ -4314,7 +4082,6 @@ type FirewallRule struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for FirewallRule. func (fr FirewallRule) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4339,7 +4106,6 @@ func (fr FirewallRule) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for FirewallRule struct. func (fr *FirewallRule) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -4409,7 +4175,6 @@ func (fr *FirewallRule) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FirewallRuleListResult represents the response to a List Firewall Rules request. type FirewallRuleListResult struct { autorest.Response `json:"-"` @@ -4417,7 +4182,6 @@ type FirewallRuleListResult struct { Value *[]FirewallRule `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FirewallRuleProperties represents the properties of a server firewall rule. type FirewallRuleProperties struct { // StartIPAddress - The start IP address of the firewall rule. Must be IPv4 format. Use value '0.0.0.0' to represent all Azure-internal IP addresses. @@ -4426,7 +4190,6 @@ type FirewallRuleProperties struct { EndIPAddress *string `json:"endIpAddress,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GeoBackupPolicy a database geo backup policy. type GeoBackupPolicy struct { autorest.Response `json:"-"` @@ -4444,7 +4207,6 @@ type GeoBackupPolicy struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for GeoBackupPolicy. func (gbp GeoBackupPolicy) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4469,7 +4231,6 @@ func (gbp GeoBackupPolicy) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for GeoBackupPolicy struct. func (gbp *GeoBackupPolicy) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -4539,7 +4300,6 @@ func (gbp *GeoBackupPolicy) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GeoBackupPolicyListResult the response to a list geo backup policies request. type GeoBackupPolicyListResult struct { autorest.Response `json:"-"` @@ -4547,7 +4307,6 @@ type GeoBackupPolicyListResult struct { Value *[]GeoBackupPolicy `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GeoBackupPolicyProperties the properties of the geo backup policy. type GeoBackupPolicyProperties struct { // State - The state of the geo backup policy. Possible values include: 'GeoBackupPolicyStateDisabled', 'GeoBackupPolicyStateEnabled' @@ -4556,7 +4315,6 @@ type GeoBackupPolicyProperties struct { StorageType *string `json:"storageType,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportExportResponse response for Import/Export Get operation. type ImportExportResponse struct { autorest.Response `json:"-"` @@ -4570,7 +4328,6 @@ type ImportExportResponse struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ImportExportResponse. func (ier ImportExportResponse) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4589,7 +4346,6 @@ func (ier ImportExportResponse) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ImportExportResponse struct. func (ier *ImportExportResponse) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -4641,7 +4397,6 @@ func (ier *ImportExportResponse) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportExportResponseProperties response for Import/Export Status operation. type ImportExportResponseProperties struct { // RequestType - The request type of the operation. @@ -4664,7 +4419,6 @@ type ImportExportResponseProperties struct { ErrorMessage *string `json:"errorMessage,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportExtensionProperties represents the properties for an import operation type ImportExtensionProperties struct { // OperationMode - The type of import operation being performed. This is always Import. @@ -4683,7 +4437,6 @@ type ImportExtensionProperties struct { AuthenticationType AuthenticationType `json:"authenticationType,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportExtensionRequest import database parameters. type ImportExtensionRequest struct { // Name - The name of the extension. @@ -4694,7 +4447,6 @@ type ImportExtensionRequest struct { *ImportExtensionProperties `json:"properties,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ImportExtensionRequest. func (ier ImportExtensionRequest) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4710,7 +4462,6 @@ func (ier ImportExtensionRequest) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ImportExtensionRequest struct. func (ier *ImportExtensionRequest) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -4753,7 +4504,6 @@ func (ier *ImportExtensionRequest) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ImportRequest import database parameters. type ImportRequest struct { // DatabaseName - The name of the database to import. @@ -4778,7 +4528,6 @@ type ImportRequest struct { AuthenticationType AuthenticationType `json:"authenticationType,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // LocationCapabilities the location capability. type LocationCapabilities struct { autorest.Response `json:"-"` @@ -4792,7 +4541,480 @@ type LocationCapabilities struct { Reason *string `json:"reason,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. +// ManagedInstance an Azure SQL managed instance. +type ManagedInstance struct { + autorest.Response `json:"-"` + // Identity - The Azure Active Directory identity of the managed instance. + Identity *ResourceIdentity `json:"identity,omitempty"` + // Sku - Managed instance sku + Sku *Sku `json:"sku,omitempty"` + // ManagedInstanceProperties - Resource properties. + *ManagedInstanceProperties `json:"properties,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // Location - Resource location. + Location *string `json:"location,omitempty"` + // ID - Resource ID. + ID *string `json:"id,omitempty"` + // Name - Resource name. + Name *string `json:"name,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for ManagedInstance. +func (mi ManagedInstance) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if mi.Identity != nil { + objectMap["identity"] = mi.Identity + } + if mi.Sku != nil { + objectMap["sku"] = mi.Sku + } + if mi.ManagedInstanceProperties != nil { + objectMap["properties"] = mi.ManagedInstanceProperties + } + if mi.Tags != nil { + objectMap["tags"] = mi.Tags + } + if mi.Location != nil { + objectMap["location"] = mi.Location + } + if mi.ID != nil { + objectMap["id"] = mi.ID + } + if mi.Name != nil { + objectMap["name"] = mi.Name + } + if mi.Type != nil { + objectMap["type"] = mi.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for ManagedInstance struct. +func (mi *ManagedInstance) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "identity": + if v != nil { + var identity ResourceIdentity + err = json.Unmarshal(*v, &identity) + if err != nil { + return err + } + mi.Identity = &identity + } + case "sku": + if v != nil { + var sku Sku + err = json.Unmarshal(*v, &sku) + if err != nil { + return err + } + mi.Sku = &sku + } + case "properties": + if v != nil { + var managedInstanceProperties ManagedInstanceProperties + err = json.Unmarshal(*v, &managedInstanceProperties) + if err != nil { + return err + } + mi.ManagedInstanceProperties = &managedInstanceProperties + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + mi.Tags = tags + } + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + mi.Location = &location + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + mi.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + mi.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + mi.Type = &typeVar + } + } + } + + return nil +} + +// ManagedInstanceListResult a list of managed instances. +type ManagedInstanceListResult struct { + autorest.Response `json:"-"` + // Value - Array of results. + Value *[]ManagedInstance `json:"value,omitempty"` + // NextLink - Link to retrieve next page of results. + NextLink *string `json:"nextLink,omitempty"` +} + +// ManagedInstanceListResultIterator provides access to a complete listing of ManagedInstance values. +type ManagedInstanceListResultIterator struct { + i int + page ManagedInstanceListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *ManagedInstanceListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter ManagedInstanceListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter ManagedInstanceListResultIterator) Response() ManagedInstanceListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter ManagedInstanceListResultIterator) Value() ManagedInstance { + if !iter.page.NotDone() { + return ManagedInstance{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (milr ManagedInstanceListResult) IsEmpty() bool { + return milr.Value == nil || len(*milr.Value) == 0 +} + +// managedInstanceListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (milr ManagedInstanceListResult) managedInstanceListResultPreparer() (*http.Request, error) { + if milr.NextLink == nil || len(to.String(milr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(milr.NextLink))) +} + +// ManagedInstanceListResultPage contains a page of ManagedInstance values. +type ManagedInstanceListResultPage struct { + fn func(ManagedInstanceListResult) (ManagedInstanceListResult, error) + milr ManagedInstanceListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *ManagedInstanceListResultPage) Next() error { + next, err := page.fn(page.milr) + if err != nil { + return err + } + page.milr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page ManagedInstanceListResultPage) NotDone() bool { + return !page.milr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page ManagedInstanceListResultPage) Response() ManagedInstanceListResult { + return page.milr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page ManagedInstanceListResultPage) Values() []ManagedInstance { + if page.milr.IsEmpty() { + return nil + } + return *page.milr.Value +} + +// ManagedInstanceProperties the properties of a managed instance. +type ManagedInstanceProperties struct { + // FullyQualifiedDomainName - The fully qualified domain name of the managed instance. + FullyQualifiedDomainName *string `json:"fullyQualifiedDomainName,omitempty"` + // AdministratorLogin - Administrator username for the managed instance. Can only be specified when the managed instance is being created (and is required for creation). + AdministratorLogin *string `json:"administratorLogin,omitempty"` + // AdministratorLoginPassword - The administrator login password (required for managed instance creation). + AdministratorLoginPassword *string `json:"administratorLoginPassword,omitempty"` + // SubnetID - Subnet resource ID for the managed instance. + SubnetID *string `json:"subnetId,omitempty"` + // State - The state of the managed instance. + State *string `json:"state,omitempty"` + // LicenseType - The license type. Possible values are 'LicenseIncluded' and 'BasePrice'. + LicenseType *string `json:"licenseType,omitempty"` + // VCores - The number of VCores. + VCores *int32 `json:"vCores,omitempty"` + // StorageSizeInGB - The maximum storage size in GB. + StorageSizeInGB *int32 `json:"storageSizeInGB,omitempty"` +} + +// ManagedInstancesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type ManagedInstancesCreateOrUpdateFuture struct { + azure.Future + req *http.Request +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future ManagedInstancesCreateOrUpdateFuture) Result(client ManagedInstancesClient) (mi ManagedInstance, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + return mi, azure.NewAsyncOpIncompleteError("sql.ManagedInstancesCreateOrUpdateFuture") + } + if future.PollingMethod() == azure.PollingLocation { + mi, err = client.CreateOrUpdateResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesCreateOrUpdateFuture", "Result", resp, "Failure sending request") + return + } + mi, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") + } + return +} + +// ManagedInstancesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type ManagedInstancesDeleteFuture struct { + azure.Future + req *http.Request +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future ManagedInstancesDeleteFuture) Result(client ManagedInstancesClient) (ar autorest.Response, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesDeleteFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + return ar, azure.NewAsyncOpIncompleteError("sql.ManagedInstancesDeleteFuture") + } + if future.PollingMethod() == azure.PollingLocation { + ar, err = client.DeleteResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesDeleteFuture", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesDeleteFuture", "Result", resp, "Failure sending request") + return + } + ar, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesDeleteFuture", "Result", resp, "Failure responding to request") + } + return +} + +// ManagedInstancesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type ManagedInstancesUpdateFuture struct { + azure.Future + req *http.Request +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future ManagedInstancesUpdateFuture) Result(client ManagedInstancesClient) (mi ManagedInstance, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + return mi, azure.NewAsyncOpIncompleteError("sql.ManagedInstancesUpdateFuture") + } + if future.PollingMethod() == azure.PollingLocation { + mi, err = client.UpdateResponder(future.Response()) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesUpdateFuture", "Result", future.Response(), "Failure responding to request") + } + return + } + var req *http.Request + var resp *http.Response + if future.PollingURL() != "" { + req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if err != nil { + return + } + } else { + req = autorest.ChangeToGet(future.req) + } + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesUpdateFuture", "Result", resp, "Failure sending request") + return + } + mi, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesUpdateFuture", "Result", resp, "Failure responding to request") + } + return +} + +// ManagedInstanceUpdate an update request for an Azure SQL Database managed instance. +type ManagedInstanceUpdate struct { + // Sku - Managed instance sku + Sku *Sku `json:"sku,omitempty"` + // ManagedInstanceProperties - Resource properties. + *ManagedInstanceProperties `json:"properties,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` +} + +// MarshalJSON is the custom marshaler for ManagedInstanceUpdate. +func (miu ManagedInstanceUpdate) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if miu.Sku != nil { + objectMap["sku"] = miu.Sku + } + if miu.ManagedInstanceProperties != nil { + objectMap["properties"] = miu.ManagedInstanceProperties + } + if miu.Tags != nil { + objectMap["tags"] = miu.Tags + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for ManagedInstanceUpdate struct. +func (miu *ManagedInstanceUpdate) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "sku": + if v != nil { + var sku Sku + err = json.Unmarshal(*v, &sku) + if err != nil { + return err + } + miu.Sku = &sku + } + case "properties": + if v != nil { + var managedInstanceProperties ManagedInstanceProperties + err = json.Unmarshal(*v, &managedInstanceProperties) + if err != nil { + return err + } + miu.ManagedInstanceProperties = &managedInstanceProperties + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + miu.Tags = tags + } + } + } + + return nil +} + // MaxSizeCapability the maximum size capability. type MaxSizeCapability struct { // Limit - The maximum size limit (see 'unit' for the units). @@ -4805,7 +5027,6 @@ type MaxSizeCapability struct { Reason *string `json:"reason,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Metric database metrics. type Metric struct { // StartTime - The start time for the metric (ISO-8601 format). @@ -4822,7 +5043,6 @@ type Metric struct { MetricValues *[]MetricValue `json:"metricValues,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MetricAvailability a metric availability value. type MetricAvailability struct { // Retention - The length of retention for the database metric. @@ -4831,7 +5051,6 @@ type MetricAvailability struct { TimeGrain *string `json:"timeGrain,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MetricDefinition a database metric definition. type MetricDefinition struct { // Name - The name information for the metric. @@ -4846,7 +5065,6 @@ type MetricDefinition struct { MetricAvailabilities *[]MetricAvailability `json:"metricAvailabilities,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MetricDefinitionListResult the response to a list database metric definitions request. type MetricDefinitionListResult struct { autorest.Response `json:"-"` @@ -4854,7 +5072,6 @@ type MetricDefinitionListResult struct { Value *[]MetricDefinition `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MetricListResult the response to a list database metrics request. type MetricListResult struct { autorest.Response `json:"-"` @@ -4862,7 +5079,6 @@ type MetricListResult struct { Value *[]Metric `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MetricName a database metric name. type MetricName struct { // Value - The name of the database metric. @@ -4871,7 +5087,6 @@ type MetricName struct { LocalizedValue *string `json:"localizedValue,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MetricValue represents database metrics. type MetricValue struct { // Count - The number of values for the metric. @@ -4888,7 +5103,6 @@ type MetricValue struct { Total *float64 `json:"total,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Operation SQL REST API operation definition. type Operation struct { // Name - The name of the operation being performed on this particular object. @@ -4901,7 +5115,6 @@ type Operation struct { Properties map[string]interface{} `json:"properties"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for Operation. func (o Operation) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -4920,7 +5133,6 @@ func (o Operation) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationDisplay display metadata associated with the operation. type OperationDisplay struct { // Provider - The localized friendly form of the resource provider name. @@ -4933,7 +5145,6 @@ type OperationDisplay struct { Description *string `json:"description,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationImpact the impact of an operation, both in absolute and relative terms. type OperationImpact struct { // Name - The name of the impact dimension. @@ -4946,7 +5157,6 @@ type OperationImpact struct { ChangeValueRelative *float64 `json:"changeValueRelative,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationListResult result of the request to list SQL operations. type OperationListResult struct { autorest.Response `json:"-"` @@ -4956,14 +5166,12 @@ type OperationListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationListResultIterator provides access to a complete listing of Operation values. type OperationListResultIterator struct { i int page OperationListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *OperationListResultIterator) Next() error { @@ -4980,19 +5188,16 @@ func (iter *OperationListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter OperationListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter OperationListResultIterator) Response() OperationListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter OperationListResultIterator) Value() Operation { @@ -5002,7 +5207,6 @@ func (iter OperationListResultIterator) Value() Operation { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (olr OperationListResult) IsEmpty() bool { return olr.Value == nil || len(*olr.Value) == 0 @@ -5020,14 +5224,12 @@ func (olr OperationListResult) operationListResultPreparer() (*http.Request, err autorest.WithBaseURL(to.String(olr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationListResultPage contains a page of Operation values. type OperationListResultPage struct { fn func(OperationListResult) (OperationListResult, error) olr OperationListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *OperationListResultPage) Next() error { @@ -5039,19 +5241,16 @@ func (page *OperationListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page OperationListResultPage) NotDone() bool { return !page.olr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page OperationListResultPage) Response() OperationListResult { return page.olr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page OperationListResultPage) Values() []Operation { if page.olr.IsEmpty() { @@ -5060,7 +5259,6 @@ func (page OperationListResultPage) Values() []Operation { return *page.olr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PartnerInfo partner server information for the failover group. type PartnerInfo struct { // ID - Resource identifier of the partner server. @@ -5071,7 +5269,6 @@ type PartnerInfo struct { ReplicationRole FailoverGroupReplicationRole `json:"replicationRole,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // PerformanceLevelCapability the performance level capability. type PerformanceLevelCapability struct { // Value - Performance level value. @@ -5080,7 +5277,6 @@ type PerformanceLevelCapability struct { Unit PerformanceLevelUnit `json:"unit,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ProxyResource ARM proxy resource. type ProxyResource struct { // ID - Resource ID. @@ -5091,7 +5287,6 @@ type ProxyResource struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecommendedIndex represents a database recommended index. type RecommendedIndex struct { // RecommendedIndexProperties - The properties representing the resource. @@ -5104,7 +5299,6 @@ type RecommendedIndex struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for RecommendedIndex. func (ri RecommendedIndex) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5123,7 +5317,6 @@ func (ri RecommendedIndex) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for RecommendedIndex struct. func (ri *RecommendedIndex) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5175,7 +5368,6 @@ func (ri *RecommendedIndex) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecommendedIndexProperties represents the properties of a database recommended index. type RecommendedIndexProperties struct { // Action - The proposed index action. You can create a missing index, drop an unused index, or rebuild an existing index to improve its performance. Possible values include: 'Create', 'Drop', 'Rebuild' @@ -5204,7 +5396,6 @@ type RecommendedIndexProperties struct { ReportedImpact *[]OperationImpact `json:"reportedImpact,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecoverableDatabase a recoverable database type RecoverableDatabase struct { autorest.Response `json:"-"` @@ -5218,7 +5409,6 @@ type RecoverableDatabase struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for RecoverableDatabase. func (rd RecoverableDatabase) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5237,7 +5427,6 @@ func (rd RecoverableDatabase) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for RecoverableDatabase struct. func (rd *RecoverableDatabase) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5289,7 +5478,6 @@ func (rd *RecoverableDatabase) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecoverableDatabaseListResult the response to a list recoverable databases request type RecoverableDatabaseListResult struct { autorest.Response `json:"-"` @@ -5297,7 +5485,6 @@ type RecoverableDatabaseListResult struct { Value *[]RecoverableDatabase `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecoverableDatabaseProperties the properties of a recoverable database type RecoverableDatabaseProperties struct { // Edition - The edition of the database @@ -5310,7 +5497,6 @@ type RecoverableDatabaseProperties struct { LastAvailableBackupDate *date.Time `json:"lastAvailableBackupDate,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationLink represents a database replication link. type ReplicationLink struct { autorest.Response `json:"-"` @@ -5326,7 +5512,6 @@ type ReplicationLink struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ReplicationLink. func (rl ReplicationLink) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5348,7 +5533,6 @@ func (rl ReplicationLink) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ReplicationLink struct. func (rl *ReplicationLink) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5409,7 +5593,6 @@ func (rl *ReplicationLink) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationLinkListResult represents the response to a List database replication link request. type ReplicationLinkListResult struct { autorest.Response `json:"-"` @@ -5417,7 +5600,6 @@ type ReplicationLinkListResult struct { Value *[]ReplicationLink `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationLinkProperties represents the properties of a database replication link. type ReplicationLinkProperties struct { // IsTerminationAllowed - Legacy value indicating whether termination is allowed. Currently always returns true. @@ -5442,7 +5624,6 @@ type ReplicationLinkProperties struct { ReplicationState ReplicationState `json:"replicationState,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationLinksFailoverAllowDataLossFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type ReplicationLinksFailoverAllowDataLossFuture struct { @@ -5450,7 +5631,6 @@ type ReplicationLinksFailoverAllowDataLossFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ReplicationLinksFailoverAllowDataLossFuture) Result(client ReplicationLinksClient) (ar autorest.Response, err error) { @@ -5493,7 +5673,6 @@ func (future ReplicationLinksFailoverAllowDataLossFuture) Result(client Replicat return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationLinksFailoverFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ReplicationLinksFailoverFuture struct { @@ -5501,7 +5680,6 @@ type ReplicationLinksFailoverFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ReplicationLinksFailoverFuture) Result(client ReplicationLinksClient) (ar autorest.Response, err error) { @@ -5544,7 +5722,6 @@ func (future ReplicationLinksFailoverFuture) Result(client ReplicationLinksClien return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Resource ARM resource. type Resource struct { // ID - Resource ID. @@ -5555,7 +5732,6 @@ type Resource struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ResourceIdentity azure Active Directory identity configuration for a resource. type ResourceIdentity struct { // PrincipalID - The Azure Active Directory principal id. @@ -5566,7 +5742,6 @@ type ResourceIdentity struct { TenantID *uuid.UUID `json:"tenantId,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorableDroppedDatabase a restorable dropped database type RestorableDroppedDatabase struct { autorest.Response `json:"-"` @@ -5582,7 +5757,6 @@ type RestorableDroppedDatabase struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for RestorableDroppedDatabase. func (rdd RestorableDroppedDatabase) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5604,7 +5778,6 @@ func (rdd RestorableDroppedDatabase) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for RestorableDroppedDatabase struct. func (rdd *RestorableDroppedDatabase) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5665,7 +5838,6 @@ func (rdd *RestorableDroppedDatabase) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorableDroppedDatabaseListResult the response to a list restorable dropped databases request type RestorableDroppedDatabaseListResult struct { autorest.Response `json:"-"` @@ -5673,7 +5845,6 @@ type RestorableDroppedDatabaseListResult struct { Value *[]RestorableDroppedDatabase `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorableDroppedDatabaseProperties the properties of a restorable dropped database type RestorableDroppedDatabaseProperties struct { // DatabaseName - The name of the database @@ -5694,7 +5865,6 @@ type RestorableDroppedDatabaseProperties struct { EarliestRestoreDate *date.Time `json:"earliestRestoreDate,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorePoint a database restore point. type RestorePoint struct { // RestorePointProperties - The properties of the restore point. @@ -5707,7 +5877,6 @@ type RestorePoint struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for RestorePoint. func (rp RestorePoint) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5726,7 +5895,6 @@ func (rp RestorePoint) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for RestorePoint struct. func (rp *RestorePoint) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5778,7 +5946,6 @@ func (rp *RestorePoint) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorePointListResult the response to a list database restore points request. type RestorePointListResult struct { autorest.Response `json:"-"` @@ -5786,7 +5953,6 @@ type RestorePointListResult struct { Value *[]RestorePoint `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorePointProperties represents the properties of a database restore point. type RestorePointProperties struct { // RestorePointType - The restore point type of the database restore point. Possible values include: 'DISCRETE', 'CONTINUOUS' @@ -5797,7 +5963,6 @@ type RestorePointProperties struct { EarliestRestoreDate *date.Time `json:"earliestRestoreDate,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Server an Azure SQL Database server. type Server struct { autorest.Response `json:"-"` @@ -5819,7 +5984,6 @@ type Server struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for Server. func (s Server) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5850,7 +6014,6 @@ func (s Server) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for Server struct. func (s *Server) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -5938,7 +6101,6 @@ func (s *Server) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerAdministratorListResult the response to a list Active Directory Administrators request. type ServerAdministratorListResult struct { autorest.Response `json:"-"` @@ -5946,7 +6108,6 @@ type ServerAdministratorListResult struct { Value *[]ServerAzureADAdministrator `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerAdministratorProperties the properties of an server Administrator. type ServerAdministratorProperties struct { // AdministratorType - The type of administrator. @@ -5959,7 +6120,6 @@ type ServerAdministratorProperties struct { TenantID *uuid.UUID `json:"tenantId,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerAzureADAdministrator an server Active Directory Administrator. type ServerAzureADAdministrator struct { autorest.Response `json:"-"` @@ -5973,7 +6133,6 @@ type ServerAzureADAdministrator struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServerAzureADAdministrator. func (saaa ServerAzureADAdministrator) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -5992,7 +6151,6 @@ func (saaa ServerAzureADAdministrator) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServerAzureADAdministrator struct. func (saaa *ServerAzureADAdministrator) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -6044,7 +6202,6 @@ func (saaa *ServerAzureADAdministrator) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerAzureADAdministratorsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type ServerAzureADAdministratorsCreateOrUpdateFuture struct { @@ -6052,7 +6209,6 @@ type ServerAzureADAdministratorsCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServerAzureADAdministratorsCreateOrUpdateFuture) Result(client ServerAzureADAdministratorsClient) (saaa ServerAzureADAdministrator, err error) { @@ -6095,7 +6251,6 @@ func (future ServerAzureADAdministratorsCreateOrUpdateFuture) Result(client Serv return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerAzureADAdministratorsDeleteFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type ServerAzureADAdministratorsDeleteFuture struct { @@ -6103,7 +6258,6 @@ type ServerAzureADAdministratorsDeleteFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServerAzureADAdministratorsDeleteFuture) Result(client ServerAzureADAdministratorsClient) (saaa ServerAzureADAdministrator, err error) { @@ -6146,7 +6300,6 @@ func (future ServerAzureADAdministratorsDeleteFuture) Result(client ServerAzureA return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerCommunicationLink server communication link. type ServerCommunicationLink struct { autorest.Response `json:"-"` @@ -6164,7 +6317,6 @@ type ServerCommunicationLink struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServerCommunicationLink. func (scl ServerCommunicationLink) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -6189,7 +6341,6 @@ func (scl ServerCommunicationLink) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServerCommunicationLink struct. func (scl *ServerCommunicationLink) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -6259,7 +6410,6 @@ func (scl *ServerCommunicationLink) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerCommunicationLinkListResult a list of server communication links. type ServerCommunicationLinkListResult struct { autorest.Response `json:"-"` @@ -6267,7 +6417,6 @@ type ServerCommunicationLinkListResult struct { Value *[]ServerCommunicationLink `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerCommunicationLinkProperties the properties of a server communication link. type ServerCommunicationLinkProperties struct { // State - The state. @@ -6276,7 +6425,6 @@ type ServerCommunicationLinkProperties struct { PartnerServer *string `json:"partnerServer,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerCommunicationLinksCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type ServerCommunicationLinksCreateOrUpdateFuture struct { @@ -6284,7 +6432,6 @@ type ServerCommunicationLinksCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServerCommunicationLinksCreateOrUpdateFuture) Result(client ServerCommunicationLinksClient) (scl ServerCommunicationLink, err error) { @@ -6327,7 +6474,6 @@ func (future ServerCommunicationLinksCreateOrUpdateFuture) Result(client ServerC return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerConnectionPolicy a server secure connection policy. type ServerConnectionPolicy struct { autorest.Response `json:"-"` @@ -6345,7 +6491,6 @@ type ServerConnectionPolicy struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServerConnectionPolicy. func (scp ServerConnectionPolicy) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -6370,7 +6515,6 @@ func (scp ServerConnectionPolicy) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServerConnectionPolicy struct. func (scp *ServerConnectionPolicy) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -6440,14 +6584,12 @@ func (scp *ServerConnectionPolicy) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerConnectionPolicyProperties the properties of a server secure connection policy. type ServerConnectionPolicyProperties struct { // ConnectionType - The server connection type. Possible values include: 'ServerConnectionTypeDefault', 'ServerConnectionTypeProxy', 'ServerConnectionTypeRedirect' ConnectionType ServerConnectionType `json:"connectionType,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKey a server key. type ServerKey struct { autorest.Response `json:"-"` @@ -6465,7 +6607,6 @@ type ServerKey struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServerKey. func (sk ServerKey) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -6490,7 +6631,6 @@ func (sk ServerKey) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServerKey struct. func (sk *ServerKey) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -6560,7 +6700,6 @@ func (sk *ServerKey) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeyListResult a list of server keys. type ServerKeyListResult struct { autorest.Response `json:"-"` @@ -6570,14 +6709,12 @@ type ServerKeyListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeyListResultIterator provides access to a complete listing of ServerKey values. type ServerKeyListResultIterator struct { i int page ServerKeyListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *ServerKeyListResultIterator) Next() error { @@ -6594,19 +6731,16 @@ func (iter *ServerKeyListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter ServerKeyListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter ServerKeyListResultIterator) Response() ServerKeyListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter ServerKeyListResultIterator) Value() ServerKey { @@ -6616,7 +6750,6 @@ func (iter ServerKeyListResultIterator) Value() ServerKey { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (sklr ServerKeyListResult) IsEmpty() bool { return sklr.Value == nil || len(*sklr.Value) == 0 @@ -6634,14 +6767,12 @@ func (sklr ServerKeyListResult) serverKeyListResultPreparer() (*http.Request, er autorest.WithBaseURL(to.String(sklr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeyListResultPage contains a page of ServerKey values. type ServerKeyListResultPage struct { fn func(ServerKeyListResult) (ServerKeyListResult, error) sklr ServerKeyListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *ServerKeyListResultPage) Next() error { @@ -6653,19 +6784,16 @@ func (page *ServerKeyListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page ServerKeyListResultPage) NotDone() bool { return !page.sklr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page ServerKeyListResultPage) Response() ServerKeyListResult { return page.sklr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page ServerKeyListResultPage) Values() []ServerKey { if page.sklr.IsEmpty() { @@ -6674,7 +6802,6 @@ func (page ServerKeyListResultPage) Values() []ServerKey { return *page.sklr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeyProperties properties for a server key execution. type ServerKeyProperties struct { // Subregion - Subregion of the server key. @@ -6689,7 +6816,6 @@ type ServerKeyProperties struct { CreationDate *date.Time `json:"creationDate,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ServerKeysCreateOrUpdateFuture struct { @@ -6697,7 +6823,6 @@ type ServerKeysCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServerKeysCreateOrUpdateFuture) Result(client ServerKeysClient) (sk ServerKey, err error) { @@ -6740,14 +6865,12 @@ func (future ServerKeysCreateOrUpdateFuture) Result(client ServerKeysClient) (sk return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServerKeysDeleteFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServerKeysDeleteFuture) Result(client ServerKeysClient) (ar autorest.Response, err error) { @@ -6790,7 +6913,6 @@ func (future ServerKeysDeleteFuture) Result(client ServerKeysClient) (ar autores return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerListResult a list of servers. type ServerListResult struct { autorest.Response `json:"-"` @@ -6800,14 +6922,12 @@ type ServerListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerListResultIterator provides access to a complete listing of Server values. type ServerListResultIterator struct { i int page ServerListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *ServerListResultIterator) Next() error { @@ -6824,19 +6944,16 @@ func (iter *ServerListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter ServerListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter ServerListResultIterator) Response() ServerListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter ServerListResultIterator) Value() Server { @@ -6846,7 +6963,6 @@ func (iter ServerListResultIterator) Value() Server { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (slr ServerListResult) IsEmpty() bool { return slr.Value == nil || len(*slr.Value) == 0 @@ -6864,14 +6980,12 @@ func (slr ServerListResult) serverListResultPreparer() (*http.Request, error) { autorest.WithBaseURL(to.String(slr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerListResultPage contains a page of Server values. type ServerListResultPage struct { fn func(ServerListResult) (ServerListResult, error) slr ServerListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *ServerListResultPage) Next() error { @@ -6883,19 +6997,16 @@ func (page *ServerListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page ServerListResultPage) NotDone() bool { return !page.slr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page ServerListResultPage) Response() ServerListResult { return page.slr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page ServerListResultPage) Values() []Server { if page.slr.IsEmpty() { @@ -6904,7 +7015,6 @@ func (page ServerListResultPage) Values() []Server { return *page.slr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerProperties the properties of a server. type ServerProperties struct { // AdministratorLogin - Administrator username for the server. Once created it cannot be changed. @@ -6919,7 +7029,6 @@ type ServerProperties struct { FullyQualifiedDomainName *string `json:"fullyQualifiedDomainName,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ServersCreateOrUpdateFuture struct { @@ -6927,7 +7036,6 @@ type ServersCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServersCreateOrUpdateFuture) Result(client ServersClient) (s Server, err error) { @@ -6970,14 +7078,12 @@ func (future ServersCreateOrUpdateFuture) Result(client ServersClient) (s Server return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServersDeleteFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServersDeleteFuture) Result(client ServersClient) (ar autorest.Response, err error) { @@ -7020,14 +7126,12 @@ func (future ServersDeleteFuture) Result(client ServersClient) (ar autorest.Resp return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServersUpdateFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future ServersUpdateFuture) Result(client ServersClient) (s Server, err error) { @@ -7070,7 +7174,6 @@ func (future ServersUpdateFuture) Result(client ServersClient) (s Server, err er return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerUpdate an update request for an Azure SQL Database server. type ServerUpdate struct { // ServerProperties - Resource properties. @@ -7079,7 +7182,6 @@ type ServerUpdate struct { Tags map[string]*string `json:"tags"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServerUpdate. func (su ServerUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -7092,7 +7194,6 @@ func (su ServerUpdate) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServerUpdate struct. func (su *ServerUpdate) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -7126,7 +7227,6 @@ func (su *ServerUpdate) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerUsage represents server metrics. type ServerUsage struct { // Name - Name of the server usage metric. @@ -7145,7 +7245,6 @@ type ServerUsage struct { NextResetTime *date.Time `json:"nextResetTime,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerUsageListResult represents the response to a list server metrics request. type ServerUsageListResult struct { autorest.Response `json:"-"` @@ -7153,7 +7252,6 @@ type ServerUsageListResult struct { Value *[]ServerUsage `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerVersionCapability the server capability type ServerVersionCapability struct { // Name - The server version name. @@ -7168,7 +7266,6 @@ type ServerVersionCapability struct { Reason *string `json:"reason,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceLevelObjectiveCapability the service objectives capability. type ServiceLevelObjectiveCapability struct { // ID - The unique ID of the service objective. @@ -7187,7 +7284,6 @@ type ServiceLevelObjectiveCapability struct { Reason *string `json:"reason,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceObjective represents a database service objective. type ServiceObjective struct { autorest.Response `json:"-"` @@ -7201,7 +7297,6 @@ type ServiceObjective struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServiceObjective. func (so ServiceObjective) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -7220,7 +7315,6 @@ func (so ServiceObjective) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServiceObjective struct. func (so *ServiceObjective) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -7272,7 +7366,6 @@ func (so *ServiceObjective) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceObjectiveListResult represents the response to a get database service objectives request. type ServiceObjectiveListResult struct { autorest.Response `json:"-"` @@ -7280,7 +7373,6 @@ type ServiceObjectiveListResult struct { Value *[]ServiceObjective `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceObjectiveProperties represents the properties of a database service objective. type ServiceObjectiveProperties struct { // ServiceObjectiveName - The name for the service objective. @@ -7295,7 +7387,6 @@ type ServiceObjectiveProperties struct { Enabled *bool `json:"enabled,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceTierAdvisor represents a Service Tier Advisor. type ServiceTierAdvisor struct { autorest.Response `json:"-"` @@ -7309,7 +7400,6 @@ type ServiceTierAdvisor struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for ServiceTierAdvisor. func (sta ServiceTierAdvisor) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -7328,7 +7418,6 @@ func (sta ServiceTierAdvisor) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for ServiceTierAdvisor struct. func (sta *ServiceTierAdvisor) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -7380,7 +7469,6 @@ func (sta *ServiceTierAdvisor) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceTierAdvisorListResult represents the response to a list service tier advisor request. type ServiceTierAdvisorListResult struct { autorest.Response `json:"-"` @@ -7388,7 +7476,6 @@ type ServiceTierAdvisorListResult struct { Value *[]ServiceTierAdvisor `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceTierAdvisorProperties represents the properties of a Service Tier Advisor. type ServiceTierAdvisorProperties struct { // ObservationPeriodStart - The observation period start (ISO8601 format). @@ -7431,7 +7518,20 @@ type ServiceTierAdvisorProperties struct { Confidence *float64 `json:"confidence,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. +// Sku an ARM Resource SKU. +type Sku struct { + // Name - The name of the SKU, typically, a letter + Number code, e.g. P3. + Name *string `json:"name,omitempty"` + // Tier - The tier of the particular SKU, e.g. Basic, Premium. + Tier *string `json:"tier,omitempty"` + // Size - Size of the particular SKU + Size *string `json:"size,omitempty"` + // Family - If the service has different generations of hardware, for the same SKU, then that can be captured here. + Family *string `json:"family,omitempty"` + // Capacity - Capacity of the particular SKU. + Capacity *int32 `json:"capacity,omitempty"` +} + // SloUsageMetric a Slo Usage Metric. type SloUsageMetric struct { // ServiceLevelObjective - The serviceLevelObjective for SLO usage metric. Possible values include: 'ServiceObjectiveNameSystem', 'ServiceObjectiveNameSystem0', 'ServiceObjectiveNameSystem1', 'ServiceObjectiveNameSystem2', 'ServiceObjectiveNameSystem3', 'ServiceObjectiveNameSystem4', 'ServiceObjectiveNameSystem2L', 'ServiceObjectiveNameSystem3L', 'ServiceObjectiveNameSystem4L', 'ServiceObjectiveNameFree', 'ServiceObjectiveNameBasic', 'ServiceObjectiveNameS0', 'ServiceObjectiveNameS1', 'ServiceObjectiveNameS2', 'ServiceObjectiveNameS3', 'ServiceObjectiveNameS4', 'ServiceObjectiveNameS6', 'ServiceObjectiveNameS7', 'ServiceObjectiveNameS9', 'ServiceObjectiveNameS12', 'ServiceObjectiveNameP1', 'ServiceObjectiveNameP2', 'ServiceObjectiveNameP3', 'ServiceObjectiveNameP4', 'ServiceObjectiveNameP6', 'ServiceObjectiveNameP11', 'ServiceObjectiveNameP15', 'ServiceObjectiveNamePRS1', 'ServiceObjectiveNamePRS2', 'ServiceObjectiveNamePRS4', 'ServiceObjectiveNamePRS6', 'ServiceObjectiveNameDW100', 'ServiceObjectiveNameDW200', 'ServiceObjectiveNameDW300', 'ServiceObjectiveNameDW400', 'ServiceObjectiveNameDW500', 'ServiceObjectiveNameDW600', 'ServiceObjectiveNameDW1000', 'ServiceObjectiveNameDW1200', 'ServiceObjectiveNameDW1000c', 'ServiceObjectiveNameDW1500', 'ServiceObjectiveNameDW1500c', 'ServiceObjectiveNameDW2000', 'ServiceObjectiveNameDW2000c', 'ServiceObjectiveNameDW3000', 'ServiceObjectiveNameDW2500c', 'ServiceObjectiveNameDW3000c', 'ServiceObjectiveNameDW6000', 'ServiceObjectiveNameDW5000c', 'ServiceObjectiveNameDW6000c', 'ServiceObjectiveNameDW7500c', 'ServiceObjectiveNameDW10000c', 'ServiceObjectiveNameDW15000c', 'ServiceObjectiveNameDW30000c', 'ServiceObjectiveNameDS100', 'ServiceObjectiveNameDS200', 'ServiceObjectiveNameDS300', 'ServiceObjectiveNameDS400', 'ServiceObjectiveNameDS500', 'ServiceObjectiveNameDS600', 'ServiceObjectiveNameDS1000', 'ServiceObjectiveNameDS1200', 'ServiceObjectiveNameDS1500', 'ServiceObjectiveNameDS2000', 'ServiceObjectiveNameElasticPool' @@ -7442,7 +7542,6 @@ type SloUsageMetric struct { InRangeTimeRatio *float64 `json:"inRangeTimeRatio,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SubscriptionUsage usage Metric of a Subscription in a Location. type SubscriptionUsage struct { autorest.Response `json:"-"` @@ -7456,7 +7555,6 @@ type SubscriptionUsage struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for SubscriptionUsage. func (su SubscriptionUsage) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -7475,7 +7573,6 @@ func (su SubscriptionUsage) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for SubscriptionUsage struct. func (su *SubscriptionUsage) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -7527,7 +7624,6 @@ func (su *SubscriptionUsage) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SubscriptionUsageListResult a list of subscription usage metrics in a location. type SubscriptionUsageListResult struct { autorest.Response `json:"-"` @@ -7537,14 +7633,12 @@ type SubscriptionUsageListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SubscriptionUsageListResultIterator provides access to a complete listing of SubscriptionUsage values. type SubscriptionUsageListResultIterator struct { i int page SubscriptionUsageListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SubscriptionUsageListResultIterator) Next() error { @@ -7561,19 +7655,16 @@ func (iter *SubscriptionUsageListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SubscriptionUsageListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SubscriptionUsageListResultIterator) Response() SubscriptionUsageListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SubscriptionUsageListResultIterator) Value() SubscriptionUsage { @@ -7583,7 +7674,6 @@ func (iter SubscriptionUsageListResultIterator) Value() SubscriptionUsage { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (sulr SubscriptionUsageListResult) IsEmpty() bool { return sulr.Value == nil || len(*sulr.Value) == 0 @@ -7601,14 +7691,12 @@ func (sulr SubscriptionUsageListResult) subscriptionUsageListResultPreparer() (* autorest.WithBaseURL(to.String(sulr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SubscriptionUsageListResultPage contains a page of SubscriptionUsage values. type SubscriptionUsageListResultPage struct { fn func(SubscriptionUsageListResult) (SubscriptionUsageListResult, error) sulr SubscriptionUsageListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SubscriptionUsageListResultPage) Next() error { @@ -7620,19 +7708,16 @@ func (page *SubscriptionUsageListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SubscriptionUsageListResultPage) NotDone() bool { return !page.sulr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SubscriptionUsageListResultPage) Response() SubscriptionUsageListResult { return page.sulr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SubscriptionUsageListResultPage) Values() []SubscriptionUsage { if page.sulr.IsEmpty() { @@ -7641,7 +7726,6 @@ func (page SubscriptionUsageListResultPage) Values() []SubscriptionUsage { return *page.sulr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SubscriptionUsageProperties properties of a subscription usage. type SubscriptionUsageProperties struct { // DisplayName - User-readable name of the metric. @@ -7654,7 +7738,6 @@ type SubscriptionUsageProperties struct { Unit *string `json:"unit,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgent an Azure SQL Database sync agent. type SyncAgent struct { autorest.Response `json:"-"` @@ -7668,7 +7751,6 @@ type SyncAgent struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for SyncAgent. func (sa SyncAgent) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -7687,7 +7769,6 @@ func (sa SyncAgent) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for SyncAgent struct. func (sa *SyncAgent) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -7739,7 +7820,6 @@ func (sa *SyncAgent) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentKeyProperties properties of an Azure SQL Database sync agent key. type SyncAgentKeyProperties struct { autorest.Response `json:"-"` @@ -7747,7 +7827,6 @@ type SyncAgentKeyProperties struct { SyncAgentKey *string `json:"syncAgentKey,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentLinkedDatabase an Azure SQL Database sync agent linked database. type SyncAgentLinkedDatabase struct { // SyncAgentLinkedDatabaseProperties - Resource properties. @@ -7760,7 +7839,6 @@ type SyncAgentLinkedDatabase struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for SyncAgentLinkedDatabase. func (sald SyncAgentLinkedDatabase) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -7779,7 +7857,6 @@ func (sald SyncAgentLinkedDatabase) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for SyncAgentLinkedDatabase struct. func (sald *SyncAgentLinkedDatabase) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -7831,7 +7908,6 @@ func (sald *SyncAgentLinkedDatabase) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentLinkedDatabaseListResult a list of sync agent linked databases. type SyncAgentLinkedDatabaseListResult struct { autorest.Response `json:"-"` @@ -7841,7 +7917,6 @@ type SyncAgentLinkedDatabaseListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentLinkedDatabaseListResultIterator provides access to a complete listing of SyncAgentLinkedDatabase // values. type SyncAgentLinkedDatabaseListResultIterator struct { @@ -7849,7 +7924,6 @@ type SyncAgentLinkedDatabaseListResultIterator struct { page SyncAgentLinkedDatabaseListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncAgentLinkedDatabaseListResultIterator) Next() error { @@ -7866,19 +7940,16 @@ func (iter *SyncAgentLinkedDatabaseListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncAgentLinkedDatabaseListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncAgentLinkedDatabaseListResultIterator) Response() SyncAgentLinkedDatabaseListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncAgentLinkedDatabaseListResultIterator) Value() SyncAgentLinkedDatabase { @@ -7888,7 +7959,6 @@ func (iter SyncAgentLinkedDatabaseListResultIterator) Value() SyncAgentLinkedDat return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (saldlr SyncAgentLinkedDatabaseListResult) IsEmpty() bool { return saldlr.Value == nil || len(*saldlr.Value) == 0 @@ -7906,14 +7976,12 @@ func (saldlr SyncAgentLinkedDatabaseListResult) syncAgentLinkedDatabaseListResul autorest.WithBaseURL(to.String(saldlr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentLinkedDatabaseListResultPage contains a page of SyncAgentLinkedDatabase values. type SyncAgentLinkedDatabaseListResultPage struct { fn func(SyncAgentLinkedDatabaseListResult) (SyncAgentLinkedDatabaseListResult, error) saldlr SyncAgentLinkedDatabaseListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncAgentLinkedDatabaseListResultPage) Next() error { @@ -7925,19 +7993,16 @@ func (page *SyncAgentLinkedDatabaseListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncAgentLinkedDatabaseListResultPage) NotDone() bool { return !page.saldlr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncAgentLinkedDatabaseListResultPage) Response() SyncAgentLinkedDatabaseListResult { return page.saldlr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncAgentLinkedDatabaseListResultPage) Values() []SyncAgentLinkedDatabase { if page.saldlr.IsEmpty() { @@ -7946,7 +8011,6 @@ func (page SyncAgentLinkedDatabaseListResultPage) Values() []SyncAgentLinkedData return *page.saldlr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentLinkedDatabaseProperties properties of an Azure SQL Database sync agent linked database. type SyncAgentLinkedDatabaseProperties struct { // DatabaseType - Type of the sync agent linked database. Possible values include: 'AzureSQLDatabase', 'SQLServerDatabase' @@ -7963,7 +8027,6 @@ type SyncAgentLinkedDatabaseProperties struct { UserName *string `json:"userName,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentListResult a list of sync agents. type SyncAgentListResult struct { autorest.Response `json:"-"` @@ -7973,14 +8036,12 @@ type SyncAgentListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentListResultIterator provides access to a complete listing of SyncAgent values. type SyncAgentListResultIterator struct { i int page SyncAgentListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncAgentListResultIterator) Next() error { @@ -7997,19 +8058,16 @@ func (iter *SyncAgentListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncAgentListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncAgentListResultIterator) Response() SyncAgentListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncAgentListResultIterator) Value() SyncAgent { @@ -8019,7 +8077,6 @@ func (iter SyncAgentListResultIterator) Value() SyncAgent { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (salr SyncAgentListResult) IsEmpty() bool { return salr.Value == nil || len(*salr.Value) == 0 @@ -8037,14 +8094,12 @@ func (salr SyncAgentListResult) syncAgentListResultPreparer() (*http.Request, er autorest.WithBaseURL(to.String(salr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentListResultPage contains a page of SyncAgent values. type SyncAgentListResultPage struct { fn func(SyncAgentListResult) (SyncAgentListResult, error) salr SyncAgentListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncAgentListResultPage) Next() error { @@ -8056,19 +8111,16 @@ func (page *SyncAgentListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncAgentListResultPage) NotDone() bool { return !page.salr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncAgentListResultPage) Response() SyncAgentListResult { return page.salr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncAgentListResultPage) Values() []SyncAgent { if page.salr.IsEmpty() { @@ -8077,7 +8129,6 @@ func (page SyncAgentListResultPage) Values() []SyncAgent { return *page.salr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentProperties properties of an Azure SQL Database sync agent. type SyncAgentProperties struct { // Name - Name of the sync agent. @@ -8096,7 +8147,6 @@ type SyncAgentProperties struct { Version *string `json:"version,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type SyncAgentsCreateOrUpdateFuture struct { @@ -8104,7 +8154,6 @@ type SyncAgentsCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncAgentsCreateOrUpdateFuture) Result(client SyncAgentsClient) (sa SyncAgent, err error) { @@ -8147,14 +8196,12 @@ func (future SyncAgentsCreateOrUpdateFuture) Result(client SyncAgentsClient) (sa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncAgentsDeleteFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncAgentsDeleteFuture) Result(client SyncAgentsClient) (ar autorest.Response, err error) { @@ -8197,7 +8244,6 @@ func (future SyncAgentsDeleteFuture) Result(client SyncAgentsClient) (ar autores return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncDatabaseIDListResult a list of sync database ID properties. type SyncDatabaseIDListResult struct { autorest.Response `json:"-"` @@ -8207,14 +8253,12 @@ type SyncDatabaseIDListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncDatabaseIDListResultIterator provides access to a complete listing of SyncDatabaseIDProperties values. type SyncDatabaseIDListResultIterator struct { i int page SyncDatabaseIDListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncDatabaseIDListResultIterator) Next() error { @@ -8231,19 +8275,16 @@ func (iter *SyncDatabaseIDListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncDatabaseIDListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncDatabaseIDListResultIterator) Response() SyncDatabaseIDListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncDatabaseIDListResultIterator) Value() SyncDatabaseIDProperties { @@ -8253,7 +8294,6 @@ func (iter SyncDatabaseIDListResultIterator) Value() SyncDatabaseIDProperties { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (sdilr SyncDatabaseIDListResult) IsEmpty() bool { return sdilr.Value == nil || len(*sdilr.Value) == 0 @@ -8271,14 +8311,12 @@ func (sdilr SyncDatabaseIDListResult) syncDatabaseIDListResultPreparer() (*http. autorest.WithBaseURL(to.String(sdilr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncDatabaseIDListResultPage contains a page of SyncDatabaseIDProperties values. type SyncDatabaseIDListResultPage struct { fn func(SyncDatabaseIDListResult) (SyncDatabaseIDListResult, error) sdilr SyncDatabaseIDListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncDatabaseIDListResultPage) Next() error { @@ -8290,19 +8328,16 @@ func (page *SyncDatabaseIDListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncDatabaseIDListResultPage) NotDone() bool { return !page.sdilr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncDatabaseIDListResultPage) Response() SyncDatabaseIDListResult { return page.sdilr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncDatabaseIDListResultPage) Values() []SyncDatabaseIDProperties { if page.sdilr.IsEmpty() { @@ -8311,14 +8346,12 @@ func (page SyncDatabaseIDListResultPage) Values() []SyncDatabaseIDProperties { return *page.sdilr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncDatabaseIDProperties properties of the sync database id. type SyncDatabaseIDProperties struct { // ID - ARM resource id of sync database. ID *string `json:"id,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncFullSchemaProperties properties of the database full schema. type SyncFullSchemaProperties struct { // Tables - List of tables in the database full schema. @@ -8327,7 +8360,6 @@ type SyncFullSchemaProperties struct { LastUpdateTime *date.Time `json:"lastUpdateTime,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncFullSchemaPropertiesListResult a list of sync schema properties. type SyncFullSchemaPropertiesListResult struct { autorest.Response `json:"-"` @@ -8337,7 +8369,6 @@ type SyncFullSchemaPropertiesListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncFullSchemaPropertiesListResultIterator provides access to a complete listing of SyncFullSchemaProperties // values. type SyncFullSchemaPropertiesListResultIterator struct { @@ -8345,7 +8376,6 @@ type SyncFullSchemaPropertiesListResultIterator struct { page SyncFullSchemaPropertiesListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncFullSchemaPropertiesListResultIterator) Next() error { @@ -8362,19 +8392,16 @@ func (iter *SyncFullSchemaPropertiesListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncFullSchemaPropertiesListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncFullSchemaPropertiesListResultIterator) Response() SyncFullSchemaPropertiesListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncFullSchemaPropertiesListResultIterator) Value() SyncFullSchemaProperties { @@ -8384,7 +8411,6 @@ func (iter SyncFullSchemaPropertiesListResultIterator) Value() SyncFullSchemaPro return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (sfsplr SyncFullSchemaPropertiesListResult) IsEmpty() bool { return sfsplr.Value == nil || len(*sfsplr.Value) == 0 @@ -8402,14 +8428,12 @@ func (sfsplr SyncFullSchemaPropertiesListResult) syncFullSchemaPropertiesListRes autorest.WithBaseURL(to.String(sfsplr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncFullSchemaPropertiesListResultPage contains a page of SyncFullSchemaProperties values. type SyncFullSchemaPropertiesListResultPage struct { fn func(SyncFullSchemaPropertiesListResult) (SyncFullSchemaPropertiesListResult, error) sfsplr SyncFullSchemaPropertiesListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncFullSchemaPropertiesListResultPage) Next() error { @@ -8421,19 +8445,16 @@ func (page *SyncFullSchemaPropertiesListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncFullSchemaPropertiesListResultPage) NotDone() bool { return !page.sfsplr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncFullSchemaPropertiesListResultPage) Response() SyncFullSchemaPropertiesListResult { return page.sfsplr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncFullSchemaPropertiesListResultPage) Values() []SyncFullSchemaProperties { if page.sfsplr.IsEmpty() { @@ -8442,7 +8463,6 @@ func (page SyncFullSchemaPropertiesListResultPage) Values() []SyncFullSchemaProp return *page.sfsplr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncFullSchemaTable properties of the table in the database full schema. type SyncFullSchemaTable struct { // Columns - List of columns in the table of database full schema. @@ -8457,7 +8477,6 @@ type SyncFullSchemaTable struct { QuotedName *string `json:"quotedName,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncFullSchemaTableColumn properties of the column in the table of database full schema. type SyncFullSchemaTableColumn struct { // DataSize - Data size of the column. @@ -8476,7 +8495,6 @@ type SyncFullSchemaTableColumn struct { QuotedName *string `json:"quotedName,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroup an Azure SQL Database sync group. type SyncGroup struct { autorest.Response `json:"-"` @@ -8490,7 +8508,6 @@ type SyncGroup struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for SyncGroup. func (sg SyncGroup) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -8509,7 +8526,6 @@ func (sg SyncGroup) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for SyncGroup struct. func (sg *SyncGroup) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -8561,7 +8577,6 @@ func (sg *SyncGroup) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupListResult a list of sync groups. type SyncGroupListResult struct { autorest.Response `json:"-"` @@ -8571,14 +8586,12 @@ type SyncGroupListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupListResultIterator provides access to a complete listing of SyncGroup values. type SyncGroupListResultIterator struct { i int page SyncGroupListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncGroupListResultIterator) Next() error { @@ -8595,19 +8608,16 @@ func (iter *SyncGroupListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncGroupListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncGroupListResultIterator) Response() SyncGroupListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncGroupListResultIterator) Value() SyncGroup { @@ -8617,7 +8627,6 @@ func (iter SyncGroupListResultIterator) Value() SyncGroup { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (sglr SyncGroupListResult) IsEmpty() bool { return sglr.Value == nil || len(*sglr.Value) == 0 @@ -8635,14 +8644,12 @@ func (sglr SyncGroupListResult) syncGroupListResultPreparer() (*http.Request, er autorest.WithBaseURL(to.String(sglr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupListResultPage contains a page of SyncGroup values. type SyncGroupListResultPage struct { fn func(SyncGroupListResult) (SyncGroupListResult, error) sglr SyncGroupListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncGroupListResultPage) Next() error { @@ -8654,19 +8661,16 @@ func (page *SyncGroupListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncGroupListResultPage) NotDone() bool { return !page.sglr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncGroupListResultPage) Response() SyncGroupListResult { return page.sglr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncGroupListResultPage) Values() []SyncGroup { if page.sglr.IsEmpty() { @@ -8675,7 +8679,6 @@ func (page SyncGroupListResultPage) Values() []SyncGroup { return *page.sglr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupLogListResult a list of sync group log properties. type SyncGroupLogListResult struct { autorest.Response `json:"-"` @@ -8685,14 +8688,12 @@ type SyncGroupLogListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupLogListResultIterator provides access to a complete listing of SyncGroupLogProperties values. type SyncGroupLogListResultIterator struct { i int page SyncGroupLogListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncGroupLogListResultIterator) Next() error { @@ -8709,19 +8710,16 @@ func (iter *SyncGroupLogListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncGroupLogListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncGroupLogListResultIterator) Response() SyncGroupLogListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncGroupLogListResultIterator) Value() SyncGroupLogProperties { @@ -8731,7 +8729,6 @@ func (iter SyncGroupLogListResultIterator) Value() SyncGroupLogProperties { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (sgllr SyncGroupLogListResult) IsEmpty() bool { return sgllr.Value == nil || len(*sgllr.Value) == 0 @@ -8749,14 +8746,12 @@ func (sgllr SyncGroupLogListResult) syncGroupLogListResultPreparer() (*http.Requ autorest.WithBaseURL(to.String(sgllr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupLogListResultPage contains a page of SyncGroupLogProperties values. type SyncGroupLogListResultPage struct { fn func(SyncGroupLogListResult) (SyncGroupLogListResult, error) sgllr SyncGroupLogListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncGroupLogListResultPage) Next() error { @@ -8768,19 +8763,16 @@ func (page *SyncGroupLogListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncGroupLogListResultPage) NotDone() bool { return !page.sgllr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncGroupLogListResultPage) Response() SyncGroupLogListResult { return page.sgllr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncGroupLogListResultPage) Values() []SyncGroupLogProperties { if page.sgllr.IsEmpty() { @@ -8789,7 +8781,6 @@ func (page SyncGroupLogListResultPage) Values() []SyncGroupLogProperties { return *page.sgllr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupLogProperties properties of an Azure SQL Database sync group log. type SyncGroupLogProperties struct { // Timestamp - Timestamp of the sync group log. @@ -8806,7 +8797,6 @@ type SyncGroupLogProperties struct { OperationStatus *string `json:"operationStatus,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupProperties properties of a sync group. type SyncGroupProperties struct { // Interval - Sync interval of the sync group. @@ -8827,7 +8817,6 @@ type SyncGroupProperties struct { Schema *SyncGroupSchema `json:"schema,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupSchema properties of sync group schema. type SyncGroupSchema struct { // Tables - List of tables in sync group schema. @@ -8836,7 +8825,6 @@ type SyncGroupSchema struct { MasterSyncMemberName *string `json:"masterSyncMemberName,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupSchemaTable properties of table in sync group schema. type SyncGroupSchemaTable struct { // Columns - List of columns in sync group schema. @@ -8845,7 +8833,6 @@ type SyncGroupSchemaTable struct { QuotedName *string `json:"quotedName,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupSchemaTableColumn properties of column in sync group table. type SyncGroupSchemaTableColumn struct { // QuotedName - Quoted name of sync group table column. @@ -8856,7 +8843,6 @@ type SyncGroupSchemaTableColumn struct { DataType *string `json:"dataType,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type SyncGroupsCreateOrUpdateFuture struct { @@ -8864,7 +8850,6 @@ type SyncGroupsCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncGroupsCreateOrUpdateFuture) Result(client SyncGroupsClient) (sg SyncGroup, err error) { @@ -8907,14 +8892,12 @@ func (future SyncGroupsCreateOrUpdateFuture) Result(client SyncGroupsClient) (sg return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncGroupsDeleteFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncGroupsDeleteFuture) Result(client SyncGroupsClient) (ar autorest.Response, err error) { @@ -8957,7 +8940,6 @@ func (future SyncGroupsDeleteFuture) Result(client SyncGroupsClient) (ar autores return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupsRefreshHubSchemaFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type SyncGroupsRefreshHubSchemaFuture struct { @@ -8965,7 +8947,6 @@ type SyncGroupsRefreshHubSchemaFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncGroupsRefreshHubSchemaFuture) Result(client SyncGroupsClient) (ar autorest.Response, err error) { @@ -9008,14 +8989,12 @@ func (future SyncGroupsRefreshHubSchemaFuture) Result(client SyncGroupsClient) ( return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncGroupsUpdateFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncGroupsUpdateFuture) Result(client SyncGroupsClient) (sg SyncGroup, err error) { @@ -9058,7 +9037,6 @@ func (future SyncGroupsUpdateFuture) Result(client SyncGroupsClient) (sg SyncGro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMember an Azure SQL Database sync member. type SyncMember struct { autorest.Response `json:"-"` @@ -9072,7 +9050,6 @@ type SyncMember struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for SyncMember. func (sm SyncMember) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -9091,7 +9068,6 @@ func (sm SyncMember) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for SyncMember struct. func (sm *SyncMember) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -9143,7 +9119,6 @@ func (sm *SyncMember) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMemberListResult a list of Azure SQL Database sync members. type SyncMemberListResult struct { autorest.Response `json:"-"` @@ -9153,14 +9128,12 @@ type SyncMemberListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMemberListResultIterator provides access to a complete listing of SyncMember values. type SyncMemberListResultIterator struct { i int page SyncMemberListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *SyncMemberListResultIterator) Next() error { @@ -9177,19 +9150,16 @@ func (iter *SyncMemberListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter SyncMemberListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter SyncMemberListResultIterator) Response() SyncMemberListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter SyncMemberListResultIterator) Value() SyncMember { @@ -9199,7 +9169,6 @@ func (iter SyncMemberListResultIterator) Value() SyncMember { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (smlr SyncMemberListResult) IsEmpty() bool { return smlr.Value == nil || len(*smlr.Value) == 0 @@ -9217,14 +9186,12 @@ func (smlr SyncMemberListResult) syncMemberListResultPreparer() (*http.Request, autorest.WithBaseURL(to.String(smlr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMemberListResultPage contains a page of SyncMember values. type SyncMemberListResultPage struct { fn func(SyncMemberListResult) (SyncMemberListResult, error) smlr SyncMemberListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *SyncMemberListResultPage) Next() error { @@ -9236,19 +9203,16 @@ func (page *SyncMemberListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page SyncMemberListResultPage) NotDone() bool { return !page.smlr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page SyncMemberListResultPage) Response() SyncMemberListResult { return page.smlr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page SyncMemberListResultPage) Values() []SyncMember { if page.smlr.IsEmpty() { @@ -9257,7 +9221,6 @@ func (page SyncMemberListResultPage) Values() []SyncMember { return *page.smlr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMemberProperties properties of a sync member. type SyncMemberProperties struct { // DatabaseType - Database type of the sync member. Possible values include: 'AzureSQLDatabase', 'SQLServerDatabase' @@ -9280,7 +9243,6 @@ type SyncMemberProperties struct { SyncState SyncMemberState `json:"syncState,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMembersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type SyncMembersCreateOrUpdateFuture struct { @@ -9288,7 +9250,6 @@ type SyncMembersCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncMembersCreateOrUpdateFuture) Result(client SyncMembersClient) (sm SyncMember, err error) { @@ -9331,14 +9292,12 @@ func (future SyncMembersCreateOrUpdateFuture) Result(client SyncMembersClient) ( return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMembersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncMembersDeleteFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncMembersDeleteFuture) Result(client SyncMembersClient) (ar autorest.Response, err error) { @@ -9381,7 +9340,6 @@ func (future SyncMembersDeleteFuture) Result(client SyncMembersClient) (ar autor return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMembersRefreshMemberSchemaFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type SyncMembersRefreshMemberSchemaFuture struct { @@ -9389,7 +9347,6 @@ type SyncMembersRefreshMemberSchemaFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncMembersRefreshMemberSchemaFuture) Result(client SyncMembersClient) (ar autorest.Response, err error) { @@ -9432,14 +9389,12 @@ func (future SyncMembersRefreshMemberSchemaFuture) Result(client SyncMembersClie return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMembersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncMembersUpdateFuture struct { azure.Future req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future SyncMembersUpdateFuture) Result(client SyncMembersClient) (sm SyncMember, err error) { @@ -9482,7 +9437,6 @@ func (future SyncMembersUpdateFuture) Result(client SyncMembersClient) (sm SyncM return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TrackedResource ARM tracked top level resource. type TrackedResource struct { // Tags - Resource tags. @@ -9497,7 +9451,6 @@ type TrackedResource struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for TrackedResource. func (tr TrackedResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -9519,7 +9472,6 @@ func (tr TrackedResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryption represents a database transparent data encryption configuration. type TransparentDataEncryption struct { autorest.Response `json:"-"` @@ -9535,7 +9487,6 @@ type TransparentDataEncryption struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for TransparentDataEncryption. func (tde TransparentDataEncryption) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -9557,7 +9508,6 @@ func (tde TransparentDataEncryption) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for TransparentDataEncryption struct. func (tde *TransparentDataEncryption) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -9618,7 +9568,6 @@ func (tde *TransparentDataEncryption) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionActivity represents a database transparent data encryption Scan. type TransparentDataEncryptionActivity struct { // Location - Resource location. @@ -9633,7 +9582,6 @@ type TransparentDataEncryptionActivity struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for TransparentDataEncryptionActivity. func (tdea TransparentDataEncryptionActivity) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -9655,7 +9603,6 @@ func (tdea TransparentDataEncryptionActivity) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for TransparentDataEncryptionActivity struct. func (tdea *TransparentDataEncryptionActivity) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -9716,7 +9663,6 @@ func (tdea *TransparentDataEncryptionActivity) UnmarshalJSON(body []byte) error return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionActivityListResult represents the response to a list database transparent data // encryption activity request. type TransparentDataEncryptionActivityListResult struct { @@ -9725,7 +9671,6 @@ type TransparentDataEncryptionActivityListResult struct { Value *[]TransparentDataEncryptionActivity `json:"value,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionActivityProperties represents the properties of a database transparent data encryption // Scan. type TransparentDataEncryptionActivityProperties struct { @@ -9735,14 +9680,12 @@ type TransparentDataEncryptionActivityProperties struct { PercentComplete *float64 `json:"percentComplete,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionProperties represents the properties of a database transparent data encryption. type TransparentDataEncryptionProperties struct { // Status - The status of the database transparent data encryption. Possible values include: 'TransparentDataEncryptionStatusEnabled', 'TransparentDataEncryptionStatusDisabled' Status TransparentDataEncryptionStatus `json:"status,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRule a virtual network rule. type VirtualNetworkRule struct { autorest.Response `json:"-"` @@ -9756,7 +9699,6 @@ type VirtualNetworkRule struct { Type *string `json:"type,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // MarshalJSON is the custom marshaler for VirtualNetworkRule. func (vnr VirtualNetworkRule) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) @@ -9775,7 +9717,6 @@ func (vnr VirtualNetworkRule) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UnmarshalJSON is the custom unmarshaler for VirtualNetworkRule struct. func (vnr *VirtualNetworkRule) UnmarshalJSON(body []byte) error { var m map[string]*json.RawMessage @@ -9827,7 +9768,6 @@ func (vnr *VirtualNetworkRule) UnmarshalJSON(body []byte) error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRuleListResult a list of virtual network rules. type VirtualNetworkRuleListResult struct { autorest.Response `json:"-"` @@ -9837,14 +9777,12 @@ type VirtualNetworkRuleListResult struct { NextLink *string `json:"nextLink,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRuleListResultIterator provides access to a complete listing of VirtualNetworkRule values. type VirtualNetworkRuleListResultIterator struct { i int page VirtualNetworkRuleListResultPage } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next value. If there was an error making // the request the iterator does not advance and the error is returned. func (iter *VirtualNetworkRuleListResultIterator) Next() error { @@ -9861,19 +9799,16 @@ func (iter *VirtualNetworkRuleListResultIterator) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the enumeration should be started or is not yet complete. func (iter VirtualNetworkRuleListResultIterator) NotDone() bool { return iter.page.NotDone() && iter.i < len(iter.page.Values()) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (iter VirtualNetworkRuleListResultIterator) Response() VirtualNetworkRuleListResult { return iter.page.Response() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. func (iter VirtualNetworkRuleListResultIterator) Value() VirtualNetworkRule { @@ -9883,7 +9818,6 @@ func (iter VirtualNetworkRuleListResultIterator) Value() VirtualNetworkRule { return iter.page.Values()[iter.i] } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // IsEmpty returns true if the ListResult contains no values. func (vnrlr VirtualNetworkRuleListResult) IsEmpty() bool { return vnrlr.Value == nil || len(*vnrlr.Value) == 0 @@ -9901,14 +9835,12 @@ func (vnrlr VirtualNetworkRuleListResult) virtualNetworkRuleListResultPreparer() autorest.WithBaseURL(to.String(vnrlr.NextLink))) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRuleListResultPage contains a page of VirtualNetworkRule values. type VirtualNetworkRuleListResultPage struct { fn func(VirtualNetworkRuleListResult) (VirtualNetworkRuleListResult, error) vnrlr VirtualNetworkRuleListResult } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Next advances to the next page of values. If there was an error making // the request the page does not advance and the error is returned. func (page *VirtualNetworkRuleListResultPage) Next() error { @@ -9920,19 +9852,16 @@ func (page *VirtualNetworkRuleListResultPage) Next() error { return nil } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NotDone returns true if the page enumeration should be started or is not yet complete. func (page VirtualNetworkRuleListResultPage) NotDone() bool { return !page.vnrlr.IsEmpty() } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Response returns the raw server response from the last page request. func (page VirtualNetworkRuleListResultPage) Response() VirtualNetworkRuleListResult { return page.vnrlr } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Values returns the slice of values for the current page or nil if there are no values. func (page VirtualNetworkRuleListResultPage) Values() []VirtualNetworkRule { if page.vnrlr.IsEmpty() { @@ -9941,7 +9870,6 @@ func (page VirtualNetworkRuleListResultPage) Values() []VirtualNetworkRule { return *page.vnrlr.Value } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRuleProperties properties of a virtual network rule. type VirtualNetworkRuleProperties struct { // VirtualNetworkSubnetID - The ARM resource id of the virtual network subnet. @@ -9952,7 +9880,6 @@ type VirtualNetworkRuleProperties struct { State VirtualNetworkRuleState `json:"state,omitempty"` } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type VirtualNetworkRulesCreateOrUpdateFuture struct { @@ -9960,7 +9887,6 @@ type VirtualNetworkRulesCreateOrUpdateFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future VirtualNetworkRulesCreateOrUpdateFuture) Result(client VirtualNetworkRulesClient) (vnr VirtualNetworkRule, err error) { @@ -10003,7 +9929,6 @@ func (future VirtualNetworkRulesCreateOrUpdateFuture) Result(client VirtualNetwo return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type VirtualNetworkRulesDeleteFuture struct { @@ -10011,7 +9936,6 @@ type VirtualNetworkRulesDeleteFuture struct { req *http.Request } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. func (future VirtualNetworkRulesDeleteFuture) Result(client VirtualNetworkRulesClient) (ar autorest.Response, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/operations.go similarity index 83% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/operations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/operations.go index 1046841acd85..d5c11bcff4cd 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/operations.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // OperationsClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -32,19 +31,16 @@ type OperationsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewOperationsClient creates an instance of the OperationsClient client. func NewOperationsClient(subscriptionID string) OperationsClient { return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // List lists all of the available SQL Rest API operations. func (client OperationsClient) List(ctx context.Context) (result OperationListResultPage, err error) { result.fn = client.listNextResults @@ -69,7 +65,6 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2015-05-01-preview" @@ -85,7 +80,6 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { @@ -93,7 +87,6 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { @@ -128,7 +121,6 @@ func (client OperationsClient) listNextResults(lastResults OperationListResult) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListComplete enumerates all values, automatically crossing page boundaries as required. func (client OperationsClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) { result.page, err = client.List(ctx) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/recoverabledatabases.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/recoverabledatabases.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/recoverabledatabases.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/recoverabledatabases.go index fa6c48773d27..cf043230ed08 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/recoverabledatabases.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/recoverabledatabases.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RecoverableDatabasesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,24 +31,22 @@ type RecoverableDatabasesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewRecoverableDatabasesClient creates an instance of the RecoverableDatabasesClient client. func NewRecoverableDatabasesClient(subscriptionID string) RecoverableDatabasesClient { return NewRecoverableDatabasesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewRecoverableDatabasesClientWithBaseURI creates an instance of the RecoverableDatabasesClient client. func NewRecoverableDatabasesClientWithBaseURI(baseURI string, subscriptionID string) RecoverableDatabasesClient { return RecoverableDatabasesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a recoverable database, which is a resource representing a database's geo backup -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database func (client RecoverableDatabasesClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result RecoverableDatabase, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -72,7 +69,6 @@ func (client RecoverableDatabasesClient) Get(ctx context.Context, resourceGroupN return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client RecoverableDatabasesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,7 +91,6 @@ func (client RecoverableDatabasesClient) GetPreparer(ctx context.Context, resour return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client RecoverableDatabasesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -103,7 +98,6 @@ func (client RecoverableDatabasesClient) GetSender(req *http.Request) (*http.Res azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client RecoverableDatabasesClient) GetResponder(resp *http.Response) (result RecoverableDatabase, err error) { @@ -117,11 +111,11 @@ func (client RecoverableDatabasesClient) GetResponder(resp *http.Response) (resu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets a list of recoverable databases -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client RecoverableDatabasesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result RecoverableDatabaseListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -144,7 +138,6 @@ func (client RecoverableDatabasesClient) ListByServer(ctx context.Context, resou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client RecoverableDatabasesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -166,7 +159,6 @@ func (client RecoverableDatabasesClient) ListByServerPreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client RecoverableDatabasesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -174,7 +166,6 @@ func (client RecoverableDatabasesClient) ListByServerSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client RecoverableDatabasesClient) ListByServerResponder(resp *http.Response) (result RecoverableDatabaseListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go index f0a91edca87d..38dd9bdadf0a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ReplicationLinksClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,25 +31,23 @@ type ReplicationLinksClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewReplicationLinksClient creates an instance of the ReplicationLinksClient client. func NewReplicationLinksClient(subscriptionID string) ReplicationLinksClient { return NewReplicationLinksClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewReplicationLinksClientWithBaseURI creates an instance of the ReplicationLinksClient client. func NewReplicationLinksClientWithBaseURI(baseURI string, subscriptionID string) ReplicationLinksClient { return ReplicationLinksClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a database replication link. Cannot be done during failover. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database that has the replication link to be dropped. linkID is the ID of the replication link to be -// deleted. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database that has the replication link to be dropped. +// linkID - the ID of the replication link to be deleted. func (client ReplicationLinksClient) Delete(ctx context.Context, resourceGroupName string, serverName string, databaseName string, linkID string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, databaseName, linkID) if err != nil { @@ -73,7 +70,6 @@ func (client ReplicationLinksClient) Delete(ctx context.Context, resourceGroupNa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client ReplicationLinksClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, linkID string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -97,7 +93,6 @@ func (client ReplicationLinksClient) DeletePreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ReplicationLinksClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -105,7 +100,6 @@ func (client ReplicationLinksClient) DeleteSender(req *http.Request) (*http.Resp azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ReplicationLinksClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -118,13 +112,13 @@ func (client ReplicationLinksClient) DeleteResponder(resp *http.Response) (resul return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Failover sets which replica database is primary by failing over from the current primary replica database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database that has the replication link to be failed over. linkID is the ID of the replication link to be -// failed over. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database that has the replication link to be failed over. +// linkID - the ID of the replication link to be failed over. func (client ReplicationLinksClient) Failover(ctx context.Context, resourceGroupName string, serverName string, databaseName string, linkID string) (result ReplicationLinksFailoverFuture, err error) { req, err := client.FailoverPreparer(ctx, resourceGroupName, serverName, databaseName, linkID) if err != nil { @@ -141,7 +135,6 @@ func (client ReplicationLinksClient) Failover(ctx context.Context, resourceGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverPreparer prepares the Failover request. func (client ReplicationLinksClient) FailoverPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, linkID string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -165,7 +158,6 @@ func (client ReplicationLinksClient) FailoverPreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverSender sends the Failover request. The method will close the // http.Response Body if it receives an error. func (client ReplicationLinksClient) FailoverSender(req *http.Request) (future ReplicationLinksFailoverFuture, err error) { @@ -181,7 +173,6 @@ func (client ReplicationLinksClient) FailoverSender(req *http.Request) (future R return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverResponder handles the response to the Failover request. The method always // closes the http.Response Body. func (client ReplicationLinksClient) FailoverResponder(resp *http.Response) (result autorest.Response, err error) { @@ -194,14 +185,14 @@ func (client ReplicationLinksClient) FailoverResponder(resp *http.Response) (res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverAllowDataLoss sets which replica database is primary by failing over from the current primary replica // database. This operation might result in data loss. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database that has the replication link to be failed over. linkID is the ID of the replication link to be -// failed over. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database that has the replication link to be failed over. +// linkID - the ID of the replication link to be failed over. func (client ReplicationLinksClient) FailoverAllowDataLoss(ctx context.Context, resourceGroupName string, serverName string, databaseName string, linkID string) (result ReplicationLinksFailoverAllowDataLossFuture, err error) { req, err := client.FailoverAllowDataLossPreparer(ctx, resourceGroupName, serverName, databaseName, linkID) if err != nil { @@ -218,7 +209,6 @@ func (client ReplicationLinksClient) FailoverAllowDataLoss(ctx context.Context, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverAllowDataLossPreparer prepares the FailoverAllowDataLoss request. func (client ReplicationLinksClient) FailoverAllowDataLossPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, linkID string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -242,7 +232,6 @@ func (client ReplicationLinksClient) FailoverAllowDataLossPreparer(ctx context.C return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverAllowDataLossSender sends the FailoverAllowDataLoss request. The method will close the // http.Response Body if it receives an error. func (client ReplicationLinksClient) FailoverAllowDataLossSender(req *http.Request) (future ReplicationLinksFailoverAllowDataLossFuture, err error) { @@ -258,7 +247,6 @@ func (client ReplicationLinksClient) FailoverAllowDataLossSender(req *http.Reque return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // FailoverAllowDataLossResponder handles the response to the FailoverAllowDataLoss request. The method always // closes the http.Response Body. func (client ReplicationLinksClient) FailoverAllowDataLossResponder(resp *http.Response) (result autorest.Response, err error) { @@ -271,12 +259,13 @@ func (client ReplicationLinksClient) FailoverAllowDataLossResponder(resp *http.R return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database replication link. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database to get the link for. linkID is the replication link ID to be retrieved. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database to get the link for. +// linkID - the replication link ID to be retrieved. func (client ReplicationLinksClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string, linkID string) (result ReplicationLink, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName, linkID) if err != nil { @@ -299,7 +288,6 @@ func (client ReplicationLinksClient) Get(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ReplicationLinksClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, linkID string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -323,7 +311,6 @@ func (client ReplicationLinksClient) GetPreparer(ctx context.Context, resourceGr return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ReplicationLinksClient) GetSender(req *http.Request) (*http.Response, error) { @@ -331,7 +318,6 @@ func (client ReplicationLinksClient) GetSender(req *http.Request) (*http.Respons azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ReplicationLinksClient) GetResponder(resp *http.Response) (result ReplicationLink, err error) { @@ -345,12 +331,12 @@ func (client ReplicationLinksClient) GetResponder(resp *http.Response) (result R return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase lists a database's replication links. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database to retrieve links for. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database to retrieve links for. func (client ReplicationLinksClient) ListByDatabase(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result ReplicationLinkListResult, err error) { req, err := client.ListByDatabasePreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -373,7 +359,6 @@ func (client ReplicationLinksClient) ListByDatabase(ctx context.Context, resourc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client ReplicationLinksClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -396,7 +381,6 @@ func (client ReplicationLinksClient) ListByDatabasePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client ReplicationLinksClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -404,7 +388,6 @@ func (client ReplicationLinksClient) ListByDatabaseSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client ReplicationLinksClient) ListByDatabaseResponder(resp *http.Response) (result ReplicationLinkListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorabledroppeddatabases.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/restorabledroppeddatabases.go similarity index 80% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorabledroppeddatabases.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/restorabledroppeddatabases.go index 9e8d1b610aa5..bc868bb01804 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorabledroppeddatabases.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/restorabledroppeddatabases.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorableDroppedDatabasesClient is the the Azure SQL Database management API provides a RESTful set of web services // that interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, // update, and delete databases. @@ -32,24 +31,22 @@ type RestorableDroppedDatabasesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewRestorableDroppedDatabasesClient creates an instance of the RestorableDroppedDatabasesClient client. func NewRestorableDroppedDatabasesClient(subscriptionID string) RestorableDroppedDatabasesClient { return NewRestorableDroppedDatabasesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewRestorableDroppedDatabasesClientWithBaseURI creates an instance of the RestorableDroppedDatabasesClient client. func NewRestorableDroppedDatabasesClientWithBaseURI(baseURI string, subscriptionID string) RestorableDroppedDatabasesClient { return RestorableDroppedDatabasesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a deleted database that can be restored -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. -// restorableDroppededDatabaseID is the id of the deleted database in the form of +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// restorableDroppededDatabaseID - the id of the deleted database in the form of // databaseName,deletionTimeInFileTimeFormat func (client RestorableDroppedDatabasesClient) Get(ctx context.Context, resourceGroupName string, serverName string, restorableDroppededDatabaseID string) (result RestorableDroppedDatabase, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, restorableDroppededDatabaseID) @@ -73,7 +70,6 @@ func (client RestorableDroppedDatabasesClient) Get(ctx context.Context, resource return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client RestorableDroppedDatabasesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, restorableDroppededDatabaseID string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -96,7 +92,6 @@ func (client RestorableDroppedDatabasesClient) GetPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client RestorableDroppedDatabasesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -104,7 +99,6 @@ func (client RestorableDroppedDatabasesClient) GetSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client RestorableDroppedDatabasesClient) GetResponder(resp *http.Response) (result RestorableDroppedDatabase, err error) { @@ -118,11 +112,11 @@ func (client RestorableDroppedDatabasesClient) GetResponder(resp *http.Response) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets a list of deleted databases that can be restored -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client RestorableDroppedDatabasesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result RestorableDroppedDatabaseListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -145,7 +139,6 @@ func (client RestorableDroppedDatabasesClient) ListByServer(ctx context.Context, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client RestorableDroppedDatabasesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -167,7 +160,6 @@ func (client RestorableDroppedDatabasesClient) ListByServerPreparer(ctx context. return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client RestorableDroppedDatabasesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -175,7 +167,6 @@ func (client RestorableDroppedDatabasesClient) ListByServerSender(req *http.Requ azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client RestorableDroppedDatabasesClient) ListByServerResponder(resp *http.Response) (result RestorableDroppedDatabaseListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorepoints.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/restorepoints.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorepoints.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/restorepoints.go index 7e739f47d45d..76427f5d2ece 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/restorepoints.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/restorepoints.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RestorePointsClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,24 +31,22 @@ type RestorePointsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewRestorePointsClient creates an instance of the RestorePointsClient client. func NewRestorePointsClient(subscriptionID string) RestorePointsClient { return NewRestorePointsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewRestorePointsClientWithBaseURI creates an instance of the RestorePointsClient client. func NewRestorePointsClientWithBaseURI(baseURI string, subscriptionID string) RestorePointsClient { return RestorePointsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase gets a list of database restore points. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database to get available restore points. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database to get available restore points. func (client RestorePointsClient) ListByDatabase(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result RestorePointListResult, err error) { req, err := client.ListByDatabasePreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -72,7 +69,6 @@ func (client RestorePointsClient) ListByDatabase(ctx context.Context, resourceGr return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client RestorePointsClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,7 +91,6 @@ func (client RestorePointsClient) ListByDatabasePreparer(ctx context.Context, re return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client RestorePointsClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -103,7 +98,6 @@ func (client RestorePointsClient) ListByDatabaseSender(req *http.Request) (*http azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client RestorePointsClient) ListByDatabaseResponder(resp *http.Response) (result RestorePointListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go similarity index 81% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go index d69f7e421260..9d0595fc77f5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go @@ -25,7 +25,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerAzureADAdministratorsClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -33,25 +32,23 @@ type ServerAzureADAdministratorsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerAzureADAdministratorsClient creates an instance of the ServerAzureADAdministratorsClient client. func NewServerAzureADAdministratorsClient(subscriptionID string) ServerAzureADAdministratorsClient { return NewServerAzureADAdministratorsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerAzureADAdministratorsClientWithBaseURI creates an instance of the ServerAzureADAdministratorsClient client. func NewServerAzureADAdministratorsClientWithBaseURI(baseURI string, subscriptionID string) ServerAzureADAdministratorsClient { return ServerAzureADAdministratorsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates a new Server Active Directory Administrator or updates an existing server Active Directory // Administrator. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. properties is the required -// parameters for creating or updating an Active Directory Administrator. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// properties - the required parameters for creating or updating an Active Directory Administrator. func (client ServerAzureADAdministratorsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, properties ServerAzureADAdministrator) (result ServerAzureADAdministratorsCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: properties, @@ -79,7 +76,6 @@ func (client ServerAzureADAdministratorsClient) CreateOrUpdate(ctx context.Conte return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ServerAzureADAdministratorsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, properties ServerAzureADAdministrator) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -104,7 +100,6 @@ func (client ServerAzureADAdministratorsClient) CreateOrUpdatePreparer(ctx conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServerAzureADAdministratorsClient) CreateOrUpdateSender(req *http.Request) (future ServerAzureADAdministratorsCreateOrUpdateFuture, err error) { @@ -120,7 +115,6 @@ func (client ServerAzureADAdministratorsClient) CreateOrUpdateSender(req *http.R return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ServerAzureADAdministratorsClient) CreateOrUpdateResponder(resp *http.Response) (result ServerAzureADAdministrator, err error) { @@ -134,11 +128,11 @@ func (client ServerAzureADAdministratorsClient) CreateOrUpdateResponder(resp *ht return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes an existing server Active Directory Administrator. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServerAzureADAdministratorsClient) Delete(ctx context.Context, resourceGroupName string, serverName string) (result ServerAzureADAdministratorsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -155,7 +149,6 @@ func (client ServerAzureADAdministratorsClient) Delete(ctx context.Context, reso return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client ServerAzureADAdministratorsClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -178,7 +171,6 @@ func (client ServerAzureADAdministratorsClient) DeletePreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServerAzureADAdministratorsClient) DeleteSender(req *http.Request) (future ServerAzureADAdministratorsDeleteFuture, err error) { @@ -194,7 +186,6 @@ func (client ServerAzureADAdministratorsClient) DeleteSender(req *http.Request) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ServerAzureADAdministratorsClient) DeleteResponder(resp *http.Response) (result ServerAzureADAdministrator, err error) { @@ -208,11 +199,11 @@ func (client ServerAzureADAdministratorsClient) DeleteResponder(resp *http.Respo return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get returns an server Administrator. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServerAzureADAdministratorsClient) Get(ctx context.Context, resourceGroupName string, serverName string) (result ServerAzureADAdministrator, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -235,7 +226,6 @@ func (client ServerAzureADAdministratorsClient) Get(ctx context.Context, resourc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServerAzureADAdministratorsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -258,7 +248,6 @@ func (client ServerAzureADAdministratorsClient) GetPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServerAzureADAdministratorsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -266,7 +255,6 @@ func (client ServerAzureADAdministratorsClient) GetSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServerAzureADAdministratorsClient) GetResponder(resp *http.Response) (result ServerAzureADAdministrator, err error) { @@ -280,11 +268,11 @@ func (client ServerAzureADAdministratorsClient) GetResponder(resp *http.Response return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer returns a list of server Administrators. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServerAzureADAdministratorsClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result ServerAdministratorListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -307,7 +295,6 @@ func (client ServerAzureADAdministratorsClient) ListByServer(ctx context.Context return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client ServerAzureADAdministratorsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -329,7 +316,6 @@ func (client ServerAzureADAdministratorsClient) ListByServerPreparer(ctx context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client ServerAzureADAdministratorsClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -337,7 +323,6 @@ func (client ServerAzureADAdministratorsClient) ListByServerSender(req *http.Req azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client ServerAzureADAdministratorsClient) ListByServerResponder(resp *http.Response) (result ServerAdministratorListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go index 9015acb14e3e..9c619b85b1c4 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go @@ -25,7 +25,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerCommunicationLinksClient is the the Azure SQL Database management API provides a RESTful set of web services // that interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, // update, and delete databases. @@ -33,25 +32,23 @@ type ServerCommunicationLinksClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerCommunicationLinksClient creates an instance of the ServerCommunicationLinksClient client. func NewServerCommunicationLinksClient(subscriptionID string) ServerCommunicationLinksClient { return NewServerCommunicationLinksClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerCommunicationLinksClientWithBaseURI creates an instance of the ServerCommunicationLinksClient client. func NewServerCommunicationLinksClientWithBaseURI(baseURI string, subscriptionID string) ServerCommunicationLinksClient { return ServerCommunicationLinksClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates a server communication link. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. communicationLinkName is the -// name of the server communication link. parameters is the required parameters for creating a server communication -// link. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// communicationLinkName - the name of the server communication link. +// parameters - the required parameters for creating a server communication link. func (client ServerCommunicationLinksClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, communicationLinkName string, parameters ServerCommunicationLink) (result ServerCommunicationLinksCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -75,7 +72,6 @@ func (client ServerCommunicationLinksClient) CreateOrUpdate(ctx context.Context, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ServerCommunicationLinksClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, communicationLinkName string, parameters ServerCommunicationLink) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -100,7 +96,6 @@ func (client ServerCommunicationLinksClient) CreateOrUpdatePreparer(ctx context. return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServerCommunicationLinksClient) CreateOrUpdateSender(req *http.Request) (future ServerCommunicationLinksCreateOrUpdateFuture, err error) { @@ -116,7 +111,6 @@ func (client ServerCommunicationLinksClient) CreateOrUpdateSender(req *http.Requ return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ServerCommunicationLinksClient) CreateOrUpdateResponder(resp *http.Response) (result ServerCommunicationLink, err error) { @@ -130,12 +124,12 @@ func (client ServerCommunicationLinksClient) CreateOrUpdateResponder(resp *http. return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a server communication link. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. communicationLinkName is the -// name of the server communication link. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// communicationLinkName - the name of the server communication link. func (client ServerCommunicationLinksClient) Delete(ctx context.Context, resourceGroupName string, serverName string, communicationLinkName string) (result autorest.Response, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, communicationLinkName) if err != nil { @@ -158,7 +152,6 @@ func (client ServerCommunicationLinksClient) Delete(ctx context.Context, resourc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client ServerCommunicationLinksClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, communicationLinkName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -181,7 +174,6 @@ func (client ServerCommunicationLinksClient) DeletePreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServerCommunicationLinksClient) DeleteSender(req *http.Request) (*http.Response, error) { @@ -189,7 +181,6 @@ func (client ServerCommunicationLinksClient) DeleteSender(req *http.Request) (*h azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ServerCommunicationLinksClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -202,12 +193,12 @@ func (client ServerCommunicationLinksClient) DeleteResponder(resp *http.Response return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get returns a server communication link. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. communicationLinkName is the -// name of the server communication link. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// communicationLinkName - the name of the server communication link. func (client ServerCommunicationLinksClient) Get(ctx context.Context, resourceGroupName string, serverName string, communicationLinkName string) (result ServerCommunicationLink, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, communicationLinkName) if err != nil { @@ -230,7 +221,6 @@ func (client ServerCommunicationLinksClient) Get(ctx context.Context, resourceGr return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServerCommunicationLinksClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, communicationLinkName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -253,7 +243,6 @@ func (client ServerCommunicationLinksClient) GetPreparer(ctx context.Context, re return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServerCommunicationLinksClient) GetSender(req *http.Request) (*http.Response, error) { @@ -261,7 +250,6 @@ func (client ServerCommunicationLinksClient) GetSender(req *http.Request) (*http azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServerCommunicationLinksClient) GetResponder(resp *http.Response) (result ServerCommunicationLink, err error) { @@ -275,11 +263,11 @@ func (client ServerCommunicationLinksClient) GetResponder(resp *http.Response) ( return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets a list of server communication links. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServerCommunicationLinksClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result ServerCommunicationLinkListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -302,7 +290,6 @@ func (client ServerCommunicationLinksClient) ListByServer(ctx context.Context, r return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client ServerCommunicationLinksClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -324,7 +311,6 @@ func (client ServerCommunicationLinksClient) ListByServerPreparer(ctx context.Co return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client ServerCommunicationLinksClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -332,7 +318,6 @@ func (client ServerCommunicationLinksClient) ListByServerSender(req *http.Reques azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client ServerCommunicationLinksClient) ListByServerResponder(resp *http.Response) (result ServerCommunicationLinkListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverconnectionpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverconnectionpolicies.go similarity index 80% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverconnectionpolicies.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverconnectionpolicies.go index c4e22b61f964..b451d8018af4 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverconnectionpolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverconnectionpolicies.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerConnectionPoliciesClient is the the Azure SQL Database management API provides a RESTful set of web services // that interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, // update, and delete databases. @@ -32,24 +31,22 @@ type ServerConnectionPoliciesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerConnectionPoliciesClient creates an instance of the ServerConnectionPoliciesClient client. func NewServerConnectionPoliciesClient(subscriptionID string) ServerConnectionPoliciesClient { return NewServerConnectionPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerConnectionPoliciesClientWithBaseURI creates an instance of the ServerConnectionPoliciesClient client. func NewServerConnectionPoliciesClientWithBaseURI(baseURI string, subscriptionID string) ServerConnectionPoliciesClient { return ServerConnectionPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates the server's connection policy. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. parameters is the required -// parameters for updating a secure connection policy. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// parameters - the required parameters for updating a secure connection policy. func (client ServerConnectionPoliciesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, parameters ServerConnectionPolicy) (result ServerConnectionPolicy, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, parameters) if err != nil { @@ -72,7 +69,6 @@ func (client ServerConnectionPoliciesClient) CreateOrUpdate(ctx context.Context, return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ServerConnectionPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters ServerConnectionPolicy) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -97,7 +93,6 @@ func (client ServerConnectionPoliciesClient) CreateOrUpdatePreparer(ctx context. return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServerConnectionPoliciesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -105,7 +100,6 @@ func (client ServerConnectionPoliciesClient) CreateOrUpdateSender(req *http.Requ azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ServerConnectionPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result ServerConnectionPolicy, err error) { @@ -119,11 +113,11 @@ func (client ServerConnectionPoliciesClient) CreateOrUpdateResponder(resp *http. return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets the server's secure connection policy. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServerConnectionPoliciesClient) Get(ctx context.Context, resourceGroupName string, serverName string) (result ServerConnectionPolicy, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -146,7 +140,6 @@ func (client ServerConnectionPoliciesClient) Get(ctx context.Context, resourceGr return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServerConnectionPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -169,7 +162,6 @@ func (client ServerConnectionPoliciesClient) GetPreparer(ctx context.Context, re return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServerConnectionPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -177,7 +169,6 @@ func (client ServerConnectionPoliciesClient) GetSender(req *http.Request) (*http azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServerConnectionPoliciesClient) GetResponder(resp *http.Response) (result ServerConnectionPolicy, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverkeys.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverkeys.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverkeys.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverkeys.go index 3401aac55ef3..81086a04876a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverkeys.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverkeys.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerKeysClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -32,28 +31,26 @@ type ServerKeysClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerKeysClient creates an instance of the ServerKeysClient client. func NewServerKeysClient(subscriptionID string) ServerKeysClient { return NewServerKeysClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerKeysClientWithBaseURI creates an instance of the ServerKeysClient client. func NewServerKeysClientWithBaseURI(baseURI string, subscriptionID string) ServerKeysClient { return ServerKeysClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a server key. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. keyName is the name of the -// server key to be operated on (updated or created). The key name is required to be in the format of -// 'vault_key_version'. For example, if the keyId is +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// keyName - the name of the server key to be operated on (updated or created). The key name is required to be +// in the format of 'vault_key_version'. For example, if the keyId is // https://YourVaultName.vault.azure.net/keys/YourKeyName/01234567890123456789012345678901, then the server key -// name should be formatted as: YourVaultName_YourKeyName_01234567890123456789012345678901 parameters is the -// requested server key resource state. +// name should be formatted as: YourVaultName_YourKeyName_01234567890123456789012345678901 +// parameters - the requested server key resource state. func (client ServerKeysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, keyName string, parameters ServerKey) (result ServerKeysCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, keyName, parameters) if err != nil { @@ -70,7 +67,6 @@ func (client ServerKeysClient) CreateOrUpdate(ctx context.Context, resourceGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ServerKeysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, keyName string, parameters ServerKey) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,7 +91,6 @@ func (client ServerKeysClient) CreateOrUpdatePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServerKeysClient) CreateOrUpdateSender(req *http.Request) (future ServerKeysCreateOrUpdateFuture, err error) { @@ -111,7 +106,6 @@ func (client ServerKeysClient) CreateOrUpdateSender(req *http.Request) (future S return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ServerKeysClient) CreateOrUpdateResponder(resp *http.Response) (result ServerKey, err error) { @@ -125,12 +119,12 @@ func (client ServerKeysClient) CreateOrUpdateResponder(resp *http.Response) (res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes the server key with the given name. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. keyName is the name of the -// server key to be deleted. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// keyName - the name of the server key to be deleted. func (client ServerKeysClient) Delete(ctx context.Context, resourceGroupName string, serverName string, keyName string) (result ServerKeysDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, keyName) if err != nil { @@ -147,7 +141,6 @@ func (client ServerKeysClient) Delete(ctx context.Context, resourceGroupName str return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client ServerKeysClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, keyName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -170,7 +163,6 @@ func (client ServerKeysClient) DeletePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServerKeysClient) DeleteSender(req *http.Request) (future ServerKeysDeleteFuture, err error) { @@ -186,7 +178,6 @@ func (client ServerKeysClient) DeleteSender(req *http.Request) (future ServerKey return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ServerKeysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -199,12 +190,12 @@ func (client ServerKeysClient) DeleteResponder(resp *http.Response) (result auto return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a server key. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. keyName is the name of the -// server key to be retrieved. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// keyName - the name of the server key to be retrieved. func (client ServerKeysClient) Get(ctx context.Context, resourceGroupName string, serverName string, keyName string) (result ServerKey, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, keyName) if err != nil { @@ -227,7 +218,6 @@ func (client ServerKeysClient) Get(ctx context.Context, resourceGroupName string return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServerKeysClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, keyName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -250,7 +240,6 @@ func (client ServerKeysClient) GetPreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServerKeysClient) GetSender(req *http.Request) (*http.Response, error) { @@ -258,7 +247,6 @@ func (client ServerKeysClient) GetSender(req *http.Request) (*http.Response, err azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServerKeysClient) GetResponder(resp *http.Response) (result ServerKey, err error) { @@ -272,11 +260,11 @@ func (client ServerKeysClient) GetResponder(resp *http.Response) (result ServerK return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets a list of server keys. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServerKeysClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result ServerKeyListResultPage, err error) { result.fn = client.listByServerNextResults req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) @@ -300,7 +288,6 @@ func (client ServerKeysClient) ListByServer(ctx context.Context, resourceGroupNa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client ServerKeysClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -322,7 +309,6 @@ func (client ServerKeysClient) ListByServerPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client ServerKeysClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -330,7 +316,6 @@ func (client ServerKeysClient) ListByServerSender(req *http.Request) (*http.Resp azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client ServerKeysClient) ListByServerResponder(resp *http.Response) (result ServerKeyListResult, err error) { @@ -365,7 +350,6 @@ func (client ServerKeysClient) listByServerNextResults(lastResults ServerKeyList return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerComplete enumerates all values, automatically crossing page boundaries as required. func (client ServerKeysClient) ListByServerComplete(ctx context.Context, resourceGroupName string, serverName string) (result ServerKeyListResultIterator, err error) { result.page, err = client.ListByServer(ctx, resourceGroupName, serverName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servers.go similarity index 80% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servers.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servers.go index c1316c41332c..b3a35b00d80c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servers.go @@ -25,7 +25,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServersClient is the the Azure SQL Database management API provides a RESTful set of web services that interact with // Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and delete // databases. @@ -33,22 +32,19 @@ type ServersClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServersClient creates an instance of the ServersClient client. func NewServersClient(subscriptionID string) ServersClient { return NewServersClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServersClientWithBaseURI creates an instance of the ServersClient client. func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient { return ServersClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailability determines whether a resource can be created with the specified name. -// -// parameters is the parameters to request for name availability. +// Parameters: +// parameters - the parameters to request for name availability. func (client ServersClient) CheckNameAvailability(ctx context.Context, parameters CheckNameAvailabilityRequest) (result CheckNameAvailabilityResponse, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -78,7 +74,6 @@ func (client ServersClient) CheckNameAvailability(ctx context.Context, parameter return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailabilityPreparer prepares the CheckNameAvailability request. func (client ServersClient) CheckNameAvailabilityPreparer(ctx context.Context, parameters CheckNameAvailabilityRequest) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -100,7 +95,6 @@ func (client ServersClient) CheckNameAvailabilityPreparer(ctx context.Context, p return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailabilitySender sends the CheckNameAvailability request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) CheckNameAvailabilitySender(req *http.Request) (*http.Response, error) { @@ -108,7 +102,6 @@ func (client ServersClient) CheckNameAvailabilitySender(req *http.Request) (*htt azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CheckNameAvailabilityResponder handles the response to the CheckNameAvailability request. The method always // closes the http.Response Body. func (client ServersClient) CheckNameAvailabilityResponder(resp *http.Response) (result CheckNameAvailabilityResponse, err error) { @@ -122,12 +115,12 @@ func (client ServersClient) CheckNameAvailabilityResponder(resp *http.Response) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. parameters is the requested -// server resource state. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// parameters - the requested server resource state. func (client ServersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, parameters Server) (result ServersCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, parameters) if err != nil { @@ -144,7 +137,6 @@ func (client ServersClient) CreateOrUpdate(ctx context.Context, resourceGroupNam return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client ServersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters Server) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -168,7 +160,6 @@ func (client ServersClient) CreateOrUpdatePreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) CreateOrUpdateSender(req *http.Request) (future ServersCreateOrUpdateFuture, err error) { @@ -184,7 +175,6 @@ func (client ServersClient) CreateOrUpdateSender(req *http.Request) (future Serv return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client ServersClient) CreateOrUpdateResponder(resp *http.Response) (result Server, err error) { @@ -198,11 +188,11 @@ func (client ServersClient) CreateOrUpdateResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServersClient) Delete(ctx context.Context, resourceGroupName string, serverName string) (result ServersDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -219,7 +209,6 @@ func (client ServersClient) Delete(ctx context.Context, resourceGroupName string return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client ServersClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -241,7 +230,6 @@ func (client ServersClient) DeletePreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) DeleteSender(req *http.Request) (future ServersDeleteFuture, err error) { @@ -257,7 +245,6 @@ func (client ServersClient) DeleteSender(req *http.Request) (future ServersDelet return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client ServersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -270,11 +257,11 @@ func (client ServersClient) DeleteResponder(resp *http.Response) (result autores return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServersClient) Get(ctx context.Context, resourceGroupName string, serverName string) (result Server, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -297,7 +284,6 @@ func (client ServersClient) Get(ctx context.Context, resourceGroupName string, s return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServersClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -319,7 +305,6 @@ func (client ServersClient) GetPreparer(ctx context.Context, resourceGroupName s return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) GetSender(req *http.Request) (*http.Response, error) { @@ -327,7 +312,6 @@ func (client ServersClient) GetSender(req *http.Request) (*http.Response, error) azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServersClient) GetResponder(resp *http.Response) (result Server, err error) { @@ -341,7 +325,6 @@ func (client ServersClient) GetResponder(resp *http.Response) (result Server, er return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // List gets a list of all servers in the subscription. func (client ServersClient) List(ctx context.Context) (result ServerListResultPage, err error) { result.fn = client.listNextResults @@ -366,7 +349,6 @@ func (client ServersClient) List(ctx context.Context) (result ServerListResultPa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListPreparer prepares the List request. func (client ServersClient) ListPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -386,7 +368,6 @@ func (client ServersClient) ListPreparer(ctx context.Context) (*http.Request, er return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) ListSender(req *http.Request) (*http.Response, error) { @@ -394,7 +375,6 @@ func (client ServersClient) ListSender(req *http.Request) (*http.Response, error azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListResponder handles the response to the List request. The method always // closes the http.Response Body. func (client ServersClient) ListResponder(resp *http.Response) (result ServerListResult, err error) { @@ -429,18 +409,16 @@ func (client ServersClient) listNextResults(lastResults ServerListResult) (resul return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListComplete enumerates all values, automatically crossing page boundaries as required. func (client ServersClient) ListComplete(ctx context.Context) (result ServerListResultIterator, err error) { result.page, err = client.List(ctx) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByResourceGroup gets a list of servers in a resource groups. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. func (client ServersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ServerListResultPage, err error) { result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) @@ -464,7 +442,6 @@ func (client ServersClient) ListByResourceGroup(ctx context.Context, resourceGro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByResourceGroupPreparer prepares the ListByResourceGroup request. func (client ServersClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -485,7 +462,6 @@ func (client ServersClient) ListByResourceGroupPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { @@ -493,7 +469,6 @@ func (client ServersClient) ListByResourceGroupSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always // closes the http.Response Body. func (client ServersClient) ListByResourceGroupResponder(resp *http.Response) (result ServerListResult, err error) { @@ -528,19 +503,18 @@ func (client ServersClient) listByResourceGroupNextResults(lastResults ServerLis return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. func (client ServersClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result ServerListResultIterator, err error) { result.page, err = client.ListByResourceGroup(ctx, resourceGroupName) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Update updates a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. parameters is the requested -// server resource state. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// parameters - the requested server resource state. func (client ServersClient) Update(ctx context.Context, resourceGroupName string, serverName string, parameters ServerUpdate) (result ServersUpdateFuture, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, serverName, parameters) if err != nil { @@ -557,7 +531,6 @@ func (client ServersClient) Update(ctx context.Context, resourceGroupName string return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdatePreparer prepares the Update request. func (client ServersClient) UpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters ServerUpdate) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -581,7 +554,6 @@ func (client ServersClient) UpdatePreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) UpdateSender(req *http.Request) (future ServersUpdateFuture, err error) { @@ -597,7 +569,6 @@ func (client ServersClient) UpdateSender(req *http.Request) (future ServersUpdat return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client ServersClient) UpdateResponder(resp *http.Response) (result Server, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverusages.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverusages.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverusages.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverusages.go index 6aa3e2dad006..cbf405da43a0 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serverusages.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverusages.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServerUsagesClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -32,23 +31,21 @@ type ServerUsagesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerUsagesClient creates an instance of the ServerUsagesClient client. func NewServerUsagesClient(subscriptionID string) ServerUsagesClient { return NewServerUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServerUsagesClientWithBaseURI creates an instance of the ServerUsagesClient client. func NewServerUsagesClientWithBaseURI(baseURI string, subscriptionID string) ServerUsagesClient { return ServerUsagesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer returns server usages. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServerUsagesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result ServerUsageListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -71,7 +68,6 @@ func (client ServerUsagesClient) ListByServer(ctx context.Context, resourceGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client ServerUsagesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -93,7 +89,6 @@ func (client ServerUsagesClient) ListByServerPreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client ServerUsagesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -101,7 +96,6 @@ func (client ServerUsagesClient) ListByServerSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client ServerUsagesClient) ListByServerResponder(resp *http.Response) (result ServerUsageListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serviceobjectives.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serviceobjectives.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serviceobjectives.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serviceobjectives.go index b66790523cb8..9e8b92bfd319 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/serviceobjectives.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serviceobjectives.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceObjectivesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,24 +31,22 @@ type ServiceObjectivesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServiceObjectivesClient creates an instance of the ServiceObjectivesClient client. func NewServiceObjectivesClient(subscriptionID string) ServiceObjectivesClient { return NewServiceObjectivesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServiceObjectivesClientWithBaseURI creates an instance of the ServiceObjectivesClient client. func NewServiceObjectivesClientWithBaseURI(baseURI string, subscriptionID string) ServiceObjectivesClient { return ServiceObjectivesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database service objective. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. serviceObjectiveName is the -// name of the service objective to retrieve. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// serviceObjectiveName - the name of the service objective to retrieve. func (client ServiceObjectivesClient) Get(ctx context.Context, resourceGroupName string, serverName string, serviceObjectiveName string) (result ServiceObjective, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, serviceObjectiveName) if err != nil { @@ -72,7 +69,6 @@ func (client ServiceObjectivesClient) Get(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServiceObjectivesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, serviceObjectiveName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,7 +91,6 @@ func (client ServiceObjectivesClient) GetPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServiceObjectivesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -103,7 +98,6 @@ func (client ServiceObjectivesClient) GetSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServiceObjectivesClient) GetResponder(resp *http.Response) (result ServiceObjective, err error) { @@ -117,11 +111,11 @@ func (client ServiceObjectivesClient) GetResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer returns database service objectives. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client ServiceObjectivesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result ServiceObjectiveListResult, err error) { req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) if err != nil { @@ -144,7 +138,6 @@ func (client ServiceObjectivesClient) ListByServer(ctx context.Context, resource return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client ServiceObjectivesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -166,7 +159,6 @@ func (client ServiceObjectivesClient) ListByServerPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client ServiceObjectivesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -174,7 +166,6 @@ func (client ServiceObjectivesClient) ListByServerSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client ServiceObjectivesClient) ListByServerResponder(resp *http.Response) (result ServiceObjectiveListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servicetieradvisors.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servicetieradvisors.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servicetieradvisors.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servicetieradvisors.go index 55cede01c08d..0d1ee5db99ad 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/servicetieradvisors.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servicetieradvisors.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ServiceTierAdvisorsClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,24 +31,23 @@ type ServiceTierAdvisorsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServiceTierAdvisorsClient creates an instance of the ServiceTierAdvisorsClient client. func NewServiceTierAdvisorsClient(subscriptionID string) ServiceTierAdvisorsClient { return NewServiceTierAdvisorsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewServiceTierAdvisorsClientWithBaseURI creates an instance of the ServiceTierAdvisorsClient client. func NewServiceTierAdvisorsClientWithBaseURI(baseURI string, subscriptionID string) ServiceTierAdvisorsClient { return ServiceTierAdvisorsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a service tier advisor. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// database. serviceTierAdvisorName is the name of service tier advisor. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of database. +// serviceTierAdvisorName - the name of service tier advisor. func (client ServiceTierAdvisorsClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string, serviceTierAdvisorName string) (result ServiceTierAdvisor, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName, serviceTierAdvisorName) if err != nil { @@ -72,7 +70,6 @@ func (client ServiceTierAdvisorsClient) Get(ctx context.Context, resourceGroupNa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client ServiceTierAdvisorsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, serviceTierAdvisorName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -96,7 +93,6 @@ func (client ServiceTierAdvisorsClient) GetPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client ServiceTierAdvisorsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -104,7 +100,6 @@ func (client ServiceTierAdvisorsClient) GetSender(req *http.Request) (*http.Resp azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client ServiceTierAdvisorsClient) GetResponder(resp *http.Response) (result ServiceTierAdvisor, err error) { @@ -118,12 +113,12 @@ func (client ServiceTierAdvisorsClient) GetResponder(resp *http.Response) (resul return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase returns service tier advisors for specified database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// database. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of database. func (client ServiceTierAdvisorsClient) ListByDatabase(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result ServiceTierAdvisorListResult, err error) { req, err := client.ListByDatabasePreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -146,7 +141,6 @@ func (client ServiceTierAdvisorsClient) ListByDatabase(ctx context.Context, reso return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client ServiceTierAdvisorsClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -169,7 +163,6 @@ func (client ServiceTierAdvisorsClient) ListByDatabasePreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client ServiceTierAdvisorsClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -177,7 +170,6 @@ func (client ServiceTierAdvisorsClient) ListByDatabaseSender(req *http.Request) azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client ServiceTierAdvisorsClient) ListByDatabaseResponder(resp *http.Response) (result ServiceTierAdvisorListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/subscriptionusages.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/subscriptionusages.go similarity index 82% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/subscriptionusages.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/subscriptionusages.go index ee985d4b9975..fb8883c25a77 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/subscriptionusages.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/subscriptionusages.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SubscriptionUsagesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -32,23 +31,20 @@ type SubscriptionUsagesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSubscriptionUsagesClient creates an instance of the SubscriptionUsagesClient client. func NewSubscriptionUsagesClient(subscriptionID string) SubscriptionUsagesClient { return NewSubscriptionUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSubscriptionUsagesClientWithBaseURI creates an instance of the SubscriptionUsagesClient client. func NewSubscriptionUsagesClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionUsagesClient { return SubscriptionUsagesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a subscription usage metric. -// -// locationName is the name of the region where the resource is located. usageName is name of usage metric to -// return. +// Parameters: +// locationName - the name of the region where the resource is located. +// usageName - name of usage metric to return. func (client SubscriptionUsagesClient) Get(ctx context.Context, locationName string, usageName string) (result SubscriptionUsage, err error) { req, err := client.GetPreparer(ctx, locationName, usageName) if err != nil { @@ -71,7 +67,6 @@ func (client SubscriptionUsagesClient) Get(ctx context.Context, locationName str return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client SubscriptionUsagesClient) GetPreparer(ctx context.Context, locationName string, usageName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -93,7 +88,6 @@ func (client SubscriptionUsagesClient) GetPreparer(ctx context.Context, location return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client SubscriptionUsagesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -101,7 +95,6 @@ func (client SubscriptionUsagesClient) GetSender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client SubscriptionUsagesClient) GetResponder(resp *http.Response) (result SubscriptionUsage, err error) { @@ -115,10 +108,9 @@ func (client SubscriptionUsagesClient) GetResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocation gets all subscription usage metrics in a given location. -// -// locationName is the name of the region where the resource is located. +// Parameters: +// locationName - the name of the region where the resource is located. func (client SubscriptionUsagesClient) ListByLocation(ctx context.Context, locationName string) (result SubscriptionUsageListResultPage, err error) { result.fn = client.listByLocationNextResults req, err := client.ListByLocationPreparer(ctx, locationName) @@ -142,7 +134,6 @@ func (client SubscriptionUsagesClient) ListByLocation(ctx context.Context, locat return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationPreparer prepares the ListByLocation request. func (client SubscriptionUsagesClient) ListByLocationPreparer(ctx context.Context, locationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -163,7 +154,6 @@ func (client SubscriptionUsagesClient) ListByLocationPreparer(ctx context.Contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationSender sends the ListByLocation request. The method will close the // http.Response Body if it receives an error. func (client SubscriptionUsagesClient) ListByLocationSender(req *http.Request) (*http.Response, error) { @@ -171,7 +161,6 @@ func (client SubscriptionUsagesClient) ListByLocationSender(req *http.Request) ( azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationResponder handles the response to the ListByLocation request. The method always // closes the http.Response Body. func (client SubscriptionUsagesClient) ListByLocationResponder(resp *http.Response) (result SubscriptionUsageListResult, err error) { @@ -206,7 +195,6 @@ func (client SubscriptionUsagesClient) listByLocationNextResults(lastResults Sub return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByLocationComplete enumerates all values, automatically crossing page boundaries as required. func (client SubscriptionUsagesClient) ListByLocationComplete(ctx context.Context, locationName string) (result SubscriptionUsageListResultIterator, err error) { result.page, err = client.ListByLocation(ctx, locationName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncagents.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncagents.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncagents.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncagents.go index 33b7c5246705..6b587e7383e9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncagents.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncagents.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncAgentsClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -32,24 +31,23 @@ type SyncAgentsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSyncAgentsClient creates an instance of the SyncAgentsClient client. func NewSyncAgentsClient(subscriptionID string) SyncAgentsClient { return NewSyncAgentsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSyncAgentsClientWithBaseURI creates an instance of the SyncAgentsClient client. func NewSyncAgentsClientWithBaseURI(baseURI string, subscriptionID string) SyncAgentsClient { return SyncAgentsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a sync agent. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server on which the sync agent is -// hosted. syncAgentName is the name of the sync agent. parameters is the requested sync agent resource state. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server on which the sync agent is hosted. +// syncAgentName - the name of the sync agent. +// parameters - the requested sync agent resource state. func (client SyncAgentsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string, parameters SyncAgent) (result SyncAgentsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, syncAgentName, parameters) if err != nil { @@ -66,7 +64,6 @@ func (client SyncAgentsClient) CreateOrUpdate(ctx context.Context, resourceGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client SyncAgentsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string, parameters SyncAgent) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -91,7 +88,6 @@ func (client SyncAgentsClient) CreateOrUpdatePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) CreateOrUpdateSender(req *http.Request) (future SyncAgentsCreateOrUpdateFuture, err error) { @@ -107,7 +103,6 @@ func (client SyncAgentsClient) CreateOrUpdateSender(req *http.Request) (future S return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client SyncAgentsClient) CreateOrUpdateResponder(resp *http.Response) (result SyncAgent, err error) { @@ -121,12 +116,12 @@ func (client SyncAgentsClient) CreateOrUpdateResponder(resp *http.Response) (res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a sync agent. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server on which the sync agent is -// hosted. syncAgentName is the name of the sync agent. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server on which the sync agent is hosted. +// syncAgentName - the name of the sync agent. func (client SyncAgentsClient) Delete(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (result SyncAgentsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, syncAgentName) if err != nil { @@ -143,7 +138,6 @@ func (client SyncAgentsClient) Delete(ctx context.Context, resourceGroupName str return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client SyncAgentsClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -166,7 +160,6 @@ func (client SyncAgentsClient) DeletePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) DeleteSender(req *http.Request) (future SyncAgentsDeleteFuture, err error) { @@ -182,7 +175,6 @@ func (client SyncAgentsClient) DeleteSender(req *http.Request) (future SyncAgent return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client SyncAgentsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -195,12 +187,12 @@ func (client SyncAgentsClient) DeleteResponder(resp *http.Response) (result auto return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GenerateKey generates a sync agent key. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server on which the sync agent is -// hosted. syncAgentName is the name of the sync agent. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server on which the sync agent is hosted. +// syncAgentName - the name of the sync agent. func (client SyncAgentsClient) GenerateKey(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (result SyncAgentKeyProperties, err error) { req, err := client.GenerateKeyPreparer(ctx, resourceGroupName, serverName, syncAgentName) if err != nil { @@ -223,7 +215,6 @@ func (client SyncAgentsClient) GenerateKey(ctx context.Context, resourceGroupNam return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GenerateKeyPreparer prepares the GenerateKey request. func (client SyncAgentsClient) GenerateKeyPreparer(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -246,7 +237,6 @@ func (client SyncAgentsClient) GenerateKeyPreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GenerateKeySender sends the GenerateKey request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) GenerateKeySender(req *http.Request) (*http.Response, error) { @@ -254,7 +244,6 @@ func (client SyncAgentsClient) GenerateKeySender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GenerateKeyResponder handles the response to the GenerateKey request. The method always // closes the http.Response Body. func (client SyncAgentsClient) GenerateKeyResponder(resp *http.Response) (result SyncAgentKeyProperties, err error) { @@ -268,12 +257,12 @@ func (client SyncAgentsClient) GenerateKeyResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a sync agent. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server on which the sync agent is -// hosted. syncAgentName is the name of the sync agent. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server on which the sync agent is hosted. +// syncAgentName - the name of the sync agent. func (client SyncAgentsClient) Get(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (result SyncAgent, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, syncAgentName) if err != nil { @@ -296,7 +285,6 @@ func (client SyncAgentsClient) Get(ctx context.Context, resourceGroupName string return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client SyncAgentsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -319,7 +307,6 @@ func (client SyncAgentsClient) GetPreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -327,7 +314,6 @@ func (client SyncAgentsClient) GetSender(req *http.Request) (*http.Response, err azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client SyncAgentsClient) GetResponder(resp *http.Response) (result SyncAgent, err error) { @@ -341,12 +327,11 @@ func (client SyncAgentsClient) GetResponder(resp *http.Response) (result SyncAge return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer lists sync agents in a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server on which the sync agent is -// hosted. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server on which the sync agent is hosted. func (client SyncAgentsClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result SyncAgentListResultPage, err error) { result.fn = client.listByServerNextResults req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) @@ -370,7 +355,6 @@ func (client SyncAgentsClient) ListByServer(ctx context.Context, resourceGroupNa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client SyncAgentsClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -392,7 +376,6 @@ func (client SyncAgentsClient) ListByServerPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -400,7 +383,6 @@ func (client SyncAgentsClient) ListByServerSender(req *http.Request) (*http.Resp azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client SyncAgentsClient) ListByServerResponder(resp *http.Response) (result SyncAgentListResult, err error) { @@ -435,19 +417,18 @@ func (client SyncAgentsClient) listByServerNextResults(lastResults SyncAgentList return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncAgentsClient) ListByServerComplete(ctx context.Context, resourceGroupName string, serverName string) (result SyncAgentListResultIterator, err error) { result.page, err = client.ListByServer(ctx, resourceGroupName, serverName) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLinkedDatabases lists databases linked to a sync agent. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server on which the sync agent is -// hosted. syncAgentName is the name of the sync agent. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server on which the sync agent is hosted. +// syncAgentName - the name of the sync agent. func (client SyncAgentsClient) ListLinkedDatabases(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (result SyncAgentLinkedDatabaseListResultPage, err error) { result.fn = client.listLinkedDatabasesNextResults req, err := client.ListLinkedDatabasesPreparer(ctx, resourceGroupName, serverName, syncAgentName) @@ -471,7 +452,6 @@ func (client SyncAgentsClient) ListLinkedDatabases(ctx context.Context, resource return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLinkedDatabasesPreparer prepares the ListLinkedDatabases request. func (client SyncAgentsClient) ListLinkedDatabasesPreparer(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -494,7 +474,6 @@ func (client SyncAgentsClient) ListLinkedDatabasesPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLinkedDatabasesSender sends the ListLinkedDatabases request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) ListLinkedDatabasesSender(req *http.Request) (*http.Response, error) { @@ -502,7 +481,6 @@ func (client SyncAgentsClient) ListLinkedDatabasesSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLinkedDatabasesResponder handles the response to the ListLinkedDatabases request. The method always // closes the http.Response Body. func (client SyncAgentsClient) ListLinkedDatabasesResponder(resp *http.Response) (result SyncAgentLinkedDatabaseListResult, err error) { @@ -537,7 +515,6 @@ func (client SyncAgentsClient) listLinkedDatabasesNextResults(lastResults SyncAg return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLinkedDatabasesComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncAgentsClient) ListLinkedDatabasesComplete(ctx context.Context, resourceGroupName string, serverName string, syncAgentName string) (result SyncAgentLinkedDatabaseListResultIterator, err error) { result.page, err = client.ListLinkedDatabases(ctx, resourceGroupName, serverName, syncAgentName) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncgroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncgroups.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncgroups.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncgroups.go index 79dec2b50874..5b405d5c9977 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncgroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncgroups.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncGroupsClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -32,24 +31,23 @@ type SyncGroupsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSyncGroupsClient creates an instance of the SyncGroupsClient client. func NewSyncGroupsClient(subscriptionID string) SyncGroupsClient { return NewSyncGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSyncGroupsClientWithBaseURI creates an instance of the SyncGroupsClient client. func NewSyncGroupsClientWithBaseURI(baseURI string, subscriptionID string) SyncGroupsClient { return SyncGroupsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CancelSync cancels a sync group synchronization. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group. func (client SyncGroupsClient) CancelSync(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (result autorest.Response, err error) { req, err := client.CancelSyncPreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName) if err != nil { @@ -72,7 +70,6 @@ func (client SyncGroupsClient) CancelSync(ctx context.Context, resourceGroupName return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CancelSyncPreparer prepares the CancelSync request. func (client SyncGroupsClient) CancelSyncPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -96,7 +93,6 @@ func (client SyncGroupsClient) CancelSyncPreparer(ctx context.Context, resourceG return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CancelSyncSender sends the CancelSync request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) CancelSyncSender(req *http.Request) (*http.Response, error) { @@ -104,7 +100,6 @@ func (client SyncGroupsClient) CancelSyncSender(req *http.Request) (*http.Respon azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CancelSyncResponder handles the response to the CancelSync request. The method always // closes the http.Response Body. func (client SyncGroupsClient) CancelSyncResponder(resp *http.Response) (result autorest.Response, err error) { @@ -117,13 +112,14 @@ func (client SyncGroupsClient) CancelSyncResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a sync group. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group. parameters is the -// requested sync group resource state. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group. +// parameters - the requested sync group resource state. func (client SyncGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, parameters SyncGroup) (result SyncGroupsCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName, parameters) if err != nil { @@ -140,7 +136,6 @@ func (client SyncGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client SyncGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, parameters SyncGroup) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -166,7 +161,6 @@ func (client SyncGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) CreateOrUpdateSender(req *http.Request) (future SyncGroupsCreateOrUpdateFuture, err error) { @@ -182,7 +176,6 @@ func (client SyncGroupsClient) CreateOrUpdateSender(req *http.Request) (future S return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client SyncGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result SyncGroup, err error) { @@ -196,12 +189,13 @@ func (client SyncGroupsClient) CreateOrUpdateResponder(resp *http.Response) (res return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a sync group. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group. func (client SyncGroupsClient) Delete(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (result SyncGroupsDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName) if err != nil { @@ -218,7 +212,6 @@ func (client SyncGroupsClient) Delete(ctx context.Context, resourceGroupName str return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client SyncGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -242,7 +235,6 @@ func (client SyncGroupsClient) DeletePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) DeleteSender(req *http.Request) (future SyncGroupsDeleteFuture, err error) { @@ -258,7 +250,6 @@ func (client SyncGroupsClient) DeleteSender(req *http.Request) (future SyncGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client SyncGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -271,12 +262,13 @@ func (client SyncGroupsClient) DeleteResponder(resp *http.Response) (result auto return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a sync group. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group. func (client SyncGroupsClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (result SyncGroup, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName) if err != nil { @@ -299,7 +291,6 @@ func (client SyncGroupsClient) Get(ctx context.Context, resourceGroupName string return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client SyncGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -323,7 +314,6 @@ func (client SyncGroupsClient) GetPreparer(ctx context.Context, resourceGroupNam return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -331,7 +321,6 @@ func (client SyncGroupsClient) GetSender(req *http.Request) (*http.Response, err azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client SyncGroupsClient) GetResponder(resp *http.Response) (result SyncGroup, err error) { @@ -345,12 +334,12 @@ func (client SyncGroupsClient) GetResponder(resp *http.Response) (result SyncGro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabase lists sync groups under a hub database. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. func (client SyncGroupsClient) ListByDatabase(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result SyncGroupListResultPage, err error) { result.fn = client.listByDatabaseNextResults req, err := client.ListByDatabasePreparer(ctx, resourceGroupName, serverName, databaseName) @@ -374,7 +363,6 @@ func (client SyncGroupsClient) ListByDatabase(ctx context.Context, resourceGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabasePreparer prepares the ListByDatabase request. func (client SyncGroupsClient) ListByDatabasePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -397,7 +385,6 @@ func (client SyncGroupsClient) ListByDatabasePreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseSender sends the ListByDatabase request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) ListByDatabaseSender(req *http.Request) (*http.Response, error) { @@ -405,7 +392,6 @@ func (client SyncGroupsClient) ListByDatabaseSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseResponder handles the response to the ListByDatabase request. The method always // closes the http.Response Body. func (client SyncGroupsClient) ListByDatabaseResponder(resp *http.Response) (result SyncGroupListResult, err error) { @@ -440,19 +426,19 @@ func (client SyncGroupsClient) listByDatabaseNextResults(lastResults SyncGroupLi return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByDatabaseComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncGroupsClient) ListByDatabaseComplete(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result SyncGroupListResultIterator, err error) { result.page, err = client.ListByDatabase(ctx, resourceGroupName, serverName, databaseName) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListHubSchemas gets a collection of hub database schemas. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group. func (client SyncGroupsClient) ListHubSchemas(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (result SyncFullSchemaPropertiesListResultPage, err error) { result.fn = client.listHubSchemasNextResults req, err := client.ListHubSchemasPreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName) @@ -476,7 +462,6 @@ func (client SyncGroupsClient) ListHubSchemas(ctx context.Context, resourceGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListHubSchemasPreparer prepares the ListHubSchemas request. func (client SyncGroupsClient) ListHubSchemasPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -500,7 +485,6 @@ func (client SyncGroupsClient) ListHubSchemasPreparer(ctx context.Context, resou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListHubSchemasSender sends the ListHubSchemas request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) ListHubSchemasSender(req *http.Request) (*http.Response, error) { @@ -508,7 +492,6 @@ func (client SyncGroupsClient) ListHubSchemasSender(req *http.Request) (*http.Re azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListHubSchemasResponder handles the response to the ListHubSchemas request. The method always // closes the http.Response Body. func (client SyncGroupsClient) ListHubSchemasResponder(resp *http.Response) (result SyncFullSchemaPropertiesListResult, err error) { @@ -543,21 +526,23 @@ func (client SyncGroupsClient) listHubSchemasNextResults(lastResults SyncFullSch return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListHubSchemasComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncGroupsClient) ListHubSchemasComplete(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (result SyncFullSchemaPropertiesListResultIterator, err error) { result.page, err = client.ListHubSchemas(ctx, resourceGroupName, serverName, databaseName, syncGroupName) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLogs gets a collection of sync group logs. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group. startTime is get -// logs generated after this time. endTime is get logs generated before this time. typeParameter is the types of -// logs to retrieve. continuationToken is the continuation token for this operation. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group. +// startTime - get logs generated after this time. +// endTime - get logs generated before this time. +// typeParameter - the types of logs to retrieve. +// continuationToken - the continuation token for this operation. func (client SyncGroupsClient) ListLogs(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, startTime string, endTime string, typeParameter string, continuationToken string) (result SyncGroupLogListResultPage, err error) { result.fn = client.listLogsNextResults req, err := client.ListLogsPreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName, startTime, endTime, typeParameter, continuationToken) @@ -581,7 +566,6 @@ func (client SyncGroupsClient) ListLogs(ctx context.Context, resourceGroupName s return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLogsPreparer prepares the ListLogs request. func (client SyncGroupsClient) ListLogsPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, startTime string, endTime string, typeParameter string, continuationToken string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -611,7 +595,6 @@ func (client SyncGroupsClient) ListLogsPreparer(ctx context.Context, resourceGro return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLogsSender sends the ListLogs request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) ListLogsSender(req *http.Request) (*http.Response, error) { @@ -619,7 +602,6 @@ func (client SyncGroupsClient) ListLogsSender(req *http.Request) (*http.Response azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLogsResponder handles the response to the ListLogs request. The method always // closes the http.Response Body. func (client SyncGroupsClient) ListLogsResponder(resp *http.Response) (result SyncGroupLogListResult, err error) { @@ -654,17 +636,15 @@ func (client SyncGroupsClient) listLogsNextResults(lastResults SyncGroupLogListR return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListLogsComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncGroupsClient) ListLogsComplete(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, startTime string, endTime string, typeParameter string, continuationToken string) (result SyncGroupLogListResultIterator, err error) { result.page, err = client.ListLogs(ctx, resourceGroupName, serverName, databaseName, syncGroupName, startTime, endTime, typeParameter, continuationToken) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSyncDatabaseIds gets a collection of sync database ids. -// -// locationName is the name of the region where the resource is located. +// Parameters: +// locationName - the name of the region where the resource is located. func (client SyncGroupsClient) ListSyncDatabaseIds(ctx context.Context, locationName string) (result SyncDatabaseIDListResultPage, err error) { result.fn = client.listSyncDatabaseIdsNextResults req, err := client.ListSyncDatabaseIdsPreparer(ctx, locationName) @@ -688,7 +668,6 @@ func (client SyncGroupsClient) ListSyncDatabaseIds(ctx context.Context, location return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSyncDatabaseIdsPreparer prepares the ListSyncDatabaseIds request. func (client SyncGroupsClient) ListSyncDatabaseIdsPreparer(ctx context.Context, locationName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -709,7 +688,6 @@ func (client SyncGroupsClient) ListSyncDatabaseIdsPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSyncDatabaseIdsSender sends the ListSyncDatabaseIds request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) ListSyncDatabaseIdsSender(req *http.Request) (*http.Response, error) { @@ -717,7 +695,6 @@ func (client SyncGroupsClient) ListSyncDatabaseIdsSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSyncDatabaseIdsResponder handles the response to the ListSyncDatabaseIds request. The method always // closes the http.Response Body. func (client SyncGroupsClient) ListSyncDatabaseIdsResponder(resp *http.Response) (result SyncDatabaseIDListResult, err error) { @@ -752,19 +729,19 @@ func (client SyncGroupsClient) listSyncDatabaseIdsNextResults(lastResults SyncDa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListSyncDatabaseIdsComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncGroupsClient) ListSyncDatabaseIdsComplete(ctx context.Context, locationName string) (result SyncDatabaseIDListResultIterator, err error) { result.page, err = client.ListSyncDatabaseIds(ctx, locationName) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshHubSchema refreshes a hub database schema. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group. func (client SyncGroupsClient) RefreshHubSchema(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (result SyncGroupsRefreshHubSchemaFuture, err error) { req, err := client.RefreshHubSchemaPreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName) if err != nil { @@ -781,7 +758,6 @@ func (client SyncGroupsClient) RefreshHubSchema(ctx context.Context, resourceGro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshHubSchemaPreparer prepares the RefreshHubSchema request. func (client SyncGroupsClient) RefreshHubSchemaPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -805,7 +781,6 @@ func (client SyncGroupsClient) RefreshHubSchemaPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshHubSchemaSender sends the RefreshHubSchema request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) RefreshHubSchemaSender(req *http.Request) (future SyncGroupsRefreshHubSchemaFuture, err error) { @@ -821,7 +796,6 @@ func (client SyncGroupsClient) RefreshHubSchemaSender(req *http.Request) (future return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshHubSchemaResponder handles the response to the RefreshHubSchema request. The method always // closes the http.Response Body. func (client SyncGroupsClient) RefreshHubSchemaResponder(resp *http.Response) (result autorest.Response, err error) { @@ -834,12 +808,13 @@ func (client SyncGroupsClient) RefreshHubSchemaResponder(resp *http.Response) (r return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TriggerSync triggers a sync group synchronization. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group. func (client SyncGroupsClient) TriggerSync(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (result autorest.Response, err error) { req, err := client.TriggerSyncPreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName) if err != nil { @@ -862,7 +837,6 @@ func (client SyncGroupsClient) TriggerSync(ctx context.Context, resourceGroupNam return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TriggerSyncPreparer prepares the TriggerSync request. func (client SyncGroupsClient) TriggerSyncPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -886,7 +860,6 @@ func (client SyncGroupsClient) TriggerSyncPreparer(ctx context.Context, resource return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TriggerSyncSender sends the TriggerSync request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) TriggerSyncSender(req *http.Request) (*http.Response, error) { @@ -894,7 +867,6 @@ func (client SyncGroupsClient) TriggerSyncSender(req *http.Request) (*http.Respo azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TriggerSyncResponder handles the response to the TriggerSync request. The method always // closes the http.Response Body. func (client SyncGroupsClient) TriggerSyncResponder(resp *http.Response) (result autorest.Response, err error) { @@ -907,13 +879,14 @@ func (client SyncGroupsClient) TriggerSyncResponder(resp *http.Response) (result return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Update updates a sync group. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group. parameters is the -// requested sync group resource state. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group. +// parameters - the requested sync group resource state. func (client SyncGroupsClient) Update(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, parameters SyncGroup) (result SyncGroupsUpdateFuture, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName, parameters) if err != nil { @@ -930,7 +903,6 @@ func (client SyncGroupsClient) Update(ctx context.Context, resourceGroupName str return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdatePreparer prepares the Update request. func (client SyncGroupsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, parameters SyncGroup) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -956,7 +928,6 @@ func (client SyncGroupsClient) UpdatePreparer(ctx context.Context, resourceGroup return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) UpdateSender(req *http.Request) (future SyncGroupsUpdateFuture, err error) { @@ -972,7 +943,6 @@ func (client SyncGroupsClient) UpdateSender(req *http.Request) (future SyncGroup return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client SyncGroupsClient) UpdateResponder(resp *http.Response) (result SyncGroup, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncmembers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncmembers.go similarity index 78% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncmembers.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncmembers.go index 9b29ee128362..01e211f11b08 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/syncmembers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncmembers.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // SyncMembersClient is the the Azure SQL Database management API provides a RESTful set of web services that interact // with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and // delete databases. @@ -32,26 +31,25 @@ type SyncMembersClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSyncMembersClient creates an instance of the SyncMembersClient client. func NewSyncMembersClient(subscriptionID string) SyncMembersClient { return NewSyncMembersClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewSyncMembersClientWithBaseURI creates an instance of the SyncMembersClient client. func NewSyncMembersClientWithBaseURI(baseURI string, subscriptionID string) SyncMembersClient { return SyncMembersClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a sync member. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group on which the sync -// member is hosted. syncMemberName is the name of the sync member. parameters is the requested sync member -// resource state. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group on which the sync member is hosted. +// syncMemberName - the name of the sync member. +// parameters - the requested sync member resource state. func (client SyncMembersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string, parameters SyncMember) (result SyncMembersCreateOrUpdateFuture, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName, syncMemberName, parameters) if err != nil { @@ -68,7 +66,6 @@ func (client SyncMembersClient) CreateOrUpdate(ctx context.Context, resourceGrou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client SyncMembersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string, parameters SyncMember) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -95,7 +92,6 @@ func (client SyncMembersClient) CreateOrUpdatePreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) CreateOrUpdateSender(req *http.Request) (future SyncMembersCreateOrUpdateFuture, err error) { @@ -111,7 +107,6 @@ func (client SyncMembersClient) CreateOrUpdateSender(req *http.Request) (future return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client SyncMembersClient) CreateOrUpdateResponder(resp *http.Response) (result SyncMember, err error) { @@ -125,13 +120,14 @@ func (client SyncMembersClient) CreateOrUpdateResponder(resp *http.Response) (re return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes a sync member. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group on which the sync -// member is hosted. syncMemberName is the name of the sync member. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group on which the sync member is hosted. +// syncMemberName - the name of the sync member. func (client SyncMembersClient) Delete(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (result SyncMembersDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName, syncMemberName) if err != nil { @@ -148,7 +144,6 @@ func (client SyncMembersClient) Delete(ctx context.Context, resourceGroupName st return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client SyncMembersClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -173,7 +168,6 @@ func (client SyncMembersClient) DeletePreparer(ctx context.Context, resourceGrou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) DeleteSender(req *http.Request) (future SyncMembersDeleteFuture, err error) { @@ -189,7 +183,6 @@ func (client SyncMembersClient) DeleteSender(req *http.Request) (future SyncMemb return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client SyncMembersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -202,13 +195,14 @@ func (client SyncMembersClient) DeleteResponder(resp *http.Response) (result aut return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a sync member. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group on which the sync -// member is hosted. syncMemberName is the name of the sync member. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group on which the sync member is hosted. +// syncMemberName - the name of the sync member. func (client SyncMembersClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (result SyncMember, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName, syncMemberName) if err != nil { @@ -231,7 +225,6 @@ func (client SyncMembersClient) Get(ctx context.Context, resourceGroupName strin return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client SyncMembersClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -256,7 +249,6 @@ func (client SyncMembersClient) GetPreparer(ctx context.Context, resourceGroupNa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) GetSender(req *http.Request) (*http.Response, error) { @@ -264,7 +256,6 @@ func (client SyncMembersClient) GetSender(req *http.Request) (*http.Response, er azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client SyncMembersClient) GetResponder(resp *http.Response) (result SyncMember, err error) { @@ -278,12 +269,13 @@ func (client SyncMembersClient) GetResponder(resp *http.Response) (result SyncMe return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListBySyncGroup lists sync members in the given sync group. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group. func (client SyncMembersClient) ListBySyncGroup(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (result SyncMemberListResultPage, err error) { result.fn = client.listBySyncGroupNextResults req, err := client.ListBySyncGroupPreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName) @@ -307,7 +299,6 @@ func (client SyncMembersClient) ListBySyncGroup(ctx context.Context, resourceGro return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListBySyncGroupPreparer prepares the ListBySyncGroup request. func (client SyncMembersClient) ListBySyncGroupPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -331,7 +322,6 @@ func (client SyncMembersClient) ListBySyncGroupPreparer(ctx context.Context, res return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListBySyncGroupSender sends the ListBySyncGroup request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) ListBySyncGroupSender(req *http.Request) (*http.Response, error) { @@ -339,7 +329,6 @@ func (client SyncMembersClient) ListBySyncGroupSender(req *http.Request) (*http. azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListBySyncGroupResponder handles the response to the ListBySyncGroup request. The method always // closes the http.Response Body. func (client SyncMembersClient) ListBySyncGroupResponder(resp *http.Response) (result SyncMemberListResult, err error) { @@ -374,20 +363,20 @@ func (client SyncMembersClient) listBySyncGroupNextResults(lastResults SyncMembe return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListBySyncGroupComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncMembersClient) ListBySyncGroupComplete(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string) (result SyncMemberListResultIterator, err error) { result.page, err = client.ListBySyncGroup(ctx, resourceGroupName, serverName, databaseName, syncGroupName) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMemberSchemas gets a sync member database schema. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group on which the sync -// member is hosted. syncMemberName is the name of the sync member. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group on which the sync member is hosted. +// syncMemberName - the name of the sync member. func (client SyncMembersClient) ListMemberSchemas(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (result SyncFullSchemaPropertiesListResultPage, err error) { result.fn = client.listMemberSchemasNextResults req, err := client.ListMemberSchemasPreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName, syncMemberName) @@ -411,7 +400,6 @@ func (client SyncMembersClient) ListMemberSchemas(ctx context.Context, resourceG return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMemberSchemasPreparer prepares the ListMemberSchemas request. func (client SyncMembersClient) ListMemberSchemasPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -436,7 +424,6 @@ func (client SyncMembersClient) ListMemberSchemasPreparer(ctx context.Context, r return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMemberSchemasSender sends the ListMemberSchemas request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) ListMemberSchemasSender(req *http.Request) (*http.Response, error) { @@ -444,7 +431,6 @@ func (client SyncMembersClient) ListMemberSchemasSender(req *http.Request) (*htt azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMemberSchemasResponder handles the response to the ListMemberSchemas request. The method always // closes the http.Response Body. func (client SyncMembersClient) ListMemberSchemasResponder(resp *http.Response) (result SyncFullSchemaPropertiesListResult, err error) { @@ -479,20 +465,20 @@ func (client SyncMembersClient) listMemberSchemasNextResults(lastResults SyncFul return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListMemberSchemasComplete enumerates all values, automatically crossing page boundaries as required. func (client SyncMembersClient) ListMemberSchemasComplete(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (result SyncFullSchemaPropertiesListResultIterator, err error) { result.page, err = client.ListMemberSchemas(ctx, resourceGroupName, serverName, databaseName, syncGroupName, syncMemberName) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshMemberSchema refreshes a sync member database schema. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group on which the sync -// member is hosted. syncMemberName is the name of the sync member. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group on which the sync member is hosted. +// syncMemberName - the name of the sync member. func (client SyncMembersClient) RefreshMemberSchema(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (result SyncMembersRefreshMemberSchemaFuture, err error) { req, err := client.RefreshMemberSchemaPreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName, syncMemberName) if err != nil { @@ -509,7 +495,6 @@ func (client SyncMembersClient) RefreshMemberSchema(ctx context.Context, resourc return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshMemberSchemaPreparer prepares the RefreshMemberSchema request. func (client SyncMembersClient) RefreshMemberSchemaPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -534,7 +519,6 @@ func (client SyncMembersClient) RefreshMemberSchemaPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshMemberSchemaSender sends the RefreshMemberSchema request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) RefreshMemberSchemaSender(req *http.Request) (future SyncMembersRefreshMemberSchemaFuture, err error) { @@ -550,7 +534,6 @@ func (client SyncMembersClient) RefreshMemberSchemaSender(req *http.Request) (fu return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // RefreshMemberSchemaResponder handles the response to the RefreshMemberSchema request. The method always // closes the http.Response Body. func (client SyncMembersClient) RefreshMemberSchemaResponder(resp *http.Response) (result autorest.Response, err error) { @@ -563,14 +546,15 @@ func (client SyncMembersClient) RefreshMemberSchemaResponder(resp *http.Response return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Update updates an existing sync member. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database on which the sync group is hosted. syncGroupName is the name of the sync group on which the sync -// member is hosted. syncMemberName is the name of the sync member. parameters is the requested sync member -// resource state. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database on which the sync group is hosted. +// syncGroupName - the name of the sync group on which the sync member is hosted. +// syncMemberName - the name of the sync member. +// parameters - the requested sync member resource state. func (client SyncMembersClient) Update(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string, parameters SyncMember) (result SyncMembersUpdateFuture, err error) { req, err := client.UpdatePreparer(ctx, resourceGroupName, serverName, databaseName, syncGroupName, syncMemberName, parameters) if err != nil { @@ -587,7 +571,6 @@ func (client SyncMembersClient) Update(ctx context.Context, resourceGroupName st return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdatePreparer prepares the Update request. func (client SyncMembersClient) UpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, syncGroupName string, syncMemberName string, parameters SyncMember) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -614,7 +597,6 @@ func (client SyncMembersClient) UpdatePreparer(ctx context.Context, resourceGrou return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) UpdateSender(req *http.Request) (future SyncMembersUpdateFuture, err error) { @@ -630,7 +612,6 @@ func (client SyncMembersClient) UpdateSender(req *http.Request) (future SyncMemb return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // UpdateResponder handles the response to the Update request. The method always // closes the http.Response Body. func (client SyncMembersClient) UpdateResponder(resp *http.Response) (result SyncMember, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptionactivities.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptionactivities.go similarity index 81% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptionactivities.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptionactivities.go index d39006a3f60c..2991d1317a39 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptionactivities.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptionactivities.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionActivitiesClient is the the Azure SQL Database management API provides a RESTful set of web // services that interact with Azure SQL Database services to manage your databases. The API enables you to create, // retrieve, update, and delete databases. @@ -32,26 +31,24 @@ type TransparentDataEncryptionActivitiesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewTransparentDataEncryptionActivitiesClient creates an instance of the TransparentDataEncryptionActivitiesClient // client. func NewTransparentDataEncryptionActivitiesClient(subscriptionID string) TransparentDataEncryptionActivitiesClient { return NewTransparentDataEncryptionActivitiesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewTransparentDataEncryptionActivitiesClientWithBaseURI creates an instance of the // TransparentDataEncryptionActivitiesClient client. func NewTransparentDataEncryptionActivitiesClientWithBaseURI(baseURI string, subscriptionID string) TransparentDataEncryptionActivitiesClient { return TransparentDataEncryptionActivitiesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByConfiguration returns a database's transparent data encryption operation result. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database for which the transparent data encryption applies. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database for which the transparent data encryption applies. func (client TransparentDataEncryptionActivitiesClient) ListByConfiguration(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result TransparentDataEncryptionActivityListResult, err error) { req, err := client.ListByConfigurationPreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -74,7 +71,6 @@ func (client TransparentDataEncryptionActivitiesClient) ListByConfiguration(ctx return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByConfigurationPreparer prepares the ListByConfiguration request. func (client TransparentDataEncryptionActivitiesClient) ListByConfigurationPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -98,7 +94,6 @@ func (client TransparentDataEncryptionActivitiesClient) ListByConfigurationPrepa return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByConfigurationSender sends the ListByConfiguration request. The method will close the // http.Response Body if it receives an error. func (client TransparentDataEncryptionActivitiesClient) ListByConfigurationSender(req *http.Request) (*http.Response, error) { @@ -106,7 +101,6 @@ func (client TransparentDataEncryptionActivitiesClient) ListByConfigurationSende azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByConfigurationResponder handles the response to the ListByConfiguration request. The method always // closes the http.Response Body. func (client TransparentDataEncryptionActivitiesClient) ListByConfigurationResponder(resp *http.Response) (result TransparentDataEncryptionActivityListResult, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptions.go similarity index 79% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptions.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptions.go index 8e6448c75734..c98d59a94625 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/transparentdataencryptions.go @@ -24,7 +24,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // TransparentDataEncryptionsClient is the the Azure SQL Database management API provides a RESTful set of web services // that interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, // update, and delete databases. @@ -32,25 +31,23 @@ type TransparentDataEncryptionsClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewTransparentDataEncryptionsClient creates an instance of the TransparentDataEncryptionsClient client. func NewTransparentDataEncryptionsClient(subscriptionID string) TransparentDataEncryptionsClient { return NewTransparentDataEncryptionsClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewTransparentDataEncryptionsClientWithBaseURI creates an instance of the TransparentDataEncryptionsClient client. func NewTransparentDataEncryptionsClientWithBaseURI(baseURI string, subscriptionID string) TransparentDataEncryptionsClient { return TransparentDataEncryptionsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates a database's transparent data encryption configuration. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database for which setting the transparent data encryption applies. parameters is the required parameters -// for creating or updating transparent data encryption. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database for which setting the transparent data encryption applies. +// parameters - the required parameters for creating or updating transparent data encryption. func (client TransparentDataEncryptionsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters TransparentDataEncryption) (result TransparentDataEncryption, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, databaseName, parameters) if err != nil { @@ -73,7 +70,6 @@ func (client TransparentDataEncryptionsClient) CreateOrUpdate(ctx context.Contex return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client TransparentDataEncryptionsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters TransparentDataEncryption) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -99,7 +95,6 @@ func (client TransparentDataEncryptionsClient) CreateOrUpdatePreparer(ctx contex return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client TransparentDataEncryptionsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { @@ -107,7 +102,6 @@ func (client TransparentDataEncryptionsClient) CreateOrUpdateSender(req *http.Re azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client TransparentDataEncryptionsClient) CreateOrUpdateResponder(resp *http.Response) (result TransparentDataEncryption, err error) { @@ -121,12 +115,12 @@ func (client TransparentDataEncryptionsClient) CreateOrUpdateResponder(resp *htt return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a database's transparent data encryption configuration. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. databaseName is the name of -// the database for which the transparent data encryption applies. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// databaseName - the name of the database for which the transparent data encryption applies. func (client TransparentDataEncryptionsClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result TransparentDataEncryption, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { @@ -149,7 +143,6 @@ func (client TransparentDataEncryptionsClient) Get(ctx context.Context, resource return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client TransparentDataEncryptionsClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -173,7 +166,6 @@ func (client TransparentDataEncryptionsClient) GetPreparer(ctx context.Context, return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client TransparentDataEncryptionsClient) GetSender(req *http.Request) (*http.Response, error) { @@ -181,7 +173,6 @@ func (client TransparentDataEncryptionsClient) GetSender(req *http.Request) (*ht azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client TransparentDataEncryptionsClient) GetResponder(resp *http.Response) (result TransparentDataEncryption, err error) { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/version.go similarity index 74% rename from vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/version.go index 6b4f11815f00..21b61983166e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/version.go @@ -1,4 +1,4 @@ -package insights +package sql import "github.com/Azure/azure-sdk-for-go/version" @@ -18,13 +18,12 @@ import "github.com/Azure/azure-sdk-for-go/version" // // Code generated by Microsoft (R) AutoRest Code Generator. // Changes may cause incorrect behavior and will be lost if the code is regenerated. -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. + // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " insights/2017-05-01-preview" + return "Azure-SDK-For-Go/" + version.Number + " sql/2015-05-01-preview" } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2017-05-01-preview/insights instead. // Version returns the semantic version (see http://semver.org) of the client. func Version() string { return version.Number diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go similarity index 80% rename from vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go index 172f2b3a90b8..ab735d07f476 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go @@ -25,7 +25,6 @@ import ( "net/http" ) -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // VirtualNetworkRulesClient is the the Azure SQL Database management API provides a RESTful set of web services that // interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, // and delete databases. @@ -33,24 +32,23 @@ type VirtualNetworkRulesClient struct { BaseClient } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewVirtualNetworkRulesClient creates an instance of the VirtualNetworkRulesClient client. func NewVirtualNetworkRulesClient(subscriptionID string) VirtualNetworkRulesClient { return NewVirtualNetworkRulesClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // NewVirtualNetworkRulesClientWithBaseURI creates an instance of the VirtualNetworkRulesClient client. func NewVirtualNetworkRulesClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkRulesClient { return VirtualNetworkRulesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdate creates or updates an existing virtual network rule. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. virtualNetworkRuleName is -// the name of the virtual network rule. parameters is the requested virtual Network Rule Resource state. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// virtualNetworkRuleName - the name of the virtual network rule. +// parameters - the requested virtual Network Rule Resource state. func (client VirtualNetworkRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string, parameters VirtualNetworkRule) (result VirtualNetworkRulesCreateOrUpdateFuture, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -74,7 +72,6 @@ func (client VirtualNetworkRulesClient) CreateOrUpdate(ctx context.Context, reso return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdatePreparer prepares the CreateOrUpdate request. func (client VirtualNetworkRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string, parameters VirtualNetworkRule) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -99,7 +96,6 @@ func (client VirtualNetworkRulesClient) CreateOrUpdatePreparer(ctx context.Conte return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkRulesClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkRulesCreateOrUpdateFuture, err error) { @@ -115,7 +111,6 @@ func (client VirtualNetworkRulesClient) CreateOrUpdateSender(req *http.Request) return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always // closes the http.Response Body. func (client VirtualNetworkRulesClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkRule, err error) { @@ -129,12 +124,12 @@ func (client VirtualNetworkRulesClient) CreateOrUpdateResponder(resp *http.Respo return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Delete deletes the virtual network rule with the given name. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. virtualNetworkRuleName is -// the name of the virtual network rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// virtualNetworkRuleName - the name of the virtual network rule. func (client VirtualNetworkRulesClient) Delete(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (result VirtualNetworkRulesDeleteFuture, err error) { req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, virtualNetworkRuleName) if err != nil { @@ -151,7 +146,6 @@ func (client VirtualNetworkRulesClient) Delete(ctx context.Context, resourceGrou return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeletePreparer prepares the Delete request. func (client VirtualNetworkRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -174,7 +168,6 @@ func (client VirtualNetworkRulesClient) DeletePreparer(ctx context.Context, reso return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkRulesClient) DeleteSender(req *http.Request) (future VirtualNetworkRulesDeleteFuture, err error) { @@ -190,7 +183,6 @@ func (client VirtualNetworkRulesClient) DeleteSender(req *http.Request) (future return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // DeleteResponder handles the response to the Delete request. The method always // closes the http.Response Body. func (client VirtualNetworkRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { @@ -203,12 +195,12 @@ func (client VirtualNetworkRulesClient) DeleteResponder(resp *http.Response) (re return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // Get gets a virtual network rule. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. virtualNetworkRuleName is -// the name of the virtual network rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// virtualNetworkRuleName - the name of the virtual network rule. func (client VirtualNetworkRulesClient) Get(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (result VirtualNetworkRule, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, virtualNetworkRuleName) if err != nil { @@ -231,7 +223,6 @@ func (client VirtualNetworkRulesClient) Get(ctx context.Context, resourceGroupNa return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetPreparer prepares the Get request. func (client VirtualNetworkRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -254,7 +245,6 @@ func (client VirtualNetworkRulesClient) GetPreparer(ctx context.Context, resourc return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkRulesClient) GetSender(req *http.Request) (*http.Response, error) { @@ -262,7 +252,6 @@ func (client VirtualNetworkRulesClient) GetSender(req *http.Request) (*http.Resp azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. func (client VirtualNetworkRulesClient) GetResponder(resp *http.Response) (result VirtualNetworkRule, err error) { @@ -276,11 +265,11 @@ func (client VirtualNetworkRulesClient) GetResponder(resp *http.Response) (resul return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServer gets a list of virtual network rules in a server. -// -// resourceGroupName is the name of the resource group that contains the resource. You can obtain this value from -// the Azure Resource Manager API or the portal. serverName is the name of the server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. func (client VirtualNetworkRulesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result VirtualNetworkRuleListResultPage, err error) { result.fn = client.listByServerNextResults req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) @@ -304,7 +293,6 @@ func (client VirtualNetworkRulesClient) ListByServer(ctx context.Context, resour return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerPreparer prepares the ListByServer request. func (client VirtualNetworkRulesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { pathParameters := map[string]interface{}{ @@ -326,7 +314,6 @@ func (client VirtualNetworkRulesClient) ListByServerPreparer(ctx context.Context return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerSender sends the ListByServer request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkRulesClient) ListByServerSender(req *http.Request) (*http.Response, error) { @@ -334,7 +321,6 @@ func (client VirtualNetworkRulesClient) ListByServerSender(req *http.Request) (* azure.DoRetryWithRegistration(client.Client)) } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerResponder handles the response to the ListByServer request. The method always // closes the http.Response Body. func (client VirtualNetworkRulesClient) ListByServerResponder(resp *http.Response) (result VirtualNetworkRuleListResult, err error) { @@ -369,7 +355,6 @@ func (client VirtualNetworkRulesClient) listByServerNextResults(lastResults Virt return } -// Deprecated: Please use package github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql instead. // ListByServerComplete enumerates all values, automatically crossing page boundaries as required. func (client VirtualNetworkRulesClient) ListByServerComplete(ctx context.Context, resourceGroupName string, serverName string) (result VirtualNetworkRuleListResultIterator, err error) { result.page, err = client.ListByServer(ctx, resourceGroupName, serverName) diff --git a/vendor/vendor.json b/vendor/vendor.json index d7e6551911ab..9b03f265db4b 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -35,8 +35,8 @@ "versionExact": "v16.2.1" }, { - "checksumSHA1": "17kDQcToCpJ8yGuAd7nP1QkOO6M=", - "path": "github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance", + "checksumSHA1": "9e+rC0Kd+zgxMrEwaP5l3DXxHM4=", + "path": "github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance", "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", "revisionTime": "2018-05-04T19:14:26Z", "version": "v16.2.1", @@ -83,8 +83,8 @@ "versionExact": "v16.2.1" }, { - "checksumSHA1": "NieGKPVYPaCrPLxkzS+fEMidE3M=", - "path": "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid", + "checksumSHA1": "E1YgAbqCDO5VSl+BTF7YgJ1gDds=", + "path": "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid", "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", "revisionTime": "2018-05-04T19:14:26Z", "version": "v16.2.1", @@ -131,8 +131,8 @@ "versionExact": "v16.2.1" }, { - "checksumSHA1": "vAkF/ng9NforhX2dTdVfNWMZmKo=", - "path": "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights", + "checksumSHA1": "E+QgVQ3X1EvmDta96Xa2aPHrkt4=", + "path": "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights", "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", "revisionTime": "2018-05-04T19:14:26Z", "version": "v16.2.1", @@ -155,32 +155,40 @@ "versionExact": "v16.2.1" }, { - "checksumSHA1": "DzVfhx2cwj/AgX9m6fvrecc7VyU=", - "path": "github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights", + "checksumSHA1": "q0OKr6uBD4lgnHN/EIDrv0GQWW8=", + "path": "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql", "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", "revisionTime": "2018-05-04T19:14:26Z", "version": "v16.2.1", "versionExact": "v16.2.1" }, { - "checksumSHA1": "0ubEDR8ye1PhBuUd5aVsGa3GLJs=", - "path": "github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement", + "checksumSHA1": "e4hCajXDSuWNkUvwA35jMHGm20E=", + "path": "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization", "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", "revisionTime": "2018-05-04T19:14:26Z", "version": "v16.2.1", "versionExact": "v16.2.1" }, { - "checksumSHA1": "q0OKr6uBD4lgnHN/EIDrv0GQWW8=", - "path": "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql", + "checksumSHA1": "EoE/UnsEm8MDYl+ox/+aIvs1HSY=", + "path": "github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights", "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", "revisionTime": "2018-05-04T19:14:26Z", "version": "v16.2.1", "versionExact": "v16.2.1" }, { - "checksumSHA1": "e4hCajXDSuWNkUvwA35jMHGm20E=", - "path": "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization", + "checksumSHA1": "ZKp5VA/YRkH75e8KjQ90X7mKJMs=", + "path": "github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement", + "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", + "revisionTime": "2018-05-04T19:14:26Z", + "version": "v16.2.1", + "versionExact": "v16.2.1" + }, + { + "checksumSHA1": "BMQkuDh8dNIdR68pKFIJp28n8yg=", + "path": "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql", "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", "revisionTime": "2018-05-04T19:14:26Z", "version": "v16.2.1", @@ -266,14 +274,6 @@ "version": "v16.2.1", "versionExact": "v16.2.1" }, - { - "checksumSHA1": "9CF6+vlasWn5NLNO3WGhLAFqp2w=", - "path": "github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" - }, { "checksumSHA1": "Gtq0yrNJHVALuWjOKpHgLRvvgxA=", "path": "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage", From def46aa5dcdbba44e489fdef6cd24bd398cb3f31 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 1 Jun 2018 19:53:02 +0200 Subject: [PATCH 211/320] Updating to include #1322 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 115e7797ac97..805b5cb3a636 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,12 @@ FEATURES: * `azurerm_virtual_machine` - support for `write_accelerator_enabled` on Premium disks attached to MS-series machines [GH-964] +IMPROVEMENTS: + +* dependencies: migrating to the un-deprecated Preview's for Container Instance, EventGrid, Log Analytics and SQL [GH-1322] +* dependencies: upgrading to `2018-01-01` of the EventGrid API [GH-1322] +* dependencies: upgrading to `2018-03-01` of the Monitor API [GH-1322] + ## 1.6.0 (May 24, 2018) UPGRADE NOTES: From 49dbb261b8bfcbc17f1e4b860db16e22ed3980f0 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 1 Jun 2018 14:17:00 -0600 Subject: [PATCH 212/320] Adding network rules to storage accounts --- azurerm/resource_arm_storage_account.go | 172 +++++++++++++++++++ azurerm/resource_arm_storage_account_test.go | 121 +++++++++++++ website/docs/r/storage_account.html.markdown | 55 ++++++ 3 files changed, 348 insertions(+) diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index c95c8839d337..015535310769 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -141,6 +141,48 @@ func resourceArmStorageAccount() *schema.Resource { Optional: true, }, + "network_rules": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "bypass": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validation.StringInSlice([]string{ + string(storage.AzureServices), + string(storage.Logging), + string(storage.Metrics), + string(storage.None), + }, true), + }, + Set: schema.HashString, + }, + "default_access_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "ip_rules": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + "virtual_network_subnet_ids": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + }, + }, + }, + "primary_location": { Type: schema.TypeString, Computed: true, @@ -245,6 +287,8 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e storageType := fmt.Sprintf("%s_%s", accountTier, replicationType) storageAccountEncryptionSource := d.Get("account_encryption_source").(string) + networkRules := expandStorageAccountNetworkRules(d) + parameters := storage.AccountCreateParameters{ Location: &location, Sku: &storage.Sku{ @@ -261,6 +305,7 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e KeySource: storage.KeySource(storageAccountEncryptionSource), }, EnableHTTPSTrafficOnly: &enableHTTPSTrafficOnly, + NetworkRuleSet: networkRules, }, } @@ -457,6 +502,22 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e d.SetPartial("enable_https_traffic_only") } + if d.HasChange("network_rules") { + networkRules := expandStorageAccountNetworkRules(d) + + opts := storage.AccountUpdateParameters{ + AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{ + NetworkRuleSet: networkRules, + }, + } + _, err := client.Update(ctx, resourceGroupName, storageAccountName, opts) + if err != nil { + return fmt.Errorf("Error updating Azure Storage Account network_rules %q: %+v", storageAccountName, err) + } + + d.SetPartial("network_rules") + } + d.Partial(false) return nil } @@ -571,6 +632,12 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err d.Set("secondary_table_endpoint", "") } } + + if networkRules := props.NetworkRuleSet; networkRules != nil { + if err := d.Set("network_rules", flattenStorageAccountNetworkRules(networkRules)); err != nil { + return fmt.Errorf("Error flattening `network_rules`: %+v", err) + } + } } d.Set("primary_access_key", accessKeys[0].Value) @@ -626,6 +693,111 @@ func flattenStorageAccountCustomDomain(input *storage.CustomDomain) []interface{ return []interface{}{domain} } +func expandStorageAccountNetworkRules(d *schema.ResourceData) *storage.NetworkRuleSet { + networkRules := d.Get("network_rules").([]interface{}) + if networkRules == nil || len(networkRules) == 0 { + return nil + } + + networkRule := networkRules[0].(map[string]interface{}) + networkRuleSet := &storage.NetworkRuleSet{} + + networkRuleSet.IPRules = expandStorageAccountIPRules(networkRule) + networkRuleSet.VirtualNetworkRules = expandStorageAccountVirtualNetworks(networkRule) + networkRuleSet.Bypass = expandStorageAccountBypass(networkRule) + if networkRule["default_access_enabled"].(bool) { + networkRuleSet.DefaultAction = storage.DefaultActionAllow + } else { + networkRuleSet.DefaultAction = storage.DefaultActionDeny + } + + return networkRuleSet +} + +func expandStorageAccountIPRules(networkRule map[string]interface{}) *[]storage.IPRule { + ipRulesInfo := networkRule["ip_rules"].(*schema.Set).List() + ipRules := make([]storage.IPRule, len(ipRulesInfo)) + + for i, ipRuleConfig := range ipRulesInfo { + attrs := ipRuleConfig.(string) + ipRule := storage.IPRule{ + IPAddressOrRange: utils.String(attrs), + Action: storage.Allow, + } + ipRules[i] = ipRule + } + + return &ipRules +} + +func expandStorageAccountVirtualNetworks(networkRule map[string]interface{}) *[]storage.VirtualNetworkRule { + virtualNetworkInfo := networkRule["virtual_network_subnet_ids"].(*schema.Set).List() + virtualNetworks := make([]storage.VirtualNetworkRule, len(virtualNetworkInfo)) + + for i, virtualNetworkConfig := range virtualNetworkInfo { + attrs := virtualNetworkConfig.(string) + virtualNetwork := storage.VirtualNetworkRule{ + VirtualNetworkResourceID: utils.String(attrs), + Action: storage.Allow, + } + virtualNetworks[i] = virtualNetwork + } + + return &virtualNetworks +} + +func expandStorageAccountBypass(networkRule map[string]interface{}) storage.Bypass { + bypassInfo := networkRule["bypass"].(*schema.Set).List() + + var bypassValues []string + for _, bypassConfig := range bypassInfo { + bypassValues = append(bypassValues, bypassConfig.(string)) + } + + return storage.Bypass(strings.Join(bypassValues, ", ")) +} + +func flattenStorageAccountNetworkRules(input *storage.NetworkRuleSet) []interface{} { + networkRules := make(map[string]interface{}, 0) + + networkRules["ip_rules"] = schema.NewSet(schema.HashString, flattenStorageAccountIPRules(input.IPRules)) + networkRules["virtual_network_subnet_ids"] = schema.NewSet(schema.HashString, flattenStorageAccountVirtualNetworks(input.VirtualNetworkRules)) + if input.DefaultAction != "" { + networkRules["default_access_enabled"] = (input.DefaultAction == storage.DefaultActionAllow) + } + networkRules["bypass"] = schema.NewSet(schema.HashString, flattenStorageAccountBypass(input.Bypass)) + return []interface{}{networkRules} +} + +func flattenStorageAccountIPRules(input *[]storage.IPRule) []interface{} { + ipRules := make([]interface{}, len(*input)) + for i, ipRule := range *input { + ipRules[i] = *ipRule.IPAddressOrRange + } + + return ipRules +} + +func flattenStorageAccountVirtualNetworks(input *[]storage.VirtualNetworkRule) []interface{} { + virtualNetworks := make([]interface{}, len(*input)) + for i, virtualNetwork := range *input { + virtualNetworks[i] = *virtualNetwork.VirtualNetworkResourceID + } + + return virtualNetworks +} + +func flattenStorageAccountBypass(input storage.Bypass) []interface{} { + bypassValues := strings.Split(string(input), ", ") + bypass := make([]interface{}, len(bypassValues)) + + for i, value := range bypassValues { + bypass[i] = value + } + + return bypass +} + func validateArmStorageAccountName(v interface{}, k string) (ws []string, es []error) { input := v.(string) diff --git a/azurerm/resource_arm_storage_account_test.go b/azurerm/resource_arm_storage_account_test.go index 8a50dca6654d..e1f58b8151e7 100644 --- a/azurerm/resource_arm_storage_account_test.go +++ b/azurerm/resource_arm_storage_account_test.go @@ -345,6 +345,42 @@ func TestAccAzureRMStorageAccount_NonStandardCasing(t *testing.T) { }) } +func TestAccAzureRMStorageAccount_networkRules(t *testing.T) { + resourceName := "azurerm_storage_account.testsa" + ri := acctest.RandInt() + rs := acctest.RandString(4) + location := testLocation() + preConfig := testAccAzureRMStorageAccount_networkRules(ri, rs, location) + postConfig := testAccAzureRMStorageAccount_networkRulesUpdate(ri, rs, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "network_rules.0.ip_rules.#", "1"), + resource.TestCheckResourceAttr(resourceName, "network_rules.0.virtual_network_subnet_ids.#", "1"), + resource.TestCheckResourceAttr(resourceName, "network_rules.0.default_access_enabled", "false"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "network_rules.0.ip_rules.#", "2"), + resource.TestCheckResourceAttr(resourceName, "network_rules.0.virtual_network_subnet_ids.#", "0"), + resource.TestCheckResourceAttr(resourceName, "network_rules.0.default_access_enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "network_rules.0.bypass.#", "2"), + ), + }, + }, + }) +} + func testCheckAzureRMStorageAccountExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API @@ -738,3 +774,88 @@ resource "azurerm_storage_account" "testsa" { } `, rInt, location, rString) } + +func testAccAzureRMStorageAccount_networkRules(rInt int, rString string, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "testrg" { + name = "testAccAzureRMSA-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvirtnet%d" + address_space = ["10.0.0.0/16"] + location = "${azurerm_resource_group.testrg.location}" + resource_group_name = "${azurerm_resource_group.testrg.name}" +} + +resource "azurerm_subnet" "test" { + name = "acctestsubnet%d" + resource_group_name = "${azurerm_resource_group.testrg.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.2.0/24" + service_endpoints = ["Microsoft.Storage"] + } + +resource "azurerm_storage_account" "testsa" { + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.testrg.name}" + + location = "${azurerm_resource_group.testrg.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + network_rules { + ip_rules = ["127.0.0.1"] + virtual_network_subnet_ids = ["${azurerm_subnet.test.id}"] + } + + tags { + environment = "production" + } +} +`, rInt, location, rInt, rInt, rString) +} + +func testAccAzureRMStorageAccount_networkRulesUpdate(rInt int, rString string, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "testrg" { + name = "testAccAzureRMSA-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvirtnet%d" + address_space = ["10.0.0.0/16"] + location = "${azurerm_resource_group.testrg.location}" + resource_group_name = "${azurerm_resource_group.testrg.name}" +} + +resource "azurerm_subnet" "test" { + name = "acctestsubnet%d" + resource_group_name = "${azurerm_resource_group.testrg.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.2.0/24" + service_endpoints = ["Microsoft.Storage"] + } + +resource "azurerm_storage_account" "testsa" { + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.testrg.name}" + + location = "${azurerm_resource_group.testrg.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + network_rules { + ip_rules = ["127.0.0.1", "127.0.0.2"] + bypass = ["Logging", "Metrics"] + default_access_enabled = true + } + + tags { + environment = "production" + } +} +`, rInt, location, rInt, rInt, rString) +} diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index f2eb13964f24..0aefa5668875 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -31,6 +31,48 @@ resource "azurerm_storage_account" "testsa" { } ``` +## Example Usage with Network Rules + +```hcl +resource "azurerm_resource_group" "testrg" { + name = "resourceGroupName" + location = "westus" +} + +resource "azurerm_virtual_network" "test" { + name = "virtnetname" + address_space = ["10.0.0.0/16"] + location = "${azurerm_resource_group.testrg.location}" + resource_group_name = "${azurerm_resource_group.testrg.name}" +} + +resource "azurerm_subnet" "test" { + name = "subnetname" + resource_group_name = "${azurerm_resource_group.testrg.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.2.0/24" + service_endpoints = ["Microsoft.Sql","Microsoft.Storage"] + } + +resource "azurerm_storage_account" "testsa" { + name = "storageaccountname" + resource_group_name = "${azurerm_resource_group.testrg.name}" + + location = "${azurerm_resource_group.testrg.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + network_rules { + ip_rules = ["127.0.0.1"] + virtual_network_subnet_ids = ["${azurerm_subnet.test.id}"] + } + + tags { + environment = "staging" + } +} +``` + ## Argument Reference The following arguments are supported: @@ -70,6 +112,8 @@ The following arguments are supported: * `custom_domain` - (Optional) A `custom_domain` block as documented below. +* `network_rules` - (Optional) A `network_rules` block as documented below. + * `tags` - (Optional) A mapping of tags to assign to the resource. --- @@ -79,6 +123,17 @@ The following arguments are supported: * `name` - (Optional) The Custom Domain Name to use for the Storage Account, which will be validated by Azure. * `use_subdomain` - (Optional) Should the Custom Domain Name be validated by using indirect CNAME validation? +--- + +* `network_rules` supports the following: + +* `bypass` - (Optional) Specifies whether traffic is bypassed for Logging/Metrics/AzureServices. Valid options are +any combination of `Logging`, `Metrics`, `AzureServices`, or `None`. +* `default_access_enabled` - (Optional) Boolean flag to specify the default action of allow or deny when no other rules +match. +* `ip_rules` - (Optional) List of IP or IP ranges in CIDR Format. Only IPV4 addresses are allowed. +* `virtual_network_subnet_ids` - (Optional) A list of resource ids for subnets. + ~> **Note:** [More information on Validation is available here](https://docs.microsoft.com/en-gb/azure/storage/blobs/storage-custom-domain-name) ## Attributes Reference From 781b1b12cf03685f4f005c8acd99ccfd53a85f57 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 1 Jun 2018 14:55:29 -0600 Subject: [PATCH 213/320] Fmting --- azurerm/resource_arm_storage_account.go | 13 ++++++++----- azurerm/resource_arm_storage_account_test.go | 10 +++++----- website/docs/r/storage_account.html.markdown | 10 +++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index 015535310769..ef742f04c332 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -145,6 +145,7 @@ func resourceArmStorageAccount() *schema.Resource { Type: schema.TypeList, MaxItems: 1, Optional: true, + Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "bypass": { @@ -165,7 +166,7 @@ func resourceArmStorageAccount() *schema.Resource { "default_access_enabled": { Type: schema.TypeBool, Optional: true, - Default: false, + Computed: true, }, "ip_rules": { Type: schema.TypeSet, @@ -705,10 +706,12 @@ func expandStorageAccountNetworkRules(d *schema.ResourceData) *storage.NetworkRu networkRuleSet.IPRules = expandStorageAccountIPRules(networkRule) networkRuleSet.VirtualNetworkRules = expandStorageAccountVirtualNetworks(networkRule) networkRuleSet.Bypass = expandStorageAccountBypass(networkRule) - if networkRule["default_access_enabled"].(bool) { - networkRuleSet.DefaultAction = storage.DefaultActionAllow - } else { - networkRuleSet.DefaultAction = storage.DefaultActionDeny + if val, ok := networkRule["default_access_enabled"]; ok { + if val.(bool) { + networkRuleSet.DefaultAction = storage.DefaultActionAllow + } else { + networkRuleSet.DefaultAction = storage.DefaultActionDeny + } } return networkRuleSet diff --git a/azurerm/resource_arm_storage_account_test.go b/azurerm/resource_arm_storage_account_test.go index e1f58b8151e7..ab9360b4da1b 100644 --- a/azurerm/resource_arm_storage_account_test.go +++ b/azurerm/resource_arm_storage_account_test.go @@ -803,12 +803,12 @@ resource "azurerm_storage_account" "testsa" { location = "${azurerm_resource_group.testrg.location}" account_tier = "Standard" - account_replication_type = "LRS" + account_replication_type = "LRS" - network_rules { - ip_rules = ["127.0.0.1"] - virtual_network_subnet_ids = ["${azurerm_subnet.test.id}"] - } + network_rules { + ip_rules = ["127.0.0.1"] + virtual_network_subnet_ids = ["${azurerm_subnet.test.id}"] + } tags { environment = "production" diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index 0aefa5668875..ee01fec15290 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -60,12 +60,12 @@ resource "azurerm_storage_account" "testsa" { location = "${azurerm_resource_group.testrg.location}" account_tier = "Standard" - account_replication_type = "LRS" + account_replication_type = "LRS" - network_rules { - ip_rules = ["127.0.0.1"] - virtual_network_subnet_ids = ["${azurerm_subnet.test.id}"] - } + network_rules { + ip_rules = ["127.0.0.1"] + virtual_network_subnet_ids = ["${azurerm_subnet.test.id}"] + } tags { environment = "staging" From 078445947ff84cf4033ee502a603273e3e8c4955 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 1 Jun 2018 14:57:23 -0600 Subject: [PATCH 214/320] Fmting --- azurerm/resource_arm_storage_account_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azurerm/resource_arm_storage_account_test.go b/azurerm/resource_arm_storage_account_test.go index ab9360b4da1b..248365e4f739 100644 --- a/azurerm/resource_arm_storage_account_test.go +++ b/azurerm/resource_arm_storage_account_test.go @@ -845,13 +845,13 @@ resource "azurerm_storage_account" "testsa" { location = "${azurerm_resource_group.testrg.location}" account_tier = "Standard" - account_replication_type = "LRS" + account_replication_type = "LRS" - network_rules { - ip_rules = ["127.0.0.1", "127.0.0.2"] - bypass = ["Logging", "Metrics"] - default_access_enabled = true - } + network_rules { + ip_rules = ["127.0.0.1", "127.0.0.2"] + bypass = ["Logging", "Metrics"] + default_access_enabled = true + } tags { environment = "production" From 7e6daf73dd65a4988abf42ab647abebfa7f7349a Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Fri, 1 Jun 2018 15:25:35 -0700 Subject: [PATCH 215/320] Fix coding styles according to the reviews. --- azurerm/resource_arm_storage_blob.go | 8 +++++--- azurerm/resource_arm_storage_blob_test.go | 6 +++--- website/docs/r/storage_blob.html.markdown | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/azurerm/resource_arm_storage_blob.go b/azurerm/resource_arm_storage_blob.go index 47a7e28af916..ca40247cae1f 100644 --- a/azurerm/resource_arm_storage_blob.go +++ b/azurerm/resource_arm_storage_blob.go @@ -547,7 +547,7 @@ func resourceArmStorageBlobUpdate(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("Error getting storage account %s: %+v", storageAccountName, err) } if !accountExists { - return fmt.Errorf("Storage account %s not found", storageAccountName) + return fmt.Errorf("Storage account %s not found in resource group %s", storageAccountName, resourceGroupName) } name := d.Get("name").(string) @@ -560,7 +560,8 @@ func resourceArmStorageBlobUpdate(d *schema.ResourceData, meta interface{}) erro blob.Properties.ContentType = d.Get("content_type").(string) } - err = blob.SetProperties(nil) + options := &storage.SetBlobPropertiesOptions{} + err = blob.SetProperties(options) if err != nil { return fmt.Errorf("Error setting properties of blob %s (container %s, storage account %s): %+v", name, storageContainerName, storageAccountName, err) } @@ -601,7 +602,8 @@ func resourceArmStorageBlobRead(d *schema.ResourceData, meta interface{}) error container := blobClient.GetContainerReference(storageContainerName) blob := container.GetBlobReference(name) - err = blob.GetProperties(nil) + options := &storage.GetBlobPropertiesOptions{} + err = blob.GetProperties(options) if err != nil { return fmt.Errorf("Error getting properties of blob %s (container %s, storage account %s): %+v", name, storageContainerName, storageAccountName, err) } diff --git a/azurerm/resource_arm_storage_blob_test.go b/azurerm/resource_arm_storage_blob_test.go index 345c8fa6fc29..116a70fa7cec 100644 --- a/azurerm/resource_arm_storage_blob_test.go +++ b/azurerm/resource_arm_storage_blob_test.go @@ -333,8 +333,8 @@ func TestAccAzureRMStorageBlobBlock_blockContentType(t *testing.T) { t.Fatalf("Failed to close source blob") } - config := testAccAzureRMStorageBlobPage_blockContentType(ri, rs1, sourceBlob.Name(), testLocation(), "text/plain") - updateConfig := testAccAzureRMStorageBlobPage_blockContentType(ri, rs1, sourceBlob.Name(), testLocation(), "text/vnd.terraform.acctest.tmpfile") + config := testAccAzureRMStorageBlobPage_blockContentType(ri, rs1, testLocation(), sourceBlob.Name(), "text/plain") + updateConfig := testAccAzureRMStorageBlobPage_blockContentType(ri, rs1, testLocation(), sourceBlob.Name(), "text/vnd.terraform.acctest.tmpfile") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -712,7 +712,7 @@ resource "azurerm_storage_blob" "destination" { `, rInt, location, rString, sourceBlobName) } -func testAccAzureRMStorageBlobPage_blockContentType(rInt int, rString, sourceBlobName, location, contentType string) string { +func testAccAzureRMStorageBlobPage_blockContentType(rInt int, rString, location string, sourceBlobName, contentType string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" diff --git a/website/docs/r/storage_blob.html.markdown b/website/docs/r/storage_blob.html.markdown index 5e6f7d382153..fcb9a16f67d8 100644 --- a/website/docs/r/storage_blob.html.markdown +++ b/website/docs/r/storage_blob.html.markdown @@ -64,6 +64,8 @@ The following arguments are supported: * `size` - (Optional) Used only for `page` blobs to specify the size in bytes of the blob to be created. Must be a multiple of 512. Defaults to 0. +* `content_type` - (Optional) The content type of the storage blob. Cannot be defined if `source_uri` is defined. Defaults to `application/octet-stream`. + * `source` - (Optional) An absolute path to a file on the local system. Cannot be defined if `source_uri` is defined. * `source_uri` - (Optional) The URI of an existing blob, or a file in the Azure File service, to use as the source contents From 86f17b74bf580bb83988e0816a68a0df51975214 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Fri, 1 Jun 2018 18:47:00 -0700 Subject: [PATCH 216/320] Move location parameter in test case. --- azurerm/resource_arm_storage_blob_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/resource_arm_storage_blob_test.go b/azurerm/resource_arm_storage_blob_test.go index 116a70fa7cec..81843ee4d698 100644 --- a/azurerm/resource_arm_storage_blob_test.go +++ b/azurerm/resource_arm_storage_blob_test.go @@ -203,7 +203,7 @@ func TestAccAzureRMStorageBlobBlock_source(t *testing.T) { t.Fatalf("Failed to close source blob") } - config := testAccAzureRMStorageBlobBlock_source(ri, rs1, sourceBlob.Name(), testLocation()) + config := testAccAzureRMStorageBlobBlock_source(ri, rs1, testLocation(), sourceBlob.Name()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -581,7 +581,7 @@ resource "azurerm_storage_blob" "test" { `, rInt, location, rString) } -func testAccAzureRMStorageBlobBlock_source(rInt int, rString string, sourceBlobName string, location string) string { +func testAccAzureRMStorageBlobBlock_source(rInt int, rString string, location string, sourceBlobName string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" From 96d8258733fc29a3192287f24380f1a6bf34c174 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Fri, 1 Jun 2018 19:24:50 -0700 Subject: [PATCH 217/320] Revert "Move location parameter in test case." This reverts commit 86f17b74bf580bb83988e0816a68a0df51975214. --- azurerm/resource_arm_storage_blob_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/resource_arm_storage_blob_test.go b/azurerm/resource_arm_storage_blob_test.go index 81843ee4d698..116a70fa7cec 100644 --- a/azurerm/resource_arm_storage_blob_test.go +++ b/azurerm/resource_arm_storage_blob_test.go @@ -203,7 +203,7 @@ func TestAccAzureRMStorageBlobBlock_source(t *testing.T) { t.Fatalf("Failed to close source blob") } - config := testAccAzureRMStorageBlobBlock_source(ri, rs1, testLocation(), sourceBlob.Name()) + config := testAccAzureRMStorageBlobBlock_source(ri, rs1, sourceBlob.Name(), testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -581,7 +581,7 @@ resource "azurerm_storage_blob" "test" { `, rInt, location, rString) } -func testAccAzureRMStorageBlobBlock_source(rInt int, rString string, location string, sourceBlobName string) string { +func testAccAzureRMStorageBlobBlock_source(rInt int, rString string, sourceBlobName string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" From 33fb16440bf57403a776d7c1a89aa771746a6c20 Mon Sep 17 00:00:00 2001 From: Damien Caro Date: Fri, 1 Jun 2018 22:53:32 -0700 Subject: [PATCH 218/320] added CustomizeDiff, validation on vpn_client_protocols and changed to TypeSet --- .../resource_arm_virtual_network_gateway.go | 55 ++++++++++++++++--- ...source_arm_virtual_network_gateway_test.go | 21 ++++++- 2 files changed, 64 insertions(+), 12 deletions(-) diff --git a/azurerm/resource_arm_virtual_network_gateway.go b/azurerm/resource_arm_virtual_network_gateway.go index 06d8a4c8c297..bae8bf391ecc 100644 --- a/azurerm/resource_arm_virtual_network_gateway.go +++ b/azurerm/resource_arm_virtual_network_gateway.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" - "github.com/hashicorp/terraform/helper/customdiff" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" + "regexp" ) func resourceArmVirtualNetworkGateway() *schema.Resource { @@ -24,6 +24,8 @@ func resourceArmVirtualNetworkGateway() *schema.Resource { State: schema.ImportStatePassthrough, }, + CustomizeDiff: resourceArmVirtualNetworkGatewayCustomizeDiff, + Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -536,10 +538,10 @@ func expandArmVirtualNetworkGatewayVpnClientConfig(d *schema.ResourceData) *netw revokedCerts = append(revokedCerts, r) } - confVpnClientProtocol := conf["vpn_client_protocols"].([]interface{}) - vpnClientProtocols := make([]network.VpnClientProtocol, 0, len(confVpnClientProtocol)) - for _, protocol := range confVpnClientProtocol { - vpnClientProtocols = append(vpnClientProtocols, network.VpnClientProtocol(protocol.(string))) + var vpnClientProtocols []network.VpnClientProtocol + for _, vpnClientProtocol := range conf["vpn_client_protocols"].(*schema.Set).List() { + p := network.VpnClientProtocol(vpnClientProtocol.(string)) + vpnClientProtocols = append(vpnClientProtocols, p) } confRadiusServerAddress := conf["radius_server_address"].(string) @@ -631,13 +633,16 @@ func flattenArmVirtualNetworkGatewayVpnClientConfig(cfg *network.VpnClientConfig } flat["revoked_certificate"] = schema.NewSet(hashVirtualNetworkGatewayRevokedCert, revokedCerts) - vpnClientProtocol := make([]interface{}, 0) + vpnClientProtocols := &schema.Set{F: schema.HashString} if vpnProtocols := cfg.VpnClientProtocols; vpnProtocols != nil { - for _, vpnProtocol := range *vpnProtocols { - vpnClientProtocol = append(vpnClientProtocol, vpnProtocol) + for _, protocol := range *vpnProtocols { + vpnClientProtocols.Add(string(protocol)) } } - flat["vpn_client_protocols"] = vpnClientProtocol + flat["vpn_client_protocols"] = vpnClientProtocols + + flat["radius_server_address"] = *cfg.RadiusServerAddress + flat["radius_server_secret"] = *cfg.RadiusServerSecret return []interface{}{flat} } @@ -723,3 +728,35 @@ func validateArmVirtualNetworkGatewayExpressRouteSku() schema.SchemaValidateFunc string(network.VirtualNetworkGatewaySkuTierUltraPerformance), }, true) } + +func resourceArmVirtualNetworkGatewayCustomizeDiff(diff *schema.ResourceDiff, v interface{}) error { + + if vpnClient, ok := diff.GetOk("vpn_client_configuration"); ok { + if vpnClientConfig, ok := vpnClient.([]interface{})[0].(map[string]interface{}); ok { + if vpnClientConfig["radius_server_address"] != "" { + if !validIP4(vpnClientConfig["radius_server_address"].(string)) { + return fmt.Errorf("radius_server_address is not an IPv4 address") + } + if vpnClientConfig["radius_server_secret"] == "" { + return fmt.Errorf("radius_server_secret cannot be empty") + } + } else { + if vpnClientConfig["radius_server_secret"] != "" { + return fmt.Errorf("radius_server_secret cannot be set when radius_server_address is empty") + } + } + } + } + return nil +} + +func validIP4(ipAddress string) bool { + ipAddress = strings.Trim(ipAddress, " ") + + re, _ := regexp.Compile(`^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$`) + if re.MatchString(ipAddress) { + return true + } + + return false +} diff --git a/azurerm/resource_arm_virtual_network_gateway_test.go b/azurerm/resource_arm_virtual_network_gateway_test.go index 5074f129c799..94aec422c514 100644 --- a/azurerm/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/resource_arm_virtual_network_gateway_test.go @@ -12,6 +12,7 @@ import ( func TestAccAzureRMVirtualNetworkGateway_basic(t *testing.T) { ri := acctest.RandInt() + resourceName := "azurerm_virtual_network_gateway.test" config := testAccAzureRMVirtualNetworkGateway_basic(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -22,7 +23,8 @@ func TestAccAzureRMVirtualNetworkGateway_basic(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualNetworkGatewayExists("azurerm_virtual_network_gateway.test"), + testCheckAzureRMVirtualNetworkGatewayExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "Basic"), ), }, }, @@ -31,6 +33,7 @@ func TestAccAzureRMVirtualNetworkGateway_basic(t *testing.T) { func TestAccAzureRMVirtualNetworkGateway_lowerCaseSubnetName(t *testing.T) { ri := acctest.RandInt() + resourceName := "azurerm_virtual_network_gateway.test" config := testAccAzureRMVirtualNetworkGateway_lowerCaseSubnetName(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -41,7 +44,8 @@ func TestAccAzureRMVirtualNetworkGateway_lowerCaseSubnetName(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualNetworkGatewayExists("azurerm_virtual_network_gateway.test"), + testCheckAzureRMVirtualNetworkGatewayExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "Basic" ), ), }, }, @@ -50,6 +54,7 @@ func TestAccAzureRMVirtualNetworkGateway_lowerCaseSubnetName(t *testing.T) { func TestAccAzureRMVirtualNetworkGateway_vpnGw1(t *testing.T) { ri := acctest.RandInt() + resourceName := "azurerm_virtual_network_gateway.test" config := testAccAzureRMVirtualNetworkGateway_vpnGw1(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -60,7 +65,9 @@ func TestAccAzureRMVirtualNetworkGateway_vpnGw1(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualNetworkGatewayExists("azurerm_virtual_network_gateway.test"), + testCheckAzureRMVirtualNetworkGatewayExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "vpn_client_configuration.0.radius_server_address", "1.2.3.4" ), + resource.TestCheckResourceAttr(resourceName, "vpn_client_configuration.0.vpn_client_protocols.#", "2" ), ), }, }, @@ -269,6 +276,14 @@ resource "azurerm_virtual_network_gateway" "test" { private_ip_address_allocation = "Dynamic" subnet_id = "${azurerm_subnet.test.id}" } + + vpn_client_configuration { + address_space = ["10.2.0.0/24"] + vpn_client_protocols = ["SSTP", "IkeV2"] + + radius_server_address = "1.2.3.4" + radius_server_secret = "1234" + } } `, rInt, location, rInt, rInt, rInt) } From 68d994de0ed9bab0935fe0bafe5cd63c7ba09115 Mon Sep 17 00:00:00 2001 From: lstolyarov Date: Sat, 2 Jun 2018 13:26:54 +0100 Subject: [PATCH 219/320] Update the storage account resource to include identity --- azurerm/resource_arm_storage_account.go | 80 ++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 7 deletions(-) diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index 508c45dfcebb..aa042b7fffd2 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -223,9 +223,31 @@ func resourceArmStorageAccount() *schema.Resource { Sensitive: true, }, - "object_id": { - Type: schema.TypeString, + "identity": { + Type: schema.TypeList, + Optional: true, Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "type": { + Type: schema.TypeString, + Required: true, + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ValidateFunc: validation.StringInSlice([]string{ + "SystemAssigned", + }, true), + }, + "principal_id": { + Type: schema.TypeString, + Computed: true, + }, + "tenant_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, }, "tags": tagsSchema(), @@ -269,6 +291,11 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e }, } + if _, ok := d.GetOk("identity"); ok { + storageAccountIdentity := expandAzureRmStorageAccountIdentity(d) + parameters.Identity = storageAccountIdentity + } + if v, ok := d.GetOk("enable_file_encryption"); ok { parameters.Encryption.Services.File = &storage.EncryptionService{ Enabled: utils.Bool(v.(bool)), @@ -462,6 +489,18 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e d.SetPartial("enable_https_traffic_only") } + if d.HasChange("identity") { + storageAccountIdentity := expandAzureRmStorageAccountIdentity(d) + + opts := storage.AccountUpdateParameters{ + Identity: storageAccountIdentity, + } + _, err := client.Update(ctx, resourceGroupName, storageAccountName, opts) + if err != nil { + return fmt.Errorf("Error updating Azure Storage Account identity %q: %+v", storageAccountName, err) + } + } + d.Partial(false) return nil } @@ -500,11 +539,6 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err } d.Set("account_kind", resp.Kind) - log.Printf("[INFO] Identity is %q", resp.Identity) - if identity := resp.Identity; identity != nil { - d.Set("object_id", identity.PrincipalID) - } - if sku := resp.Sku; sku != nil { d.Set("account_type", sku.Name) d.Set("account_tier", sku.Tier) @@ -586,6 +620,11 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err d.Set("primary_access_key", accessKeys[0].Value) d.Set("secondary_access_key", accessKeys[1].Value) + identity := flattenAzureRmStorageAccountIdentity(resp.Identity) + if err := d.Set("identity", identity); err != nil { + return err + } + flattenAndSetTags(d, resp.Tags) return nil @@ -661,3 +700,30 @@ func validateArmStorageAccountType(v interface{}, k string) (ws []string, es []e es = append(es, fmt.Errorf("Invalid storage account type %q", input)) return } + +func expandAzureRmStorageAccountIdentity(d *schema.ResourceData) *storage.Identity { + identities := d.Get("identity").([]interface{}) + identity := identities[0].(map[string]interface{}) + identityType := identity["type"].(string) + return &storage.Identity{ + Type: &identityType, + } +} + +func flattenAzureRmStorageAccountIdentity(identity *storage.Identity) []interface{} { + if identity == nil { + return make([]interface{}, 0) + } + + result := make(map[string]interface{}) + result["type"] = *identity.Type + + if identity.PrincipalID != nil { + result["principal_id"] = *identity.PrincipalID + } + if identity.TenantID != nil { + result["tenant_id"] = *identity.TenantID + } + + return []interface{}{result} +} From 28f4b30c4d53bfb8d56010f6b3a7d8f364826742 Mon Sep 17 00:00:00 2001 From: lstolyarov Date: Sat, 2 Jun 2018 13:27:29 +0100 Subject: [PATCH 220/320] Add the storage account identity tests --- azurerm/resource_arm_storage_account_test.go | 90 ++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/azurerm/resource_arm_storage_account_test.go b/azurerm/resource_arm_storage_account_test.go index 8a50dca6654d..269347165ae0 100644 --- a/azurerm/resource_arm_storage_account_test.go +++ b/azurerm/resource_arm_storage_account_test.go @@ -3,6 +3,7 @@ package azurerm import ( "fmt" "net/http" + "regexp" "testing" "github.com/hashicorp/terraform/helper/acctest" @@ -345,6 +346,69 @@ func TestAccAzureRMStorageAccount_NonStandardCasing(t *testing.T) { }) } +func TestAccAzureRMStorageAccount_enableIdentity(t *testing.T) { + resourceName := "azurerm_storage_account.testsa" + + ri := acctest.RandInt() + rs := acctest.RandString(4) + config := testAccAzureRMStorageAccount_identity(ri, rs, testLocation()) + + uuidMatch := regexp.MustCompile("^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[8|9|aA|bB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "identity.0.type", "SystemAssigned"), + resource.TestMatchResourceAttr(resourceName, "identity.0.principal_id", uuidMatch), + resource.TestMatchResourceAttr(resourceName, "identity.0.tenant_id", uuidMatch), + ), + }, + }, + }) +} + +func TestAccAzureRMStorageAccount_updateResourceByEnablingIdentity(t *testing.T) { + resourceName := "azurerm_storage_account.testsa" + + ri := acctest.RandInt() + rs := acctest.RandString(4) + + basicResourceNoManagedIdentity := testAccAzureRMStorageAccount_basic(ri, rs, testLocation()) + managedIdentityEnabled := testAccAzureRMStorageAccount_identity(ri, rs, testLocation()) + + uuidMatch := regexp.MustCompile("^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[8|9|aA|bB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroy, + Steps: []resource.TestStep{ + { + Config: basicResourceNoManagedIdentity, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "identity.#", "0"), + ), + }, + { + Config: managedIdentityEnabled, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "identity.0.type", "SystemAssigned"), + resource.TestMatchResourceAttr(resourceName, "identity.0.principal_id", uuidMatch), + resource.TestMatchResourceAttr(resourceName, "identity.0.tenant_id", uuidMatch), + ), + }, + }, + }) +} + func testCheckAzureRMStorageAccountExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API @@ -738,3 +802,29 @@ resource "azurerm_storage_account" "testsa" { } `, rInt, location, rString) } + +func testAccAzureRMStorageAccount_identity(rInt int, rString string, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "testrg" { + name = "testAccAzureRMSA-%d" + location = "%s" +} + +resource "azurerm_storage_account" "testsa" { + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.testrg.name}" + + location = "${azurerm_resource_group.testrg.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + identity { + type = "SystemAssigned" + } + + tags { + environment = "production" + } +} +`, rInt, location, rString) +} From c3f58daca90dd5b2bdcf0099cd730c483bc1a8e9 Mon Sep 17 00:00:00 2001 From: lstolyarov Date: Sat, 2 Jun 2018 13:28:09 +0100 Subject: [PATCH 221/320] Update the storage account identity block documentation --- website/docs/r/storage_account.html.markdown | 25 ++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index f2eb13964f24..ded0bae47793 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -45,8 +45,8 @@ The following arguments are supported: * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `account_kind` - (Optional) Defines the Kind of account. Valid options are `Storage`, - `StorageV2` and `BlobStorage`. Changing this forces a new resource to be created. +* `account_kind` - (Optional) Defines the Kind of account. Valid options are `Storage`, + `StorageV2` and `BlobStorage`. Changing this forces a new resource to be created. Defaults to `Storage`. * `account_tier` - (Required) Defines the Tier to use for this storage account. Valid options are `Standard` and `Premium`. Changing this forces a new resource to be created @@ -72,6 +72,8 @@ The following arguments are supported: * `tags` - (Optional) A mapping of tags to assign to the resource. +* `identity` - (Optional) A Managed Service Identity block as defined below. + --- * `custom_domain` supports the following: @@ -81,6 +83,14 @@ The following arguments are supported: ~> **Note:** [More information on Validation is available here](https://docs.microsoft.com/en-gb/azure/storage/blobs/storage-custom-domain-name) +--- + +`identity` supports the following: + +* `type` - (Required) Specifies the identity type of the Storage Account. At this time the only allowed value is `SystemAssigned`. + +~> The assigned `principal_id` and `tenant_id` can be retrieved after the Storage Account has been created. More details are available below. + ## Attributes Reference The following attributes are exported in addition to the arguments listed above: @@ -101,6 +111,17 @@ The following attributes are exported in addition to the arguments listed above: * `secondary_connection_string` - The connection string associated with the secondary location * `primary_blob_connection_string` - The connection string associated with the primary blob location * `secondary_blob_connection_string` - The connection string associated with the secondary blob location +* `identity` - An `identity` block as defined below, which contains the Identity information for this Storage Account. + +--- + +`identity` exports the following: + +* `principal_id` - The Principal ID for the Service Principal associated with the Identity of this Storage Account. + +* `tenant_id` - The Tenant ID for the Service Principal associated with the Identity of this Storage Account. + +-> You can access the Principal ID via `${azurerm_storage_account.test.identity.0.principal_id}` and the Tenant ID via `${azurerm_storage_account.test.identity.0.tenant_id}` ## Import From e28d8114fc5fe156eca9cf1f9a672ebdc2af88b5 Mon Sep 17 00:00:00 2001 From: Oscar Utbult Date: Sat, 2 Jun 2018 19:43:24 +0200 Subject: [PATCH 222/320] Fix spelling mistake --- website/docs/r/app_service.html.markdown | 2 +- website/docs/r/app_service_slot.html.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/app_service.html.markdown b/website/docs/r/app_service.html.markdown index 6b0f4506e6a2..798939f8d0b4 100644 --- a/website/docs/r/app_service.html.markdown +++ b/website/docs/r/app_service.html.markdown @@ -155,7 +155,7 @@ The following arguments are supported: * `always_on` - (Optional) Should the app be loaded at all times? Defaults to `false`. * `default_documents` - (Optional) The ordering of default documents to load, if an address isn't specified. -* `dotnet_framework_version` - (Optional) The version of the .net framework's CLR used in this App Service. Possible values are `v2.0` (which will use the latest version of the .net framework for the .net CLR v2 - currently `.net 3.5`) and `v4.0` (which corresponds to the latest version of the .net CLR v4 - which at the time of writing is `.net 4.7.1`). [For more information on which .net CLR version to use based on the .net framework you're targetting - please see this table](https://en.wikipedia.org/wiki/.NET_Framework_version_history#Overview). Defaults to `v4.0`. +* `dotnet_framework_version` - (Optional) The version of the .net framework's CLR used in this App Service. Possible values are `v2.0` (which will use the latest version of the .net framework for the .net CLR v2 - currently `.net 3.5`) and `v4.0` (which corresponds to the latest version of the .net CLR v4 - which at the time of writing is `.net 4.7.1`). [For more information on which .net CLR version to use based on the .net framework you're targeting - please see this table](https://en.wikipedia.org/wiki/.NET_Framework_version_history#Overview). Defaults to `v4.0`. * `http2_enabled` - (Optional) Is HTTP2 Enabled on this App Service? Defaults to `false`. * `ip_restriction` - (Optional) One or more `ip_restriction` blocks as defined below. * `java_version` - (Optional) The version of Java to use. If specified `java_container` and `java_container_version` must also be specified. Possible values are `1.7` and `1.8`. diff --git a/website/docs/r/app_service_slot.html.markdown b/website/docs/r/app_service_slot.html.markdown index 68d7e1a2fb55..c918bbde5cdb 100644 --- a/website/docs/r/app_service_slot.html.markdown +++ b/website/docs/r/app_service_slot.html.markdown @@ -182,7 +182,7 @@ The following arguments are supported: * `always_on` - (Optional) Should the app be loaded at all times? Defaults to `false`. * `default_documents` - (Optional) The ordering of default documents to load, if an address isn't specified. -* `dotnet_framework_version` - (Optional) The version of the .net framework's CLR used in this App Service Slot. Possible values are `v2.0` (which will use the latest version of the .net framework for the .net CLR v2 - currently `.net 3.5`) and `v4.0` (which corresponds to the latest version of the .net CLR v4 - which at the time of writing is `.net 4.7.1`). [For more information on which .net CLR version to use based on the .net framework you're targetting - please see this table](https://en.wikipedia.org/wiki/.NET_Framework_version_history#Overview). Defaults to `v4.0`. +* `dotnet_framework_version` - (Optional) The version of the .net framework's CLR used in this App Service Slot. Possible values are `v2.0` (which will use the latest version of the .net framework for the .net CLR v2 - currently `.net 3.5`) and `v4.0` (which corresponds to the latest version of the .net CLR v4 - which at the time of writing is `.net 4.7.1`). [For more information on which .net CLR version to use based on the .net framework you're targeting - please see this table](https://en.wikipedia.org/wiki/.NET_Framework_version_history#Overview). Defaults to `v4.0`. * `http2_enabled` - (Optional) Is HTTP2 Enabled on this App Service? Defaults to `false`. * `ip_restriction` - (Optional) One or more `ip_restriction` blocks as defined below. * `java_version` - (Optional) The version of Java to use. If specified `java_container` and `java_container_version` must also be specified. Possible values are `1.7` and `1.8`. From b68a1ed3fca0ab746a9435000e46048dec2ce75d Mon Sep 17 00:00:00 2001 From: Chang Li Date: Sun, 3 Jun 2018 18:47:56 +0800 Subject: [PATCH 223/320] Additional Testcases for Cdn endpoint --- azurerm/resource_arm_cdn_endpoint_test.go | 145 ++++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/azurerm/resource_arm_cdn_endpoint_test.go b/azurerm/resource_arm_cdn_endpoint_test.go index 235325a721c1..1929c36df241 100644 --- a/azurerm/resource_arm_cdn_endpoint_test.go +++ b/azurerm/resource_arm_cdn_endpoint_test.go @@ -157,6 +157,69 @@ func TestAccAzureRMCdnEndpoint_withGeoFilters(t *testing.T) { }, }) } +func TestAccAzureRMCdnEndpoint_fullFields(t *testing.T) { + resourceName := "azurerm_cdn_endpoint.test" + ri := acctest.RandInt() + config := testAccAzureRMCdnEndpoint_fullFields(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMCdnEndpointDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMCdnEndpointExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "is_http_allowed", "true"), + resource.TestCheckResourceAttr(resourceName, "is_https_allowed", "true"), + resource.TestCheckResourceAttr(resourceName, "origin_path", "/origin-path"), + resource.TestCheckResourceAttr(resourceName, "probe_path", "/origin-path/probe"), + resource.TestCheckResourceAttr(resourceName, "origin_host_header", "www.example.com"), + resource.TestCheckResourceAttr(resourceName, "optimization_type", "GeneralWebDelivery"), + resource.TestCheckResourceAttr(resourceName, "querystring_caching_behaviour", "UseQueryString"), + resource.TestCheckResourceAttr(resourceName, "content_types_to_compress.#", "1"), + resource.TestCheckResourceAttr(resourceName, "is_compression_enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "geo_filter.#", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.environment", "Production"), + ), + }, + }, + }) +} + +func TestAccAzureRMCdnEndpoint_isHttpAndHttpsAllowedUpdate(t *testing.T) { + resourceName := "azurerm_cdn_endpoint.test" + ri := acctest.RandInt() + location := testLocation() + config := testAccAzureRMCdnEndpoint_isHttpAndHttpsAllowed(ri, location, "true", "false") + updatedConfig := testAccAzureRMCdnEndpoint_isHttpAndHttpsAllowed(ri, location, "false", "true") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMCdnEndpointDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMCdnEndpointExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "is_http_allowed", "true"), + resource.TestCheckResourceAttr(resourceName, "is_https_allowed", "false"), + ), + }, + { + Config: updatedConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMCdnEndpointExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "is_http_allowed", "false"), + resource.TestCheckResourceAttr(resourceName, "is_https_allowed", "true"), + ), + }, + }, + }) +} func testCheckAzureRMCdnEndpointExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { @@ -427,6 +490,7 @@ resource "azurerm_cdn_endpoint" "test" { } `, rInt, location, rInt, rInt) } + func testAccAzureRMCdnEndpoint_optimized(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -459,3 +523,84 @@ resource "azurerm_cdn_endpoint" "test" { } `, rInt, location, rInt, rInt) } + +func testAccAzureRMCdnEndpoint_fullFields(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_cdn_profile" "test" { + name = "acctestcdnprof%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "Standard_Verizon" +} + +resource "azurerm_cdn_endpoint" "test" { + name = "acctestcdnend%d" + profile_name = "${azurerm_cdn_profile.test.name}" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + is_http_allowed = true + is_https_allowed = true + content_types_to_compress = ["text/html"] + is_compression_enabled = true + querystring_caching_behaviour = "UseQueryString" + origin_host_header = "www.example.com" + optimization_type = "GeneralWebDelivery" + origin_path = "/origin-path" + probe_path = "/origin-path/probe" + + origin { + name = "acceptanceTestCdnOrigin1" + host_name = "www.example.com" + https_port = 443 + http_port = 80 + } + + geo_filter { + relative_path = "/some-example-endpoint" + action = "Allow" + country_codes = ["GB"] + } + + tags { + environment = "Production" + } +} +`, rInt, location, rInt, rInt) +} + +func testAccAzureRMCdnEndpoint_isHttpAndHttpsAllowed(rInt int, location string, isHttpAllowed string, isHttpsAllowed string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_cdn_profile" "test" { + name = "acctestcdnprof%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "Standard_Verizon" +} + +resource "azurerm_cdn_endpoint" "test" { + name = "acctestcdnend%d" + profile_name = "${azurerm_cdn_profile.test.name}" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + is_http_allowed = %s + is_https_allowed = %s + + origin { + name = "acceptanceTestCdnOrigin1" + host_name = "www.example.com" + https_port = 443 + http_port = 80 + } +} +`, rInt, location, rInt, rInt, isHttpAllowed, isHttpsAllowed) +} From 5aee1eaa0b499c7d9f6efc26601e97ede5871c85 Mon Sep 17 00:00:00 2001 From: = Date: Mon, 4 Jun 2018 12:59:35 -0600 Subject: [PATCH 224/320] Removing default access attribute --- azurerm/import_arm_storage_account_test.go | 25 ++++++++++++++ azurerm/resource_arm_storage_account.go | 29 +++++----------- azurerm/resource_arm_storage_account_test.go | 35 ++++++++++++++++++-- website/docs/r/storage_account.html.markdown | 2 -- 4 files changed, 66 insertions(+), 25 deletions(-) diff --git a/azurerm/import_arm_storage_account_test.go b/azurerm/import_arm_storage_account_test.go index 652d4f73db1e..2dfb535b0970 100644 --- a/azurerm/import_arm_storage_account_test.go +++ b/azurerm/import_arm_storage_account_test.go @@ -155,3 +155,28 @@ func TestAccAzureRMStorageAccount_importEnableHttpsTrafficOnly(t *testing.T) { }, }) } + +func TestAccAzureRMStorageAccount_importNetworkRules(t *testing.T) { + resourceName := "azurerm_storage_account.testsa" + + ri := acctest.RandInt() + rs := acctest.RandString(4) + config := testAccAzureRMStorageAccount_networkRules(ri, rs, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index ef742f04c332..73e208ca48a1 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -145,7 +145,6 @@ func resourceArmStorageAccount() *schema.Resource { Type: schema.TypeList, MaxItems: 1, Optional: true, - Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "bypass": { @@ -163,11 +162,6 @@ func resourceArmStorageAccount() *schema.Resource { }, Set: schema.HashString, }, - "default_access_enabled": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - }, "ip_rules": { Type: schema.TypeSet, Optional: true, @@ -634,8 +628,9 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err } } - if networkRules := props.NetworkRuleSet; networkRules != nil { - if err := d.Set("network_rules", flattenStorageAccountNetworkRules(networkRules)); err != nil { + networkRules := props.NetworkRuleSet + if networkRules != nil && len(*networkRules.IPRules) > 0 && len(*networkRules.VirtualNetworkRules) > 0 { + if err := d.Set("network_rules", flattenStorageAccountNetworkRules(d, networkRules)); err != nil { return fmt.Errorf("Error flattening `network_rules`: %+v", err) } } @@ -697,7 +692,8 @@ func flattenStorageAccountCustomDomain(input *storage.CustomDomain) []interface{ func expandStorageAccountNetworkRules(d *schema.ResourceData) *storage.NetworkRuleSet { networkRules := d.Get("network_rules").([]interface{}) if networkRules == nil || len(networkRules) == 0 { - return nil + // Default access is enabled when no network rules are set. + return &storage.NetworkRuleSet{DefaultAction: storage.DefaultActionAllow} } networkRule := networkRules[0].(map[string]interface{}) @@ -706,13 +702,8 @@ func expandStorageAccountNetworkRules(d *schema.ResourceData) *storage.NetworkRu networkRuleSet.IPRules = expandStorageAccountIPRules(networkRule) networkRuleSet.VirtualNetworkRules = expandStorageAccountVirtualNetworks(networkRule) networkRuleSet.Bypass = expandStorageAccountBypass(networkRule) - if val, ok := networkRule["default_access_enabled"]; ok { - if val.(bool) { - networkRuleSet.DefaultAction = storage.DefaultActionAllow - } else { - networkRuleSet.DefaultAction = storage.DefaultActionDeny - } - } + // Default Access is disabled when network rules are set. + networkRuleSet.DefaultAction = storage.DefaultActionDeny return networkRuleSet } @@ -760,15 +751,13 @@ func expandStorageAccountBypass(networkRule map[string]interface{}) storage.Bypa return storage.Bypass(strings.Join(bypassValues, ", ")) } -func flattenStorageAccountNetworkRules(input *storage.NetworkRuleSet) []interface{} { +func flattenStorageAccountNetworkRules(d *schema.ResourceData, input *storage.NetworkRuleSet) []interface{} { networkRules := make(map[string]interface{}, 0) networkRules["ip_rules"] = schema.NewSet(schema.HashString, flattenStorageAccountIPRules(input.IPRules)) networkRules["virtual_network_subnet_ids"] = schema.NewSet(schema.HashString, flattenStorageAccountVirtualNetworks(input.VirtualNetworkRules)) - if input.DefaultAction != "" { - networkRules["default_access_enabled"] = (input.DefaultAction == storage.DefaultActionAllow) - } networkRules["bypass"] = schema.NewSet(schema.HashString, flattenStorageAccountBypass(input.Bypass)) + return []interface{}{networkRules} } diff --git a/azurerm/resource_arm_storage_account_test.go b/azurerm/resource_arm_storage_account_test.go index 248365e4f739..426fe67f93c0 100644 --- a/azurerm/resource_arm_storage_account_test.go +++ b/azurerm/resource_arm_storage_account_test.go @@ -364,7 +364,6 @@ func TestAccAzureRMStorageAccount_networkRules(t *testing.T) { testCheckAzureRMStorageAccountExists(resourceName), resource.TestCheckResourceAttr(resourceName, "network_rules.0.ip_rules.#", "1"), resource.TestCheckResourceAttr(resourceName, "network_rules.0.virtual_network_subnet_ids.#", "1"), - resource.TestCheckResourceAttr(resourceName, "network_rules.0.default_access_enabled", "false"), ), }, { @@ -373,7 +372,6 @@ func TestAccAzureRMStorageAccount_networkRules(t *testing.T) { testCheckAzureRMStorageAccountExists(resourceName), resource.TestCheckResourceAttr(resourceName, "network_rules.0.ip_rules.#", "2"), resource.TestCheckResourceAttr(resourceName, "network_rules.0.virtual_network_subnet_ids.#", "0"), - resource.TestCheckResourceAttr(resourceName, "network_rules.0.default_access_enabled", "true"), resource.TestCheckResourceAttr(resourceName, "network_rules.0.bypass.#", "2"), ), }, @@ -381,6 +379,38 @@ func TestAccAzureRMStorageAccount_networkRules(t *testing.T) { }) } +func TestAccAzureRMStorageAccount_networkRulesDeleted(t *testing.T) { + resourceName := "azurerm_storage_account.testsa" + ri := acctest.RandInt() + rs := acctest.RandString(4) + location := testLocation() + preConfig := testAccAzureRMStorageAccount_networkRules(ri, rs, location) + postConfig := testAccAzureRMStorageAccount_basic(ri, rs, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "network_rules.0.ip_rules.#", "1"), + resource.TestCheckResourceAttr(resourceName, "network_rules.0.virtual_network_subnet_ids.#", "1"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "network_rules.#", "0"), + ), + }, + }, + }) +} + func testCheckAzureRMStorageAccountExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API @@ -850,7 +880,6 @@ resource "azurerm_storage_account" "testsa" { network_rules { ip_rules = ["127.0.0.1", "127.0.0.2"] bypass = ["Logging", "Metrics"] - default_access_enabled = true } tags { diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index ee01fec15290..d04552f55bbd 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -129,8 +129,6 @@ The following arguments are supported: * `bypass` - (Optional) Specifies whether traffic is bypassed for Logging/Metrics/AzureServices. Valid options are any combination of `Logging`, `Metrics`, `AzureServices`, or `None`. -* `default_access_enabled` - (Optional) Boolean flag to specify the default action of allow or deny when no other rules -match. * `ip_rules` - (Optional) List of IP or IP ranges in CIDR Format. Only IPV4 addresses are allowed. * `virtual_network_subnet_ids` - (Optional) A list of resource ids for subnets. From 69c146daf12c1aa66cd7ecc2fca5c0e1a6b2dfb2 Mon Sep 17 00:00:00 2001 From: = Date: Mon, 4 Jun 2018 13:31:39 -0600 Subject: [PATCH 225/320] Removing extra code --- azurerm/resource_arm_storage_account.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index 73e208ca48a1..7efa5e747aaf 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -630,7 +630,7 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err networkRules := props.NetworkRuleSet if networkRules != nil && len(*networkRules.IPRules) > 0 && len(*networkRules.VirtualNetworkRules) > 0 { - if err := d.Set("network_rules", flattenStorageAccountNetworkRules(d, networkRules)); err != nil { + if err := d.Set("network_rules", flattenStorageAccountNetworkRules(networkRules)); err != nil { return fmt.Errorf("Error flattening `network_rules`: %+v", err) } } @@ -751,7 +751,7 @@ func expandStorageAccountBypass(networkRule map[string]interface{}) storage.Bypa return storage.Bypass(strings.Join(bypassValues, ", ")) } -func flattenStorageAccountNetworkRules(d *schema.ResourceData, input *storage.NetworkRuleSet) []interface{} { +func flattenStorageAccountNetworkRules(input *storage.NetworkRuleSet) []interface{} { networkRules := make(map[string]interface{}, 0) networkRules["ip_rules"] = schema.NewSet(schema.HashString, flattenStorageAccountIPRules(input.IPRules)) From 14be304dd15f2c97484bc60a20951f800a37eca3 Mon Sep 17 00:00:00 2001 From: Payam Hekmat <980614+phekmat@users.noreply.github.com> Date: Fri, 16 Mar 2018 11:07:11 -0500 Subject: [PATCH 226/320] Replace DNS NS record objects with records array - Replace and deprecate the `azurerm_dns_ns_record.record` objects with a single `records` array to simplify working with DNS zone resources - Duplicate tests to have coverage for the deprecated attribute - Add test for migrating from `record` attributes to `records` - Add TODOs to remove code once the deprecated attribute is removed - Update docs for the new attribute --- azurerm/resource_arm_dns_ns_record.go | 77 +++++-- azurerm/resource_arm_dns_ns_record_test.go | 255 ++++++++++++++++++++- website/docs/r/dns_ns_record.html.markdown | 12 +- 3 files changed, 314 insertions(+), 30 deletions(-) diff --git a/azurerm/resource_arm_dns_ns_record.go b/azurerm/resource_arm_dns_ns_record.go index 8f6d1b8b9afe..909bca9e541f 100644 --- a/azurerm/resource_arm_dns_ns_record.go +++ b/azurerm/resource_arm_dns_ns_record.go @@ -33,9 +33,21 @@ func resourceArmDnsNsRecord() *schema.Resource { Required: true, }, + "records": { + Type: schema.TypeList, + //TODO: add `Required: true` once we remove the `record` attribute + Optional: true, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + ConflictsWith: []string{"record"}, + }, + "record": { - Type: schema.TypeSet, - Required: true, + Type: schema.TypeSet, + Optional: true, + Computed: true, + Deprecated: "This field has been replaced by `records`", + ConflictsWith: []string{"records"}, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "nsdname": { @@ -122,8 +134,13 @@ func resourceArmDnsNsRecordRead(d *schema.ResourceData, meta interface{}) error d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) - if err := d.Set("record", flattenAzureRmDnsNsRecords(resp.NsRecords)); err != nil { - return err + if err := d.Set("records", flattenAzureRmDnsNsRecords(resp.NsRecords)); err != nil { + return fmt.Errorf("Error settings `records`: %+v", err) + } + + //TODO: remove this once we remove the `record` attribute + if err := d.Set("record", flattenAzureRmDnsNsRecordsSet(resp.NsRecords)); err != nil { + return fmt.Errorf("Error settings `record`: %+v", err) } flattenAndSetTags(d, resp.Metadata) @@ -152,14 +169,14 @@ func resourceArmDnsNsRecordDelete(d *schema.ResourceData, meta interface{}) erro return nil } -func flattenAzureRmDnsNsRecords(records *[]dns.NsRecord) []map[string]interface{} { +//TODO: remove this once we remove the `record` attribute +func flattenAzureRmDnsNsRecordsSet(records *[]dns.NsRecord) []map[string]interface{} { results := make([]map[string]interface{}, 0, len(*records)) if records != nil { for _, record := range *records { nsRecord := make(map[string]interface{}) nsRecord["nsdname"] = *record.Nsdname - results = append(results, nsRecord) } } @@ -167,20 +184,48 @@ func flattenAzureRmDnsNsRecords(records *[]dns.NsRecord) []map[string]interface{ return results } +func flattenAzureRmDnsNsRecords(records *[]dns.NsRecord) []string { + results := make([]string, 0, len(*records)) + + if records != nil { + for _, record := range *records { + results = append(results, *record.Nsdname) + } + } + + return results +} + func expandAzureRmDnsNsRecords(d *schema.ResourceData) ([]dns.NsRecord, error) { - recordStrings := d.Get("record").(*schema.Set).List() - records := make([]dns.NsRecord, len(recordStrings)) + var records []dns.NsRecord - for i, v := range recordStrings { - record := v.(map[string]interface{}) - nsdName := record["nsdname"].(string) + //TODO: remove this once we remove the `record` attribute + if d.HasChange("records") || !d.HasChange("record") { + recordStrings := d.Get("records").([]interface{}) + records = make([]dns.NsRecord, len(recordStrings)) + for i, v := range recordStrings { + record := v.(string) - nsRecord := dns.NsRecord{ - Nsdname: &nsdName, - } + nsRecord := dns.NsRecord{ + Nsdname: &record, + } - records[i] = nsRecord + records[i] = nsRecord + } + } else { + recordList := d.Get("record").(*schema.Set).List() + if len(recordList) != 0 { + records = make([]dns.NsRecord, len(recordList)) + for i, v := range recordList { + record := v.(map[string]interface{}) + nsdname := record["nsdname"].(string) + nsRecord := dns.NsRecord{ + Nsdname: &nsdname, + } + + records[i] = nsRecord + } + } } - return records, nil } diff --git a/azurerm/resource_arm_dns_ns_record_test.go b/azurerm/resource_arm_dns_ns_record_test.go index 32bddc4e8738..54246b174b07 100644 --- a/azurerm/resource_arm_dns_ns_record_test.go +++ b/azurerm/resource_arm_dns_ns_record_test.go @@ -11,6 +11,27 @@ import ( "github.com/hashicorp/terraform/terraform" ) +//TODO: remove this once we remove the `record` attribute +func TestAccAzureRMDnsNsRecord_deprecatedBasic(t *testing.T) { + resourceName := "azurerm_dns_ns_record.test" + ri := acctest.RandInt() + config := testAccAzureRMDnsNsRecord_deprecatedBasic(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMDnsNsRecordDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDnsNsRecordExists(resourceName), + ), + }, + }, + }) +} + func TestAccAzureRMDnsNsRecord_basic(t *testing.T) { resourceName := "azurerm_dns_ns_record.test" ri := acctest.RandInt() @@ -31,6 +52,37 @@ func TestAccAzureRMDnsNsRecord_basic(t *testing.T) { }) } +//TODO: remove this once we remove the `record` attribute +func TestAccAzureRMDnsNsRecord_deprecatedUpdateRecords(t *testing.T) { + resourceName := "azurerm_dns_ns_record.test" + ri := acctest.RandInt() + location := testLocation() + preConfig := testAccAzureRMDnsNsRecord_deprecatedBasic(ri, location) + postConfig := testAccAzureRMDnsNsRecord_deprecatedUpdateRecords(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMDnsNsRecordDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDnsNsRecordExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "record.#", "2"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDnsNsRecordExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "record.#", "3"), + ), + }, + }, + }) +} + func TestAccAzureRMDnsNsRecord_updateRecords(t *testing.T) { resourceName := "azurerm_dns_ns_record.test" ri := acctest.RandInt() @@ -47,14 +99,76 @@ func TestAccAzureRMDnsNsRecord_updateRecords(t *testing.T) { Config: preConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsNsRecordExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "record.#", "2"), + resource.TestCheckResourceAttr(resourceName, "records.#", "2"), ), }, { Config: postConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsNsRecordExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "record.#", "3"), + resource.TestCheckResourceAttr(resourceName, "records.#", "3"), + ), + }, + }, + }) +} + +//TODO: remove this once we remove the `record` attribute +func TestAccAzureRMDnsNsRecord_deprecatedChangeRecordToRecords(t *testing.T) { + resourceName := "azurerm_dns_ns_record.test" + ri := acctest.RandInt() + location := testLocation() + preConfig := testAccAzureRMDnsNsRecord_deprecatedBasic(ri, location) + postConfig := testAccAzureRMDnsNsRecord_deprecatedBasicNewRecords(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMDnsNsRecordDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDnsNsRecordExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "records.#", "2"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDnsNsRecordExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "records.#", "2"), + ), + }, + }, + }) +} + +//TODO: remove this once we remove the `record` attribute +func TestAccAzureRMDnsNsRecord_deprecatedWithTags(t *testing.T) { + resourceName := "azurerm_dns_ns_record.test" + ri := acctest.RandInt() + location := testLocation() + preConfig := testAccAzureRMDnsNsRecord_deprecatedWithTags(ri, location) + postConfig := testAccAzureRMDnsNsRecord_deprecatedWithTagsUpdate(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMDnsNsRecordDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDnsNsRecordExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDnsNsRecordExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), ), }, }, @@ -161,6 +275,30 @@ resource "azurerm_dns_zone" "test" { resource_group_name = "${azurerm_resource_group.test.name}" } +resource "azurerm_dns_ns_record" "test" { + name = "mynsrecord%d" + resource_group_name = "${azurerm_resource_group.test.name}" + zone_name = "${azurerm_dns_zone.test.name}" + ttl = 300 + + records = ["ns1.contoso.com", "ns2.contoso.com"] +} +`, rInt, location, rInt, rInt) +} + +//TODO: remove this once we remove the `record` attribute +func testAccAzureRMDnsNsRecord_deprecatedBasic(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG_%d" + location = "%s" +} + +resource "azurerm_dns_zone" "test" { + name = "acctestzone%d.com" + resource_group_name = "${azurerm_resource_group.test.name}" +} + resource "azurerm_dns_ns_record" "test" { name = "mynsrecord%d" resource_group_name = "${azurerm_resource_group.test.name}" @@ -168,16 +306,40 @@ resource "azurerm_dns_ns_record" "test" { ttl = 300 record { - nsdname = "ns1.contoso.com" + nsdname = "ns1.contoso.com" } record { - nsdname = "ns2.contoso.com" + nsdname = "ns2.contoso.com" } } `, rInt, location, rInt, rInt) } +//TODO: remove this once we remove the `record` attribute +func testAccAzureRMDnsNsRecord_deprecatedBasicNewRecords(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG_%d" + location = "%s" +} + +resource "azurerm_dns_zone" "test" { + name = "acctestzone%d.com" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_dns_ns_record" "test" { + name = "mynsrecord%d" + resource_group_name = "${azurerm_resource_group.test.name}" + zone_name = "${azurerm_dns_zone.test.name}" + ttl = 300 + + records = ["ns2.contoso.com", "ns1.contoso.com"] +} +`, rInt, location, rInt, rInt) +} + func testAccAzureRMDnsNsRecord_updateRecords(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -190,6 +352,30 @@ resource "azurerm_dns_zone" "test" { resource_group_name = "${azurerm_resource_group.test.name}" } +resource "azurerm_dns_ns_record" "test" { + name = "mynsrecord%d" + resource_group_name = "${azurerm_resource_group.test.name}" + zone_name = "${azurerm_dns_zone.test.name}" + ttl = 300 + + records = ["ns1.contoso.com", "ns2.contoso.com", "ns3.contoso.com"] +} +`, rInt, location, rInt, rInt) +} + +//TODO: remove this once we remove the `record` attribute +func testAccAzureRMDnsNsRecord_deprecatedUpdateRecords(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG_%d" + location = "%s" +} + +resource "azurerm_dns_zone" "test" { + name = "acctestzone%d.com" + resource_group_name = "${azurerm_resource_group.test.name}" +} + resource "azurerm_dns_ns_record" "test" { name = "mynsrecord%d" resource_group_name = "${azurerm_resource_group.test.name}" @@ -229,9 +415,38 @@ resource "azurerm_dns_ns_record" "test" { zone_name = "${azurerm_dns_zone.test.name}" ttl = 300 - record { - nsdname = "ns1.contoso.com" + records = ["ns1.contoso.com", "ns2.contoso.com"] + + tags { + environment = "Production" + cost_center = "MSFT" } +} +`, rInt, location, rInt, rInt) +} + +//TODO: remove this once we remove the `record` attribute +func testAccAzureRMDnsNsRecord_deprecatedWithTags(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG_%d" + location = "%s" +} + +resource "azurerm_dns_zone" "test" { + name = "acctestzone%d.com" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_dns_ns_record" "test" { + name = "mynsrecord%d" + resource_group_name = "${azurerm_resource_group.test.name}" + zone_name = "${azurerm_dns_zone.test.name}" + ttl = 300 + + record { + nsdname = "ns1.contoso.com" + } record { nsdname = "ns2.contoso.com" @@ -257,6 +472,34 @@ resource "azurerm_dns_zone" "test" { resource_group_name = "${azurerm_resource_group.test.name}" } +resource "azurerm_dns_ns_record" "test" { + name = "mynsrecord%d" + resource_group_name = "${azurerm_resource_group.test.name}" + zone_name = "${azurerm_dns_zone.test.name}" + ttl = 300 + + records = ["ns1.contoso.com", "ns2.contoso.com"] + + tags { + environment = "staging" + } +} +`, rInt, location, rInt, rInt) +} + +//TODO: remove this once we remove the `record` attribute +func testAccAzureRMDnsNsRecord_deprecatedWithTagsUpdate(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG_%d" + location = "%s" +} + +resource "azurerm_dns_zone" "test" { + name = "acctestzone%d.com" + resource_group_name = "${azurerm_resource_group.test.name}" +} + resource "azurerm_dns_ns_record" "test" { name = "mynsrecord%d" resource_group_name = "${azurerm_resource_group.test.name}" diff --git a/website/docs/r/dns_ns_record.html.markdown b/website/docs/r/dns_ns_record.html.markdown index 2a8b8f0f1f09..ab1d30d3a1e5 100644 --- a/website/docs/r/dns_ns_record.html.markdown +++ b/website/docs/r/dns_ns_record.html.markdown @@ -29,13 +29,7 @@ resource "azurerm_dns_ns_record" "test" { resource_group_name = "${azurerm_resource_group.test.name}" ttl = 300 - record { - nsdname = "ns1.contoso.com" - } - - record { - nsdname = "ns2.contoso.com" - } + records = ["ns1.contoso.com", "ns2.contoso.com"] tags { Environment = "Production" @@ -54,7 +48,9 @@ The following arguments are supported: * `ttl` - (Required) The Time To Live (TTL) of the DNS record. -* `record` - (Required) A list of values that make up the NS record. Each `record` block supports fields documented below. +* `records` - (Optional) A list of values that make up the NS record. *WARNING*: Either `records` or `record` is required. + +* `record` - (Optional) A list of values that make up the NS record. Each `record` block supports fields documented below. This field has been deprecated and will be removed in a future release. * `tags` - (Optional) A mapping of tags to assign to the resource. From eda1b597331ce9bb86d877d2186a6660f3ff7bd5 Mon Sep 17 00:00:00 2001 From: Damien Caro Date: Mon, 4 Jun 2018 15:21:48 -0700 Subject: [PATCH 227/320] formatted test code with gofmt --- azurerm/resource_arm_virtual_network_gateway_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azurerm/resource_arm_virtual_network_gateway_test.go b/azurerm/resource_arm_virtual_network_gateway_test.go index 94aec422c514..355084af92bb 100644 --- a/azurerm/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/resource_arm_virtual_network_gateway_test.go @@ -45,7 +45,7 @@ func TestAccAzureRMVirtualNetworkGateway_lowerCaseSubnetName(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMVirtualNetworkGatewayExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "sku", "Basic" ), + resource.TestCheckResourceAttr(resourceName, "sku", "Basic"), ), }, }, @@ -66,8 +66,8 @@ func TestAccAzureRMVirtualNetworkGateway_vpnGw1(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMVirtualNetworkGatewayExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "vpn_client_configuration.0.radius_server_address", "1.2.3.4" ), - resource.TestCheckResourceAttr(resourceName, "vpn_client_configuration.0.vpn_client_protocols.#", "2" ), + resource.TestCheckResourceAttr(resourceName, "vpn_client_configuration.0.radius_server_address", "1.2.3.4"), + resource.TestCheckResourceAttr(resourceName, "vpn_client_configuration.0.vpn_client_protocols.#", "2"), ), }, }, From 7d9a57d9e52249efc7d474bc8026f53486b841f9 Mon Sep 17 00:00:00 2001 From: Chang Li Date: Tue, 5 Jun 2018 14:14:02 +0800 Subject: [PATCH 228/320] Location validate fix in CosmosDbAccount tests --- azurerm/resource_arm_cosmos_db_account_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_cosmos_db_account_test.go b/azurerm/resource_arm_cosmos_db_account_test.go index 7fc025d97389..8c28527c0854 100644 --- a/azurerm/resource_arm_cosmos_db_account_test.go +++ b/azurerm/resource_arm_cosmos_db_account_test.go @@ -543,7 +543,7 @@ func checkAccAzureRMCosmosDBAccount_basic(resourceName string, location string, testCheckAzureRMCosmosDBAccountExists(resourceName), resource.TestCheckResourceAttrSet(resourceName, "name"), resource.TestCheckResourceAttrSet(resourceName, "resource_group_name"), - resource.TestCheckResourceAttr(resourceName, "location", location), + resource.TestCheckResourceAttr(resourceName, "location", azureRMNormalizeLocation(location)), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), resource.TestCheckResourceAttr(resourceName, "offer_type", string(documentdb.Standard)), resource.TestCheckResourceAttr(resourceName, "consistency_policy.0.consistency_level", consistency), From 789720f6224284e50c821bdbdaa797bb0af214ea Mon Sep 17 00:00:00 2001 From: "sylvain.boily" Date: Mon, 7 May 2018 10:44:04 -0400 Subject: [PATCH 229/320] Adding support for dns_servers and ip_forwarding --- CHANGELOG.md | 4 +- .../resource_arm_virtual_machine_scale_set.go | 61 +- ...urce_arm_virtual_machine_scale_set_test.go | 957 ++++++++++-------- .../r/virtual_machine_scale_set.html.markdown | 11 +- 4 files changed, 626 insertions(+), 407 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 805b5cb3a636..08eb41326ce5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -174,7 +174,7 @@ IMPROVEMENTS: * `azurerm_app_service` - allow changing `client_affinity_enabled` without requiring a resource recreation ([#993](https://github.com/terraform-providers/terraform-provider-azurerm/issues/993)) * `azurerm_app_service` - support for configuring `LocalSCM` source control ([#826](https://github.com/terraform-providers/terraform-provider-azurerm/issues/826)) * `azurerm_app_service` - returning a clearer error message when the name (which needs to be globally unique) is in use ([#1037](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1037)) -* `azurerm_cosmosdb_account` - increasing the maximum value for `max_interval_in_seconds` from 100s to 86400s (1 day) [[#1000](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1000)] +* `azurerm_cosmosdb_account` - increasing the maximum value for `max_interval_in_seconds` from 100s to 86400s (1 day) [[#1000](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1000)] * `azurerm_function_app` - returning a clearer error message when the name (which needs to be globally unique) is in use ([#1037](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1037)) * `azurerm_network_interface` - support for attaching to Application Gateways ([#1027](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1027)) * `azurerm_traffic_manager_endpoint` - adding support for `geo_mappings` ([#986](https://github.com/terraform-providers/terraform-provider-azurerm/issues/986)) @@ -352,4 +352,4 @@ IMPROVEMENTS: * core - Upgrading `Azure/azure-sdk-for-go` to v11.2.2-beta ([#594](https://github.com/terraform-providers/terraform-provider-azurerm/issues/594)) * core - upgrading `Azure/go-autorest` to v9.5.2 ([#617](https://github.com/terraform-providers/terraform-provider-azurerm/issues/617)) * core - skipping Resource Provider Registration in AutoRest when opted-out ([#630](https://github.com/terraform-providers/terraform-provider-azurerm/issues/630)) -* `azurerm_app_service` - exposing the Default Hostname as a Computed field +* `azurerm_app_service` - exposing the Default Hostname as a Computed field diff --git a/azurerm/resource_arm_virtual_machine_scale_set.go b/azurerm/resource_arm_virtual_machine_scale_set.go index 1f5b8259536d..d095b7357423 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set.go +++ b/azurerm/resource_arm_virtual_machine_scale_set.go @@ -303,11 +303,32 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { Optional: true, }, + "ip_forwarding": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "network_security_group_id": { Type: schema.TypeString, Optional: true, }, + "dns_settings": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "dns_servers": { + Type: schema.TypeList, + Required: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + }, + }, + "ip_configuration": { Type: schema.TypeList, Required: true, @@ -776,7 +797,6 @@ func resourceArmVirtualMachineScaleSetRead(d *schema.ResourceData, meta interfac if upgradePolicy := properties.UpgradePolicy; upgradePolicy != nil { d.Set("upgrade_policy_mode", upgradePolicy.Mode) } - d.Set("overprovision", properties.Overprovision) d.Set("single_placement_group", properties.SinglePlacementGroup) @@ -1036,10 +1056,27 @@ func flattenAzureRmVirtualMachineScaleSetNetworkProfile(profile *compute.Virtual s["accelerated_networking"] = *v } + if v := netConfig.VirtualMachineScaleSetNetworkConfigurationProperties.EnableIPForwarding; v != nil { + s["ip_forwarding"] = *v + } + if v := netConfig.VirtualMachineScaleSetNetworkConfigurationProperties.NetworkSecurityGroup; v != nil { s["network_security_group_id"] = *v.ID } + if netConfig.VirtualMachineScaleSetNetworkConfigurationProperties.DNSSettings != nil { + dnsSetting := make(map[string]interface{}) + dnsServers := make([]string, 0, len(*netConfig.VirtualMachineScaleSetNetworkConfigurationProperties.DNSSettings.DNSServers)) + if netConfig.VirtualMachineScaleSetNetworkConfigurationProperties.DNSSettings.DNSServers != nil { + for _, dnsServer := range *netConfig.VirtualMachineScaleSetNetworkConfigurationProperties.DNSSettings.DNSServers { + dnsServers = append(dnsServers, dnsServer) + } + dnsSetting["dns_servers"] = dnsServers + } + + s["dns_settings"] = []interface{}{dnsSetting} + } + if netConfig.VirtualMachineScaleSetNetworkConfigurationProperties.IPConfigurations != nil { ipConfigs := make([]map[string]interface{}, 0, len(*netConfig.VirtualMachineScaleSetNetworkConfigurationProperties.IPConfigurations)) for _, ipConfig := range *netConfig.VirtualMachineScaleSetNetworkConfigurationProperties.IPConfigurations { @@ -1394,7 +1431,25 @@ func expandAzureRmVirtualMachineScaleSetNetworkProfile(d *schema.ResourceData) * name := config["name"].(string) primary := config["primary"].(bool) acceleratedNetworking := config["accelerated_networking"].(bool) - + ipForwarding := config["ip_forwarding"].(bool) + + dnsSettingsConfigs := config["dns_settings"].([]interface{}) + dnsSettings := compute.VirtualMachineScaleSetNetworkConfigurationDNSSettings{} + for _, dnsSettingsConfig := range dnsSettingsConfigs { + dns_settings := dnsSettingsConfig.(map[string]interface{}) + + if v := dns_settings["dns_servers"]; v != nil { + dns_servers := dns_settings["dns_servers"].([]interface{}) + if len(dns_servers) > 0 { + var dnsServers []string + for _, v := range dns_servers { + str := v.(string) + dnsServers = append(dnsServers, str) + } + dnsSettings.DNSServers = &dnsServers + } + } + } ipConfigurationConfigs := config["ip_configuration"].([]interface{}) ipConfigurations := make([]compute.VirtualMachineScaleSetIPConfiguration, 0, len(ipConfigurationConfigs)) for _, ipConfigConfig := range ipConfigurationConfigs { @@ -1486,6 +1541,8 @@ func expandAzureRmVirtualMachineScaleSetNetworkProfile(d *schema.ResourceData) * Primary: &primary, IPConfigurations: &ipConfigurations, EnableAcceleratedNetworking: &acceleratedNetworking, + EnableIPForwarding: &ipForwarding, + DNSSettings: &dnsSettings, }, } diff --git a/azurerm/resource_arm_virtual_machine_scale_set_test.go b/azurerm/resource_arm_virtual_machine_scale_set_test.go index 0a3359ed555d..0573af551941 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set_test.go +++ b/azurerm/resource_arm_virtual_machine_scale_set_test.go @@ -13,6 +13,7 @@ import ( ) func TestAccAzureRMVirtualMachineScaleSet_basic(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_basic(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -23,10 +24,9 @@ func TestAccAzureRMVirtualMachineScaleSet_basic(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), - - // single placement group should default to true - testCheckAzureRMVirtualMachineScaleSetSinglePlacementGroup("azurerm_virtual_machine_scale_set.test", true), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + // testing default scaleset values + testCheckAzureRMVirtualMachineScaleSetSinglePlacementGroup(resourceName, true), ), }, }, @@ -34,7 +34,7 @@ func TestAccAzureRMVirtualMachineScaleSet_basic(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_basicPublicIP(t *testing.T) { - resource_name := "azurerm_virtual_machine_scale_set.test" + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_basicPublicIP(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -45,9 +45,9 @@ func TestAccAzureRMVirtualMachineScaleSet_basicPublicIP(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists(resource_name), - testCheckAzureRMVirtualMachineScaleSetIsPrimary(resource_name, true), - testCheckAzureRMVirtualMachineScaleSetPublicIPName(resource_name, "TestPublicIPConfiguration"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + testCheckAzureRMVirtualMachineScaleSetIsPrimary(resourceName, true), + testCheckAzureRMVirtualMachineScaleSetPublicIPName(resourceName, "TestPublicIPConfiguration"), ), }, }, @@ -55,7 +55,7 @@ func TestAccAzureRMVirtualMachineScaleSet_basicPublicIP(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_basicAcceleratedNetworking(t *testing.T) { - resource_name := "azurerm_virtual_machine_scale_set.test" + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_basicAcceleratedNetworking(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -66,8 +66,55 @@ func TestAccAzureRMVirtualMachineScaleSet_basicAcceleratedNetworking(t *testing. { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists(resource_name), - testCheckAzureRMVirtualMachineScaleSetAcceleratedNetworking(resource_name, true), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + testCheckAzureRMVirtualMachineScaleSetAcceleratedNetworking(resourceName, true), + ), + }, + }, + }) +} + +func TestAccAzureRMVirtualMachineScaleSet_basicIPForwarding(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" + ri := acctest.RandInt() + networkProfileName := fmt.Sprintf("TestNetworkProfile-%d", ri) + networkProfile := map[string]interface{}{"name": networkProfileName, "primary": true} + networkProfileHash := fmt.Sprintf("%d", resourceArmVirtualMachineScaleSetNetworkConfigurationHash(networkProfile)) + config := testAccAzureRMVirtualMachineScaleSet_basicIPForwarding(ri, testLocation()) + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualMachineScaleSetDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "network_profile."+networkProfileHash+".ip_forwarding", "true"), + ), + }, + }, + }) +} + +func TestAccAzureRMVirtualMachineScaleSet_basicDNSSettings(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" + ri := acctest.RandInt() + networkProfileName := fmt.Sprintf("TestNetworkProfile-%d", ri) + networkProfile := map[string]interface{}{"name": networkProfileName, "primary": true} + networkProfileHash := fmt.Sprintf("%d", resourceArmVirtualMachineScaleSetNetworkConfigurationHash(networkProfile)) + config := testAccAzureRMVirtualMachineScaleSet_basicDNSSettings(ri, testLocation()) + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualMachineScaleSetDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "network_profile."+networkProfileHash+".dns_settings.0.dns_servers.0", "8.8.8.8"), + resource.TestCheckResourceAttr(resourceName, "network_profile."+networkProfileHash+".dns_settings.0.dns_servers.1", "8.8.4.4"), ), }, }, @@ -75,7 +122,7 @@ func TestAccAzureRMVirtualMachineScaleSet_basicAcceleratedNetworking(t *testing. } func TestAccAzureRMVirtualMachineScaleSet_bootDiagnostic(t *testing.T) { - resource_name := "azurerm_virtual_machine_scale_set.test" + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_bootDiagnostic(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -86,8 +133,8 @@ func TestAccAzureRMVirtualMachineScaleSet_bootDiagnostic(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists(resource_name), - resource.TestCheckResourceAttr(resource_name, "boot_diagnostics.0.enabled", "true"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "boot_diagnostics.0.enabled", "true"), ), }, }, @@ -95,7 +142,7 @@ func TestAccAzureRMVirtualMachineScaleSet_bootDiagnostic(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_networkSecurityGroup(t *testing.T) { - resource_name := "azurerm_virtual_machine_scale_set.test" + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_networkSecurityGroup(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -106,7 +153,7 @@ func TestAccAzureRMVirtualMachineScaleSet_networkSecurityGroup(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists(resource_name), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), ), }, }, @@ -114,6 +161,7 @@ func TestAccAzureRMVirtualMachineScaleSet_networkSecurityGroup(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_basicWindows(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_basicWindows(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -124,10 +172,10 @@ func TestAccAzureRMVirtualMachineScaleSet_basicWindows(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), // single placement group should default to true - testCheckAzureRMVirtualMachineScaleSetSinglePlacementGroup("azurerm_virtual_machine_scale_set.test", true), + testCheckAzureRMVirtualMachineScaleSetSinglePlacementGroup(resourceName, true), ), }, }, @@ -135,6 +183,7 @@ func TestAccAzureRMVirtualMachineScaleSet_basicWindows(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_singlePlacementGroupFalse(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_singlePlacementGroupFalse(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -145,8 +194,8 @@ func TestAccAzureRMVirtualMachineScaleSet_singlePlacementGroupFalse(t *testing.T { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), - testCheckAzureRMVirtualMachineScaleSetSinglePlacementGroup("azurerm_virtual_machine_scale_set.test", false), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + testCheckAzureRMVirtualMachineScaleSetSinglePlacementGroup(resourceName, false), ), }, }, @@ -210,6 +259,7 @@ func TestAccAzureRMVirtualMachineScaleSet_customDataUpdated(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_basicLinux_managedDisk(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_basicLinux_managedDisk(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -220,7 +270,7 @@ func TestAccAzureRMVirtualMachineScaleSet_basicLinux_managedDisk(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), ), }, }, @@ -228,6 +278,7 @@ func TestAccAzureRMVirtualMachineScaleSet_basicLinux_managedDisk(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_basicWindows_managedDisk(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_basicWindows_managedDisk(ri, testLocation(), "Standard_D1_v2") resource.Test(t, resource.TestCase{ @@ -238,7 +289,7 @@ func TestAccAzureRMVirtualMachineScaleSet_basicWindows_managedDisk(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), ), }, }, @@ -246,6 +297,7 @@ func TestAccAzureRMVirtualMachineScaleSet_basicWindows_managedDisk(t *testing.T) } func TestAccAzureRMVirtualMachineScaleSet_basicWindows_managedDisk_resize(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() preConfig := testAccAzureRMVirtualMachineScaleSet_basicWindows_managedDisk(ri, testLocation(), "Standard_D1_v2") postConfig := testAccAzureRMVirtualMachineScaleSet_basicWindows_managedDisk(ri, testLocation(), "Standard_D2_v2") @@ -257,13 +309,13 @@ func TestAccAzureRMVirtualMachineScaleSet_basicWindows_managedDisk_resize(t *tes { Config: preConfig, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), ), }, { Config: postConfig, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), ), }, }, @@ -271,6 +323,7 @@ func TestAccAzureRMVirtualMachineScaleSet_basicWindows_managedDisk_resize(t *tes } func TestAccAzureRMVirtualMachineScaleSet_basicLinux_managedDiskNoName(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_basicLinux_managedDiskNoName(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -281,7 +334,7 @@ func TestAccAzureRMVirtualMachineScaleSet_basicLinux_managedDiskNoName(t *testin { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), ), }, }, @@ -289,6 +342,7 @@ func TestAccAzureRMVirtualMachineScaleSet_basicLinux_managedDiskNoName(t *testin } func TestAccAzureRMVirtualMachineScaleSet_basicLinux_disappears(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_basic(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -299,8 +353,8 @@ func TestAccAzureRMVirtualMachineScaleSet_basicLinux_disappears(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), - testCheckAzureRMVirtualMachineScaleSetDisappears("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + testCheckAzureRMVirtualMachineScaleSetDisappears(resourceName), ), ExpectNonEmptyPlan: true, }, @@ -309,6 +363,7 @@ func TestAccAzureRMVirtualMachineScaleSet_basicLinux_disappears(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_planManagedDisk(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_planManagedDisk(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -319,7 +374,7 @@ func TestAccAzureRMVirtualMachineScaleSet_planManagedDisk(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), ), }, }, @@ -327,6 +382,7 @@ func TestAccAzureRMVirtualMachineScaleSet_planManagedDisk(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_customImage(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() resourceGroup := fmt.Sprintf("acctestRG-%d", ri) userName := fmt.Sprintf("testadmin%d", ri) @@ -353,7 +409,7 @@ func TestAccAzureRMVirtualMachineScaleSet_customImage(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), testCheckAzureRMImageExists("azurerm_image.test", true), ), }, @@ -362,6 +418,7 @@ func TestAccAzureRMVirtualMachineScaleSet_customImage(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_applicationGateway(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSetApplicationGatewayTemplate(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -372,8 +429,8 @@ func TestAccAzureRMVirtualMachineScaleSet_applicationGateway(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), - testCheckAzureRMVirtualMachineScaleSetHasApplicationGateway("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + testCheckAzureRMVirtualMachineScaleSetHasApplicationGateway(resourceName), ), }, }, @@ -381,6 +438,7 @@ func TestAccAzureRMVirtualMachineScaleSet_applicationGateway(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_loadBalancer(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSetLoadBalancerTemplate(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -391,8 +449,8 @@ func TestAccAzureRMVirtualMachineScaleSet_loadBalancer(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), - testCheckAzureRMVirtualMachineScaleSetHasLoadbalancer("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + testCheckAzureRMVirtualMachineScaleSetHasLoadbalancer(resourceName), ), }, }, @@ -400,6 +458,7 @@ func TestAccAzureRMVirtualMachineScaleSet_loadBalancer(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_loadBalancerManagedDataDisks(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSetLoadBalancerTemplateManagedDataDisks(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -410,8 +469,8 @@ func TestAccAzureRMVirtualMachineScaleSet_loadBalancerManagedDataDisks(t *testin { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), - testCheckAzureRMVirtualMachineScaleSetHasDataDisks("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + testCheckAzureRMVirtualMachineScaleSetHasDataDisks(resourceName), ), }, }, @@ -419,6 +478,7 @@ func TestAccAzureRMVirtualMachineScaleSet_loadBalancerManagedDataDisks(t *testin } func TestAccAzureRMVirtualMachineScaleSet_overprovision(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSetOverProvisionTemplate(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -429,8 +489,8 @@ func TestAccAzureRMVirtualMachineScaleSet_overprovision(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), - testCheckAzureRMVirtualMachineScaleSetOverprovision("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + testCheckAzureRMVirtualMachineScaleSetOverprovision(resourceName), ), }, }, @@ -475,6 +535,7 @@ func TestAccAzureRMVirtualMachineScaleSet_MSI(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_extension(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSetExtensionTemplate(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -485,8 +546,8 @@ func TestAccAzureRMVirtualMachineScaleSet_extension(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), - testCheckAzureRMVirtualMachineScaleSetExtension("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + testCheckAzureRMVirtualMachineScaleSetExtension(resourceName), ), }, }, @@ -523,6 +584,7 @@ func TestAccAzureRMVirtualMachineScaleSet_extensionUpdate(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_multipleExtensions(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSetMultipleExtensionsTemplate(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -533,8 +595,8 @@ func TestAccAzureRMVirtualMachineScaleSet_multipleExtensions(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), - testCheckAzureRMVirtualMachineScaleSetExtension("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), + testCheckAzureRMVirtualMachineScaleSetExtension(resourceName), ), }, }, @@ -558,6 +620,7 @@ func TestAccAzureRMVirtualMachineScaleSet_osDiskTypeConflict(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_NonStandardCasing(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSetNonStandardCasing(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -568,7 +631,7 @@ func TestAccAzureRMVirtualMachineScaleSet_NonStandardCasing(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), ), }, { @@ -581,6 +644,7 @@ func TestAccAzureRMVirtualMachineScaleSet_NonStandardCasing(t *testing.T) { } func TestAccAzureRMVirtualMachineScaleSet_multipleNetworkProfiles(t *testing.T) { + resourceName := "azurerm_virtual_machine_scale_set.test" ri := acctest.RandInt() config := testAccAzureRMVirtualMachineScaleSet_multipleNetworkProfiles(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -591,7 +655,7 @@ func TestAccAzureRMVirtualMachineScaleSet_multipleNetworkProfiles(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"), + testCheckAzureRMVirtualMachineScaleSetExists(resourceName), ), }, }, @@ -921,38 +985,26 @@ func testCheckAzureRMVirtualMachineScaleSetHasDataDisks(name string) resource.Te func testAccAzureRMVirtualMachineScaleSet_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } -resource "azurerm_network_interface" "test" { - name = "acctni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "dynamic" - } -} - resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -971,7 +1023,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -981,15 +1033,15 @@ resource "azurerm_virtual_machine_scale_set" "test" { tier = "Standard" capacity = 2 } - + os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true ip_configuration { name = "TestIPConfiguration" @@ -1011,44 +1063,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_basicPublicIP(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } -resource "azurerm_network_interface" "test" { - name = "acctni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "dynamic" - } -} - resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -1067,7 +1107,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -1079,13 +1119,13 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true ip_configuration { name = "TestIPConfiguration" @@ -1093,7 +1133,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { primary = true public_ip_address_configuration { name = "TestPublicIPConfiguration" - domain_name_label = "test-domain-label-%d" + domain_name_label = "test-domain-label-%[1]d" idle_timeout = 4 } } @@ -1113,44 +1153,117 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_basicAcceleratedNetworking(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } -resource "azurerm_network_interface" "test" { - name = "acctni-%d" +resource "azurerm_storage_account" "test" { + name = "accsa%[1]d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + tags { + environment = "staging" + } +} + +resource "azurerm_storage_container" "test" { + name = "vhds" + resource_group_name = "${azurerm_resource_group.test.name}" + storage_account_name = "${azurerm_storage_account.test.name}" + container_access_type = "private" +} + +resource "azurerm_virtual_machine_scale_set" "test" { + name = "acctvmss-%[1]d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + upgrade_policy_mode = "Manual" + + sku { + name = "Standard_D4_v2" + tier = "Standard" + capacity = 2 + } + + os_profile { + computer_name_prefix = "testvm-%[1]d" + admin_username = "myadmin" + admin_password = "Passwword1234" + } + + network_profile { + name = "TestNetworkProfile-%[1]d" + primary = true + accelerated_networking = true + ip_configuration { + name = "TestIPConfiguration" + subnet_id = "${azurerm_subnet.test.id}" + } + } + + storage_profile_os_disk { + name = "osDiskProfile" + caching = "ReadWrite" + create_option = "FromImage" + vhd_containers = ["${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}"] + } + + storage_profile_image_reference { + publisher = "Canonical" + offer = "UbuntuServer" + sku = "16.04-LTS" + version = "latest" + } +} +`, rInt, location) +} + +func testAccAzureRMVirtualMachineScaleSet_basicIPForwarding(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%[1]d" + location = "%[2]s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctvn-%[1]d" + address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" +} - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "dynamic" - } +resource "azurerm_subnet" "test" { + name = "acctsub-%[1]d" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.2.0/24" } resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -1169,7 +1282,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -1181,15 +1294,15 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true - accelerated_networking = true + ip_forwarding = true ip_configuration { name = "TestIPConfiguration" subnet_id = "${azurerm_subnet.test.id}" @@ -1210,44 +1323,119 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } -func testAccAzureRMVirtualMachineScaleSet_bootDiagnostic(rInt int, location string) string { +func testAccAzureRMVirtualMachineScaleSet_basicDNSSettings(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } -resource "azurerm_network_interface" "test" { - name = "acctni-%d" +resource "azurerm_storage_account" "test" { + name = "accsa%[1]d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + tags { + environment = "staging" + } +} + +resource "azurerm_storage_container" "test" { + name = "vhds" + resource_group_name = "${azurerm_resource_group.test.name}" + storage_account_name = "${azurerm_storage_account.test.name}" + container_access_type = "private" +} + +resource "azurerm_virtual_machine_scale_set" "test" { + name = "acctvmss-%[1]d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + upgrade_policy_mode = "Manual" + + sku { + name = "Standard_D4_v2" + tier = "Standard" + capacity = 2 + } + + os_profile { + computer_name_prefix = "testvm-%[1]d" + admin_username = "myadmin" + admin_password = "Passwword1234" + } + + network_profile { + name = "TestNetworkProfile-%[1]d" + primary = true + dns_settings { + dns_servers = ["8.8.8.8", "8.8.4.4"] + } + ip_configuration { + name = "TestIPConfiguration" + subnet_id = "${azurerm_subnet.test.id}" + } + } + + storage_profile_os_disk { + name = "osDiskProfile" + caching = "ReadWrite" + create_option = "FromImage" + vhd_containers = ["${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}"] + } + + storage_profile_image_reference { + publisher = "Canonical" + offer = "UbuntuServer" + sku = "16.04-LTS" + version = "latest" + } +} +`, rInt, location) +} + +func testAccAzureRMVirtualMachineScaleSet_bootDiagnostic(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%[1]d" + location = "%[2]s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctvn-%[1]d" + address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" +} - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "dynamic" - } +resource "azurerm_subnet" "test" { + name = "acctsub-%[1]d" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.2.0/24" } resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -1266,7 +1454,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -1278,7 +1466,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } @@ -1288,7 +1476,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true ip_configuration { name = "TestIPConfiguration" @@ -1310,44 +1498,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_networkSecurityGroup(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } -resource "azurerm_network_interface" "test" { - name = "acctni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "dynamic" - } -} - resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -1366,13 +1542,13 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_network_security_group" "test" { - name = "acceptanceTestSecurityGroup-%d" + name = "acceptanceTestSecurityGroup-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -1384,13 +1560,13 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true network_security_group_id = "${azurerm_network_security_group.test.id}" ip_configuration { @@ -1399,7 +1575,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { primary = true public_ip_address_configuration { name = "TestPublicIPConfiguration" - domain_name_label = "test-domain-label-%d" + domain_name_label = "test-domain-label-%[1]d" idle_timeout = 4 } } @@ -1419,44 +1595,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_basicWindows(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } -resource "azurerm_network_interface" "test" { - name = "acctni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "dynamic" - } -} - resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -1475,7 +1639,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -1502,7 +1666,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true ip_configuration { name = "TestIPConfiguration" @@ -1524,14 +1688,14 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_singlePlacementGroupFalse(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" - location = "%s" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { @@ -1548,18 +1712,6 @@ resource "azurerm_subnet" "test" { address_prefix = "10.0.2.0/24" } -resource "azurerm_network_interface" "test" { - name = "acctni-%[1]d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "dynamic" - } -} - resource "azurerm_storage_account" "test" { name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" @@ -1627,42 +1779,48 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_linux(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" - location = "%s" + name = "acctestrg-%[1]d" + location = "%[2]s" } + resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" + name = "acctestvn-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" address_space = ["10.0.0.0/8"] } + resource "azurerm_subnet" "test" { - name = "acctestsn-%d" + name = "acctestsn-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.1.0/24" } + resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" } + resource "azurerm_storage_container" "test" { - name = "acctestsc-%d" + name = "acctestsc-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } + resource "azurerm_public_ip" "test" { - name = "acctestpip-%d" + name = "acctestpip-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" public_ip_address_allocation = "static" } + resource "azurerm_lb" "test" { - name = "acctestlb-%d" + name = "acctestlb-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" frontend_ip_configuration { @@ -1670,27 +1828,32 @@ resource "azurerm_lb" "test" { public_ip_address_id = "${azurerm_public_ip.test.id}" } } + resource "azurerm_lb_backend_address_pool" "test" { - name = "acctestbap-%d" + name = "acctestbap-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" } + resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctestvmss-%d" + name = "acctestvmss-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" upgrade_policy_mode = "Automatic" + sku { name = "Standard_A0" tier = "Standard" capacity = "1" } + os_profile { computer_name_prefix = "prefix" admin_username = "ubuntu" admin_password = "password" custom_data = "custom data!" } + os_profile_linux_config { disable_password_authentication = true ssh_keys { @@ -1698,6 +1861,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { key_data = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCsTcryUl51Q2VSEHqDRNmceUFo55ZtcIwxl2QITbN1RREti5ml/VTytC0yeBOvnZA4x4CFpdw/lCDPk0yrH9Ei5vVkXmOrExdTlT3qI7YaAzj1tUVlBd4S6LX1F7y6VLActvdHuDDuXZXzCDd/97420jrDfWZqJMlUK/EmCE5ParCeHIRIvmBxcEnGfFIsw8xQZl0HphxWOtJil8qsUWSdMyCiJYYQpMoMliO99X40AUc4/AlsyPyT5ddbKk08YrZ+rKDVHF7o29rh4vi5MmHkVgVQHKiKybWlHq+b71gIAUQk9wrJxD+dqt4igrmDSpIjfjwnd+l5UIn5fJSO5DYV4YT/4hwK7OKmuo7OFHD0WyY5YnkYEMtFgzemnRBdE8ulcT60DQpVgRMXFWHvhyCWy0L6sgj1QWDZlLpvsIvNfHsyhKFMG1frLnMt/nP0+YCcfg+v1JYeCKjeoJxB8DWcRBsjzItY0CGmzP8UYZiYKl/2u+2TgFS5r7NWH11bxoUzjKdaa1NLw+ieA8GlBFfCbfWe6YVB9ggUte4VtYFMZGxOjS2bAiYtfgTKFJv+XqORAwExG6+G2eDxIDyo80/OA9IG7Xv/jwQr7D6KDjDuULFcN/iTxuttoKrHeYz1hf5ZQlBdllwJHYx6fK2g8kha6r2JIQKocvsAXiiONqSfw== hello@world.com" } } + network_profile { name = "TestNetworkProfile" primary = true @@ -1707,6 +1871,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { load_balancer_backend_address_pool_ids = ["${azurerm_lb_backend_address_pool.test.id}"] } } + storage_profile_os_disk { name = "osDiskProfile" caching = "ReadWrite" @@ -1714,6 +1879,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { os_type = "linux" vhd_containers = ["${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}"] } + storage_profile_image_reference { publisher = "Canonical" offer = "UbuntuServer" @@ -1721,48 +1887,54 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_linuxUpdated(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" - location = "%s" + name = "acctestrg-%[1]d" + location = "%[2]s" } + resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" + name = "acctestvn-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" address_space = ["10.0.0.0/8"] } + resource "azurerm_subnet" "test" { - name = "acctestsn-%d" + name = "acctestsn-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.1.0/24" } + resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" } + resource "azurerm_storage_container" "test" { - name = "acctestsc-%d" + name = "acctestsc-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } + resource "azurerm_public_ip" "test" { - name = "acctestpip-%d" + name = "acctestpip-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" public_ip_address_allocation = "static" } + resource "azurerm_lb" "test" { - name = "acctestlb-%d" + name = "acctestlb-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" frontend_ip_configuration { @@ -1770,27 +1942,32 @@ resource "azurerm_lb" "test" { public_ip_address_id = "${azurerm_public_ip.test.id}" } } + resource "azurerm_lb_backend_address_pool" "test" { - name = "acctestbap-%d" + name = "acctestbap-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" } + resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctestvmss-%d" + name = "acctestvmss-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" upgrade_policy_mode = "Automatic" + sku { name = "Standard_A0" tier = "Standard" capacity = "1" } + os_profile { computer_name_prefix = "prefix" admin_username = "ubuntu" admin_password = "password" custom_data = "custom data!" } + os_profile_linux_config { disable_password_authentication = true ssh_keys { @@ -1798,6 +1975,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { key_data = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCsTcryUl51Q2VSEHqDRNmceUFo55ZtcIwxl2QITbN1RREti5ml/VTytC0yeBOvnZA4x4CFpdw/lCDPk0yrH9Ei5vVkXmOrExdTlT3qI7YaAzj1tUVlBd4S6LX1F7y6VLActvdHuDDuXZXzCDd/97420jrDfWZqJMlUK/EmCE5ParCeHIRIvmBxcEnGfFIsw8xQZl0HphxWOtJil8qsUWSdMyCiJYYQpMoMliO99X40AUc4/AlsyPyT5ddbKk08YrZ+rKDVHF7o29rh4vi5MmHkVgVQHKiKybWlHq+b71gIAUQk9wrJxD+dqt4igrmDSpIjfjwnd+l5UIn5fJSO5DYV4YT/4hwK7OKmuo7OFHD0WyY5YnkYEMtFgzemnRBdE8ulcT60DQpVgRMXFWHvhyCWy0L6sgj1QWDZlLpvsIvNfHsyhKFMG1frLnMt/nP0+YCcfg+v1JYeCKjeoJxB8DWcRBsjzItY0CGmzP8UYZiYKl/2u+2TgFS5r7NWH11bxoUzjKdaa1NLw+ieA8GlBFfCbfWe6YVB9ggUte4VtYFMZGxOjS2bAiYtfgTKFJv+XqORAwExG6+G2eDxIDyo80/OA9IG7Xv/jwQr7D6KDjDuULFcN/iTxuttoKrHeYz1hf5ZQlBdllwJHYx6fK2g8kha6r2JIQKocvsAXiiONqSfw== hello@world.com" } } + network_profile { name = "TestNetworkProfile" primary = true @@ -1807,6 +1985,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { load_balancer_backend_address_pool_ids = ["${azurerm_lb_backend_address_pool.test.id}"] } } + storage_profile_os_disk { name = "osDiskProfile" caching = "ReadWrite" @@ -1814,58 +1993,66 @@ resource "azurerm_virtual_machine_scale_set" "test" { os_type = "linux" vhd_containers = ["${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}"] } + storage_profile_image_reference { publisher = "Canonical" offer = "UbuntuServer" sku = "16.04-LTS" version = "latest" } + tags { ThisIs = "a test" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_linuxCustomDataUpdated(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" - location = "%s" + name = "acctestrg-%[1]d" + location = "%[2]s" } + resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" + name = "acctestvn-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" address_space = ["10.0.0.0/8"] } + resource "azurerm_subnet" "test" { - name = "acctestsn-%d" + name = "acctestsn-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.1.0/24" } + resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" } + resource "azurerm_storage_container" "test" { - name = "acctestsc-%d" + name = "acctestsc-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } + resource "azurerm_public_ip" "test" { - name = "acctestpip-%d" + name = "acctestpip-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" public_ip_address_allocation = "static" } + resource "azurerm_lb" "test" { - name = "acctestlb-%d" + name = "acctestlb-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" frontend_ip_configuration { @@ -1873,27 +2060,32 @@ resource "azurerm_lb" "test" { public_ip_address_id = "${azurerm_public_ip.test.id}" } } + resource "azurerm_lb_backend_address_pool" "test" { - name = "acctestbap-%d" + name = "acctestbap-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" } + resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctestvmss-%d" + name = "acctestvmss-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" upgrade_policy_mode = "Automatic" + sku { name = "Standard_A0" tier = "Standard" capacity = "1" } + os_profile { computer_name_prefix = "prefix" admin_username = "ubuntu" admin_password = "password" custom_data = "updated custom data!" } + os_profile_linux_config { disable_password_authentication = true ssh_keys { @@ -1901,6 +2093,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { key_data = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCsTcryUl51Q2VSEHqDRNmceUFo55ZtcIwxl2QITbN1RREti5ml/VTytC0yeBOvnZA4x4CFpdw/lCDPk0yrH9Ei5vVkXmOrExdTlT3qI7YaAzj1tUVlBd4S6LX1F7y6VLActvdHuDDuXZXzCDd/97420jrDfWZqJMlUK/EmCE5ParCeHIRIvmBxcEnGfFIsw8xQZl0HphxWOtJil8qsUWSdMyCiJYYQpMoMliO99X40AUc4/AlsyPyT5ddbKk08YrZ+rKDVHF7o29rh4vi5MmHkVgVQHKiKybWlHq+b71gIAUQk9wrJxD+dqt4igrmDSpIjfjwnd+l5UIn5fJSO5DYV4YT/4hwK7OKmuo7OFHD0WyY5YnkYEMtFgzemnRBdE8ulcT60DQpVgRMXFWHvhyCWy0L6sgj1QWDZlLpvsIvNfHsyhKFMG1frLnMt/nP0+YCcfg+v1JYeCKjeoJxB8DWcRBsjzItY0CGmzP8UYZiYKl/2u+2TgFS5r7NWH11bxoUzjKdaa1NLw+ieA8GlBFfCbfWe6YVB9ggUte4VtYFMZGxOjS2bAiYtfgTKFJv+XqORAwExG6+G2eDxIDyo80/OA9IG7Xv/jwQr7D6KDjDuULFcN/iTxuttoKrHeYz1hf5ZQlBdllwJHYx6fK2g8kha6r2JIQKocvsAXiiONqSfw== hello@world.com" } } + network_profile { name = "TestNetworkProfile" primary = true @@ -1910,6 +2103,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { load_balancer_backend_address_pool_ids = ["${azurerm_lb_backend_address_pool.test.id}"] } } + storage_profile_os_disk { name = "osDiskProfile" caching = "ReadWrite" @@ -1917,6 +2111,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { os_type = "linux" vhd_containers = ["${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}"] } + storage_profile_image_reference { publisher = "Canonical" offer = "UbuntuServer" @@ -1924,32 +2119,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_basicLinux_managedDisk(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -1961,13 +2156,13 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true ip_configuration { name = "TestIPConfiguration" @@ -1989,32 +2184,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_basicLinux_managedDisk_withZones(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -2027,13 +2222,13 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true ip_configuration { name = "TestIPConfiguration" @@ -2054,38 +2249,38 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_basicWindows_managedDisk(rInt int, location string, vmSize string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" sku { - name = "%s" + name = "%[3]s" tier = "Standard" capacity = 2 } @@ -2116,7 +2311,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true ip_configuration { name = "TestIPConfiguration" @@ -2138,32 +2333,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, vmSize, rInt) +`, rInt, location, vmSize) } func testAccAzureRMVirtualMachineScaleSet_basicLinux_managedDiskNoName(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -2175,13 +2370,13 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true ip_configuration { name = "TestIPConfiguration" @@ -2202,32 +2397,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSetApplicationGatewayTemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" - location = "%s" + name = "acctestrg-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -2242,7 +2437,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -2254,7 +2449,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } @@ -2287,21 +2482,21 @@ resource "azurerm_virtual_machine_scale_set" "test" { # application gateway resource "azurerm_subnet" "gwtest" { - name = "gw-subnet-%d" + name = "gw-subnet-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.3.0/24" } resource "azurerm_public_ip" "test" { - name = "acctest-pubip-%d" + name = "acctest-pubip-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" public_ip_address_allocation = "dynamic" } resource "azurerm_application_gateway" "test" { - name = "acctestgw-%d" + name = "acctestgw-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" @@ -2397,32 +2592,32 @@ resource "azurerm_application_gateway" "test" { environment = "tf01" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSetLoadBalancerTemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" - location = "%s" + name = "acctestrg-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -2437,7 +2632,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_lb" "test" { - name = "acctestlb-%d" + name = "acctestlb-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" @@ -2467,7 +2662,7 @@ resource "azurerm_lb_nat_pool" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -2479,7 +2674,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } @@ -2511,32 +2706,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSetOverProvisionTemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" - location = "%s" + name = "acctestrg-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -2551,7 +2746,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -2564,7 +2759,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } @@ -2594,14 +2789,14 @@ resource "azurerm_virtual_machine_scale_set" "test" { } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSetPriorityTemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestrg-%[1]d" - location = "%s" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { @@ -2684,26 +2879,26 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetMSITemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" - location = "%s" + name = "acctestrg-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -2718,7 +2913,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -2733,17 +2928,17 @@ resource "azurerm_virtual_machine_scale_set" "test" { identity { type = "systemAssigned" } - + extension { name = "MSILinuxExtension" publisher = "Microsoft.ManagedIdentity" type = "ManagedIdentityExtensionForLinux" type_handler_version = "1.0" settings = "{\"port\": 50342}" - } + } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } @@ -2773,32 +2968,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSetExtensionTemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" - location = "%s" + name = "acctestrg-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -2813,7 +3008,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -2826,7 +3021,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } @@ -2884,32 +3079,32 @@ SETTINGS SETTINGS } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSetExtensionTemplateUpdated(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" - location = "%s" + name = "acctestrg-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -2924,7 +3119,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -2937,7 +3132,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } @@ -2996,32 +3191,32 @@ SETTINGS SETTINGS } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSetMultipleExtensionsTemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" - location = "%s" + name = "acctestrg-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -3036,7 +3231,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -3049,7 +3244,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } @@ -3108,44 +3303,32 @@ SETTINGS } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_osDiskTypeConflict(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } -resource "azurerm_network_interface" "test" { - name = "acctni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "dynamic" - } -} - resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -3157,13 +3340,13 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true ip_configuration { @@ -3188,32 +3371,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSetLoadBalancerTemplateManagedDataDisks(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" - location = "%s" + name = "acctestrg-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_lb" "test" { - name = "acctestlb-%d" + name = "acctestlb-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" @@ -3231,7 +3414,7 @@ resource "azurerm_lb_backend_address_pool" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -3243,7 +3426,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } @@ -3282,44 +3465,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSetNonStandardCasing(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } -resource "azurerm_network_interface" "test" { - name = "acctni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "dynamic" - } -} - resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -3338,7 +3509,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -3350,13 +3521,13 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true ip_configuration { @@ -3379,32 +3550,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_planManagedDisk(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -3416,13 +3587,13 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true ip_configuration { name = "TestIPConfiguration" @@ -3449,40 +3620,40 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } func testAccAzureRMVirtualMachineScaleSet_customImage(rInt int, location string, userName string, password string, hostName string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } resource "azurerm_public_ip" "test" { - name = "acctpip-%d" + name = "acctpip-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" public_ip_address_allocation = "Dynamic" - domain_name_label = "%s" + domain_name_label = "%[3]s" } resource "azurerm_network_interface" "testsource" { - name = "acctnicsource-%d" + name = "acctnicsource-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" @@ -3495,7 +3666,7 @@ resource "azurerm_network_interface" "testsource" { } resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -3537,8 +3708,8 @@ resource "azurerm_virtual_machine" "testsource" { os_profile { computer_name = "mdimagetestsource" - admin_username = "%s" - admin_password = "%s" + admin_username = "%[4]s" + admin_password = "%[5]s" } os_profile_linux_config { @@ -3552,7 +3723,7 @@ resource "azurerm_virtual_machine" "testsource" { } resource "azurerm_image" "test" { - name = "accteste-%d" + name = "accteste-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" @@ -3577,7 +3748,7 @@ resource "azurerm_image" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -3593,13 +3764,13 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } network_profile { - name = "TestNetworkProfile-%d" + name = "TestNetworkProfile-%[1]d" primary = true ip_configuration { name = "TestIPConfiguration" @@ -3613,44 +3784,32 @@ resource "azurerm_virtual_machine_scale_set" "test" { managed_disk_type = "Standard_LRS" } } -`, rInt, location, rInt, rInt, rInt, hostName, rInt, rInt, userName, password, rInt, rInt, rInt, rInt) +`, rInt, location, hostName, userName, password) } func testAccAzureRMVirtualMachineScaleSet_multipleNetworkProfiles(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" + name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "acctsub-%d" + name = "acctsub-%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" } -resource "azurerm_network_interface" "test" { - name = "acctni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "dynamic" - } -} - resource "azurerm_storage_account" "test" { - name = "accsa%d" + name = "accsa%[1]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" @@ -3669,7 +3828,7 @@ resource "azurerm_storage_container" "test" { } resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" + name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" upgrade_policy_mode = "Manual" @@ -3681,13 +3840,13 @@ resource "azurerm_virtual_machine_scale_set" "test" { } os_profile { - computer_name_prefix = "testvm-%d" + computer_name_prefix = "testvm-%[1]d" admin_username = "myadmin" admin_password = "Passwword1234" } network_profile { - name = "primary-%d" + name = "primary-%[1]d" primary = true ip_configuration { name = "primary" @@ -3696,7 +3855,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { } network_profile { - name = "secondary-%d" + name = "secondary-%[1]d" primary = false ip_configuration { name = "secondary" @@ -3718,5 +3877,5 @@ resource "azurerm_virtual_machine_scale_set" "test" { version = "latest" } } -`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt) +`, rInt, location) } diff --git a/website/docs/r/virtual_machine_scale_set.html.markdown b/website/docs/r/virtual_machine_scale_set.html.markdown index 7d3c93151961..25a541c86046 100644 --- a/website/docs/r/virtual_machine_scale_set.html.markdown +++ b/website/docs/r/virtual_machine_scale_set.html.markdown @@ -353,10 +353,14 @@ resource "azurerm_virtual_machine_scale_set" "test" { * `name` - (Required) Specifies the name of the network interface configuration. * `primary` - (Required) Indicates whether network interfaces created from the network interface configuration will be the primary NIC of the VM. -* `ip_configuration` - (Required) An ip_configuration block as documented below +* `ip_configuration` - (Required) An ip_configuration block as documented below. +* `accelerated_networking` - (Optional) Specifies whether to enable accelerated networking or not. Defaults to `false`. +* `dns_settings` - (Optional) An dns_settings block as documented below. * `network_security_group_id` - (Optional) Specifies the identifier for the network security group. -* `accelerated_networking` - (Optional) Specifies whether to enable accelerated networking or not. Defaults to -`false`. + +`dns_settings` supports the following: + +* `dns_servers` - (Required) Specifies an array of dns servers. `ip_configuration` supports the following: @@ -452,7 +456,6 @@ The following attributes are exported: * `id` - The virtual machine scale set ID. - ## Import Virtual Machine Scale Sets can be imported using the `resource id`, e.g. From e8242fde0d40f1276d2eee4c38c725d5cfb485bb Mon Sep 17 00:00:00 2001 From: "sylvain.boily" Date: Tue, 5 Jun 2018 09:56:14 -0400 Subject: [PATCH 230/320] fix failling test --- azurerm/resource_arm_virtual_machine_scale_set_test.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/azurerm/resource_arm_virtual_machine_scale_set_test.go b/azurerm/resource_arm_virtual_machine_scale_set_test.go index 0573af551941..3406a3406e0a 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set_test.go +++ b/azurerm/resource_arm_virtual_machine_scale_set_test.go @@ -3741,12 +3741,6 @@ resource "azurerm_image" "test" { } } - - data "azurerm_image" "test" { - name = "${azurerm_image.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - resource "azurerm_virtual_machine_scale_set" "test" { name = "acctvmss-%[1]d" location = "${azurerm_resource_group.test.location}" @@ -3754,7 +3748,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { upgrade_policy_mode = "Manual" storage_profile_image_reference { - id = "${data.azurerm_image.test.id}" + id = "${azurerm_image.test.id}" } sku { From f9714a11b6cc1ae660cfe753f69663306a7e5f3f Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 5 Jun 2018 16:00:43 -0700 Subject: [PATCH 231/320] Update CHANGELOG.md to include #1209 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08eb41326ce5..6cec114cded2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ FEATURES: IMPROVEMENTS: +* `azurerm_virtual_machine_scale_set` - adding the `dns_settings` and `dns_servers` property [GH-1209] +* `azurerm_virtual_machine_scale_set` - adding the `ip_forwarding` property [GH-1209] * dependencies: migrating to the un-deprecated Preview's for Container Instance, EventGrid, Log Analytics and SQL [GH-1322] * dependencies: upgrading to `2018-01-01` of the EventGrid API [GH-1322] * dependencies: upgrading to `2018-03-01` of the Monitor API [GH-1322] From 09417dabcc717fc495374d0fee4a05c8b8f8746b Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 5 Jun 2018 17:10:21 -0700 Subject: [PATCH 232/320] Update CHANGELOG.md to include #1334 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cec114cded2..2e33128be495 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ IMPROVEMENTS: * `azurerm_virtual_machine_scale_set` - adding the `dns_settings` and `dns_servers` property [GH-1209] * `azurerm_virtual_machine_scale_set` - adding the `ip_forwarding` property [GH-1209] +* `azurerm_storage_account` - adding the `network_rules` property [GH-1334] * dependencies: migrating to the un-deprecated Preview's for Container Instance, EventGrid, Log Analytics and SQL [GH-1322] * dependencies: upgrading to `2018-01-01` of the EventGrid API [GH-1322] * dependencies: upgrading to `2018-03-01` of the Monitor API [GH-1322] From 82dbd308abc6eb4a85dca83f1ca137ed511b43b2 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 5 Jun 2018 17:25:12 -0700 Subject: [PATCH 233/320] Fix storage_account dataasource documentation --- website/docs/d/storage_account.html.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/docs/d/storage_account.html.markdown b/website/docs/d/storage_account.html.markdown index ee1c5c676720..340dc1c43322 100644 --- a/website/docs/d/storage_account.html.markdown +++ b/website/docs/d/storage_account.html.markdown @@ -35,13 +35,13 @@ output "storage_account_tier" { * `location` - The Azure location where the Storage Account exists -* `account_kind` - Defines the Kind of account, either `BlobStorage` or `Storage`. +* `account_kind` - The Kind of account. -* `account_tier` - Defines the Tier of this storage account. +* `account_tier` - The Tier of this storage account. -* `account_replication_type` - Defines the type of replication used for this storage account. +* `account_replication_type` - The type of replication used for this storage account. -* `access_tier` - Defines the access tier for `BlobStorage` accounts. +* `access_tier` - The access tier for `BlobStorage` accounts. * `enable_blob_encryption` - Are Encryption Services are enabled for Blob storage? See [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) for more information. From 57003c872188feb914570dcd2301b05fb715d492 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 5 Jun 2018 18:31:23 -0700 Subject: [PATCH 234/320] Update CHANGELOG.md to include #991 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e33128be495..e5e73e53a59b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,9 +17,10 @@ FEATURES: IMPROVEMENTS: +* `azurerm_dns_ns_record` - deprecated `record` properties in favor of a `records` list [GH-991] +* `azurerm_storage_account` - adding the `network_rules` property [GH-1334] * `azurerm_virtual_machine_scale_set` - adding the `dns_settings` and `dns_servers` property [GH-1209] * `azurerm_virtual_machine_scale_set` - adding the `ip_forwarding` property [GH-1209] -* `azurerm_storage_account` - adding the `network_rules` property [GH-1334] * dependencies: migrating to the un-deprecated Preview's for Container Instance, EventGrid, Log Analytics and SQL [GH-1322] * dependencies: upgrading to `2018-01-01` of the EventGrid API [GH-1322] * dependencies: upgrading to `2018-03-01` of the Monitor API [GH-1322] From a53ec9cd8901ca23e5a278222c467bb6be360a4b Mon Sep 17 00:00:00 2001 From: ShanePoint Date: Tue, 5 Jun 2018 22:06:28 -0700 Subject: [PATCH 235/320] Updated validation to allow underscore in app service plan name and updated example. --- azurerm/resource_arm_app_service.go | 4 ++-- azurerm/resource_arm_app_service_plan.go | 4 ++-- examples/app-service/app.tf | 11 +++++++++-- examples/app-service/variables.tf | 21 ++++++++++++--------- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/azurerm/resource_arm_app_service.go b/azurerm/resource_arm_app_service.go index 193f9a063d69..1412ad3e00c1 100644 --- a/azurerm/resource_arm_app_service.go +++ b/azurerm/resource_arm_app_service.go @@ -967,8 +967,8 @@ func flattenAzureRmAppServiceMachineIdentity(identity *web.ManagedServiceIdentit func validateAppServiceName(v interface{}, k string) (ws []string, es []error) { value := v.(string) - if matched := regexp.MustCompile(`^[0-9a-zA-Z-]+$`).Match([]byte(value)); !matched { - es = append(es, fmt.Errorf("%q may only contain alphanumeric characters and dashes", k)) + if matched := regexp.MustCompile(`^[0-9a-zA-Z-]{1,60}$`).Match([]byte(value)); !matched { + es = append(es, fmt.Errorf("%q may only contain alphanumeric characters and dashes and up to 60 characters", k)) } return diff --git a/azurerm/resource_arm_app_service_plan.go b/azurerm/resource_arm_app_service_plan.go index da0247c72d3a..719bf242eabe 100644 --- a/azurerm/resource_arm_app_service_plan.go +++ b/azurerm/resource_arm_app_service_plan.go @@ -314,8 +314,8 @@ func flattenAppServiceProperties(props *web.AppServicePlanProperties) []interfac func validateAppServicePlanName(v interface{}, k string) (ws []string, es []error) { value := v.(string) - if matched := regexp.MustCompile(`^[0-9a-zA-Z-]+$`).Match([]byte(value)); !matched { - es = append(es, fmt.Errorf("%q may only contain alphanumeric characters and dashes", k)) + if matched := regexp.MustCompile(`^[0-9a-zA-Z-_]{1,60}$`).Match([]byte(value)); !matched { + es = append(es, fmt.Errorf("%q may only contain alphanumeric characters, dashes and underscores up to 60 characters", k)) } return diff --git a/examples/app-service/app.tf b/examples/app-service/app.tf index d2cf74a13484..cd10ccc479cf 100644 --- a/examples/app-service/app.tf +++ b/examples/app-service/app.tf @@ -8,8 +8,15 @@ resource "azurerm_resource_group" "default" { location = "${var.location}" } + +resource "random_integer" "ri" { + min = 10000 + max = 99999 +} + + resource "azurerm_app_service_plan" "default" { - name = "${var.app_service_name}-plan" + name = "tfex-appservice-${random_integer.ri.result}-plan" location = "${azurerm_resource_group.default.location}" resource_group_name = "${azurerm_resource_group.default.name}" @@ -20,7 +27,7 @@ resource "azurerm_app_service_plan" "default" { } resource "azurerm_app_service" "default" { - name = "${var.app_service_name}" + name = "tfex-appservice-${random_integer.ri.result}" location = "${azurerm_resource_group.default.location}" resource_group_name = "${azurerm_resource_group.default.name}" app_service_plan_id = "${azurerm_app_service_plan.default.id}" diff --git a/examples/app-service/variables.tf b/examples/app-service/variables.tf index 6d9f8e8d18d8..51985b70b5ca 100644 --- a/examples/app-service/variables.tf +++ b/examples/app-service/variables.tf @@ -1,21 +1,24 @@ variable "resource_group_name" { - type = "string" + type = "string" + description = "Name of the azure resource group." + default = "tfex-appserviceplan" } variable "location" { - type = "string" + type = "string" + description = "Location of the azure resource group." + default = "westus" } -variable "app_service_name" { - type = "string" -} variable "app_service_plan_sku_tier" { - type = "string" - default = "Basic" # Basic | Standard | ... + type = "string" + description = "SKU tier of the App Service Plan" + default = "Basic" # Basic | Standard | ... } variable "app_service_plan_sku_size" { - type = "string" - default = "B1" # B1 | S1 | ... + type = "string" + description = "SKU size of the App Service Plan" + default = "B1" # B1 | S1 | ... } From a4956d5450ba77c8c040ac2d0e4fc52857534268 Mon Sep 17 00:00:00 2001 From: ShanePoint Date: Tue, 5 Jun 2018 22:38:18 -0700 Subject: [PATCH 236/320] Fixed build error with travis. #1336 --- azurerm/resource_arm_app_service.go | 2 +- azurerm/resource_arm_app_service_plan.go | 2 +- azurerm/resource_arm_app_service_plan_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azurerm/resource_arm_app_service.go b/azurerm/resource_arm_app_service.go index 997b500cf03b..875ee712771c 100644 --- a/azurerm/resource_arm_app_service.go +++ b/azurerm/resource_arm_app_service.go @@ -607,7 +607,7 @@ func validateAppServiceName(v interface{}, k string) (ws []string, es []error) { value := v.(string) if matched := regexp.MustCompile(`^[0-9a-zA-Z-]{1,60}$`).Match([]byte(value)); !matched { - es = append(es, fmt.Errorf("%q may only contain alphanumeric characters and dashes and up to 60 characters", k)) + es = append(es, fmt.Errorf("%q may only contain alphanumeric characters and dashes and up to 60 characters in length", k)) } return diff --git a/azurerm/resource_arm_app_service_plan.go b/azurerm/resource_arm_app_service_plan.go index 719bf242eabe..31c273251884 100644 --- a/azurerm/resource_arm_app_service_plan.go +++ b/azurerm/resource_arm_app_service_plan.go @@ -315,7 +315,7 @@ func validateAppServicePlanName(v interface{}, k string) (ws []string, es []erro value := v.(string) if matched := regexp.MustCompile(`^[0-9a-zA-Z-_]{1,60}$`).Match([]byte(value)); !matched { - es = append(es, fmt.Errorf("%q may only contain alphanumeric characters, dashes and underscores up to 60 characters", k)) + es = append(es, fmt.Errorf("%q may only contain alphanumeric characters, dashes and underscores up to 60 characters in length", k)) } return diff --git a/azurerm/resource_arm_app_service_plan_test.go b/azurerm/resource_arm_app_service_plan_test.go index 74628a84c1ee..08745d4080e0 100644 --- a/azurerm/resource_arm_app_service_plan_test.go +++ b/azurerm/resource_arm_app_service_plan_test.go @@ -33,7 +33,7 @@ func TestAzureRMAppServicePlanName_validation(t *testing.T) { }, { Value: "hello_world", - ErrCount: 1, + ErrCount: 0, }, { Value: "helloworld21!", From e5cdd0837b77c8c5505fdf470016c3e5469d5691 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 6 Jun 2018 10:40:44 -0700 Subject: [PATCH 237/320] Update CHANGELOG.md to include #1351 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5e73e53a59b..5870df00277a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ BUG FIXES: * `azurerm_network_interface` - ensuring that Public IP's/Private IP Addresses can be removed once assigned [GH-1295] * `azurerm_public_ip` - setting the `domain_name_label` property into state [GH-1287] * `azurerm_virtual_machine_scale_set` - the field `overprovision` has been updated to `true` by default rather than `false` to match Azure [GH-1322] +* `resource_arm_app_service_plan` - validation will now allow understores in the `name` property [GH-1351] FEATURES: From d01415303c5e36bc7317ae4b58d73edffced46a7 Mon Sep 17 00:00:00 2001 From: Oscar Utbult Date: Wed, 6 Jun 2018 22:16:52 +0200 Subject: [PATCH 238/320] Fix spelling --- examples/traffic-manager-lb-scale-set/Readme.md | 2 +- examples/traffic-manager-lb-scale-set/terraform.tfvars.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/traffic-manager-lb-scale-set/Readme.md b/examples/traffic-manager-lb-scale-set/Readme.md index 49679d33c16c..d6637bc3f659 100644 --- a/examples/traffic-manager-lb-scale-set/Readme.md +++ b/examples/traffic-manager-lb-scale-set/Readme.md @@ -2,7 +2,7 @@ This example shows how to create a load balanced scale set in multiple locations and then geographically load balance these using traffic manager. This example the scale set uses a market place Ubuntu image, this could be customised using an extension or a generalized image created using packer. -This script demonstrates how variable can be passed in and out of reusable modules. You will need to run `terraform get` for terrafrom to get so that modules are pre-processed. +This script demonstrates how variable can be passed in and out of reusable modules. You will need to run `terraform get` for terraform to get so that modules are pre-processed. ## Keys and variables diff --git a/examples/traffic-manager-lb-scale-set/terraform.tfvars.example b/examples/traffic-manager-lb-scale-set/terraform.tfvars.example index fdb09a2b029a..0046619c4c50 100644 --- a/examples/traffic-manager-lb-scale-set/terraform.tfvars.example +++ b/examples/traffic-manager-lb-scale-set/terraform.tfvars.example @@ -1,5 +1,5 @@ # Azure provide keys example. This should not be included in your repository for security reasons -# Use terrafrom -var-file="FULLPATH" +# Use terraform -var-file="FULLPATH" subscription_id = "" client_id = "" From f3ae858208f83b2f166fd9768e63f97ba9a37722 Mon Sep 17 00:00:00 2001 From: Oscar Utbult Date: Wed, 6 Jun 2018 22:27:11 +0200 Subject: [PATCH 239/320] Fix spelling --- azurerm/resource_arm_virtual_network_peering.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_virtual_network_peering.go b/azurerm/resource_arm_virtual_network_peering.go index a24fb5441835..fba059af5d4b 100644 --- a/azurerm/resource_arm_virtual_network_peering.go +++ b/azurerm/resource_arm_virtual_network_peering.go @@ -10,7 +10,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -// peerMutex is used to prevet multiple Peering resources being creaed, updated +// peerMutex is used to prevent multiple Peering resources being created, updated // or deleted at the same time var peerMutex = &sync.Mutex{} From 0c143f6f719a110d2083ddd7fc3d90f9f30a9304 Mon Sep 17 00:00:00 2001 From: Oscar Utbult Date: Wed, 6 Jun 2018 22:49:00 +0200 Subject: [PATCH 240/320] Fix spelling --- azurerm/resource_arm_loadbalancer.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azurerm/resource_arm_loadbalancer.go b/azurerm/resource_arm_loadbalancer.go index 5cd9ad35d1ec..0ba7cf1759b5 100644 --- a/azurerm/resource_arm_loadbalancer.go +++ b/azurerm/resource_arm_loadbalancer.go @@ -16,7 +16,7 @@ import ( func resourceArmLoadBalancer() *schema.Resource { return &schema.Resource{ Create: resourceArmLoadBalancerCreate, - Read: resourecArmLoadBalancerRead, + Read: resourceArmLoadBalancerRead, Update: resourceArmLoadBalancerCreate, Delete: resourceArmLoadBalancerDelete, Importer: &schema.ResourceImporter{ @@ -181,10 +181,10 @@ func resourceArmLoadBalancerCreate(d *schema.ResourceData, meta interface{}) err return fmt.Errorf("Error waiting for LoadBalancer (%q - Resource Group %q) to become available: %s", name, resGroup, err) } - return resourecArmLoadBalancerRead(d, meta) + return resourceArmLoadBalancerRead(d, meta) } -func resourecArmLoadBalancerRead(d *schema.ResourceData, meta interface{}) error { +func resourceArmLoadBalancerRead(d *schema.ResourceData, meta interface{}) error { id, err := parseAzureResourceID(d.Id()) if err != nil { return err From e6d0c5c079b5fe4eb98c6339ee9caa69ce6ca70d Mon Sep 17 00:00:00 2001 From: Oscar Utbult Date: Wed, 6 Jun 2018 22:55:46 +0200 Subject: [PATCH 241/320] Fix spelling --- azurerm/resource_arm_local_network_gateway_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_local_network_gateway_test.go b/azurerm/resource_arm_local_network_gateway_test.go index f35f93ea3e0b..9a81de76f5e8 100644 --- a/azurerm/resource_arm_local_network_gateway_test.go +++ b/azurerm/resource_arm_local_network_gateway_test.go @@ -193,7 +193,7 @@ func TestAccAzureRMLocalNetworkGateway_bgpSettingsComplete(t *testing.T) { }) } -// testCheckAzureRMLocalNetworkGatewayExists returns the resurce.TestCheckFunc +// testCheckAzureRMLocalNetworkGatewayExists returns the resource.TestCheckFunc // which checks whether or not the expected local network gateway exists both // in the schema, and on Azure. func testCheckAzureRMLocalNetworkGatewayExists(name string) resource.TestCheckFunc { From f06841ef0ccafb52185afac767fa594744f20226 Mon Sep 17 00:00:00 2001 From: grimoh117 Date: Thu, 7 Jun 2018 22:09:08 +0900 Subject: [PATCH 242/320] Fix postgresql_server --- website/docs/r/postgresql_configuration.html.markdown | 1 - website/docs/r/postgresql_database.html.markdown | 1 - website/docs/r/postgresql_server.html.markdown | 1 - 3 files changed, 3 deletions(-) diff --git a/website/docs/r/postgresql_configuration.html.markdown b/website/docs/r/postgresql_configuration.html.markdown index c8827eb4baa7..27ec24af2b83 100644 --- a/website/docs/r/postgresql_configuration.html.markdown +++ b/website/docs/r/postgresql_configuration.html.markdown @@ -39,7 +39,6 @@ resource "azurerm_postgresql_server" "test" { administrator_login = "psqladminun" administrator_login_password = "H@Sh1CoR3!" version = "9.5" - storage_mb = "51200" ssl_enforcement = "Enabled" } diff --git a/website/docs/r/postgresql_database.html.markdown b/website/docs/r/postgresql_database.html.markdown index 17bed096d195..8cb9b885e225 100644 --- a/website/docs/r/postgresql_database.html.markdown +++ b/website/docs/r/postgresql_database.html.markdown @@ -39,7 +39,6 @@ resource "azurerm_postgresql_server" "test" { administrator_login = "psqladminun" administrator_login_password = "H@Sh1CoR3!" version = "9.5" - storage_mb = "51200" ssl_enforcement = "Enabled" } diff --git a/website/docs/r/postgresql_server.html.markdown b/website/docs/r/postgresql_server.html.markdown index a27378716e53..db3b565f9f74 100644 --- a/website/docs/r/postgresql_server.html.markdown +++ b/website/docs/r/postgresql_server.html.markdown @@ -39,7 +39,6 @@ resource "azurerm_postgresql_server" "test" { administrator_login = "psqladminun" administrator_login_password = "H@Sh1CoR3!" version = "9.5" - storage_mb = "51200" ssl_enforcement = "Enabled" } ``` From dc664e226ef5b1489945cd12b5ab9deee5130f2a Mon Sep 17 00:00:00 2001 From: joris Date: Thu, 7 Jun 2018 10:06:59 -0400 Subject: [PATCH 243/320] Typo in access tier for Xtorage account Correct access tier is `Cool` --- website/docs/r/storage_account.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index d04552f55bbd..60b3e32be401 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -95,7 +95,7 @@ The following arguments are supported: * `account_replication_type` - (Required) Defines the type of replication to use for this storage account. Valid options are `LRS`, `GRS`, `RAGRS` and `ZRS`. -* `access_tier` - (Optional) Defines the access tier for `BlobStorage` and `StorageV2` accounts. Valid options are `Hot` and `Cold`, defaults to `Hot`. +* `access_tier` - (Optional) Defines the access tier for `BlobStorage` and `StorageV2` accounts. Valid options are `Hot` and `Cool`, defaults to `Hot`. * `enable_blob_encryption` - (Optional) Boolean flag which controls if Encryption Services are enabled for Blob storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) From 7352fd5c631e49ed706d7d09c0947e1885016f1f Mon Sep 17 00:00:00 2001 From: Oscar Utbult Date: Thu, 7 Jun 2018 20:25:43 +0200 Subject: [PATCH 244/320] Fix spelling --- website/docs/r/data_lake_store.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/data_lake_store.html.markdown b/website/docs/r/data_lake_store.html.markdown index c7b09aec6854..6c7213c66450 100644 --- a/website/docs/r/data_lake_store.html.markdown +++ b/website/docs/r/data_lake_store.html.markdown @@ -49,7 +49,7 @@ The following arguments are supported: * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `tier` - (Optional) The monnthly commitment tier for Data Lake Store. Accepted values are `Consumption`, `Commitment_1TB`, `Commitment_10TB`, `Commitment_100TB`, `Commitment_500TB`, `Commitment_1PB` or `Commitment_5PB`. +* `tier` - (Optional) The monthly commitment tier for Data Lake Store. Accepted values are `Consumption`, `Commitment_1TB`, `Commitment_10TB`, `Commitment_100TB`, `Commitment_500TB`, `Commitment_1PB` or `Commitment_5PB`. * `tags` - (Optional) A mapping of tags to assign to the resource. From da8d16f66e3b510ae6324bbefd19cf6f557776a4 Mon Sep 17 00:00:00 2001 From: Oscar Utbult Date: Thu, 7 Jun 2018 23:07:26 +0200 Subject: [PATCH 245/320] Fix spelling --- examples/2-vms-loadbalancer-lbrules/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/2-vms-loadbalancer-lbrules/README.md b/examples/2-vms-loadbalancer-lbrules/README.md index 5730f2ad951e..0776c73a8850 100644 --- a/examples/2-vms-loadbalancer-lbrules/README.md +++ b/examples/2-vms-loadbalancer-lbrules/README.md @@ -1,6 +1,6 @@ # Create 2 Virtual Machines under a Load balancer and configures Load Balancing rules for the VMs -This Terraform template was based on [this](https://github.com/Azure/azure-quickstart-templates/tree/master/201-2-vms-loadbalancer-lbrules) Azure Quickstart Template. Changes to the ARM template may have occured since the creation of this example may not be reflected here. +This Terraform template was based on [this](https://github.com/Azure/azure-quickstart-templates/tree/master/201-2-vms-loadbalancer-lbrules) Azure Quickstart Template. Changes to the ARM template may have occurred since the creation of this example may not be reflected here. This template allows you to create 2 Virtual Machines under a Load balancer and configure a load balancing rule on Port 80. This template also deploys a Storage Account, Virtual Network, Public IP address, Availability Set, and Network Interfaces. From 76c4e9baebdd5e5ff586b731a4591ff4ce8ef48e Mon Sep 17 00:00:00 2001 From: Oscar Utbult Date: Thu, 7 Jun 2018 23:21:33 +0200 Subject: [PATCH 246/320] Fix spelling --- website/docs/d/key_vault_access_policy.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/key_vault_access_policy.html.markdown b/website/docs/d/key_vault_access_policy.html.markdown index ca2f2908b6ee..c9fd21735909 100644 --- a/website/docs/d/key_vault_access_policy.html.markdown +++ b/website/docs/d/key_vault_access_policy.html.markdown @@ -24,7 +24,7 @@ output "access_policy_key_permissions" { ## Argument Reference -* `name` - (Required) Specifies the name of the Management Tempalte. Possible values are: `Key Management`, +* `name` - (Required) Specifies the name of the Management Template. Possible values are: `Key Management`, `Secret Management`, `Certificate Management`, `Key & Secret Management`, `Key & Certificate Management`, `Secret & Certificate Management`, `Key, Secret, & Certificate Management` From c1c65c767b78bba2c8b050c7d9116be736434e49 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Thu, 7 Jun 2018 18:09:15 -0700 Subject: [PATCH 247/320] Add field to --- azurerm/resource_arm_function_app.go | 61 ++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/azurerm/resource_arm_function_app.go b/azurerm/resource_arm_function_app.go index 8a3c3eb1113d..68471cb57f84 100644 --- a/azurerm/resource_arm_function_app.go +++ b/azurerm/resource_arm_function_app.go @@ -105,6 +105,33 @@ func resourceArmFunctionApp() *schema.Resource { }, }, + "identity": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "type": { + Type: schema.TypeString, + Required: true, + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ValidateFunc: validation.StringInSlice([]string{ + string(web.SystemAssigned), + }, true), + }, + "principal_id": { + Type: schema.TypeString, + Computed: true, + }, + "tenant_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "tags": tagsSchema(), "default_hostname": { @@ -204,6 +231,12 @@ func resourceArmFunctionAppCreate(d *schema.ResourceData, meta interface{}) erro }, } + if v, ok := d.GetOk("identity.0.type"); ok { + siteEnvelope.Identity = &web.ManagedServiceIdentity{ + Type: web.ManagedServiceIdentityType(v.(string)), + } + } + createFuture, err := client.CreateOrUpdate(ctx, resGroup, name, siteEnvelope) if err != nil { return err @@ -263,6 +296,12 @@ func resourceArmFunctionAppUpdate(d *schema.ResourceData, meta interface{}) erro }, } + if v, ok := d.GetOk("identity.0.type"); ok { + siteEnvelope.Identity = &web.ManagedServiceIdentity{ + Type: web.ManagedServiceIdentityType(v.(string)), + } + } + future, err := client.CreateOrUpdate(ctx, resGroup, name, siteEnvelope) if err != nil { return err @@ -357,6 +396,10 @@ func resourceArmFunctionAppRead(d *schema.ResourceData, meta interface{}) error d.Set("client_affinity_enabled", props.ClientAffinityEnabled) } + if err := d.Set("identity", flattenFunctionAppIdentity(resp.Identity)); err != nil { + return err + } + appSettings := flattenAppServiceAppSettings(appSettingsResp.Properties) d.Set("storage_connection_string", appSettings["AzureWebJobsStorage"]) @@ -529,3 +572,21 @@ func flattenFunctionAppConnectionStrings(input map[string]*web.ConnStringValueTy return results } + +func flattenFunctionAppIdentity(identity *web.ManagedServiceIdentity) interface{} { + if identity == nil { + return make([]interface{}, 0) + } + + result := make(map[string]interface{}) + result["type"] = string(identity.Type) + + if identity.PrincipalID != nil { + result["principal_id"] = *identity.PrincipalID + } + if identity.TenantID != nil { + result["tenant_id"] = *identity.TenantID + } + + return []interface{}{result} +} From bbbfffea19db0bfe233614946b2e06126126de9c Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Thu, 7 Jun 2018 18:35:52 -0700 Subject: [PATCH 248/320] Add test cases for the new identity field. --- azurerm/resource_arm_function_app_test.go | 102 ++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/azurerm/resource_arm_function_app_test.go b/azurerm/resource_arm_function_app_test.go index b81f71fb371c..ed7c395b6101 100644 --- a/azurerm/resource_arm_function_app_test.go +++ b/azurerm/resource_arm_function_app_test.go @@ -2,6 +2,7 @@ package azurerm import ( "fmt" + "regexp" "strings" "testing" @@ -334,6 +335,69 @@ func TestAccAzureRMFunctionApp_consumptionPlan(t *testing.T) { }) } +func TestAccAzureRMFunctionApp_createIdentity(t *testing.T) { + resourceName := "azurerm_function_app.test" + ri := acctest.RandInt() + rs := strings.ToLower(acctest.RandString(11)) + config := testAccAzureRMFunctionApp_basicIdentity(ri, rs, testLocation()) + + uuidMatch := regexp.MustCompile("^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[8|9|aA|bB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMFunctionAppDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMFunctionAppExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "identity.#", "1"), + resource.TestCheckResourceAttr(resourceName, "identity.0.type", "SystemAssigned"), + resource.TestMatchResourceAttr(resourceName, "identity.0.principal_id", uuidMatch), + resource.TestMatchResourceAttr(resourceName, "identity.0.tenant_id", uuidMatch), + ), + }, + }, + }) +} + +func TestAccAzureRMFunctionApp_updateIdentity(t *testing.T) { + resourceName := "azurerm_function_app.test" + ri := acctest.RandInt() + rs := strings.ToLower(acctest.RandString(11)) + + preConfig := testAccAzureRMFunctionApp_basic(ri, rs, testLocation()) + postConfig := testAccAzureRMFunctionApp_basicIdentity(ri, rs, testLocation()) + + uuidMatch := regexp.MustCompile("^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[8|9|aA|bB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMFunctionAppDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "identity.#", "0"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMFunctionAppExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "identity.#", "1"), + resource.TestCheckResourceAttr(resourceName, "identity.0.type", "SystemAssigned"), + resource.TestMatchResourceAttr(resourceName, "identity.0.principal_id", uuidMatch), + resource.TestMatchResourceAttr(resourceName, "identity.0.tenant_id", uuidMatch), + ), + }, + }, + }) +} + func testCheckAzureRMFunctionAppDestroy(s *terraform.State) error { client := testAccProvider.Meta().(*ArmClient).appServicesClient @@ -850,3 +914,41 @@ resource "azurerm_function_app" "test" { } `, rInt, location, rString, rInt, rInt) } + +func testAccAzureRMFunctionApp_basicIdentity(rInt int, storage string, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%[1]d" + location = "%[2]s" +} + +resource "azurerm_storage_account" "test" { + name = "acctestsa%[3]s" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + account_tier = "Standard" + account_replication_type = "LRS" +} + +resource "azurerm_app_service_plan" "test" { + name = "acctestASP-%[1]d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku { + tier = "Standard" + size = "S1" + } +} + +resource "azurerm_function_app" "test" { + name = "acctest-%[1]d-func" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_plan_id = "${azurerm_app_service_plan.test.id}" + storage_connection_string = "${azurerm_storage_account.test.primary_connection_string}" + + identity { + type = "SystemAssigned" + } +}`, rInt, location, storage) +} From 0f401a44c3dffdbfa83cb5199e34fb320805aeca Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Thu, 7 Jun 2018 18:43:36 -0700 Subject: [PATCH 249/320] Add documentation to the new identity field. --- website/docs/r/function_app.html.markdown | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/website/docs/r/function_app.html.markdown b/website/docs/r/function_app.html.markdown index a6f8011726f7..574d26d9c3be 100644 --- a/website/docs/r/function_app.html.markdown +++ b/website/docs/r/function_app.html.markdown @@ -111,6 +111,8 @@ The following arguments are supported: * `site_config` - (Optional) A `site_config` object as defined below. +* `identity` - (Optional) An `identity` block as defined below. + * `tags` - (Optional) A mapping of tags to assign to the resource. --- @@ -132,6 +134,13 @@ The following arguments are supported: * `websockets_enabled` - (Optional) Should WebSockets be enabled? +--- + +`identity` supports the following: + +* `type` - (Required) Specifies the identity type of the App Service. At this time the only allowed value is `SystemAssigned`. + + ## Attributes Reference The following attributes are exported: @@ -142,6 +151,17 @@ The following attributes are exported: * `outbound_ip_addresses` - A comma separated list of outbound IP addresses - such as `52.23.25.3,52.143.43.12` +* `identity` - An `identity` block as defined below, which contains the Managed Service Identity information for this App Service. + +--- + +`identity` exports the following: + +* `principal_id` - The Principal ID for the Service Principal associated with the Managed Service Identity of this App Service. + +* `tenant_id` - The Tenant ID for the Service Principal associated with the Managed Service Identity of this App Service. + + ## Import Function Apps can be imported using the `resource id`, e.g. From f7df70dc396edf68c279505d3068b2668eced086 Mon Sep 17 00:00:00 2001 From: lstolyarov Date: Fri, 8 Jun 2018 09:40:38 +0100 Subject: [PATCH 250/320] Checking identity type is not nill --- azurerm/resource_arm_storage_account.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index aa042b7fffd2..a9cca7404bdb 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -716,8 +716,9 @@ func flattenAzureRmStorageAccountIdentity(identity *storage.Identity) []interfac } result := make(map[string]interface{}) - result["type"] = *identity.Type - + if identity.Type != nil { + result["type"] = *identity.Type + } if identity.PrincipalID != nil { result["principal_id"] = *identity.PrincipalID } From 8dd38e2dc058c57d27f23eeddd5bbcb105579639 Mon Sep 17 00:00:00 2001 From: lstolyarov Date: Fri, 8 Jun 2018 09:45:39 +0100 Subject: [PATCH 251/320] Updating storage account identity documentation --- website/docs/r/storage_account.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index ded0bae47793..cc68d2e495b2 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -89,7 +89,7 @@ The following arguments are supported: * `type` - (Required) Specifies the identity type of the Storage Account. At this time the only allowed value is `SystemAssigned`. -~> The assigned `principal_id` and `tenant_id` can be retrieved after the Storage Account has been created. More details are available below. +~> The assigned `principal_id` and `tenant_id` can be retrieved after the identity `type` has been set to `SystemAssigned` and Storage Account has been created. More details are available below. ## Attributes Reference From 403ca2b2b0a1513ae4c04c1d29dcd599a99be51c Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 8 Jun 2018 11:59:09 +0000 Subject: [PATCH 252/320] Update to make example work --- examples/2-vms-loadbalancer-lbrules/main.tf | 2 ++ examples/2-vms-loadbalancer-lbrules/outputs.tf | 4 ++-- examples/2-vms-loadbalancer-lbrules/variables.tf | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/2-vms-loadbalancer-lbrules/main.tf b/examples/2-vms-loadbalancer-lbrules/main.tf index 1fc737fc11bc..759dacc74d34 100644 --- a/examples/2-vms-loadbalancer-lbrules/main.tf +++ b/examples/2-vms-loadbalancer-lbrules/main.tf @@ -143,4 +143,6 @@ resource "azurerm_virtual_machine" "vm" { admin_username = "${var.admin_username}" admin_password = "${var.admin_password}" } + + os_profile_windows_config {} } diff --git a/examples/2-vms-loadbalancer-lbrules/outputs.tf b/examples/2-vms-loadbalancer-lbrules/outputs.tf index 19757fa523aa..0a9e743dd5ec 100644 --- a/examples/2-vms-loadbalancer-lbrules/outputs.tf +++ b/examples/2-vms-loadbalancer-lbrules/outputs.tf @@ -6,6 +6,6 @@ output "vm_fqdn" { value = "${azurerm_public_ip.lbpip.fqdn}" } -output "ssh_command" { - value = "ssh ${var.admin_username}@${azurerm_public_ip.lbpip.fqdn}" +output "VMs RDP acces" { + value = "${formatlist("RDP_URL=%v:%v", azurerm_public_ip.lbpip.fqdn, azurerm_lb_nat_rule.tcp.*.frontend_port)}" } diff --git a/examples/2-vms-loadbalancer-lbrules/variables.tf b/examples/2-vms-loadbalancer-lbrules/variables.tf index 55b07181c6d8..c294945f916d 100644 --- a/examples/2-vms-loadbalancer-lbrules/variables.tf +++ b/examples/2-vms-loadbalancer-lbrules/variables.tf @@ -51,7 +51,7 @@ variable "storage_replication_type" { variable "vm_size" { description = "Specifies the size of the virtual machine." - default = "Standard_D1" + default = "Standard_D1_v2" } variable "image_publisher" { From 1717cf2c2412454aba383e5ea3056effab78f644 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 8 Jun 2018 14:12:27 -0700 Subject: [PATCH 253/320] Update CHANGELOG.md to include #1369 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5870df00277a..4a5bd5fbc6f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ FEATURES: IMPROVEMENTS: * `azurerm_dns_ns_record` - deprecated `record` properties in favor of a `records` list [GH-991] +* `azurerm_function_app` - adding the `identity` property [GH-1369] * `azurerm_storage_account` - adding the `network_rules` property [GH-1334] * `azurerm_virtual_machine_scale_set` - adding the `dns_settings` and `dns_servers` property [GH-1209] * `azurerm_virtual_machine_scale_set` - adding the `ip_forwarding` property [GH-1209] From a5d1c4df99eea00cbbeb6110681f914575687471 Mon Sep 17 00:00:00 2001 From: Matthew Martin Date: Fri, 8 Jun 2018 16:38:48 -0500 Subject: [PATCH 254/320] docs/d/subscriptions: Fix typo: subscription -> subscriptions --- website/docs/d/subscriptions.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/d/subscriptions.html.markdown b/website/docs/d/subscriptions.html.markdown index 2faf4755dead..3cc639352270 100644 --- a/website/docs/d/subscriptions.html.markdown +++ b/website/docs/d/subscriptions.html.markdown @@ -6,9 +6,9 @@ description: |- Get information about the available subscriptions. --- -# Data Source: azurerm_subscription +# Data Source: azurerm_subscriptions -Use this data source to access a list of all Azure subscription currently available. +Use this data source to access a list of all Azure subscriptions currently available. ## Example Usage From a680f181034362276d07291a0186680bf1a2621e Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 11 Jun 2018 12:43:00 -0700 Subject: [PATCH 255/320] azurerm_role_definition: role_definition_id is now optional --- azurerm/resource_arm_role_definition.go | 13 +++++- azurerm/resource_arm_role_definition_test.go | 43 ++++++++++++++++++++ website/docs/r/role_definition.html.markdown | 3 +- 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/azurerm/resource_arm_role_definition.go b/azurerm/resource_arm_role_definition.go index d3ce17c34fb1..8584f7e412a3 100644 --- a/azurerm/resource_arm_role_definition.go +++ b/azurerm/resource_arm_role_definition.go @@ -5,6 +5,7 @@ import ( "log" "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization" + "github.com/hashicorp/go-uuid" "github.com/hashicorp/terraform/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,7 +23,8 @@ func resourceArmRoleDefinition() *schema.Resource { Schema: map[string]*schema.Schema{ "role_definition_id": { Type: schema.TypeString, - Required: true, + Optional: true, + Computed: true, ForceNew: true, }, @@ -81,6 +83,15 @@ func resourceArmRoleDefinitionCreateUpdate(d *schema.ResourceData, meta interfac ctx := meta.(*ArmClient).StopContext roleDefinitionId := d.Get("role_definition_id").(string) + if roleDefinitionId == "" { + uuid, err := uuid.GenerateUUID() + if err != nil { + return fmt.Errorf("Error generating UUID for Role Assignment: %+v", err) + } + + roleDefinitionId = uuid + } + name := d.Get("name").(string) scope := d.Get("scope").(string) description := d.Get("description").(string) diff --git a/azurerm/resource_arm_role_definition_test.go b/azurerm/resource_arm_role_definition_test.go index 5186e4580aa3..7ea2ec5455a2 100644 --- a/azurerm/resource_arm_role_definition_test.go +++ b/azurerm/resource_arm_role_definition_test.go @@ -87,6 +87,28 @@ func TestAccAzureRMRoleDefinition_update(t *testing.T) { }) } +func TestAccAzureRMRoleDefinition_emptyName(t *testing.T) { + resourceName := "azurerm_role_definition.test" + + ri := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMRoleDefinitionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMRoleDefinition_emptyId(ri), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMRoleDefinitionExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "id"), + resource.TestCheckResourceAttrSet(resourceName, "name"), + ), + }, + }, + }) +} + func testCheckAzureRMRoleDefinitionExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] @@ -201,3 +223,24 @@ resource "azurerm_role_definition" "test" { } `, id, rInt) } + +func testAccAzureRMRoleDefinition_emptyId(rInt int) string { + return fmt.Sprintf(` +data "azurerm_subscription" "primary" {} + +resource "azurerm_role_definition" "test" { + role_definition_id = "hi" + name = "acctestrd-%d" + scope = "${data.azurerm_subscription.primary.id}" + + permissions { + actions = ["*"] + not_actions = [] + } + + assignable_scopes = [ + "${data.azurerm_subscription.primary.id}", + ] +} +`, rInt) +} diff --git a/website/docs/r/role_definition.html.markdown b/website/docs/r/role_definition.html.markdown index 1e181e33e104..281cdf1209ce 100644 --- a/website/docs/r/role_definition.html.markdown +++ b/website/docs/r/role_definition.html.markdown @@ -17,7 +17,6 @@ Manages a custom Role Definition, used to assign Roles to Users/Principals. data "azurerm_subscription" "primary" {} resource "azurerm_role_definition" "test" { - role_definition_id = "12345678-1234-5678-1234-123456780123" name = "my-custom-role" scope = "${data.azurerm_subscription.primary.id}" description = "This is a custom role created via Terraform" @@ -37,7 +36,7 @@ resource "azurerm_role_definition" "test" { The following arguments are supported: -* `role_definition_id` - (Required) A unique UUID/GUID which identifies this role. Changing this forces a new resource to be created. +* `role_definition_id` - (Optional) A unique UUID/GUID which identifies this role - one will be generated if not specified.. Changing this forces a new resource to be created. * `name` - (Required) The name of the Role Definition. Changing this forces a new resource to be created. From 2189f02309d3e8926378afed11ffea0a7dd801d8 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 11 Jun 2018 13:28:01 -0700 Subject: [PATCH 256/320] azurerm_role_definition: role_definition_id testing UUID format --- azurerm/resource_arm_role_definition_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_role_definition_test.go b/azurerm/resource_arm_role_definition_test.go index 7ea2ec5455a2..16c395e59b82 100644 --- a/azurerm/resource_arm_role_definition_test.go +++ b/azurerm/resource_arm_role_definition_test.go @@ -229,7 +229,7 @@ func testAccAzureRMRoleDefinition_emptyId(rInt int) string { data "azurerm_subscription" "primary" {} resource "azurerm_role_definition" "test" { - role_definition_id = "hi" + role_definition_id = "fbda02370fbdf6f76e80f2d42708669a" name = "acctestrd-%d" scope = "${data.azurerm_subscription.primary.id}" From 1bd305465aa82eb2916a84e347be01eaaaca97c2 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 11 Jun 2018 13:38:26 -0700 Subject: [PATCH 257/320] azurerm_role_definition: role_definition_id updated empty test --- azurerm/resource_arm_role_definition_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/azurerm/resource_arm_role_definition_test.go b/azurerm/resource_arm_role_definition_test.go index 16c395e59b82..3c72499a6f0a 100644 --- a/azurerm/resource_arm_role_definition_test.go +++ b/azurerm/resource_arm_role_definition_test.go @@ -229,7 +229,6 @@ func testAccAzureRMRoleDefinition_emptyId(rInt int) string { data "azurerm_subscription" "primary" {} resource "azurerm_role_definition" "test" { - role_definition_id = "fbda02370fbdf6f76e80f2d42708669a" name = "acctestrd-%d" scope = "${data.azurerm_subscription.primary.id}" From 0c9bff6e808cd4ed1f3a43ce84deb869b95c1764 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 11 Jun 2018 23:23:33 -0700 Subject: [PATCH 258/320] Update CHANGELOG.md to include #1304 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a5bd5fbc6f0..6585fd252ce2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ IMPROVEMENTS: * `azurerm_dns_ns_record` - deprecated `record` properties in favor of a `records` list [GH-991] * `azurerm_function_app` - adding the `identity` property [GH-1369] * `azurerm_storage_account` - adding the `network_rules` property [GH-1334] +* `azurerm_storage_blob` - adding the `content_type` property [GH-1304] * `azurerm_virtual_machine_scale_set` - adding the `dns_settings` and `dns_servers` property [GH-1209] * `azurerm_virtual_machine_scale_set` - adding the `ip_forwarding` property [GH-1209] * dependencies: migrating to the un-deprecated Preview's for Container Instance, EventGrid, Log Analytics and SQL [GH-1322] From 0e6a74372b6396cfc34c3a1294232b0fd766b841 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 11 Jun 2018 23:46:57 -0700 Subject: [PATCH 259/320] azirerm_redis_cache - small doc fix --- website/docs/r/redis_cache.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/r/redis_cache.html.markdown b/website/docs/r/redis_cache.html.markdown index 79db178e70ab..8f9f375673e2 100644 --- a/website/docs/r/redis_cache.html.markdown +++ b/website/docs/r/redis_cache.html.markdown @@ -148,7 +148,7 @@ The pricing group for the Redis Family - either "C" or "P" at present. * `redis_configuration` supports the following: -* `maxmemory_reserve` - (Optional) Value in megabytes reserved for non-cache usage e.g. failover. Defaults are shown below. +* `maxmemory_reserved` - (Optional) Value in megabytes reserved for non-cache usage e.g. failover. Defaults are shown below. * `maxmemory_delta` - (Optional) The max-memory delta for this Redis instance. Defaults are shown below. * `maxmemory_policy` - (Optional) How Redis will select what to remove when `maxmemory` is reached. Defaults are shown below. @@ -183,14 +183,14 @@ redis_configuration { | maxmemory_delta | 2 | 50 | 200 | | maxmemory_policy | volatile-lru | volatile-lru | volatile-lru | -_*Important*: The maxmemory_reserved setting is only available for Standard and Premium caches. More details are available in the Relevant Links section below._ +_*Important*: The `maxmemory_reserved` and `maxmemory_delta` settings are only available for Standard and Premium caches. More details are available in the Relevant Links section below._ * `patch_schedule` supports the following: * `day_of_week` (Required) the Weekday name - possible values include `Monday`, `Tuesday`, `Wednesday` etc. * `start_hour_utc` - (Optional) the Start Hour for maintenance in UTC - possible values range from `0 - 23`. -~> **Note:** The Patch Window lasts for 5 hours from the `start_hour_utc`. +~> **Note:** The Patch Window lasts for `5` hours from the `start_hour_utc`. ## Attributes Reference From ccea935fa5992b9b15811ee7b78a2e2520a19fb7 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 12 Jun 2018 01:16:13 -0700 Subject: [PATCH 260/320] service bus namespace: changes to validation --- azurerm/resource_arm_servicebus_namespace.go | 31 ++++++++++++------- .../main.tf | 5 +-- .../docs/r/servicebus_namespace.html.markdown | 2 +- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/azurerm/resource_arm_servicebus_namespace.go b/azurerm/resource_arm_servicebus_namespace.go index e22911e37e19..2fdb29855bc0 100644 --- a/azurerm/resource_arm_servicebus_namespace.go +++ b/azurerm/resource_arm_servicebus_namespace.go @@ -58,9 +58,8 @@ func resourceArmServiceBusNamespace() *schema.Resource { }, "capacity": { - Type: schema.TypeInt, - Optional: true, - + Type: schema.TypeInt, + Optional: true, ValidateFunc: validateIntInSlice([]int{1, 2, 4}), }, @@ -90,12 +89,27 @@ func resourceArmServiceBusNamespace() *schema.Resource { "tags": tagsSchema(), }, + + CustomizeDiff: func(d *schema.ResourceDiff, v interface{}) error { + + //If the SKU is not premium the API will always return 0 for capacity + //so lets only allow it to be set if the SKU is premium + if _, ok := d.GetOk("capacity"); ok { + sku := d.Get("sku").(string) + if strings.ToLower(sku) != strings.ToLower(string(servicebus.Premium)) { + return fmt.Errorf("`capacity` can only be set for a Premium SKU") + } + } + + return nil + }, } } func resourceArmServiceBusNamespaceCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).serviceBusNamespacesClient ctx := meta.(*ArmClient).StopContext + log.Printf("[INFO] preparing arguments for AzureRM ServiceBus Namespace creation.") name := d.Get("name").(string) @@ -113,15 +127,8 @@ func resourceArmServiceBusNamespaceCreate(d *schema.ResourceData, meta interface Tags: expandTags(tags), } - capacity := d.Get("capacity").(int) - if capacity > 0 { - /*skuName := strings.ToLower(string(parameters.Sku.Name)) - premiumSku := strings.ToLower(string(servicebus.Premium)) - if skuName != premiumSku { - return fmt.Errorf("`capacity` can only be set for a Premium SKU") - }*/ - - parameters.Sku.Capacity = utils.Int32(int32(capacity)) + if capacity, ok := d.GetOk("capacity"); ok { + parameters.Sku.Capacity = utils.Int32(int32(capacity.(int))) } future, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters) diff --git a/examples/servicebus-create-topic-and-subscription/main.tf b/examples/servicebus-create-topic-and-subscription/main.tf index bcdb50a4aefd..3a5f32a391a4 100644 --- a/examples/servicebus-create-topic-and-subscription/main.tf +++ b/examples/servicebus-create-topic-and-subscription/main.tf @@ -13,11 +13,11 @@ resource "azurerm_servicebus_namespace" "test" { name = "tfex-servicebus${random_integer.ri.result}" location = "${var.location}" resource_group_name = "${var.resource_group}" - sku = "premium" + sku = "standard" capacity = 1 } - +/* resource "azurerm_servicebus_topic" "test" { name = "tfex_servicebus${random_integer.ri.result}_topic" resource_group_name = "${var.resource_group}" @@ -43,3 +43,4 @@ resource "azurerm_servicebus_topic" "forward_to" { enable_partitioning = true } +*/ \ No newline at end of file diff --git a/website/docs/r/servicebus_namespace.html.markdown b/website/docs/r/servicebus_namespace.html.markdown index 48f0a8882423..42a0b9275bb6 100644 --- a/website/docs/r/servicebus_namespace.html.markdown +++ b/website/docs/r/servicebus_namespace.html.markdown @@ -53,7 +53,7 @@ The following arguments are supported: * `sku` - (Required) Defines which tier to use. Options are basic, standard or premium. -* `capacity` - (Optional) Specifies the capacity of a Premium namespace. Can be 1, 2 or 4. +* `capacity` - (Optional) Specifies the capacity, can only be set when `sku` is `Premium` namespace. Can be `1`, `2` or `4`. * `tags` - (Optional) A mapping of tags to assign to the resource. From 9fe7aa72b65941db4567bff5a845cb82278c0735 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 12 Jun 2018 08:07:23 -0700 Subject: [PATCH 261/320] role definition - removed extra . from docs --- website/docs/r/role_definition.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/role_definition.html.markdown b/website/docs/r/role_definition.html.markdown index 281cdf1209ce..4add04c60c70 100644 --- a/website/docs/r/role_definition.html.markdown +++ b/website/docs/r/role_definition.html.markdown @@ -36,7 +36,7 @@ resource "azurerm_role_definition" "test" { The following arguments are supported: -* `role_definition_id` - (Optional) A unique UUID/GUID which identifies this role - one will be generated if not specified.. Changing this forces a new resource to be created. +* `role_definition_id` - (Optional) A unique UUID/GUID which identifies this role - one will be generated if not specified. Changing this forces a new resource to be created. * `name` - (Required) The name of the Role Definition. Changing this forces a new resource to be created. From ce9758731133bad5d3bafee23be48aa49e1f4af0 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 12 Jun 2018 08:05:14 -0700 Subject: [PATCH 262/320] removed unnecessary test --- .../resource_arm_servicebus_namespace_test.go | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/azurerm/resource_arm_servicebus_namespace_test.go b/azurerm/resource_arm_servicebus_namespace_test.go index cd03c884fe7c..8fa6637acfa3 100644 --- a/azurerm/resource_arm_servicebus_namespace_test.go +++ b/azurerm/resource_arm_servicebus_namespace_test.go @@ -62,38 +62,6 @@ func testSweepServiceBusNamespace(region string) error { return nil } -func TestAccAzureRMServiceBusNamespaceCapacity_validation(t *testing.T) { - cases := []struct { - Value int - ErrCount int - }{ - { - Value: 17, - ErrCount: 1, - }, - { - Value: 1, - ErrCount: 0, - }, - { - Value: 2, - ErrCount: 0, - }, - { - Value: 4, - ErrCount: 0, - }, - } - - for _, tc := range cases { - _, errors := validateServiceBusNamespaceCapacity(tc.Value, "azurerm_servicebus_namespace") - - if len(errors) != tc.ErrCount { - t.Fatalf("Expected the Azure RM ServiceBus Namespace Capacity to trigger a validation error") - } - } -} - func TestAccAzureRMServiceBusNamespace_basic(t *testing.T) { resourceName := "azurerm_servicebus_namespace.test" ri := acctest.RandInt() From 14e327763ea899e22a21dcef8dae8f2fe14dd2b5 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 11 Jun 2018 23:24:55 -0700 Subject: [PATCH 263/320] azurerm_storage_account encryption now on by defaults --- azurerm/resource_arm_storage_account.go | 14 ++++++-------- website/docs/r/storage_account.html.markdown | 8 ++------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index 7efa5e747aaf..610f83372d7d 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -127,13 +127,13 @@ func resourceArmStorageAccount() *schema.Resource { "enable_blob_encryption": { Type: schema.TypeBool, Optional: true, - Computed: true, + Default: true, }, "enable_file_encryption": { Type: schema.TypeBool, Optional: true, - Computed: true, + Default: true, }, "enable_https_traffic_only": { @@ -275,6 +275,7 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e location := azureRMNormalizeLocation(d.Get("location").(string)) tags := d.Get("tags").(map[string]interface{}) enableBlobEncryption := d.Get("enable_blob_encryption").(bool) + enableFileEncryption := d.Get("enable_file_encryption").(bool) enableHTTPSTrafficOnly := d.Get("enable_https_traffic_only").(bool) accountTier := d.Get("account_tier").(string) @@ -296,6 +297,9 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e Services: &storage.EncryptionServices{ Blob: &storage.EncryptionService{ Enabled: utils.Bool(enableBlobEncryption), + }, + File: &storage.EncryptionService{ + Enabled: utils.Bool(enableFileEncryption), }}, KeySource: storage.KeySource(storageAccountEncryptionSource), }, @@ -304,12 +308,6 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e }, } - if v, ok := d.GetOk("enable_file_encryption"); ok { - parameters.Encryption.Services.File = &storage.EncryptionService{ - Enabled: utils.Bool(v.(bool)), - } - } - if _, ok := d.GetOk("custom_domain"); ok { parameters.CustomDomain = expandStorageAccountCustomDomain(d) } diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index d04552f55bbd..1376b7c6ee87 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -97,13 +97,9 @@ The following arguments are supported: * `access_tier` - (Optional) Defines the access tier for `BlobStorage` and `StorageV2` accounts. Valid options are `Hot` and `Cold`, defaults to `Hot`. -* `enable_blob_encryption` - (Optional) Boolean flag which controls if Encryption - Services are enabled for Blob storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) - for more information. +* `enable_blob_encryption` - (Optional) Boolean flag which controls if Encryption Services are enabled for Blob storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) for more information. Defaults to `true`. -* `enable_file_encryption` - (Optional) Boolean flag which controls if Encryption - Services are enabled for File storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) - for more information. +* `enable_file_encryption` - (Optional) Boolean flag which controls if Encryption Services are enabled for File storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) for more information. Defaults to `true`. * `enable_https_traffic_only` - (Optional) Boolean flag which forces HTTPS if enabled, see [here](https://docs.microsoft.com/en-us/azure/storage/storage-require-secure-transfer/) for more information. From 0dc040ca23188694aca53e0c2ee722b1a9a321fe Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 12 Jun 2018 08:16:36 -0700 Subject: [PATCH 264/320] Update CHANGELOG.md to include #1378 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6585fd252ce2..d2af50fbfc37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ IMPROVEMENTS: * `azurerm_dns_ns_record` - deprecated `record` properties in favor of a `records` list [GH-991] * `azurerm_function_app` - adding the `identity` property [GH-1369] +* `azurerm_role_definition` - the `role_definition_id` property is now optional. The resource will now generate a random UUID if it is ommited [GH-1378] * `azurerm_storage_account` - adding the `network_rules` property [GH-1334] * `azurerm_storage_blob` - adding the `content_type` property [GH-1304] * `azurerm_virtual_machine_scale_set` - adding the `dns_settings` and `dns_servers` property [GH-1209] From 0fc3bf3b304fc972f33edec620bd4559a9080d29 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 12 Jun 2018 08:20:21 -0700 Subject: [PATCH 265/320] Update CHANGELOG.md to include #1380 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2af50fbfc37..06fa846f300f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ BUG FIXES: * `azurerm_kubernetes_cluster` - `dns_prefix` is now required [GH-1333] * `azurerm_network_interface` - ensuring that Public IP's/Private IP Addresses can be removed once assigned [GH-1295] * `azurerm_public_ip` - setting the `domain_name_label` property into state [GH-1287] +* `azurerm_storage_account` - encryption is now explicity `true` by default [GH-1380] * `azurerm_virtual_machine_scale_set` - the field `overprovision` has been updated to `true` by default rather than `false` to match Azure [GH-1322] * `resource_arm_app_service_plan` - validation will now allow understores in the `name` property [GH-1351] From c68568c0e85dd5dd2a157b01723dd7cc6e3e0866 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 12 Jun 2018 08:46:44 -0700 Subject: [PATCH 266/320] Update CHANGELOG.md to include #1382 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06fa846f300f..f4482aedd7af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ BUG FIXES: * `azurerm_network_interface` - ensuring that Public IP's/Private IP Addresses can be removed once assigned [GH-1295] * `azurerm_public_ip` - setting the `domain_name_label` property into state [GH-1287] * `azurerm_storage_account` - encryption is now explicity `true` by default [GH-1380] +* `azurerm_servicebus_namespace` - the `capacity` propety no longer unnecessarily creates a new resource when changed [GH-1382] * `azurerm_virtual_machine_scale_set` - the field `overprovision` has been updated to `true` by default rather than `false` to match Azure [GH-1322] * `resource_arm_app_service_plan` - validation will now allow understores in the `name` property [GH-1351] From bf6c579dd27f46946d03d440242da47051de7c37 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 13 Jun 2018 00:18:45 -0700 Subject: [PATCH 267/320] automation: Added validate & suppress helper packages & cleaned up code --- azurerm/helpers/suppress/string.go | 10 ++ azurerm/helpers/suppress/string_test.go | 43 ++++++++ azurerm/helpers/suppress/time.go | 18 ++++ azurerm/helpers/suppress/time_test.go | 48 +++++++++ azurerm/helpers/validate/time.go | 46 ++++++++ azurerm/helpers/validate/time_test.go | 88 +++++++++++++++ azurerm/resource_arm_automation_account.go | 7 +- azurerm/resource_arm_automation_credential.go | 6 ++ azurerm/resource_arm_automation_runbook.go | 4 + azurerm/resource_arm_automation_schedule.go | 101 ++++++------------ .../resource_arm_automation_schedule_test.go | 3 +- 11 files changed, 300 insertions(+), 74 deletions(-) create mode 100644 azurerm/helpers/suppress/string.go create mode 100644 azurerm/helpers/suppress/string_test.go create mode 100644 azurerm/helpers/suppress/time.go create mode 100644 azurerm/helpers/suppress/time_test.go create mode 100644 azurerm/helpers/validate/time.go create mode 100644 azurerm/helpers/validate/time_test.go diff --git a/azurerm/helpers/suppress/string.go b/azurerm/helpers/suppress/string.go new file mode 100644 index 000000000000..0726f7026fd8 --- /dev/null +++ b/azurerm/helpers/suppress/string.go @@ -0,0 +1,10 @@ +package suppress + +import ( + "github.com/hashicorp/terraform/helper/schema" + "strings" +) + +func CaseDifference(_, old, new string, _ *schema.ResourceData) bool { + return strings.ToLower(old) == strings.ToLower(new) +} diff --git a/azurerm/helpers/suppress/string_test.go b/azurerm/helpers/suppress/string_test.go new file mode 100644 index 000000000000..c9c1832ef45c --- /dev/null +++ b/azurerm/helpers/suppress/string_test.go @@ -0,0 +1,43 @@ +package suppress + +import "testing" + +func TestHelper_Suppress_CaseDifference(t *testing.T) { + cases := []struct { + StringA string + StringB string + Suppress bool + }{ + { + StringA: "", + StringB: "", + Suppress: true, + }, + { + StringA: "ye old text", + StringB: "", + Suppress: false, + }, + { + StringA: "ye old text?", + StringB: "ye different text", + Suppress: false, + }, + { + StringA: "ye same text!", + StringB: "ye same text!", + Suppress: true, + }, + { + StringA: "ye old text?", + StringB: "Ye OLD texT?", + Suppress: true, + }, + } + + for _, tc := range cases { + if CaseDifference("test", tc.StringA, tc.StringB, nil) != tc.Suppress { + t.Fatalf("Expected CaseDifference to return %t for '%q' == '%q'", tc.Suppress, tc.StringA, tc.StringB) + } + } +} diff --git a/azurerm/helpers/suppress/time.go b/azurerm/helpers/suppress/time.go new file mode 100644 index 000000000000..c4a4aca61fb7 --- /dev/null +++ b/azurerm/helpers/suppress/time.go @@ -0,0 +1,18 @@ +package suppress + +import ( + "time" + + "github.com/hashicorp/terraform/helper/schema" +) + +func Rfc3339Time(_, old, new string, _ *schema.ResourceData) bool { + ot, oerr := time.Parse(time.RFC3339, old) + nt, nerr := time.Parse(time.RFC3339, new) + + if oerr != nil || nerr != nil { + return false + } + + return nt.Equal(ot) +} diff --git a/azurerm/helpers/suppress/time_test.go b/azurerm/helpers/suppress/time_test.go new file mode 100644 index 000000000000..74a60a2f3da6 --- /dev/null +++ b/azurerm/helpers/suppress/time_test.go @@ -0,0 +1,48 @@ +package suppress + +import "testing" + +func TestHelper_Supress_Rfc3339Time(t *testing.T) { + cases := []struct { + TimeA string + TimeB string + Suppress bool + }{ + { + TimeA: "", + TimeB: "", + Suppress: false, + }, + { + TimeA: "this is not a time", + TimeB: "neither is this", + Suppress: false, + }, + { + TimeA: "2000-01-01T01:23:45+00:00", + TimeB: "that is a valid time", + Suppress: false, + }, + { + TimeA: "2000-01-01T01:23:45+00:00", + TimeB: "1984-07-07T01:23:45+00:00", + Suppress: false, + }, + { + TimeA: "2000-01-01T01:23:45+00:00", + TimeB: "2000-01-01T01:23:45Z", + Suppress: true, + }, + { + TimeA: "2000-01-01T01:23:45-08:00", + TimeB: "2000-01-01T09:23:45Z", + Suppress: true, + }, + } + + for _, tc := range cases { + if Rfc3339Time("test", tc.TimeA, tc.TimeB, nil) != tc.Suppress { + t.Fatalf("Expected Rfc3339Time to return %t for '%q' == '%q'", tc.Suppress, tc.TimeA, tc.TimeB) + } + } +} diff --git a/azurerm/helpers/validate/time.go b/azurerm/helpers/validate/time.go new file mode 100644 index 000000000000..cc435532e73d --- /dev/null +++ b/azurerm/helpers/validate/time.go @@ -0,0 +1,46 @@ +package validate + +import ( + "fmt" + "time" + + "github.com/Azure/go-autorest/autorest/date" + "github.com/hashicorp/terraform/helper/schema" +) + +//todo, now in terraform helper, switch over once vended, +func Rfc3339Time(i interface{}, k string) (_ []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if _, err := date.ParseTime(time.RFC3339, v); err != nil { + errors = append(errors, fmt.Errorf("%q has the invalid RFC3339 date format %q: %+v", k, i, err)) + } + + return +} + +func Rfc3339DateInFutureBy(d time.Duration) schema.SchemaValidateFunc { + return func(i interface{}, k string) (_ []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + t, err := date.ParseTime(time.RFC3339, v) + if err != nil { + errors = append(errors, fmt.Errorf("%q has the invalid RFC3339 date format %q: %+v", k, i, err)) + return + } + + if time.Until(t) < d { + errors = append(errors, fmt.Errorf("%q is %q and should be at least %q in the future", k, i, d)) + } + + return + } +} diff --git a/azurerm/helpers/validate/time_test.go b/azurerm/helpers/validate/time_test.go new file mode 100644 index 000000000000..8cb584566fa6 --- /dev/null +++ b/azurerm/helpers/validate/time_test.go @@ -0,0 +1,88 @@ +package validate + +import ( + "testing" + "time" +) + +func TestHelper_Validate_RFC3339Time(t *testing.T) { + cases := []struct { + Time string + Errors int + }{ + { + Time: "", + Errors: 1, + }, + { + Time: "this is not a date", + Errors: 1, + }, + { + Time: "2000-01-01", + Errors: 1, + }, + { + Time: "2000-01-01T01:23:45", + Errors: 1, + }, + { + Time: "2000-01-01T01:23:45Z", + Errors: 0, + }, + { + Time: "2000-01-01T01:23:45+00:00", + Errors: 0, + }, + } + + for _, tc := range cases { + _, errors := Rfc3339Time(tc.Time, "test") + + if len(errors) != tc.Errors { + t.Fatalf("Expected Rfc3339Time to have an error for '%q'", tc.Time) + } + } +} + +func TestHelper_Validate_Rfc3339DateInFutureBy(t *testing.T) { + cases := []struct { + Time string + Duration time.Duration + Errors int + }{ + { + Time: "", + Duration: time.Hour, + Errors: 1, + }, + { + Time: "not a time", + Duration: time.Hour, + Errors: 1, + }, + { + Time: time.Now().String(), + Duration: time.Hour, + Errors: 1, + }, + { + Time: time.Now().Add(time.Hour * 7).String(), + Duration: time.Hour, + Errors: 1, + }, + { + Time: time.Now().Add(time.Minute).String(), + Duration: time.Minute * 7, + Errors: 0, + }, + } + + for _, tc := range cases { + _, errors := Rfc3339DateInFutureBy(tc.Duration)(tc.Time, "test") + + if len(errors) < tc.Errors { + t.Fatalf("Expected Rfc3339DateInFutureBy to have an error for '%q' in future by `%q`", tc.Time, tc.Duration.String()) + } + } +} diff --git a/azurerm/resource_arm_automation_account.go b/azurerm/resource_arm_automation_account.go index 85528c784e38..22e648848409 100644 --- a/azurerm/resource_arm_automation_account.go +++ b/azurerm/resource_arm_automation_account.go @@ -28,7 +28,8 @@ func resourceArmAutomationAccount() *schema.Resource { Required: true, ForceNew: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile(`^[0-9a-zA-Z][-0-9a-zA-Z]{0,48}[0-9a-zA-Z]$`), //todo will not allow single character names, even thou they are valid + //todo this will not allow single character names, even thou they are valid + regexp.MustCompile(`^[0-9a-zA-Z][-0-9a-zA-Z]{0,48}[0-9a-zA-Z]$`), `The account name must not be empty, and must not exceed 50 characters in length. The account name must start with a letter or number. The account name can contain letters, numbers, and dashes. The final character must be a letter or a number.`, ), }, @@ -37,7 +38,6 @@ func resourceArmAutomationAccount() *schema.Resource { "resource_group_name": resourceGroupNameSchema(), - //can we somehow default this? "sku": { Type: schema.TypeList, Required: true, @@ -65,6 +65,7 @@ func resourceArmAutomationAccount() *schema.Resource { func resourceArmAutomationAccountCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).automationAccountClient ctx := meta.(*ArmClient).StopContext + log.Printf("[INFO] preparing arguments for AzureRM Automation Account creation.") name := d.Get("name").(string) @@ -105,6 +106,7 @@ func resourceArmAutomationAccountCreateUpdate(d *schema.ResourceData, meta inter func resourceArmAutomationAccountRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).automationAccountClient ctx := meta.(*ArmClient).StopContext + id, err := parseAzureResourceID(d.Id()) if err != nil { return err @@ -161,7 +163,6 @@ func resourceArmAutomationAccountDelete(d *schema.ResourceData, meta interface{} return nil } -//todo remove when deprecated field func flattenAndSetAutomationAccountSku(d *schema.ResourceData, sku *automation.Sku) { results := make([]interface{}, 1) diff --git a/azurerm/resource_arm_automation_credential.go b/azurerm/resource_arm_automation_credential.go index cbd92c4706be..6ab5e6e33e63 100644 --- a/azurerm/resource_arm_automation_credential.go +++ b/azurerm/resource_arm_automation_credential.go @@ -15,6 +15,7 @@ func resourceArmAutomationCredential() *schema.Resource { Read: resourceArmAutomationCredentialRead, Update: resourceArmAutomationCredentialCreateUpdate, Delete: resourceArmAutomationCredentialDelete, + Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -25,7 +26,9 @@ func resourceArmAutomationCredential() *schema.Resource { Required: true, ForceNew: true, }, + "resource_group_name": resourceGroupNameSchema(), + "account_name": { Type: schema.TypeString, Required: true, @@ -42,6 +45,7 @@ func resourceArmAutomationCredential() *schema.Resource { Required: true, Sensitive: true, }, + "description": { Type: schema.TypeString, Optional: true, @@ -53,6 +57,7 @@ func resourceArmAutomationCredential() *schema.Resource { func resourceArmAutomationCredentialCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).automationCredentialClient ctx := meta.(*ArmClient).StopContext + log.Printf("[INFO] preparing arguments for AzureRM Automation Credential creation.") name := d.Get("name").(string) @@ -93,6 +98,7 @@ func resourceArmAutomationCredentialCreateUpdate(d *schema.ResourceData, meta in func resourceArmAutomationCredentialRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).automationCredentialClient ctx := meta.(*ArmClient).StopContext + id, err := parseAzureResourceID(d.Id()) if err != nil { return err diff --git a/azurerm/resource_arm_automation_runbook.go b/azurerm/resource_arm_automation_runbook.go index 1b2d7d2219f8..914cddf5a7d7 100644 --- a/azurerm/resource_arm_automation_runbook.go +++ b/azurerm/resource_arm_automation_runbook.go @@ -16,6 +16,7 @@ func resourceArmAutomationRunbook() *schema.Resource { Read: resourceArmAutomationRunbookRead, Update: resourceArmAutomationRunbookCreateUpdate, Delete: resourceArmAutomationRunbookDelete, + Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -103,6 +104,7 @@ func resourceArmAutomationRunbook() *schema.Resource { }, }, }, + "tags": tagsSchema(), }, } @@ -111,6 +113,7 @@ func resourceArmAutomationRunbook() *schema.Resource { func resourceArmAutomationRunbookCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).automationRunbookClient ctx := meta.(*ArmClient).StopContext + log.Printf("[INFO] preparing arguments for AzureRM Automation Runbook creation.") name := d.Get("name").(string) @@ -161,6 +164,7 @@ func resourceArmAutomationRunbookCreateUpdate(d *schema.ResourceData, meta inter func resourceArmAutomationRunbookRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).automationRunbookClient ctx := meta.(*ArmClient).StopContext + id, err := parseAzureResourceID(d.Id()) if err != nil { return err diff --git a/azurerm/resource_arm_automation_schedule.go b/azurerm/resource_arm_automation_schedule.go index 7baf1986a3b5..053a74f46214 100644 --- a/azurerm/resource_arm_automation_schedule.go +++ b/azurerm/resource_arm_automation_schedule.go @@ -9,6 +9,8 @@ import ( "github.com/Azure/go-autorest/autorest/date" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "regexp" "strings" @@ -25,33 +27,6 @@ func resourceArmAutomationSchedule() *schema.Resource { State: schema.ImportStatePassthrough, }, - CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { - - interval, _ := diff.GetOk("interval") - if strings.ToLower(diff.Get("frequency").(string)) == "onetime" && interval.(int) > 0 { - return fmt.Errorf("interval canot be set when frequency is not OneTime") - } - - _, hasAccount := diff.GetOk("automation_account_name") - _, hasAutomationAccountWeb := diff.GetOk("account_name") - if !hasAccount && !hasAutomationAccountWeb { - return fmt.Errorf("`automation_account_name` must be set") - } - - //if automation_account_name changed or account_name chnaged not to or from nil force a new resource - oAan, nAan := diff.GetChange("automation_account_name") - if oAan != "" && nAan != "" { - diff.ForceNew("automation_account_name") - } - - oAn, nAn := diff.GetChange("account_name") - if oAn != "" && nAn != "" { - diff.ForceNew("automation_account_name") - } - - return nil - }, - Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -69,7 +44,7 @@ func resourceArmAutomationSchedule() *schema.Resource { "account_name": { Type: schema.TypeString, Optional: true, - Deprecated: "account_name has been renamed to automation_account_name for clarity and to better match the azure API", + Deprecated: "account_name has been renamed to automation_account_name for clarity and to match the azure API", ConflictsWith: []string{"automation_account_name"}, }, @@ -83,7 +58,7 @@ func resourceArmAutomationSchedule() *schema.Resource { "frequency": { Type: schema.TypeString, Required: true, - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + DiffSuppressFunc: suppress.CaseDifference, ValidateFunc: validation.StringInSlice([]string{ string(automation.Day), string(automation.Hour), @@ -105,8 +80,8 @@ func resourceArmAutomationSchedule() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - DiffSuppressFunc: compareDataAsUTCSuppressFunc, - ValidateFunc: validateRFC3339DateInFutureBy(time.Duration(5) * time.Minute), + DiffSuppressFunc: suppress.Rfc3339Time, + ValidateFunc: validate.Rfc3339DateInFutureBy(time.Duration(5) * time.Minute), //defaults to now + 7 minutes in create function if not set }, @@ -114,8 +89,8 @@ func resourceArmAutomationSchedule() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, //same as start time when OneTime, ridiculous value when recurring: "9999-12-31T15:59:00-08:00" - DiffSuppressFunc: compareDataAsUTCSuppressFunc, - ValidateFunc: validateRFC3339Date, + DiffSuppressFunc: suppress.CaseDifference, + ValidateFunc: validate.Rfc3339Time, }, "description": { @@ -127,52 +102,40 @@ func resourceArmAutomationSchedule() *schema.Resource { Type: schema.TypeString, Optional: true, Default: "UTC", - //ValidateFunc: validateTimezone, - //go uses a different list + //todo figure out how to validate this properly }, - //todo missing fields: week_days, month_days, month_week_day from advanced automation section - //also next_run may be useful + //todo missing properties: week_days, month_days, month_week_day from advanced automation section }, - } -} -//todo move to internal package validate -func compareDataAsUTCSuppressFunc(_, old, new string, _ *schema.ResourceData) bool { - ot, oerr := time.Parse(time.RFC3339, old) - nt, nerr := time.Parse(time.RFC3339, new) - if oerr != nil || nerr != nil { - return false - } - - return nt.Equal(ot) -} + CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { -//todo move to internal package validate -func validateRFC3339DateInFutureBy(d time.Duration) schema.SchemaValidateFunc { - return func(i interface{}, k string) (s []string, errors []error) { - t, err := time.Parse(time.RFC3339, i.(string)) - if err != nil { - errors = append(errors, fmt.Errorf("%q has the invalid RFC3339 date format %q: %+v", k, i, err)) - } + interval, _ := diff.GetOk("interval") + if strings.ToLower(diff.Get("frequency").(string)) == "onetime" && interval.(int) > 0 { + return fmt.Errorf("interval canot be set when frequency is not OneTime") + } - if time.Until(t) < d { - errors = append(errors, fmt.Errorf("%q is %q but should be at least %q in the future", k, i, d)) - } + _, hasAccount := diff.GetOk("automation_account_name") + _, hasAutomationAccountWeb := diff.GetOk("account_name") + if !hasAccount && !hasAutomationAccountWeb { + return fmt.Errorf("`automation_account_name` must be set") + } - return - } -} + //if automation_account_name changed or account_name changed to or from nil force a new resource + //remove once we remove the deprecated property + oAan, nAan := diff.GetChange("automation_account_name") + if oAan != "" && nAan != "" { + diff.ForceNew("automation_account_name") + } -//todo move to internal package validate -func validateTimezone(v interface{}, k string) (ws []string, errors []error) { - locationString := v.(string) + oAn, nAn := diff.GetChange("account_name") + if oAn != "" && nAn != "" { + diff.ForceNew("automation_account_name") + } - if _, err := time.LoadLocation(locationString); err != nil { - errors = append(errors, fmt.Errorf("%q is the invalid timezone %q: %+v", k, v, err)) + return nil + }, } - - return } func resourceArmAutomationScheduleCreateUpdate(d *schema.ResourceData, meta interface{}) error { diff --git a/azurerm/resource_arm_automation_schedule_test.go b/azurerm/resource_arm_automation_schedule_test.go index 0cf8b718be0a..4f734adf8815 100644 --- a/azurerm/resource_arm_automation_schedule_test.go +++ b/azurerm/resource_arm_automation_schedule_test.go @@ -5,7 +5,6 @@ import ( "testing" "time" - "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation" "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" @@ -24,7 +23,7 @@ func TestAccAzureRMAutomationSchedule_oneTime(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutomationScheduleExistsAndFrequencyType("azurerm_automation_schedule.test", automation.OneTime), + ), }, }, From 4d7175f0d0ebbee3ee1723b02982cf721a779b90 Mon Sep 17 00:00:00 2001 From: Jon Povey Date: Wed, 13 Jun 2018 09:38:38 +0100 Subject: [PATCH 268/320] Fix dead_lettering_on_message_expiration property name for azure service bus queue --- website/docs/r/servicebus_queue.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/servicebus_queue.html.markdown b/website/docs/r/servicebus_queue.html.markdown index 7e2cfae876e2..76d0aa7e982b 100644 --- a/website/docs/r/servicebus_queue.html.markdown +++ b/website/docs/r/servicebus_queue.html.markdown @@ -103,7 +103,7 @@ The following arguments are supported: a queue can guarantee first-in-first-out delivery of messages. Changing this forces a new resource to be created. Defaults to `false`. -* `requires_session` - (Optional) Boolean flag which controls whether the Queue has dead letter support when a message expires. Defaults to `false`. +* `dead_lettering_on_message_expiration` - (Optional) Boolean flag which controls whether the Queue has dead letter support when a message expires. Defaults to `false`. ### TimeSpan Format From 8a2457ebedefef8b5ec365426a3516da46a93481 Mon Sep 17 00:00:00 2001 From: lstolyarov Date: Wed, 13 Jun 2018 15:35:38 +0100 Subject: [PATCH 269/320] Updating to make the updateResourceByEnablingIdentity test pass --- azurerm/resource_arm_storage_account.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index a9cca7404bdb..d7111591813c 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -502,7 +502,7 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e } d.Partial(false) - return nil + return resourceArmStorageAccountRead(d, meta) } func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) error { From cb8dd586f25a435faeb4488597ed6c2377dbe26f Mon Sep 17 00:00:00 2001 From: lstolyarov Date: Wed, 13 Jun 2018 15:51:30 +0100 Subject: [PATCH 270/320] Running fmt --- azurerm/resource_arm_storage_account.go | 8 ++++---- azurerm/resource_arm_storage_account_test.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index 63a2d98f29b5..50ba72ab65c7 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -533,7 +533,7 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e d.SetPartial("enable_https_traffic_only") } - if d.HasChange("identity") { + if d.HasChange("identity") { storageAccountIdentity := expandAzureRmStorageAccountIdentity(d) opts := storage.AccountUpdateParameters{ @@ -543,9 +543,9 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e if err != nil { return fmt.Errorf("Error updating Azure Storage Account identity %q: %+v", storageAccountName, err) } - } - - if d.HasChange("network_rules") { + } + + if d.HasChange("network_rules") { networkRules := expandStorageAccountNetworkRules(d) opts := storage.AccountUpdateParameters{ diff --git a/azurerm/resource_arm_storage_account_test.go b/azurerm/resource_arm_storage_account_test.go index 6c457c1b27f7..3b8a167f275b 100644 --- a/azurerm/resource_arm_storage_account_test.go +++ b/azurerm/resource_arm_storage_account_test.go @@ -408,7 +408,7 @@ func TestAccAzureRMStorageAccount_updateResourceByEnablingIdentity(t *testing.T) }, }) } - + func TestAccAzureRMStorageAccount_networkRules(t *testing.T) { resourceName := "azurerm_storage_account.testsa" ri := acctest.RandInt() @@ -473,7 +473,7 @@ func TestAccAzureRMStorageAccount_networkRulesDeleted(t *testing.T) { }, }, }) -} +} func testCheckAzureRMStorageAccountExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { @@ -967,4 +967,4 @@ resource "azurerm_storage_account" "testsa" { } } `, rInt, location, rInt, rInt, rString) -} \ No newline at end of file +} From 3fc03e6a6faf60f9c6d2308ff6a38d8f8a3e3758 Mon Sep 17 00:00:00 2001 From: Chang Li Date: Wed, 13 Jun 2018 23:55:20 +0800 Subject: [PATCH 271/320] ExpressRouteCircuit additional test cases --- ...resource_arm_express_route_circuit_test.go | 171 +++++++++++++++++- 1 file changed, 168 insertions(+), 3 deletions(-) diff --git a/azurerm/resource_arm_express_route_circuit_test.go b/azurerm/resource_arm_express_route_circuit_test.go index 0b5bcafa84eb..ea514a86d99c 100644 --- a/azurerm/resource_arm_express_route_circuit_test.go +++ b/azurerm/resource_arm_express_route_circuit_test.go @@ -17,9 +17,13 @@ func TestAccAzureRMExpressRouteCircuit(t *testing.T) { // Azure only being happy about provisioning a couple at a time testCases := map[string]map[string]func(t *testing.T){ "basic": { - "metered": testAccAzureRMExpressRouteCircuit_basicMetered, - "unlimited": testAccAzureRMExpressRouteCircuit_basicUnlimited, - "update": testAccAzureRMExpressRouteCircuit_update, + "metered": testAccAzureRMExpressRouteCircuit_basicMetered, + "unlimited": testAccAzureRMExpressRouteCircuit_basicUnlimited, + "update": testAccAzureRMExpressRouteCircuit_update, + "tierUpdate": testAccAzureRMExpressRouteCircuit_tierUpdate, + "premiumMetered": testAccAzureRMExpressRouteCircuit_premiumMetered, + "premiumUnlimited": testAccAzureRMExpressRouteCircuit_premiumUnlimited, + "allowClassicOperationsUpdate": testAccAzureRMExpressRouteCircuit_allowClassicOperationsUpdate, }, "PrivatePeering": { "azurePrivatePeering": testAccAzureRMExpressRouteCircuitPeering_azurePrivatePeering, @@ -122,6 +126,106 @@ func testAccAzureRMExpressRouteCircuit_update(t *testing.T) { }) } +func testAccAzureRMExpressRouteCircuit_tierUpdate(t *testing.T) { + resourceName := "azurerm_express_route_circuit.test" + var erc network.ExpressRouteCircuit + ri := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMExpressRouteCircuitDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMExpressRouteCircuit_sku(ri, testLocation(), "Standard", "MeteredData"), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMExpressRouteCircuitExists("azurerm_express_route_circuit.test", &erc), + resource.TestCheckResourceAttr(resourceName, "sku.0.tier", "Standard"), + ), + }, + { + Config: testAccAzureRMExpressRouteCircuit_sku(ri, testLocation(), "Premium", "MeteredData"), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMExpressRouteCircuitExists("azurerm_express_route_circuit.test", &erc), + resource.TestCheckResourceAttr(resourceName, "sku.0.tier", "Premium"), + ), + }, + }, + }) +} + +func testAccAzureRMExpressRouteCircuit_premiumMetered(t *testing.T) { + resourceName := "azurerm_express_route_circuit.test" + var erc network.ExpressRouteCircuit + ri := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMExpressRouteCircuitDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMExpressRouteCircuit_sku(ri, testLocation(), "Premium", "MeteredData"), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMExpressRouteCircuitExists("azurerm_express_route_circuit.test", &erc), + resource.TestCheckResourceAttr(resourceName, "sku.0.tier", "Premium"), + resource.TestCheckResourceAttr(resourceName, "sku.0.family", "MeteredData"), + ), + }, + }, + }) +} + +func testAccAzureRMExpressRouteCircuit_premiumUnlimited(t *testing.T) { + resourceName := "azurerm_express_route_circuit.test" + var erc network.ExpressRouteCircuit + ri := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMExpressRouteCircuitDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMExpressRouteCircuit_sku(ri, testLocation(), "Premium", "UnlimitedData"), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMExpressRouteCircuitExists("azurerm_express_route_circuit.test", &erc), + resource.TestCheckResourceAttr(resourceName, "sku.0.tier", "Premium"), + resource.TestCheckResourceAttr(resourceName, "sku.0.family", "UnlimitedData"), + ), + }, + }, + }) +} + +func testAccAzureRMExpressRouteCircuit_allowClassicOperationsUpdate(t *testing.T) { + resourceName := "azurerm_express_route_circuit.test" + var erc network.ExpressRouteCircuit + ri := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMExpressRouteCircuitDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMExpressRouteCircuit_allowClassicOperations(ri, testLocation(), "false"), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMExpressRouteCircuitExists("azurerm_express_route_circuit.test", &erc), + resource.TestCheckResourceAttr(resourceName, "allow_classic_operations", "false"), + ), + }, + { + Config: testAccAzureRMExpressRouteCircuit_allowClassicOperations(ri, testLocation(), "true"), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMExpressRouteCircuitExists("azurerm_express_route_circuit.test", &erc), + resource.TestCheckResourceAttr(resourceName, "allow_classic_operations", "true"), + ), + }, + }, + }) +} + func testCheckAzureRMExpressRouteCircuitExists(name string, erc *network.ExpressRouteCircuit) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] @@ -208,6 +312,7 @@ resource "azurerm_express_route_circuit" "test" { } `, rInt, location, rInt) } + func testAccAzureRMExpressRouteCircuit_basicUnlimitedConfig(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -237,3 +342,63 @@ resource "azurerm_express_route_circuit" "test" { } `, rInt, location, rInt) } + +func testAccAzureRMExpressRouteCircuit_sku(rInt int, location string, tier string, family string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestrg-%d" + location = "%s" +} + +resource "azurerm_express_route_circuit" "test" { + name = "acctest-erc-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + service_provider_name = "Equinix" + peering_location = "Silicon Valley" + bandwidth_in_mbps = 50 + + sku { + tier = "%s" + family = "%s" + } + + allow_classic_operations = false + + tags { + Environment = "production" + Purpose = "AcceptanceTests" + } +} +`, rInt, location, rInt, tier, family) +} + +func testAccAzureRMExpressRouteCircuit_allowClassicOperations(rInt int, location string, allowClassicOperations string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestrg-%d" + location = "%s" +} + +resource "azurerm_express_route_circuit" "test" { + name = "acctest-erc-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + service_provider_name = "Equinix" + peering_location = "Silicon Valley" + bandwidth_in_mbps = 50 + + sku { + tier = "Standard" + family = "MeteredData" + } + + allow_classic_operations = %s + + tags { + Environment = "production" + Purpose = "AcceptanceTests" + } +} +`, rInt, location, rInt, allowClassicOperations) +} From a0db137fcf0c6a4668e01ab3afa66fb3a4e0cf1d Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 13 Jun 2018 19:33:36 -0700 Subject: [PATCH 272/320] Update resource_arm_storage_account.go Removed some lines that were accidentally merged back in. --- azurerm/resource_arm_storage_account.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index 50ba72ab65c7..4b8c7df84420 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -339,13 +339,7 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e storageAccountIdentity := expandAzureRmStorageAccountIdentity(d) parameters.Identity = storageAccountIdentity } - - if v, ok := d.GetOk("enable_file_encryption"); ok { - parameters.Encryption.Services.File = &storage.EncryptionService{ - Enabled: utils.Bool(v.(bool)), - } - } - + if _, ok := d.GetOk("custom_domain"); ok { parameters.CustomDomain = expandStorageAccountCustomDomain(d) } From 86fe88cd0030f03f1bf6ed9b679b24f4a3a30e23 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 13 Jun 2018 19:43:32 -0700 Subject: [PATCH 273/320] Update resource_arm_storage_account.go fix go fmt issues --- azurerm/resource_arm_storage_account.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index 4b8c7df84420..be90c7050a59 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -339,7 +339,7 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e storageAccountIdentity := expandAzureRmStorageAccountIdentity(d) parameters.Identity = storageAccountIdentity } - + if _, ok := d.GetOk("custom_domain"); ok { parameters.CustomDomain = expandStorageAccountCustomDomain(d) } From 8fd768c8049403ad8bb2bc82a52f37b8a8734560 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 13 Jun 2018 20:04:16 -0700 Subject: [PATCH 274/320] Update CHANGELOG.md to include #1323 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4482aedd7af..889320cc0c54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ IMPROVEMENTS: * `azurerm_function_app` - adding the `identity` property [GH-1369] * `azurerm_role_definition` - the `role_definition_id` property is now optional. The resource will now generate a random UUID if it is ommited [GH-1378] * `azurerm_storage_account` - adding the `network_rules` property [GH-1334] +* `azurerm_storage_account` - adding the `identity` property [GH-1323] * `azurerm_storage_blob` - adding the `content_type` property [GH-1304] * `azurerm_virtual_machine_scale_set` - adding the `dns_settings` and `dns_servers` property [GH-1209] * `azurerm_virtual_machine_scale_set` - adding the `ip_forwarding` property [GH-1209] From 2fe297f3f626f512ba0adcebbd58adca634218a7 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 14 Jun 2018 01:36:35 -0700 Subject: [PATCH 275/320] Update CHANGELOG.md --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 889320cc0c54..d2a1780ef809 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,14 +9,14 @@ BUG FIXES: * `azurerm_kubernetes_cluster` - `dns_prefix` is now required [GH-1333] * `azurerm_network_interface` - ensuring that Public IP's/Private IP Addresses can be removed once assigned [GH-1295] * `azurerm_public_ip` - setting the `domain_name_label` property into state [GH-1287] -* `azurerm_storage_account` - encryption is now explicity `true` by default [GH-1380] -* `azurerm_servicebus_namespace` - the `capacity` propety no longer unnecessarily creates a new resource when changed [GH-1382] -* `azurerm_virtual_machine_scale_set` - the field `overprovision` has been updated to `true` by default rather than `false` to match Azure [GH-1322] -* `resource_arm_app_service_plan` - validation will now allow understores in the `name` property [GH-1351] +* `azurerm_storage_account` - file and blob encryption is now explicity `true` by default [GH-1380] +* `azurerm_servicebus_namespace` - the `capacity` propety no longer unnecessarily forces a new resource when changed [GH-1382] +* `azurerm_virtual_machine_scale_set` - the field `overprovision` is now `true` by default [GH-1322] +* `resource_arm_app_service_plan` - the `name` property validation now allows understores [GH-1351] FEATURES: -* `azurerm_virtual_machine` - support for `write_accelerator_enabled` on Premium disks attached to MS-series machines [GH-964] +* `azurerm_virtual_machine` - support for `write_accelerator_enabled` property on Premium disks attached to MS-series machines [GH-964] IMPROVEMENTS: From 7a45b4c7d739abb480a2cf3be3c77e09cedd8156 Mon Sep 17 00:00:00 2001 From: lstolyarov Date: Thu, 14 Jun 2018 09:39:11 +0100 Subject: [PATCH 276/320] Moving from net.dial to http.get so environment proxy settings can be picked up --- azurerm/resource_arm_key_vault.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/azurerm/resource_arm_key_vault.go b/azurerm/resource_arm_key_vault.go index 2a30b0b92069..f5072a7411bd 100644 --- a/azurerm/resource_arm_key_vault.go +++ b/azurerm/resource_arm_key_vault.go @@ -3,12 +3,11 @@ package azurerm import ( "fmt" "log" - "net" + "net/http" "regexp" "time" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault" - "github.com/hashicorp/go-getter/helper/url" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" @@ -445,21 +444,22 @@ func validateKeyVaultName(v interface{}, k string) (ws []string, errors []error) func keyVaultRefreshFunc(vaultUri string) resource.StateRefreshFunc { return func() (interface{}, string, error) { log.Printf("[DEBUG] Checking to see if KeyVault %q is available..", vaultUri) - uri, err := url.Parse(vaultUri) - if err != nil { - return nil, "error", fmt.Errorf("Error parsing URI %q: %s", vaultUri, err) + + var PTransport = &http.Transport{Proxy: http.ProxyFromEnvironment} + + client := &http.Client{ + Transport: PTransport, } - hostAndPort := fmt.Sprintf("%s:443", uri.Host) - conn, err := net.Dial("tcp", hostAndPort) + conn, err := client.Get(vaultUri) if err != nil { - log.Printf("[DEBUG] Didn't find KeyVault at %q", hostAndPort) - return nil, "pending", fmt.Errorf("Error connecting to %q: %s", hostAndPort, err) + log.Printf("[DEBUG] Didn't find KeyVault at %q", vaultUri) + return nil, "pending", fmt.Errorf("Error connecting to %q: %s %s", vaultUri, err, conn) } - _ = conn.Close() + defer conn.Body.Close() - log.Printf("[DEBUG] Found KeyVault at %q", hostAndPort) + log.Printf("[DEBUG] Found KeyVault at %q", vaultUri) return "available", "available", nil } } From c7bd08cabf16b95665c755c0c5ec9369a809eb44 Mon Sep 17 00:00:00 2001 From: lstolyarov Date: Thu, 14 Jun 2018 11:00:59 +0100 Subject: [PATCH 277/320] Clean up --- azurerm/resource_arm_key_vault.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_key_vault.go b/azurerm/resource_arm_key_vault.go index f5072a7411bd..ef9e1b3a8819 100644 --- a/azurerm/resource_arm_key_vault.go +++ b/azurerm/resource_arm_key_vault.go @@ -454,7 +454,7 @@ func keyVaultRefreshFunc(vaultUri string) resource.StateRefreshFunc { conn, err := client.Get(vaultUri) if err != nil { log.Printf("[DEBUG] Didn't find KeyVault at %q", vaultUri) - return nil, "pending", fmt.Errorf("Error connecting to %q: %s %s", vaultUri, err, conn) + return nil, "pending", fmt.Errorf("Error connecting to %q: %s", vaultUri, err) } defer conn.Body.Close() From c6fec095978bbc27d278db17074622b2c3550160 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 14 Jun 2018 10:44:07 -0700 Subject: [PATCH 278/320] Update CHANGELOG.md to include #1393 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2a1780ef809..6f365798e95c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,14 @@ UPGRADE NOTES: BUG FIXES: +* `azurerm_key_vault` - respectes the same proxy environment varibles terraform does and can now create the vault when behind a proxy [GH-1393] * `azurerm_kubernetes_cluster` - `dns_prefix` is now required [GH-1333] * `azurerm_network_interface` - ensuring that Public IP's/Private IP Addresses can be removed once assigned [GH-1295] * `azurerm_public_ip` - setting the `domain_name_label` property into state [GH-1287] * `azurerm_storage_account` - file and blob encryption is now explicity `true` by default [GH-1380] * `azurerm_servicebus_namespace` - the `capacity` propety no longer unnecessarily forces a new resource when changed [GH-1382] * `azurerm_virtual_machine_scale_set` - the field `overprovision` is now `true` by default [GH-1322] -* `resource_arm_app_service_plan` - the `name` property validation now allows understores [GH-1351] +* `azurerm_app_service_plan` - the `name` property validation now allows understores [GH-1351] FEATURES: From d085c60cf00c3e151b44209d00fd9b31ece2ecf6 Mon Sep 17 00:00:00 2001 From: Damien Caro Date: Thu, 14 Jun 2018 12:28:39 -0700 Subject: [PATCH 279/320] Order packages, checked vpn_client values for nil, updated validate function and customizeDiff, added new test --- .../resource_arm_virtual_network_gateway.go | 46 ++++------ ...source_arm_virtual_network_gateway_test.go | 89 ++++++++++++++++--- 2 files changed, 95 insertions(+), 40 deletions(-) diff --git a/azurerm/resource_arm_virtual_network_gateway.go b/azurerm/resource_arm_virtual_network_gateway.go index bae8bf391ecc..34c8f29f9920 100644 --- a/azurerm/resource_arm_virtual_network_gateway.go +++ b/azurerm/resource_arm_virtual_network_gateway.go @@ -4,6 +4,7 @@ import ( "bytes" "fmt" "log" + "regexp" "strings" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" @@ -11,7 +12,6 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" - "regexp" ) func resourceArmVirtualNetworkGateway() *schema.Resource { @@ -202,9 +202,10 @@ func resourceArmVirtualNetworkGateway() *schema.Resource { "vpn_client_configuration.0.root_certificate", "vpn_client_configuration.0.revoked_certificate", }, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, + ValidateFunc: validation.StringMatch( + regexp.MustCompile("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"), + "The radius server address must be a valid IPv4 address", + ), }, "radius_server_secret": { Type: schema.TypeString, @@ -213,9 +214,6 @@ func resourceArmVirtualNetworkGateway() *schema.Resource { "vpn_client_configuration.0.root_certificate", "vpn_client_configuration.0.revoked_certificate", }, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, }, }, }, @@ -641,8 +639,13 @@ func flattenArmVirtualNetworkGatewayVpnClientConfig(cfg *network.VpnClientConfig } flat["vpn_client_protocols"] = vpnClientProtocols - flat["radius_server_address"] = *cfg.RadiusServerAddress - flat["radius_server_secret"] = *cfg.RadiusServerSecret + if v := cfg.RadiusServerAddress; v != nil { + flat["radius_server_address"] = *v + } + + if v := cfg.RadiusServerSecret; v != nil { + flat["radius_server_secret"] = *v + } return []interface{}{flat} } @@ -733,30 +736,17 @@ func resourceArmVirtualNetworkGatewayCustomizeDiff(diff *schema.ResourceDiff, v if vpnClient, ok := diff.GetOk("vpn_client_configuration"); ok { if vpnClientConfig, ok := vpnClient.([]interface{})[0].(map[string]interface{}); ok { - if vpnClientConfig["radius_server_address"] != "" { - if !validIP4(vpnClientConfig["radius_server_address"].(string)) { - return fmt.Errorf("radius_server_address is not an IPv4 address") + if vpnClientConfig["radius_server_address"] != "" || vpnClientConfig["radius_server_secret"] != "" { + // If the vpn client gateway is using a radius server then both value should be set + if vpnClientConfig["radius_server_address"] == "" { + return fmt.Errorf("the radius_server_address must be set ") } if vpnClientConfig["radius_server_secret"] == "" { - return fmt.Errorf("radius_server_secret cannot be empty") - } - } else { - if vpnClientConfig["radius_server_secret"] != "" { - return fmt.Errorf("radius_server_secret cannot be set when radius_server_address is empty") + return fmt.Errorf("the radius_server_secret must be set") } } + // If radius is not set then we assume using the certificate, nil values are acceptable } } return nil } - -func validIP4(ipAddress string) bool { - ipAddress = strings.Trim(ipAddress, " ") - - re, _ := regexp.Compile(`^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$`) - if re.MatchString(ipAddress) { - return true - } - - return false -} diff --git a/azurerm/resource_arm_virtual_network_gateway_test.go b/azurerm/resource_arm_virtual_network_gateway_test.go index 355084af92bb..3aa46a3621af 100644 --- a/azurerm/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/resource_arm_virtual_network_gateway_test.go @@ -54,7 +54,6 @@ func TestAccAzureRMVirtualNetworkGateway_lowerCaseSubnetName(t *testing.T) { func TestAccAzureRMVirtualNetworkGateway_vpnGw1(t *testing.T) { ri := acctest.RandInt() - resourceName := "azurerm_virtual_network_gateway.test" config := testAccAzureRMVirtualNetworkGateway_vpnGw1(ri, testLocation()) resource.Test(t, resource.TestCase{ @@ -65,9 +64,7 @@ func TestAccAzureRMVirtualNetworkGateway_vpnGw1(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualNetworkGatewayExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "vpn_client_configuration.0.radius_server_address", "1.2.3.4"), - resource.TestCheckResourceAttr(resourceName, "vpn_client_configuration.0.vpn_client_protocols.#", "2"), + testCheckAzureRMVirtualNetworkGatewayExists("azurerm_virtual_network_gateway.test"), ), }, }, @@ -93,6 +90,28 @@ func TestAccAzureRMVirtualNetworkGateway_activeActive(t *testing.T) { }) } +func TestAccAzureRMVirtualNetworkGateway_vpnClientConfig(t *testing.T) { + ri := acctest.RandInt() + resourceName := "azurerm_virtual_network_gateway.test" + config := testAccAzureRMVirtualNetworkGateway_vpnClientConfig(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualNetworkGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualNetworkGatewayExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "vpn_client_configuration.0.radius_server_address", "1.2.3.4"), + resource.TestCheckResourceAttr(resourceName, "vpn_client_configuration.0.vpn_client_protocols.#", "2"), + ), + }, + }, + }) +} + func testCheckAzureRMVirtualNetworkGatewayExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { name, resourceGroup, err := getArmResourceNameAndGroup(s, name) @@ -276,14 +295,6 @@ resource "azurerm_virtual_network_gateway" "test" { private_ip_address_allocation = "Dynamic" subnet_id = "${azurerm_subnet.test.id}" } - - vpn_client_configuration { - address_space = ["10.2.0.0/24"] - vpn_client_protocols = ["SSTP", "IkeV2"] - - radius_server_address = "1.2.3.4" - radius_server_secret = "1234" - } } `, rInt, location, rInt, rInt, rInt) } @@ -361,3 +372,57 @@ resource "azurerm_virtual_network_gateway" "test" { `, rInt, location, rInt, rInt, rInt, rInt) } + +func testAccAzureRMVirtualNetworkGateway_vpnClientConfig(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvn-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + address_space = ["10.0.0.0/16"] +} + +resource "azurerm_subnet" "test" { + name = "GatewaySubnet" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_public_ip" "test" { + name = "acctestpip-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + public_ip_address_allocation = "Dynamic" +} + +resource "azurerm_virtual_network_gateway" "test" { + name = "acctestvng-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + type = "Vpn" + vpn_type = "RouteBased" + sku = "VpnGw1" + + ip_configuration { + public_ip_address_id = "${azurerm_public_ip.test.id}" + private_ip_address_allocation = "Dynamic" + subnet_id = "${azurerm_subnet.test.id}" + } + + vpn_client_configuration { + address_space = ["10.2.0.0/24"] + vpn_client_protocols = ["SSTP", "IkeV2"] + + radius_server_address = "1.2.3.4" + radius_server_secret = "1234" + } +} +`, rInt, location, rInt, rInt, rInt) +} \ No newline at end of file From 195dc2dc474d81883006848f5c47bb8825efa90c Mon Sep 17 00:00:00 2001 From: Damien Caro Date: Thu, 14 Jun 2018 12:36:36 -0700 Subject: [PATCH 280/320] reformat test --- azurerm/resource_arm_virtual_network_gateway_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_virtual_network_gateway_test.go b/azurerm/resource_arm_virtual_network_gateway_test.go index 3aa46a3621af..9f849e34f2fd 100644 --- a/azurerm/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/resource_arm_virtual_network_gateway_test.go @@ -425,4 +425,4 @@ resource "azurerm_virtual_network_gateway" "test" { } } `, rInt, location, rInt, rInt, rInt) -} \ No newline at end of file +} From da84fb50513bd5bbc44cea9f1e3d29e30e3576d0 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 14 Jun 2018 13:56:32 -0700 Subject: [PATCH 281/320] ran terraform fmt on examples --- examples/aci-linux-multi/main.tf | 52 ++++---- examples/aci-linux-multi/outputs.tf | 7 +- examples/aci-linux-volume-mount/main.tf | 119 +++++++++--------- examples/aci-linux-volume-mount/outputs.tf | 7 +- examples/app-service/app.tf | 2 - examples/app-service/variables.tf | 5 +- examples/cdn-with-storage-account/main.tf | 16 +-- .../cdn-with-storage-account/variables.tf | 2 +- examples/cosmos-db/main.tf | 63 +++++----- examples/cosmos-db/outputs.tf | 4 +- examples/cosmos-db/variables.tf | 2 +- examples/encrypt-running-linux-vm/main.tf | 6 +- examples/freebsd-jumpbox/main.tf | 23 ++-- examples/freebsd-jumpbox/outputs.tf | 2 +- examples/kubernetes-cluster/main.tf | 50 ++++---- examples/kubernetes-cluster/variables.tf | 2 +- .../main.tf | 20 +-- .../outputs.tf | 5 +- examples/openshift-origin/main.tf | 2 +- examples/policy-definition/main.tf | 14 +-- examples/recoveryservice-vault/main.tf | 13 +- examples/recoveryservice-vault/outputs.tf | 3 +- examples/scheduler-jobs/main.tf | 25 ++-- examples/scheduler-jobs/outputs.tf | 3 +- .../main.tf | 4 +- .../spark-and-cassandra-on-centos/main.tf | 32 +++-- examples/tf-azurerm-vnet/main.tf | 20 +-- examples/tf-azurerm-vnet/outputs.tf | 2 +- examples/tf-azurerm-vnet/variables.tf | 5 +- examples/tf-sql-database/outputs.tf | 2 +- examples/traffic-manager-lb-scale-set/main.tf | 62 +++++---- .../tf_modules/location.tf | 34 ++--- .../tf_modules/outputs.tf | 2 +- .../traffic-manager-lb-scale-set/variables.tf | 75 +++++------ .../main.tf | 12 +- examples/vm-simple-linux-managed-disk/main.tf | 2 +- .../vm-simple-linux-managed-disk/outputs.tf | 2 +- .../vm-simple-linux-managed-disk/variables.tf | 2 +- examples/vmss-ubuntu/main.tf | 2 +- examples/wordpress-mysql-replication/main.tf | 2 +- 40 files changed, 347 insertions(+), 360 deletions(-) diff --git a/examples/aci-linux-multi/main.tf b/examples/aci-linux-multi/main.tf index 6d525b1a4e22..e7a9a8f3e8ad 100644 --- a/examples/aci-linux-multi/main.tf +++ b/examples/aci-linux-multi/main.tf @@ -1,38 +1,38 @@ resource "azurerm_resource_group" "aci-rg" { - name = "${var.resource_group_name}" - location = "${var.resource_group_location}" + name = "${var.resource_group_name}" + location = "${var.resource_group_location}" } #an attempt to keep the aci container group name (and dns label) somewhat unique resource "random_integer" "random_int" { - min = 100 - max = 999 + min = 100 + max = 999 } resource "azurerm_container_group" "aci-example" { - name = "my-aci-cg-${random_integer.random_int.result}" - location = "${azurerm_resource_group.aci-rg.location}" - resource_group_name = "${azurerm_resource_group.aci-rg.name}" - ip_address_type = "public" - dns_name_label = "my-aci-cg-${random_integer.random_int.result}" - os_type = "linux" + name = "my-aci-cg-${random_integer.random_int.result}" + location = "${azurerm_resource_group.aci-rg.location}" + resource_group_name = "${azurerm_resource_group.aci-rg.name}" + ip_address_type = "public" + dns_name_label = "my-aci-cg-${random_integer.random_int.result}" + os_type = "linux" - container { - name = "hw" - image = "microsoft/aci-helloworld:latest" - cpu = "0.5" - memory = "1.5" - port = "80" - } + container { + name = "hw" + image = "microsoft/aci-helloworld:latest" + cpu = "0.5" + memory = "1.5" + port = "80" + } - container { - name = "sidecar" - image = "microsoft/aci-tutorial-sidecar" - cpu = "0.5" - memory = "1.5" - } + container { + name = "sidecar" + image = "microsoft/aci-tutorial-sidecar" + cpu = "0.5" + memory = "1.5" + } - tags { - environment = "testing" - } + tags { + environment = "testing" + } } diff --git a/examples/aci-linux-multi/outputs.tf b/examples/aci-linux-multi/outputs.tf index 45ff1b4614ed..dbc2301b875a 100644 --- a/examples/aci-linux-multi/outputs.tf +++ b/examples/aci-linux-multi/outputs.tf @@ -1,9 +1,8 @@ - output "ip_address" { - value = "${azurerm_container_group.aci-example.ip_address}" + value = "${azurerm_container_group.aci-example.ip_address}" } #the dns fqdn of the container group if dns_name_label is set output "fqdn" { - value = "${azurerm_container_group.aci-example.fqdn}" -} \ No newline at end of file + value = "${azurerm_container_group.aci-example.fqdn}" +} diff --git a/examples/aci-linux-volume-mount/main.tf b/examples/aci-linux-volume-mount/main.tf index 738a0c85ae0c..f83926796e51 100644 --- a/examples/aci-linux-volume-mount/main.tf +++ b/examples/aci-linux-volume-mount/main.tf @@ -1,60 +1,59 @@ -resource "azurerm_resource_group" "aci-rg" { - name = "${var.resource_group_name}" - location = "${var.resource_group_location}" -} - -#storage account name needs to be globally unique so lets generate a random id -resource "random_integer" "random_int" { - min = 100 - max = 999 -} - -resource "azurerm_storage_account" "aci-sa" { - name = "acistorageacct${random_integer.random_int.result}" - resource_group_name = "${azurerm_resource_group.aci-rg.name}" - location = "${azurerm_resource_group.aci-rg.location}" - account_tier = "Standard" - account_replication_type = "LRS" -} - -resource "azurerm_storage_share" "aci-share" { - name = "aci-test-share" - - resource_group_name = "${azurerm_resource_group.aci-rg.name}" - storage_account_name = "${azurerm_storage_account.aci-sa.name}" - - quota = 50 -} - -resource "azurerm_container_group" "aci-example" { - - name = "mycontainergroup-${random_integer.random_int.result}" - location = "${azurerm_resource_group.aci-rg.location}" - resource_group_name = "${azurerm_resource_group.aci-rg.name}" - ip_address_type = "public" - dns_name_label = "mycontainergroup-${random_integer.random_int.result}" - os_type = "linux" - - container { - name = "webserver" - image = "seanmckenna/aci-hellofiles" - cpu = "1" - memory = "1.5" - port = "80" - protocol = "tcp" - - volume { - name = "logs" - mount_path = "/aci/logs" - read_only = false - share_name = "${azurerm_storage_share.aci-share.name}" - - storage_account_name = "${azurerm_storage_account.aci-sa.name}" - storage_account_key = "${azurerm_storage_account.aci-sa.primary_access_key}" - } - } - - tags { - environment = "testing" - } -} +resource "azurerm_resource_group" "aci-rg" { + name = "${var.resource_group_name}" + location = "${var.resource_group_location}" +} + +#storage account name needs to be globally unique so lets generate a random id +resource "random_integer" "random_int" { + min = 100 + max = 999 +} + +resource "azurerm_storage_account" "aci-sa" { + name = "acistorageacct${random_integer.random_int.result}" + resource_group_name = "${azurerm_resource_group.aci-rg.name}" + location = "${azurerm_resource_group.aci-rg.location}" + account_tier = "Standard" + account_replication_type = "LRS" +} + +resource "azurerm_storage_share" "aci-share" { + name = "aci-test-share" + + resource_group_name = "${azurerm_resource_group.aci-rg.name}" + storage_account_name = "${azurerm_storage_account.aci-sa.name}" + + quota = 50 +} + +resource "azurerm_container_group" "aci-example" { + name = "mycontainergroup-${random_integer.random_int.result}" + location = "${azurerm_resource_group.aci-rg.location}" + resource_group_name = "${azurerm_resource_group.aci-rg.name}" + ip_address_type = "public" + dns_name_label = "mycontainergroup-${random_integer.random_int.result}" + os_type = "linux" + + container { + name = "webserver" + image = "seanmckenna/aci-hellofiles" + cpu = "1" + memory = "1.5" + port = "80" + protocol = "tcp" + + volume { + name = "logs" + mount_path = "/aci/logs" + read_only = false + share_name = "${azurerm_storage_share.aci-share.name}" + + storage_account_name = "${azurerm_storage_account.aci-sa.name}" + storage_account_key = "${azurerm_storage_account.aci-sa.primary_access_key}" + } + } + + tags { + environment = "testing" + } +} diff --git a/examples/aci-linux-volume-mount/outputs.tf b/examples/aci-linux-volume-mount/outputs.tf index 45ff1b4614ed..dbc2301b875a 100644 --- a/examples/aci-linux-volume-mount/outputs.tf +++ b/examples/aci-linux-volume-mount/outputs.tf @@ -1,9 +1,8 @@ - output "ip_address" { - value = "${azurerm_container_group.aci-example.ip_address}" + value = "${azurerm_container_group.aci-example.ip_address}" } #the dns fqdn of the container group if dns_name_label is set output "fqdn" { - value = "${azurerm_container_group.aci-example.fqdn}" -} \ No newline at end of file + value = "${azurerm_container_group.aci-example.fqdn}" +} diff --git a/examples/app-service/app.tf b/examples/app-service/app.tf index cd10ccc479cf..8316a2bf49d0 100644 --- a/examples/app-service/app.tf +++ b/examples/app-service/app.tf @@ -8,13 +8,11 @@ resource "azurerm_resource_group" "default" { location = "${var.location}" } - resource "random_integer" "ri" { min = 10000 max = 99999 } - resource "azurerm_app_service_plan" "default" { name = "tfex-appservice-${random_integer.ri.result}-plan" location = "${azurerm_resource_group.default.location}" diff --git a/examples/app-service/variables.tf b/examples/app-service/variables.tf index 51985b70b5ca..de3130794e0f 100644 --- a/examples/app-service/variables.tf +++ b/examples/app-service/variables.tf @@ -10,15 +10,14 @@ variable "location" { default = "westus" } - variable "app_service_plan_sku_tier" { type = "string" description = "SKU tier of the App Service Plan" - default = "Basic" # Basic | Standard | ... + default = "Basic" # Basic | Standard | ... } variable "app_service_plan_sku_size" { type = "string" description = "SKU size of the App Service Plan" - default = "B1" # B1 | S1 | ... + default = "B1" # B1 | S1 | ... } diff --git a/examples/cdn-with-storage-account/main.tf b/examples/cdn-with-storage-account/main.tf index 591f4a672874..dba4f646d421 100644 --- a/examples/cdn-with-storage-account/main.tf +++ b/examples/cdn-with-storage-account/main.tf @@ -11,9 +11,9 @@ resource "azurerm_resource_group" "rg" { } resource "azurerm_storage_account" "stor" { - name = "${var.resource_group}stor" - location = "${var.location}" - resource_group_name = "${azurerm_resource_group.rg.name}" + name = "${var.resource_group}stor" + location = "${var.location}" + resource_group_name = "${azurerm_resource_group.rg.name}" account_tier = "${var.storage_account_tier}" account_replication_type = "${var.storage_replication_type}" } @@ -26,10 +26,10 @@ resource "azurerm_cdn_profile" "cdn" { } resource "azurerm_cdn_endpoint" "cdnendpt" { - name = "${var.resource_group}CdnEndpoint1" - profile_name = "${azurerm_cdn_profile.cdn.name}" - location = "${var.location}" - resource_group_name = "${azurerm_resource_group.rg.name}" + name = "${var.resource_group}CdnEndpoint1" + profile_name = "${azurerm_cdn_profile.cdn.name}" + location = "${var.location}" + resource_group_name = "${azurerm_resource_group.rg.name}" origin { name = "${var.resource_group}Origin1" @@ -37,4 +37,4 @@ resource "azurerm_cdn_endpoint" "cdnendpt" { http_port = 80 https_port = 443 } -} \ No newline at end of file +} diff --git a/examples/cdn-with-storage-account/variables.tf b/examples/cdn-with-storage-account/variables.tf index 5b1c9f541cac..900b70eb16d4 100644 --- a/examples/cdn-with-storage-account/variables.tf +++ b/examples/cdn-with-storage-account/variables.tf @@ -20,4 +20,4 @@ variable "storage_replication_type" { variable "host_name" { description = "A string that determines the hostname/IP address of the origin server. This string could be a domain name, IPv4 address or IPv6 address." default = "www.hostnameoforiginserver.com" -} \ No newline at end of file +} diff --git a/examples/cosmos-db/main.tf b/examples/cosmos-db/main.tf index dadd2dbff430..7b205e23a2a0 100644 --- a/examples/cosmos-db/main.tf +++ b/examples/cosmos-db/main.tf @@ -1,40 +1,39 @@ - resource "azurerm_resource_group" "rg" { - name = "${var.resource_group_name}" - location = "${var.resource_group_location}" + name = "${var.resource_group_name}" + location = "${var.resource_group_location}" } resource "random_integer" "ri" { - min = 10000 - max = 99999 + min = 10000 + max = 99999 } resource "azurerm_cosmosdb_account" "db" { - name = "tfex-cosmos-db-${random_integer.ri.result}" - location = "${azurerm_resource_group.rg.location}" - resource_group_name = "${azurerm_resource_group.rg.name}" - offer_type = "Standard" - kind = "GlobalDocumentDB" - - enable_automatic_failover = true - - //set ip_range_filter to allow azure services (0.0.0.0) and azure portal. - ip_range_filter = "0.0.0.0,104.42.195.92,40.76.54.131,52.176.6.30,52.169.50.45,52.187.184.26" - - consistency_policy { - consistency_level = "BoundedStaleness" - max_interval_in_seconds = 10 - max_staleness_prefix = 200 - } - - geo_location { - prefix = "tfex-cosmos-db-${random_integer.ri.result}-customid" - location = "${azurerm_resource_group.rg.location}" - failover_priority = 2 - } - - geo_location { - location = "${var.failover_location}" - failover_priority = 0 - } + name = "tfex-cosmos-db-${random_integer.ri.result}" + location = "${azurerm_resource_group.rg.location}" + resource_group_name = "${azurerm_resource_group.rg.name}" + offer_type = "Standard" + kind = "GlobalDocumentDB" + + enable_automatic_failover = true + + //set ip_range_filter to allow azure services (0.0.0.0) and azure portal. + ip_range_filter = "0.0.0.0,104.42.195.92,40.76.54.131,52.176.6.30,52.169.50.45,52.187.184.26" + + consistency_policy { + consistency_level = "BoundedStaleness" + max_interval_in_seconds = 10 + max_staleness_prefix = 200 + } + + geo_location { + prefix = "tfex-cosmos-db-${random_integer.ri.result}-customid" + location = "${azurerm_resource_group.rg.location}" + failover_priority = 2 + } + + geo_location { + location = "${var.failover_location}" + failover_priority = 0 + } } diff --git a/examples/cosmos-db/outputs.tf b/examples/cosmos-db/outputs.tf index 7f4aa9f35c24..c976dda996d9 100644 --- a/examples/cosmos-db/outputs.tf +++ b/examples/cosmos-db/outputs.tf @@ -1,4 +1,3 @@ - output "cosmos-db-id" { value = "${azurerm_cosmosdb_account.db.id}" } @@ -10,6 +9,7 @@ output "cosmos-db-endpoint" { output "cosmos-db-endpoints_read" { value = "${azurerm_cosmosdb_account.db.read_endpoints}" } + output "cosmos-db-endpoints_write" { value = "${azurerm_cosmosdb_account.db.write_endpoints}" } @@ -20,4 +20,4 @@ output "cosmos-db-primary_master_key" { output "cosmos-db-secondary_master_key" { value = "${azurerm_cosmosdb_account.db.secondary_master_key}" -} \ No newline at end of file +} diff --git a/examples/cosmos-db/variables.tf b/examples/cosmos-db/variables.tf index 9aa566eaa88f..2de35a04e29a 100644 --- a/examples/cosmos-db/variables.tf +++ b/examples/cosmos-db/variables.tf @@ -14,4 +14,4 @@ variable "failover_location" { type = "string" description = "Location of the failover instance." default = "eastus" -} \ No newline at end of file +} diff --git a/examples/encrypt-running-linux-vm/main.tf b/examples/encrypt-running-linux-vm/main.tf index a4bda0cf7e38..5285452094f5 100644 --- a/examples/encrypt-running-linux-vm/main.tf +++ b/examples/encrypt-running-linux-vm/main.tf @@ -37,9 +37,9 @@ resource "azurerm_network_interface" "nic" { } resource "azurerm_storage_account" "stor" { - name = "${var.hostname}stor" - resource_group_name = "${azurerm_resource_group.rg.name}" - location = "${azurerm_resource_group.rg.location}" + name = "${var.hostname}stor" + resource_group_name = "${azurerm_resource_group.rg.name}" + location = "${azurerm_resource_group.rg.location}" account_tier = "${var.storage_account_tier}" account_replication_type = "${var.storage_replication_type}" } diff --git a/examples/freebsd-jumpbox/main.tf b/examples/freebsd-jumpbox/main.tf index eb2cf039f88d..471d3bfab2bb 100644 --- a/examples/freebsd-jumpbox/main.tf +++ b/examples/freebsd-jumpbox/main.tf @@ -27,10 +27,10 @@ resource "azurerm_subnet" "mgmt-subnet" { } resource "azurerm_subnet" "web-subnet" { - name = "${azurerm_resource_group.rg.name}-web-subnet" - virtual_network_name = "${azurerm_virtual_network.vnet.name}" - resource_group_name = "${azurerm_resource_group.rg.name}" - address_prefix = "${var.web-subnet_prefix}" + name = "${azurerm_resource_group.rg.name}-web-subnet" + virtual_network_name = "${azurerm_virtual_network.vnet.name}" + resource_group_name = "${azurerm_resource_group.rg.name}" + address_prefix = "${var.web-subnet_prefix}" network_security_group_id = "${azurerm_network_security_group.web-nsg.id}" } @@ -63,7 +63,7 @@ resource "azurerm_network_security_group" "web-nsg" { resource_group_name = "${azurerm_resource_group.rg.name}" location = "${azurerm_resource_group.rg.location}" - security_rule { + security_rule { name = "allow-www" description = "Allow HTTP Traffic" priority = 100 @@ -83,9 +83,9 @@ resource "azurerm_network_security_group" "web-nsg" { # ************************** NETWORK INTERFACES **************************** # resource "azurerm_network_interface" "nic" { - name = "${azurerm_resource_group.rg.name}-nic" - location = "${var.location}" - resource_group_name = "${azurerm_resource_group.rg.name}" + name = "${azurerm_resource_group.rg.name}-nic" + location = "${var.location}" + resource_group_name = "${azurerm_resource_group.rg.name}" network_security_group_id = "${azurerm_network_security_group.mgmt-nsg.id}" ip_configuration { @@ -169,8 +169,9 @@ resource "azurerm_virtual_machine" "vm" { os_profile_linux_config { disable_password_authentication = true + ssh_keys { - path = "/home/${var.admin_username}/.ssh/authorized_keys" + path = "/home/${var.admin_username}/.ssh/authorized_keys" key_data = "${var.ssh_key_data}" } } @@ -179,8 +180,8 @@ resource "azurerm_virtual_machine" "vm" { enabled = true storage_uri = "${azurerm_storage_account.stor.primary_blob_endpoint}" } - + tags { environment = "Management" } -} \ No newline at end of file +} diff --git a/examples/freebsd-jumpbox/outputs.tf b/examples/freebsd-jumpbox/outputs.tf index 32c6294ceeab..13768e554d6c 100644 --- a/examples/freebsd-jumpbox/outputs.tf +++ b/examples/freebsd-jumpbox/outputs.tf @@ -8,4 +8,4 @@ output "vm_fqdn" { output "ssh_command" { value = "ssh ${var.admin_username}@${azurerm_public_ip.pip.fqdn}" -} \ No newline at end of file +} diff --git a/examples/kubernetes-cluster/main.tf b/examples/kubernetes-cluster/main.tf index 898312caa5fb..2566d1f3d5e3 100644 --- a/examples/kubernetes-cluster/main.tf +++ b/examples/kubernetes-cluster/main.tf @@ -1,39 +1,39 @@ resource "azurerm_resource_group" "akc-rg" { - name = "${var.resource_group_name}" - location = "${var.resource_group_location}" + name = "${var.resource_group_name}" + location = "${var.resource_group_location}" } #an attempt to keep the aci container group name (and dns label) somewhat unique resource "random_integer" "random_int" { - min = 100 - max = 999 + min = 100 + max = 999 } resource "azurerm_kubernetes_cluster" "aks_container" { - name = "akc-${random_integer.random_int.result}" - location = "${var.resource_group_location}" - dns_prefix = "akc-${random_integer.random_int.result}" + name = "akc-${random_integer.random_int.result}" + location = "${var.resource_group_location}" + dns_prefix = "akc-${random_integer.random_int.result}" - resource_group_name = "${azurerm_resource_group.akc-rg.name}" - kubernetes_version = "1.8.7" + resource_group_name = "${azurerm_resource_group.akc-rg.name}" + kubernetes_version = "1.8.7" + linux_profile { + admin_username = "${var.linux_admin_username}" - linux_profile { - admin_username = "${var.linux_admin_username}" - ssh_key { - key_data = "${var.linux_admin_ssh_publickey}" - } + ssh_key { + key_data = "${var.linux_admin_ssh_publickey}" } + } - agent_pool_profile { - name = "agentpool" - count = "2" - vm_size = "Standard_DS2_v2" - os_type = "Linux" - } + agent_pool_profile { + name = "agentpool" + count = "2" + vm_size = "Standard_DS2_v2" + os_type = "Linux" + } - service_principal { - client_id = "${var.client_id}" - client_secret = "${var.client_secret}" - } -} \ No newline at end of file + service_principal { + client_id = "${var.client_id}" + client_secret = "${var.client_secret}" + } +} diff --git a/examples/kubernetes-cluster/variables.tf b/examples/kubernetes-cluster/variables.tf index eb2648c13c3c..e51e90a3a44d 100644 --- a/examples/kubernetes-cluster/variables.tf +++ b/examples/kubernetes-cluster/variables.tf @@ -34,4 +34,4 @@ variable "linux_admin_username" { variable "linux_admin_ssh_publickey" { type = "string" description = "Configure all the linux virtual machines in the cluster with the SSH RSA public key string. The key should include three parts, for example 'ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm'" -} \ No newline at end of file +} diff --git a/examples/log-analytics-container-monitoring/main.tf b/examples/log-analytics-container-monitoring/main.tf index 52bb40b6f1e3..32208c470997 100644 --- a/examples/log-analytics-container-monitoring/main.tf +++ b/examples/log-analytics-container-monitoring/main.tf @@ -33,14 +33,14 @@ resource "azurerm_log_analytics_solution" "test" { } resource "azurerm_log_analytics_solution" "test2" { - solution_name = "Security" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - workspace_resource_id = "${azurerm_log_analytics_workspace.test.id}" - workspace_name = "${azurerm_log_analytics_workspace.test.name}" - - plan { - publisher = "Microsoft" - product = "OMSGallery/Security" - } + solution_name = "Security" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + workspace_resource_id = "${azurerm_log_analytics_workspace.test.id}" + workspace_name = "${azurerm_log_analytics_workspace.test.name}" + + plan { + publisher = "Microsoft" + product = "OMSGallery/Security" + } } diff --git a/examples/log-analytics-container-monitoring/outputs.tf b/examples/log-analytics-container-monitoring/outputs.tf index d6adecaf6ec4..62d0010f8a12 100644 --- a/examples/log-analytics-container-monitoring/outputs.tf +++ b/examples/log-analytics-container-monitoring/outputs.tf @@ -1,10 +1,9 @@ - // These outputs can be used to deploy the monitoring Daemonset into your k8s cluster // https://docs.microsoft.com/en-us/azure/aks/tutorial-kubernetes-monitor output "workspace_id" { - value = "${azurerm_log_analytics_workspace.test.workspace_id}" + value = "${azurerm_log_analytics_workspace.test.workspace_id}" } output "workspace_key" { - value = "${azurerm_log_analytics_workspace.test.primary_shared_key}" + value = "${azurerm_log_analytics_workspace.test.primary_shared_key}" } diff --git a/examples/openshift-origin/main.tf b/examples/openshift-origin/main.tf index fad9b0a5e91c..497d37897d35 100644 --- a/examples/openshift-origin/main.tf +++ b/examples/openshift-origin/main.tf @@ -551,7 +551,7 @@ resource "azurerm_virtual_machine" "master" { "set -x", "chmod +x masterPrep.sh", "chmod +x deployOpenShift.sh", - "sudo bash masterPrep.sh \"${azurerm_storage_account.persistent_volume_storage_account.name}\" \"${var.resource_group_location}\" \"${var.admin_username}\" && sudo bash deployOpenShift.sh \"${var.admin_username}\" \"${var.openshift_password}\" \"${var.key_vault_secret}\" \"${var.openshift_cluster_prefix}-master\" \"${azurerm_public_ip.openshift_master_pip.fqdn}\" \"${azurerm_public_ip.openshift_master_pip.ip_address}\" \"${var.openshift_cluster_prefix}-infra\" \"${var.openshift_cluster_prefix}-node\" \"${var.node_instance_count}\" \"${var.infra_instance_count}\" \"${var.master_instance_count}\" \"${var.default_sub_domain_type}\" \"${azurerm_storage_account.registry_storage_account.name}\" \"${azurerm_storage_account.registry_storage_account.primary_access_key}\" \"${var.tenant_id}\" \"${var.subscription_id}\" \"${var.aad_client_id}\" \"${var.aad_client_secret}\" \"${azurerm_resource_group.rg.name}\" \"${azurerm_resource_group.rg.location}\" \"${var.key_vault_name}\"" + "sudo bash masterPrep.sh \"${azurerm_storage_account.persistent_volume_storage_account.name}\" \"${var.resource_group_location}\" \"${var.admin_username}\" && sudo bash deployOpenShift.sh \"${var.admin_username}\" \"${var.openshift_password}\" \"${var.key_vault_secret}\" \"${var.openshift_cluster_prefix}-master\" \"${azurerm_public_ip.openshift_master_pip.fqdn}\" \"${azurerm_public_ip.openshift_master_pip.ip_address}\" \"${var.openshift_cluster_prefix}-infra\" \"${var.openshift_cluster_prefix}-node\" \"${var.node_instance_count}\" \"${var.infra_instance_count}\" \"${var.master_instance_count}\" \"${var.default_sub_domain_type}\" \"${azurerm_storage_account.registry_storage_account.name}\" \"${azurerm_storage_account.registry_storage_account.primary_access_key}\" \"${var.tenant_id}\" \"${var.subscription_id}\" \"${var.aad_client_id}\" \"${var.aad_client_secret}\" \"${azurerm_resource_group.rg.name}\" \"${azurerm_resource_group.rg.location}\" \"${var.key_vault_name}\"", ] } diff --git a/examples/policy-definition/main.tf b/examples/policy-definition/main.tf index b3acea24f58d..3cc6ffc64c29 100644 --- a/examples/policy-definition/main.tf +++ b/examples/policy-definition/main.tf @@ -1,9 +1,10 @@ resource "azurerm_policy_definition" "policy" { - name = "${var.policy_definition_name}" - policy_type = "${var.policy_type}" - mode = "${var.mode}" - display_name = "${var.display_name}" - policy_rule =< Date: Thu, 14 Jun 2018 13:56:55 -0700 Subject: [PATCH 282/320] updated error messages on customizeDiff and use bool --- azurerm/resource_arm_virtual_network_gateway.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/azurerm/resource_arm_virtual_network_gateway.go b/azurerm/resource_arm_virtual_network_gateway.go index 34c8f29f9920..cae1d416d3ab 100644 --- a/azurerm/resource_arm_virtual_network_gateway.go +++ b/azurerm/resource_arm_virtual_network_gateway.go @@ -736,16 +736,15 @@ func resourceArmVirtualNetworkGatewayCustomizeDiff(diff *schema.ResourceDiff, v if vpnClient, ok := diff.GetOk("vpn_client_configuration"); ok { if vpnClientConfig, ok := vpnClient.([]interface{})[0].(map[string]interface{}); ok { - if vpnClientConfig["radius_server_address"] != "" || vpnClientConfig["radius_server_secret"] != "" { - // If the vpn client gateway is using a radius server then both value should be set - if vpnClientConfig["radius_server_address"] == "" { - return fmt.Errorf("the radius_server_address must be set ") - } - if vpnClientConfig["radius_server_secret"] == "" { - return fmt.Errorf("the radius_server_secret must be set") - } + hasRadiusAddress := vpnClientConfig["radius_server_address"] != "" + hasRadiusSecret := vpnClientConfig["radius_server_secret"] != "" + + if hasRadiusAddress && !hasRadiusSecret { + return fmt.Errorf("if radius_server_address is set radius_server_secret must also be set") + } + if !hasRadiusAddress && hasRadiusSecret { + return fmt.Errorf("if radius_server_secret is set radius_server_address must also be set") } - // If radius is not set then we assume using the certificate, nil values are acceptable } } return nil From 3f76426c513cab3b9cb03479c970b32d92049fb3 Mon Sep 17 00:00:00 2001 From: Oscar Utbult Date: Thu, 14 Jun 2018 23:46:46 +0200 Subject: [PATCH 283/320] Fix spelling --- website/docs/r/cosmosdb_account.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/cosmosdb_account.html.markdown b/website/docs/r/cosmosdb_account.html.markdown index 4bfa0f8ffafc..d4bbe12949a1 100644 --- a/website/docs/r/cosmosdb_account.html.markdown +++ b/website/docs/r/cosmosdb_account.html.markdown @@ -85,7 +85,7 @@ The following arguments are supported: `geo_location` Configures the geographic locations the data is replicated to and supports the following: -* `prefix` - (Optional) The string used to generate the document enpoints for this region. If not specified it defaults to `${cosmosdb_account.name}-${location}`. Changing this causes the location to be deleted and re-provisioned and cannot be changed for the location with failover priority `0`. +* `prefix` - (Optional) The string used to generate the document endpoints for this region. If not specified it defaults to `${cosmosdb_account.name}-${location}`. Changing this causes the location to be deleted and re-provisioned and cannot be changed for the location with failover priority `0`. * `location` - (Required) The name of the Azure region to host replicated data. * `failover_priority` - (Required) The failover priority of the region. A failover priority of `0` indicates a write region. The maximum value for a failover priority = (total number of regions - 1). Failover priority values must be unique for each of the regions in which the database account exists. Changing this causes the location to be re-provisioned and cannot be changed for the location with failover priority `0`. From edfc2c36f2c0506eb473b952dc89b96cdcd0623a Mon Sep 17 00:00:00 2001 From: Oscar Utbult Date: Thu, 14 Jun 2018 23:55:24 +0200 Subject: [PATCH 284/320] Fix spelling --- website/docs/r/local_network_gateway.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/local_network_gateway.html.markdown b/website/docs/r/local_network_gateway.html.markdown index 422855a59181..cddaa69c2da2 100644 --- a/website/docs/r/local_network_gateway.html.markdown +++ b/website/docs/r/local_network_gateway.html.markdown @@ -38,7 +38,7 @@ The following arguments are supported: * `resource_group_name` - (Required) The name of the resource group in which to create the local network gateway. -* `location` - (Required) The location/region where the local network gatway is +* `location` - (Required) The location/region where the local network gateway is created. Changing this forces a new resource to be created. * `gateway_address` - (Required) The IP address of the gateway to which to From b45097752cc1b0d28e164e1ffcd426fbfe78ee26 Mon Sep 17 00:00:00 2001 From: Damien Caro Date: Thu, 14 Jun 2018 17:44:26 -0700 Subject: [PATCH 285/320] added dependency on activeActive test --- azurerm/resource_arm_virtual_network_gateway_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/azurerm/resource_arm_virtual_network_gateway_test.go b/azurerm/resource_arm_virtual_network_gateway_test.go index 9f849e34f2fd..2b773cb0bda2 100644 --- a/azurerm/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/resource_arm_virtual_network_gateway_test.go @@ -338,6 +338,7 @@ resource "azurerm_public_ip" "second" { } resource "azurerm_virtual_network_gateway" "test" { + depends_on = ["azurerm_public_ip.first", "azurerm_public_ip.second"] name = "acctestvng-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" From b4a6ebdc8ec79b60a9b09e53b079a3d7cc51cd4c Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 14 Jun 2018 16:47:26 -0700 Subject: [PATCH 286/320] automation: recatored import tests & added schedule tests --- azurerm/import_arm_automation_account_test.go | 56 ---- .../import_arm_automation_credential_test.go | 33 -- azurerm/import_arm_automation_runbook_test.go | 33 -- .../import_arm_automation_schedule_test.go | 32 -- .../resource_arm_automation_account_test.go | 20 +- ...resource_arm_automation_credential_test.go | 16 +- .../resource_arm_automation_runbook_test.go | 16 +- azurerm/resource_arm_automation_schedule.go | 23 +- .../resource_arm_automation_schedule_test.go | 305 ++++++++++++++++-- examples/automation-account/main.tf | 1 - 10 files changed, 325 insertions(+), 210 deletions(-) delete mode 100644 azurerm/import_arm_automation_account_test.go delete mode 100644 azurerm/import_arm_automation_credential_test.go delete mode 100644 azurerm/import_arm_automation_runbook_test.go delete mode 100644 azurerm/import_arm_automation_schedule_test.go diff --git a/azurerm/import_arm_automation_account_test.go b/azurerm/import_arm_automation_account_test.go deleted file mode 100644 index 780b9860130d..000000000000 --- a/azurerm/import_arm_automation_account_test.go +++ /dev/null @@ -1,56 +0,0 @@ -package azurerm - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAzureRMAutomationAccount_importBasic(t *testing.T) { - resourceName := "azurerm_automation_account.test" - - ri := acctest.RandInt() - config := testAccAzureRMAutomationAccount_basic(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMAutomationAccountDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAzureRMAutomationAccount_importComplete(t *testing.T) { - resourceName := "azurerm_automation_account.test" - - ri := acctest.RandInt() - config := testAccAzureRMAutomationAccount_complete(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMAutomationAccountDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/azurerm/import_arm_automation_credential_test.go b/azurerm/import_arm_automation_credential_test.go deleted file mode 100644 index 0fbc3a382a40..000000000000 --- a/azurerm/import_arm_automation_credential_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package azurerm - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAzureRMAutomationCredential_importCredential(t *testing.T) { - resourceName := "azurerm_automation_credential.test" - - ri := acctest.RandInt() - config := testAccAzureRMAutomationCredential_complete(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMAutomationCredentialDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"password"}, - }, - }, - }) -} diff --git a/azurerm/import_arm_automation_runbook_test.go b/azurerm/import_arm_automation_runbook_test.go deleted file mode 100644 index d4d464948b46..000000000000 --- a/azurerm/import_arm_automation_runbook_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package azurerm - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAzureRMAutomationRunbook_importRunbookPSWorkflow(t *testing.T) { - resourceName := "azurerm_automation_runbook.test" - - ri := acctest.RandInt() - config := testAccAzureRMAutomationRunbook_PSWorkflow(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMAutomationRunbookDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"publish_content_link"}, - }, - }, - }) -} diff --git a/azurerm/import_arm_automation_schedule_test.go b/azurerm/import_arm_automation_schedule_test.go deleted file mode 100644 index e814c09b5cef..000000000000 --- a/azurerm/import_arm_automation_schedule_test.go +++ /dev/null @@ -1,32 +0,0 @@ -package azurerm - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAzureRMAutomationSchedule_importScheduleOneTime(t *testing.T) { - resourceName := "azurerm_automation_schedule.test" - - ri := acctest.RandInt() - config := testAccAzureRMAutomationSchedule_oneTime(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMAutomationScheduleDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/azurerm/resource_arm_automation_account_test.go b/azurerm/resource_arm_automation_account_test.go index bfd880cd7a8f..9cfbe654108a 100644 --- a/azurerm/resource_arm_automation_account_test.go +++ b/azurerm/resource_arm_automation_account_test.go @@ -11,9 +11,8 @@ import ( ) func TestAccAzureRMAutomationAccount_basic(t *testing.T) { - ri := acctest.RandInt() resourceName := "azurerm_automation_account.test" - config := testAccAzureRMAutomationAccount_basic(ri, testLocation()) + ri := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -21,20 +20,24 @@ func TestAccAzureRMAutomationAccount_basic(t *testing.T) { CheckDestroy: testCheckAzureRMAutomationAccountDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMAutomationAccount_basic(ri, testLocation()), Check: resource.ComposeTestCheckFunc( testCheckAzureRMAutomationAccountExists(resourceName), resource.TestCheckResourceAttr(resourceName, "sku.0.name", "Basic"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } func TestAccAzureRMAutomationAccount_complete(t *testing.T) { - ri := acctest.RandInt() resourceName := "azurerm_automation_account.test" - config := testAccAzureRMAutomationAccount_complete(ri, testLocation()) + ri := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -42,13 +45,18 @@ func TestAccAzureRMAutomationAccount_complete(t *testing.T) { CheckDestroy: testCheckAzureRMAutomationAccountDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMAutomationAccount_complete(ri, testLocation()), Check: resource.ComposeTestCheckFunc( testCheckAzureRMAutomationAccountExists(resourceName), resource.TestCheckResourceAttr(resourceName, "sku.0.name", "Basic"), resource.TestCheckResourceAttr(resourceName, "tags.hello", "world"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } diff --git a/azurerm/resource_arm_automation_credential_test.go b/azurerm/resource_arm_automation_credential_test.go index 6ff53bbadd9c..9417e21ccdde 100644 --- a/azurerm/resource_arm_automation_credential_test.go +++ b/azurerm/resource_arm_automation_credential_test.go @@ -13,7 +13,6 @@ import ( func TestAccAzureRMAutomationCredential_basic(t *testing.T) { resourceName := "azurerm_automation_credential.test" ri := acctest.RandInt() - config := testAccAzureRMAutomationCredential_basic(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -21,12 +20,17 @@ func TestAccAzureRMAutomationCredential_basic(t *testing.T) { CheckDestroy: testCheckAzureRMAutomationCredentialDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMAutomationCredential_basic(ri, testLocation()), Check: resource.ComposeTestCheckFunc( testCheckAzureRMAutomationCredentialExists(resourceName), resource.TestCheckResourceAttr(resourceName, "username", "test_user"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -34,7 +38,6 @@ func TestAccAzureRMAutomationCredential_basic(t *testing.T) { func TestAccAzureRMAutomationCredential_complete(t *testing.T) { resourceName := "azurerm_automation_credential.test" ri := acctest.RandInt() - config := testAccAzureRMAutomationCredential_complete(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -42,13 +45,18 @@ func TestAccAzureRMAutomationCredential_complete(t *testing.T) { CheckDestroy: testCheckAzureRMAutomationCredentialDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMAutomationCredential_complete(ri, testLocation()), Check: resource.ComposeTestCheckFunc( testCheckAzureRMAutomationCredentialExists(resourceName), resource.TestCheckResourceAttr(resourceName, "username", "test_user"), resource.TestCheckResourceAttr(resourceName, "description", "This is a test credential for terraform acceptance test"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } diff --git a/azurerm/resource_arm_automation_runbook_test.go b/azurerm/resource_arm_automation_runbook_test.go index 0b37fd231264..85b511fd2f3e 100644 --- a/azurerm/resource_arm_automation_runbook_test.go +++ b/azurerm/resource_arm_automation_runbook_test.go @@ -13,7 +13,6 @@ import ( func TestAccAzureRMAutomationRunbook_PSWorkflow(t *testing.T) { resourceName := "azurerm_automation_runbook.test" ri := acctest.RandInt() - config := testAccAzureRMAutomationRunbook_PSWorkflow(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -21,12 +20,17 @@ func TestAccAzureRMAutomationRunbook_PSWorkflow(t *testing.T) { CheckDestroy: testCheckAzureRMAutomationRunbookDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMAutomationRunbook_PSWorkflow(ri, testLocation()), Check: resource.ComposeTestCheckFunc( testCheckAzureRMAutomationRunbookExists(resourceName), resource.TestCheckResourceAttr(resourceName, "runbook_type", "PowerShellWorkflow"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -34,7 +38,6 @@ func TestAccAzureRMAutomationRunbook_PSWorkflow(t *testing.T) { func TestAccAzureRMAutomationRunbook_PSWorkflowWithHash(t *testing.T) { resourceName := "azurerm_automation_runbook.test" ri := acctest.RandInt() - config := testAccAzureRMAutomationRunbook_PSWorkflowWithHash(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -42,12 +45,17 @@ func TestAccAzureRMAutomationRunbook_PSWorkflowWithHash(t *testing.T) { CheckDestroy: testCheckAzureRMAutomationRunbookDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMAutomationRunbook_PSWorkflowWithHash(ri, testLocation()), Check: resource.ComposeTestCheckFunc( testCheckAzureRMAutomationRunbookExists(resourceName), resource.TestCheckResourceAttr(resourceName, "runbook_type", "PowerShellWorkflow"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } diff --git a/azurerm/resource_arm_automation_schedule.go b/azurerm/resource_arm_automation_schedule.go index 053a74f46214..de3d1ff06442 100644 --- a/azurerm/resource_arm_automation_schedule.go +++ b/azurerm/resource_arm_automation_schedule.go @@ -12,7 +12,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" - "regexp" "strings" ) @@ -32,10 +31,10 @@ func resourceArmAutomationSchedule() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validation.StringMatch( + /*ValidateFunc: validation.StringMatch( regexp.MustCompile(`^[^<>*%&:\\?.+/]{0,127}[^<>*%&:\\?.+/\s]$`), `The name length must be from 1 to 128 characters. The name cannot contain special characters < > * % & : \ ? . + / and cannot end with a whitespace character.`, - ), + ),*/ }, "resource_group_name": resourceGroupNameSchema(), @@ -44,6 +43,7 @@ func resourceArmAutomationSchedule() *schema.Resource { "account_name": { Type: schema.TypeString, Optional: true, + Computed: true, Deprecated: "account_name has been renamed to automation_account_name for clarity and to match the azure API", ConflictsWith: []string{"automation_account_name"}, }, @@ -51,6 +51,7 @@ func resourceArmAutomationSchedule() *schema.Resource { "automation_account_name": { Type: schema.TypeString, Optional: true, //todo change to required once account_name has been removed + Computed: true, //ForceNew: true, //todo this needs to come back once account_name has been removed ConflictsWith: []string{"account_name"}, }, @@ -123,15 +124,19 @@ func resourceArmAutomationSchedule() *schema.Resource { //if automation_account_name changed or account_name changed to or from nil force a new resource //remove once we remove the deprecated property + //if diff.HasChange("automation_account_name") { oAan, nAan := diff.GetChange("automation_account_name") if oAan != "" && nAan != "" { diff.ForceNew("automation_account_name") } + //} + //if diff.HasChange("account_name") { oAn, nAn := diff.GetChange("account_name") if oAn != "" && nAn != "" { - diff.ForceNew("automation_account_name") + diff.ForceNew("account_name") } + //} return nil }, @@ -158,7 +163,7 @@ func resourceArmAutomationScheduleCreateUpdate(d *schema.ResourceData, meta inte accountName = v.(string) } else if v, ok := d.GetOk("account_name"); ok { accountName = v.(string) - } //CustomizeDiff should enforce one of these two being set + } parameters := automation.ScheduleCreateOrUpdateParameters{ Name: &name, @@ -235,12 +240,8 @@ func resourceArmAutomationScheduleRead(d *schema.ResourceData, meta interface{}) d.Set("name", resp.Name) d.Set("resource_group_name", resGroup) - //todo remove once `account_name` is removed - if _, ok := d.GetOk("automation_account_name"); ok { - d.Set("automation_account_name", accountName) - } else { - d.Set("account_name", accountName) - } + d.Set("automation_account_name", accountName) + d.Set("account_name", accountName) //todo remove once `account_name` is removed d.Set("frequency", string(resp.Frequency)) if v := resp.StartTime; v != nil { diff --git a/azurerm/resource_arm_automation_schedule_test.go b/azurerm/resource_arm_automation_schedule_test.go index 4f734adf8815..74479f97d8e1 100644 --- a/azurerm/resource_arm_automation_schedule_test.go +++ b/azurerm/resource_arm_automation_schedule_test.go @@ -2,18 +2,18 @@ package azurerm import ( "fmt" - "testing" - "time" - "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" + "strconv" + "testing" + "time" ) -func TestAccAzureRMAutomationSchedule_oneTime(t *testing.T) { +func TestAccAzureRMAutomationSchedule_oneTime_basic(t *testing.T) { + resourceName := "azurerm_automation_schedule.test" ri := acctest.RandInt() - config := testAccAzureRMAutomationSchedule_oneTime(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -21,10 +21,154 @@ func TestAccAzureRMAutomationSchedule_oneTime(t *testing.T) { CheckDestroy: testCheckAzureRMAutomationScheduleDestroy, Steps: []resource.TestStep{ { - Config: config, - Check: resource.ComposeTestCheckFunc( + Config: testAccAzureRMAutomationSchedule_oneTime_basic(ri, testLocation()), + Check: checkAccAzureRMAutomationSchedule_oneTime_basic(resourceName), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMAutomationSchedule_oneTime_complete(t *testing.T) { + resourceName := "azurerm_automation_schedule.test" + ri := acctest.RandInt() + + //the API returns the time in the timezone we pass in + //it also seems to strip seconds, hijack the RFC3339 format to have 0s there + loc, _ := time.LoadLocation("CET") + startTime := time.Now().UTC().Add(time.Hour * 7).In(loc).Format("2006-01-02T15:04:00Z07:00") - ), + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAutomationScheduleDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMAutomationSchedule_oneTime_complete(ri, testLocation(), startTime), + Check: checkAccAzureRMAutomationSchedule_oneTime_complete(resourceName, startTime), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMAutomationSchedule_oneTime_update(t *testing.T) { + resourceName := "azurerm_automation_schedule.test" + ri := acctest.RandInt() + + //the API returns the time in the timezone we pass in + //it also seems to strip seconds, hijack the RFC3339 format to have 0s there + loc, _ := time.LoadLocation("CET") + startTime := time.Now().UTC().Add(time.Hour * 7).In(loc).Format("2006-01-02T15:04:00Z07:00") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAutomationScheduleDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMAutomationSchedule_oneTime_basic(ri, testLocation()), + Check: checkAccAzureRMAutomationSchedule_oneTime_basic(resourceName), + }, + { + Config: testAccAzureRMAutomationSchedule_oneTime_complete(ri, testLocation(), startTime), + Check: checkAccAzureRMAutomationSchedule_oneTime_complete(resourceName, startTime), + }, + }, + }) +} + +func TestAccAzureRMAutomationSchedule_hourly(t *testing.T) { + resourceName := "azurerm_automation_schedule.test" + ri := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAutomationScheduleDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMAutomationSchedule_recurring_basic(ri, testLocation(), "Hour", 7), + Check: checkAccAzureRMAutomationSchedule_recurring_basic(resourceName, "Hour", 7), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMAutomationSchedule_daily(t *testing.T) { + resourceName := "azurerm_automation_schedule.test" + ri := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAutomationScheduleDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMAutomationSchedule_recurring_basic(ri, testLocation(), "Day", 7), + Check: checkAccAzureRMAutomationSchedule_recurring_basic(resourceName, "Day", 7), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMAutomationSchedule_weekly(t *testing.T) { + resourceName := "azurerm_automation_schedule.test" + ri := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAutomationScheduleDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMAutomationSchedule_recurring_basic(ri, testLocation(), "Week", 7), + Check: checkAccAzureRMAutomationSchedule_recurring_basic(resourceName, "Week", 7), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMAutomationSchedule_monthly(t *testing.T) { + resourceName := "azurerm_automation_schedule.test" + ri := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMAutomationScheduleDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMAutomationSchedule_recurring_basic(ri, testLocation(), "Month", 7), + Check: checkAccAzureRMAutomationSchedule_recurring_basic(resourceName, "Month", 7), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -63,33 +207,134 @@ func testCheckAzureRMAutomationScheduleDestroy(s *terraform.State) error { return nil } -func testAccAzureRMAutomationSchedule_oneTime(rInt int, location string) string { - startTime := time.Now().UTC().Add(time.Duration(7) * time.Minute) - startTime = startTime.Add(time.Duration(-1*startTime.Second()) * time.Second) +func testCheckAzureRMAutomationScheduleExists(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*ArmClient).automationScheduleClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + name := rs.Primary.Attributes["name"] + accName := rs.Primary.Attributes["automation_account_name"] + + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for Automation Schedule: '%s'", name) + } + + resp, err := conn.Get(ctx, resourceGroup, accName, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Automation Schedule '%s' (resource group: '%s') does not exist", name, resourceGroup) + } + + return fmt.Errorf("Bad: Get on automationScheduleClient: %+v", err) + } + + return nil + } +} + +func testAccAzureRMAutomationSchedule_prerequisites(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_automation_account" "test" { + name = "acctestAA-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku { + name = "Basic" + } +} + +`, rInt, location, rInt) +} +func testAccAzureRMAutomationSchedule_oneTime_basic(rInt int, location string) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" +%s + +resource "azurerm_automation_schedule" "test" { + name = "acctestAS-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + automation_account_name = "${azurerm_automation_account.test.name}" + frequency = "OneTime" +} +`, testAccAzureRMAutomationSchedule_prerequisites(rInt, location), rInt) } -resource "azurerm_automation_account" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "Basic" - } +func checkAccAzureRMAutomationSchedule_oneTime_basic(resourceName string) resource.TestCheckFunc { + return resource.ComposeAggregateTestCheckFunc( + testCheckAzureRMAutomationScheduleExists("azurerm_automation_schedule.test"), + resource.TestCheckResourceAttrSet(resourceName, "name"), + resource.TestCheckResourceAttrSet(resourceName, "resource_group_name"), + resource.TestCheckResourceAttrSet(resourceName, "automation_account_name"), + resource.TestCheckResourceAttrSet(resourceName, "start_time"), + resource.TestCheckResourceAttr(resourceName, "frequency", "OneTime"), + resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), + ) } +func testAccAzureRMAutomationSchedule_oneTime_complete(rInt int, location, startTime string) string { + return fmt.Sprintf(` +%s + resource "azurerm_automation_schedule" "test" { - name = "OneTimer-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - account_name = "${azurerm_automation_account.test.name}" - frequency = "OneTime" - timezone = "Central Europe Standard Time" - start_time = "%s" - description = "This is a test runbook for terraform acceptance test" -} -`, rInt, location, rInt, rInt, startTime.Format(time.RFC3339)) + name = "acctestAS-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + automation_account_name = "${azurerm_automation_account.test.name}" + frequency = "OneTime" + start_time = "%s" + timezone = "Central Europe Standard Time" + description = "This is an automation schedule" +} +`, testAccAzureRMAutomationSchedule_prerequisites(rInt, location), rInt, startTime) +} + +func checkAccAzureRMAutomationSchedule_oneTime_complete(resourceName, startTime string) resource.TestCheckFunc { + return resource.ComposeAggregateTestCheckFunc( + testCheckAzureRMAutomationScheduleExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "name"), + resource.TestCheckResourceAttrSet(resourceName, "resource_group_name"), + resource.TestCheckResourceAttrSet(resourceName, "automation_account_name"), + resource.TestCheckResourceAttr(resourceName, "frequency", "OneTime"), + resource.TestCheckResourceAttr(resourceName, "start_time", startTime), + resource.TestCheckResourceAttr(resourceName, "timezone", "Central Europe Standard Time"), + resource.TestCheckResourceAttr(resourceName, "description", "This is an automation schedule"), + ) +} + +func testAccAzureRMAutomationSchedule_recurring_basic(rInt int, location, frequency string, interval int) string { + return fmt.Sprintf(` +%s + +resource "azurerm_automation_schedule" "test" { + name = "acctestAS-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + automation_account_name = "${azurerm_automation_account.test.name}" + frequency = "%s" + interval = "%d" +} +`, testAccAzureRMAutomationSchedule_prerequisites(rInt, location), rInt, frequency, interval) +} + +func checkAccAzureRMAutomationSchedule_recurring_basic(resourceName string, frequency string, interval int) resource.TestCheckFunc { + return resource.ComposeAggregateTestCheckFunc( + testCheckAzureRMAutomationScheduleExists("azurerm_automation_schedule.test"), + resource.TestCheckResourceAttrSet(resourceName, "name"), + resource.TestCheckResourceAttrSet(resourceName, "resource_group_name"), + resource.TestCheckResourceAttrSet(resourceName, "automation_account_name"), + resource.TestCheckResourceAttrSet(resourceName, "start_time"), + resource.TestCheckResourceAttr(resourceName, "frequency", frequency), + resource.TestCheckResourceAttr(resourceName, "interval", strconv.Itoa(interval)), + resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), + ) } diff --git a/examples/automation-account/main.tf b/examples/automation-account/main.tf index 2940c9363293..f1a2ee4ae7d1 100644 --- a/examples/automation-account/main.tf +++ b/examples/automation-account/main.tf @@ -19,7 +19,6 @@ resource "azurerm_automation_schedule" "one-time" { resource_group_name = "${azurerm_resource_group.rg.name}" automation_account_name = "${azurerm_automation_account.account.name}" frequency = "OneTime" - timezone = "UTC+10" //defaults start_time to now + 7 min } From d4d30c393141b867d1f563108cf48a5cd92865cb Mon Sep 17 00:00:00 2001 From: Damien Caro Date: Thu, 14 Jun 2018 23:11:59 -0700 Subject: [PATCH 287/320] added dependency on public_ip for the vnet_gateway for the vpnClientConfig --- azurerm/resource_arm_virtual_network_gateway_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_virtual_network_gateway_test.go b/azurerm/resource_arm_virtual_network_gateway_test.go index 2b773cb0bda2..4ebf856c35f3 100644 --- a/azurerm/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/resource_arm_virtual_network_gateway_test.go @@ -338,7 +338,7 @@ resource "azurerm_public_ip" "second" { } resource "azurerm_virtual_network_gateway" "test" { - depends_on = ["azurerm_public_ip.first", "azurerm_public_ip.second"] + depends_on = ["azurerm_public_ip.first", "azurerm_public_ip.second"] name = "acctestvng-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" @@ -403,6 +403,7 @@ resource "azurerm_public_ip" "test" { } resource "azurerm_virtual_network_gateway" "test" { + depends_on = ["azurerm_public_ip.test"] name = "acctestvng-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" From 13428fadb3c9472656cc4b0de8e386aa4fce8a17 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 14 Jun 2018 23:56:30 -0700 Subject: [PATCH 288/320] Update CHANGELOG.md to include #946 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f365798e95c..cdee4d1373fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ BUG FIXES: * `azurerm_storage_account` - file and blob encryption is now explicity `true` by default [GH-1380] * `azurerm_servicebus_namespace` - the `capacity` propety no longer unnecessarily forces a new resource when changed [GH-1382] * `azurerm_virtual_machine_scale_set` - the field `overprovision` is now `true` by default [GH-1322] +* `azurerm_virtual_network_gateway` - adding the properties `vpn_client_protocols`, `radius_server_address` and `radius_server_secret` [GH-946] * `azurerm_app_service_plan` - the `name` property validation now allows understores [GH-1351] FEATURES: From 3ef04d6a5b6b3c13a265dbe99cc2d7e4134a1156 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 15 Jun 2018 00:11:37 -0700 Subject: [PATCH 289/320] automation: updates to make tests pass --- azurerm/resource_arm_automation_credential.go | 2 +- azurerm/resource_arm_automation_credential_test.go | 14 ++++++++------ azurerm/resource_arm_automation_runbook_test.go | 14 ++++++++------ azurerm/resource_arm_automation_schedule.go | 9 +++------ 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/azurerm/resource_arm_automation_credential.go b/azurerm/resource_arm_automation_credential.go index 6ab5e6e33e63..3767bef02fdd 100644 --- a/azurerm/resource_arm_automation_credential.go +++ b/azurerm/resource_arm_automation_credential.go @@ -92,7 +92,7 @@ func resourceArmAutomationCredentialCreateUpdate(d *schema.ResourceData, meta in d.SetId(*read.ID) - return resourceArmAutomationAccountRead(d, meta) + return resourceArmAutomationCredentialRead(d, meta) } func resourceArmAutomationCredentialRead(d *schema.ResourceData, meta interface{}) error { diff --git a/azurerm/resource_arm_automation_credential_test.go b/azurerm/resource_arm_automation_credential_test.go index 9417e21ccdde..6ffb7ac94665 100644 --- a/azurerm/resource_arm_automation_credential_test.go +++ b/azurerm/resource_arm_automation_credential_test.go @@ -27,9 +27,10 @@ func TestAccAzureRMAutomationCredential_basic(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"password"}, }, }, }) @@ -53,9 +54,10 @@ func TestAccAzureRMAutomationCredential_complete(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"password"}, }, }, }) diff --git a/azurerm/resource_arm_automation_runbook_test.go b/azurerm/resource_arm_automation_runbook_test.go index 85b511fd2f3e..27686417f540 100644 --- a/azurerm/resource_arm_automation_runbook_test.go +++ b/azurerm/resource_arm_automation_runbook_test.go @@ -27,9 +27,10 @@ func TestAccAzureRMAutomationRunbook_PSWorkflow(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"publish_content_link"}, }, }, }) @@ -52,9 +53,10 @@ func TestAccAzureRMAutomationRunbook_PSWorkflowWithHash(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"publish_content_link"}, }, }, }) diff --git a/azurerm/resource_arm_automation_schedule.go b/azurerm/resource_arm_automation_schedule.go index de3d1ff06442..4ea080af20e9 100644 --- a/azurerm/resource_arm_automation_schedule.go +++ b/azurerm/resource_arm_automation_schedule.go @@ -12,6 +12,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" + "regexp" "strings" ) @@ -31,10 +32,10 @@ func resourceArmAutomationSchedule() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - /*ValidateFunc: validation.StringMatch( + ValidateFunc: validation.StringMatch( regexp.MustCompile(`^[^<>*%&:\\?.+/]{0,127}[^<>*%&:\\?.+/\s]$`), `The name length must be from 1 to 128 characters. The name cannot contain special characters < > * % & : \ ? . + / and cannot end with a whitespace character.`, - ),*/ + ), }, "resource_group_name": resourceGroupNameSchema(), @@ -124,19 +125,15 @@ func resourceArmAutomationSchedule() *schema.Resource { //if automation_account_name changed or account_name changed to or from nil force a new resource //remove once we remove the deprecated property - //if diff.HasChange("automation_account_name") { oAan, nAan := diff.GetChange("automation_account_name") if oAan != "" && nAan != "" { diff.ForceNew("automation_account_name") } - //} - //if diff.HasChange("account_name") { oAn, nAn := diff.GetChange("account_name") if oAn != "" && nAn != "" { diff.ForceNew("account_name") } - //} return nil }, From f287c40e97e14ff896ee0d26efbdba1265e6ee9a Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 15 Jun 2018 12:01:04 -0700 Subject: [PATCH 290/320] automation schedule: final PR updates --- azurerm/helpers/validate/time.go | 3 ++- azurerm/resource_arm_automation_account.go | 2 +- azurerm/resource_arm_automation_schedule.go | 4 ++-- .../docs/r/automation_schedule.html.markdown | 22 +++++++++---------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/azurerm/helpers/validate/time.go b/azurerm/helpers/validate/time.go index cc435532e73d..b45b6266ca06 100644 --- a/azurerm/helpers/validate/time.go +++ b/azurerm/helpers/validate/time.go @@ -8,7 +8,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" ) -//todo, now in terraform helper, switch over once vended, +//todo, now in terraform helper, switch over once vended +// -> https://github.com/hashicorp/terraform/blob/master/helper/validation/validation.go#L263 func Rfc3339Time(i interface{}, k string) (_ []string, errors []error) { v, ok := i.(string) if !ok { diff --git a/azurerm/resource_arm_automation_account.go b/azurerm/resource_arm_automation_account.go index 22e648848409..52ad4c512ff3 100644 --- a/azurerm/resource_arm_automation_account.go +++ b/azurerm/resource_arm_automation_account.go @@ -29,7 +29,7 @@ func resourceArmAutomationAccount() *schema.Resource { ForceNew: true, ValidateFunc: validation.StringMatch( //todo this will not allow single character names, even thou they are valid - regexp.MustCompile(`^[0-9a-zA-Z][-0-9a-zA-Z]{0,48}[0-9a-zA-Z]$`), + regexp.MustCompile(`^[0-9a-zA-Z]([-0-9a-zA-Z]{0,48}[0-9a-zA-Z])?$`), `The account name must not be empty, and must not exceed 50 characters in length. The account name must start with a letter or number. The account name can contain letters, numbers, and dashes. The final character must be a letter or a number.`, ), }, diff --git a/azurerm/resource_arm_automation_schedule.go b/azurerm/resource_arm_automation_schedule.go index 4ea080af20e9..47d941657201 100644 --- a/azurerm/resource_arm_automation_schedule.go +++ b/azurerm/resource_arm_automation_schedule.go @@ -3,6 +3,8 @@ package azurerm import ( "fmt" "log" + "regexp" + "strings" "time" "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation" @@ -12,8 +14,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" - "regexp" - "strings" ) func resourceArmAutomationSchedule() *schema.Resource { diff --git a/website/docs/r/automation_schedule.html.markdown b/website/docs/r/automation_schedule.html.markdown index 2ce5b13ddbb9..2314c853735b 100644 --- a/website/docs/r/automation_schedule.html.markdown +++ b/website/docs/r/automation_schedule.html.markdown @@ -8,18 +8,18 @@ description: |- # azurerm_automation_schedule -Manages a new Automation Schedule. +Manages a Automation Schedule. ## Example Usage ```hcl resource "azurerm_resource_group" "example" { - name = "resourceGroup1" + name = "tfex-automation-account" location = "West Europe" } resource "azurerm_automation_account" "example" { - name = "account1" + name = "tfex-automation-account" location = "${azurerm_resource_group.example.location}" resource_group_name = "${azurerm_resource_group.example.name}" sku { @@ -28,14 +28,14 @@ resource "azurerm_automation_account" "example" { } resource "azurerm_automation_schedule" "example" { - name = "schedule1" - resource_group_name = "${azurerm_resource_group.example.name}" - account_name = "${azurerm_automation_account.example.name}" - frequency = "Hour" - interval = 1 - timezone = "Central Europe Standard Time" - start_time = "2014-04-15T18:00:15+02:00" - description = "This is an example schedule" + name = "tfex-automation-schedule" + resource_group_name = "${azurerm_resource_group.example.name}" + automation_account_name = "${azurerm_automation_account.example.name}" + frequency = "Hour" + interval = 1 + timezone = "Central Europe Standard Time" + start_time = "2014-04-15T18:00:15+02:00" + description = "This is an example schedule" } ``` From 600ae5251cdb8d3118d0832ab5940f04671e5222 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 15 Jun 2018 12:04:43 -0700 Subject: [PATCH 291/320] mass docs update: remove a stray new --- website/docs/r/application_gateway.html.markdown | 4 ++-- website/docs/r/automation_account.html.markdown | 4 ++-- website/docs/r/automation_credential.html.markdown | 4 ++-- website/docs/r/automation_runbook.html.markdown | 4 ++-- website/docs/r/automation_schedule.html.markdown | 4 ++-- website/docs/r/cosmosdb_account.html.markdown | 4 ++-- website/docs/r/eventhub.html.markdown | 4 ++-- website/docs/r/eventhub_authorization_rule.html.markdown | 4 ++-- website/docs/r/eventhub_consumer_group.html.markdown | 4 ++-- website/docs/r/iothub.html.markdown | 4 ++-- website/docs/r/local_network_gateway.html.markdown | 4 ++-- website/docs/r/log_analytics_solution.html.markdown | 4 ++-- website/docs/r/log_analytics_workspace.html.markdown | 4 ++-- website/docs/r/resource_group.html.markdown | 4 ++-- .../docs/r/servicebus_topic_authorization_rule.html.markdown | 4 ++-- website/docs/r/virtual_machine_extension.html.markdown | 4 ++-- website/docs/r/virtual_network.html.markdown | 4 ++-- website/docs/r/virtual_network_gateway.html.markdown | 4 ++-- .../docs/r/virtual_network_gateway_connection.html.markdown | 4 ++-- website/docs/r/virtual_network_peering.html.markdown | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/website/docs/r/application_gateway.html.markdown b/website/docs/r/application_gateway.html.markdown index f1ffe196dcc8..fda4505642df 100644 --- a/website/docs/r/application_gateway.html.markdown +++ b/website/docs/r/application_gateway.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azure_application_gateway" sidebar_current: "docs-azurerm-resource-application-gateway" description: |- - Manages a new application gateway based on a previously created virtual network with configured subnets. + Manages a application gateway based on a previously created virtual network with configured subnets. --- # azurerm_application_gateway -Manages a new application gateway based on a previously created virtual network with configured subnets. +Manages a application gateway based on a previously created virtual network with configured subnets. ## Example Usage diff --git a/website/docs/r/automation_account.html.markdown b/website/docs/r/automation_account.html.markdown index 604ff51846b8..7e64e472290a 100644 --- a/website/docs/r/automation_account.html.markdown +++ b/website/docs/r/automation_account.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_automation_account" sidebar_current: "docs-azurerm-resource-automation-account" description: |- - Manages a new Automation Account. + Manages a Automation Account. --- # azurerm_automation_account -Manages a new Automation Account. +Manages a Automation Account. ## Example Usage diff --git a/website/docs/r/automation_credential.html.markdown b/website/docs/r/automation_credential.html.markdown index f7902e93e184..e1811c13731b 100644 --- a/website/docs/r/automation_credential.html.markdown +++ b/website/docs/r/automation_credential.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_automation_credential" sidebar_current: "docs-azurerm-resource-automation-credential" description: |- - Manages a new Automation Credential. + Manages a Automation Credential. --- # azurerm_automation_credential -Manages a new Automation Credential. +Manages a Automation Credential. ## Example Usage diff --git a/website/docs/r/automation_runbook.html.markdown b/website/docs/r/automation_runbook.html.markdown index 1af8f53649dc..4ee9e8d512a4 100644 --- a/website/docs/r/automation_runbook.html.markdown +++ b/website/docs/r/automation_runbook.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_automation_runbook" sidebar_current: "docs-azurerm-resource-automation-runbook" description: |- - Manages a new Automation Runbook. + Manages a Automation Runbook. --- # azurerm_automation_runbook -Manages a new Automation Runbook. +Manages a Automation Runbook. ## Example Usage diff --git a/website/docs/r/automation_schedule.html.markdown b/website/docs/r/automation_schedule.html.markdown index c28edbcd30a0..3806d3032d4a 100644 --- a/website/docs/r/automation_schedule.html.markdown +++ b/website/docs/r/automation_schedule.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_automation_schedule" sidebar_current: "docs-azurerm-resource-automation-schedule" description: |- - Manages a new Automation Schedule. + Manages a Automation Schedule. --- # azurerm_automation_schedule -Manages a new Automation Schedule. +Manages a Automation Schedule. ## Example Usage diff --git a/website/docs/r/cosmosdb_account.html.markdown b/website/docs/r/cosmosdb_account.html.markdown index d4bbe12949a1..fc2d411393e1 100644 --- a/website/docs/r/cosmosdb_account.html.markdown +++ b/website/docs/r/cosmosdb_account.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_cosmosdb_account" sidebar_current: "docs-azurerm-resource-cosmosdb-account" description: |- - Manages a new CosmosDB (formally DocumentDB) Account. + Manages a CosmosDB (formally DocumentDB) Account. --- # azurerm_cosmos_db_account -Manages a new CosmosDB (formally DocumentDB) Account. +Manages a CosmosDB (formally DocumentDB) Account. ## Example Usage diff --git a/website/docs/r/eventhub.html.markdown b/website/docs/r/eventhub.html.markdown index 6ef9fae9ee48..e8d1ed16b1ec 100644 --- a/website/docs/r/eventhub.html.markdown +++ b/website/docs/r/eventhub.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_eventhub" sidebar_current: "docs-azurerm-resource-eventhub" description: |- - Manages a new Event Hubs as a nested resource within an Event Hubs namespace. + Manages a Event Hubs as a nested resource within an Event Hubs namespace. --- # azurerm_eventhub -Manages a new Event Hubs as a nested resource within a Event Hubs namespace. +Manages a Event Hubs as a nested resource within a Event Hubs namespace. ## Example Usage diff --git a/website/docs/r/eventhub_authorization_rule.html.markdown b/website/docs/r/eventhub_authorization_rule.html.markdown index 63b292b09c9c..20e1f2a0878b 100644 --- a/website/docs/r/eventhub_authorization_rule.html.markdown +++ b/website/docs/r/eventhub_authorization_rule.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_eventhub_authorization_rule" sidebar_current: "docs-azurerm-resource-eventhub-authorization-rule" description: |- - Manages a new Event Hubs authorization Rule within an Event Hub. + Manages a Event Hubs authorization Rule within an Event Hub. --- # azurerm_eventhub_authorization_rule -Manages a new Event Hubs authorization Rule within an Event Hub. +Manages a Event Hubs authorization Rule within an Event Hub. ## Example Usage diff --git a/website/docs/r/eventhub_consumer_group.html.markdown b/website/docs/r/eventhub_consumer_group.html.markdown index 24a07289dd92..2e0f1dc0c50c 100644 --- a/website/docs/r/eventhub_consumer_group.html.markdown +++ b/website/docs/r/eventhub_consumer_group.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_eventhub_consumer_group" sidebar_current: "docs-azurerm-resource-eventhub-consumer-group" description: |- - Manages a new Event Hubs Consumer Group as a nested resource within an Event Hub. + Manages a Event Hubs Consumer Group as a nested resource within an Event Hub. --- # azurerm_eventhub_consumer_group -Manages a new Event Hubs Consumer Group as a nested resource within an Event Hub. +Manages a Event Hubs Consumer Group as a nested resource within an Event Hub. ## Example Usage diff --git a/website/docs/r/iothub.html.markdown b/website/docs/r/iothub.html.markdown index 729267da036c..bb21f9b64bee 100644 --- a/website/docs/r/iothub.html.markdown +++ b/website/docs/r/iothub.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_iothub" sidebar_current: "docs-azurerm-resource-iothub" description: |- - Manages a new IotHub resource + Manages a IotHub resource --- # azurerm_iothub -Manages a new IotHub +Manages a IotHub ## Example Usage diff --git a/website/docs/r/local_network_gateway.html.markdown b/website/docs/r/local_network_gateway.html.markdown index cddaa69c2da2..96922c091192 100644 --- a/website/docs/r/local_network_gateway.html.markdown +++ b/website/docs/r/local_network_gateway.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_local_network_gateway" sidebar_current: "docs-azurerm-resource-network-local-network-gateway" description: |- - Manages a new local network gateway connection over which specific connections can be configured. + Manages a local network gateway connection over which specific connections can be configured. --- # azurerm_local_network_gateway -Manages a new local network gateway connection over which specific connections can be configured. +Manages a local network gateway connection over which specific connections can be configured. ## Example Usage diff --git a/website/docs/r/log_analytics_solution.html.markdown b/website/docs/r/log_analytics_solution.html.markdown index 12266c4b4bd9..4f3444188389 100644 --- a/website/docs/r/log_analytics_solution.html.markdown +++ b/website/docs/r/log_analytics_solution.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_log_analytics_solution" sidebar_current: "docs-azurerm-resource-oms-log-analytics-solution" description: |- - Manages a new Log Analytics (formally Operational Insights) Solution. + Manages a Log Analytics (formally Operational Insights) Solution. --- # azurerm_log_analytics_solution -Manages a new Log Analytics (formally Operational Insights) Solution. +Manages a Log Analytics (formally Operational Insights) Solution. ## Example Usage diff --git a/website/docs/r/log_analytics_workspace.html.markdown b/website/docs/r/log_analytics_workspace.html.markdown index 4cf7d0d198e8..602b88dc395e 100644 --- a/website/docs/r/log_analytics_workspace.html.markdown +++ b/website/docs/r/log_analytics_workspace.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_log_analytics_workspace" sidebar_current: "docs-azurerm-resource-oms-log-analytics-workspace" description: |- - Manages a new Log Analytics (formally Operational Insights) Workspace. + Manages a Log Analytics (formally Operational Insights) Workspace. --- # azurerm_log_analytics_workspace -Manages a new Log Analytics (formally Operational Insights) Workspace. +Manages a Log Analytics (formally Operational Insights) Workspace. ## Example Usage diff --git a/website/docs/r/resource_group.html.markdown b/website/docs/r/resource_group.html.markdown index a4d49cd98eeb..32375ee7133c 100644 --- a/website/docs/r/resource_group.html.markdown +++ b/website/docs/r/resource_group.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_resource_group" sidebar_current: "docs-azurerm-resource-resource-group" description: |- - Manages a new resource group on Azure. + Manages a resource group on Azure. --- # azurerm_resource_group -Manages a new resource group on Azure. +Manages a resource group on Azure. ## Example Usage diff --git a/website/docs/r/servicebus_topic_authorization_rule.html.markdown b/website/docs/r/servicebus_topic_authorization_rule.html.markdown index 3d109d073f02..a1ee01dcec70 100644 --- a/website/docs/r/servicebus_topic_authorization_rule.html.markdown +++ b/website/docs/r/servicebus_topic_authorization_rule.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_servicebus_topic_authorization_rule" sidebar_current: "docs-azurerm-resource-servicebus-topic-authorization-rule" description: |- - Manages a new ServiceBus Topic authorization Rule within a ServiceBus Topic. + Manages a ServiceBus Topic authorization Rule within a ServiceBus Topic. --- # azurerm_servicebus_topic_authorization_rule -Manages a new ServiceBus Topic authorization Rule within a ServiceBus Topic. +Manages a ServiceBus Topic authorization Rule within a ServiceBus Topic. ## Example Usage diff --git a/website/docs/r/virtual_machine_extension.html.markdown b/website/docs/r/virtual_machine_extension.html.markdown index 3e7bb7064d02..ff0c7f081274 100644 --- a/website/docs/r/virtual_machine_extension.html.markdown +++ b/website/docs/r/virtual_machine_extension.html.markdown @@ -3,13 +3,13 @@ layout: "azurerm" page_title: "Azure Resource Manager: azure_virtual_machine_extension" sidebar_current: "docs-azurerm-resource-compute-virtualmachine-extension" description: |- - Manages a new Virtual Machine Extension to provide post deployment + Manages a Virtual Machine Extension to provide post deployment configuration and run automated tasks. --- # azurerm_virtual_machine_extension -Manages a new Virtual Machine Extension to provide post deployment configuration +Manages a Virtual Machine Extension to provide post deployment configuration and run automated tasks. ~> **Please Note:** The CustomScript extensions for Linux & Windows require that the `commandToExecute` returns a `0` exit code to be classified as successfully deployed. You can achieve this by appending `exit 0` to the end of your `commandToExecute`. diff --git a/website/docs/r/virtual_network.html.markdown b/website/docs/r/virtual_network.html.markdown index e66e082930a4..151d12c761ee 100644 --- a/website/docs/r/virtual_network.html.markdown +++ b/website/docs/r/virtual_network.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azure_virtual_network" sidebar_current: "docs-azurerm-resource-network-virtual-network" description: |- - Manages a new virtual network including any configured subnets. Each subnet can optionally be configured with a security group to be associated with the subnet. + Manages a virtual network including any configured subnets. Each subnet can optionally be configured with a security group to be associated with the subnet. --- # azurerm_virtual_network -Manages a new virtual network including any configured subnets. Each subnet can +Manages a virtual network including any configured subnets. Each subnet can optionally be configured with a security group to be associated with the subnet. ~> **NOTE on Virtual Networks and Subnet's:** Terraform currently diff --git a/website/docs/r/virtual_network_gateway.html.markdown b/website/docs/r/virtual_network_gateway.html.markdown index bbb306f1c3bf..6e81076894b2 100644 --- a/website/docs/r/virtual_network_gateway.html.markdown +++ b/website/docs/r/virtual_network_gateway.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azure_virtual_network_gateway" sidebar_current: "docs-azurerm-resource-network-virtual-network-gateway-x" description: |- - Manages a new virtual network gateway to establish secure, cross-premises connectivity. + Manages a virtual network gateway to establish secure, cross-premises connectivity. --- # azurerm_virtual_network_gateway -Manages a new Virtual Network Gateway to establish secure, cross-premises connectivity. +Manages a Virtual Network Gateway to establish secure, cross-premises connectivity. -> **Note:** Please be aware that provisioning a Virtual Network Gateway takes a long time (between 30 minutes and 1 hour) diff --git a/website/docs/r/virtual_network_gateway_connection.html.markdown b/website/docs/r/virtual_network_gateway_connection.html.markdown index 9d5e9c28feb4..923ae0a1460a 100644 --- a/website/docs/r/virtual_network_gateway_connection.html.markdown +++ b/website/docs/r/virtual_network_gateway_connection.html.markdown @@ -3,12 +3,12 @@ layout: "azurerm" page_title: "Azure Resource Manager: azure_virtual_network_gateway_connection" sidebar_current: "docs-azurerm-resource-network-virtual-network-gateway-connection" description: |- - Manages a new connection in an existing Virtual Network Gateway. + Manages a connection in an existing Virtual Network Gateway. --- # azurerm_virtual_network_gateway_connection -Manages a new connection in an existing Virtual Network Gateway. +Manages a connection in an existing Virtual Network Gateway. ## Example Usage diff --git a/website/docs/r/virtual_network_peering.html.markdown b/website/docs/r/virtual_network_peering.html.markdown index b3bd11280701..46678eb138ac 100644 --- a/website/docs/r/virtual_network_peering.html.markdown +++ b/website/docs/r/virtual_network_peering.html.markdown @@ -3,13 +3,13 @@ layout: "azurerm" page_title: "Azure Resource Manager: azure_virtual_network_peering" sidebar_current: "docs-azurerm-resource-network-virtual-network-peering" description: |- - Manages a new virtual network peering which allows resources to access other + Manages a virtual network peering which allows resources to access other resources in the linked virtual network. --- # azurerm_virtual_network_peering -Manages a new virtual network peering which allows resources to access other +Manages a virtual network peering which allows resources to access other resources in the linked virtual network. ## Example Usage From 334e289a69359d0d51f35a77d05f09f5cdf93bff Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 15 Jun 2018 12:10:43 -0700 Subject: [PATCH 292/320] Update CHANGELOG.md to include #1384 --- CHANGELOG.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdee4d1373fe..88750d143d1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ UPGRADE NOTES: BUG FIXES: -* `azurerm_key_vault` - respectes the same proxy environment varibles terraform does and can now create the vault when behind a proxy [GH-1393] +* `azurerm_key_vault` - respecting the proxy environment varibles terraform does and now can create vaults when behind a proxy [GH-1393] * `azurerm_kubernetes_cluster` - `dns_prefix` is now required [GH-1333] * `azurerm_network_interface` - ensuring that Public IP's/Private IP Addresses can be removed once assigned [GH-1295] * `azurerm_public_ip` - setting the `domain_name_label` property into state [GH-1287] @@ -16,18 +16,16 @@ BUG FIXES: * `azurerm_virtual_network_gateway` - adding the properties `vpn_client_protocols`, `radius_server_address` and `radius_server_secret` [GH-946] * `azurerm_app_service_plan` - the `name` property validation now allows understores [GH-1351] -FEATURES: - -* `azurerm_virtual_machine` - support for `write_accelerator_enabled` property on Premium disks attached to MS-series machines [GH-964] - IMPROVEMENTS: +* `azurerm_automation_schedule` - adding the `interval` property and supporting recurring schedules [GH-1384] * `azurerm_dns_ns_record` - deprecated `record` properties in favor of a `records` list [GH-991] * `azurerm_function_app` - adding the `identity` property [GH-1369] * `azurerm_role_definition` - the `role_definition_id` property is now optional. The resource will now generate a random UUID if it is ommited [GH-1378] * `azurerm_storage_account` - adding the `network_rules` property [GH-1334] * `azurerm_storage_account` - adding the `identity` property [GH-1323] * `azurerm_storage_blob` - adding the `content_type` property [GH-1304] +* `azurerm_virtual_machine` - support for `write_accelerator_enabled` property on Premium disks attached to MS-series machines [GH-964] * `azurerm_virtual_machine_scale_set` - adding the `dns_settings` and `dns_servers` property [GH-1209] * `azurerm_virtual_machine_scale_set` - adding the `ip_forwarding` property [GH-1209] * dependencies: migrating to the un-deprecated Preview's for Container Instance, EventGrid, Log Analytics and SQL [GH-1322] From a78b2ea7f98c3a302ba76fd1275003a447e74ed6 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 12 Jun 2018 22:16:07 -0700 Subject: [PATCH 293/320] Properly set some sets --- azurerm/resource_arm_loadbalancer.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azurerm/resource_arm_loadbalancer.go b/azurerm/resource_arm_loadbalancer.go index 0ba7cf1759b5..c1228702b03e 100644 --- a/azurerm/resource_arm_loadbalancer.go +++ b/azurerm/resource_arm_loadbalancer.go @@ -334,21 +334,21 @@ func flattenLoadBalancerFrontendIpConfiguration(ipConfigs *[]network.FrontendIPC } if rules := props.LoadBalancingRules; rules != nil { - loadBalancingRules := make([]string, 0, len(*rules)) + loadBalancingRules := make([]interface{}, 0, len(*rules)) for _, rule := range *rules { loadBalancingRules = append(loadBalancingRules, *rule.ID) } - ipConfig["load_balancer_rules"] = loadBalancingRules + ipConfig["load_balancer_rules"] = schema.NewSet(schema.HashString, loadBalancingRules) } if rules := props.InboundNatRules; rules != nil { - inboundNatRules := make([]string, 0, len(*rules)) + inboundNatRules := make([]interface{}, 0, len(*rules)) for _, rule := range *rules { inboundNatRules = append(inboundNatRules, *rule.ID) } - ipConfig["inbound_nat_rules"] = inboundNatRules + ipConfig["inbound_nat_rules"] = schema.NewSet(schema.HashString, inboundNatRules) } } From 3811d70e2ac3dded7c57bdd0b39c69db14c456c0 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 15 Jun 2018 14:17:59 -0700 Subject: [PATCH 294/320] Add some validation helpers and ++validate azurerm_network_interface --- azurerm/helpers/validate/azure.go | 21 ++++ azurerm/helpers/validate/azure_test.go | 59 ++++++++++++ azurerm/helpers/validate/network.go | 34 +++++++ azurerm/helpers/validate/network_test.go | 95 +++++++++++++++++++ azurerm/helpers/validate/string.go | 19 ++++ azurerm/helpers/validate/string_test.go | 31 ++++++ azurerm/resource_arm_loadbalancer.go | 79 ++++++++------- azurerm/resource_arm_network_interface.go | 91 +++++++++++------- .../resource_arm_virtual_network_gateway.go | 7 +- 9 files changed, 367 insertions(+), 69 deletions(-) create mode 100644 azurerm/helpers/validate/azure.go create mode 100644 azurerm/helpers/validate/azure_test.go create mode 100644 azurerm/helpers/validate/network.go create mode 100644 azurerm/helpers/validate/network_test.go create mode 100644 azurerm/helpers/validate/string.go create mode 100644 azurerm/helpers/validate/string_test.go diff --git a/azurerm/helpers/validate/azure.go b/azurerm/helpers/validate/azure.go new file mode 100644 index 000000000000..6b3f5b75d97f --- /dev/null +++ b/azurerm/helpers/validate/azure.go @@ -0,0 +1,21 @@ +package validate + +import ( + "fmt" + "regexp" +) + +func AzureResourceId(i interface{}, k string) (_ []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + //todo, match subscription/{guid} and provider/name.name perhaps? + if matched := regexp.MustCompile(`(/subscriptions/)|(/providers/)`).Match([]byte(v)); !matched { + errors = append(errors, fmt.Errorf("azure resource ID %q should start with with '/subscriptions/{subscriptionId}' or '/providers/{resourceProviderNamespace}/'", k)) + } + + return +} diff --git a/azurerm/helpers/validate/azure_test.go b/azurerm/helpers/validate/azure_test.go new file mode 100644 index 000000000000..5ff5e9cde135 --- /dev/null +++ b/azurerm/helpers/validate/azure_test.go @@ -0,0 +1,59 @@ +package validate + +import "testing" + +func TestHelper_Validate_AzureResourceId(t *testing.T) { + cases := []struct { + Id string + Errors int + }{ + { + Id: "", + Errors: 1, + }, + { + Id: "nonsense", + Errors: 1, + }, + { + Id: "/slash", + Errors: 1, + }, + { + Id: "/path/to/nothing", + Errors: 1, + }, + { + Id: "/subscriptions", + Errors: 1, + }, + { + Id: "/providers", + Errors: 1, + }, + { + Id: "/subscriptions/not-a-guid", + Errors: 0, + }, + { + Id: "/providers/test", + Errors: 0, + }, + { + Id: "/subscriptions/00000000-0000-0000-0000-00000000000/", + Errors: 0, + }, + { + Id: "/providers/provider.name/", + Errors: 0, + }, + } + + for _, tc := range cases { + _, errors := AzureResourceId(tc.Id, "test") + + if len(errors) < tc.Errors { + t.Fatalf("Expected AzureResourceId to have an error for '%q'", tc.Id) + } + } +} diff --git a/azurerm/helpers/validate/network.go b/azurerm/helpers/validate/network.go new file mode 100644 index 000000000000..c16f93e93ad7 --- /dev/null +++ b/azurerm/helpers/validate/network.go @@ -0,0 +1,34 @@ +package validate + +import ( + "fmt" + "regexp" +) + +func Ip4Address(i interface{}, k string) (_ []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if matched := regexp.MustCompile(`((^[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$`).Match([]byte(v)); !matched { + errors = append(errors, fmt.Errorf("%q is not a valid IP4 address: '%q`", k, i)) + } + + return +} + +func MacAddress(i interface{}, k string) (_ []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if matched := regexp.MustCompile(`((^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$`).Match([]byte(v)); !matched { + errors = append(errors, fmt.Errorf("%q is not a valid MAC address: '%q`", k, i)) + } + + return +} diff --git a/azurerm/helpers/validate/network_test.go b/azurerm/helpers/validate/network_test.go new file mode 100644 index 000000000000..dd865cb371e3 --- /dev/null +++ b/azurerm/helpers/validate/network_test.go @@ -0,0 +1,95 @@ +package validate + +import "testing" + +func TestHelper_Validate_Ip4Address(t *testing.T) { + cases := []struct { + Ip string + Errors int + }{ + { + Ip: "", + Errors: 1, + }, + { + Ip: "000.000.000.000", + Errors: 1, + }, + { + Ip: "1.2.3.no", + Errors: 1, + }, + { + Ip: "text", + Errors: 1, + }, + { + Ip: "1.2.3.4", + Errors: 0, + }, + { + Ip: "12.34.43.21", + Errors: 0, + }, + { + Ip: "100.123.199.0", + Errors: 0, + }, + { + Ip: "255.255.255.255", + Errors: 0, + }, + } + + for _, tc := range cases { + _, errors := Ip4Address(tc.Ip, "test") + + if len(errors) < tc.Errors { + t.Fatalf("Expected AzureResourceId to have an error for '%q'", tc.Ip) + } + } +} + +func TestHelper_Validate_MacAddress(t *testing.T) { + cases := []struct { + Ip string + Errors int + }{ + { + Ip: "", + Errors: 1, + }, + { + Ip: "text", + Errors: 1, + }, + { + Ip: "12:34:no", + Errors: 1, + }, + { + Ip: "123:34:56:78:90:ab", + Errors: 1, + }, + { + Ip: "12:34:56:78:90:NO", + Errors: 1, + }, + { + Ip: "12:34:56:78:90:ab", + Errors: 0, + }, + { + Ip: "ab:cd:ef:AB:CD:EF", + Errors: 0, + }, + } + + for _, tc := range cases { + _, errors := Ip4Address(tc.Ip, "test") + + if len(errors) < tc.Errors { + t.Fatalf("Expected AzureResourceId to have an error for '%q'", tc.Ip) + } + } +} diff --git a/azurerm/helpers/validate/string.go b/azurerm/helpers/validate/string.go new file mode 100644 index 000000000000..8b1dc2040cd9 --- /dev/null +++ b/azurerm/helpers/validate/string.go @@ -0,0 +1,19 @@ +package validate + +import ( + "fmt" +) + +func StringNotEmpty(i interface{}, k string) (_ []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if len(v) == 0 { + errors = append(errors, fmt.Errorf("%q is an empty string", k)) + } + + return +} diff --git a/azurerm/helpers/validate/string_test.go b/azurerm/helpers/validate/string_test.go new file mode 100644 index 000000000000..014b63417c6f --- /dev/null +++ b/azurerm/helpers/validate/string_test.go @@ -0,0 +1,31 @@ +package validate + +import "testing" + +func TestHelper_Validate_StringNotEmpty(t *testing.T) { + cases := []struct { + String string + Errors int + }{ + { + String: "", + Errors: 1, + }, + { + String: "k", + Errors: 0, + }, + { + String: "a longer string", + Errors: 0, + }, + } + + for _, tc := range cases { + _, errors := StringNotEmpty(tc.String, "test") + + if len(errors) < tc.Errors { + t.Fatalf("Expected StringNotEmpty to have an error for '%q'", tc.String) + } + } +} diff --git a/azurerm/resource_arm_loadbalancer.go b/azurerm/resource_arm_loadbalancer.go index c1228702b03e..4fd1f04d38f0 100644 --- a/azurerm/resource_arm_loadbalancer.go +++ b/azurerm/resource_arm_loadbalancer.go @@ -10,6 +10,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -34,6 +36,18 @@ func resourceArmLoadBalancer() *schema.Resource { "resource_group_name": resourceGroupNameSchema(), + "sku": { + Type: schema.TypeString, + Optional: true, + Default: string(network.LoadBalancerSkuNameBasic), + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + string(network.LoadBalancerSkuNameBasic), + string(network.LoadBalancerSkuNameStandard), + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + "frontend_ip_configuration": { Type: schema.TypeList, Optional: true, @@ -41,49 +55,62 @@ func resourceArmLoadBalancer() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validate.StringNotEmpty, }, "subnet_id": { - Type: schema.TypeString, - Optional: true, - Computed: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validate.AzureResourceId, }, "private_ip_address": { - Type: schema.TypeString, - Optional: true, - Computed: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validate.AzureResourceId, }, "public_ip_address_id": { - Type: schema.TypeString, - Optional: true, - Computed: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validate.AzureResourceId, }, "private_ip_address_allocation": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: validateLoadBalancerPrivateIpAddressAllocation, + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validation.StringInSlice([]string{ + string(network.Dynamic), + string(network.Static), + }, true), StateFunc: ignoreCaseStateFunc, - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + DiffSuppressFunc: suppress.CaseDifference, }, "load_balancer_rules": { Type: schema.TypeSet, Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validate.StringNotEmpty, + }, + Set: schema.HashString, }, "inbound_nat_rules": { Type: schema.TypeSet, Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validate.StringNotEmpty, + }, + Set: schema.HashString, }, "zones": singleZonesSchema(), @@ -103,18 +130,6 @@ func resourceArmLoadBalancer() *schema.Resource { }, }, - "sku": { - Type: schema.TypeString, - Optional: true, - Default: string(network.LoadBalancerSkuNameBasic), - ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{ - string(network.LoadBalancerSkuNameBasic), - string(network.LoadBalancerSkuNameStandard), - }, true), - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, - }, - "tags": tagsSchema(), }, } diff --git a/azurerm/resource_arm_network_interface.go b/azurerm/resource_arm_network_interface.go index d4ab01c1f20d..141efc165ec1 100644 --- a/azurerm/resource_arm_network_interface.go +++ b/azurerm/resource_arm_network_interface.go @@ -8,6 +8,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,20 +34,23 @@ func resourceArmNetworkInterface() *schema.Resource { "resource_group_name": resourceGroupNameSchema(), "network_security_group_id": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ValidateFunc: validate.AzureResourceId, }, "mac_address": { - Type: schema.TypeString, - Optional: true, - Computed: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validate.MacAddress, }, "virtual_machine_id": { - Type: schema.TypeString, - Optional: true, - Computed: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validate.AzureResourceId, }, "ip_configuration": { @@ -55,14 +59,16 @@ func resourceArmNetworkInterface() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validate.StringNotEmpty, }, "subnet_id": { Type: schema.TypeString, Required: true, DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ValidateFunc: validate.AzureResourceId, }, "private_ip_address": { @@ -82,40 +88,53 @@ func resourceArmNetworkInterface() *schema.Resource { }, "public_ip_address_id": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ValidateFunc: validate.AzureResourceId, }, "application_gateway_backend_address_pools_ids": { Type: schema.TypeSet, Optional: true, Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validate.AzureResourceId, + }, + Set: schema.HashString, }, "load_balancer_backend_address_pools_ids": { Type: schema.TypeSet, Optional: true, Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validate.AzureResourceId, + }, + Set: schema.HashString, }, "load_balancer_inbound_nat_rules_ids": { Type: schema.TypeSet, Optional: true, Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validate.AzureResourceId, + }, + Set: schema.HashString, }, "application_security_group_ids": { Type: schema.TypeSet, Optional: true, Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validate.AzureResourceId, + }, + Set: schema.HashString, }, "primary": { @@ -131,28 +150,36 @@ func resourceArmNetworkInterface() *schema.Resource { Type: schema.TypeSet, Optional: true, Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validate.StringNotEmpty, + }, + Set: schema.HashString, }, "internal_dns_name_label": { - Type: schema.TypeString, - Optional: true, - Computed: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validate.StringNotEmpty, }, "applied_dns_servers": { Type: schema.TypeSet, Optional: true, Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validate.StringNotEmpty, + }, + Set: schema.HashString, }, "internal_fqdn": { - Type: schema.TypeString, - Optional: true, - Computed: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validate.StringNotEmpty, }, /** @@ -366,6 +393,8 @@ func resourceArmNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e d.Set("internal_fqdn", props.DNSSettings.InternalFqdn) d.Set("internal_dns_name_label", props.DNSSettings.InternalDNSNameLabel) } + d.Set("applied_dns_servers", appliedDNSServers) + d.Set("dns_servers", dnsServers) if nsg := props.NetworkSecurityGroup; nsg != nil { d.Set("network_security_group_id", nsg.ID) @@ -379,8 +408,6 @@ func resourceArmNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e d.Set("location", azureRMNormalizeLocation(*location)) } - d.Set("applied_dns_servers", appliedDNSServers) - d.Set("dns_servers", dnsServers) d.Set("enable_ip_forwarding", resp.EnableIPForwarding) d.Set("enable_accelerated_networking", resp.EnableAcceleratedNetworking) diff --git a/azurerm/resource_arm_virtual_network_gateway.go b/azurerm/resource_arm_virtual_network_gateway.go index cae1d416d3ab..21f798523321 100644 --- a/azurerm/resource_arm_virtual_network_gateway.go +++ b/azurerm/resource_arm_virtual_network_gateway.go @@ -4,13 +4,13 @@ import ( "bytes" "fmt" "log" - "regexp" "strings" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -202,10 +202,7 @@ func resourceArmVirtualNetworkGateway() *schema.Resource { "vpn_client_configuration.0.root_certificate", "vpn_client_configuration.0.revoked_certificate", }, - ValidateFunc: validation.StringMatch( - regexp.MustCompile("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"), - "The radius server address must be a valid IPv4 address", - ), + ValidateFunc: validate.Ip4Address, }, "radius_server_secret": { Type: schema.TypeString, From ae34758632c201dc9999d234e5237ae4bc740ab1 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Sat, 16 Jun 2018 00:28:34 +0000 Subject: [PATCH 295/320] v1.7.0 --- CHANGELOG.md | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88750d143d1a..f313db72788c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,36 +1,36 @@ -## 1.7.0 (Unreleased) +## 1.7.0 (June 16, 2018) UPGRADE NOTES: -~> **Please Note:** The field `overprovision` on the `azurerm_virtual_machine_scale_set` resource has changed from `false` to `true` to match the behaviour of Azure in this release. [GH-1322] +~> **Please Note:** The field `overprovision` on the `azurerm_virtual_machine_scale_set` resource has changed from `false` to `true` to match the behaviour of Azure in this release. ([#1322](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1322)) BUG FIXES: -* `azurerm_key_vault` - respecting the proxy environment varibles terraform does and now can create vaults when behind a proxy [GH-1393] -* `azurerm_kubernetes_cluster` - `dns_prefix` is now required [GH-1333] -* `azurerm_network_interface` - ensuring that Public IP's/Private IP Addresses can be removed once assigned [GH-1295] -* `azurerm_public_ip` - setting the `domain_name_label` property into state [GH-1287] -* `azurerm_storage_account` - file and blob encryption is now explicity `true` by default [GH-1380] -* `azurerm_servicebus_namespace` - the `capacity` propety no longer unnecessarily forces a new resource when changed [GH-1382] -* `azurerm_virtual_machine_scale_set` - the field `overprovision` is now `true` by default [GH-1322] -* `azurerm_virtual_network_gateway` - adding the properties `vpn_client_protocols`, `radius_server_address` and `radius_server_secret` [GH-946] -* `azurerm_app_service_plan` - the `name` property validation now allows understores [GH-1351] +* `azurerm_key_vault` - respecting the proxy environment varibles terraform does and now can create vaults when behind a proxy ([#1393](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1393)) +* `azurerm_kubernetes_cluster` - `dns_prefix` is now required ([#1333](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1333)) +* `azurerm_network_interface` - ensuring that Public IP's/Private IP Addresses can be removed once assigned ([#1295](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1295)) +* `azurerm_public_ip` - setting the `domain_name_label` property into state ([#1287](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1287)) +* `azurerm_storage_account` - file and blob encryption is now explicity `true` by default ([#1380](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1380)) +* `azurerm_servicebus_namespace` - the `capacity` propety no longer unnecessarily forces a new resource when changed ([#1382](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1382)) +* `azurerm_virtual_machine_scale_set` - the field `overprovision` is now `true` by default ([#1322](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1322)) +* `azurerm_virtual_network_gateway` - adding the properties `vpn_client_protocols`, `radius_server_address` and `radius_server_secret` ([#946](https://github.com/terraform-providers/terraform-provider-azurerm/issues/946)) +* `azurerm_app_service_plan` - the `name` property validation now allows understores ([#1351](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1351)) IMPROVEMENTS: -* `azurerm_automation_schedule` - adding the `interval` property and supporting recurring schedules [GH-1384] -* `azurerm_dns_ns_record` - deprecated `record` properties in favor of a `records` list [GH-991] -* `azurerm_function_app` - adding the `identity` property [GH-1369] -* `azurerm_role_definition` - the `role_definition_id` property is now optional. The resource will now generate a random UUID if it is ommited [GH-1378] -* `azurerm_storage_account` - adding the `network_rules` property [GH-1334] -* `azurerm_storage_account` - adding the `identity` property [GH-1323] -* `azurerm_storage_blob` - adding the `content_type` property [GH-1304] -* `azurerm_virtual_machine` - support for `write_accelerator_enabled` property on Premium disks attached to MS-series machines [GH-964] -* `azurerm_virtual_machine_scale_set` - adding the `dns_settings` and `dns_servers` property [GH-1209] -* `azurerm_virtual_machine_scale_set` - adding the `ip_forwarding` property [GH-1209] -* dependencies: migrating to the un-deprecated Preview's for Container Instance, EventGrid, Log Analytics and SQL [GH-1322] -* dependencies: upgrading to `2018-01-01` of the EventGrid API [GH-1322] -* dependencies: upgrading to `2018-03-01` of the Monitor API [GH-1322] +* `azurerm_automation_schedule` - adding the `interval` property and supporting recurring schedules ([#1384](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1384)) +* `azurerm_dns_ns_record` - deprecated `record` properties in favor of a `records` list ([#991](https://github.com/terraform-providers/terraform-provider-azurerm/issues/991)) +* `azurerm_function_app` - adding the `identity` property ([#1369](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1369)) +* `azurerm_role_definition` - the `role_definition_id` property is now optional. The resource will now generate a random UUID if it is ommited ([#1378](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1378)) +* `azurerm_storage_account` - adding the `network_rules` property ([#1334](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1334)) +* `azurerm_storage_account` - adding the `identity` property ([#1323](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1323)) +* `azurerm_storage_blob` - adding the `content_type` property ([#1304](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1304)) +* `azurerm_virtual_machine` - support for `write_accelerator_enabled` property on Premium disks attached to MS-series machines ([#964](https://github.com/terraform-providers/terraform-provider-azurerm/issues/964)) +* `azurerm_virtual_machine_scale_set` - adding the `dns_settings` and `dns_servers` property ([#1209](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1209)) +* `azurerm_virtual_machine_scale_set` - adding the `ip_forwarding` property ([#1209](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1209)) +* dependencies: migrating to the un-deprecated Preview's for Container Instance, EventGrid, Log Analytics and SQL ([#1322](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1322)) +* dependencies: upgrading to `2018-01-01` of the EventGrid API ([#1322](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1322)) +* dependencies: upgrading to `2018-03-01` of the Monitor API ([#1322](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1322)) ## 1.6.0 (May 24, 2018) @@ -185,7 +185,7 @@ IMPROVEMENTS: * `azurerm_app_service` - allow changing `client_affinity_enabled` without requiring a resource recreation ([#993](https://github.com/terraform-providers/terraform-provider-azurerm/issues/993)) * `azurerm_app_service` - support for configuring `LocalSCM` source control ([#826](https://github.com/terraform-providers/terraform-provider-azurerm/issues/826)) * `azurerm_app_service` - returning a clearer error message when the name (which needs to be globally unique) is in use ([#1037](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1037)) -* `azurerm_cosmosdb_account` - increasing the maximum value for `max_interval_in_seconds` from 100s to 86400s (1 day) [[#1000](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1000)] +* `azurerm_cosmosdb_account` - increasing the maximum value for `max_interval_in_seconds` from 100s to 86400s (1 day) ([#1000](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1000)) * `azurerm_function_app` - returning a clearer error message when the name (which needs to be globally unique) is in use ([#1037](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1037)) * `azurerm_network_interface` - support for attaching to Application Gateways ([#1027](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1027)) * `azurerm_traffic_manager_endpoint` - adding support for `geo_mappings` ([#986](https://github.com/terraform-providers/terraform-provider-azurerm/issues/986)) From f8f441e4f72fe4c51ade9e8dd96be813fe78b8d5 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Sat, 16 Jun 2018 00:33:59 +0000 Subject: [PATCH 296/320] Cleanup after v1.7.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f313db72788c..6f342bd30f8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 1.8.0 (Unreleased) ## 1.7.0 (June 16, 2018) UPGRADE NOTES: From f184d1dba66ec9c2e9078a0517358e5703afda92 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 15 Jun 2018 17:39:18 -0700 Subject: [PATCH 297/320] Update CHANGELOG.md to fix a minor mistake --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f342bd30f8f..011d059b006a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,6 @@ BUG FIXES: * `azurerm_storage_account` - file and blob encryption is now explicity `true` by default ([#1380](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1380)) * `azurerm_servicebus_namespace` - the `capacity` propety no longer unnecessarily forces a new resource when changed ([#1382](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1382)) * `azurerm_virtual_machine_scale_set` - the field `overprovision` is now `true` by default ([#1322](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1322)) -* `azurerm_virtual_network_gateway` - adding the properties `vpn_client_protocols`, `radius_server_address` and `radius_server_secret` ([#946](https://github.com/terraform-providers/terraform-provider-azurerm/issues/946)) * `azurerm_app_service_plan` - the `name` property validation now allows understores ([#1351](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1351)) IMPROVEMENTS: @@ -29,6 +28,7 @@ IMPROVEMENTS: * `azurerm_virtual_machine` - support for `write_accelerator_enabled` property on Premium disks attached to MS-series machines ([#964](https://github.com/terraform-providers/terraform-provider-azurerm/issues/964)) * `azurerm_virtual_machine_scale_set` - adding the `dns_settings` and `dns_servers` property ([#1209](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1209)) * `azurerm_virtual_machine_scale_set` - adding the `ip_forwarding` property ([#1209](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1209)) +* `azurerm_virtual_network_gateway` - adding the properties `vpn_client_protocols`, `radius_server_address` and `radius_server_secret` ([#946](https://github.com/terraform-providers/terraform-provider-azurerm/issues/946)) * dependencies: migrating to the un-deprecated Preview's for Container Instance, EventGrid, Log Analytics and SQL ([#1322](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1322)) * dependencies: upgrading to `2018-01-01` of the EventGrid API ([#1322](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1322)) * dependencies: upgrading to `2018-03-01` of the Monitor API ([#1322](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1322)) From 477cf49bfd494d78e3077af23fe3eada2916e917 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 18 Jun 2018 00:57:27 -0700 Subject: [PATCH 298/320] normalize acctest resource group name: acctestrg -> acctestRG (#1399) * normalize acctest resource group name: acctestrg -> acctestRG * acctestRG_ -> acctestRG- --- azurerm/data_source_data_lake_store_test.go | 4 ++-- azurerm/data_source_dns_zone_test.go | 4 ++-- azurerm/data_source_image_test.go | 4 ++-- azurerm/data_source_public_ips_test.go | 6 ++--- azurerm/data_source_snapshot_test.go | 4 ++-- .../resource_arm_application_gateway_test.go | 12 +++++----- ...rce_arm_container_registry_migrate_test.go | 2 +- azurerm/resource_arm_data_lake_store_test.go | 8 +++---- azurerm/resource_arm_dns_a_record_test.go | 8 +++---- azurerm/resource_arm_dns_aaaa_record_test.go | 8 +++---- azurerm/resource_arm_dns_cname_record_test.go | 10 ++++---- azurerm/resource_arm_dns_mx_record_test.go | 8 +++---- azurerm/resource_arm_dns_ns_record_test.go | 18 +++++++------- azurerm/resource_arm_dns_ptr_record_test.go | 8 +++---- azurerm/resource_arm_dns_srv_record_test.go | 8 +++---- azurerm/resource_arm_dns_txt_record_test.go | 8 +++---- azurerm/resource_arm_dns_zone_test.go | 6 ++--- azurerm/resource_arm_eventhub_test.go | 2 +- ...xpress_route_circuit_authorization_test.go | 4 ++-- ..._arm_express_route_circuit_peering_test.go | 4 ++-- ...resource_arm_express_route_circuit_test.go | 4 ++-- ...resource_arm_key_vault_certificate_test.go | 6 ++--- ..._loadbalancer_backend_address_pool_test.go | 6 ++--- ...resource_arm_loadbalancer_nat_pool_test.go | 10 ++++---- ...resource_arm_loadbalancer_nat_rule_test.go | 12 +++++----- .../resource_arm_loadbalancer_probe_test.go | 14 +++++------ .../resource_arm_loadbalancer_rule_test.go | 16 ++++++------- azurerm/resource_arm_loadbalancer_test.go | 14 +++++------ .../resource_arm_network_interface_test.go | 2 +- azurerm/resource_arm_packet_capture_test.go | 2 +- .../resource_arm_policy_assignment_test.go | 4 ++-- azurerm/resource_arm_search_service_test.go | 4 ++-- azurerm/resource_arm_snapshot_test.go | 12 +++++----- .../resource_arm_sql_administrator_test.go | 4 ++-- azurerm/resource_arm_sql_database_test.go | 12 +++++----- .../resource_arm_sql_firewall_rule_test.go | 4 ++-- azurerm/resource_arm_sql_server_test.go | 6 ++--- ...ource_arm_sql_virtual_network_rule_test.go | 14 +++++------ azurerm/resource_arm_storage_share_test.go | 2 +- ...ource_arm_traffic_manager_endpoint_test.go | 4 ++-- ...urce_arm_virtual_machine_extension_test.go | 8 +++---- ...urce_arm_virtual_machine_scale_set_test.go | 24 +++++++++---------- ...rm_virtual_machine_unmanaged_disks_test.go | 4 ++-- azurerm/resource_arm_virtual_network_test.go | 2 +- website/docs/r/managed_disk.html.markdown | 4 ++-- website/docs/r/storage_blob.html.markdown | 2 +- .../docs/r/storage_container.html.markdown | 2 +- website/docs/r/storage_queue.html.markdown | 2 +- .../docs/r/template_deployment.html.markdown | 2 +- website/docs/r/virtual_machine.html.markdown | 6 ++--- .../r/virtual_machine_extension.html.markdown | 2 +- .../r/virtual_machine_scale_set.html.markdown | 4 ++-- 52 files changed, 175 insertions(+), 175 deletions(-) diff --git a/azurerm/data_source_data_lake_store_test.go b/azurerm/data_source_data_lake_store_test.go index cb1ec86e3266..ea5bfdc48971 100644 --- a/azurerm/data_source_data_lake_store_test.go +++ b/azurerm/data_source_data_lake_store_test.go @@ -54,7 +54,7 @@ func TestAccDataSourceAzureRMDataLakeStore_tier(t *testing.T) { func testAccDataSourceDataLakeStore_basic(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -74,7 +74,7 @@ data "azurerm_data_lake_store" "test" { func testAccDataSourceDataLakeStore_tier(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/data_source_dns_zone_test.go b/azurerm/data_source_dns_zone_test.go index fc3a63db741c..2b75d623aad5 100644 --- a/azurerm/data_source_dns_zone_test.go +++ b/azurerm/data_source_dns_zone_test.go @@ -73,7 +73,7 @@ func TestAccDataSourceAzureRMDNSZone_withoutResourceGroupName(t *testing.T) { func testAccDataSourceDNSZone_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -92,7 +92,7 @@ data "azurerm_dns_zone" "test" { func testAccDataSourceDNSZone_tags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/data_source_image_test.go b/azurerm/data_source_image_test.go index 2ce1c5d79e3f..139392b48a70 100644 --- a/azurerm/data_source_image_test.go +++ b/azurerm/data_source_image_test.go @@ -68,7 +68,7 @@ func TestAccDataSourceAzureRMImage_localFilter(t *testing.T) { func testAccDataSourceAzureRMImageBasic(rInt int, rString string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -198,7 +198,7 @@ output "location" { func testAccDataSourceAzureRMImageLocalFilter(rInt int, rString string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/data_source_public_ips_test.go b/azurerm/data_source_public_ips_test.go index bd4111353b95..25bc82e0b476 100644 --- a/azurerm/data_source_public_ips_test.go +++ b/azurerm/data_source_public_ips_test.go @@ -104,7 +104,7 @@ func TestAccDataSourceAzureRMPublicIPs_allocationType(t *testing.T) { func testAccDataSourceAzureRMPublicIPs_attached(rInt int, rString string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -155,7 +155,7 @@ data "azurerm_public_ips" "attached" { func testAccDataSourceAzureRMPublicIPs_prefix(rInt int, rString string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -202,7 +202,7 @@ data "azurerm_public_ips" "test" { func testAccDataSourceAzureRMPublicIPs_allocationType(rInt int, rString string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/data_source_snapshot_test.go b/azurerm/data_source_snapshot_test.go index c21c3a9d2da5..7d79ffc9ab6a 100644 --- a/azurerm/data_source_snapshot_test.go +++ b/azurerm/data_source_snapshot_test.go @@ -51,7 +51,7 @@ func TestAccDataSourceAzureRMSnapshot_importEncryption(t *testing.T) { func testAccDataSourceAzureRMSnapshot_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -84,7 +84,7 @@ func testAccDataSourceAzureRMSnapshot_encryption(rInt int, rString string, locat data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_application_gateway_test.go b/azurerm/resource_arm_application_gateway_test.go index 4936723b8286..2d434d24e76b 100644 --- a/azurerm/resource_arm_application_gateway_test.go +++ b/azurerm/resource_arm_application_gateway_test.go @@ -178,7 +178,7 @@ func TestAccAzureRMApplicationGateway_waf(t *testing.T) { subscriptionID := os.Getenv("ARM_SUBSCRIPTION_ID") gwID := fmt.Sprintf( - "/subscriptions/%s/resourceGroups/acctestrg-%d/providers/Microsoft.Network/applicationGateways/acctestgw-%d", + "/subscriptions/%s/resourceGroups/acctestRG-%d/providers/Microsoft.Network/applicationGateways/acctestgw-%d", subscriptionID, ri, ri) resource.Test(t, resource.TestCase{ @@ -356,7 +356,7 @@ func testCheckAzureRMApplicationGatewayDestroy(s *terraform.State) error { func testAccAzureRMApplicationGateway_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -539,7 +539,7 @@ resource "azurerm_application_gateway" "test" { func testAccAzureRMApplicationGateway_basic_changeSslCert(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -722,7 +722,7 @@ resource "azurerm_application_gateway" "test" { func testAccAzureRMApplicationGateway_basic_authCert(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -923,7 +923,7 @@ resource "azurerm_application_gateway" "test" { func testAccAzureRMApplicationGateway_basic_changeAuthCert(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -1124,7 +1124,7 @@ resource "azurerm_application_gateway" "test" { func testAccAzureRMApplicationGateway_waf(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_container_registry_migrate_test.go b/azurerm/resource_arm_container_registry_migrate_test.go index ae61dc359932..966fd99a8c99 100644 --- a/azurerm/resource_arm_container_registry_migrate_test.go +++ b/azurerm/resource_arm_container_registry_migrate_test.go @@ -27,7 +27,7 @@ func TestAccAzureRMContainerRegistryMigrateState(t *testing.T) { client.StopContext = testAccProvider.StopContext() rs := acctest.RandString(4) - resourceGroupName := fmt.Sprintf("acctestrg%s", rs) + resourceGroupName := fmt.Sprintf("acctestRG%s", rs) storageAccountName := fmt.Sprintf("acctestsa%s", rs) location := azureRMNormalizeLocation(testLocation()) ctx := client.StopContext diff --git a/azurerm/resource_arm_data_lake_store_test.go b/azurerm/resource_arm_data_lake_store_test.go index 488673fe5d80..c0dc71fc5fc3 100644 --- a/azurerm/resource_arm_data_lake_store_test.go +++ b/azurerm/resource_arm_data_lake_store_test.go @@ -160,7 +160,7 @@ func testCheckAzureRMDataLakeStoreDestroy(s *terraform.State) error { func testAccAzureRMDataLakeStore_basic(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -175,7 +175,7 @@ resource "azurerm_data_lake_store" "test" { func testAccAzureRMDataLakeStore_tier(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -191,7 +191,7 @@ resource "azurerm_data_lake_store" "test" { func testAccAzureRMDataLakeStore_withTags(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -211,7 +211,7 @@ resource "azurerm_data_lake_store" "test" { func testAccAzureRMDataLakeStore_withTagsUpdate(rInt int, rs string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_dns_a_record_test.go b/azurerm/resource_arm_dns_a_record_test.go index 0677009a7793..ff295b29c049 100644 --- a/azurerm/resource_arm_dns_a_record_test.go +++ b/azurerm/resource_arm_dns_a_record_test.go @@ -153,7 +153,7 @@ func testCheckAzureRMDnsARecordDestroy(s *terraform.State) error { func testAccAzureRMDnsARecord_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -175,7 +175,7 @@ resource "azurerm_dns_a_record" "test" { func testAccAzureRMDnsARecord_updateRecords(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -197,7 +197,7 @@ resource "azurerm_dns_a_record" "test" { func testAccAzureRMDnsARecord_withTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -224,7 +224,7 @@ resource "azurerm_dns_a_record" "test" { func testAccAzureRMDnsARecord_withTagsUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_dns_aaaa_record_test.go b/azurerm/resource_arm_dns_aaaa_record_test.go index a46ecd39e7b3..e979ae0bfb4d 100644 --- a/azurerm/resource_arm_dns_aaaa_record_test.go +++ b/azurerm/resource_arm_dns_aaaa_record_test.go @@ -153,7 +153,7 @@ func testCheckAzureRMDnsAaaaRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsAAAARecord_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -175,7 +175,7 @@ resource "azurerm_dns_aaaa_record" "test" { func testAccAzureRMDnsAAAARecord_updateRecords(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -197,7 +197,7 @@ resource "azurerm_dns_aaaa_record" "test" { func testAccAzureRMDnsAAAARecord_withTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -224,7 +224,7 @@ resource "azurerm_dns_aaaa_record" "test" { func testAccAzureRMDnsAAAARecord_withTagsUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_dns_cname_record_test.go b/azurerm/resource_arm_dns_cname_record_test.go index f856fa528eb1..cae310e63ebf 100644 --- a/azurerm/resource_arm_dns_cname_record_test.go +++ b/azurerm/resource_arm_dns_cname_record_test.go @@ -172,7 +172,7 @@ func testCheckAzureRMDnsCNameRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsCNameRecord_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -194,7 +194,7 @@ resource "azurerm_dns_cname_record" "test" { func testAccAzureRMDnsCNameRecord_subdomain(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -216,7 +216,7 @@ resource "azurerm_dns_cname_record" "test" { func testAccAzureRMDnsCNameRecord_updateRecords(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -238,7 +238,7 @@ resource "azurerm_dns_cname_record" "test" { func testAccAzureRMDnsCNameRecord_withTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -265,7 +265,7 @@ resource "azurerm_dns_cname_record" "test" { func testAccAzureRMDnsCNameRecord_withTagsUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_dns_mx_record_test.go b/azurerm/resource_arm_dns_mx_record_test.go index e7b7fab9a932..bb82161dd3c9 100644 --- a/azurerm/resource_arm_dns_mx_record_test.go +++ b/azurerm/resource_arm_dns_mx_record_test.go @@ -153,7 +153,7 @@ func testCheckAzureRMDnsMxRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsMxRecord_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -184,7 +184,7 @@ resource "azurerm_dns_mx_record" "test" { func testAccAzureRMDnsMxRecord_updateRecords(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -220,7 +220,7 @@ resource "azurerm_dns_mx_record" "test" { func testAccAzureRMDnsMxRecord_withTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -256,7 +256,7 @@ resource "azurerm_dns_mx_record" "test" { func testAccAzureRMDnsMxRecord_withTagsUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_dns_ns_record_test.go b/azurerm/resource_arm_dns_ns_record_test.go index 54246b174b07..6b6e4e9985a9 100644 --- a/azurerm/resource_arm_dns_ns_record_test.go +++ b/azurerm/resource_arm_dns_ns_record_test.go @@ -266,7 +266,7 @@ func testCheckAzureRMDnsNsRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsNsRecord_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -290,7 +290,7 @@ resource "azurerm_dns_ns_record" "test" { func testAccAzureRMDnsNsRecord_deprecatedBasic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -320,7 +320,7 @@ resource "azurerm_dns_ns_record" "test" { func testAccAzureRMDnsNsRecord_deprecatedBasicNewRecords(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -343,7 +343,7 @@ resource "azurerm_dns_ns_record" "test" { func testAccAzureRMDnsNsRecord_updateRecords(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -367,7 +367,7 @@ resource "azurerm_dns_ns_record" "test" { func testAccAzureRMDnsNsRecord_deprecatedUpdateRecords(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -400,7 +400,7 @@ resource "azurerm_dns_ns_record" "test" { func testAccAzureRMDnsNsRecord_withTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -429,7 +429,7 @@ resource "azurerm_dns_ns_record" "test" { func testAccAzureRMDnsNsRecord_deprecatedWithTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -463,7 +463,7 @@ resource "azurerm_dns_ns_record" "test" { func testAccAzureRMDnsNsRecord_withTagsUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -491,7 +491,7 @@ resource "azurerm_dns_ns_record" "test" { func testAccAzureRMDnsNsRecord_deprecatedWithTagsUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_dns_ptr_record_test.go b/azurerm/resource_arm_dns_ptr_record_test.go index 805f1d7d926b..7a0c123bff42 100644 --- a/azurerm/resource_arm_dns_ptr_record_test.go +++ b/azurerm/resource_arm_dns_ptr_record_test.go @@ -153,7 +153,7 @@ func testCheckAzureRMDnsPtrRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsPtrRecord_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -175,7 +175,7 @@ resource "azurerm_dns_ptr_record" "test" { func testAccAzureRMDnsPtrRecord_updateRecords(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -197,7 +197,7 @@ resource "azurerm_dns_ptr_record" "test" { func testAccAzureRMDnsPtrRecord_withTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -224,7 +224,7 @@ resource "azurerm_dns_ptr_record" "test" { func testAccAzureRMDnsPtrRecord_withTagsUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_dns_srv_record_test.go b/azurerm/resource_arm_dns_srv_record_test.go index e35c5c40dab6..36c79fb73449 100644 --- a/azurerm/resource_arm_dns_srv_record_test.go +++ b/azurerm/resource_arm_dns_srv_record_test.go @@ -153,7 +153,7 @@ func testCheckAzureRMDnsSrvRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsSrvRecord_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -188,7 +188,7 @@ resource "azurerm_dns_srv_record" "test" { func testAccAzureRMDnsSrvRecord_updateRecords(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -230,7 +230,7 @@ resource "azurerm_dns_srv_record" "test" { func testAccAzureRMDnsSrvRecord_withTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -270,7 +270,7 @@ resource "azurerm_dns_srv_record" "test" { func testAccAzureRMDnsSrvRecord_withTagsUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_dns_txt_record_test.go b/azurerm/resource_arm_dns_txt_record_test.go index 5c6761ebc65d..bd28cc67d357 100644 --- a/azurerm/resource_arm_dns_txt_record_test.go +++ b/azurerm/resource_arm_dns_txt_record_test.go @@ -151,7 +151,7 @@ func testCheckAzureRMDnsTxtRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsTxtRecord_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -180,7 +180,7 @@ resource "azurerm_dns_txt_record" "test" { func testAccAzureRMDnsTxtRecord_updateRecords(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -213,7 +213,7 @@ resource "azurerm_dns_txt_record" "test" { func testAccAzureRMDnsTxtRecord_withTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -247,7 +247,7 @@ resource "azurerm_dns_txt_record" "test" { func testAccAzureRMDnsTxtRecord_withTagsUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_dns_zone_test.go b/azurerm/resource_arm_dns_zone_test.go index 70ae3161cfc7..eed88bc3b0bb 100644 --- a/azurerm/resource_arm_dns_zone_test.go +++ b/azurerm/resource_arm_dns_zone_test.go @@ -119,7 +119,7 @@ func testCheckAzureRMDnsZoneDestroy(s *terraform.State) error { func testAccAzureRMDnsZone_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -133,7 +133,7 @@ resource "azurerm_dns_zone" "test" { func testAccAzureRMDnsZone_withTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -151,7 +151,7 @@ resource "azurerm_dns_zone" "test" { func testAccAzureRMDnsZone_withTagsUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_eventhub_test.go b/azurerm/resource_arm_eventhub_test.go index a68fcbe8c6bc..b224e06689cc 100644 --- a/azurerm/resource_arm_eventhub_test.go +++ b/azurerm/resource_arm_eventhub_test.go @@ -397,7 +397,7 @@ func testAccAzureRMEventHub_captureDescription(rInt int, rString string, locatio enabledString := strconv.FormatBool(enabled) return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_express_route_circuit_authorization_test.go b/azurerm/resource_arm_express_route_circuit_authorization_test.go index ad4b67500bc9..65e52e180146 100644 --- a/azurerm/resource_arm_express_route_circuit_authorization_test.go +++ b/azurerm/resource_arm_express_route_circuit_authorization_test.go @@ -114,7 +114,7 @@ func testCheckAzureRMExpressRouteCircuitAuthorizationDestroy(s *terraform.State) func testAccAzureRMExpressRouteCircuitAuthorization_basicConfig(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -150,7 +150,7 @@ resource "azurerm_express_route_circuit_authorization" "test" { func testAccAzureRMExpressRouteCircuitAuthorization_multipleConfig(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_express_route_circuit_peering_test.go b/azurerm/resource_arm_express_route_circuit_peering_test.go index 662993da4e4d..9e22566a6508 100644 --- a/azurerm/resource_arm_express_route_circuit_peering_test.go +++ b/azurerm/resource_arm_express_route_circuit_peering_test.go @@ -115,7 +115,7 @@ func testCheckAzureRMExpressRouteCircuitPeeringDestroy(s *terraform.State) error func testAccAzureRMExpressRouteCircuitPeering_privatePeering(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -154,7 +154,7 @@ resource "azurerm_express_route_circuit_peering" "test" { func testAccAzureRMExpressRouteCircuitPeering_msPeering(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_express_route_circuit_test.go b/azurerm/resource_arm_express_route_circuit_test.go index ea514a86d99c..5ce7127189cc 100644 --- a/azurerm/resource_arm_express_route_circuit_test.go +++ b/azurerm/resource_arm_express_route_circuit_test.go @@ -286,7 +286,7 @@ func testCheckAzureRMExpressRouteCircuitDestroy(s *terraform.State) error { func testAccAzureRMExpressRouteCircuit_basicMeteredConfig(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -316,7 +316,7 @@ resource "azurerm_express_route_circuit" "test" { func testAccAzureRMExpressRouteCircuit_basicUnlimitedConfig(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_key_vault_certificate_test.go b/azurerm/resource_arm_key_vault_certificate_test.go index 0e67f14436a9..bc5d31e43935 100644 --- a/azurerm/resource_arm_key_vault_certificate_test.go +++ b/azurerm/resource_arm_key_vault_certificate_test.go @@ -134,7 +134,7 @@ func testAccAzureRMKeyVaultCertificate_basicImportPFX(rString string, location s data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestrg-%s" + name = "acctestRG-%s" location = "%s" } @@ -202,7 +202,7 @@ func testAccAzureRMKeyVaultCertificate_basicGenerate(rString string, location st data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestrg-%s" + name = "acctestRG-%s" location = "%s" } @@ -290,7 +290,7 @@ func testAccAzureRMKeyVaultCertificate_basicGenerateTags(rString string, locatio data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestrg-%s" + name = "acctestRG-%s" location = "%s" } diff --git a/azurerm/resource_arm_loadbalancer_backend_address_pool_test.go b/azurerm/resource_arm_loadbalancer_backend_address_pool_test.go index b7a0780e061e..12ce8ed2ba27 100644 --- a/azurerm/resource_arm_loadbalancer_backend_address_pool_test.go +++ b/azurerm/resource_arm_loadbalancer_backend_address_pool_test.go @@ -18,7 +18,7 @@ func TestAccAzureRMLoadBalancerBackEndAddressPool_basic(t *testing.T) { subscriptionID := os.Getenv("ARM_SUBSCRIPTION_ID") backendAddressPoolId := fmt.Sprintf( - "/subscriptions/%s/resourceGroups/acctestrg-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/backendAddressPools/%s", + "/subscriptions/%s/resourceGroups/acctestRG-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/backendAddressPools/%s", subscriptionID, ri, ri, addressPoolName) resource.Test(t, resource.TestCase{ @@ -176,7 +176,7 @@ func testCheckAzureRMLoadBalancerBackEndAddressPoolDisappears(addressPoolName st func testAccAzureRMLoadBalancerBackEndAddressPool_basic(rInt int, addressPoolName string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -211,7 +211,7 @@ resource "azurerm_lb_backend_address_pool" "test" { func testAccAzureRMLoadBalancerBackEndAddressPool_removal(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_loadbalancer_nat_pool_test.go b/azurerm/resource_arm_loadbalancer_nat_pool_test.go index 2a4bd75d63e0..4d4a40f6ffab 100644 --- a/azurerm/resource_arm_loadbalancer_nat_pool_test.go +++ b/azurerm/resource_arm_loadbalancer_nat_pool_test.go @@ -18,7 +18,7 @@ func TestAccAzureRMLoadBalancerNatPool_basic(t *testing.T) { subscriptionID := os.Getenv("ARM_SUBSCRIPTION_ID") natPoolId := fmt.Sprintf( - "/subscriptions/%s/resourceGroups/acctestrg-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/inboundNatPools/%s", + "/subscriptions/%s/resourceGroups/acctestRG-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/inboundNatPools/%s", subscriptionID, ri, ri, natPoolName) resource.Test(t, resource.TestCase{ @@ -216,7 +216,7 @@ func testCheckAzureRMLoadBalancerNatPoolDisappears(natPoolName string, lb *netwo func testAccAzureRMLoadBalancerNatPool_basic(rInt int, natPoolName string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -255,7 +255,7 @@ resource "azurerm_lb_nat_pool" "test" { func testAccAzureRMLoadBalancerNatPool_removal(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -283,7 +283,7 @@ func testAccAzureRMLoadBalancerNatPool_multiplePools(rInt int, natPoolName, natP return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -334,7 +334,7 @@ resource "azurerm_lb_nat_pool" "test2" { func testAccAzureRMLoadBalancerNatPool_multiplePoolsUpdate(rInt int, natPoolName, natPool2Name string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_loadbalancer_nat_rule_test.go b/azurerm/resource_arm_loadbalancer_nat_rule_test.go index 782c1f2b2ac4..ebc1d0aeff75 100644 --- a/azurerm/resource_arm_loadbalancer_nat_rule_test.go +++ b/azurerm/resource_arm_loadbalancer_nat_rule_test.go @@ -18,7 +18,7 @@ func TestAccAzureRMLoadBalancerNatRule_basic(t *testing.T) { subscriptionID := os.Getenv("ARM_SUBSCRIPTION_ID") natRuleId := fmt.Sprintf( - "/subscriptions/%s/resourceGroups/acctestrg-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/inboundNatRules/%s", + "/subscriptions/%s/resourceGroups/acctestRG-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/inboundNatRules/%s", subscriptionID, ri, ri, natRuleName) resource.Test(t, resource.TestCase{ @@ -276,7 +276,7 @@ func testCheckAzureRMLoadBalancerNatRuleDisappears(natRuleName string, lb *netwo func testAccAzureRMLoadBalancerNatRule_basic(rInt int, natRuleName string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -314,7 +314,7 @@ resource "azurerm_lb_nat_rule" "test" { func testAccAzureRMLoadBalancerNatRule_removal(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -341,7 +341,7 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancerNatRule_multipleRules(rInt int, natRuleName, natRule2Name string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -390,7 +390,7 @@ resource "azurerm_lb_nat_rule" "test2" { func testAccAzureRMLoadBalancerNatRule_multipleRulesUpdate(rInt int, natRuleName, natRule2Name string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -439,7 +439,7 @@ resource "azurerm_lb_nat_rule" "test2" { func testAccAzureRMLoadBalancerNatRule_enableFloatingIP(rInt int, natRuleName string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_loadbalancer_probe_test.go b/azurerm/resource_arm_loadbalancer_probe_test.go index 92f13bc96e93..b2f440b931b4 100644 --- a/azurerm/resource_arm_loadbalancer_probe_test.go +++ b/azurerm/resource_arm_loadbalancer_probe_test.go @@ -18,7 +18,7 @@ func TestAccAzureRMLoadBalancerProbe_basic(t *testing.T) { subscriptionID := os.Getenv("ARM_SUBSCRIPTION_ID") probe_id := fmt.Sprintf( - "/subscriptions/%s/resourceGroups/acctestrg-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/probes/%s", + "/subscriptions/%s/resourceGroups/acctestRG-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/probes/%s", subscriptionID, ri, ri, probeName) resource.Test(t, resource.TestCase{ @@ -247,7 +247,7 @@ func testCheckAzureRMLoadBalancerProbeDisappears(addressPoolName string, lb *net func testAccAzureRMLoadBalancerProbe_basic(rInt int, probeName string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -282,7 +282,7 @@ resource "azurerm_lb_probe" "test" { func testAccAzureRMLoadBalancerProbe_removal(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -309,7 +309,7 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancerProbe_multipleProbes(rInt int, probeName, probe2Name string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -352,7 +352,7 @@ resource "azurerm_lb_probe" "test2" { func testAccAzureRMLoadBalancerProbe_multipleProbesUpdate(rInt int, probeName, probe2Name string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -396,7 +396,7 @@ resource "azurerm_lb_probe" "test2" { func testAccAzureRMLoadBalancerProbe_updateProtocolBefore(rInt int, probeName string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -433,7 +433,7 @@ resource "azurerm_lb_probe" "test" { func testAccAzureRMLoadBalancerProbe_updateProtocolAfter(rInt int, probeName string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_loadbalancer_rule_test.go b/azurerm/resource_arm_loadbalancer_rule_test.go index 4e567f5eeaee..5633f23d21e7 100644 --- a/azurerm/resource_arm_loadbalancer_rule_test.go +++ b/azurerm/resource_arm_loadbalancer_rule_test.go @@ -74,7 +74,7 @@ func TestAccAzureRMLoadBalancerRule_basic(t *testing.T) { subscriptionID := os.Getenv("ARM_SUBSCRIPTION_ID") lbRule_id := fmt.Sprintf( - "/subscriptions/%s/resourceGroups/acctestrg-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/loadBalancingRules/%s", + "/subscriptions/%s/resourceGroups/acctestRG-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/loadBalancingRules/%s", subscriptionID, ri, ri, lbRuleName) resource.Test(t, resource.TestCase{ @@ -157,11 +157,11 @@ func TestAccAzureRMLoadBalancerRule_update(t *testing.T) { subscriptionID := os.Getenv("ARM_SUBSCRIPTION_ID") lbRuleID := fmt.Sprintf( - "/subscriptions/%s/resourceGroups/acctestrg-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/loadBalancingRules/%s", + "/subscriptions/%s/resourceGroups/acctestRG-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/loadBalancingRules/%s", subscriptionID, ri, ri, lbRuleName) lbRule2ID := fmt.Sprintf( - "/subscriptions/%s/resourceGroups/acctestrg-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/loadBalancingRules/%s", + "/subscriptions/%s/resourceGroups/acctestRG-%d/providers/Microsoft.Network/loadBalancers/arm-test-loadbalancer-%d/loadBalancingRules/%s", subscriptionID, ri, ri, lbRule2Name) resource.Test(t, resource.TestCase{ @@ -313,7 +313,7 @@ func testCheckAzureRMLoadBalancerRuleDisappears(ruleName string, lb *network.Loa func testAccAzureRMLoadBalancerRule_basic(rInt int, lbRuleName string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -351,7 +351,7 @@ resource "azurerm_lb_rule" "test" { func testAccAzureRMLoadBalancerRule_removal(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -380,7 +380,7 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancerRule_inconsistentRead(rInt int, backendPoolName, probeName, lbRuleName string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -435,7 +435,7 @@ resource "azurerm_lb_rule" "test" { func testAccAzureRMLoadBalancerRule_multipleRules(rInt int, lbRuleName, lbRule2Name string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -485,7 +485,7 @@ resource "azurerm_lb_rule" "test2" { func testAccAzureRMLoadBalancerRule_multipleRulesUpdate(rInt int, lbRuleName, lbRule2Name string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_loadbalancer_test.go b/azurerm/resource_arm_loadbalancer_test.go index 92243088129f..9d5cd4b50347 100644 --- a/azurerm/resource_arm_loadbalancer_test.go +++ b/azurerm/resource_arm_loadbalancer_test.go @@ -213,7 +213,7 @@ func testCheckAzureRMLoadBalancerDestroy(s *terraform.State) error { func testAccAzureRMLoadBalancer_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -233,7 +233,7 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancer_standard(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -255,7 +255,7 @@ func testAccAzureRMLoadBalancer_updatedTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -274,7 +274,7 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancer_frontEndConfig(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -312,7 +312,7 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancer_frontEndConfig_withZone(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -352,7 +352,7 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancer_frontEndConfigRemovalWithIP(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -385,7 +385,7 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancer_frontEndConfigRemoval(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_network_interface_test.go b/azurerm/resource_arm_network_interface_test.go index 362b5f4c22c9..2ae53ea7d1fb 100644 --- a/azurerm/resource_arm_network_interface_test.go +++ b/azurerm/resource_arm_network_interface_test.go @@ -1041,7 +1041,7 @@ resource "azurerm_network_interface" "test2" { func testAccAzureRMNetworkInterface_applicationGatewayBackendPool(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_packet_capture_test.go b/azurerm/resource_arm_packet_capture_test.go index 1c340b90faa4..ecfa2b7ade9a 100644 --- a/azurerm/resource_arm_packet_capture_test.go +++ b/azurerm/resource_arm_packet_capture_test.go @@ -153,7 +153,7 @@ func testCheckAzureRMPacketCaptureDestroy(s *terraform.State) error { func testAzureRMPacketCapture_base(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_policy_assignment_test.go b/azurerm/resource_arm_policy_assignment_test.go index 750cbd168200..d57c280b34f5 100644 --- a/azurerm/resource_arm_policy_assignment_test.go +++ b/azurerm/resource_arm_policy_assignment_test.go @@ -123,7 +123,7 @@ POLICY_RULE } resource "azurerm_resource_group" "test" { - name = "acctestrgpol-%d" + name = "acctestRG-%d" location = "%s" } @@ -171,7 +171,7 @@ PARAMETERS } resource "azurerm_resource_group" "test" { - name = "acctestrgpol-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_search_service_test.go b/azurerm/resource_arm_search_service_test.go index 0a92ca9f98b7..7982a8e14ece 100644 --- a/azurerm/resource_arm_search_service_test.go +++ b/azurerm/resource_arm_search_service_test.go @@ -112,7 +112,7 @@ func testCheckAzureRMSearchServiceDestroy(s *terraform.State) error { func testAccAzureRMSearchService_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -132,7 +132,7 @@ resource "azurerm_search_service" "test" { func testAccAzureRMSearchService_complete(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } resource "azurerm_search_service" "test" { diff --git a/azurerm/resource_arm_snapshot_test.go b/azurerm/resource_arm_snapshot_test.go index 47bc96711cde..d996ead4bf32 100644 --- a/azurerm/resource_arm_snapshot_test.go +++ b/azurerm/resource_arm_snapshot_test.go @@ -242,7 +242,7 @@ func testCheckAzureRMSnapshotExists(name string) resource.TestCheckFunc { func testAccAzureRMSnapshot_fromManagedDisk(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -268,7 +268,7 @@ resource "azurerm_snapshot" "test" { func testAccAzureRMSnapshot_fromManagedDiskUpdated(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -300,7 +300,7 @@ func testAccAzureRMSnapshot_encryption(rInt int, rString string, location string data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -393,7 +393,7 @@ resource "azurerm_snapshot" "test" { func testAccAzureRMSnapshot_extendingManagedDisk(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -420,7 +420,7 @@ resource "azurerm_snapshot" "test" { func testAccAzureRMSnapshot_fromExistingSnapshot(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -454,7 +454,7 @@ resource "azurerm_snapshot" "second" { func testAccAzureRMSnapshot_fromUnmanagedDisk(rInt int, rString string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_sql_administrator_test.go b/azurerm/resource_arm_sql_administrator_test.go index 9d2a7b5ff123..dda4c421ff5e 100644 --- a/azurerm/resource_arm_sql_administrator_test.go +++ b/azurerm/resource_arm_sql_administrator_test.go @@ -137,7 +137,7 @@ func testAccAzureRMSqlAdministrator_basic(rInt int, location string) string { data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -165,7 +165,7 @@ func testAccAzureRMSqlAdministrator_withUpdates(rInt int, location string) strin data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_sql_database_test.go b/azurerm/resource_arm_sql_database_test.go index 24eb65fc53dc..964dc6f22a6d 100644 --- a/azurerm/resource_arm_sql_database_test.go +++ b/azurerm/resource_arm_sql_database_test.go @@ -268,7 +268,7 @@ func testCheckAzureRMSqlDatabaseDisappears(name string) resource.TestCheckFunc { func testAccAzureRMSqlDatabase_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -297,7 +297,7 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_withTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -331,7 +331,7 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_withTagsUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -392,7 +392,7 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_restorePointInTime(rInt int, formattedTime string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -431,7 +431,7 @@ resource "azurerm_sql_database" "test_restore" { func testAccAzureRMSqlDatabase_elasticPool(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -471,7 +471,7 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_collationUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_sql_firewall_rule_test.go b/azurerm/resource_arm_sql_firewall_rule_test.go index 31f01f78ede2..391e1a9e1b06 100644 --- a/azurerm/resource_arm_sql_firewall_rule_test.go +++ b/azurerm/resource_arm_sql_firewall_rule_test.go @@ -149,7 +149,7 @@ func testCheckAzureRMSqlFirewallRuleDisappears(name string) resource.TestCheckFu func testAccAzureRMSqlFirewallRule_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -175,7 +175,7 @@ resource "azurerm_sql_firewall_rule" "test" { func testAccAzureRMSqlFirewallRule_withUpdates(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_sql_server_test.go b/azurerm/resource_arm_sql_server_test.go index 2039e1474b54..b9c0cbb45193 100644 --- a/azurerm/resource_arm_sql_server_test.go +++ b/azurerm/resource_arm_sql_server_test.go @@ -220,7 +220,7 @@ func testCheckAzureRMSqlServerDisappears(name string) resource.TestCheckFunc { func testAccAzureRMSqlServer_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -238,7 +238,7 @@ resource "azurerm_sql_server" "test" { func testAccAzureRMSqlServer_withTags(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } @@ -261,7 +261,7 @@ resource "azurerm_sql_server" "test" { func testAccAzureRMSqlServer_withTagsUpdated(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_sql_virtual_network_rule_test.go b/azurerm/resource_arm_sql_virtual_network_rule_test.go index 3da6afbb0b9f..f278cc522dee 100644 --- a/azurerm/resource_arm_sql_virtual_network_rule_test.go +++ b/azurerm/resource_arm_sql_virtual_network_rule_test.go @@ -423,7 +423,7 @@ func testCheckAzureRMSqlVirtualNetworkRuleDisappears(name string) resource.TestC func testAccAzureRMSqlVirtualNetworkRule_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } resource "azurerm_virtual_network" "test" { @@ -465,7 +465,7 @@ resource "azurerm_sql_virtual_network_rule" "test" { func testAccAzureRMSqlVirtualNetworkRule_withUpdates(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } resource "azurerm_virtual_network" "test" { @@ -507,7 +507,7 @@ resource "azurerm_sql_virtual_network_rule" "test" { func testAccAzureRMSqlVirtualNetworkRule_subnetSwitchPre(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } resource "azurerm_virtual_network" "test" { @@ -556,7 +556,7 @@ resource "azurerm_sql_virtual_network_rule" "test" { func testAccAzureRMSqlVirtualNetworkRule_subnetSwitchPost(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } resource "azurerm_virtual_network" "test" { @@ -605,7 +605,7 @@ resource "azurerm_sql_virtual_network_rule" "test" { func testAccAzureRMSqlVirtualNetworkRule_ignoreEndpointValid(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } resource "azurerm_virtual_network" "test" { @@ -648,7 +648,7 @@ resource "azurerm_sql_virtual_network_rule" "test" { func testAccAzureRMSqlVirtualNetworkRule_ignoreEndpointInvalid(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } resource "azurerm_virtual_network" "test" { @@ -690,7 +690,7 @@ resource "azurerm_sql_virtual_network_rule" "test" { func testAccAzureRMSqlVirtualNetworkRule_multipleSubnets(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" + name = "acctestRG-%d" location = "%s" } resource "azurerm_virtual_network" "vnet1" { diff --git a/azurerm/resource_arm_storage_share_test.go b/azurerm/resource_arm_storage_share_test.go index df13f8622eb7..3b227400950f 100644 --- a/azurerm/resource_arm_storage_share_test.go +++ b/azurerm/resource_arm_storage_share_test.go @@ -225,7 +225,7 @@ func TestValidateArmStorageShareName(t *testing.T) { func testAccAzureRMStorageShare_basic(rInt int, rString string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_traffic_manager_endpoint_test.go b/azurerm/resource_arm_traffic_manager_endpoint_test.go index 2b2ed6a42afc..838b805a9615 100644 --- a/azurerm/resource_arm_traffic_manager_endpoint_test.go +++ b/azurerm/resource_arm_traffic_manager_endpoint_test.go @@ -754,7 +754,7 @@ resource "azurerm_traffic_manager_endpoint" "test" { func testAccAzureRMTrafficManagerEndpoint_geoMappings(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -793,7 +793,7 @@ resource "azurerm_traffic_manager_endpoint" "test" { func testAccAzureRMTrafficManagerEndpoint_geoMappingsUpdated(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_virtual_machine_extension_test.go b/azurerm/resource_arm_virtual_machine_extension_test.go index 0d100e05652c..9146032a726f 100644 --- a/azurerm/resource_arm_virtual_machine_extension_test.go +++ b/azurerm/resource_arm_virtual_machine_extension_test.go @@ -142,7 +142,7 @@ func testCheckAzureRMVirtualMachineExtensionDestroy(s *terraform.State) error { func testAccAzureRMVirtualMachineExtension_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -248,7 +248,7 @@ SETTINGS func testAccAzureRMVirtualMachineExtension_basicUpdate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -355,7 +355,7 @@ SETTINGS func testAccAzureRMVirtualMachineExtension_concurrent(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } @@ -473,7 +473,7 @@ SETTINGS func testAccAzureRMVirtualMachineExtension_linuxDiagnostics(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/resource_arm_virtual_machine_scale_set_test.go b/azurerm/resource_arm_virtual_machine_scale_set_test.go index 3406a3406e0a..5ccd6dcdf638 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set_test.go +++ b/azurerm/resource_arm_virtual_machine_scale_set_test.go @@ -1779,7 +1779,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_linux(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%[1]d" + name = "acctestRG-%[1]d" location = "%[2]s" } @@ -1893,7 +1893,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_linuxUpdated(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%[1]d" + name = "acctestRG-%[1]d" location = "%[2]s" } @@ -2011,7 +2011,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_linuxCustomDataUpdated(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%[1]d" + name = "acctestRG-%[1]d" location = "%[2]s" } @@ -2403,7 +2403,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetApplicationGatewayTemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%[1]d" + name = "acctestRG-%[1]d" location = "%[2]s" } @@ -2598,7 +2598,7 @@ resource "azurerm_application_gateway" "test" { func testAccAzureRMVirtualMachineScaleSetLoadBalancerTemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%[1]d" + name = "acctestRG-%[1]d" location = "%[2]s" } @@ -2712,7 +2712,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetOverProvisionTemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%[1]d" + name = "acctestRG-%[1]d" location = "%[2]s" } @@ -2795,7 +2795,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetPriorityTemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%[1]d" + name = "acctestRG-%[1]d" location = "%[2]s" } @@ -2879,7 +2879,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetMSITemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%[1]d" + name = "acctestRG-%[1]d" location = "%[2]s" } @@ -2974,7 +2974,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetExtensionTemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%[1]d" + name = "acctestRG-%[1]d" location = "%[2]s" } @@ -3085,7 +3085,7 @@ SETTINGS func testAccAzureRMVirtualMachineScaleSetExtensionTemplateUpdated(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%[1]d" + name = "acctestRG-%[1]d" location = "%[2]s" } @@ -3197,7 +3197,7 @@ SETTINGS func testAccAzureRMVirtualMachineScaleSetMultipleExtensionsTemplate(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%[1]d" + name = "acctestRG-%[1]d" location = "%[2]s" } @@ -3377,7 +3377,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetLoadBalancerTemplateManagedDataDisks(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg-%[1]d" + name = "acctestRG-%[1]d" location = "%[2]s" } diff --git a/azurerm/resource_arm_virtual_machine_unmanaged_disks_test.go b/azurerm/resource_arm_virtual_machine_unmanaged_disks_test.go index 4cac5fafa08c..efcf1bf1e4b0 100644 --- a/azurerm/resource_arm_virtual_machine_unmanaged_disks_test.go +++ b/azurerm/resource_arm_virtual_machine_unmanaged_disks_test.go @@ -2524,7 +2524,7 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_linuxMachineWithSSH(rString string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg%s" + name = "acctestRG%s" location = "%s" } @@ -2611,7 +2611,7 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_linuxMachineWithSSHRemoved(rString string, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestrg%s" + name = "acctestRG%s" location = "%s" } diff --git a/azurerm/resource_arm_virtual_network_test.go b/azurerm/resource_arm_virtual_network_test.go index a0085cd3b2d1..c971b785cc8a 100644 --- a/azurerm/resource_arm_virtual_network_test.go +++ b/azurerm/resource_arm_virtual_network_test.go @@ -349,7 +349,7 @@ variable "network_cidr" { } resource "azurerm_resource_group" "test" { - name = "acctestrg%s" + name = "acctestRG%s" location = "%s" } diff --git a/website/docs/r/managed_disk.html.markdown b/website/docs/r/managed_disk.html.markdown index fe2b89899b7c..5791deb0dc33 100644 --- a/website/docs/r/managed_disk.html.markdown +++ b/website/docs/r/managed_disk.html.markdown @@ -14,7 +14,7 @@ Create a managed disk. ```hcl resource "azurerm_resource_group" "test" { - name = "acctestrg" + name = "acctestRG" location = "West US 2" } @@ -36,7 +36,7 @@ resource "azurerm_managed_disk" "test" { ```hcl resource "azurerm_resource_group" "test" { - name = "acctestrg" + name = "acctestRG" location = "West US 2" } diff --git a/website/docs/r/storage_blob.html.markdown b/website/docs/r/storage_blob.html.markdown index fcb9a16f67d8..2adc126a18a8 100644 --- a/website/docs/r/storage_blob.html.markdown +++ b/website/docs/r/storage_blob.html.markdown @@ -14,7 +14,7 @@ Create an Azure Storage Blob. ```hcl resource "azurerm_resource_group" "test" { - name = "acctestrg-d" + name = "acctestRG-d" location = "westus" } diff --git a/website/docs/r/storage_container.html.markdown b/website/docs/r/storage_container.html.markdown index da769ac8e3c7..6690da0f6271 100644 --- a/website/docs/r/storage_container.html.markdown +++ b/website/docs/r/storage_container.html.markdown @@ -14,7 +14,7 @@ Create an Azure Storage Container. ```hcl resource "azurerm_resource_group" "test" { - name = "acctestrg" + name = "acctestRG" location = "westus" } diff --git a/website/docs/r/storage_queue.html.markdown b/website/docs/r/storage_queue.html.markdown index d0fb9b350db3..ea4f99e29ddd 100644 --- a/website/docs/r/storage_queue.html.markdown +++ b/website/docs/r/storage_queue.html.markdown @@ -14,7 +14,7 @@ Create an Azure Storage Queue. ```hcl resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "westus" } diff --git a/website/docs/r/template_deployment.html.markdown b/website/docs/r/template_deployment.html.markdown index 9a07e56ae189..36ada32d76be 100644 --- a/website/docs/r/template_deployment.html.markdown +++ b/website/docs/r/template_deployment.html.markdown @@ -20,7 +20,7 @@ One workaround for this is to use a unique Resource Group for each ARM Template ```hcl resource "azurerm_resource_group" "test" { - name = "acctestrg-01" + name = "acctestRG-01" location = "West US" } diff --git a/website/docs/r/virtual_machine.html.markdown b/website/docs/r/virtual_machine.html.markdown index 2a636ecc1d53..3986b93a9203 100644 --- a/website/docs/r/virtual_machine.html.markdown +++ b/website/docs/r/virtual_machine.html.markdown @@ -14,7 +14,7 @@ Create a virtual machine. ```hcl resource "azurerm_resource_group" "test" { - name = "acctestrg" + name = "acctestRG" location = "West US 2" } @@ -127,7 +127,7 @@ data "azurerm_image" "image" { } resource "azurerm_resource_group" "test" { - name = "acctestrg" + name = "acctestRG" location = "West US 2" } @@ -227,7 +227,7 @@ resource "azurerm_virtual_machine" "test" { ```hcl resource "azurerm_resource_group" "test" { - name = "acctestrg" + name = "acctestRG" location = "West US" } diff --git a/website/docs/r/virtual_machine_extension.html.markdown b/website/docs/r/virtual_machine_extension.html.markdown index ff0c7f081274..6128eb6a53a6 100644 --- a/website/docs/r/virtual_machine_extension.html.markdown +++ b/website/docs/r/virtual_machine_extension.html.markdown @@ -18,7 +18,7 @@ and run automated tasks. ```hcl resource "azurerm_resource_group" "test" { - name = "acctestrg" + name = "acctestRG" location = "West US" } diff --git a/website/docs/r/virtual_machine_scale_set.html.markdown b/website/docs/r/virtual_machine_scale_set.html.markdown index 25a541c86046..34e8675fcf69 100644 --- a/website/docs/r/virtual_machine_scale_set.html.markdown +++ b/website/docs/r/virtual_machine_scale_set.html.markdown @@ -17,7 +17,7 @@ Create a virtual machine scale set. ```hcl resource "azurerm_resource_group" "test" { - name = "acctestrg" + name = "acctestRG" location = "West US 2" } @@ -146,7 +146,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { ```hcl resource "azurerm_resource_group" "test" { - name = "acctestrg" + name = "acctestRG" location = "West US" } From ba4743d5453e0ffa319b4f25bec87075b5652fd2 Mon Sep 17 00:00:00 2001 From: Matt Mencel Date: Mon, 18 Jun 2018 11:12:12 -0500 Subject: [PATCH 299/320] New Log Analytics Sku for azurerm_log_analytics_workspace (#1078) (#1079) * New Log Analytics Sku for `azurerm_log_analytics_workspace` (#1078) * Migrating to use the new SKU's. Tests pass: ``` $ acctests azurerm TestAccAzureRMLogAnalyticsWorkspace_ === RUN TestAccAzureRMLogAnalyticsWorkspace_importRequiredOnly --- PASS: TestAccAzureRMLogAnalyticsWorkspace_importRequiredOnly (136.16s) === RUN TestAccAzureRMLogAnalyticsWorkspace_importRetentionInDaysComplete --- PASS: TestAccAzureRMLogAnalyticsWorkspace_importRetentionInDaysComplete (74.59s) === RUN TestAccAzureRMLogAnalyticsWorkspace_requiredOnly --- PASS: TestAccAzureRMLogAnalyticsWorkspace_requiredOnly (129.72s) === RUN TestAccAzureRMLogAnalyticsWorkspace_retentionInDaysComplete --- PASS: TestAccAzureRMLogAnalyticsWorkspace_retentionInDaysComplete (131.16s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 471.669s ``` --- azurerm/resource_arm_log_analytics_workspace.go | 1 + azurerm/resource_arm_log_analytics_workspace_test.go | 6 +++--- website/docs/r/log_analytics_workspace.html.markdown | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/azurerm/resource_arm_log_analytics_workspace.go b/azurerm/resource_arm_log_analytics_workspace.go index cc7a295fdd8e..8f1386d1db9e 100644 --- a/azurerm/resource_arm_log_analytics_workspace.go +++ b/azurerm/resource_arm_log_analytics_workspace.go @@ -44,6 +44,7 @@ func resourceArmLogAnalyticsWorkspace() *schema.Resource { string(operationalinsights.Standalone), string(operationalinsights.Standard), string(operationalinsights.Unlimited), + string(operationalinsights.PerGB2018), }, true), DiffSuppressFunc: ignoreCaseDiffSuppressFunc, }, diff --git a/azurerm/resource_arm_log_analytics_workspace_test.go b/azurerm/resource_arm_log_analytics_workspace_test.go index ca76d9fd95ba..8cd26c17a09f 100644 --- a/azurerm/resource_arm_log_analytics_workspace_test.go +++ b/azurerm/resource_arm_log_analytics_workspace_test.go @@ -69,6 +69,7 @@ func TestAccAzureRMLogAnalyticsWorkspace_requiredOnly(t *testing.T) { }, }) } + func TestAccAzureRMLogAnalyticsWorkspace_retentionInDaysComplete(t *testing.T) { ri := acctest.RandInt() config := testAccAzureRMLogAnalyticsWorkspace_retentionInDaysComplete(ri, testLocation()) @@ -143,7 +144,6 @@ func testCheckAzureRMLogAnalyticsWorkspaceExists(name string) resource.TestCheck return nil } } - func testAccAzureRMLogAnalyticsWorkspace_requiredOnly(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -155,7 +155,7 @@ resource "azurerm_log_analytics_workspace" "test" { name = "acctest-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Free" + sku = "PerGB2018" } `, rInt, location, rInt) } @@ -171,7 +171,7 @@ resource "azurerm_log_analytics_workspace" "test" { name = "acctest-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" + sku = "PerGB2018" retention_in_days = 30 } `, rInt, location, rInt) diff --git a/website/docs/r/log_analytics_workspace.html.markdown b/website/docs/r/log_analytics_workspace.html.markdown index 602b88dc395e..6f9bd609441c 100644 --- a/website/docs/r/log_analytics_workspace.html.markdown +++ b/website/docs/r/log_analytics_workspace.html.markdown @@ -37,7 +37,9 @@ The following arguments are supported: * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `sku` - (Required) Specifies the Sku of the Log Analytics Workspace. Possible values are `Free`, `PerNode`, `Premium`, `Standard`, `Standalone` and `Unlimited.` +* `sku` - (Required) Specifies the Sku of the Log Analytics Workspace. Possible values are `Free`, `PerNode`, `Premium`, `Standard`, `Standalone`, `Unlimited`, and `PerGB2018` (new Sku as of `2018-04-03`). + +~> **NOTE:** A new pricing model took effect on `2018-04-03`, which requires the SKU `PerGB2018`. If you're provisioned resources before this date you have the option of remaining with the previous Pricing SKU and using the other SKU's defined above. More information about [the Pricing SKU's is available at the following URI](http://aka.ms/PricingTierWarning). * `retention_in_days` - (Optional) The workspace data retention in days. Possible values range between 30 and 730. From c5c1228adf82f71829ea43d45bfd140b16da4232 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 18 Jun 2018 18:13:29 +0200 Subject: [PATCH 300/320] Updating to include #1079 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 011d059b006a..e1af3b38473b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## 1.8.0 (Unreleased) + +IMPROVEMENTS: + +* `azurerm_log_analytics_workspace` - support for the `PerGB2018` SKU [GH-1079] + ## 1.7.0 (June 16, 2018) UPGRADE NOTES: From f53764481a808a13b6d24ce3299362e1cb6b73b0 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 18 Jun 2018 21:58:40 +0200 Subject: [PATCH 301/320] `azure` -> `azurerm` --- website/docs/r/application_gateway.html.markdown | 6 +++--- website/docs/r/network_interface.html.markdown | 2 +- website/docs/r/subnet.html.markdown | 2 +- website/docs/r/virtual_machine_extension.html.markdown | 2 +- website/docs/r/virtual_network.html.markdown | 2 +- website/docs/r/virtual_network_gateway.html.markdown | 2 +- .../docs/r/virtual_network_gateway_connection.html.markdown | 4 ++-- website/docs/r/virtual_network_peering.html.markdown | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/website/docs/r/application_gateway.html.markdown b/website/docs/r/application_gateway.html.markdown index fda4505642df..221a748cefb0 100644 --- a/website/docs/r/application_gateway.html.markdown +++ b/website/docs/r/application_gateway.html.markdown @@ -1,6 +1,6 @@ --- layout: "azurerm" -page_title: "Azure Resource Manager: azure_application_gateway" +page_title: "Azure Resource Manager: azurerm_application_gateway" sidebar_current: "docs-azurerm-resource-application-gateway" description: |- Manages a application gateway based on a previously created virtual network with configured subnets. @@ -217,8 +217,8 @@ The `backend_http_settings` block supports: * `probe_name` - (Optional) Reference to URL probe. * `authentication_certificate` - (Optional) - A list of `authentication_certificate` references for the `backend_http_setting` to use. Each element consists of: - - * `name` (Required) + + * `name` (Required) * `id` (Calculated) The `http_listener` block supports: diff --git a/website/docs/r/network_interface.html.markdown b/website/docs/r/network_interface.html.markdown index ce179c020474..3cb2972916a9 100644 --- a/website/docs/r/network_interface.html.markdown +++ b/website/docs/r/network_interface.html.markdown @@ -1,6 +1,6 @@ --- layout: "azurerm" -page_title: "Azure Resource Manager: azure_network_interface" +page_title: "Azure Resource Manager: azurerm_network_interface" sidebar_current: "docs-azurerm-resource-network-interface" description: |- Manages a Network Interface located in a Virtual Network, usually attached to a Virtual Machine. diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown index b7bcbf05d6a5..e2e3c2bbb7c0 100644 --- a/website/docs/r/subnet.html.markdown +++ b/website/docs/r/subnet.html.markdown @@ -1,6 +1,6 @@ --- layout: "azurerm" -page_title: "Azure Resource Manager: azure_subnet" +page_title: "Azure Resource Manager: azurerm_subnet" sidebar_current: "docs-azurerm-resource-network-subnet" description: |- Manages a subnet. Subnets represent network segments within the IP space defined by the virtual network. diff --git a/website/docs/r/virtual_machine_extension.html.markdown b/website/docs/r/virtual_machine_extension.html.markdown index 6128eb6a53a6..796f9554e336 100644 --- a/website/docs/r/virtual_machine_extension.html.markdown +++ b/website/docs/r/virtual_machine_extension.html.markdown @@ -1,6 +1,6 @@ --- layout: "azurerm" -page_title: "Azure Resource Manager: azure_virtual_machine_extension" +page_title: "Azure Resource Manager: azurerm_virtual_machine_extension" sidebar_current: "docs-azurerm-resource-compute-virtualmachine-extension" description: |- Manages a Virtual Machine Extension to provide post deployment diff --git a/website/docs/r/virtual_network.html.markdown b/website/docs/r/virtual_network.html.markdown index 151d12c761ee..ada47e904c77 100644 --- a/website/docs/r/virtual_network.html.markdown +++ b/website/docs/r/virtual_network.html.markdown @@ -1,6 +1,6 @@ --- layout: "azurerm" -page_title: "Azure Resource Manager: azure_virtual_network" +page_title: "Azure Resource Manager: azurerm_virtual_network" sidebar_current: "docs-azurerm-resource-network-virtual-network" description: |- Manages a virtual network including any configured subnets. Each subnet can optionally be configured with a security group to be associated with the subnet. diff --git a/website/docs/r/virtual_network_gateway.html.markdown b/website/docs/r/virtual_network_gateway.html.markdown index 857f7a7e935c..ac4ac9219ce8 100644 --- a/website/docs/r/virtual_network_gateway.html.markdown +++ b/website/docs/r/virtual_network_gateway.html.markdown @@ -1,6 +1,6 @@ --- layout: "azurerm" -page_title: "Azure Resource Manager: azure_virtual_network_gateway" +page_title: "Azure Resource Manager: azurerm_virtual_network_gateway" sidebar_current: "docs-azurerm-resource-network-virtual-network-gateway-x" description: |- Manages a virtual network gateway to establish secure, cross-premises connectivity. diff --git a/website/docs/r/virtual_network_gateway_connection.html.markdown b/website/docs/r/virtual_network_gateway_connection.html.markdown index 923ae0a1460a..0407a8c0de91 100644 --- a/website/docs/r/virtual_network_gateway_connection.html.markdown +++ b/website/docs/r/virtual_network_gateway_connection.html.markdown @@ -1,6 +1,6 @@ --- layout: "azurerm" -page_title: "Azure Resource Manager: azure_virtual_network_gateway_connection" +page_title: "Azure Resource Manager: azurerm_virtual_network_gateway_connection" sidebar_current: "docs-azurerm-resource-network-virtual-network-gateway-connection" description: |- Manages a connection in an existing Virtual Network Gateway. @@ -274,7 +274,7 @@ The `ipsec_policy` block supports: * `ipsec_integrity` - (Required) The IPSec integrity algorithm. Valid options are `GCMAES128`, `GCMAES192`, `GCMAES256`, `MD5`, `SHA1`, or `SHA256`. - + * `pfs_group` - (Required) The DH group used in IKE phase 2 for new child SA. Valid options are `ECP256`, `ECP384`, `PFS1`, `PFS2`, `PFS2048`, `PFS24`, or `None`. diff --git a/website/docs/r/virtual_network_peering.html.markdown b/website/docs/r/virtual_network_peering.html.markdown index 46678eb138ac..ca7217bc0618 100644 --- a/website/docs/r/virtual_network_peering.html.markdown +++ b/website/docs/r/virtual_network_peering.html.markdown @@ -1,6 +1,6 @@ --- layout: "azurerm" -page_title: "Azure Resource Manager: azure_virtual_network_peering" +page_title: "Azure Resource Manager: azurerm_virtual_network_peering" sidebar_current: "docs-azurerm-resource-network-virtual-network-peering" description: |- Manages a virtual network peering which allows resources to access other From cbdf4f41c086d006e25f29ad9cdf15bc4b1b3dbc Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 19 Jun 2018 00:06:07 -0700 Subject: [PATCH 302/320] Updates requested in PR --- azurerm/helpers/azure/resourceid.go | 154 ++++++++++++ azurerm/helpers/azure/resourceid_test.go | 235 ++++++++++++++++++ azurerm/helpers/azure/validate.go | 19 ++ .../azure_test.go => azure/validate_test.go} | 6 +- azurerm/helpers/validate/azure.go | 21 -- azurerm/helpers/validate/network_test.go | 4 +- azurerm/helpers/validate/string.go | 19 -- azurerm/helpers/validate/string_test.go | 31 --- azurerm/helpers/validate/time_test.go | 4 +- azurerm/resource_arm_loadbalancer.go | 15 +- azurerm/resource_arm_network_interface.go | 33 +-- 11 files changed, 441 insertions(+), 100 deletions(-) create mode 100644 azurerm/helpers/azure/resourceid.go create mode 100644 azurerm/helpers/azure/resourceid_test.go create mode 100644 azurerm/helpers/azure/validate.go rename azurerm/helpers/{validate/azure_test.go => azure/validate_test.go} (84%) delete mode 100644 azurerm/helpers/validate/azure.go delete mode 100644 azurerm/helpers/validate/string.go delete mode 100644 azurerm/helpers/validate/string_test.go diff --git a/azurerm/helpers/azure/resourceid.go b/azurerm/helpers/azure/resourceid.go new file mode 100644 index 000000000000..e6f6e4136f98 --- /dev/null +++ b/azurerm/helpers/azure/resourceid.go @@ -0,0 +1,154 @@ +package azure + +import ( + "fmt" + "net/url" + "sort" + "strings" +) + +// ResourceID represents a parsed long-form Azure Resource Manager ID +// with the Subscription ID, Resource Group and the Provider as top- +// level fields, and other key-value pairs available via a map in the +// Path field. +type ResourceID struct { + SubscriptionID string + ResourceGroup string + Provider string + Path map[string]string +} + +// parseAzureResourceID converts a long-form Azure Resource Manager ID +// into a ResourceID. We make assumptions about the structure of URLs, +// which is obviously not good, but the best thing available given the +// SDK. +func ParseAzureResourceID(id string) (*ResourceID, error) { + idURL, err := url.ParseRequestURI(id) + if err != nil { + return nil, fmt.Errorf("Cannot parse Azure Id: %s", err) + } + + path := idURL.Path + + path = strings.TrimSpace(path) + if strings.HasPrefix(path, "/") { + path = path[1:] + } + + if strings.HasSuffix(path, "/") { + path = path[:len(path)-1] + } + + components := strings.Split(path, "/") + + // We should have an even number of key-value pairs. + if len(components)%2 != 0 { + return nil, fmt.Errorf("The number of path segments is not divisible by 2 in %q", path) + } + + var subscriptionID string + + // Put the constituent key-value pairs into a map + componentMap := make(map[string]string, len(components)/2) + for current := 0; current < len(components); current += 2 { + key := components[current] + value := components[current+1] + + // Check key/value for empty strings. + if key == "" || value == "" { + return nil, fmt.Errorf("Key/Value cannot be empty strings. Key: '%s', Value: '%s'", key, value) + } + + // Catch the subscriptionID before it can be overwritten by another "subscriptions" + // value in the ID which is the case for the Service Bus subscription resource + if key == "subscriptions" && subscriptionID == "" { + subscriptionID = value + } else { + componentMap[key] = value + } + } + + // Build up a ResourceID from the map + idObj := &ResourceID{} + idObj.Path = componentMap + + if subscriptionID != "" { + idObj.SubscriptionID = subscriptionID + } else { + return nil, fmt.Errorf("No subscription ID found in: %q", path) + } + + if resourceGroup, ok := componentMap["resourceGroups"]; ok { + idObj.ResourceGroup = resourceGroup + delete(componentMap, "resourceGroups") + } else { + // Some Azure APIs are weird and provide things in lower case... + // However it's not clear whether the casing of other elements in the URI + // matter, so we explicitly look for that case here. + if resourceGroup, ok := componentMap["resourcegroups"]; ok { + idObj.ResourceGroup = resourceGroup + delete(componentMap, "resourcegroups") + } else { + return nil, fmt.Errorf("No resource group name found in: %q", path) + } + } + + // It is OK not to have a provider in the case of a resource group + if provider, ok := componentMap["providers"]; ok { + idObj.Provider = provider + delete(componentMap, "providers") + } + + return idObj, nil +} + +func composeAzureResourceID(idObj *ResourceID) (id string, err error) { + if idObj.SubscriptionID == "" || idObj.ResourceGroup == "" { + return "", fmt.Errorf("SubscriptionID and ResourceGroup cannot be empty") + } + + id = fmt.Sprintf("/subscriptions/%s/resourceGroups/%s", idObj.SubscriptionID, idObj.ResourceGroup) + + if idObj.Provider != "" { + if len(idObj.Path) < 1 { + return "", fmt.Errorf("ResourceID.Path should have at least one item when ResourceID.Provider is specified") + } + + id += fmt.Sprintf("/providers/%s", idObj.Provider) + + // sort the path keys so our output is deterministic + var pathKeys []string + for k := range idObj.Path { + pathKeys = append(pathKeys, k) + } + sort.Strings(pathKeys) + + for _, k := range pathKeys { + v := idObj.Path[k] + if k == "" || v == "" { + return "", fmt.Errorf("ResourceID.Path cannot contain empty strings") + } + id += fmt.Sprintf("/%s/%s", k, v) + } + } + + return +} + +func ParseNetworkSecurityGroupName(networkSecurityGroupId string) (string, error) { + id, err := ParseAzureResourceID(networkSecurityGroupId) + if err != nil { + return "", fmt.Errorf("[ERROR] Unable to Parse Network Security Group ID '%s': %+v", networkSecurityGroupId, err) + } + + return id.Path["networkSecurityGroups"], nil +} + +func ParseRouteTableName(routeTableId string) (string, error) { + id, err := ParseAzureResourceID(routeTableId) + if err != nil { + return "", fmt.Errorf("[ERROR] Unable to parse Route Table ID '%s': %+v", routeTableId, err) + } + + return id.Path["routeTables"], nil +} diff --git a/azurerm/helpers/azure/resourceid_test.go b/azurerm/helpers/azure/resourceid_test.go new file mode 100644 index 000000000000..e7a03fa4fba2 --- /dev/null +++ b/azurerm/helpers/azure/resourceid_test.go @@ -0,0 +1,235 @@ +package azure + +import ( + "reflect" + "testing" +) + +func TestParseAzureResourceID(t *testing.T) { + testCases := []struct { + id string + expectedResourceID *ResourceID + expectError bool + }{ + { + // Missing "resourceGroups". + "/subscriptions/00000000-0000-0000-0000-000000000000//myResourceGroup/", + nil, + true, + }, + { + // Empty resource group ID. + "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups//", + nil, + true, + }, + { + "random", + nil, + true, + }, + { + "/subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", + nil, + true, + }, + { + "subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", + nil, + true, + }, + { + "/subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038/resourceGroups/testGroup1", + &ResourceID{ + SubscriptionID: "6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", + ResourceGroup: "testGroup1", + Provider: "", + Path: map[string]string{}, + }, + false, + }, + { + "/subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038/resourceGroups/testGroup1/providers/Microsoft.Network", + &ResourceID{ + SubscriptionID: "6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", + ResourceGroup: "testGroup1", + Provider: "Microsoft.Network", + Path: map[string]string{}, + }, + false, + }, + { + // Missing leading / + "subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038/resourceGroups/testGroup1/providers/Microsoft.Network/virtualNetworks/virtualNetwork1/", + nil, + true, + }, + { + "/subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038/resourceGroups/testGroup1/providers/Microsoft.Network/virtualNetworks/virtualNetwork1", + &ResourceID{ + SubscriptionID: "6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", + ResourceGroup: "testGroup1", + Provider: "Microsoft.Network", + Path: map[string]string{ + "virtualNetworks": "virtualNetwork1", + }, + }, + false, + }, + { + "/subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038/resourceGroups/testGroup1/providers/Microsoft.Network/virtualNetworks/virtualNetwork1?api-version=2006-01-02-preview", + &ResourceID{ + SubscriptionID: "6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", + ResourceGroup: "testGroup1", + Provider: "Microsoft.Network", + Path: map[string]string{ + "virtualNetworks": "virtualNetwork1", + }, + }, + false, + }, + { + "/subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038/resourceGroups/testGroup1/providers/Microsoft.Network/virtualNetworks/virtualNetwork1/subnets/publicInstances1?api-version=2006-01-02-preview", + &ResourceID{ + SubscriptionID: "6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", + ResourceGroup: "testGroup1", + Provider: "Microsoft.Network", + Path: map[string]string{ + "virtualNetworks": "virtualNetwork1", + "subnets": "publicInstances1", + }, + }, + false, + }, + { + "/subscriptions/34ca515c-4629-458e-bf7c-738d77e0d0ea/resourcegroups/acceptanceTestResourceGroup1/providers/Microsoft.Cdn/profiles/acceptanceTestCdnProfile1", + &ResourceID{ + SubscriptionID: "34ca515c-4629-458e-bf7c-738d77e0d0ea", + ResourceGroup: "acceptanceTestResourceGroup1", + Provider: "Microsoft.Cdn", + Path: map[string]string{ + "profiles": "acceptanceTestCdnProfile1", + }, + }, + false, + }, + { + "/subscriptions/34ca515c-4629-458e-bf7c-738d77e0d0ea/resourceGroups/testGroup1/providers/Microsoft.ServiceBus/namespaces/testNamespace1/topics/testTopic1/subscriptions/testSubscription1", + &ResourceID{ + SubscriptionID: "34ca515c-4629-458e-bf7c-738d77e0d0ea", + ResourceGroup: "testGroup1", + Provider: "Microsoft.ServiceBus", + Path: map[string]string{ + "namespaces": "testNamespace1", + "topics": "testTopic1", + "subscriptions": "testSubscription1", + }, + }, + false, + }, + } + + for _, test := range testCases { + parsed, err := ParseAzureResourceID(test.id) + if test.expectError && err != nil { + continue + } + if err != nil { + t.Fatalf("Unexpected error: %s", err) + } + + if !reflect.DeepEqual(test.expectedResourceID, parsed) { + t.Fatalf("Unexpected resource ID:\nExpected: %+v\nGot: %+v\n", test.expectedResourceID, parsed) + } + } +} + +func TestComposeAzureResourceID(t *testing.T) { + testCases := []struct { + resourceID *ResourceID + expectedID string + expectError bool + }{ + { + &ResourceID{ + SubscriptionID: "00000000-0000-0000-0000-000000000000", + ResourceGroup: "testGroup1", + Provider: "foo.bar", + Path: map[string]string{ + "k1": "v1", + "k2": "v2", + "k3": "v3", + "k4": "v4", + "k5": "v5", + "k6": "v6", + "k7": "v7", + "k8": "v8", + }, + }, + "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup1/providers/foo.bar/k1/v1/k2/v2/k3/v3/k4/v4/k5/v5/k6/v6/k7/v7/k8/v8", + false, + }, + { + &ResourceID{ + SubscriptionID: "00000000-0000-0000-0000-000000000000", + ResourceGroup: "testGroup1", + }, + "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup1", + false, + }, + { + // If Provider is specified, there must be at least one element in Path. + &ResourceID{ + SubscriptionID: "00000000-0000-0000-0000-000000000000", + ResourceGroup: "testGroup1", + Provider: "foo.bar", + }, + "", + true, + }, + { + // One of the keys in Path is an empty string. + &ResourceID{ + SubscriptionID: "00000000-0000-0000-0000-000000000000", + ResourceGroup: "testGroup1", + Provider: "foo.bar", + Path: map[string]string{ + "k2": "v2", + "": "v1", + }, + }, + "", + true, + }, + { + // One of the values in Path is an empty string. + &ResourceID{ + SubscriptionID: "00000000-0000-0000-0000-000000000000", + ResourceGroup: "testGroup1", + Provider: "foo.bar", + Path: map[string]string{ + "k1": "v1", + "k2": "", + }, + }, + "", + true, + }, + } + + for _, test := range testCases { + idString, err := composeAzureResourceID(test.resourceID) + + if test.expectError && err != nil { + continue + } + + if err != nil { + t.Fatalf("Unexpected error: %s", err) + } + + if test.expectedID != idString { + t.Fatalf("Unexpected resource ID string:\nExpected: %s\nGot: %s\n", test.expectedID, idString) + } + } +} diff --git a/azurerm/helpers/azure/validate.go b/azurerm/helpers/azure/validate.go new file mode 100644 index 000000000000..67b3941eb35d --- /dev/null +++ b/azurerm/helpers/azure/validate.go @@ -0,0 +1,19 @@ +package azure + +import ( + "fmt" +) + +func ValidateResourceId(i interface{}, k string) (_ []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if _, err := ParseAzureResourceID(v); err != nil { + errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) + } + + return +} diff --git a/azurerm/helpers/validate/azure_test.go b/azurerm/helpers/azure/validate_test.go similarity index 84% rename from azurerm/helpers/validate/azure_test.go rename to azurerm/helpers/azure/validate_test.go index 5ff5e9cde135..1adcae422730 100644 --- a/azurerm/helpers/validate/azure_test.go +++ b/azurerm/helpers/azure/validate_test.go @@ -1,4 +1,4 @@ -package validate +package azure import "testing" @@ -50,10 +50,10 @@ func TestHelper_Validate_AzureResourceId(t *testing.T) { } for _, tc := range cases { - _, errors := AzureResourceId(tc.Id, "test") + _, errors := ValidateResourceId(tc.Id, "test") if len(errors) < tc.Errors { - t.Fatalf("Expected AzureResourceId to have an error for '%q'", tc.Id) + t.Fatalf("Expected AzureResourceId to have an error for %q", tc.Id) } } } diff --git a/azurerm/helpers/validate/azure.go b/azurerm/helpers/validate/azure.go deleted file mode 100644 index 6b3f5b75d97f..000000000000 --- a/azurerm/helpers/validate/azure.go +++ /dev/null @@ -1,21 +0,0 @@ -package validate - -import ( - "fmt" - "regexp" -) - -func AzureResourceId(i interface{}, k string) (_ []string, errors []error) { - v, ok := i.(string) - if !ok { - errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) - return - } - - //todo, match subscription/{guid} and provider/name.name perhaps? - if matched := regexp.MustCompile(`(/subscriptions/)|(/providers/)`).Match([]byte(v)); !matched { - errors = append(errors, fmt.Errorf("azure resource ID %q should start with with '/subscriptions/{subscriptionId}' or '/providers/{resourceProviderNamespace}/'", k)) - } - - return -} diff --git a/azurerm/helpers/validate/network_test.go b/azurerm/helpers/validate/network_test.go index dd865cb371e3..c903627a5435 100644 --- a/azurerm/helpers/validate/network_test.go +++ b/azurerm/helpers/validate/network_test.go @@ -45,7 +45,7 @@ func TestHelper_Validate_Ip4Address(t *testing.T) { _, errors := Ip4Address(tc.Ip, "test") if len(errors) < tc.Errors { - t.Fatalf("Expected AzureResourceId to have an error for '%q'", tc.Ip) + t.Fatalf("Expected AzureResourceId to have an error for %q", tc.Ip) } } } @@ -89,7 +89,7 @@ func TestHelper_Validate_MacAddress(t *testing.T) { _, errors := Ip4Address(tc.Ip, "test") if len(errors) < tc.Errors { - t.Fatalf("Expected AzureResourceId to have an error for '%q'", tc.Ip) + t.Fatalf("Expected AzureResourceId to have an error for %q", tc.Ip) } } } diff --git a/azurerm/helpers/validate/string.go b/azurerm/helpers/validate/string.go deleted file mode 100644 index 8b1dc2040cd9..000000000000 --- a/azurerm/helpers/validate/string.go +++ /dev/null @@ -1,19 +0,0 @@ -package validate - -import ( - "fmt" -) - -func StringNotEmpty(i interface{}, k string) (_ []string, errors []error) { - v, ok := i.(string) - if !ok { - errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) - return - } - - if len(v) == 0 { - errors = append(errors, fmt.Errorf("%q is an empty string", k)) - } - - return -} diff --git a/azurerm/helpers/validate/string_test.go b/azurerm/helpers/validate/string_test.go deleted file mode 100644 index 014b63417c6f..000000000000 --- a/azurerm/helpers/validate/string_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package validate - -import "testing" - -func TestHelper_Validate_StringNotEmpty(t *testing.T) { - cases := []struct { - String string - Errors int - }{ - { - String: "", - Errors: 1, - }, - { - String: "k", - Errors: 0, - }, - { - String: "a longer string", - Errors: 0, - }, - } - - for _, tc := range cases { - _, errors := StringNotEmpty(tc.String, "test") - - if len(errors) < tc.Errors { - t.Fatalf("Expected StringNotEmpty to have an error for '%q'", tc.String) - } - } -} diff --git a/azurerm/helpers/validate/time_test.go b/azurerm/helpers/validate/time_test.go index 8cb584566fa6..96744f83af90 100644 --- a/azurerm/helpers/validate/time_test.go +++ b/azurerm/helpers/validate/time_test.go @@ -40,7 +40,7 @@ func TestHelper_Validate_RFC3339Time(t *testing.T) { _, errors := Rfc3339Time(tc.Time, "test") if len(errors) != tc.Errors { - t.Fatalf("Expected Rfc3339Time to have an error for '%q'", tc.Time) + t.Fatalf("Expected Rfc3339Time to have an error for %q", tc.Time) } } } @@ -82,7 +82,7 @@ func TestHelper_Validate_Rfc3339DateInFutureBy(t *testing.T) { _, errors := Rfc3339DateInFutureBy(tc.Duration)(tc.Time, "test") if len(errors) < tc.Errors { - t.Fatalf("Expected Rfc3339DateInFutureBy to have an error for '%q' in future by `%q`", tc.Time, tc.Duration.String()) + t.Fatalf("Expected Rfc3339DateInFutureBy to have an error for %q in future by %q", tc.Time, tc.Duration.String()) } } } diff --git a/azurerm/resource_arm_loadbalancer.go b/azurerm/resource_arm_loadbalancer.go index 4fd1f04d38f0..72b4b7bde9b9 100644 --- a/azurerm/resource_arm_loadbalancer.go +++ b/azurerm/resource_arm_loadbalancer.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,6 +21,7 @@ func resourceArmLoadBalancer() *schema.Resource { Read: resourceArmLoadBalancerRead, Update: resourceArmLoadBalancerCreate, Delete: resourceArmLoadBalancerDelete, + Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -57,28 +58,28 @@ func resourceArmLoadBalancer() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.StringNotEmpty, + ValidateFunc: validation.NoZeroValues, }, "subnet_id": { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validate.AzureResourceId, + ValidateFunc: azure.ValidateResourceId, }, "private_ip_address": { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validate.AzureResourceId, + ValidateFunc: azure.ValidateResourceId, }, "public_ip_address_id": { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validate.AzureResourceId, + ValidateFunc: azure.ValidateResourceId, }, "private_ip_address_allocation": { @@ -98,7 +99,7 @@ func resourceArmLoadBalancer() *schema.Resource { Computed: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.StringNotEmpty, + ValidateFunc: validation.NoZeroValues, }, Set: schema.HashString, }, @@ -108,7 +109,7 @@ func resourceArmLoadBalancer() *schema.Resource { Computed: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.StringNotEmpty, + ValidateFunc: validation.NoZeroValues, }, Set: schema.HashString, }, diff --git a/azurerm/resource_arm_network_interface.go b/azurerm/resource_arm_network_interface.go index 141efc165ec1..1dd50ccca38c 100644 --- a/azurerm/resource_arm_network_interface.go +++ b/azurerm/resource_arm_network_interface.go @@ -8,6 +8,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -18,6 +20,7 @@ func resourceArmNetworkInterface() *schema.Resource { Read: resourceArmNetworkInterfaceRead, Update: resourceArmNetworkInterfaceCreateUpdate, Delete: resourceArmNetworkInterfaceDelete, + Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -36,7 +39,7 @@ func resourceArmNetworkInterface() *schema.Resource { "network_security_group_id": { Type: schema.TypeString, Optional: true, - ValidateFunc: validate.AzureResourceId, + ValidateFunc: azure.ValidateResourceId, }, "mac_address": { @@ -50,7 +53,7 @@ func resourceArmNetworkInterface() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validate.AzureResourceId, + ValidateFunc: azure.ValidateResourceId, }, "ip_configuration": { @@ -61,14 +64,14 @@ func resourceArmNetworkInterface() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.StringNotEmpty, + ValidateFunc: validation.NoZeroValues, }, "subnet_id": { Type: schema.TypeString, Required: true, - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, - ValidateFunc: validate.AzureResourceId, + DiffSuppressFunc: suppress.CaseDifference, + ValidateFunc: azure.ValidateResourceId, }, "private_ip_address": { @@ -84,13 +87,13 @@ func resourceArmNetworkInterface() *schema.Resource { string(network.Static), }, true), StateFunc: ignoreCaseStateFunc, - DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + DiffSuppressFunc: suppress.CaseDifference, }, "public_ip_address_id": { Type: schema.TypeString, Optional: true, - ValidateFunc: validate.AzureResourceId, + ValidateFunc: azure.ValidateResourceId, }, "application_gateway_backend_address_pools_ids": { @@ -99,7 +102,7 @@ func resourceArmNetworkInterface() *schema.Resource { Computed: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.AzureResourceId, + ValidateFunc: azure.ValidateResourceId, }, Set: schema.HashString, }, @@ -110,7 +113,7 @@ func resourceArmNetworkInterface() *schema.Resource { Computed: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.AzureResourceId, + ValidateFunc: azure.ValidateResourceId, }, Set: schema.HashString, }, @@ -121,7 +124,7 @@ func resourceArmNetworkInterface() *schema.Resource { Computed: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.AzureResourceId, + ValidateFunc: azure.ValidateResourceId, }, Set: schema.HashString, }, @@ -132,7 +135,7 @@ func resourceArmNetworkInterface() *schema.Resource { Computed: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.AzureResourceId, + ValidateFunc: azure.ValidateResourceId, }, Set: schema.HashString, }, @@ -152,7 +155,7 @@ func resourceArmNetworkInterface() *schema.Resource { Computed: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.StringNotEmpty, + ValidateFunc: validation.NoZeroValues, }, Set: schema.HashString, }, @@ -161,7 +164,7 @@ func resourceArmNetworkInterface() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validate.StringNotEmpty, + ValidateFunc: validation.NoZeroValues, }, "applied_dns_servers": { @@ -170,7 +173,7 @@ func resourceArmNetworkInterface() *schema.Resource { Computed: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.StringNotEmpty, + ValidateFunc: validation.NoZeroValues, }, Set: schema.HashString, }, @@ -179,7 +182,7 @@ func resourceArmNetworkInterface() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validate.StringNotEmpty, + ValidateFunc: validation.NoZeroValues, }, /** From a454b5c9d30dacba8c77f70748e9b184a6c055dd Mon Sep 17 00:00:00 2001 From: Henry Buckle Date: Tue, 19 Jun 2018 11:59:08 +0100 Subject: [PATCH 303/320] `azurerm_sql_database` - support for importing from bacpac (#972) * add database_import property * add option to import database from bacpac * PR tweaks * rename database_import to import * add acc test * Handling case-insensitivity --- azurerm/resource_arm_sql_database.go | 95 ++++++++++++++++++++++ azurerm/resource_arm_sql_database_test.go | 89 ++++++++++++++++++++ azurerm/testdata/sql_import.bacpac | Bin 0 -> 3016 bytes website/docs/r/sql_database.html.markdown | 12 +++ 4 files changed, 196 insertions(+) create mode 100644 azurerm/testdata/sql_import.bacpac diff --git a/azurerm/resource_arm_sql_database.go b/azurerm/resource_arm_sql_database.go index 30f2b03a184f..0483646ac8db 100644 --- a/azurerm/resource_arm_sql_database.go +++ b/azurerm/resource_arm_sql_database.go @@ -3,6 +3,7 @@ package azurerm import ( "fmt" "log" + "strings" "time" "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql" @@ -57,6 +58,61 @@ func resourceArmSqlDatabase() *schema.Resource { DiffSuppressFunc: ignoreCaseDiffSuppressFunc, }, + "import": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "storage_uri": { + Type: schema.TypeString, + Required: true, + }, + "storage_key": { + Type: schema.TypeString, + Required: true, + Sensitive: true, + }, + "storage_key_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "StorageAccessKey", + "SharedAccessKey", + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + "administrator_login": { + Type: schema.TypeString, + Required: true, + }, + "administrator_login_password": { + Type: schema.TypeString, + Required: true, + Sensitive: true, + }, + "authentication_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "ADPassword", + "SQL", + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + "operation_mode": { + Type: schema.TypeString, + Optional: true, + Default: "Import", + ValidateFunc: validation.StringInSlice([]string{ + "Import", + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + }, + }, + }, + "source_database_id": { Type: schema.TypeString, Optional: true, @@ -238,6 +294,27 @@ func resourceArmSqlDatabaseCreateUpdate(d *schema.ResourceData, meta interface{} return err } + if _, ok := d.GetOk("import"); ok { + if !strings.EqualFold(createMode, "default") { + return fmt.Errorf("import can only be used when create_mode is Default") + } + importParameters := expandAzureRmSqlDatabaseImport(d) + importFuture, err := client.CreateImportOperation(ctx, resourceGroup, serverName, name, importParameters) + if err != nil { + return err + } + + // this is set in config.go, but something sets + // it back to 15 minutes, which isn't long enough + // for most imports + client.Client.PollingDuration = 60 * time.Minute + + err = importFuture.WaitForCompletion(ctx, client.Client) + if err != nil { + return err + } + } + resp, err := client.Get(ctx, resourceGroup, serverName, name, "") if err != nil { return err @@ -356,3 +433,21 @@ func flattenEncryptionStatus(encryption *[]sql.TransparentDataEncryption) string return "" } + +func expandAzureRmSqlDatabaseImport(d *schema.ResourceData) sql.ImportExtensionRequest { + v := d.Get("import") + dbimportRefs := v.([]interface{}) + dbimportRef := dbimportRefs[0].(map[string]interface{}) + return sql.ImportExtensionRequest{ + Name: utils.String("terraform"), + ImportExtensionProperties: &sql.ImportExtensionProperties{ + StorageKeyType: sql.StorageKeyType(dbimportRef["storage_key_type"].(string)), + StorageKey: utils.String(dbimportRef["storage_key"].(string)), + StorageURI: utils.String(dbimportRef["storage_uri"].(string)), + AdministratorLogin: utils.String(dbimportRef["administrator_login"].(string)), + AdministratorLoginPassword: utils.String(dbimportRef["administrator_login_password"].(string)), + AuthenticationType: sql.AuthenticationType(dbimportRef["authentication_type"].(string)), + OperationMode: utils.String(dbimportRef["operation_mode"].(string)), + }, + } +} diff --git a/azurerm/resource_arm_sql_database_test.go b/azurerm/resource_arm_sql_database_test.go index 964dc6f22a6d..cc8fbfd022d5 100644 --- a/azurerm/resource_arm_sql_database_test.go +++ b/azurerm/resource_arm_sql_database_test.go @@ -265,6 +265,25 @@ func testCheckAzureRMSqlDatabaseDisappears(name string) resource.TestCheckFunc { } } +func TestAccAzureRMSqlDatabase_bacpac(t *testing.T) { + ri := acctest.RandInt() + config := testAccAzureRMSqlDatabase_bacpac(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMSqlDatabaseDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSqlDatabaseExists("azurerm_sql_database.test"), + ), + }, + }, + }) +} + func testAccAzureRMSqlDatabase_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -496,3 +515,73 @@ resource "azurerm_sql_database" "test" { } `, rInt, location, rInt, rInt) } + +func testAccAzureRMSqlDatabase_bacpac(rInt int, location string) string { + return fmt.Sprintf(` + resource "azurerm_resource_group" "test" { + name = "acctestRG_%d" + location = "%s" + } + + resource "azurerm_storage_account" "test" { + name = "accsa%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + account_tier = "Standard" + account_replication_type = "LRS" + } + + resource "azurerm_storage_container" "test" { + name = "bacpac" + resource_group_name = "${azurerm_resource_group.test.name}" + storage_account_name = "${azurerm_storage_account.test.name}" + container_access_type = "private" + } + + resource "azurerm_storage_blob" "test" { + name = "test.bacpac" + resource_group_name = "${azurerm_resource_group.test.name}" + storage_account_name = "${azurerm_storage_account.test.name}" + storage_container_name = "${azurerm_storage_container.test.name}" + type = "block" + source = "testdata/sql_import.bacpac" + } + + resource "azurerm_sql_server" "test" { + name = "acctestsqlserver%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + version = "12.0" + administrator_login = "mradministrator" + administrator_login_password = "thisIsDog11" + } + + resource "azurerm_sql_firewall_rule" "test" { + name = "allowazure" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_sql_server.test.name}" + start_ip_address = "0.0.0.0" + end_ip_address = "0.0.0.0" + } + + resource "azurerm_sql_database" "test" { + name = "acctestdb%d" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_sql_server.test.name}" + location = "${azurerm_resource_group.test.location}" + edition = "Standard" + collation = "SQL_Latin1_General_CP1_CI_AS" + max_size_bytes = "1073741824" + requested_service_objective_name = "S0" + + import { + storage_uri = "${azurerm_storage_blob.test.url}" + storage_key = "${azurerm_storage_account.test.primary_access_key}" + storage_key_type = "StorageAccessKey" + administrator_login = "${azurerm_sql_server.test.administrator_login}" + administrator_login_password = "${azurerm_sql_server.test.administrator_login_password}" + authentication_type = "SQL" + } + } + `, rInt, location, rInt, rInt, rInt) +} diff --git a/azurerm/testdata/sql_import.bacpac b/azurerm/testdata/sql_import.bacpac new file mode 100644 index 0000000000000000000000000000000000000000..98825ab441bb5bf9ad4e515bd99648a3e1af726d GIT binary patch literal 3016 zcmbtWd0Z1`8XiEAqgEDa5v1-kH4ua(Gs)y6Ny`yj4MOCQu81;81{ul4%mhS5cRjFb ztJP``JP}1HZK1Uu*i|cvwpv$E&{|Ynq`O{VTdmZq?KcTY!Q#(9HpwKvyx)61@AJLi zr`P!m34tKU56ab9Q_dw-c@y3clsgQ9{GkZQVlxqD!EB2e-Z~26ZDAGv{OZoiEo?_Z z%6jsCJN!%8yBk-2{M-(%?w#OsACcyOs@BWfxq%=hPRJn6kp zMnqJnuWQ|4IqcI>_}lgKzK7>_#I?3%Pi<`8yldJ7{`p8d6F-i7K7NJYnwXwV1u|xC zSX;9-cJ06Nhw?f`>;7F6|J~IMFT5_ecz9pN)MGupsN2S9C#Yu>MWzUe(LoMM(JD_A6CG`8Zg7}(9IrJ_3vRjLH-vX0 z`>OWy@Y7SOj`n_a1QV+p&xL+&Uley?jYFzhuH1d*H8iF^bWi@4>0U48Y~QY2EZKc= ztfFU3(Fc<+kKA@bvm|YMaNvHgi^$t?fzv0?o25wm&$*N#r{p2R+7Hrqd+l00t+W2- z+I96`;wSkJ68AL;DmSh;Xv$i8dyb=}gGbg{x4rL+XI?6kcZG+H;WS_FI`@y@wNYn2 zj0n@@96R+*Qx&0_5j*ov%TMjv86{DXz26$B8Ofv7XNcRYVS|o)w&yOlydr;BUGcV^ z$l>sRkYOZS9~TwS~W>sz5aKaG!k|Dj*cPxJn=AzOMi_V|08cS2Vkot?8=CSKln zAgbHk3O(`)jawp={TQ$I@0t={w5II1TvK;rug|Y_$?_fHkM9RwefZ0Qd8bzjBTM!s zq|9%4rFVh1egIGJ{`X<}Ccwla;28mUnuHrC5e#m^8T?snm8|^q`9^ru;*yaa|Excm z78jOyy|c4(Yf;o)n=XBeclgh35%b2*h+kOI-XkdKcz8d!`&4Sz@|VMJhfhUQ{gvHu zSIf(%ryrVnc8Va>P4YdDKy}_#~`oi@)(*-G068%Fqg>ijy*0 zIZCxYa8=g}vGtEOcig_y_P^3=Z7Yto4wcr&#ORM|R7&e}De0l(w#!noVtq3d7 zcKW0D-}Qa(M9?xieQA+>&G+BtF~439Z!F7tsd?CohG^4$sJ1Tii<(f!`dtU`I}xqK zO+L>jVb_&eRc-q^yZ_48762-Npgb^Y>=s|-MPCSFp8!x>8b!_|ts@g0m6X^tI=j6tuxge2b0g2b6(X94^RP8xSYbkz)Gt*1q@?X3Wc<>fUw}S zz(N`+8*R&H1V)=hNEexDf&y-ZCfq2@ASeQ5VOePScGE^=X#UO|h0fre2tJr6ywVE^tf}nioC)23{ zv;;uLzEnb1p-&g|)#NZTES{Q49*SfXnE@vNJp_POv2b5E)F|cxDHcw2m>CB}sI7#9 zp>T67talj9q)|tdX4(n~tJ;8w^CkJRd=xcF5L}D{#QFsq7~9Por+2YbA`*x_>h86H z78y=XYyMw`d!qFDV}q!K1AC});oyeL_0OG^2QWBeatiEPgF&~XFfT)o@)NVLXqcx< zzz`88MkLWNA4b{Tf?=3cfWW-hrC@z{fd52?83s1MPzIxNB_da13Ra$IvzLN7QNX}F zV>J9nutXaLwv>}+KuZgTBxR>ant-(?lHI{d7-$fD15OhrIE6G4RvJtTm?y>f29k+} zZB{s&w3=)s^nje%-2`-jH&`kV!;xkt4rCZPlZk_Q2@cY1f>BJY5G!F&)Zf5Jriw}0 zMn!|!!w!&Qf^x&s*Q_+dEW!wOnZwHT+sAAaHnTK4n<}kARl+AlE_=`mJwaJWnw@-r z-weTST8#*FZ4hx^OyQq`x|4HuP?cCf7z=5K#hs8x0B2F8nj`dF0XZ5(B2E@3DiV_9 zC@Mqb5{X2tKodj?M2m_MnJ5{-4}wl@B!7$?bCRv;(ofgTf(DzvEG_8w!q02pR(3-Qc&$>Ed^%x%o!` literal 0 HcmV?d00001 diff --git a/website/docs/r/sql_database.html.markdown b/website/docs/r/sql_database.html.markdown index 4d402d27db35..8bfacf83daa9 100644 --- a/website/docs/r/sql_database.html.markdown +++ b/website/docs/r/sql_database.html.markdown @@ -52,6 +52,8 @@ The following arguments are supported: * `create_mode` - (Optional) Specifies the type of database to create. Defaults to `Default`. See below for the accepted values/ +* `import` - (Optional) A Database Import block as documented below. `create_mode` must be set to `Default`. + * `source_database_id` - (Optional) The URI of the source database if `create_mode` value is not `Default`. * `restore_point_in_time` - (Optional) The point in time for the restore. Only applies if `create_mode` is `PointInTimeRestore` e.g. 2013-11-08T22:00:40Z @@ -73,6 +75,16 @@ The following arguments are supported: * `tags` - (Optional) A mapping of tags to assign to the resource. +`import` supports the following: + +* `storage_uri` - (Required) Specifies the blob URI of the .bacpac file. +* `storage_key` - (Required) Specifies the access key for the storage account. +* `storage_key_type` - (Required) Specifies the type of access key for the storage account. Valid values are `StorageAccessKey` or `SharedAccessKey`. +* `administrator_login` - (Required) Specifies the name of the SQL administrator. +* `administrator_login_password` - (Required) Specifies the password of the SQL administrator. +* `authentication_type` - (Required) Specifies the type of authentication used to access the server. Valid values are `SQL` or `ADPassword`. +* `operation_mode` - (Optional) Specifies the type of import operation being performed. The only allowable value is `Import`. + ## Attributes Reference The following attributes are exported: From 28a538c284bdbd1090000e9819aaa4aeb84a3a6e Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 19 Jun 2018 12:59:28 +0200 Subject: [PATCH 304/320] Updating to include #972 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1af3b38473b..64c0c19732b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ IMPROVEMENTS: * `azurerm_log_analytics_workspace` - support for the `PerGB2018` SKU [GH-1079] +* `azurerm_sql_database` - support for importing from a bacpac backup [GH-972] ## 1.7.0 (June 16, 2018) From 83e0562923954dfd67757a05275adf892c4af42d Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 19 Jun 2018 12:59:42 +0200 Subject: [PATCH 305/320] Updating to include #972 From 802cac4a6ebb8d5fd39245f473da407cf689caf9 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 19 Jun 2018 12:59:43 +0200 Subject: [PATCH 306/320] Updating to include #972 From 2cd6f50e3fb2aec2f46cd45455cbd871c6801d0a Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 19 Jun 2018 15:01:44 +0200 Subject: [PATCH 307/320] Log Analytics: support for Sovereign clouds (#1410) * Supporting Sovereign clouds for Log Analytics * Fixing the SKU on the Log Analytics Solution to the new pricing structure --- azurerm/config.go | 4 ++-- azurerm/resource_arm_log_analytics_solution_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azurerm/config.go b/azurerm/config.go index fd23c447d24f..aace35012b63 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -799,11 +799,11 @@ func (c *ArmClient) registerNetworkingClients(endpoint, subscriptionId string, a } func (c *ArmClient) registerOperationalInsightsClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) { - opwc := operationalinsights.NewWorkspacesClient(subscriptionId) + opwc := operationalinsights.NewWorkspacesClientWithBaseURI(endpoint, subscriptionId) c.configureClient(&opwc.Client, auth) c.workspacesClient = opwc - solutionsClient := operationsmanagement.NewSolutionsClient(subscriptionId, "Microsoft.OperationsManagement", "solutions", "testing") + solutionsClient := operationsmanagement.NewSolutionsClientWithBaseURI(endpoint, subscriptionId, "Microsoft.OperationsManagement", "solutions", "testing") c.configureClient(&solutionsClient.Client, auth) c.solutionsClient = solutionsClient } diff --git a/azurerm/resource_arm_log_analytics_solution_test.go b/azurerm/resource_arm_log_analytics_solution_test.go index 52b5edd0c0ef..f908ae3a953c 100644 --- a/azurerm/resource_arm_log_analytics_solution_test.go +++ b/azurerm/resource_arm_log_analytics_solution_test.go @@ -113,7 +113,7 @@ resource "azurerm_log_analytics_workspace" "test" { name = "acctest-dep-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Free" + sku = "PerGB2018" } resource "azurerm_log_analytics_solution" "test" { @@ -142,7 +142,7 @@ resource "azurerm_log_analytics_workspace" "test" { name = "acctest-dep-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Free" + sku = "PerGB2018" } resource "azurerm_log_analytics_solution" "test" { From ffd34655fbdae6cfeff48b204849a470c3c94902 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 19 Jun 2018 15:02:21 +0200 Subject: [PATCH 308/320] Updating to include #1410 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64c0c19732b3..b1aa07d1fab9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ IMPROVEMENTS: +* `azurerm_log_analytics_solution` - support for Sovereign Clouds [GH-1410] +* `azurerm_log_analytics_workspace` - support for Sovereign Clouds [GH-1410] * `azurerm_log_analytics_workspace` - support for the `PerGB2018` SKU [GH-1079] * `azurerm_sql_database` - support for importing from a bacpac backup [GH-972] From ee2dc7554c9edc71f94cc165ac0467f7e61bff1e Mon Sep 17 00:00:00 2001 From: SGheethan Date: Tue, 19 Jun 2018 15:05:13 +0200 Subject: [PATCH 309/320] Vm size DS1 does not exist. Replaced it with D1 (#1406) --- website/docs/r/kubernetes_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown index d7f3c5ee6eb1..b8decd001efe 100644 --- a/website/docs/r/kubernetes_cluster.html.markdown +++ b/website/docs/r/kubernetes_cluster.html.markdown @@ -39,7 +39,7 @@ resource "azurerm_kubernetes_cluster" "test" { agent_pool_profile { name = "default" count = 1 - vm_size = "Standard_DS1_v2" + vm_size = "Standard_D1_v2" os_type = "Linux" os_disk_size_gb = 30 } From 23b09797dddfda82bfdb5e8f17268fd2d2f4a3a5 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 19 Jun 2018 18:31:28 +0200 Subject: [PATCH 310/320] Container Registry: reporting on errors when updating & making errors consistant (#1413) --- azurerm/resource_arm_container_registry.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/azurerm/resource_arm_container_registry.go b/azurerm/resource_arm_container_registry.go index 200359dd21c7..89064aa4016d 100644 --- a/azurerm/resource_arm_container_registry.go +++ b/azurerm/resource_arm_container_registry.go @@ -144,21 +144,21 @@ func resourceArmContainerRegistryCreate(d *schema.ResourceData, meta interface{} future, err := client.Create(ctx, resourceGroup, name, parameters) if err != nil { - return err + return fmt.Errorf("Error creating Container Registry %q (Resource Group %q): %+v", name, resourceGroup, err) } err = future.WaitForCompletion(ctx, client.Client) if err != nil { - return err + return fmt.Errorf("Error waiting for creation of Container Registry %q (Resource Group %q): %+v", name, resourceGroup, err) } read, err := client.Get(ctx, resourceGroup, name) if err != nil { - return err + return fmt.Errorf("Error retrieving Container Registry %q (Resource Group %q): %+v", name, resourceGroup, err) } if read.ID == nil { - return fmt.Errorf("Cannot read Container Registry %s (resource group %s) ID", name, resourceGroup) + return fmt.Errorf("Cannot read Container Registry %q (resource group %q) ID", name, resourceGroup) } d.SetId(*read.ID) @@ -205,14 +205,17 @@ func resourceArmContainerRegistryUpdate(d *schema.ResourceData, meta interface{} future, err := client.Update(ctx, resourceGroup, name, parameters) if err != nil { - return err + return fmt.Errorf("Error updating Container Registry %q (Resource Group %q): %+v", name, resourceGroup, err) } err = future.WaitForCompletion(ctx, client.Client) + if err != nil { + return fmt.Errorf("Error waiting for update of Container Registry %q (Resource Group %q): %+v", name, resourceGroup, err) + } read, err := client.Get(ctx, resourceGroup, name) if err != nil { - return err + return fmt.Errorf("Error retrieving Container Registry %q (Resource Group %q): %+v", name, resourceGroup, err) } if read.ID == nil { @@ -238,11 +241,12 @@ func resourceArmContainerRegistryRead(d *schema.ResourceData, meta interface{}) resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[DEBUG] Container Registry %q was not found in Resource Group %q", name, resourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error making Read request on Azure Container Registry %q: %+v", name, err) + return fmt.Errorf("Error making Read request on Azure Container Registry %q (Resource Group %q): %+v", name, resourceGroup, err) } d.Set("name", resp.Name) From 666033fdf91cc844c464e1911156c227dfe05e2e Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 19 Jun 2018 01:51:44 -0700 Subject: [PATCH 311/320] Updates requested in PR --- azurerm/resource_arm_loadbalancer.go | 3 +- azurerm/resourceid.go | 123 ++------------ azurerm/resourceid_test.go | 235 --------------------------- 3 files changed, 15 insertions(+), 346 deletions(-) delete mode 100644 azurerm/resourceid_test.go diff --git a/azurerm/resource_arm_loadbalancer.go b/azurerm/resource_arm_loadbalancer.go index 72b4b7bde9b9..982a2c8680f2 100644 --- a/azurerm/resource_arm_loadbalancer.go +++ b/azurerm/resource_arm_loadbalancer.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -72,7 +73,7 @@ func resourceArmLoadBalancer() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: azure.ValidateResourceId, + ValidateFunc: validate.Ip4Address, }, "public_ip_address_id": { diff --git a/azurerm/resourceid.go b/azurerm/resourceid.go index 5523b43f23bf..1cc213c26df4 100644 --- a/azurerm/resourceid.go +++ b/azurerm/resourceid.go @@ -2,11 +2,13 @@ package azurerm import ( "fmt" - "net/url" - "sort" - "strings" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" ) +//PLEASE NOTE: This code has been moved to terraform-provider-azurerm/azurerm/helpers/azure +//this file is simply a shim to prevent mass code changes + // ResourceID represents a parsed long-form Azure Resource Manager ID // with the Subscription ID, Resource Group and the Provider as top- // level fields, and other key-value pairs available via a map in the @@ -23,116 +25,17 @@ type ResourceID struct { // which is obviously not good, but the best thing available given the // SDK. func parseAzureResourceID(id string) (*ResourceID, error) { - idURL, err := url.ParseRequestURI(id) + parsed, err := azure.ParseAzureResourceID(id) if err != nil { - return nil, fmt.Errorf("Cannot parse Azure Id: %s", err) - } - - path := idURL.Path - - path = strings.TrimSpace(path) - if strings.HasPrefix(path, "/") { - path = path[1:] - } - - if strings.HasSuffix(path, "/") { - path = path[:len(path)-1] - } - - components := strings.Split(path, "/") - - // We should have an even number of key-value pairs. - if len(components)%2 != 0 { - return nil, fmt.Errorf("The number of path segments is not divisible by 2 in %q", path) - } - - var subscriptionID string - - // Put the constituent key-value pairs into a map - componentMap := make(map[string]string, len(components)/2) - for current := 0; current < len(components); current += 2 { - key := components[current] - value := components[current+1] - - // Check key/value for empty strings. - if key == "" || value == "" { - return nil, fmt.Errorf("Key/Value cannot be empty strings. Key: '%s', Value: '%s'", key, value) - } - - // Catch the subscriptionID before it can be overwritten by another "subscriptions" - // value in the ID which is the case for the Service Bus subscription resource - if key == "subscriptions" && subscriptionID == "" { - subscriptionID = value - } else { - componentMap[key] = value - } - } - - // Build up a ResourceID from the map - idObj := &ResourceID{} - idObj.Path = componentMap - - if subscriptionID != "" { - idObj.SubscriptionID = subscriptionID - } else { - return nil, fmt.Errorf("No subscription ID found in: %q", path) - } - - if resourceGroup, ok := componentMap["resourceGroups"]; ok { - idObj.ResourceGroup = resourceGroup - delete(componentMap, "resourceGroups") - } else { - // Some Azure APIs are weird and provide things in lower case... - // However it's not clear whether the casing of other elements in the URI - // matter, so we explicitly look for that case here. - if resourceGroup, ok := componentMap["resourcegroups"]; ok { - idObj.ResourceGroup = resourceGroup - delete(componentMap, "resourcegroups") - } else { - return nil, fmt.Errorf("No resource group name found in: %q", path) - } - } - - // It is OK not to have a provider in the case of a resource group - if provider, ok := componentMap["providers"]; ok { - idObj.Provider = provider - delete(componentMap, "providers") - } - - return idObj, nil -} - -func composeAzureResourceID(idObj *ResourceID) (id string, err error) { - if idObj.SubscriptionID == "" || idObj.ResourceGroup == "" { - return "", fmt.Errorf("SubscriptionID and ResourceGroup cannot be empty") - } - - id = fmt.Sprintf("/subscriptions/%s/resourceGroups/%s", idObj.SubscriptionID, idObj.ResourceGroup) - - if idObj.Provider != "" { - if len(idObj.Path) < 1 { - return "", fmt.Errorf("ResourceID.Path should have at least one item when ResourceID.Provider is specified") - } - - id += fmt.Sprintf("/providers/%s", idObj.Provider) - - // sort the path keys so our output is deterministic - var pathKeys []string - for k := range idObj.Path { - pathKeys = append(pathKeys, k) - } - sort.Strings(pathKeys) - - for _, k := range pathKeys { - v := idObj.Path[k] - if k == "" || v == "" { - return "", fmt.Errorf("ResourceID.Path cannot contain empty strings") - } - id += fmt.Sprintf("/%s/%s", k, v) - } + return nil, err } - return + return &ResourceID{ + SubscriptionID: parsed.SubscriptionID, + ResourceGroup: parsed.ResourceGroup, + Provider: parsed.Provider, + Path: parsed.Path, + }, nil } func parseNetworkSecurityGroupName(networkSecurityGroupId string) (string, error) { diff --git a/azurerm/resourceid_test.go b/azurerm/resourceid_test.go deleted file mode 100644 index 6857f181811d..000000000000 --- a/azurerm/resourceid_test.go +++ /dev/null @@ -1,235 +0,0 @@ -package azurerm - -import ( - "reflect" - "testing" -) - -func TestParseAzureResourceID(t *testing.T) { - testCases := []struct { - id string - expectedResourceID *ResourceID - expectError bool - }{ - { - // Missing "resourceGroups". - "/subscriptions/00000000-0000-0000-0000-000000000000//myResourceGroup/", - nil, - true, - }, - { - // Empty resource group ID. - "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups//", - nil, - true, - }, - { - "random", - nil, - true, - }, - { - "/subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", - nil, - true, - }, - { - "subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", - nil, - true, - }, - { - "/subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038/resourceGroups/testGroup1", - &ResourceID{ - SubscriptionID: "6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", - ResourceGroup: "testGroup1", - Provider: "", - Path: map[string]string{}, - }, - false, - }, - { - "/subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038/resourceGroups/testGroup1/providers/Microsoft.Network", - &ResourceID{ - SubscriptionID: "6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", - ResourceGroup: "testGroup1", - Provider: "Microsoft.Network", - Path: map[string]string{}, - }, - false, - }, - { - // Missing leading / - "subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038/resourceGroups/testGroup1/providers/Microsoft.Network/virtualNetworks/virtualNetwork1/", - nil, - true, - }, - { - "/subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038/resourceGroups/testGroup1/providers/Microsoft.Network/virtualNetworks/virtualNetwork1", - &ResourceID{ - SubscriptionID: "6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", - ResourceGroup: "testGroup1", - Provider: "Microsoft.Network", - Path: map[string]string{ - "virtualNetworks": "virtualNetwork1", - }, - }, - false, - }, - { - "/subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038/resourceGroups/testGroup1/providers/Microsoft.Network/virtualNetworks/virtualNetwork1?api-version=2006-01-02-preview", - &ResourceID{ - SubscriptionID: "6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", - ResourceGroup: "testGroup1", - Provider: "Microsoft.Network", - Path: map[string]string{ - "virtualNetworks": "virtualNetwork1", - }, - }, - false, - }, - { - "/subscriptions/6d74bdd2-9f84-11e5-9bd9-7831c1c4c038/resourceGroups/testGroup1/providers/Microsoft.Network/virtualNetworks/virtualNetwork1/subnets/publicInstances1?api-version=2006-01-02-preview", - &ResourceID{ - SubscriptionID: "6d74bdd2-9f84-11e5-9bd9-7831c1c4c038", - ResourceGroup: "testGroup1", - Provider: "Microsoft.Network", - Path: map[string]string{ - "virtualNetworks": "virtualNetwork1", - "subnets": "publicInstances1", - }, - }, - false, - }, - { - "/subscriptions/34ca515c-4629-458e-bf7c-738d77e0d0ea/resourcegroups/acceptanceTestResourceGroup1/providers/Microsoft.Cdn/profiles/acceptanceTestCdnProfile1", - &ResourceID{ - SubscriptionID: "34ca515c-4629-458e-bf7c-738d77e0d0ea", - ResourceGroup: "acceptanceTestResourceGroup1", - Provider: "Microsoft.Cdn", - Path: map[string]string{ - "profiles": "acceptanceTestCdnProfile1", - }, - }, - false, - }, - { - "/subscriptions/34ca515c-4629-458e-bf7c-738d77e0d0ea/resourceGroups/testGroup1/providers/Microsoft.ServiceBus/namespaces/testNamespace1/topics/testTopic1/subscriptions/testSubscription1", - &ResourceID{ - SubscriptionID: "34ca515c-4629-458e-bf7c-738d77e0d0ea", - ResourceGroup: "testGroup1", - Provider: "Microsoft.ServiceBus", - Path: map[string]string{ - "namespaces": "testNamespace1", - "topics": "testTopic1", - "subscriptions": "testSubscription1", - }, - }, - false, - }, - } - - for _, test := range testCases { - parsed, err := parseAzureResourceID(test.id) - if test.expectError && err != nil { - continue - } - if err != nil { - t.Fatalf("Unexpected error: %s", err) - } - - if !reflect.DeepEqual(test.expectedResourceID, parsed) { - t.Fatalf("Unexpected resource ID:\nExpected: %+v\nGot: %+v\n", test.expectedResourceID, parsed) - } - } -} - -func TestComposeAzureResourceID(t *testing.T) { - testCases := []struct { - resourceID *ResourceID - expectedID string - expectError bool - }{ - { - &ResourceID{ - SubscriptionID: "00000000-0000-0000-0000-000000000000", - ResourceGroup: "testGroup1", - Provider: "foo.bar", - Path: map[string]string{ - "k1": "v1", - "k2": "v2", - "k3": "v3", - "k4": "v4", - "k5": "v5", - "k6": "v6", - "k7": "v7", - "k8": "v8", - }, - }, - "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup1/providers/foo.bar/k1/v1/k2/v2/k3/v3/k4/v4/k5/v5/k6/v6/k7/v7/k8/v8", - false, - }, - { - &ResourceID{ - SubscriptionID: "00000000-0000-0000-0000-000000000000", - ResourceGroup: "testGroup1", - }, - "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup1", - false, - }, - { - // If Provider is specified, there must be at least one element in Path. - &ResourceID{ - SubscriptionID: "00000000-0000-0000-0000-000000000000", - ResourceGroup: "testGroup1", - Provider: "foo.bar", - }, - "", - true, - }, - { - // One of the keys in Path is an empty string. - &ResourceID{ - SubscriptionID: "00000000-0000-0000-0000-000000000000", - ResourceGroup: "testGroup1", - Provider: "foo.bar", - Path: map[string]string{ - "k2": "v2", - "": "v1", - }, - }, - "", - true, - }, - { - // One of the values in Path is an empty string. - &ResourceID{ - SubscriptionID: "00000000-0000-0000-0000-000000000000", - ResourceGroup: "testGroup1", - Provider: "foo.bar", - Path: map[string]string{ - "k1": "v1", - "k2": "", - }, - }, - "", - true, - }, - } - - for _, test := range testCases { - idString, err := composeAzureResourceID(test.resourceID) - - if test.expectError && err != nil { - continue - } - - if err != nil { - t.Fatalf("Unexpected error: %s", err) - } - - if test.expectedID != idString { - t.Fatalf("Unexpected resource ID string:\nExpected: %s\nGot: %s\n", test.expectedID, idString) - } - } -} From ee5417618d6aad08c53adec4272870aa7b9b0a56 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 19 Jun 2018 12:06:54 -0700 Subject: [PATCH 312/320] Update CHANGELOG.md to include #1403 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1aa07d1fab9..0859fd2c7a91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ IMPROVEMENTS: * `azurerm_log_analytics_workspace` - support for Sovereign Clouds [GH-1410] * `azurerm_log_analytics_workspace` - support for the `PerGB2018` SKU [GH-1079] * `azurerm_sql_database` - support for importing from a bacpac backup [GH-972] +* `azurerm_network_interface` - addtional validation on properties [GH-1403] +* `azurerm_arm_loadbalancer` - addtional validation on properties [GH-1403] + ## 1.7.0 (June 16, 2018) From ec0118460c8cc2e5521d16b775f7000394c258aa Mon Sep 17 00:00:00 2001 From: Nigel Metheringham Date: Fri, 22 Jun 2018 15:44:02 +0100 Subject: [PATCH 313/320] Fix typo in storage_account_sas documentation (#1430) --- website/docs/d/storage_account_sas.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/storage_account_sas.html.markdown b/website/docs/d/storage_account_sas.html.markdown index 81decab5a6fc..fa9d1390ef85 100644 --- a/website/docs/d/storage_account_sas.html.markdown +++ b/website/docs/d/storage_account_sas.html.markdown @@ -73,7 +73,7 @@ output "sas_url_query_string" { * `connection_string` - (Required) The connection string for the storage account to which this SAS applies. Typically directly from the `primary_connection_string` attribute of a terraform created `azurerm_storage_account` resource. * `https_only` - (Optional) Only permit `https` access. If `false`, both `http` and `https` are permitted. Defaults to `true`. -* `resouce_types` - (Required) A `resource_types` block as defined below. +* `resource_types` - (Required) A `resource_types` block as defined below. * `services` - (Required) A `services` block as defined below. * `start` - (Required) The starting time and date of validity of this SAS. Must be a valid ISO-8601 format time/date string. * `expiry` - (Required) The expiration time and date of this SAS. Must be a valid ISO-8601 format time/date string. From 471a45f10e7368d374ac039b1d0ab6f4c7a67566 Mon Sep 17 00:00:00 2001 From: Chang Li Date: Fri, 22 Jun 2018 23:12:30 +0800 Subject: [PATCH 314/320] VirtualNetworkGateway Additional Testcases (#1409) * VirtualNetworkGateway Additional Testcases * Resource name fix * Make fmt --- ...source_arm_virtual_network_gateway_test.go | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/azurerm/resource_arm_virtual_network_gateway_test.go b/azurerm/resource_arm_virtual_network_gateway_test.go index 4ebf856c35f3..5e34d3433a2a 100644 --- a/azurerm/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/resource_arm_virtual_network_gateway_test.go @@ -90,6 +90,69 @@ func TestAccAzureRMVirtualNetworkGateway_activeActive(t *testing.T) { }) } +func TestAccAzureRMVirtualNetworkGateway_standard(t *testing.T) { + resourceName := "azurerm_virtual_network_gateway.test" + ri := acctest.RandInt() + config := testAccAzureRMVirtualNetworkGateway_sku(ri, testLocation(), "Standard") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualNetworkGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualNetworkGatewayExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "Standard"), + ), + }, + }, + }) +} + +func TestAccAzureRMVirtualNetworkGateway_vpnGw2(t *testing.T) { + resourceName := "azurerm_virtual_network_gateway.test" + ri := acctest.RandInt() + config := testAccAzureRMVirtualNetworkGateway_sku(ri, testLocation(), "VpnGw2") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualNetworkGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualNetworkGatewayExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "VpnGw2"), + ), + }, + }, + }) +} + +func TestAccAzureRMVirtualNetworkGateway_vpnGw3(t *testing.T) { + resourceName := "azurerm_virtual_network_gateway.test" + ri := acctest.RandInt() + config := testAccAzureRMVirtualNetworkGateway_sku(ri, testLocation(), "VpnGw3") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualNetworkGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualNetworkGatewayExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "sku", "VpnGw3"), + ), + }, + }, + }) +} + func TestAccAzureRMVirtualNetworkGateway_vpnClientConfig(t *testing.T) { ri := acctest.RandInt() resourceName := "azurerm_virtual_network_gateway.test" @@ -428,3 +491,49 @@ resource "azurerm_virtual_network_gateway" "test" { } `, rInt, location, rInt, rInt, rInt) } + +func testAccAzureRMVirtualNetworkGateway_sku(rInt int, location string, sku string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvn-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + address_space = ["10.0.0.0/16"] +} + +resource "azurerm_subnet" "test" { + name = "GatewaySubnet" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_public_ip" "test" { + name = "acctestpip-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + public_ip_address_allocation = "Dynamic" +} + +resource "azurerm_virtual_network_gateway" "test" { + name = "acctestvng-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + type = "Vpn" + vpn_type = "RouteBased" + sku = "%s" + + ip_configuration { + public_ip_address_id = "${azurerm_public_ip.test.id}" + private_ip_address_allocation = "Dynamic" + subnet_id = "${azurerm_subnet.test.id}" + } +} +`, rInt, location, rInt, rInt, rInt, sku) +} From a6f0dba20e0229dab3fb29cf7cbc658a6c860715 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 24 Jun 2018 13:25:01 +0100 Subject: [PATCH 315/320] Helpers: fixing test failures (#1431) * Fixing failing tests ``` $ go test -v . === RUN TestHelper_Validate_Ip4Address --- PASS: TestHelper_Validate_Ip4Address (0.00s) === RUN TestHelper_Validate_MacAddress --- PASS: TestHelper_Validate_MacAddress (0.00s) === RUN TestHelper_Validate_RFC3339Time --- PASS: TestHelper_Validate_RFC3339Time (0.00s) === RUN TestHelper_Validate_Rfc3339DateInFutureBy --- PASS: TestHelper_Validate_Rfc3339DateInFutureBy (0.00s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate 0.026s ``` * Switching to use Go's built-in IPv4 parsing function ``` $ go test -v ./azurerm/helpers/validate/ === RUN TestHelper_Validate_Ip4Address --- PASS: TestHelper_Validate_Ip4Address (0.00s) === RUN TestHelper_Validate_MacAddress --- PASS: TestHelper_Validate_MacAddress (0.00s) === RUN TestHelper_Validate_RFC3339Time --- PASS: TestHelper_Validate_RFC3339Time (0.00s) === RUN TestHelper_Validate_Rfc3339DateInFutureBy --- PASS: TestHelper_Validate_Rfc3339DateInFutureBy (0.00s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate 0.027s ``` --- azurerm/helpers/validate/network.go | 10 ++++++---- azurerm/helpers/validate/network_test.go | 10 +++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/azurerm/helpers/validate/network.go b/azurerm/helpers/validate/network.go index c16f93e93ad7..a0f38179692c 100644 --- a/azurerm/helpers/validate/network.go +++ b/azurerm/helpers/validate/network.go @@ -2,6 +2,7 @@ package validate import ( "fmt" + "net" "regexp" ) @@ -12,8 +13,9 @@ func Ip4Address(i interface{}, k string) (_ []string, errors []error) { return } - if matched := regexp.MustCompile(`((^[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$`).Match([]byte(v)); !matched { - errors = append(errors, fmt.Errorf("%q is not a valid IP4 address: '%q`", k, i)) + ip := net.ParseIP(v) + if four := ip.To4(); four == nil { + errors = append(errors, fmt.Errorf("%q is not a valid IP4 address: %q", k, v)) } return @@ -26,8 +28,8 @@ func MacAddress(i interface{}, k string) (_ []string, errors []error) { return } - if matched := regexp.MustCompile(`((^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$`).Match([]byte(v)); !matched { - errors = append(errors, fmt.Errorf("%q is not a valid MAC address: '%q`", k, i)) + if matched := regexp.MustCompile(`^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$`).Match([]byte(v)); !matched { + errors = append(errors, fmt.Errorf("%q is not a valid MAC address: %q", k, i)) } return diff --git a/azurerm/helpers/validate/network_test.go b/azurerm/helpers/validate/network_test.go index c903627a5435..beea33c3fe0d 100644 --- a/azurerm/helpers/validate/network_test.go +++ b/azurerm/helpers/validate/network_test.go @@ -12,8 +12,8 @@ func TestHelper_Validate_Ip4Address(t *testing.T) { Errors: 1, }, { - Ip: "000.000.000.000", - Errors: 1, + Ip: "0.0.0.0", + Errors: 0, }, { Ip: "1.2.3.no", @@ -45,7 +45,7 @@ func TestHelper_Validate_Ip4Address(t *testing.T) { _, errors := Ip4Address(tc.Ip, "test") if len(errors) < tc.Errors { - t.Fatalf("Expected AzureResourceId to have an error for %q", tc.Ip) + t.Fatalf("Expected Ip4Address to have an error for %q", tc.Ip) } } } @@ -86,10 +86,10 @@ func TestHelper_Validate_MacAddress(t *testing.T) { } for _, tc := range cases { - _, errors := Ip4Address(tc.Ip, "test") + _, errors := MacAddress(tc.Ip, "test") if len(errors) < tc.Errors { - t.Fatalf("Expected AzureResourceId to have an error for %q", tc.Ip) + t.Fatalf("Expected MacAddress to have an error for %q", tc.Ip) } } } From c60d37b15239e0a44d9b452e82b1503088ebb1a5 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 24 Jun 2018 14:25:39 +0200 Subject: [PATCH 316/320] Updating to include #1431 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0859fd2c7a91..db09e4d8f1d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ IMPROVEMENTS: * `azurerm_network_interface` - addtional validation on properties [GH-1403] * `azurerm_arm_loadbalancer` - addtional validation on properties [GH-1403] +BUG FIXES: + +* validation: ensuring IPv4/MAC addresses are detected correctly [GH-1431] ## 1.7.0 (June 16, 2018) From 828291d7054c36c300ef670bf6ba6288effe9fef Mon Sep 17 00:00:00 2001 From: kt Date: Sun, 24 Jun 2018 05:44:45 -0700 Subject: [PATCH 317/320] Upgrade autorest to 10.11.4 and Azure SDK to 17.4.0 (#1418) * Upgrade autorest to 10.11.2 and Aure SDK to 17.3.1 * Upgrade autorest to 10.11.4 and Aure SDK to 17.4.0 --- .../mgmt/2015-05-01/insights/components.go | 14 +- .../mgmt/2015-05-01/insights/models.go | 32 +- .../mgmt/2015-05-01/insights/webtests.go | 95 + .../cdn/mgmt/2017-04-02/cdn/customdomains.go | 28 +- .../cdn/mgmt/2017-04-02/cdn/endpoints.go | 98 +- .../cdn/mgmt/2017-04-02/cdn/models.go | 416 +-- .../cdn/mgmt/2017-04-02/cdn/origins.go | 14 +- .../cdn/mgmt/2017-04-02/cdn/profiles.go | 42 +- .../containerinstance/containergroups.go | 14 +- .../2018-04-01/containerinstance/models.go | 32 +- .../2017-10-01/containerregistry/models.go | 320 +- .../containerregistry/registries.go | 56 +- .../containerregistry/replications.go | 42 +- .../2017-10-01/containerregistry/webhooks.go | 42 +- .../containerservice/containerservices.go | 28 +- .../containerservice/managedclusters.go | 101 +- .../2017-09-30/containerservice/models.go | 144 +- .../2015-04-08/documentdb/databaseaccounts.go | 322 +- .../mgmt/2015-04-08/documentdb/models.go | 216 +- .../store/mgmt/2016-11-01/account/accounts.go | 42 +- .../mgmt/2016-11-01/account/firewallrules.go | 2 +- .../store/mgmt/2016-11-01/account/models.go | 492 ++- .../2016-11-01/account/virtualnetworkrules.go | 428 +++ .../dns/mgmt/2016-04-01/dns/models.go | 32 +- .../dns/mgmt/2016-04-01/dns/recordsets.go | 61 +- .../services/dns/mgmt/2016-04-01/dns/zones.go | 55 +- .../eventgrid/eventsubscriptions.go | 42 +- .../mgmt/2018-01-01/eventgrid/models.go | 192 +- .../mgmt/2018-01-01/eventgrid/topics.go | 42 +- .../2017-04-01/eventhub/consumergroups.go | 32 +- .../mgmt/2017-04-01/eventhub/eventhubs.go | 32 +- .../mgmt/2017-04-01/eventhub/models.go | 64 +- .../mgmt/2017-04-01/eventhub/namespaces.go | 28 +- .../mgmt/2017-07-01/devices/iothubresource.go | 28 +- .../iothub/mgmt/2017-07-01/devices/models.go | 64 +- .../keyvault/2016-10-01/keyvault/models.go | 24 +- .../mgmt/2016-10-01/keyvault/models.go | 32 +- .../mgmt/2016-10-01/keyvault/vaults.go | 14 +- .../2017-12-01/mysql/checknameavailability.go | 4 +- .../mysql/mgmt/2017-12-01/mysql/client.go | 2 +- .../mgmt/2017-12-01/mysql/configurations.go | 18 +- .../mysql/mgmt/2017-12-01/mysql/databases.go | 32 +- .../mgmt/2017-12-01/mysql/firewallrules.go | 32 +- .../mysql/locationbasedperformancetier.go | 4 +- .../mysql/mgmt/2017-12-01/mysql/logfiles.go | 4 +- .../mysql/mgmt/2017-12-01/mysql/models.go | 524 ++-- .../mysql/mgmt/2017-12-01/mysql/operations.go | 4 +- .../mysql/mgmt/2017-12-01/mysql/servers.go | 46 +- .../2017-12-01/mysql/virtualnetworkrules.go | 366 +++ .../2017-09-01/network/applicationgateways.go | 84 +- .../network/applicationsecuritygroups.go | 28 +- .../expressroutecircuitauthorizations.go | 28 +- .../network/expressroutecircuitpeerings.go | 28 +- .../network/expressroutecircuits.go | 84 +- .../2017-09-01/network/inboundnatrules.go | 28 +- .../mgmt/2017-09-01/network/interfaces.go | 70 +- .../mgmt/2017-09-01/network/loadbalancers.go | 42 +- .../network/localnetworkgateways.go | 42 +- .../network/mgmt/2017-09-01/network/models.go | 2786 +++-------------- .../mgmt/2017-09-01/network/packetcaptures.go | 56 +- .../2017-09-01/network/publicipaddresses.go | 42 +- .../2017-09-01/network/routefilterrules.go | 42 +- .../mgmt/2017-09-01/network/routefilters.go | 42 +- .../network/mgmt/2017-09-01/network/routes.go | 28 +- .../mgmt/2017-09-01/network/routetables.go | 42 +- .../mgmt/2017-09-01/network/securitygroups.go | 42 +- .../mgmt/2017-09-01/network/securityrules.go | 28 +- .../mgmt/2017-09-01/network/subnets.go | 28 +- .../virtualnetworkgatewayconnections.go | 70 +- .../network/virtualnetworkgateways.go | 140 +- .../network/virtualnetworkpeerings.go | 28 +- .../2017-09-01/network/virtualnetworks.go | 42 +- .../mgmt/2017-09-01/network/watchers.go | 154 +- .../postgresql/checknameavailability.go | 4 +- .../mgmt/2017-12-01/postgresql/client.go | 3 +- .../2017-12-01/postgresql/configurations.go | 18 +- .../mgmt/2017-12-01/postgresql/databases.go | 32 +- .../2017-12-01/postgresql/firewallrules.go | 32 +- .../locationbasedperformancetier.go | 4 +- .../mgmt/2017-12-01/postgresql/logfiles.go | 4 +- .../mgmt/2017-12-01/postgresql/models.go | 656 ++-- .../mgmt/2017-12-01/postgresql/operations.go | 4 +- .../mgmt/2017-12-01/postgresql/servers.go | 46 +- .../postgresql/serversecurityalertpolicies.go | 187 ++ .../postgresql/virtualnetworkrules.go | 366 +++ .../operationalinsights/models.go | 32 +- .../operationalinsights/workspaces.go | 14 +- .../sql/backuplongtermretentionpolicies.go | 14 +- .../sql/backuplongtermretentionvaults.go | 14 +- .../sql/databaseblobauditingpolicies.go | 4 +- .../mgmt/2015-05-01-preview/sql/databases.go | 98 +- .../2015-05-01-preview/sql/elasticpools.go | 28 +- .../sql/encryptionprotectors.go | 14 +- .../2015-05-01-preview/sql/failovergroups.go | 70 +- .../sql/managedinstances.go | 42 +- .../sql/mgmt/2015-05-01-preview/sql/models.go | 1528 ++------- .../sql/replicationlinks.go | 28 +- .../sql/serverazureadadministrators.go | 28 +- .../sql/servercommunicationlinks.go | 14 +- .../mgmt/2015-05-01-preview/sql/serverkeys.go | 28 +- .../mgmt/2015-05-01-preview/sql/servers.go | 42 +- .../mgmt/2015-05-01-preview/sql/syncagents.go | 28 +- .../mgmt/2015-05-01-preview/sql/syncgroups.go | 56 +- .../2015-05-01-preview/sql/syncmembers.go | 56 +- .../sql/virtualnetworkrules.go | 28 +- .../mgmt/2018-03-01/redis/linkedserver.go | 14 +- .../redis/mgmt/2018-03-01/redis/models.go | 160 +- .../redis/mgmt/2018-03-01/redis/redis.go | 56 +- .../relay/mgmt/2017-04-01/relay/models.go | 64 +- .../relay/mgmt/2017-04-01/relay/namespaces.go | 28 +- .../mgmt/2017-05-10/resources/deployments.go | 28 +- .../mgmt/2017-05-10/resources/groups.go | 14 +- .../mgmt/2017-05-10/resources/models.go | 352 +-- .../mgmt/2017-05-10/resources/resources.go | 112 +- .../2016-03-01/scheduler/jobcollections.go | 42 +- .../mgmt/2016-03-01/scheduler/models.go | 96 +- .../search/mgmt/2015-08-19/search/models.go | 32 +- .../search/mgmt/2015-08-19/search/services.go | 14 +- .../2017-04-01/servicebus/migrationconfigs.go | 14 +- .../mgmt/2017-04-01/servicebus/models.go | 96 +- .../mgmt/2017-04-01/servicebus/namespaces.go | 28 +- .../mgmt/2017-10-01/storage/accounts.go | 14 +- .../storage/mgmt/2017-10-01/storage/models.go | 32 +- .../services/web/mgmt/2016-09-01/web/apps.go | 308 +- .../web/appservicecertificateorders.go | 28 +- .../2016-09-01/web/appserviceenvironments.go | 86 +- .../mgmt/2016-09-01/web/appserviceplans.go | 14 +- .../web/mgmt/2016-09-01/web/domains.go | 14 +- .../web/mgmt/2016-09-01/web/models.go | 1088 ++----- .../Azure/azure-sdk-for-go/storage/README.md | 10 +- .../Azure/azure-sdk-for-go/version/version.go | 2 +- .../Azure/go-autorest/autorest/adal/config.go | 8 +- .../Azure/go-autorest/autorest/adal/token.go | 404 ++- .../Azure/go-autorest/autorest/azure/async.go | 945 ++++-- .../Azure/go-autorest/autorest/azure/azure.go | 27 +- .../go-autorest/autorest/azure/cli/profile.go | 7 + .../Azure/go-autorest/autorest/azure/rp.go | 2 +- .../Azure/go-autorest/autorest/utility.go | 5 +- .../autorest/validation/validation.go | 23 +- .../Azure/go-autorest/autorest/version.go | 2 +- vendor/vendor.json | 434 +-- 141 files changed, 7757 insertions(+), 9170 deletions(-) create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/virtualnetworkrules.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/virtualnetworkrules.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/serversecurityalertpolicies.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/virtualnetworkrules.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/components.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/components.go index 90d532fdfd68..556529872eba 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/components.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/components.go @@ -487,15 +487,17 @@ func (client ComponentsClient) PurgePreparer(ctx context.Context, resourceGroupN // PurgeSender sends the Purge request. The method will close the // http.Response Body if it receives an error. func (client ComponentsClient) PurgeSender(req *http.Request) (future ComponentsPurgeFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/models.go index 993b4276d21a..827ee3305899 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/models.go @@ -889,12 +889,11 @@ type ComponentPurgeStatusResponse struct { // ComponentsPurgeFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ComponentsPurgeFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ComponentsPurgeFuture) Result(client ComponentsClient) (so SetObject, err error) { +func (future *ComponentsPurgeFuture) Result(client ComponentsClient) (so SetObject, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -902,34 +901,15 @@ func (future ComponentsPurgeFuture) Result(client ComponentsClient) (so SetObjec return } if !done { - return so, azure.NewAsyncOpIncompleteError("insights.ComponentsPurgeFuture") - } - if future.PollingMethod() == azure.PollingLocation { - so, err = client.PurgeResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "insights.ComponentsPurgeFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("insights.ComponentsPurgeFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if so.Response.Response, err = future.GetResult(sender); err == nil && so.Response.Response.StatusCode != http.StatusNoContent { + so, err = client.PurgeResponder(so.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "insights.ComponentsPurgeFuture", "Result", so.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "insights.ComponentsPurgeFuture", "Result", resp, "Failure sending request") - return - } - so, err = client.PurgeResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "insights.ComponentsPurgeFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/webtests.go b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/webtests.go index 7ac7ab23d55f..464479765739 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/webtests.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights/webtests.go @@ -344,6 +344,101 @@ func (client WebTestsClient) ListComplete(ctx context.Context) (result WebTestLi return } +// ListByComponent get all Application Insights web tests defined for the specified component. +// Parameters: +// componentName - the name of the Application Insights component resource. +// resourceGroupName - the name of the resource group. +func (client WebTestsClient) ListByComponent(ctx context.Context, componentName string, resourceGroupName string) (result WebTestListResultPage, err error) { + result.fn = client.listByComponentNextResults + req, err := client.ListByComponentPreparer(ctx, componentName, resourceGroupName) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WebTestsClient", "ListByComponent", nil, "Failure preparing request") + return + } + + resp, err := client.ListByComponentSender(req) + if err != nil { + result.wtlr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "insights.WebTestsClient", "ListByComponent", resp, "Failure sending request") + return + } + + result.wtlr, err = client.ListByComponentResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WebTestsClient", "ListByComponent", resp, "Failure responding to request") + } + + return +} + +// ListByComponentPreparer prepares the ListByComponent request. +func (client WebTestsClient) ListByComponentPreparer(ctx context.Context, componentName string, resourceGroupName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "componentName": autorest.Encode("path", componentName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-05-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Insights/components/{componentName}/webtests", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByComponentSender sends the ListByComponent request. The method will close the +// http.Response Body if it receives an error. +func (client WebTestsClient) ListByComponentSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByComponentResponder handles the response to the ListByComponent request. The method always +// closes the http.Response Body. +func (client WebTestsClient) ListByComponentResponder(resp *http.Response) (result WebTestListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByComponentNextResults retrieves the next set of results, if any. +func (client WebTestsClient) listByComponentNextResults(lastResults WebTestListResult) (result WebTestListResult, err error) { + req, err := lastResults.webTestListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "insights.WebTestsClient", "listByComponentNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByComponentSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "insights.WebTestsClient", "listByComponentNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByComponentResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "insights.WebTestsClient", "listByComponentNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByComponentComplete enumerates all values, automatically crossing page boundaries as required. +func (client WebTestsClient) ListByComponentComplete(ctx context.Context, componentName string, resourceGroupName string) (result WebTestListResultIterator, err error) { + result.page, err = client.ListByComponent(ctx, componentName, resourceGroupName) + return +} + // ListByResourceGroup get all Application Insights web tests defined within a specified resource group. // Parameters: // resourceGroupName - the name of the resource group. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/customdomains.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/customdomains.go index 2ac10acc2a3a..945381d7eaa8 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/customdomains.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/customdomains.go @@ -103,15 +103,17 @@ func (client CustomDomainsClient) CreatePreparer(ctx context.Context, resourceGr // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client CustomDomainsClient) CreateSender(req *http.Request) (future CustomDomainsCreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -184,15 +186,17 @@ func (client CustomDomainsClient) DeletePreparer(ctx context.Context, resourceGr // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client CustomDomainsClient) DeleteSender(req *http.Request) (future CustomDomainsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/endpoints.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/endpoints.go index d47ac81a73b4..5bf5c05f2f1e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/endpoints.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/endpoints.go @@ -102,15 +102,17 @@ func (client EndpointsClient) CreatePreparer(ctx context.Context, resourceGroupN // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client EndpointsClient) CreateSender(req *http.Request) (future EndpointsCreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -182,15 +184,17 @@ func (client EndpointsClient) DeletePreparer(ctx context.Context, resourceGroupN // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client EndpointsClient) DeleteSender(req *http.Request) (future EndpointsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -552,15 +556,17 @@ func (client EndpointsClient) LoadContentPreparer(ctx context.Context, resourceG // LoadContentSender sends the LoadContent request. The method will close the // http.Response Body if it receives an error. func (client EndpointsClient) LoadContentSender(req *http.Request) (future EndpointsLoadContentFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -637,15 +643,17 @@ func (client EndpointsClient) PurgeContentPreparer(ctx context.Context, resource // PurgeContentSender sends the PurgeContent request. The method will close the // http.Response Body if it receives an error. func (client EndpointsClient) PurgeContentSender(req *http.Request) (future EndpointsPurgeContentFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -715,15 +723,17 @@ func (client EndpointsClient) StartPreparer(ctx context.Context, resourceGroupNa // StartSender sends the Start request. The method will close the // http.Response Body if it receives an error. func (client EndpointsClient) StartSender(req *http.Request) (future EndpointsStartFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -794,15 +804,17 @@ func (client EndpointsClient) StopPreparer(ctx context.Context, resourceGroupNam // StopSender sends the Stop request. The method will close the // http.Response Body if it receives an error. func (client EndpointsClient) StopSender(req *http.Request) (future EndpointsStopFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -878,15 +890,17 @@ func (client EndpointsClient) UpdatePreparer(ctx context.Context, resourceGroupN // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client EndpointsClient) UpdateSender(req *http.Request) (future EndpointsUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/models.go index 6c98c918c4d1..9a1c731dc417 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/models.go @@ -517,12 +517,11 @@ type CustomDomainPropertiesParameters struct { // CustomDomainsCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type CustomDomainsCreateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future CustomDomainsCreateFuture) Result(client CustomDomainsClient) (cd CustomDomain, err error) { +func (future *CustomDomainsCreateFuture) Result(client CustomDomainsClient) (cd CustomDomain, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -530,34 +529,15 @@ func (future CustomDomainsCreateFuture) Result(client CustomDomainsClient) (cd C return } if !done { - return cd, azure.NewAsyncOpIncompleteError("cdn.CustomDomainsCreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - cd, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.CustomDomainsCreateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("cdn.CustomDomainsCreateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if cd.Response.Response, err = future.GetResult(sender); err == nil && cd.Response.Response.StatusCode != http.StatusNoContent { + cd, err = client.CreateResponder(cd.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "cdn.CustomDomainsCreateFuture", "Result", cd.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.CustomDomainsCreateFuture", "Result", resp, "Failure sending request") - return - } - cd, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.CustomDomainsCreateFuture", "Result", resp, "Failure responding to request") } return } @@ -565,12 +545,11 @@ func (future CustomDomainsCreateFuture) Result(client CustomDomainsClient) (cd C // CustomDomainsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type CustomDomainsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future CustomDomainsDeleteFuture) Result(client CustomDomainsClient) (cd CustomDomain, err error) { +func (future *CustomDomainsDeleteFuture) Result(client CustomDomainsClient) (cd CustomDomain, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -578,34 +557,15 @@ func (future CustomDomainsDeleteFuture) Result(client CustomDomainsClient) (cd C return } if !done { - return cd, azure.NewAsyncOpIncompleteError("cdn.CustomDomainsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - cd, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.CustomDomainsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("cdn.CustomDomainsDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if cd.Response.Response, err = future.GetResult(sender); err == nil && cd.Response.Response.StatusCode != http.StatusNoContent { + cd, err = client.DeleteResponder(cd.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "cdn.CustomDomainsDeleteFuture", "Result", cd.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.CustomDomainsDeleteFuture", "Result", resp, "Failure sending request") - return - } - cd, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.CustomDomainsDeleteFuture", "Result", resp, "Failure responding to request") } return } @@ -1134,12 +1094,11 @@ type EndpointPropertiesUpdateParameters struct { // EndpointsCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type EndpointsCreateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future EndpointsCreateFuture) Result(client EndpointsClient) (e Endpoint, err error) { +func (future *EndpointsCreateFuture) Result(client EndpointsClient) (e Endpoint, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1147,34 +1106,15 @@ func (future EndpointsCreateFuture) Result(client EndpointsClient) (e Endpoint, return } if !done { - return e, azure.NewAsyncOpIncompleteError("cdn.EndpointsCreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - e, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsCreateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("cdn.EndpointsCreateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if e.Response.Response, err = future.GetResult(sender); err == nil && e.Response.Response.StatusCode != http.StatusNoContent { + e, err = client.CreateResponder(e.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "cdn.EndpointsCreateFuture", "Result", e.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsCreateFuture", "Result", resp, "Failure sending request") - return - } - e, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsCreateFuture", "Result", resp, "Failure responding to request") } return } @@ -1182,12 +1122,11 @@ func (future EndpointsCreateFuture) Result(client EndpointsClient) (e Endpoint, // EndpointsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type EndpointsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future EndpointsDeleteFuture) Result(client EndpointsClient) (ar autorest.Response, err error) { +func (future *EndpointsDeleteFuture) Result(client EndpointsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1195,47 +1134,21 @@ func (future EndpointsDeleteFuture) Result(client EndpointsClient) (ar autorest. return } if !done { - return ar, azure.NewAsyncOpIncompleteError("cdn.EndpointsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("cdn.EndpointsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // EndpointsLoadContentFuture an abstraction for monitoring and retrieving the results of a long-running operation. type EndpointsLoadContentFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future EndpointsLoadContentFuture) Result(client EndpointsClient) (ar autorest.Response, err error) { +func (future *EndpointsLoadContentFuture) Result(client EndpointsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1243,35 +1156,10 @@ func (future EndpointsLoadContentFuture) Result(client EndpointsClient) (ar auto return } if !done { - return ar, azure.NewAsyncOpIncompleteError("cdn.EndpointsLoadContentFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.LoadContentResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsLoadContentFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsLoadContentFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("cdn.EndpointsLoadContentFuture") return } - ar, err = client.LoadContentResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsLoadContentFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -1279,12 +1167,11 @@ func (future EndpointsLoadContentFuture) Result(client EndpointsClient) (ar auto // operation. type EndpointsPurgeContentFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future EndpointsPurgeContentFuture) Result(client EndpointsClient) (ar autorest.Response, err error) { +func (future *EndpointsPurgeContentFuture) Result(client EndpointsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1292,47 +1179,21 @@ func (future EndpointsPurgeContentFuture) Result(client EndpointsClient) (ar aut return } if !done { - return ar, azure.NewAsyncOpIncompleteError("cdn.EndpointsPurgeContentFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.PurgeContentResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsPurgeContentFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsPurgeContentFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("cdn.EndpointsPurgeContentFuture") return } - ar, err = client.PurgeContentResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsPurgeContentFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // EndpointsStartFuture an abstraction for monitoring and retrieving the results of a long-running operation. type EndpointsStartFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future EndpointsStartFuture) Result(client EndpointsClient) (e Endpoint, err error) { +func (future *EndpointsStartFuture) Result(client EndpointsClient) (e Endpoint, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1340,34 +1201,15 @@ func (future EndpointsStartFuture) Result(client EndpointsClient) (e Endpoint, e return } if !done { - return e, azure.NewAsyncOpIncompleteError("cdn.EndpointsStartFuture") - } - if future.PollingMethod() == azure.PollingLocation { - e, err = client.StartResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsStartFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("cdn.EndpointsStartFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if e.Response.Response, err = future.GetResult(sender); err == nil && e.Response.Response.StatusCode != http.StatusNoContent { + e, err = client.StartResponder(e.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "cdn.EndpointsStartFuture", "Result", e.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsStartFuture", "Result", resp, "Failure sending request") - return - } - e, err = client.StartResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsStartFuture", "Result", resp, "Failure responding to request") } return } @@ -1375,12 +1217,11 @@ func (future EndpointsStartFuture) Result(client EndpointsClient) (e Endpoint, e // EndpointsStopFuture an abstraction for monitoring and retrieving the results of a long-running operation. type EndpointsStopFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future EndpointsStopFuture) Result(client EndpointsClient) (e Endpoint, err error) { +func (future *EndpointsStopFuture) Result(client EndpointsClient) (e Endpoint, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1388,34 +1229,15 @@ func (future EndpointsStopFuture) Result(client EndpointsClient) (e Endpoint, er return } if !done { - return e, azure.NewAsyncOpIncompleteError("cdn.EndpointsStopFuture") - } - if future.PollingMethod() == azure.PollingLocation { - e, err = client.StopResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsStopFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("cdn.EndpointsStopFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if e.Response.Response, err = future.GetResult(sender); err == nil && e.Response.Response.StatusCode != http.StatusNoContent { + e, err = client.StopResponder(e.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "cdn.EndpointsStopFuture", "Result", e.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsStopFuture", "Result", resp, "Failure sending request") - return - } - e, err = client.StopResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsStopFuture", "Result", resp, "Failure responding to request") } return } @@ -1423,12 +1245,11 @@ func (future EndpointsStopFuture) Result(client EndpointsClient) (e Endpoint, er // EndpointsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type EndpointsUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future EndpointsUpdateFuture) Result(client EndpointsClient) (e Endpoint, err error) { +func (future *EndpointsUpdateFuture) Result(client EndpointsClient) (e Endpoint, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1436,34 +1257,15 @@ func (future EndpointsUpdateFuture) Result(client EndpointsClient) (e Endpoint, return } if !done { - return e, azure.NewAsyncOpIncompleteError("cdn.EndpointsUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - e, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("cdn.EndpointsUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if e.Response.Response, err = future.GetResult(sender); err == nil && e.Response.Response.StatusCode != http.StatusNoContent { + e, err = client.UpdateResponder(e.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "cdn.EndpointsUpdateFuture", "Result", e.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsUpdateFuture", "Result", resp, "Failure sending request") - return - } - e, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.EndpointsUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -1917,12 +1719,11 @@ type OriginPropertiesParameters struct { // OriginsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type OriginsUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future OriginsUpdateFuture) Result(client OriginsClient) (o Origin, err error) { +func (future *OriginsUpdateFuture) Result(client OriginsClient) (o Origin, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1930,34 +1731,15 @@ func (future OriginsUpdateFuture) Result(client OriginsClient) (o Origin, err er return } if !done { - return o, azure.NewAsyncOpIncompleteError("cdn.OriginsUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - o, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.OriginsUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("cdn.OriginsUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if o.Response.Response, err = future.GetResult(sender); err == nil && o.Response.Response.StatusCode != http.StatusNoContent { + o, err = client.UpdateResponder(o.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "cdn.OriginsUpdateFuture", "Result", o.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.OriginsUpdateFuture", "Result", resp, "Failure sending request") - return - } - o, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.OriginsUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -2238,12 +2020,11 @@ type ProfileProperties struct { // ProfilesCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ProfilesCreateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ProfilesCreateFuture) Result(client ProfilesClient) (p Profile, err error) { +func (future *ProfilesCreateFuture) Result(client ProfilesClient) (p Profile, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2251,34 +2032,15 @@ func (future ProfilesCreateFuture) Result(client ProfilesClient) (p Profile, err return } if !done { - return p, azure.NewAsyncOpIncompleteError("cdn.ProfilesCreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - p, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.ProfilesCreateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("cdn.ProfilesCreateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if p.Response.Response, err = future.GetResult(sender); err == nil && p.Response.Response.StatusCode != http.StatusNoContent { + p, err = client.CreateResponder(p.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "cdn.ProfilesCreateFuture", "Result", p.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.ProfilesCreateFuture", "Result", resp, "Failure sending request") - return - } - p, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.ProfilesCreateFuture", "Result", resp, "Failure responding to request") } return } @@ -2286,12 +2048,11 @@ func (future ProfilesCreateFuture) Result(client ProfilesClient) (p Profile, err // ProfilesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ProfilesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ProfilesDeleteFuture) Result(client ProfilesClient) (ar autorest.Response, err error) { +func (future *ProfilesDeleteFuture) Result(client ProfilesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2299,47 +2060,21 @@ func (future ProfilesDeleteFuture) Result(client ProfilesClient) (ar autorest.Re return } if !done { - return ar, azure.NewAsyncOpIncompleteError("cdn.ProfilesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.ProfilesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("cdn.ProfilesDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.ProfilesDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.ProfilesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // ProfilesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ProfilesUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ProfilesUpdateFuture) Result(client ProfilesClient) (p Profile, err error) { +func (future *ProfilesUpdateFuture) Result(client ProfilesClient) (p Profile, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2347,34 +2082,15 @@ func (future ProfilesUpdateFuture) Result(client ProfilesClient) (p Profile, err return } if !done { - return p, azure.NewAsyncOpIncompleteError("cdn.ProfilesUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - p, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.ProfilesUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("cdn.ProfilesUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if p.Response.Response, err = future.GetResult(sender); err == nil && p.Response.Response.StatusCode != http.StatusNoContent { + p, err = client.UpdateResponder(p.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "cdn.ProfilesUpdateFuture", "Result", p.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.ProfilesUpdateFuture", "Result", resp, "Failure sending request") - return - } - p, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.ProfilesUpdateFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/origins.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/origins.go index 4cc1fd9c0c50..ee373054a769 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/origins.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/origins.go @@ -284,15 +284,17 @@ func (client OriginsClient) UpdatePreparer(ctx context.Context, resourceGroupNam // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client OriginsClient) UpdateSender(req *http.Request) (future OriginsUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/profiles.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/profiles.go index 6bd15876408b..b81e2f85807f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/profiles.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn/profiles.go @@ -98,15 +98,17 @@ func (client ProfilesClient) CreatePreparer(ctx context.Context, resourceGroupNa // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client ProfilesClient) CreateSender(req *http.Request) (future ProfilesCreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -176,15 +178,17 @@ func (client ProfilesClient) DeletePreparer(ctx context.Context, resourceGroupNa // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ProfilesClient) DeleteSender(req *http.Request) (future ProfilesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -779,15 +783,17 @@ func (client ProfilesClient) UpdatePreparer(ctx context.Context, resourceGroupNa // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ProfilesClient) UpdateSender(req *http.Request) (future ProfilesUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containergroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containergroups.go index d8e167188ae3..aad2a5013ee7 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containergroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/containergroups.go @@ -99,15 +99,17 @@ func (client ContainerGroupsClient) CreateOrUpdatePreparer(ctx context.Context, // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ContainerGroupsClient) CreateOrUpdateSender(req *http.Request) (future ContainerGroupsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/models.go index 8a95c8ffd29b..01563f1513ac 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance/models.go @@ -440,12 +440,11 @@ type ContainerGroupPropertiesInstanceView struct { // operation. type ContainerGroupsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ContainerGroupsCreateOrUpdateFuture) Result(client ContainerGroupsClient) (cg ContainerGroup, err error) { +func (future *ContainerGroupsCreateOrUpdateFuture) Result(client ContainerGroupsClient) (cg ContainerGroup, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -453,34 +452,15 @@ func (future ContainerGroupsCreateOrUpdateFuture) Result(client ContainerGroupsC return } if !done { - return cg, azure.NewAsyncOpIncompleteError("containerinstance.ContainerGroupsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - cg, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerinstance.ContainerGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerinstance.ContainerGroupsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if cg.Response.Response, err = future.GetResult(sender); err == nil && cg.Response.Response.StatusCode != http.StatusNoContent { + cg, err = client.CreateOrUpdateResponder(cg.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "containerinstance.ContainerGroupsCreateOrUpdateFuture", "Result", cg.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerinstance.ContainerGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - cg, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerinstance.ContainerGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/models.go index 4b16260110a6..dd8ff448238c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/models.go @@ -551,12 +551,11 @@ type RegenerateCredentialParameters struct { // RegistriesCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type RegistriesCreateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RegistriesCreateFuture) Result(client RegistriesClient) (r Registry, err error) { +func (future *RegistriesCreateFuture) Result(client RegistriesClient) (r Registry, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -564,34 +563,15 @@ func (future RegistriesCreateFuture) Result(client RegistriesClient) (r Registry return } if !done { - return r, azure.NewAsyncOpIncompleteError("containerregistry.RegistriesCreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - r, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.RegistriesCreateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerregistry.RegistriesCreateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if r.Response.Response, err = future.GetResult(sender); err == nil && r.Response.Response.StatusCode != http.StatusNoContent { + r, err = client.CreateResponder(r.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "containerregistry.RegistriesCreateFuture", "Result", r.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.RegistriesCreateFuture", "Result", resp, "Failure sending request") - return - } - r, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.RegistriesCreateFuture", "Result", resp, "Failure responding to request") } return } @@ -599,12 +579,11 @@ func (future RegistriesCreateFuture) Result(client RegistriesClient) (r Registry // RegistriesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type RegistriesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RegistriesDeleteFuture) Result(client RegistriesClient) (ar autorest.Response, err error) { +func (future *RegistriesDeleteFuture) Result(client RegistriesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -612,35 +591,10 @@ func (future RegistriesDeleteFuture) Result(client RegistriesClient) (ar autores return } if !done { - return ar, azure.NewAsyncOpIncompleteError("containerregistry.RegistriesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.RegistriesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerregistry.RegistriesDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.RegistriesDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.RegistriesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -648,12 +602,11 @@ func (future RegistriesDeleteFuture) Result(client RegistriesClient) (ar autores // operation. type RegistriesImportImageFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RegistriesImportImageFuture) Result(client RegistriesClient) (ar autorest.Response, err error) { +func (future *RegistriesImportImageFuture) Result(client RegistriesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -661,47 +614,21 @@ func (future RegistriesImportImageFuture) Result(client RegistriesClient) (ar au return } if !done { - return ar, azure.NewAsyncOpIncompleteError("containerregistry.RegistriesImportImageFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.ImportImageResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.RegistriesImportImageFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.RegistriesImportImageFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("containerregistry.RegistriesImportImageFuture") return } - ar, err = client.ImportImageResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.RegistriesImportImageFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // RegistriesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type RegistriesUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RegistriesUpdateFuture) Result(client RegistriesClient) (r Registry, err error) { +func (future *RegistriesUpdateFuture) Result(client RegistriesClient) (r Registry, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -709,34 +636,15 @@ func (future RegistriesUpdateFuture) Result(client RegistriesClient) (r Registry return } if !done { - return r, azure.NewAsyncOpIncompleteError("containerregistry.RegistriesUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - r, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.RegistriesUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerregistry.RegistriesUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if r.Response.Response, err = future.GetResult(sender); err == nil && r.Response.Response.StatusCode != http.StatusNoContent { + r, err = client.UpdateResponder(r.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "containerregistry.RegistriesUpdateFuture", "Result", r.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.RegistriesUpdateFuture", "Result", resp, "Failure sending request") - return - } - r, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.RegistriesUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -1336,12 +1244,11 @@ type ReplicationProperties struct { // ReplicationsCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ReplicationsCreateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ReplicationsCreateFuture) Result(client ReplicationsClient) (r Replication, err error) { +func (future *ReplicationsCreateFuture) Result(client ReplicationsClient) (r Replication, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1349,34 +1256,15 @@ func (future ReplicationsCreateFuture) Result(client ReplicationsClient) (r Repl return } if !done { - return r, azure.NewAsyncOpIncompleteError("containerregistry.ReplicationsCreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - r, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.ReplicationsCreateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerregistry.ReplicationsCreateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if r.Response.Response, err = future.GetResult(sender); err == nil && r.Response.Response.StatusCode != http.StatusNoContent { + r, err = client.CreateResponder(r.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "containerregistry.ReplicationsCreateFuture", "Result", r.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.ReplicationsCreateFuture", "Result", resp, "Failure sending request") - return - } - r, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.ReplicationsCreateFuture", "Result", resp, "Failure responding to request") } return } @@ -1384,12 +1272,11 @@ func (future ReplicationsCreateFuture) Result(client ReplicationsClient) (r Repl // ReplicationsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ReplicationsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ReplicationsDeleteFuture) Result(client ReplicationsClient) (ar autorest.Response, err error) { +func (future *ReplicationsDeleteFuture) Result(client ReplicationsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1397,47 +1284,21 @@ func (future ReplicationsDeleteFuture) Result(client ReplicationsClient) (ar aut return } if !done { - return ar, azure.NewAsyncOpIncompleteError("containerregistry.ReplicationsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.ReplicationsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.ReplicationsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("containerregistry.ReplicationsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.ReplicationsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // ReplicationsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ReplicationsUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ReplicationsUpdateFuture) Result(client ReplicationsClient) (r Replication, err error) { +func (future *ReplicationsUpdateFuture) Result(client ReplicationsClient) (r Replication, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1445,34 +1306,15 @@ func (future ReplicationsUpdateFuture) Result(client ReplicationsClient) (r Repl return } if !done { - return r, azure.NewAsyncOpIncompleteError("containerregistry.ReplicationsUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - r, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.ReplicationsUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerregistry.ReplicationsUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if r.Response.Response, err = future.GetResult(sender); err == nil && r.Response.Response.StatusCode != http.StatusNoContent { + r, err = client.UpdateResponder(r.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "containerregistry.ReplicationsUpdateFuture", "Result", r.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.ReplicationsUpdateFuture", "Result", resp, "Failure sending request") - return - } - r, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.ReplicationsUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -1957,12 +1799,11 @@ func (wpup WebhookPropertiesUpdateParameters) MarshalJSON() ([]byte, error) { // WebhooksCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type WebhooksCreateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WebhooksCreateFuture) Result(client WebhooksClient) (w Webhook, err error) { +func (future *WebhooksCreateFuture) Result(client WebhooksClient) (w Webhook, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1970,34 +1811,15 @@ func (future WebhooksCreateFuture) Result(client WebhooksClient) (w Webhook, err return } if !done { - return w, azure.NewAsyncOpIncompleteError("containerregistry.WebhooksCreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - w, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.WebhooksCreateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerregistry.WebhooksCreateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if w.Response.Response, err = future.GetResult(sender); err == nil && w.Response.Response.StatusCode != http.StatusNoContent { + w, err = client.CreateResponder(w.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "containerregistry.WebhooksCreateFuture", "Result", w.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.WebhooksCreateFuture", "Result", resp, "Failure sending request") - return - } - w, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.WebhooksCreateFuture", "Result", resp, "Failure responding to request") } return } @@ -2005,12 +1827,11 @@ func (future WebhooksCreateFuture) Result(client WebhooksClient) (w Webhook, err // WebhooksDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type WebhooksDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WebhooksDeleteFuture) Result(client WebhooksClient) (ar autorest.Response, err error) { +func (future *WebhooksDeleteFuture) Result(client WebhooksClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2018,47 +1839,21 @@ func (future WebhooksDeleteFuture) Result(client WebhooksClient) (ar autorest.Re return } if !done { - return ar, azure.NewAsyncOpIncompleteError("containerregistry.WebhooksDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.WebhooksDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerregistry.WebhooksDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.WebhooksDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.WebhooksDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // WebhooksUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type WebhooksUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WebhooksUpdateFuture) Result(client WebhooksClient) (w Webhook, err error) { +func (future *WebhooksUpdateFuture) Result(client WebhooksClient) (w Webhook, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2066,34 +1861,15 @@ func (future WebhooksUpdateFuture) Result(client WebhooksClient) (w Webhook, err return } if !done { - return w, azure.NewAsyncOpIncompleteError("containerregistry.WebhooksUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - w, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.WebhooksUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerregistry.WebhooksUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if w.Response.Response, err = future.GetResult(sender); err == nil && w.Response.Response.StatusCode != http.StatusNoContent { + w, err = client.UpdateResponder(w.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "containerregistry.WebhooksUpdateFuture", "Result", w.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.WebhooksUpdateFuture", "Result", resp, "Failure sending request") - return - } - w, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerregistry.WebhooksUpdateFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/registries.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/registries.go index e341c0e62252..f42f4eb47ba9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/registries.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/registries.go @@ -179,15 +179,17 @@ func (client RegistriesClient) CreatePreparer(ctx context.Context, resourceGroup // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client RegistriesClient) CreateSender(req *http.Request) (future RegistriesCreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -256,15 +258,17 @@ func (client RegistriesClient) DeletePreparer(ctx context.Context, resourceGroup // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client RegistriesClient) DeleteSender(req *http.Request) (future RegistriesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -415,15 +419,17 @@ func (client RegistriesClient) ImportImagePreparer(ctx context.Context, resource // ImportImageSender sends the ImportImage request. The method will close the // http.Response Body if it receives an error. func (client RegistriesClient) ImportImageSender(req *http.Request) (future RegistriesImportImageFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -906,15 +912,17 @@ func (client RegistriesClient) UpdatePreparer(ctx context.Context, resourceGroup // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client RegistriesClient) UpdateSender(req *http.Request) (future RegistriesUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/replications.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/replications.go index dc05abe72d71..0fdc10204bd0 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/replications.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/replications.go @@ -101,15 +101,17 @@ func (client ReplicationsClient) CreatePreparer(ctx context.Context, resourceGro // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client ReplicationsClient) CreateSender(req *http.Request) (future ReplicationsCreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -184,15 +186,17 @@ func (client ReplicationsClient) DeletePreparer(ctx context.Context, resourceGro // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ReplicationsClient) DeleteSender(req *http.Request) (future ReplicationsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -453,15 +457,17 @@ func (client ReplicationsClient) UpdatePreparer(ctx context.Context, resourceGro // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ReplicationsClient) UpdateSender(req *http.Request) (future ReplicationsUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/webhooks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/webhooks.go index 33b67fa2acc9..09120fdb0306 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/webhooks.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry/webhooks.go @@ -107,15 +107,17 @@ func (client WebhooksClient) CreatePreparer(ctx context.Context, resourceGroupNa // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client WebhooksClient) CreateSender(req *http.Request) (future WebhooksCreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -190,15 +192,17 @@ func (client WebhooksClient) DeletePreparer(ctx context.Context, resourceGroupNa // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client WebhooksClient) DeleteSender(req *http.Request) (future WebhooksDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -730,15 +734,17 @@ func (client WebhooksClient) UpdatePreparer(ctx context.Context, resourceGroupNa // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client WebhooksClient) UpdateSender(req *http.Request) (future WebhooksUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/containerservices.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/containerservices.go index 317b63851897..4a3dda6f5630 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/containerservices.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/containerservices.go @@ -122,15 +122,17 @@ func (client ContainerServicesClient) CreateOrUpdatePreparer(ctx context.Context // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ContainerServicesClient) CreateOrUpdateSender(req *http.Request) (future ContainerServicesCreateOrUpdateFutureType, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -194,15 +196,17 @@ func (client ContainerServicesClient) DeletePreparer(ctx context.Context, resour // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ContainerServicesClient) DeleteSender(req *http.Request) (future ContainerServicesDeleteFutureType, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/managedclusters.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/managedclusters.go index 1e03bc6dc9c5..bdfb8e22eea1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/managedclusters.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/managedclusters.go @@ -108,15 +108,17 @@ func (client ManagedClustersClient) CreateOrUpdatePreparer(ctx context.Context, // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ManagedClustersClient) CreateOrUpdateSender(req *http.Request) (future ManagedClustersCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -177,15 +179,17 @@ func (client ManagedClustersClient) DeletePreparer(ctx context.Context, resource // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ManagedClustersClient) DeleteSender(req *http.Request) (future ManagedClustersDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -268,8 +272,77 @@ func (client ManagedClustersClient) GetResponder(resp *http.Response) (result Ma return } -// GetAccessProfiles gets the accessProfile for the specified role name of the managed cluster with a specified -// resource group and name. +// GetAccessProfile gets the accessProfile for the specified role name of the managed cluster with a specified resource +// group and name. +// Parameters: +// resourceGroupName - the name of the resource group. +// resourceName - the name of the managed cluster resource. +// roleName - the name of the role for managed cluster accessProfile resource. +func (client ManagedClustersClient) GetAccessProfile(ctx context.Context, resourceGroupName string, resourceName string, roleName string) (result ManagedClusterAccessProfile, err error) { + req, err := client.GetAccessProfilePreparer(ctx, resourceGroupName, resourceName, roleName) + if err != nil { + err = autorest.NewErrorWithError(err, "containerservice.ManagedClustersClient", "GetAccessProfile", nil, "Failure preparing request") + return + } + + resp, err := client.GetAccessProfileSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "containerservice.ManagedClustersClient", "GetAccessProfile", resp, "Failure sending request") + return + } + + result, err = client.GetAccessProfileResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "containerservice.ManagedClustersClient", "GetAccessProfile", resp, "Failure responding to request") + } + + return +} + +// GetAccessProfilePreparer prepares the GetAccessProfile request. +func (client ManagedClustersClient) GetAccessProfilePreparer(ctx context.Context, resourceGroupName string, resourceName string, roleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "roleName": autorest.Encode("path", roleName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-08-31" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/accessProfiles/{roleName}/listCredential", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetAccessProfileSender sends the GetAccessProfile request. The method will close the +// http.Response Body if it receives an error. +func (client ManagedClustersClient) GetAccessProfileSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetAccessProfileResponder handles the response to the GetAccessProfile request. The method always +// closes the http.Response Body. +func (client ManagedClustersClient) GetAccessProfileResponder(resp *http.Response) (result ManagedClusterAccessProfile, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetAccessProfiles use ManagedClusters_GetAccessProfile instead. // Parameters: // resourceGroupName - the name of the resource group. // resourceName - the name of the managed cluster resource. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/models.go index 82b6808bd5e2..9470cf7785e1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice/models.go @@ -80,8 +80,6 @@ func PossibleStorageProfileTypesValues() []StorageProfileTypes { type VMSizeTypes string const ( - // StandardA0 ... - StandardA0 VMSizeTypes = "Standard_A0" // StandardA1 ... StandardA1 VMSizeTypes = "Standard_A1" // StandardA10 ... @@ -118,10 +116,6 @@ const ( StandardA8V2 VMSizeTypes = "Standard_A8_v2" // StandardA9 ... StandardA9 VMSizeTypes = "Standard_A9" - // StandardB1ms ... - StandardB1ms VMSizeTypes = "Standard_B1ms" - // StandardB1s ... - StandardB1s VMSizeTypes = "Standard_B1s" // StandardB2ms ... StandardB2ms VMSizeTypes = "Standard_B2ms" // StandardB2s ... @@ -438,7 +432,7 @@ const ( // PossibleVMSizeTypesValues returns an array of possible values for the VMSizeTypes const type. func PossibleVMSizeTypesValues() []VMSizeTypes { - return []VMSizeTypes{StandardA0, StandardA1, StandardA10, StandardA11, StandardA1V2, StandardA2, StandardA2mV2, StandardA2V2, StandardA3, StandardA4, StandardA4mV2, StandardA4V2, StandardA5, StandardA6, StandardA7, StandardA8, StandardA8mV2, StandardA8V2, StandardA9, StandardB1ms, StandardB1s, StandardB2ms, StandardB2s, StandardB4ms, StandardB8ms, StandardD1, StandardD11, StandardD11V2, StandardD11V2Promo, StandardD12, StandardD12V2, StandardD12V2Promo, StandardD13, StandardD13V2, StandardD13V2Promo, StandardD14, StandardD14V2, StandardD14V2Promo, StandardD15V2, StandardD16sV3, StandardD16V3, StandardD1V2, StandardD2, StandardD2sV3, StandardD2V2, StandardD2V2Promo, StandardD2V3, StandardD3, StandardD32sV3, StandardD32V3, StandardD3V2, StandardD3V2Promo, StandardD4, StandardD4sV3, StandardD4V2, StandardD4V2Promo, StandardD4V3, StandardD5V2, StandardD5V2Promo, StandardD64sV3, StandardD64V3, StandardD8sV3, StandardD8V3, StandardDS1, StandardDS11, StandardDS11V2, StandardDS11V2Promo, StandardDS12, StandardDS12V2, StandardDS12V2Promo, StandardDS13, StandardDS132V2, StandardDS134V2, StandardDS13V2, StandardDS13V2Promo, StandardDS14, StandardDS144V2, StandardDS148V2, StandardDS14V2, StandardDS14V2Promo, StandardDS15V2, StandardDS1V2, StandardDS2, StandardDS2V2, StandardDS2V2Promo, StandardDS3, StandardDS3V2, StandardDS3V2Promo, StandardDS4, StandardDS4V2, StandardDS4V2Promo, StandardDS5V2, StandardDS5V2Promo, StandardE16sV3, StandardE16V3, StandardE2sV3, StandardE2V3, StandardE3216sV3, StandardE328sV3, StandardE32sV3, StandardE32V3, StandardE4sV3, StandardE4V3, StandardE6416sV3, StandardE6432sV3, StandardE64sV3, StandardE64V3, StandardE8sV3, StandardE8V3, StandardF1, StandardF16, StandardF16s, StandardF16sV2, StandardF1s, StandardF2, StandardF2s, StandardF2sV2, StandardF32sV2, StandardF4, StandardF4s, StandardF4sV2, StandardF64sV2, StandardF72sV2, StandardF8, StandardF8s, StandardF8sV2, StandardG1, StandardG2, StandardG3, StandardG4, StandardG5, StandardGS1, StandardGS2, StandardGS3, StandardGS4, StandardGS44, StandardGS48, StandardGS5, StandardGS516, StandardGS58, StandardH16, StandardH16m, StandardH16mr, StandardH16r, StandardH8, StandardH8m, StandardL16s, StandardL32s, StandardL4s, StandardL8s, StandardM12832ms, StandardM12864ms, StandardM128ms, StandardM128s, StandardM6416ms, StandardM6432ms, StandardM64ms, StandardM64s, StandardNC12, StandardNC12sV2, StandardNC12sV3, StandardNC24, StandardNC24r, StandardNC24rsV2, StandardNC24rsV3, StandardNC24sV2, StandardNC24sV3, StandardNC6, StandardNC6sV2, StandardNC6sV3, StandardND12s, StandardND24rs, StandardND24s, StandardND6s, StandardNV12, StandardNV24, StandardNV6} + return []VMSizeTypes{StandardA1, StandardA10, StandardA11, StandardA1V2, StandardA2, StandardA2mV2, StandardA2V2, StandardA3, StandardA4, StandardA4mV2, StandardA4V2, StandardA5, StandardA6, StandardA7, StandardA8, StandardA8mV2, StandardA8V2, StandardA9, StandardB2ms, StandardB2s, StandardB4ms, StandardB8ms, StandardD1, StandardD11, StandardD11V2, StandardD11V2Promo, StandardD12, StandardD12V2, StandardD12V2Promo, StandardD13, StandardD13V2, StandardD13V2Promo, StandardD14, StandardD14V2, StandardD14V2Promo, StandardD15V2, StandardD16sV3, StandardD16V3, StandardD1V2, StandardD2, StandardD2sV3, StandardD2V2, StandardD2V2Promo, StandardD2V3, StandardD3, StandardD32sV3, StandardD32V3, StandardD3V2, StandardD3V2Promo, StandardD4, StandardD4sV3, StandardD4V2, StandardD4V2Promo, StandardD4V3, StandardD5V2, StandardD5V2Promo, StandardD64sV3, StandardD64V3, StandardD8sV3, StandardD8V3, StandardDS1, StandardDS11, StandardDS11V2, StandardDS11V2Promo, StandardDS12, StandardDS12V2, StandardDS12V2Promo, StandardDS13, StandardDS132V2, StandardDS134V2, StandardDS13V2, StandardDS13V2Promo, StandardDS14, StandardDS144V2, StandardDS148V2, StandardDS14V2, StandardDS14V2Promo, StandardDS15V2, StandardDS1V2, StandardDS2, StandardDS2V2, StandardDS2V2Promo, StandardDS3, StandardDS3V2, StandardDS3V2Promo, StandardDS4, StandardDS4V2, StandardDS4V2Promo, StandardDS5V2, StandardDS5V2Promo, StandardE16sV3, StandardE16V3, StandardE2sV3, StandardE2V3, StandardE3216sV3, StandardE328sV3, StandardE32sV3, StandardE32V3, StandardE4sV3, StandardE4V3, StandardE6416sV3, StandardE6432sV3, StandardE64sV3, StandardE64V3, StandardE8sV3, StandardE8V3, StandardF1, StandardF16, StandardF16s, StandardF16sV2, StandardF1s, StandardF2, StandardF2s, StandardF2sV2, StandardF32sV2, StandardF4, StandardF4s, StandardF4sV2, StandardF64sV2, StandardF72sV2, StandardF8, StandardF8s, StandardF8sV2, StandardG1, StandardG2, StandardG3, StandardG4, StandardG5, StandardGS1, StandardGS2, StandardGS3, StandardGS4, StandardGS44, StandardGS48, StandardGS5, StandardGS516, StandardGS58, StandardH16, StandardH16m, StandardH16mr, StandardH16r, StandardH8, StandardH8m, StandardL16s, StandardL32s, StandardL4s, StandardL8s, StandardM12832ms, StandardM12864ms, StandardM128ms, StandardM128s, StandardM6416ms, StandardM6432ms, StandardM64ms, StandardM64s, StandardNC12, StandardNC12sV2, StandardNC12sV3, StandardNC24, StandardNC24r, StandardNC24rsV2, StandardNC24rsV3, StandardNC24sV2, StandardNC24sV3, StandardNC6, StandardNC6sV2, StandardNC6sV3, StandardND12s, StandardND24rs, StandardND24s, StandardND6s, StandardNV12, StandardNV24, StandardNV6} } // AccessProfile profile for enabling a user to access a managed cluster. @@ -453,7 +447,7 @@ type AgentPoolProfile struct { Name *string `json:"name,omitempty"` // Count - Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. Count *int32 `json:"count,omitempty"` - // VMSize - Size of agent VMs. Possible values include: 'StandardA0', 'StandardA1', 'StandardA10', 'StandardA11', 'StandardA1V2', 'StandardA2', 'StandardA2V2', 'StandardA2mV2', 'StandardA3', 'StandardA4', 'StandardA4V2', 'StandardA4mV2', 'StandardA5', 'StandardA6', 'StandardA7', 'StandardA8', 'StandardA8V2', 'StandardA8mV2', 'StandardA9', 'StandardB1ms', 'StandardB1s', 'StandardB2ms', 'StandardB2s', 'StandardB4ms', 'StandardB8ms', 'StandardD1', 'StandardD11', 'StandardD11V2', 'StandardD11V2Promo', 'StandardD12', 'StandardD12V2', 'StandardD12V2Promo', 'StandardD13', 'StandardD13V2', 'StandardD13V2Promo', 'StandardD14', 'StandardD14V2', 'StandardD14V2Promo', 'StandardD15V2', 'StandardD16V3', 'StandardD16sV3', 'StandardD1V2', 'StandardD2', 'StandardD2V2', 'StandardD2V2Promo', 'StandardD2V3', 'StandardD2sV3', 'StandardD3', 'StandardD32V3', 'StandardD32sV3', 'StandardD3V2', 'StandardD3V2Promo', 'StandardD4', 'StandardD4V2', 'StandardD4V2Promo', 'StandardD4V3', 'StandardD4sV3', 'StandardD5V2', 'StandardD5V2Promo', 'StandardD64V3', 'StandardD64sV3', 'StandardD8V3', 'StandardD8sV3', 'StandardDS1', 'StandardDS11', 'StandardDS11V2', 'StandardDS11V2Promo', 'StandardDS12', 'StandardDS12V2', 'StandardDS12V2Promo', 'StandardDS13', 'StandardDS132V2', 'StandardDS134V2', 'StandardDS13V2', 'StandardDS13V2Promo', 'StandardDS14', 'StandardDS144V2', 'StandardDS148V2', 'StandardDS14V2', 'StandardDS14V2Promo', 'StandardDS15V2', 'StandardDS1V2', 'StandardDS2', 'StandardDS2V2', 'StandardDS2V2Promo', 'StandardDS3', 'StandardDS3V2', 'StandardDS3V2Promo', 'StandardDS4', 'StandardDS4V2', 'StandardDS4V2Promo', 'StandardDS5V2', 'StandardDS5V2Promo', 'StandardE16V3', 'StandardE16sV3', 'StandardE2V3', 'StandardE2sV3', 'StandardE3216sV3', 'StandardE328sV3', 'StandardE32V3', 'StandardE32sV3', 'StandardE4V3', 'StandardE4sV3', 'StandardE6416sV3', 'StandardE6432sV3', 'StandardE64V3', 'StandardE64sV3', 'StandardE8V3', 'StandardE8sV3', 'StandardF1', 'StandardF16', 'StandardF16s', 'StandardF16sV2', 'StandardF1s', 'StandardF2', 'StandardF2s', 'StandardF2sV2', 'StandardF32sV2', 'StandardF4', 'StandardF4s', 'StandardF4sV2', 'StandardF64sV2', 'StandardF72sV2', 'StandardF8', 'StandardF8s', 'StandardF8sV2', 'StandardG1', 'StandardG2', 'StandardG3', 'StandardG4', 'StandardG5', 'StandardGS1', 'StandardGS2', 'StandardGS3', 'StandardGS4', 'StandardGS44', 'StandardGS48', 'StandardGS5', 'StandardGS516', 'StandardGS58', 'StandardH16', 'StandardH16m', 'StandardH16mr', 'StandardH16r', 'StandardH8', 'StandardH8m', 'StandardL16s', 'StandardL32s', 'StandardL4s', 'StandardL8s', 'StandardM12832ms', 'StandardM12864ms', 'StandardM128ms', 'StandardM128s', 'StandardM6416ms', 'StandardM6432ms', 'StandardM64ms', 'StandardM64s', 'StandardNC12', 'StandardNC12sV2', 'StandardNC12sV3', 'StandardNC24', 'StandardNC24r', 'StandardNC24rsV2', 'StandardNC24rsV3', 'StandardNC24sV2', 'StandardNC24sV3', 'StandardNC6', 'StandardNC6sV2', 'StandardNC6sV3', 'StandardND12s', 'StandardND24rs', 'StandardND24s', 'StandardND6s', 'StandardNV12', 'StandardNV24', 'StandardNV6' + // VMSize - Size of agent VMs. Possible values include: 'StandardA1', 'StandardA10', 'StandardA11', 'StandardA1V2', 'StandardA2', 'StandardA2V2', 'StandardA2mV2', 'StandardA3', 'StandardA4', 'StandardA4V2', 'StandardA4mV2', 'StandardA5', 'StandardA6', 'StandardA7', 'StandardA8', 'StandardA8V2', 'StandardA8mV2', 'StandardA9', 'StandardB2ms', 'StandardB2s', 'StandardB4ms', 'StandardB8ms', 'StandardD1', 'StandardD11', 'StandardD11V2', 'StandardD11V2Promo', 'StandardD12', 'StandardD12V2', 'StandardD12V2Promo', 'StandardD13', 'StandardD13V2', 'StandardD13V2Promo', 'StandardD14', 'StandardD14V2', 'StandardD14V2Promo', 'StandardD15V2', 'StandardD16V3', 'StandardD16sV3', 'StandardD1V2', 'StandardD2', 'StandardD2V2', 'StandardD2V2Promo', 'StandardD2V3', 'StandardD2sV3', 'StandardD3', 'StandardD32V3', 'StandardD32sV3', 'StandardD3V2', 'StandardD3V2Promo', 'StandardD4', 'StandardD4V2', 'StandardD4V2Promo', 'StandardD4V3', 'StandardD4sV3', 'StandardD5V2', 'StandardD5V2Promo', 'StandardD64V3', 'StandardD64sV3', 'StandardD8V3', 'StandardD8sV3', 'StandardDS1', 'StandardDS11', 'StandardDS11V2', 'StandardDS11V2Promo', 'StandardDS12', 'StandardDS12V2', 'StandardDS12V2Promo', 'StandardDS13', 'StandardDS132V2', 'StandardDS134V2', 'StandardDS13V2', 'StandardDS13V2Promo', 'StandardDS14', 'StandardDS144V2', 'StandardDS148V2', 'StandardDS14V2', 'StandardDS14V2Promo', 'StandardDS15V2', 'StandardDS1V2', 'StandardDS2', 'StandardDS2V2', 'StandardDS2V2Promo', 'StandardDS3', 'StandardDS3V2', 'StandardDS3V2Promo', 'StandardDS4', 'StandardDS4V2', 'StandardDS4V2Promo', 'StandardDS5V2', 'StandardDS5V2Promo', 'StandardE16V3', 'StandardE16sV3', 'StandardE2V3', 'StandardE2sV3', 'StandardE3216sV3', 'StandardE328sV3', 'StandardE32V3', 'StandardE32sV3', 'StandardE4V3', 'StandardE4sV3', 'StandardE6416sV3', 'StandardE6432sV3', 'StandardE64V3', 'StandardE64sV3', 'StandardE8V3', 'StandardE8sV3', 'StandardF1', 'StandardF16', 'StandardF16s', 'StandardF16sV2', 'StandardF1s', 'StandardF2', 'StandardF2s', 'StandardF2sV2', 'StandardF32sV2', 'StandardF4', 'StandardF4s', 'StandardF4sV2', 'StandardF64sV2', 'StandardF72sV2', 'StandardF8', 'StandardF8s', 'StandardF8sV2', 'StandardG1', 'StandardG2', 'StandardG3', 'StandardG4', 'StandardG5', 'StandardGS1', 'StandardGS2', 'StandardGS3', 'StandardGS4', 'StandardGS44', 'StandardGS48', 'StandardGS5', 'StandardGS516', 'StandardGS58', 'StandardH16', 'StandardH16m', 'StandardH16mr', 'StandardH16r', 'StandardH8', 'StandardH8m', 'StandardL16s', 'StandardL32s', 'StandardL4s', 'StandardL8s', 'StandardM12832ms', 'StandardM12864ms', 'StandardM128ms', 'StandardM128s', 'StandardM6416ms', 'StandardM6432ms', 'StandardM64ms', 'StandardM64s', 'StandardNC12', 'StandardNC12sV2', 'StandardNC12sV3', 'StandardNC24', 'StandardNC24r', 'StandardNC24rsV2', 'StandardNC24rsV3', 'StandardNC24sV2', 'StandardNC24sV3', 'StandardNC6', 'StandardNC6sV2', 'StandardNC6sV3', 'StandardND12s', 'StandardND24rs', 'StandardND24s', 'StandardND6s', 'StandardNV12', 'StandardNV24', 'StandardNV6' VMSize VMSizeTypes `json:"vmSize,omitempty"` // OsDiskSizeGB - OS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified. OsDiskSizeGB *int32 `json:"osDiskSizeGB,omitempty"` @@ -465,7 +459,7 @@ type AgentPoolProfile struct { Ports *[]int32 `json:"ports,omitempty"` // StorageProfile - Storage profile specifies what kind of storage used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will choose for you based on the orchestrator choice. Possible values include: 'StorageAccount', 'ManagedDisks' StorageProfile StorageProfileTypes `json:"storageProfile,omitempty"` - // VnetSubnetID - VNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. + // VnetSubnetID - VNet SubnetID specifies the vnet's subnet identifier. VnetSubnetID *string `json:"vnetSubnetID,omitempty"` // OsType - OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows' OsType OSType `json:"osType,omitempty"` @@ -585,12 +579,11 @@ func (cs *ContainerService) UnmarshalJSON(body []byte) error { // long-running operation. type ContainerServicesCreateOrUpdateFutureType struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ContainerServicesCreateOrUpdateFutureType) Result(client ContainerServicesClient) (cs ContainerService, err error) { +func (future *ContainerServicesCreateOrUpdateFutureType) Result(client ContainerServicesClient) (cs ContainerService, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -598,34 +591,15 @@ func (future ContainerServicesCreateOrUpdateFutureType) Result(client ContainerS return } if !done { - return cs, azure.NewAsyncOpIncompleteError("containerservice.ContainerServicesCreateOrUpdateFutureType") - } - if future.PollingMethod() == azure.PollingLocation { - cs, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerservice.ContainerServicesCreateOrUpdateFutureType", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerservice.ContainerServicesCreateOrUpdateFutureType") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if cs.Response.Response, err = future.GetResult(sender); err == nil && cs.Response.Response.StatusCode != http.StatusNoContent { + cs, err = client.CreateOrUpdateResponder(cs.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "containerservice.ContainerServicesCreateOrUpdateFutureType", "Result", cs.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerservice.ContainerServicesCreateOrUpdateFutureType", "Result", resp, "Failure sending request") - return - } - cs, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerservice.ContainerServicesCreateOrUpdateFutureType", "Result", resp, "Failure responding to request") } return } @@ -634,12 +608,11 @@ func (future ContainerServicesCreateOrUpdateFutureType) Result(client ContainerS // operation. type ContainerServicesDeleteFutureType struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ContainerServicesDeleteFutureType) Result(client ContainerServicesClient) (ar autorest.Response, err error) { +func (future *ContainerServicesDeleteFutureType) Result(client ContainerServicesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -647,35 +620,10 @@ func (future ContainerServicesDeleteFutureType) Result(client ContainerServicesC return } if !done { - return ar, azure.NewAsyncOpIncompleteError("containerservice.ContainerServicesDeleteFutureType") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerservice.ContainerServicesDeleteFutureType", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerservice.ContainerServicesDeleteFutureType") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerservice.ContainerServicesDeleteFutureType", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerservice.ContainerServicesDeleteFutureType", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -1167,12 +1115,11 @@ type ManagedClusterProperties struct { // operation. type ManagedClustersCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ManagedClustersCreateOrUpdateFuture) Result(client ManagedClustersClient) (mc ManagedCluster, err error) { +func (future *ManagedClustersCreateOrUpdateFuture) Result(client ManagedClustersClient) (mc ManagedCluster, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1180,34 +1127,15 @@ func (future ManagedClustersCreateOrUpdateFuture) Result(client ManagedClustersC return } if !done { - return mc, azure.NewAsyncOpIncompleteError("containerservice.ManagedClustersCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - mc, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerservice.ManagedClustersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerservice.ManagedClustersCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if mc.Response.Response, err = future.GetResult(sender); err == nil && mc.Response.Response.StatusCode != http.StatusNoContent { + mc, err = client.CreateOrUpdateResponder(mc.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "containerservice.ManagedClustersCreateOrUpdateFuture", "Result", mc.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerservice.ManagedClustersCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - mc, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerservice.ManagedClustersCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -1216,12 +1144,11 @@ func (future ManagedClustersCreateOrUpdateFuture) Result(client ManagedClustersC // operation. type ManagedClustersDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ManagedClustersDeleteFuture) Result(client ManagedClustersClient) (ar autorest.Response, err error) { +func (future *ManagedClustersDeleteFuture) Result(client ManagedClustersClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1229,35 +1156,10 @@ func (future ManagedClustersDeleteFuture) Result(client ManagedClustersClient) ( return } if !done { - return ar, azure.NewAsyncOpIncompleteError("containerservice.ManagedClustersDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "containerservice.ManagedClustersDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("containerservice.ManagedClustersDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "containerservice.ManagedClustersDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "containerservice.ManagedClustersDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -1357,11 +1259,11 @@ type MasterProfile struct { Count *int32 `json:"count,omitempty"` // DNSPrefix - DNS prefix to be used to create the FQDN for the master pool. DNSPrefix *string `json:"dnsPrefix,omitempty"` - // VMSize - Size of agent VMs. Possible values include: 'StandardA0', 'StandardA1', 'StandardA10', 'StandardA11', 'StandardA1V2', 'StandardA2', 'StandardA2V2', 'StandardA2mV2', 'StandardA3', 'StandardA4', 'StandardA4V2', 'StandardA4mV2', 'StandardA5', 'StandardA6', 'StandardA7', 'StandardA8', 'StandardA8V2', 'StandardA8mV2', 'StandardA9', 'StandardB1ms', 'StandardB1s', 'StandardB2ms', 'StandardB2s', 'StandardB4ms', 'StandardB8ms', 'StandardD1', 'StandardD11', 'StandardD11V2', 'StandardD11V2Promo', 'StandardD12', 'StandardD12V2', 'StandardD12V2Promo', 'StandardD13', 'StandardD13V2', 'StandardD13V2Promo', 'StandardD14', 'StandardD14V2', 'StandardD14V2Promo', 'StandardD15V2', 'StandardD16V3', 'StandardD16sV3', 'StandardD1V2', 'StandardD2', 'StandardD2V2', 'StandardD2V2Promo', 'StandardD2V3', 'StandardD2sV3', 'StandardD3', 'StandardD32V3', 'StandardD32sV3', 'StandardD3V2', 'StandardD3V2Promo', 'StandardD4', 'StandardD4V2', 'StandardD4V2Promo', 'StandardD4V3', 'StandardD4sV3', 'StandardD5V2', 'StandardD5V2Promo', 'StandardD64V3', 'StandardD64sV3', 'StandardD8V3', 'StandardD8sV3', 'StandardDS1', 'StandardDS11', 'StandardDS11V2', 'StandardDS11V2Promo', 'StandardDS12', 'StandardDS12V2', 'StandardDS12V2Promo', 'StandardDS13', 'StandardDS132V2', 'StandardDS134V2', 'StandardDS13V2', 'StandardDS13V2Promo', 'StandardDS14', 'StandardDS144V2', 'StandardDS148V2', 'StandardDS14V2', 'StandardDS14V2Promo', 'StandardDS15V2', 'StandardDS1V2', 'StandardDS2', 'StandardDS2V2', 'StandardDS2V2Promo', 'StandardDS3', 'StandardDS3V2', 'StandardDS3V2Promo', 'StandardDS4', 'StandardDS4V2', 'StandardDS4V2Promo', 'StandardDS5V2', 'StandardDS5V2Promo', 'StandardE16V3', 'StandardE16sV3', 'StandardE2V3', 'StandardE2sV3', 'StandardE3216sV3', 'StandardE328sV3', 'StandardE32V3', 'StandardE32sV3', 'StandardE4V3', 'StandardE4sV3', 'StandardE6416sV3', 'StandardE6432sV3', 'StandardE64V3', 'StandardE64sV3', 'StandardE8V3', 'StandardE8sV3', 'StandardF1', 'StandardF16', 'StandardF16s', 'StandardF16sV2', 'StandardF1s', 'StandardF2', 'StandardF2s', 'StandardF2sV2', 'StandardF32sV2', 'StandardF4', 'StandardF4s', 'StandardF4sV2', 'StandardF64sV2', 'StandardF72sV2', 'StandardF8', 'StandardF8s', 'StandardF8sV2', 'StandardG1', 'StandardG2', 'StandardG3', 'StandardG4', 'StandardG5', 'StandardGS1', 'StandardGS2', 'StandardGS3', 'StandardGS4', 'StandardGS44', 'StandardGS48', 'StandardGS5', 'StandardGS516', 'StandardGS58', 'StandardH16', 'StandardH16m', 'StandardH16mr', 'StandardH16r', 'StandardH8', 'StandardH8m', 'StandardL16s', 'StandardL32s', 'StandardL4s', 'StandardL8s', 'StandardM12832ms', 'StandardM12864ms', 'StandardM128ms', 'StandardM128s', 'StandardM6416ms', 'StandardM6432ms', 'StandardM64ms', 'StandardM64s', 'StandardNC12', 'StandardNC12sV2', 'StandardNC12sV3', 'StandardNC24', 'StandardNC24r', 'StandardNC24rsV2', 'StandardNC24rsV3', 'StandardNC24sV2', 'StandardNC24sV3', 'StandardNC6', 'StandardNC6sV2', 'StandardNC6sV3', 'StandardND12s', 'StandardND24rs', 'StandardND24s', 'StandardND6s', 'StandardNV12', 'StandardNV24', 'StandardNV6' + // VMSize - Size of agent VMs. Possible values include: 'StandardA1', 'StandardA10', 'StandardA11', 'StandardA1V2', 'StandardA2', 'StandardA2V2', 'StandardA2mV2', 'StandardA3', 'StandardA4', 'StandardA4V2', 'StandardA4mV2', 'StandardA5', 'StandardA6', 'StandardA7', 'StandardA8', 'StandardA8V2', 'StandardA8mV2', 'StandardA9', 'StandardB2ms', 'StandardB2s', 'StandardB4ms', 'StandardB8ms', 'StandardD1', 'StandardD11', 'StandardD11V2', 'StandardD11V2Promo', 'StandardD12', 'StandardD12V2', 'StandardD12V2Promo', 'StandardD13', 'StandardD13V2', 'StandardD13V2Promo', 'StandardD14', 'StandardD14V2', 'StandardD14V2Promo', 'StandardD15V2', 'StandardD16V3', 'StandardD16sV3', 'StandardD1V2', 'StandardD2', 'StandardD2V2', 'StandardD2V2Promo', 'StandardD2V3', 'StandardD2sV3', 'StandardD3', 'StandardD32V3', 'StandardD32sV3', 'StandardD3V2', 'StandardD3V2Promo', 'StandardD4', 'StandardD4V2', 'StandardD4V2Promo', 'StandardD4V3', 'StandardD4sV3', 'StandardD5V2', 'StandardD5V2Promo', 'StandardD64V3', 'StandardD64sV3', 'StandardD8V3', 'StandardD8sV3', 'StandardDS1', 'StandardDS11', 'StandardDS11V2', 'StandardDS11V2Promo', 'StandardDS12', 'StandardDS12V2', 'StandardDS12V2Promo', 'StandardDS13', 'StandardDS132V2', 'StandardDS134V2', 'StandardDS13V2', 'StandardDS13V2Promo', 'StandardDS14', 'StandardDS144V2', 'StandardDS148V2', 'StandardDS14V2', 'StandardDS14V2Promo', 'StandardDS15V2', 'StandardDS1V2', 'StandardDS2', 'StandardDS2V2', 'StandardDS2V2Promo', 'StandardDS3', 'StandardDS3V2', 'StandardDS3V2Promo', 'StandardDS4', 'StandardDS4V2', 'StandardDS4V2Promo', 'StandardDS5V2', 'StandardDS5V2Promo', 'StandardE16V3', 'StandardE16sV3', 'StandardE2V3', 'StandardE2sV3', 'StandardE3216sV3', 'StandardE328sV3', 'StandardE32V3', 'StandardE32sV3', 'StandardE4V3', 'StandardE4sV3', 'StandardE6416sV3', 'StandardE6432sV3', 'StandardE64V3', 'StandardE64sV3', 'StandardE8V3', 'StandardE8sV3', 'StandardF1', 'StandardF16', 'StandardF16s', 'StandardF16sV2', 'StandardF1s', 'StandardF2', 'StandardF2s', 'StandardF2sV2', 'StandardF32sV2', 'StandardF4', 'StandardF4s', 'StandardF4sV2', 'StandardF64sV2', 'StandardF72sV2', 'StandardF8', 'StandardF8s', 'StandardF8sV2', 'StandardG1', 'StandardG2', 'StandardG3', 'StandardG4', 'StandardG5', 'StandardGS1', 'StandardGS2', 'StandardGS3', 'StandardGS4', 'StandardGS44', 'StandardGS48', 'StandardGS5', 'StandardGS516', 'StandardGS58', 'StandardH16', 'StandardH16m', 'StandardH16mr', 'StandardH16r', 'StandardH8', 'StandardH8m', 'StandardL16s', 'StandardL32s', 'StandardL4s', 'StandardL8s', 'StandardM12832ms', 'StandardM12864ms', 'StandardM128ms', 'StandardM128s', 'StandardM6416ms', 'StandardM6432ms', 'StandardM64ms', 'StandardM64s', 'StandardNC12', 'StandardNC12sV2', 'StandardNC12sV3', 'StandardNC24', 'StandardNC24r', 'StandardNC24rsV2', 'StandardNC24rsV3', 'StandardNC24sV2', 'StandardNC24sV3', 'StandardNC6', 'StandardNC6sV2', 'StandardNC6sV3', 'StandardND12s', 'StandardND24rs', 'StandardND24s', 'StandardND6s', 'StandardNV12', 'StandardNV24', 'StandardNV6' VMSize VMSizeTypes `json:"vmSize,omitempty"` // OsDiskSizeGB - OS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified. OsDiskSizeGB *int32 `json:"osDiskSizeGB,omitempty"` - // VnetSubnetID - VNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. + // VnetSubnetID - VNet SubnetID specifies the vnet's subnet identifier. VnetSubnetID *string `json:"vnetSubnetID,omitempty"` // FirstConsecutiveStaticIP - FirstConsecutiveStaticIP used to specify the first static ip of masters. FirstConsecutiveStaticIP *string `json:"firstConsecutiveStaticIP,omitempty"` diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/databaseaccounts.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/databaseaccounts.go index ca3c1b24d6bf..58fc95c6d6cd 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/databaseaccounts.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/databaseaccounts.go @@ -184,15 +184,17 @@ func (client DatabaseAccountsClient) CreateOrUpdatePreparer(ctx context.Context, // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DatabaseAccountsClient) CreateOrUpdateSender(req *http.Request) (future DatabaseAccountsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -264,15 +266,17 @@ func (client DatabaseAccountsClient) DeletePreparer(ctx context.Context, resourc // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client DatabaseAccountsClient) DeleteSender(req *http.Request) (future DatabaseAccountsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -350,15 +354,17 @@ func (client DatabaseAccountsClient) FailoverPriorityChangePreparer(ctx context. // FailoverPriorityChangeSender sends the FailoverPriorityChange request. The method will close the // http.Response Body if it receives an error. func (client DatabaseAccountsClient) FailoverPriorityChangeSender(req *http.Request) (future DatabaseAccountsFailoverPriorityChangeFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -452,6 +458,84 @@ func (client DatabaseAccountsClient) GetResponder(resp *http.Response) (result D return } +// GetReadOnlyKeys lists the read-only access keys for the specified Azure Cosmos DB database account. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +func (client DatabaseAccountsClient) GetReadOnlyKeys(ctx context.Context, resourceGroupName string, accountName string) (result DatabaseAccountListReadOnlyKeysResult, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}, + {TargetValue: accountName, + Constraints: []validation.Constraint{{Target: "accountName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "accountName", Name: validation.MinLength, Rule: 3, Chain: nil}}}}); err != nil { + return result, validation.NewError("documentdb.DatabaseAccountsClient", "GetReadOnlyKeys", err.Error()) + } + + req, err := client.GetReadOnlyKeysPreparer(ctx, resourceGroupName, accountName) + if err != nil { + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsClient", "GetReadOnlyKeys", nil, "Failure preparing request") + return + } + + resp, err := client.GetReadOnlyKeysSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsClient", "GetReadOnlyKeys", resp, "Failure sending request") + return + } + + result, err = client.GetReadOnlyKeysResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsClient", "GetReadOnlyKeys", resp, "Failure responding to request") + } + + return +} + +// GetReadOnlyKeysPreparer prepares the GetReadOnlyKeys request. +func (client DatabaseAccountsClient) GetReadOnlyKeysPreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-04-08" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/{accountName}/readonlykeys", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetReadOnlyKeysSender sends the GetReadOnlyKeys request. The method will close the +// http.Response Body if it receives an error. +func (client DatabaseAccountsClient) GetReadOnlyKeysSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetReadOnlyKeysResponder handles the response to the GetReadOnlyKeys request. The method always +// closes the http.Response Body. +func (client DatabaseAccountsClient) GetReadOnlyKeysResponder(resp *http.Response) (result DatabaseAccountListReadOnlyKeysResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + // List lists all the Azure Cosmos DB database accounts available under the subscription. func (client DatabaseAccountsClient) List(ctx context.Context) (result DatabaseAccountsListResult, err error) { req, err := client.ListPreparer(ctx) @@ -954,7 +1038,7 @@ func (client DatabaseAccountsClient) ListReadOnlyKeysPreparer(ctx context.Contex } preparer := autorest.CreatePreparer( - autorest.AsGet(), + autorest.AsPost(), autorest.WithBaseURL(client.BaseURI), autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/{accountName}/readonlykeys", pathParameters), autorest.WithQueryParameters(queryParameters)) @@ -1064,6 +1148,178 @@ func (client DatabaseAccountsClient) ListUsagesResponder(resp *http.Response) (r return } +// OfflineRegion offline the specified region for the specified Azure Cosmos DB database account. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// regionParameterForOffline - cosmos DB region to offline for the database account. +func (client DatabaseAccountsClient) OfflineRegion(ctx context.Context, resourceGroupName string, accountName string, regionParameterForOffline RegionForOnlineOffline) (result DatabaseAccountsOfflineRegionFuture, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}, + {TargetValue: accountName, + Constraints: []validation.Constraint{{Target: "accountName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "accountName", Name: validation.MinLength, Rule: 3, Chain: nil}}}, + {TargetValue: regionParameterForOffline, + Constraints: []validation.Constraint{{Target: "regionParameterForOffline.Region", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { + return result, validation.NewError("documentdb.DatabaseAccountsClient", "OfflineRegion", err.Error()) + } + + req, err := client.OfflineRegionPreparer(ctx, resourceGroupName, accountName, regionParameterForOffline) + if err != nil { + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsClient", "OfflineRegion", nil, "Failure preparing request") + return + } + + result, err = client.OfflineRegionSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsClient", "OfflineRegion", result.Response(), "Failure sending request") + return + } + + return +} + +// OfflineRegionPreparer prepares the OfflineRegion request. +func (client DatabaseAccountsClient) OfflineRegionPreparer(ctx context.Context, resourceGroupName string, accountName string, regionParameterForOffline RegionForOnlineOffline) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-04-08" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/{accountName}/offlineRegion", pathParameters), + autorest.WithJSON(regionParameterForOffline), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// OfflineRegionSender sends the OfflineRegion request. The method will close the +// http.Response Body if it receives an error. +func (client DatabaseAccountsClient) OfflineRegionSender(req *http.Request) (future DatabaseAccountsOfflineRegionFuture, err error) { + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// OfflineRegionResponder handles the response to the OfflineRegion request. The method always +// closes the http.Response Body. +func (client DatabaseAccountsClient) OfflineRegionResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByClosing()) + result.Response = resp + return +} + +// OnlineRegion online the specified region for the specified Azure Cosmos DB database account. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// accountName - cosmos DB database account name. +// regionParameterForOnline - cosmos DB region to online for the database account. +func (client DatabaseAccountsClient) OnlineRegion(ctx context.Context, resourceGroupName string, accountName string, regionParameterForOnline RegionForOnlineOffline) (result DatabaseAccountsOnlineRegionFuture, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}, + {TargetValue: accountName, + Constraints: []validation.Constraint{{Target: "accountName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "accountName", Name: validation.MinLength, Rule: 3, Chain: nil}}}, + {TargetValue: regionParameterForOnline, + Constraints: []validation.Constraint{{Target: "regionParameterForOnline.Region", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { + return result, validation.NewError("documentdb.DatabaseAccountsClient", "OnlineRegion", err.Error()) + } + + req, err := client.OnlineRegionPreparer(ctx, resourceGroupName, accountName, regionParameterForOnline) + if err != nil { + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsClient", "OnlineRegion", nil, "Failure preparing request") + return + } + + result, err = client.OnlineRegionSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsClient", "OnlineRegion", result.Response(), "Failure sending request") + return + } + + return +} + +// OnlineRegionPreparer prepares the OnlineRegion request. +func (client DatabaseAccountsClient) OnlineRegionPreparer(ctx context.Context, resourceGroupName string, accountName string, regionParameterForOnline RegionForOnlineOffline) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2015-04-08" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/{accountName}/onlineRegion", pathParameters), + autorest.WithJSON(regionParameterForOnline), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// OnlineRegionSender sends the OnlineRegion request. The method will close the +// http.Response Body if it receives an error. +func (client DatabaseAccountsClient) OnlineRegionSender(req *http.Request) (future DatabaseAccountsOnlineRegionFuture, err error) { + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// OnlineRegionResponder handles the response to the OnlineRegion request. The method always +// closes the http.Response Body. +func (client DatabaseAccountsClient) OnlineRegionResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByClosing()) + result.Response = resp + return +} + // Patch patches the properties of an existing Azure Cosmos DB database account. // Parameters: // resourceGroupName - name of an Azure resource group. @@ -1122,15 +1378,17 @@ func (client DatabaseAccountsClient) PatchPreparer(ctx context.Context, resource // PatchSender sends the Patch request. The method will close the // http.Response Body if it receives an error. func (client DatabaseAccountsClient) PatchSender(req *http.Request) (future DatabaseAccountsPatchFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1205,15 +1463,17 @@ func (client DatabaseAccountsClient) RegenerateKeyPreparer(ctx context.Context, // RegenerateKeySender sends the RegenerateKey request. The method will close the // http.Response Body if it receives an error. func (client DatabaseAccountsClient) RegenerateKeySender(req *http.Request) (future DatabaseAccountsRegenerateKeyFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/models.go index e831e0925975..a882a5a2e63e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb/models.go @@ -607,12 +607,11 @@ type DatabaseAccountRegenerateKeyParameters struct { // operation. type DatabaseAccountsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabaseAccountsCreateOrUpdateFuture) Result(client DatabaseAccountsClient) (da DatabaseAccount, err error) { +func (future *DatabaseAccountsCreateOrUpdateFuture) Result(client DatabaseAccountsClient) (da DatabaseAccount, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -620,34 +619,15 @@ func (future DatabaseAccountsCreateOrUpdateFuture) Result(client DatabaseAccount return } if !done { - return da, azure.NewAsyncOpIncompleteError("documentdb.DatabaseAccountsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - da, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("documentdb.DatabaseAccountsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if da.Response.Response, err = future.GetResult(sender); err == nil && da.Response.Response.StatusCode != http.StatusNoContent { + da, err = client.CreateOrUpdateResponder(da.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsCreateOrUpdateFuture", "Result", da.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - da, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -656,12 +636,11 @@ func (future DatabaseAccountsCreateOrUpdateFuture) Result(client DatabaseAccount // operation. type DatabaseAccountsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabaseAccountsDeleteFuture) Result(client DatabaseAccountsClient) (ar autorest.Response, err error) { +func (future *DatabaseAccountsDeleteFuture) Result(client DatabaseAccountsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -669,35 +648,10 @@ func (future DatabaseAccountsDeleteFuture) Result(client DatabaseAccountsClient) return } if !done { - return ar, azure.NewAsyncOpIncompleteError("documentdb.DatabaseAccountsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("documentdb.DatabaseAccountsDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -705,12 +659,11 @@ func (future DatabaseAccountsDeleteFuture) Result(client DatabaseAccountsClient) // long-running operation. type DatabaseAccountsFailoverPriorityChangeFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabaseAccountsFailoverPriorityChangeFuture) Result(client DatabaseAccountsClient) (ar autorest.Response, err error) { +func (future *DatabaseAccountsFailoverPriorityChangeFuture) Result(client DatabaseAccountsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -718,35 +671,10 @@ func (future DatabaseAccountsFailoverPriorityChangeFuture) Result(client Databas return } if !done { - return ar, azure.NewAsyncOpIncompleteError("documentdb.DatabaseAccountsFailoverPriorityChangeFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.FailoverPriorityChangeResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsFailoverPriorityChangeFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("documentdb.DatabaseAccountsFailoverPriorityChangeFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsFailoverPriorityChangeFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.FailoverPriorityChangeResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsFailoverPriorityChangeFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -758,104 +686,112 @@ type DatabaseAccountsListResult struct { Value *[]DatabaseAccount `json:"value,omitempty"` } -// DatabaseAccountsPatchFuture an abstraction for monitoring and retrieving the results of a long-running +// DatabaseAccountsOfflineRegionFuture an abstraction for monitoring and retrieving the results of a long-running // operation. -type DatabaseAccountsPatchFuture struct { +type DatabaseAccountsOfflineRegionFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabaseAccountsPatchFuture) Result(client DatabaseAccountsClient) (da DatabaseAccount, err error) { +func (future *DatabaseAccountsOfflineRegionFuture) Result(client DatabaseAccountsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsPatchFuture", "Result", future.Response(), "Polling failure") + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsOfflineRegionFuture", "Result", future.Response(), "Polling failure") return } if !done { - return da, azure.NewAsyncOpIncompleteError("documentdb.DatabaseAccountsPatchFuture") - } - if future.PollingMethod() == azure.PollingLocation { - da, err = client.PatchResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsPatchFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("documentdb.DatabaseAccountsOfflineRegionFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + ar.Response = future.Response() + return +} + +// DatabaseAccountsOnlineRegionFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type DatabaseAccountsOnlineRegionFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *DatabaseAccountsOnlineRegionFuture) Result(client DatabaseAccountsClient) (ar autorest.Response, err error) { + var done bool + done, err = future.Done(client) if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsPatchFuture", "Result", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsOnlineRegionFuture", "Result", future.Response(), "Polling failure") return } - da, err = client.PatchResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsPatchFuture", "Result", resp, "Failure responding to request") + if !done { + err = azure.NewAsyncOpIncompleteError("documentdb.DatabaseAccountsOnlineRegionFuture") + return } + ar.Response = future.Response() return } -// DatabaseAccountsRegenerateKeyFuture an abstraction for monitoring and retrieving the results of a long-running +// DatabaseAccountsPatchFuture an abstraction for monitoring and retrieving the results of a long-running // operation. -type DatabaseAccountsRegenerateKeyFuture struct { +type DatabaseAccountsPatchFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabaseAccountsRegenerateKeyFuture) Result(client DatabaseAccountsClient) (ar autorest.Response, err error) { +func (future *DatabaseAccountsPatchFuture) Result(client DatabaseAccountsClient) (da DatabaseAccount, err error) { var done bool done, err = future.Done(client) if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsRegenerateKeyFuture", "Result", future.Response(), "Polling failure") + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsPatchFuture", "Result", future.Response(), "Polling failure") return } if !done { - return ar, azure.NewAsyncOpIncompleteError("documentdb.DatabaseAccountsRegenerateKeyFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.RegenerateKeyResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsRegenerateKeyFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("documentdb.DatabaseAccountsPatchFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if da.Response.Response, err = future.GetResult(sender); err == nil && da.Response.Response.StatusCode != http.StatusNoContent { + da, err = client.PatchResponder(da.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsPatchFuture", "Result", da.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + return +} + +// DatabaseAccountsRegenerateKeyFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type DatabaseAccountsRegenerateKeyFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *DatabaseAccountsRegenerateKeyFuture) Result(client DatabaseAccountsClient) (ar autorest.Response, err error) { + var done bool + done, err = future.Done(client) if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsRegenerateKeyFuture", "Result", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsRegenerateKeyFuture", "Result", future.Response(), "Polling failure") return } - ar, err = client.RegenerateKeyResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "documentdb.DatabaseAccountsRegenerateKeyFuture", "Result", resp, "Failure responding to request") + if !done { + err = azure.NewAsyncOpIncompleteError("documentdb.DatabaseAccountsRegenerateKeyFuture") + return } + ar.Response = future.Response() return } +// ErrorResponse error Response. +type ErrorResponse struct { + // Code - Error code. + Code *string `json:"code,omitempty"` + // Message - Error message indicating why the operation failed. + Message *string `json:"message,omitempty"` +} + // FailoverPolicies the list of new failover policies for the failover priority change. type FailoverPolicies struct { // FailoverPolicies - List of failover policies. @@ -1189,6 +1125,12 @@ type PercentileMetricValue struct { Total *float64 `json:"total,omitempty"` } +// RegionForOnlineOffline cosmos DB region to online or offline. +type RegionForOnlineOffline struct { + // Region - Cosmos DB region, with spaces between words and each word capitalized. + Region *string `json:"region,omitempty"` +} + // Resource a database account resource. type Resource struct { // ID - The unique resource identifier of the database account. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/accounts.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/accounts.go index 52f0dc72d3bf..6cce0f738e83 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/accounts.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/accounts.go @@ -179,15 +179,17 @@ func (client AccountsClient) CreatePreparer(ctx context.Context, resourceGroupNa // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client AccountsClient) CreateSender(req *http.Request) (future AccountsCreateFutureType, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -248,15 +250,17 @@ func (client AccountsClient) DeletePreparer(ctx context.Context, resourceGroupNa // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client AccountsClient) DeleteSender(req *http.Request) (future AccountsDeleteFutureType, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -714,15 +718,17 @@ func (client AccountsClient) UpdatePreparer(ctx context.Context, resourceGroupNa // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client AccountsClient) UpdateSender(req *http.Request) (future AccountsUpdateFutureType, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/firewallrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/firewallrules.go index f3c1385d09b0..6ce16a323d8a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/firewallrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/firewallrules.go @@ -122,7 +122,7 @@ func (client FirewallRulesClient) CreateOrUpdateResponder(resp *http.Response) ( return } -// Delete deletes the specified firewall rule from the specified Data Lake Store account +// Delete deletes the specified firewall rule from the specified Data Lake Store account. // Parameters: // resourceGroupName - the name of the Azure resource group. // accountName - the name of the Data Lake Store account. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/models.go index c5fd6c189532..17ffe424ce4d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/models.go @@ -231,12 +231,11 @@ func PossibleTrustedIDProviderStateValues() []TrustedIDProviderState { // AccountsCreateFutureType an abstraction for monitoring and retrieving the results of a long-running operation. type AccountsCreateFutureType struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AccountsCreateFutureType) Result(client AccountsClient) (dlsa DataLakeStoreAccount, err error) { +func (future *AccountsCreateFutureType) Result(client AccountsClient) (dlsa DataLakeStoreAccount, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -244,34 +243,15 @@ func (future AccountsCreateFutureType) Result(client AccountsClient) (dlsa DataL return } if !done { - return dlsa, azure.NewAsyncOpIncompleteError("account.AccountsCreateFutureType") - } - if future.PollingMethod() == azure.PollingLocation { - dlsa, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "account.AccountsCreateFutureType", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("account.AccountsCreateFutureType") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if dlsa.Response.Response, err = future.GetResult(sender); err == nil && dlsa.Response.Response.StatusCode != http.StatusNoContent { + dlsa, err = client.CreateResponder(dlsa.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "account.AccountsCreateFutureType", "Result", dlsa.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "account.AccountsCreateFutureType", "Result", resp, "Failure sending request") - return - } - dlsa, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.AccountsCreateFutureType", "Result", resp, "Failure responding to request") } return } @@ -279,12 +259,11 @@ func (future AccountsCreateFutureType) Result(client AccountsClient) (dlsa DataL // AccountsDeleteFutureType an abstraction for monitoring and retrieving the results of a long-running operation. type AccountsDeleteFutureType struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AccountsDeleteFutureType) Result(client AccountsClient) (ar autorest.Response, err error) { +func (future *AccountsDeleteFutureType) Result(client AccountsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -292,47 +271,21 @@ func (future AccountsDeleteFutureType) Result(client AccountsClient) (ar autores return } if !done { - return ar, azure.NewAsyncOpIncompleteError("account.AccountsDeleteFutureType") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "account.AccountsDeleteFutureType", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("account.AccountsDeleteFutureType") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "account.AccountsDeleteFutureType", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.AccountsDeleteFutureType", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // AccountsUpdateFutureType an abstraction for monitoring and retrieving the results of a long-running operation. type AccountsUpdateFutureType struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AccountsUpdateFutureType) Result(client AccountsClient) (dlsa DataLakeStoreAccount, err error) { +func (future *AccountsUpdateFutureType) Result(client AccountsClient) (dlsa DataLakeStoreAccount, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -340,34 +293,15 @@ func (future AccountsUpdateFutureType) Result(client AccountsClient) (dlsa DataL return } if !done { - return dlsa, azure.NewAsyncOpIncompleteError("account.AccountsUpdateFutureType") - } - if future.PollingMethod() == azure.PollingLocation { - dlsa, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "account.AccountsUpdateFutureType", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("account.AccountsUpdateFutureType") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if dlsa.Response.Response, err = future.GetResult(sender); err == nil && dlsa.Response.Response.StatusCode != http.StatusNoContent { + dlsa, err = client.UpdateResponder(dlsa.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "account.AccountsUpdateFutureType", "Result", dlsa.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "account.AccountsUpdateFutureType", "Result", resp, "Failure sending request") - return - } - dlsa, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "account.AccountsUpdateFutureType", "Result", resp, "Failure responding to request") } return } @@ -486,6 +420,8 @@ type CreateDataLakeStoreAccountProperties struct { EncryptionState EncryptionState `json:"encryptionState,omitempty"` // FirewallRules - The list of firewall rules associated with this Data Lake Store account. FirewallRules *[]CreateFirewallRuleWithAccountParameters `json:"firewallRules,omitempty"` + // VirtualNetworkRules - The list of virtual network rules associated with this Data Lake Store account. + VirtualNetworkRules *[]CreateVirtualNetworkRuleWithAccountParameters `json:"virtualNetworkRules,omitempty"` // FirewallState - The current state of the IP address firewall for this Data Lake Store account. Possible values include: 'FirewallStateEnabled', 'FirewallStateDisabled' FirewallState FirewallState `json:"firewallState,omitempty"` // FirewallAllowAzureIps - The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced. Possible values include: 'FirewallAllowAzureIpsStateEnabled', 'FirewallAllowAzureIpsStateDisabled' @@ -645,6 +581,52 @@ type CreateOrUpdateTrustedIDProviderProperties struct { IDProvider *string `json:"idProvider,omitempty"` } +// CreateOrUpdateVirtualNetworkRuleParameters the parameters used to create a new virtual network rule. +type CreateOrUpdateVirtualNetworkRuleParameters struct { + // CreateOrUpdateVirtualNetworkRuleProperties - The virtual network rule properties to use when creating a new virtual network rule. + *CreateOrUpdateVirtualNetworkRuleProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for CreateOrUpdateVirtualNetworkRuleParameters. +func (couvnrp CreateOrUpdateVirtualNetworkRuleParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if couvnrp.CreateOrUpdateVirtualNetworkRuleProperties != nil { + objectMap["properties"] = couvnrp.CreateOrUpdateVirtualNetworkRuleProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for CreateOrUpdateVirtualNetworkRuleParameters struct. +func (couvnrp *CreateOrUpdateVirtualNetworkRuleParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var createOrUpdateVirtualNetworkRuleProperties CreateOrUpdateVirtualNetworkRuleProperties + err = json.Unmarshal(*v, &createOrUpdateVirtualNetworkRuleProperties) + if err != nil { + return err + } + couvnrp.CreateOrUpdateVirtualNetworkRuleProperties = &createOrUpdateVirtualNetworkRuleProperties + } + } + } + + return nil +} + +// CreateOrUpdateVirtualNetworkRuleProperties the virtual network rule properties to use when creating a new +// virtual network rule. +type CreateOrUpdateVirtualNetworkRuleProperties struct { + // SubnetID - The resource identifier for the subnet. + SubnetID *string `json:"subnetId,omitempty"` +} + // CreateTrustedIDProviderWithAccountParameters the parameters used to create a new trusted identity provider while // creating a new Data Lake Store account. type CreateTrustedIDProviderWithAccountParameters struct { @@ -699,6 +681,60 @@ func (ctipwap *CreateTrustedIDProviderWithAccountParameters) UnmarshalJSON(body return nil } +// CreateVirtualNetworkRuleWithAccountParameters the parameters used to create a new virtual network rule while +// creating a new Data Lake Store account. +type CreateVirtualNetworkRuleWithAccountParameters struct { + // Name - The unique name of the virtual network rule to create. + Name *string `json:"name,omitempty"` + // CreateOrUpdateVirtualNetworkRuleProperties - The virtual network rule properties to use when creating a new virtual network rule. + *CreateOrUpdateVirtualNetworkRuleProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for CreateVirtualNetworkRuleWithAccountParameters. +func (cvnrwap CreateVirtualNetworkRuleWithAccountParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if cvnrwap.Name != nil { + objectMap["name"] = cvnrwap.Name + } + if cvnrwap.CreateOrUpdateVirtualNetworkRuleProperties != nil { + objectMap["properties"] = cvnrwap.CreateOrUpdateVirtualNetworkRuleProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for CreateVirtualNetworkRuleWithAccountParameters struct. +func (cvnrwap *CreateVirtualNetworkRuleWithAccountParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + cvnrwap.Name = &name + } + case "properties": + if v != nil { + var createOrUpdateVirtualNetworkRuleProperties CreateOrUpdateVirtualNetworkRuleProperties + err = json.Unmarshal(*v, &createOrUpdateVirtualNetworkRuleProperties) + if err != nil { + return err + } + cvnrwap.CreateOrUpdateVirtualNetworkRuleProperties = &createOrUpdateVirtualNetworkRuleProperties + } + } + } + + return nil +} + // DataLakeStoreAccount data Lake Store account information. type DataLakeStoreAccount struct { autorest.Response `json:"-"` @@ -1047,6 +1083,8 @@ type DataLakeStoreAccountProperties struct { EncryptionProvisioningState EncryptionProvisioningState `json:"encryptionProvisioningState,omitempty"` // FirewallRules - The list of firewall rules associated with this Data Lake Store account. FirewallRules *[]FirewallRule `json:"firewallRules,omitempty"` + // VirtualNetworkRules - The list of virtual network rules associated with this Data Lake Store account. + VirtualNetworkRules *[]VirtualNetworkRule `json:"virtualNetworkRules,omitempty"` // FirewallState - The current state of the IP address firewall for this Data Lake Store account. Possible values include: 'FirewallStateEnabled', 'FirewallStateDisabled' FirewallState FirewallState `json:"firewallState,omitempty"` // FirewallAllowAzureIps - The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced. Possible values include: 'FirewallAllowAzureIpsStateEnabled', 'FirewallAllowAzureIpsStateDisabled' @@ -1648,6 +1686,8 @@ type UpdateDataLakeStoreAccountProperties struct { EncryptionConfig *UpdateEncryptionConfig `json:"encryptionConfig,omitempty"` // FirewallRules - The list of firewall rules associated with this Data Lake Store account. FirewallRules *[]UpdateFirewallRuleWithAccountParameters `json:"firewallRules,omitempty"` + // VirtualNetworkRules - The list of virtual network rules associated with this Data Lake Store account. + VirtualNetworkRules *[]UpdateVirtualNetworkRuleWithAccountParameters `json:"virtualNetworkRules,omitempty"` // FirewallState - The current state of the IP address firewall for this Data Lake Store account. Disabling the firewall does not remove existing rules, they will just be ignored until the firewall is re-enabled. Possible values include: 'FirewallStateEnabled', 'FirewallStateDisabled' FirewallState FirewallState `json:"firewallState,omitempty"` // FirewallAllowAzureIps - The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced. Possible values include: 'FirewallAllowAzureIpsStateEnabled', 'FirewallAllowAzureIpsStateDisabled' @@ -1872,3 +1912,293 @@ func (utipwap *UpdateTrustedIDProviderWithAccountParameters) UnmarshalJSON(body return nil } + +// UpdateVirtualNetworkRuleParameters the parameters used to update a virtual network rule. +type UpdateVirtualNetworkRuleParameters struct { + // UpdateVirtualNetworkRuleProperties - The virtual network rule properties to use when updating a virtual network rule. + *UpdateVirtualNetworkRuleProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for UpdateVirtualNetworkRuleParameters. +func (uvnrp UpdateVirtualNetworkRuleParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if uvnrp.UpdateVirtualNetworkRuleProperties != nil { + objectMap["properties"] = uvnrp.UpdateVirtualNetworkRuleProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for UpdateVirtualNetworkRuleParameters struct. +func (uvnrp *UpdateVirtualNetworkRuleParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var updateVirtualNetworkRuleProperties UpdateVirtualNetworkRuleProperties + err = json.Unmarshal(*v, &updateVirtualNetworkRuleProperties) + if err != nil { + return err + } + uvnrp.UpdateVirtualNetworkRuleProperties = &updateVirtualNetworkRuleProperties + } + } + } + + return nil +} + +// UpdateVirtualNetworkRuleProperties the virtual network rule properties to use when updating a virtual network +// rule. +type UpdateVirtualNetworkRuleProperties struct { + // SubnetID - The resource identifier for the subnet. + SubnetID *string `json:"subnetId,omitempty"` +} + +// UpdateVirtualNetworkRuleWithAccountParameters the parameters used to update a virtual network rule while +// updating a Data Lake Store account. +type UpdateVirtualNetworkRuleWithAccountParameters struct { + // Name - The unique name of the virtual network rule to update. + Name *string `json:"name,omitempty"` + // UpdateVirtualNetworkRuleProperties - The virtual network rule properties to use when updating a virtual network rule. + *UpdateVirtualNetworkRuleProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for UpdateVirtualNetworkRuleWithAccountParameters. +func (uvnrwap UpdateVirtualNetworkRuleWithAccountParameters) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if uvnrwap.Name != nil { + objectMap["name"] = uvnrwap.Name + } + if uvnrwap.UpdateVirtualNetworkRuleProperties != nil { + objectMap["properties"] = uvnrwap.UpdateVirtualNetworkRuleProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for UpdateVirtualNetworkRuleWithAccountParameters struct. +func (uvnrwap *UpdateVirtualNetworkRuleWithAccountParameters) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + uvnrwap.Name = &name + } + case "properties": + if v != nil { + var updateVirtualNetworkRuleProperties UpdateVirtualNetworkRuleProperties + err = json.Unmarshal(*v, &updateVirtualNetworkRuleProperties) + if err != nil { + return err + } + uvnrwap.UpdateVirtualNetworkRuleProperties = &updateVirtualNetworkRuleProperties + } + } + } + + return nil +} + +// VirtualNetworkRule data Lake Store virtual network rule information. +type VirtualNetworkRule struct { + autorest.Response `json:"-"` + // VirtualNetworkRuleProperties - The virtual network rule properties. + *VirtualNetworkRuleProperties `json:"properties,omitempty"` + // ID - The resource identifier. + ID *string `json:"id,omitempty"` + // Name - The resource name. + Name *string `json:"name,omitempty"` + // Type - The resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for VirtualNetworkRule. +func (vnr VirtualNetworkRule) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if vnr.VirtualNetworkRuleProperties != nil { + objectMap["properties"] = vnr.VirtualNetworkRuleProperties + } + if vnr.ID != nil { + objectMap["id"] = vnr.ID + } + if vnr.Name != nil { + objectMap["name"] = vnr.Name + } + if vnr.Type != nil { + objectMap["type"] = vnr.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for VirtualNetworkRule struct. +func (vnr *VirtualNetworkRule) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var virtualNetworkRuleProperties VirtualNetworkRuleProperties + err = json.Unmarshal(*v, &virtualNetworkRuleProperties) + if err != nil { + return err + } + vnr.VirtualNetworkRuleProperties = &virtualNetworkRuleProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + vnr.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + vnr.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + vnr.Type = &typeVar + } + } + } + + return nil +} + +// VirtualNetworkRuleListResult data Lake Store virtual network rule list information. +type VirtualNetworkRuleListResult struct { + autorest.Response `json:"-"` + // Value - The results of the list operation. + Value *[]VirtualNetworkRule `json:"value,omitempty"` + // NextLink - The link (url) to the next page of results. + NextLink *string `json:"nextLink,omitempty"` +} + +// VirtualNetworkRuleListResultIterator provides access to a complete listing of VirtualNetworkRule values. +type VirtualNetworkRuleListResultIterator struct { + i int + page VirtualNetworkRuleListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *VirtualNetworkRuleListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter VirtualNetworkRuleListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter VirtualNetworkRuleListResultIterator) Response() VirtualNetworkRuleListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter VirtualNetworkRuleListResultIterator) Value() VirtualNetworkRule { + if !iter.page.NotDone() { + return VirtualNetworkRule{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (vnrlr VirtualNetworkRuleListResult) IsEmpty() bool { + return vnrlr.Value == nil || len(*vnrlr.Value) == 0 +} + +// virtualNetworkRuleListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (vnrlr VirtualNetworkRuleListResult) virtualNetworkRuleListResultPreparer() (*http.Request, error) { + if vnrlr.NextLink == nil || len(to.String(vnrlr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(vnrlr.NextLink))) +} + +// VirtualNetworkRuleListResultPage contains a page of VirtualNetworkRule values. +type VirtualNetworkRuleListResultPage struct { + fn func(VirtualNetworkRuleListResult) (VirtualNetworkRuleListResult, error) + vnrlr VirtualNetworkRuleListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *VirtualNetworkRuleListResultPage) Next() error { + next, err := page.fn(page.vnrlr) + if err != nil { + return err + } + page.vnrlr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page VirtualNetworkRuleListResultPage) NotDone() bool { + return !page.vnrlr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page VirtualNetworkRuleListResultPage) Response() VirtualNetworkRuleListResult { + return page.vnrlr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page VirtualNetworkRuleListResultPage) Values() []VirtualNetworkRule { + if page.vnrlr.IsEmpty() { + return nil + } + return *page.vnrlr.Value +} + +// VirtualNetworkRuleProperties the virtual network rule properties. +type VirtualNetworkRuleProperties struct { + // SubnetID - The resource identifier for the subnet. + SubnetID *string `json:"subnetId,omitempty"` +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/virtualnetworkrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/virtualnetworkrules.go new file mode 100644 index 000000000000..d44ef296b9d6 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account/virtualnetworkrules.go @@ -0,0 +1,428 @@ +package account + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// VirtualNetworkRulesClient is the creates an Azure Data Lake Store account management client. +type VirtualNetworkRulesClient struct { + BaseClient +} + +// NewVirtualNetworkRulesClient creates an instance of the VirtualNetworkRulesClient client. +func NewVirtualNetworkRulesClient(subscriptionID string) VirtualNetworkRulesClient { + return NewVirtualNetworkRulesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewVirtualNetworkRulesClientWithBaseURI creates an instance of the VirtualNetworkRulesClient client. +func NewVirtualNetworkRulesClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkRulesClient { + return VirtualNetworkRulesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate creates or updates the specified virtual network rule. During update, the virtual network rule with +// the specified name will be replaced with this new virtual network rule. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// virtualNetworkRuleName - the name of the virtual network rule to create or update. +// parameters - parameters supplied to create or update the virtual network rule. +func (client VirtualNetworkRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, accountName string, virtualNetworkRuleName string, parameters CreateOrUpdateVirtualNetworkRuleParameters) (result VirtualNetworkRule, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.CreateOrUpdateVirtualNetworkRuleProperties", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.CreateOrUpdateVirtualNetworkRuleProperties.SubnetID", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil { + return result, validation.NewError("account.VirtualNetworkRulesClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, accountName, virtualNetworkRuleName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "CreateOrUpdate", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client VirtualNetworkRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, accountName string, virtualNetworkRuleName string, parameters CreateOrUpdateVirtualNetworkRuleParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "virtualNetworkRuleName": autorest.Encode("path", virtualNetworkRuleName), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/virtualNetworkRules/{virtualNetworkRuleName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes the specified virtual network rule from the specified Data Lake Store account. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// virtualNetworkRuleName - the name of the virtual network rule to delete. +func (client VirtualNetworkRulesClient) Delete(ctx context.Context, resourceGroupName string, accountName string, virtualNetworkRuleName string) (result autorest.Response, err error) { + req, err := client.DeletePreparer(ctx, resourceGroupName, accountName, virtualNetworkRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client VirtualNetworkRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, accountName string, virtualNetworkRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "virtualNetworkRuleName": autorest.Encode("path", virtualNetworkRuleName), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/virtualNetworkRules/{virtualNetworkRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) DeleteSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get gets the specified Data Lake Store virtual network rule. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// virtualNetworkRuleName - the name of the virtual network rule to retrieve. +func (client VirtualNetworkRulesClient) Get(ctx context.Context, resourceGroupName string, accountName string, virtualNetworkRuleName string) (result VirtualNetworkRule, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, accountName, virtualNetworkRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client VirtualNetworkRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, accountName string, virtualNetworkRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "virtualNetworkRuleName": autorest.Encode("path", virtualNetworkRuleName), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/virtualNetworkRules/{virtualNetworkRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) GetResponder(resp *http.Response) (result VirtualNetworkRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListByAccount lists the Data Lake Store virtual network rules within the specified Data Lake Store account. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +func (client VirtualNetworkRulesClient) ListByAccount(ctx context.Context, resourceGroupName string, accountName string) (result VirtualNetworkRuleListResultPage, err error) { + result.fn = client.listByAccountNextResults + req, err := client.ListByAccountPreparer(ctx, resourceGroupName, accountName) + if err != nil { + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "ListByAccount", nil, "Failure preparing request") + return + } + + resp, err := client.ListByAccountSender(req) + if err != nil { + result.vnrlr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "ListByAccount", resp, "Failure sending request") + return + } + + result.vnrlr, err = client.ListByAccountResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "ListByAccount", resp, "Failure responding to request") + } + + return +} + +// ListByAccountPreparer prepares the ListByAccount request. +func (client VirtualNetworkRulesClient) ListByAccountPreparer(ctx context.Context, resourceGroupName string, accountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/virtualNetworkRules", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByAccountSender sends the ListByAccount request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) ListByAccountSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByAccountResponder handles the response to the ListByAccount request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) ListByAccountResponder(resp *http.Response) (result VirtualNetworkRuleListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByAccountNextResults retrieves the next set of results, if any. +func (client VirtualNetworkRulesClient) listByAccountNextResults(lastResults VirtualNetworkRuleListResult) (result VirtualNetworkRuleListResult, err error) { + req, err := lastResults.virtualNetworkRuleListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "listByAccountNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByAccountSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "listByAccountNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByAccountResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "listByAccountNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByAccountComplete enumerates all values, automatically crossing page boundaries as required. +func (client VirtualNetworkRulesClient) ListByAccountComplete(ctx context.Context, resourceGroupName string, accountName string) (result VirtualNetworkRuleListResultIterator, err error) { + result.page, err = client.ListByAccount(ctx, resourceGroupName, accountName) + return +} + +// Update updates the specified virtual network rule. +// Parameters: +// resourceGroupName - the name of the Azure resource group. +// accountName - the name of the Data Lake Store account. +// virtualNetworkRuleName - the name of the virtual network rule to update. +// parameters - parameters supplied to update the virtual network rule. +func (client VirtualNetworkRulesClient) Update(ctx context.Context, resourceGroupName string, accountName string, virtualNetworkRuleName string, parameters *UpdateVirtualNetworkRuleParameters) (result VirtualNetworkRule, err error) { + req, err := client.UpdatePreparer(ctx, resourceGroupName, accountName, virtualNetworkRuleName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "Update", nil, "Failure preparing request") + return + } + + resp, err := client.UpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "Update", resp, "Failure sending request") + return + } + + result, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "account.VirtualNetworkRulesClient", "Update", resp, "Failure responding to request") + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client VirtualNetworkRulesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, accountName string, virtualNetworkRuleName string, parameters *UpdateVirtualNetworkRuleParameters) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "virtualNetworkRuleName": autorest.Encode("path", virtualNetworkRuleName), + } + + const APIVersion = "2016-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeStore/accounts/{accountName}/virtualNetworkRules/{virtualNetworkRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + if parameters != nil { + preparer = autorest.DecoratePreparer(preparer, + autorest.WithJSON(parameters)) + } + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) UpdateSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) UpdateResponder(resp *http.Response) (result VirtualNetworkRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/models.go index d346ca44b9d8..f7b9cea94664 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/models.go @@ -824,12 +824,11 @@ type ZoneProperties struct { // ZonesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ZonesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ZonesDeleteFuture) Result(client ZonesClient) (zdr ZoneDeleteResult, err error) { +func (future *ZonesDeleteFuture) Result(client ZonesClient) (zdr ZoneDeleteResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -837,34 +836,15 @@ func (future ZonesDeleteFuture) Result(client ZonesClient) (zdr ZoneDeleteResult return } if !done { - return zdr, azure.NewAsyncOpIncompleteError("dns.ZonesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - zdr, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "dns.ZonesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("dns.ZonesDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if zdr.Response.Response, err = future.GetResult(sender); err == nil && zdr.Response.Response.StatusCode != http.StatusNoContent { + zdr, err = client.DeleteResponder(zdr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "dns.ZonesDeleteFuture", "Result", zdr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "dns.ZonesDeleteFuture", "Result", resp, "Failure sending request") - return - } - zdr, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "dns.ZonesDeleteFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/recordsets.go b/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/recordsets.go index cd10b4004e73..e3d2bc1160aa 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/recordsets.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/recordsets.go @@ -21,6 +21,7 @@ import ( "context" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" "net/http" ) @@ -41,7 +42,7 @@ func NewRecordSetsClientWithBaseURI(baseURI string, subscriptionID string) Recor // CreateOrUpdate creates or updates a record set within a DNS zone. // Parameters: -// resourceGroupName - the name of the resource group. +// resourceGroupName - the name of the resource group. The name is case insensitive. // zoneName - the name of the DNS zone (without a terminating dot). // relativeRecordSetName - the name of the record set, relative to the name of the zone. // recordType - the type of DNS record in this record set. Record sets of type SOA can be updated but not @@ -52,6 +53,14 @@ func NewRecordSetsClientWithBaseURI(baseURI string, subscriptionID string) Recor // ifNoneMatch - set to '*' to allow a new record set to be created, but to prevent updating an existing record // set. Other values will be ignored. func (client RecordSetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, zoneName string, relativeRecordSetName string, recordType RecordType, parameters RecordSet, ifMatch string, ifNoneMatch string) (result RecordSet, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("dns.RecordSetsClient", "CreateOrUpdate", err.Error()) + } + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, zoneName, relativeRecordSetName, recordType, parameters, ifMatch, ifNoneMatch) if err != nil { err = autorest.NewErrorWithError(err, "dns.RecordSetsClient", "CreateOrUpdate", nil, "Failure preparing request") @@ -128,7 +137,7 @@ func (client RecordSetsClient) CreateOrUpdateResponder(resp *http.Response) (res // Delete deletes a record set from a DNS zone. This operation cannot be undone. // Parameters: -// resourceGroupName - the name of the resource group. +// resourceGroupName - the name of the resource group. The name is case insensitive. // zoneName - the name of the DNS zone (without a terminating dot). // relativeRecordSetName - the name of the record set, relative to the name of the zone. // recordType - the type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are @@ -136,6 +145,14 @@ func (client RecordSetsClient) CreateOrUpdateResponder(resp *http.Response) (res // ifMatch - the etag of the record set. Omit this value to always delete the current record set. Specify the // last-seen etag value to prevent accidentally deleting any concurrent changes. func (client RecordSetsClient) Delete(ctx context.Context, resourceGroupName string, zoneName string, relativeRecordSetName string, recordType RecordType, ifMatch string) (result autorest.Response, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("dns.RecordSetsClient", "Delete", err.Error()) + } + req, err := client.DeletePreparer(ctx, resourceGroupName, zoneName, relativeRecordSetName, recordType, ifMatch) if err != nil { err = autorest.NewErrorWithError(err, "dns.RecordSetsClient", "Delete", nil, "Failure preparing request") @@ -205,11 +222,19 @@ func (client RecordSetsClient) DeleteResponder(resp *http.Response) (result auto // Get gets a record set. // Parameters: -// resourceGroupName - the name of the resource group. +// resourceGroupName - the name of the resource group. The name is case insensitive. // zoneName - the name of the DNS zone (without a terminating dot). // relativeRecordSetName - the name of the record set, relative to the name of the zone. // recordType - the type of DNS record in this record set. func (client RecordSetsClient) Get(ctx context.Context, resourceGroupName string, zoneName string, relativeRecordSetName string, recordType RecordType) (result RecordSet, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("dns.RecordSetsClient", "Get", err.Error()) + } + req, err := client.GetPreparer(ctx, resourceGroupName, zoneName, relativeRecordSetName, recordType) if err != nil { err = autorest.NewErrorWithError(err, "dns.RecordSetsClient", "Get", nil, "Failure preparing request") @@ -276,13 +301,21 @@ func (client RecordSetsClient) GetResponder(resp *http.Response) (result RecordS // ListByDNSZone lists all record sets in a DNS zone. // Parameters: -// resourceGroupName - the name of the resource group. +// resourceGroupName - the name of the resource group. The name is case insensitive. // zoneName - the name of the DNS zone (without a terminating dot). // top - the maximum number of record sets to return. If not specified, returns up to 100 record sets. // recordsetnamesuffix - the suffix label of the record set name that has to be used to filter the record set // enumerations. If this parameter is specified, Enumeration will return only records that end with // . func (client RecordSetsClient) ListByDNSZone(ctx context.Context, resourceGroupName string, zoneName string, top *int32, recordsetnamesuffix string) (result RecordSetListResultPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("dns.RecordSetsClient", "ListByDNSZone", err.Error()) + } + result.fn = client.listByDNSZoneNextResults req, err := client.ListByDNSZonePreparer(ctx, resourceGroupName, zoneName, top, recordsetnamesuffix) if err != nil { @@ -381,7 +414,7 @@ func (client RecordSetsClient) ListByDNSZoneComplete(ctx context.Context, resour // ListByType lists the record sets of a specified type in a DNS zone. // Parameters: -// resourceGroupName - the name of the resource group. +// resourceGroupName - the name of the resource group. The name is case insensitive. // zoneName - the name of the DNS zone (without a terminating dot). // recordType - the type of record sets to enumerate. // top - the maximum number of record sets to return. If not specified, returns up to 100 record sets. @@ -389,6 +422,14 @@ func (client RecordSetsClient) ListByDNSZoneComplete(ctx context.Context, resour // enumerations. If this parameter is specified, Enumeration will return only records that end with // . func (client RecordSetsClient) ListByType(ctx context.Context, resourceGroupName string, zoneName string, recordType RecordType, top *int32, recordsetnamesuffix string) (result RecordSetListResultPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("dns.RecordSetsClient", "ListByType", err.Error()) + } + result.fn = client.listByTypeNextResults req, err := client.ListByTypePreparer(ctx, resourceGroupName, zoneName, recordType, top, recordsetnamesuffix) if err != nil { @@ -488,7 +529,7 @@ func (client RecordSetsClient) ListByTypeComplete(ctx context.Context, resourceG // Update updates a record set within a DNS zone. // Parameters: -// resourceGroupName - the name of the resource group. +// resourceGroupName - the name of the resource group. The name is case insensitive. // zoneName - the name of the DNS zone (without a terminating dot). // relativeRecordSetName - the name of the record set, relative to the name of the zone. // recordType - the type of DNS record in this record set. @@ -496,6 +537,14 @@ func (client RecordSetsClient) ListByTypeComplete(ctx context.Context, resourceG // ifMatch - the etag of the record set. Omit this value to always overwrite the current record set. Specify // the last-seen etag value to prevent accidentally overwritting concurrent changes. func (client RecordSetsClient) Update(ctx context.Context, resourceGroupName string, zoneName string, relativeRecordSetName string, recordType RecordType, parameters RecordSet, ifMatch string) (result RecordSet, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("dns.RecordSetsClient", "Update", err.Error()) + } + req, err := client.UpdatePreparer(ctx, resourceGroupName, zoneName, relativeRecordSetName, recordType, parameters, ifMatch) if err != nil { err = autorest.NewErrorWithError(err, "dns.RecordSetsClient", "Update", nil, "Failure preparing request") diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/zones.go b/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/zones.go index d085c1784a10..5e17378320f6 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/zones.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns/zones.go @@ -21,6 +21,7 @@ import ( "context" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" "net/http" ) @@ -41,7 +42,7 @@ func NewZonesClientWithBaseURI(baseURI string, subscriptionID string) ZonesClien // CreateOrUpdate creates or updates a DNS zone. Does not modify DNS records within the zone. // Parameters: -// resourceGroupName - the name of the resource group. +// resourceGroupName - the name of the resource group. The name is case insensitive. // zoneName - the name of the DNS zone (without a terminating dot). // parameters - parameters supplied to the CreateOrUpdate operation. // ifMatch - the etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the @@ -49,6 +50,14 @@ func NewZonesClientWithBaseURI(baseURI string, subscriptionID string) ZonesClien // ifNoneMatch - set to '*' to allow a new DNS zone to be created, but to prevent updating an existing zone. // Other values will be ignored. func (client ZonesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, zoneName string, parameters Zone, ifMatch string, ifNoneMatch string) (result Zone, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("dns.ZonesClient", "CreateOrUpdate", err.Error()) + } + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, zoneName, parameters, ifMatch, ifNoneMatch) if err != nil { err = autorest.NewErrorWithError(err, "dns.ZonesClient", "CreateOrUpdate", nil, "Failure preparing request") @@ -124,11 +133,19 @@ func (client ZonesClient) CreateOrUpdateResponder(resp *http.Response) (result Z // Delete deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be // undone. // Parameters: -// resourceGroupName - the name of the resource group. +// resourceGroupName - the name of the resource group. The name is case insensitive. // zoneName - the name of the DNS zone (without a terminating dot). // ifMatch - the etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen // etag value to prevent accidentally deleting any concurrent changes. func (client ZonesClient) Delete(ctx context.Context, resourceGroupName string, zoneName string, ifMatch string) (result ZonesDeleteFuture, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("dns.ZonesClient", "Delete", err.Error()) + } + req, err := client.DeletePreparer(ctx, resourceGroupName, zoneName, ifMatch) if err != nil { err = autorest.NewErrorWithError(err, "dns.ZonesClient", "Delete", nil, "Failure preparing request") @@ -172,15 +189,17 @@ func (client ZonesClient) DeletePreparer(ctx context.Context, resourceGroupName // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ZonesClient) DeleteSender(req *http.Request) (future ZonesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -199,9 +218,17 @@ func (client ZonesClient) DeleteResponder(resp *http.Response) (result ZoneDelet // Get gets a DNS zone. Retrieves the zone properties, but not the record sets within the zone. // Parameters: -// resourceGroupName - the name of the resource group. +// resourceGroupName - the name of the resource group. The name is case insensitive. // zoneName - the name of the DNS zone (without a terminating dot). func (client ZonesClient) Get(ctx context.Context, resourceGroupName string, zoneName string) (result Zone, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("dns.ZonesClient", "Get", err.Error()) + } + req, err := client.GetPreparer(ctx, resourceGroupName, zoneName) if err != nil { err = autorest.NewErrorWithError(err, "dns.ZonesClient", "Get", nil, "Failure preparing request") @@ -361,9 +388,17 @@ func (client ZonesClient) ListComplete(ctx context.Context, top *int32) (result // ListByResourceGroup lists the DNS zones within a resource group. // Parameters: -// resourceGroupName - the name of the resource group. +// resourceGroupName - the name of the resource group. The name is case insensitive. // top - the maximum number of record sets to return. If not specified, returns up to 100 record sets. func (client ZonesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string, top *int32) (result ZoneListResultPage, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("dns.ZonesClient", "ListByResourceGroup", err.Error()) + } + result.fn = client.listByResourceGroupNextResults req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName, top) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/eventsubscriptions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/eventsubscriptions.go index a5487f7d7275..1f77e05d38d6 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/eventsubscriptions.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/eventsubscriptions.go @@ -94,15 +94,17 @@ func (client EventSubscriptionsClient) CreateOrUpdatePreparer(ctx context.Contex // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) CreateOrUpdateSender(req *http.Request) (future EventSubscriptionsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -169,15 +171,17 @@ func (client EventSubscriptionsClient) DeletePreparer(ctx context.Context, scope // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) DeleteSender(req *http.Request) (future EventSubscriptionsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -995,15 +999,17 @@ func (client EventSubscriptionsClient) UpdatePreparer(ctx context.Context, scope // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client EventSubscriptionsClient) UpdateSender(req *http.Request) (future EventSubscriptionsUpdateFuture, err error) { - sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/models.go index 8a264027fee7..4d4e60b85c0c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/models.go @@ -472,12 +472,11 @@ func (esp *EventSubscriptionProperties) UnmarshalJSON(body []byte) error { // long-running operation. type EventSubscriptionsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future EventSubscriptionsCreateOrUpdateFuture) Result(client EventSubscriptionsClient) (es EventSubscription, err error) { +func (future *EventSubscriptionsCreateOrUpdateFuture) Result(client EventSubscriptionsClient) (es EventSubscription, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -485,34 +484,15 @@ func (future EventSubscriptionsCreateOrUpdateFuture) Result(client EventSubscrip return } if !done { - return es, azure.NewAsyncOpIncompleteError("eventgrid.EventSubscriptionsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - es, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("eventgrid.EventSubscriptionsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if es.Response.Response, err = future.GetResult(sender); err == nil && es.Response.Response.StatusCode != http.StatusNoContent { + es, err = client.CreateOrUpdateResponder(es.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsCreateOrUpdateFuture", "Result", es.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - es, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -521,12 +501,11 @@ func (future EventSubscriptionsCreateOrUpdateFuture) Result(client EventSubscrip // operation. type EventSubscriptionsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future EventSubscriptionsDeleteFuture) Result(client EventSubscriptionsClient) (ar autorest.Response, err error) { +func (future *EventSubscriptionsDeleteFuture) Result(client EventSubscriptionsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -534,35 +513,10 @@ func (future EventSubscriptionsDeleteFuture) Result(client EventSubscriptionsCli return } if !done { - return ar, azure.NewAsyncOpIncompleteError("eventgrid.EventSubscriptionsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("eventgrid.EventSubscriptionsDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -577,12 +531,11 @@ type EventSubscriptionsListResult struct { // operation. type EventSubscriptionsUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future EventSubscriptionsUpdateFuture) Result(client EventSubscriptionsClient) (es EventSubscription, err error) { +func (future *EventSubscriptionsUpdateFuture) Result(client EventSubscriptionsClient) (es EventSubscription, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -590,34 +543,15 @@ func (future EventSubscriptionsUpdateFuture) Result(client EventSubscriptionsCli return } if !done { - return es, azure.NewAsyncOpIncompleteError("eventgrid.EventSubscriptionsUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - es, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("eventgrid.EventSubscriptionsUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if es.Response.Response, err = future.GetResult(sender); err == nil && es.Response.Response.StatusCode != http.StatusNoContent { + es, err = client.UpdateResponder(es.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsUpdateFuture", "Result", es.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsUpdateFuture", "Result", resp, "Failure sending request") - return - } - es, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.EventSubscriptionsUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -939,12 +873,11 @@ type TopicRegenerateKeyRequest struct { // TopicsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type TopicsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future TopicsCreateOrUpdateFuture) Result(client TopicsClient) (t Topic, err error) { +func (future *TopicsCreateOrUpdateFuture) Result(client TopicsClient) (t Topic, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -952,34 +885,15 @@ func (future TopicsCreateOrUpdateFuture) Result(client TopicsClient) (t Topic, e return } if !done { - return t, azure.NewAsyncOpIncompleteError("eventgrid.TopicsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - t, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.TopicsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("eventgrid.TopicsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if t.Response.Response, err = future.GetResult(sender); err == nil && t.Response.Response.StatusCode != http.StatusNoContent { + t, err = client.CreateOrUpdateResponder(t.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "eventgrid.TopicsCreateOrUpdateFuture", "Result", t.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.TopicsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - t, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.TopicsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -987,12 +901,11 @@ func (future TopicsCreateOrUpdateFuture) Result(client TopicsClient) (t Topic, e // TopicsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type TopicsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future TopicsDeleteFuture) Result(client TopicsClient) (ar autorest.Response, err error) { +func (future *TopicsDeleteFuture) Result(client TopicsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1000,35 +913,10 @@ func (future TopicsDeleteFuture) Result(client TopicsClient) (ar autorest.Respon return } if !done { - return ar, azure.NewAsyncOpIncompleteError("eventgrid.TopicsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.TopicsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("eventgrid.TopicsDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.TopicsDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.TopicsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -1051,12 +939,11 @@ type TopicsListResult struct { // TopicsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type TopicsUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future TopicsUpdateFuture) Result(client TopicsClient) (t Topic, err error) { +func (future *TopicsUpdateFuture) Result(client TopicsClient) (t Topic, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1064,34 +951,15 @@ func (future TopicsUpdateFuture) Result(client TopicsClient) (t Topic, err error return } if !done { - return t, azure.NewAsyncOpIncompleteError("eventgrid.TopicsUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - t, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.TopicsUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("eventgrid.TopicsUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if t.Response.Response, err = future.GetResult(sender); err == nil && t.Response.Response.StatusCode != http.StatusNoContent { + t, err = client.UpdateResponder(t.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "eventgrid.TopicsUpdateFuture", "Result", t.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.TopicsUpdateFuture", "Result", resp, "Failure sending request") - return - } - t, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "eventgrid.TopicsUpdateFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/topics.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/topics.go index eb1f890547d6..676b4730c897 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/topics.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid/topics.go @@ -87,15 +87,17 @@ func (client TopicsClient) CreateOrUpdatePreparer(ctx context.Context, resourceG // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) CreateOrUpdateSender(req *http.Request) (future TopicsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -156,15 +158,17 @@ func (client TopicsClient) DeletePreparer(ctx context.Context, resourceGroupName // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) DeleteSender(req *http.Request) (future TopicsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -635,15 +639,17 @@ func (client TopicsClient) UpdatePreparer(ctx context.Context, resourceGroupName // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client TopicsClient) UpdateSender(req *http.Request) (future TopicsUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go index 07a0faf85b7a..386d0c64bee2 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go @@ -306,7 +306,11 @@ func (client ConsumerGroupsClient) GetResponder(resp *http.Response) (result Con // resourceGroupName - name of the resource group within the azure subscription. // namespaceName - the Namespace name // eventHubName - the Event Hub name -func (client ConsumerGroupsClient) ListByEventHub(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string) (result ConsumerGroupListResultPage, err error) { +// skip - skip is only used if a previous operation returned a partial result. If a previous response contains +// a nextLink element, the value of the nextLink element will include a skip parameter that specifies a +// starting point to use for subsequent calls. +// top - may be used to limit the number of results to the most recent N usageDetails. +func (client ConsumerGroupsClient) ListByEventHub(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string, skip *int32, top *int32) (result ConsumerGroupListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, @@ -315,12 +319,22 @@ func (client ConsumerGroupsClient) ListByEventHub(ctx context.Context, resourceG Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + {TargetValue: skip, + Constraints: []validation.Constraint{{Target: "skip", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil}, + {Target: "skip", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}, + }}}}, + {TargetValue: top, + Constraints: []validation.Constraint{{Target: "top", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil}, + {Target: "top", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}, + }}}}}); err != nil { return result, validation.NewError("eventhub.ConsumerGroupsClient", "ListByEventHub", err.Error()) } result.fn = client.listByEventHubNextResults - req, err := client.ListByEventHubPreparer(ctx, resourceGroupName, namespaceName, eventHubName) + req, err := client.ListByEventHubPreparer(ctx, resourceGroupName, namespaceName, eventHubName, skip, top) if err != nil { err = autorest.NewErrorWithError(err, "eventhub.ConsumerGroupsClient", "ListByEventHub", nil, "Failure preparing request") return @@ -342,7 +356,7 @@ func (client ConsumerGroupsClient) ListByEventHub(ctx context.Context, resourceG } // ListByEventHubPreparer prepares the ListByEventHub request. -func (client ConsumerGroupsClient) ListByEventHubPreparer(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string) (*http.Request, error) { +func (client ConsumerGroupsClient) ListByEventHubPreparer(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string, skip *int32, top *int32) (*http.Request, error) { pathParameters := map[string]interface{}{ "eventHubName": autorest.Encode("path", eventHubName), "namespaceName": autorest.Encode("path", namespaceName), @@ -354,6 +368,12 @@ func (client ConsumerGroupsClient) ListByEventHubPreparer(ctx context.Context, r queryParameters := map[string]interface{}{ "api-version": APIVersion, } + if skip != nil { + queryParameters["$skip"] = autorest.Encode("query", *skip) + } + if top != nil { + queryParameters["$top"] = autorest.Encode("query", *top) + } preparer := autorest.CreatePreparer( autorest.AsGet(), @@ -405,7 +425,7 @@ func (client ConsumerGroupsClient) listByEventHubNextResults(lastResults Consume } // ListByEventHubComplete enumerates all values, automatically crossing page boundaries as required. -func (client ConsumerGroupsClient) ListByEventHubComplete(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string) (result ConsumerGroupListResultIterator, err error) { - result.page, err = client.ListByEventHub(ctx, resourceGroupName, namespaceName, eventHubName) +func (client ConsumerGroupsClient) ListByEventHubComplete(ctx context.Context, resourceGroupName string, namespaceName string, eventHubName string, skip *int32, top *int32) (result ConsumerGroupListResultIterator, err error) { + result.page, err = client.ListByEventHub(ctx, resourceGroupName, namespaceName, eventHubName, skip, top) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go index b98f5e1cf502..7228f2e33213 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go @@ -675,19 +675,33 @@ func (client EventHubsClient) ListAuthorizationRulesComplete(ctx context.Context // Parameters: // resourceGroupName - name of the resource group within the azure subscription. // namespaceName - the Namespace name -func (client EventHubsClient) ListByNamespace(ctx context.Context, resourceGroupName string, namespaceName string) (result ListResultPage, err error) { +// skip - skip is only used if a previous operation returned a partial result. If a previous response contains +// a nextLink element, the value of the nextLink element will include a skip parameter that specifies a +// starting point to use for subsequent calls. +// top - may be used to limit the number of results to the most recent N usageDetails. +func (client EventHubsClient) ListByNamespace(ctx context.Context, resourceGroupName string, namespaceName string, skip *int32, top *int32) (result ListResultPage, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: resourceGroupName, Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: namespaceName, Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, - {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}}); err != nil { + {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, + {TargetValue: skip, + Constraints: []validation.Constraint{{Target: "skip", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil}, + {Target: "skip", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}, + }}}}, + {TargetValue: top, + Constraints: []validation.Constraint{{Target: "top", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil}, + {Target: "top", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}, + }}}}}); err != nil { return result, validation.NewError("eventhub.EventHubsClient", "ListByNamespace", err.Error()) } result.fn = client.listByNamespaceNextResults - req, err := client.ListByNamespacePreparer(ctx, resourceGroupName, namespaceName) + req, err := client.ListByNamespacePreparer(ctx, resourceGroupName, namespaceName, skip, top) if err != nil { err = autorest.NewErrorWithError(err, "eventhub.EventHubsClient", "ListByNamespace", nil, "Failure preparing request") return @@ -709,7 +723,7 @@ func (client EventHubsClient) ListByNamespace(ctx context.Context, resourceGroup } // ListByNamespacePreparer prepares the ListByNamespace request. -func (client EventHubsClient) ListByNamespacePreparer(ctx context.Context, resourceGroupName string, namespaceName string) (*http.Request, error) { +func (client EventHubsClient) ListByNamespacePreparer(ctx context.Context, resourceGroupName string, namespaceName string, skip *int32, top *int32) (*http.Request, error) { pathParameters := map[string]interface{}{ "namespaceName": autorest.Encode("path", namespaceName), "resourceGroupName": autorest.Encode("path", resourceGroupName), @@ -720,6 +734,12 @@ func (client EventHubsClient) ListByNamespacePreparer(ctx context.Context, resou queryParameters := map[string]interface{}{ "api-version": APIVersion, } + if skip != nil { + queryParameters["$skip"] = autorest.Encode("query", *skip) + } + if top != nil { + queryParameters["$top"] = autorest.Encode("query", *top) + } preparer := autorest.CreatePreparer( autorest.AsGet(), @@ -771,8 +791,8 @@ func (client EventHubsClient) listByNamespaceNextResults(lastResults ListResult) } // ListByNamespaceComplete enumerates all values, automatically crossing page boundaries as required. -func (client EventHubsClient) ListByNamespaceComplete(ctx context.Context, resourceGroupName string, namespaceName string) (result ListResultIterator, err error) { - result.page, err = client.ListByNamespace(ctx, resourceGroupName, namespaceName) +func (client EventHubsClient) ListByNamespaceComplete(ctx context.Context, resourceGroupName string, namespaceName string, skip *int32, top *int32) (result ListResultIterator, err error) { + result.page, err = client.ListByNamespace(ctx, resourceGroupName, namespaceName, skip, top) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/models.go index 6d642772a787..30cfd7c93c37 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/models.go @@ -1595,12 +1595,11 @@ func (mVar *Model) UnmarshalJSON(body []byte) error { // operation. type NamespacesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (en EHNamespace, err error) { +func (future *NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (en EHNamespace, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1608,34 +1607,15 @@ func (future NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (en return } if !done { - return en, azure.NewAsyncOpIncompleteError("eventhub.NamespacesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - en, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "eventhub.NamespacesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("eventhub.NamespacesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if en.Response.Response, err = future.GetResult(sender); err == nil && en.Response.Response.StatusCode != http.StatusNoContent { + en, err = client.CreateOrUpdateResponder(en.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "eventhub.NamespacesCreateOrUpdateFuture", "Result", en.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "eventhub.NamespacesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - en, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "eventhub.NamespacesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -1643,12 +1623,11 @@ func (future NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (en // NamespacesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type NamespacesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future NamespacesDeleteFuture) Result(client NamespacesClient) (ar autorest.Response, err error) { +func (future *NamespacesDeleteFuture) Result(client NamespacesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1656,35 +1635,10 @@ func (future NamespacesDeleteFuture) Result(client NamespacesClient) (ar autores return } if !done { - return ar, azure.NewAsyncOpIncompleteError("eventhub.NamespacesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "eventhub.NamespacesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("eventhub.NamespacesDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "eventhub.NamespacesDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "eventhub.NamespacesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go index 5d69e5453ef9..ee8818989074 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go @@ -183,15 +183,17 @@ func (client NamespacesClient) CreateOrUpdatePreparer(ctx context.Context, resou // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client NamespacesClient) CreateOrUpdateSender(req *http.Request) (future NamespacesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -349,15 +351,17 @@ func (client NamespacesClient) DeletePreparer(ctx context.Context, resourceGroup // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client NamespacesClient) DeleteSender(req *http.Request) (future NamespacesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/iothubresource.go b/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/iothubresource.go index cd05df353aeb..591a82626708 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/iothubresource.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/iothubresource.go @@ -272,15 +272,17 @@ func (client IotHubResourceClient) CreateOrUpdatePreparer(ctx context.Context, r // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client IotHubResourceClient) CreateOrUpdateSender(req *http.Request) (future IotHubResourceCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -341,15 +343,17 @@ func (client IotHubResourceClient) DeletePreparer(ctx context.Context, resourceG // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client IotHubResourceClient) DeleteSender(req *http.Request) (future IotHubResourceDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusNotFound)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusNotFound)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/models.go index 6e982061723e..08a8d037aa8b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices/models.go @@ -912,12 +912,11 @@ func (page IotHubQuotaMetricInfoListResultPage) Values() []IotHubQuotaMetricInfo // operation. type IotHubResourceCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future IotHubResourceCreateOrUpdateFuture) Result(client IotHubResourceClient) (ihd IotHubDescription, err error) { +func (future *IotHubResourceCreateOrUpdateFuture) Result(client IotHubResourceClient) (ihd IotHubDescription, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -925,34 +924,15 @@ func (future IotHubResourceCreateOrUpdateFuture) Result(client IotHubResourceCli return } if !done { - return ihd, azure.NewAsyncOpIncompleteError("devices.IotHubResourceCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ihd, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "devices.IotHubResourceCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("devices.IotHubResourceCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ihd.Response.Response, err = future.GetResult(sender); err == nil && ihd.Response.Response.StatusCode != http.StatusNoContent { + ihd, err = client.CreateOrUpdateResponder(ihd.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "devices.IotHubResourceCreateOrUpdateFuture", "Result", ihd.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "devices.IotHubResourceCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - ihd, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "devices.IotHubResourceCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -960,12 +940,11 @@ func (future IotHubResourceCreateOrUpdateFuture) Result(client IotHubResourceCli // IotHubResourceDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type IotHubResourceDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future IotHubResourceDeleteFuture) Result(client IotHubResourceClient) (so SetObject, err error) { +func (future *IotHubResourceDeleteFuture) Result(client IotHubResourceClient) (so SetObject, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -973,34 +952,15 @@ func (future IotHubResourceDeleteFuture) Result(client IotHubResourceClient) (so return } if !done { - return so, azure.NewAsyncOpIncompleteError("devices.IotHubResourceDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - so, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "devices.IotHubResourceDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("devices.IotHubResourceDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if so.Response.Response, err = future.GetResult(sender); err == nil && so.Response.Response.StatusCode != http.StatusNoContent { + so, err = client.DeleteResponder(so.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "devices.IotHubResourceDeleteFuture", "Result", so.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "devices.IotHubResourceDeleteFuture", "Result", resp, "Failure sending request") - return - } - so, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "devices.IotHubResourceDeleteFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault/models.go index 0bdea2f1b8e7..399f505677d4 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault/models.go @@ -44,13 +44,17 @@ func PossibleActionTypeValues() []ActionType { type DeletionRecoveryLevel string const ( - // Purgeable ... + // Purgeable Soft-delete is not enabled for this vault. A DELETE operation results in immediate and + // irreversible data loss. Purgeable DeletionRecoveryLevel = "Purgeable" - // Recoverable ... + // Recoverable Soft-delete is enabled for this vault and purge has been disabled. A deleted entity will + // remain in this state until recovered, or the end of the retention interval. Recoverable DeletionRecoveryLevel = "Recoverable" - // RecoverableProtectedSubscription ... + // RecoverableProtectedSubscription Soft-delete is enabled for this vault, and the subscription is + // protected against immediate deletion. RecoverableProtectedSubscription DeletionRecoveryLevel = "Recoverable+ProtectedSubscription" - // RecoverablePurgeable ... + // RecoverablePurgeable Soft-delete is enabled for this vault; A priveleged user may trigger an immediate, + // irreversible deletion(purge) of a deleted entity. RecoverablePurgeable DeletionRecoveryLevel = "Recoverable+Purgeable" ) @@ -63,13 +67,13 @@ func PossibleDeletionRecoveryLevelValues() []DeletionRecoveryLevel { type JSONWebKeyCurveName string const ( - // P256 ... + // P256 The NIST P-256 elliptic curve, AKA SECG curve SECP256R1. P256 JSONWebKeyCurveName = "P-256" - // P384 ... + // P384 The NIST P-384 elliptic curve, AKA SECG curve SECP384R1. P384 JSONWebKeyCurveName = "P-384" - // P521 ... + // P521 The NIST P-521 elliptic curve, AKA SECG curve SECP521R1. P521 JSONWebKeyCurveName = "P-521" - // SECP256K1 ... + // SECP256K1 The SECG SECP256K1 elliptic curve. SECP256K1 JSONWebKeyCurveName = "SECP256K1" ) @@ -1529,7 +1533,7 @@ func (kb KeyBundle) MarshalJSON() ([]byte, error) { type KeyCreateParameters struct { // Kty - The type of key to create. For valid values, see JsonWebKeyType. Possible values include: 'EC', 'ECHSM', 'RSA', 'RSAHSM', 'Oct' Kty JSONWebKeyType `json:"kty,omitempty"` - // KeySize - The key size in bytes. For example, 1024 or 2048. + // KeySize - The key size in bits. For example: 2048, 3072, or 4096 for RSA. KeySize *int32 `json:"key_size,omitempty"` KeyOps *[]JSONWebKeyOperation `json:"key_ops,omitempty"` KeyAttributes *KeyAttributes `json:"attributes,omitempty"` @@ -1746,7 +1750,7 @@ type KeyProperties struct { Exportable *bool `json:"exportable,omitempty"` // KeyType - The key type. KeyType *string `json:"kty,omitempty"` - // KeySize - The key size in bytes. For example; 1024 or 2048. + // KeySize - The key size in bits. For example: 2048, 3072, or 4096 for RSA. KeySize *int32 `json:"key_size,omitempty"` // ReuseKey - Indicates if the same key pair will be used on certificate renewal. ReuseKey *bool `json:"reuse_key,omitempty"` diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault/models.go index a887b0ee342f..f28e0abbb3d0 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault/models.go @@ -1052,12 +1052,11 @@ type VaultProperties struct { // VaultsPurgeDeletedFuture an abstraction for monitoring and retrieving the results of a long-running operation. type VaultsPurgeDeletedFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VaultsPurgeDeletedFuture) Result(client VaultsClient) (ar autorest.Response, err error) { +func (future *VaultsPurgeDeletedFuture) Result(client VaultsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1065,34 +1064,9 @@ func (future VaultsPurgeDeletedFuture) Result(client VaultsClient) (ar autorest. return } if !done { - return ar, azure.NewAsyncOpIncompleteError("keyvault.VaultsPurgeDeletedFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.PurgeDeletedResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "keyvault.VaultsPurgeDeletedFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("keyvault.VaultsPurgeDeletedFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "keyvault.VaultsPurgeDeletedFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.PurgeDeletedResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "keyvault.VaultsPurgeDeletedFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault/vaults.go b/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault/vaults.go index 9ee6ddc18e64..b9bf8b24951e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault/vaults.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault/vaults.go @@ -820,15 +820,17 @@ func (client VaultsClient) PurgeDeletedPreparer(ctx context.Context, vaultName s // PurgeDeletedSender sends the PurgeDeleted request. The method will close the // http.Response Body if it receives an error. func (client VaultsClient) PurgeDeletedSender(req *http.Request) (future VaultsPurgeDeletedFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/checknameavailability.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/checknameavailability.go index 5260dd2a4418..aff51201d082 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/checknameavailability.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/checknameavailability.go @@ -26,8 +26,8 @@ import ( ) // CheckNameAvailabilityClient is the the Microsoft Azure management API provides create, read, update, and delete -// functionality for Azure MySQL resources including servers, databases, firewall rules, log files and configurations -// with new business model. +// functionality for Azure MySQL resources including servers, databases, firewall rules, VNET rules, log files and +// configurations with new business model. type CheckNameAvailabilityClient struct { BaseClient } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/client.go index 296701a8b2af..97fc51c4a198 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/client.go @@ -1,7 +1,7 @@ // Package mysql implements the Azure ARM Mysql service API version 2017-12-01. // // The Microsoft Azure management API provides create, read, update, and delete functionality for Azure MySQL resources -// including servers, databases, firewall rules, log files and configurations with new business model. +// including servers, databases, firewall rules, VNET rules, log files and configurations with new business model. package mysql // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/configurations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/configurations.go index f0b7b5b0e821..c2d669c9dc88 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/configurations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/configurations.go @@ -25,8 +25,8 @@ import ( ) // ConfigurationsClient is the the Microsoft Azure management API provides create, read, update, and delete -// functionality for Azure MySQL resources including servers, databases, firewall rules, log files and configurations -// with new business model. +// functionality for Azure MySQL resources including servers, databases, firewall rules, VNET rules, log files and +// configurations with new business model. type ConfigurationsClient struct { BaseClient } @@ -91,15 +91,17 @@ func (client ConfigurationsClient) CreateOrUpdatePreparer(ctx context.Context, r // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ConfigurationsClient) CreateOrUpdateSender(req *http.Request) (future ConfigurationsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/databases.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/databases.go index 35f97fe5411d..d659483733bc 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/databases.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/databases.go @@ -25,8 +25,8 @@ import ( ) // DatabasesClient is the the Microsoft Azure management API provides create, read, update, and delete functionality -// for Azure MySQL resources including servers, databases, firewall rules, log files and configurations with new -// business model. +// for Azure MySQL resources including servers, databases, firewall rules, VNET rules, log files and configurations +// with new business model. type DatabasesClient struct { BaseClient } @@ -91,15 +91,17 @@ func (client DatabasesClient) CreateOrUpdatePreparer(ctx context.Context, resour // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) CreateOrUpdateSender(req *http.Request) (future DatabasesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -163,15 +165,17 @@ func (client DatabasesClient) DeletePreparer(ctx context.Context, resourceGroupN // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) DeleteSender(req *http.Request) (future DatabasesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/firewallrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/firewallrules.go index 1d2a04d2a22d..528aeaa2f005 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/firewallrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/firewallrules.go @@ -26,8 +26,8 @@ import ( ) // FirewallRulesClient is the the Microsoft Azure management API provides create, read, update, and delete -// functionality for Azure MySQL resources including servers, databases, firewall rules, log files and configurations -// with new business model. +// functionality for Azure MySQL resources including servers, databases, firewall rules, VNET rules, log files and +// configurations with new business model. type FirewallRulesClient struct { BaseClient } @@ -103,15 +103,17 @@ func (client FirewallRulesClient) CreateOrUpdatePreparer(ctx context.Context, re // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client FirewallRulesClient) CreateOrUpdateSender(req *http.Request) (future FirewallRulesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -175,15 +177,17 @@ func (client FirewallRulesClient) DeletePreparer(ctx context.Context, resourceGr // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client FirewallRulesClient) DeleteSender(req *http.Request) (future FirewallRulesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/locationbasedperformancetier.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/locationbasedperformancetier.go index 7b056f0aa95b..16c645ad8ba4 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/locationbasedperformancetier.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/locationbasedperformancetier.go @@ -25,8 +25,8 @@ import ( ) // LocationBasedPerformanceTierClient is the the Microsoft Azure management API provides create, read, update, and -// delete functionality for Azure MySQL resources including servers, databases, firewall rules, log files and -// configurations with new business model. +// delete functionality for Azure MySQL resources including servers, databases, firewall rules, VNET rules, log files +// and configurations with new business model. type LocationBasedPerformanceTierClient struct { BaseClient } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/logfiles.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/logfiles.go index 15b1ad92144c..ef252ba46bc1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/logfiles.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/logfiles.go @@ -25,8 +25,8 @@ import ( ) // LogFilesClient is the the Microsoft Azure management API provides create, read, update, and delete functionality for -// Azure MySQL resources including servers, databases, firewall rules, log files and configurations with new business -// model. +// Azure MySQL resources including servers, databases, firewall rules, VNET rules, log files and configurations with +// new business model. type LogFilesClient struct { BaseClient } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/models.go index 7c8afc8a4542..2511603f4c7e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/models.go @@ -22,6 +22,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/date" + "github.com/Azure/go-autorest/autorest/to" "net/http" ) @@ -140,6 +141,27 @@ func PossibleSslEnforcementEnumValues() []SslEnforcementEnum { return []SslEnforcementEnum{SslEnforcementEnumDisabled, SslEnforcementEnumEnabled} } +// VirtualNetworkRuleState enumerates the values for virtual network rule state. +type VirtualNetworkRuleState string + +const ( + // Deleting ... + Deleting VirtualNetworkRuleState = "Deleting" + // Initializing ... + Initializing VirtualNetworkRuleState = "Initializing" + // InProgress ... + InProgress VirtualNetworkRuleState = "InProgress" + // Ready ... + Ready VirtualNetworkRuleState = "Ready" + // Unknown ... + Unknown VirtualNetworkRuleState = "Unknown" +) + +// PossibleVirtualNetworkRuleStateValues returns an array of possible values for the VirtualNetworkRuleState const type. +func PossibleVirtualNetworkRuleStateValues() []VirtualNetworkRuleState { + return []VirtualNetworkRuleState{Deleting, Initializing, InProgress, Ready, Unknown} +} + // Configuration represents a Configuration. type Configuration struct { autorest.Response `json:"-"` @@ -249,12 +271,11 @@ type ConfigurationProperties struct { // operation. type ConfigurationsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ConfigurationsCreateOrUpdateFuture) Result(client ConfigurationsClient) (c Configuration, err error) { +func (future *ConfigurationsCreateOrUpdateFuture) Result(client ConfigurationsClient) (c Configuration, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -262,34 +283,15 @@ func (future ConfigurationsCreateOrUpdateFuture) Result(client ConfigurationsCli return } if !done { - return c, azure.NewAsyncOpIncompleteError("mysql.ConfigurationsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - c, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ConfigurationsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("mysql.ConfigurationsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if c.Response.Response, err = future.GetResult(sender); err == nil && c.Response.Response.StatusCode != http.StatusNoContent { + c, err = client.CreateOrUpdateResponder(c.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "mysql.ConfigurationsCreateOrUpdateFuture", "Result", c.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ConfigurationsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - c, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ConfigurationsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -395,12 +397,11 @@ type DatabaseProperties struct { // operation. type DatabasesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Database, err error) { +func (future *DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Database, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -408,34 +409,15 @@ func (future DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Da return } if !done { - return d, azure.NewAsyncOpIncompleteError("mysql.DatabasesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - d, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.DatabasesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("mysql.DatabasesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if d.Response.Response, err = future.GetResult(sender); err == nil && d.Response.Response.StatusCode != http.StatusNoContent { + d, err = client.CreateOrUpdateResponder(d.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "mysql.DatabasesCreateOrUpdateFuture", "Result", d.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.DatabasesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - d, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.DatabasesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -443,12 +425,11 @@ func (future DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Da // DatabasesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabasesDeleteFuture) Result(client DatabasesClient) (ar autorest.Response, err error) { +func (future *DatabasesDeleteFuture) Result(client DatabasesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -456,35 +437,10 @@ func (future DatabasesDeleteFuture) Result(client DatabasesClient) (ar autorest. return } if !done { - return ar, azure.NewAsyncOpIncompleteError("mysql.DatabasesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.DatabasesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.DatabasesDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("mysql.DatabasesDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.DatabasesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -589,12 +545,11 @@ type FirewallRuleProperties struct { // operation. type FirewallRulesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future FirewallRulesCreateOrUpdateFuture) Result(client FirewallRulesClient) (fr FirewallRule, err error) { +func (future *FirewallRulesCreateOrUpdateFuture) Result(client FirewallRulesClient) (fr FirewallRule, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -602,34 +557,15 @@ func (future FirewallRulesCreateOrUpdateFuture) Result(client FirewallRulesClien return } if !done { - return fr, azure.NewAsyncOpIncompleteError("mysql.FirewallRulesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - fr, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.FirewallRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("mysql.FirewallRulesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if fr.Response.Response, err = future.GetResult(sender); err == nil && fr.Response.Response.StatusCode != http.StatusNoContent { + fr, err = client.CreateOrUpdateResponder(fr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "mysql.FirewallRulesCreateOrUpdateFuture", "Result", fr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.FirewallRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - fr, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.FirewallRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -637,12 +573,11 @@ func (future FirewallRulesCreateOrUpdateFuture) Result(client FirewallRulesClien // FirewallRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type FirewallRulesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future FirewallRulesDeleteFuture) Result(client FirewallRulesClient) (ar autorest.Response, err error) { +func (future *FirewallRulesDeleteFuture) Result(client FirewallRulesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -650,35 +585,10 @@ func (future FirewallRulesDeleteFuture) Result(client FirewallRulesClient) (ar a return } if !done { - return ar, azure.NewAsyncOpIncompleteError("mysql.FirewallRulesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.FirewallRulesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("mysql.FirewallRulesDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.FirewallRulesDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.FirewallRulesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -1430,12 +1340,11 @@ func (spfr ServerPropertiesForRestore) AsBasicServerPropertiesForCreate() (Basic // ServersCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServersCreateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServersCreateFuture) Result(client ServersClient) (s Server, err error) { +func (future *ServersCreateFuture) Result(client ServersClient) (s Server, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1443,34 +1352,15 @@ func (future ServersCreateFuture) Result(client ServersClient) (s Server, err er return } if !done { - return s, azure.NewAsyncOpIncompleteError("mysql.ServersCreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersCreateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("mysql.ServersCreateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.CreateResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "mysql.ServersCreateFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersCreateFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersCreateFuture", "Result", resp, "Failure responding to request") } return } @@ -1478,12 +1368,11 @@ func (future ServersCreateFuture) Result(client ServersClient) (s Server, err er // ServersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServersDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServersDeleteFuture) Result(client ServersClient) (ar autorest.Response, err error) { +func (future *ServersDeleteFuture) Result(client ServersClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1491,47 +1380,21 @@ func (future ServersDeleteFuture) Result(client ServersClient) (ar autorest.Resp return } if !done { - return ar, azure.NewAsyncOpIncompleteError("mysql.ServersDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("mysql.ServersDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // ServersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServersUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServersUpdateFuture) Result(client ServersClient) (s Server, err error) { +func (future *ServersUpdateFuture) Result(client ServersClient) (s Server, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1539,34 +1402,15 @@ func (future ServersUpdateFuture) Result(client ServersClient) (s Server, err er return } if !done { - return s, azure.NewAsyncOpIncompleteError("mysql.ServersUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("mysql.ServersUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.UpdateResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "mysql.ServersUpdateFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersUpdateFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "mysql.ServersUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -1708,3 +1552,249 @@ func (tr TrackedResource) MarshalJSON() ([]byte, error) { } return json.Marshal(objectMap) } + +// VirtualNetworkRule a virtual network rule. +type VirtualNetworkRule struct { + autorest.Response `json:"-"` + // VirtualNetworkRuleProperties - Resource properties. + *VirtualNetworkRuleProperties `json:"properties,omitempty"` + // ID - Resource ID + ID *string `json:"id,omitempty"` + // Name - Resource name. + Name *string `json:"name,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for VirtualNetworkRule. +func (vnr VirtualNetworkRule) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if vnr.VirtualNetworkRuleProperties != nil { + objectMap["properties"] = vnr.VirtualNetworkRuleProperties + } + if vnr.ID != nil { + objectMap["id"] = vnr.ID + } + if vnr.Name != nil { + objectMap["name"] = vnr.Name + } + if vnr.Type != nil { + objectMap["type"] = vnr.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for VirtualNetworkRule struct. +func (vnr *VirtualNetworkRule) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var virtualNetworkRuleProperties VirtualNetworkRuleProperties + err = json.Unmarshal(*v, &virtualNetworkRuleProperties) + if err != nil { + return err + } + vnr.VirtualNetworkRuleProperties = &virtualNetworkRuleProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + vnr.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + vnr.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + vnr.Type = &typeVar + } + } + } + + return nil +} + +// VirtualNetworkRuleListResult a list of virtual network rules. +type VirtualNetworkRuleListResult struct { + autorest.Response `json:"-"` + // Value - Array of results. + Value *[]VirtualNetworkRule `json:"value,omitempty"` + // NextLink - Link to retrieve next page of results. + NextLink *string `json:"nextLink,omitempty"` +} + +// VirtualNetworkRuleListResultIterator provides access to a complete listing of VirtualNetworkRule values. +type VirtualNetworkRuleListResultIterator struct { + i int + page VirtualNetworkRuleListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *VirtualNetworkRuleListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter VirtualNetworkRuleListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter VirtualNetworkRuleListResultIterator) Response() VirtualNetworkRuleListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter VirtualNetworkRuleListResultIterator) Value() VirtualNetworkRule { + if !iter.page.NotDone() { + return VirtualNetworkRule{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (vnrlr VirtualNetworkRuleListResult) IsEmpty() bool { + return vnrlr.Value == nil || len(*vnrlr.Value) == 0 +} + +// virtualNetworkRuleListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (vnrlr VirtualNetworkRuleListResult) virtualNetworkRuleListResultPreparer() (*http.Request, error) { + if vnrlr.NextLink == nil || len(to.String(vnrlr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(vnrlr.NextLink))) +} + +// VirtualNetworkRuleListResultPage contains a page of VirtualNetworkRule values. +type VirtualNetworkRuleListResultPage struct { + fn func(VirtualNetworkRuleListResult) (VirtualNetworkRuleListResult, error) + vnrlr VirtualNetworkRuleListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *VirtualNetworkRuleListResultPage) Next() error { + next, err := page.fn(page.vnrlr) + if err != nil { + return err + } + page.vnrlr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page VirtualNetworkRuleListResultPage) NotDone() bool { + return !page.vnrlr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page VirtualNetworkRuleListResultPage) Response() VirtualNetworkRuleListResult { + return page.vnrlr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page VirtualNetworkRuleListResultPage) Values() []VirtualNetworkRule { + if page.vnrlr.IsEmpty() { + return nil + } + return *page.vnrlr.Value +} + +// VirtualNetworkRuleProperties properties of a virtual network rule. +type VirtualNetworkRuleProperties struct { + // VirtualNetworkSubnetID - The ARM resource id of the virtual network subnet. + VirtualNetworkSubnetID *string `json:"virtualNetworkSubnetId,omitempty"` + // IgnoreMissingVnetServiceEndpoint - Create firewall rule before the virtual network has vnet service endpoint enabled. + IgnoreMissingVnetServiceEndpoint *bool `json:"ignoreMissingVnetServiceEndpoint,omitempty"` + // State - Virtual Network Rule State. Possible values include: 'Initializing', 'InProgress', 'Ready', 'Deleting', 'Unknown' + State VirtualNetworkRuleState `json:"state,omitempty"` +} + +// VirtualNetworkRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a +// long-running operation. +type VirtualNetworkRulesCreateOrUpdateFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *VirtualNetworkRulesCreateOrUpdateFuture) Result(client VirtualNetworkRulesClient) (vnr VirtualNetworkRule, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("mysql.VirtualNetworkRulesCreateOrUpdateFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if vnr.Response.Response, err = future.GetResult(sender); err == nil && vnr.Response.Response.StatusCode != http.StatusNoContent { + vnr, err = client.CreateOrUpdateResponder(vnr.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesCreateOrUpdateFuture", "Result", vnr.Response.Response, "Failure responding to request") + } + } + return +} + +// VirtualNetworkRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type VirtualNetworkRulesDeleteFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *VirtualNetworkRulesDeleteFuture) Result(client VirtualNetworkRulesClient) (ar autorest.Response, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesDeleteFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("mysql.VirtualNetworkRulesDeleteFuture") + return + } + ar.Response = future.Response() + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/operations.go index 22a04483fe1b..6c36b558e70c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/operations.go @@ -25,8 +25,8 @@ import ( ) // OperationsClient is the the Microsoft Azure management API provides create, read, update, and delete functionality -// for Azure MySQL resources including servers, databases, firewall rules, log files and configurations with new -// business model. +// for Azure MySQL resources including servers, databases, firewall rules, VNET rules, log files and configurations +// with new business model. type OperationsClient struct { BaseClient } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/servers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/servers.go index c64bcec73f7e..66b2f6678ffa 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/servers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/servers.go @@ -26,8 +26,8 @@ import ( ) // ServersClient is the the Microsoft Azure management API provides create, read, update, and delete functionality for -// Azure MySQL resources including servers, databases, firewall rules, log files and configurations with new business -// model. +// Azure MySQL resources including servers, databases, firewall rules, VNET rules, log files and configurations with +// new business model. type ServersClient struct { BaseClient } @@ -101,15 +101,17 @@ func (client ServersClient) CreatePreparer(ctx context.Context, resourceGroupNam // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) CreateSender(req *http.Request) (future ServersCreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -171,15 +173,17 @@ func (client ServersClient) DeletePreparer(ctx context.Context, resourceGroupNam // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) DeleteSender(req *http.Request) (future ServersDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -440,15 +444,17 @@ func (client ServersClient) UpdatePreparer(ctx context.Context, resourceGroupNam // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) UpdateSender(req *http.Request) (future ServersUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/virtualnetworkrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/virtualnetworkrules.go new file mode 100644 index 000000000000..99b70e42de66 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql/virtualnetworkrules.go @@ -0,0 +1,366 @@ +package mysql + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// VirtualNetworkRulesClient is the the Microsoft Azure management API provides create, read, update, and delete +// functionality for Azure MySQL resources including servers, databases, firewall rules, VNET rules, log files and +// configurations with new business model. +type VirtualNetworkRulesClient struct { + BaseClient +} + +// NewVirtualNetworkRulesClient creates an instance of the VirtualNetworkRulesClient client. +func NewVirtualNetworkRulesClient(subscriptionID string) VirtualNetworkRulesClient { + return NewVirtualNetworkRulesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewVirtualNetworkRulesClientWithBaseURI creates an instance of the VirtualNetworkRulesClient client. +func NewVirtualNetworkRulesClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkRulesClient { + return VirtualNetworkRulesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate creates or updates an existing virtual network rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// virtualNetworkRuleName - the name of the virtual network rule. +// parameters - the requested virtual Network Rule Resource state. +func (client VirtualNetworkRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string, parameters VirtualNetworkRule) (result VirtualNetworkRulesCreateOrUpdateFuture, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkRuleProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.VirtualNetworkRuleProperties.VirtualNetworkSubnetID", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil { + return result, validation.NewError("mysql.VirtualNetworkRulesClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, virtualNetworkRuleName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + result, err = client.CreateOrUpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request") + return + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client VirtualNetworkRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string, parameters VirtualNetworkRule) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "virtualNetworkRuleName": autorest.Encode("path", virtualNetworkRuleName), + } + + const APIVersion = "2017-12-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkRulesCreateOrUpdateFuture, err error) { + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes the virtual network rule with the given name. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// virtualNetworkRuleName - the name of the virtual network rule. +func (client VirtualNetworkRulesClient) Delete(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (result VirtualNetworkRulesDeleteFuture, err error) { + req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, virtualNetworkRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "Delete", nil, "Failure preparing request") + return + } + + result, err = client.DeleteSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "Delete", result.Response(), "Failure sending request") + return + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client VirtualNetworkRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "virtualNetworkRuleName": autorest.Encode("path", virtualNetworkRuleName), + } + + const APIVersion = "2017-12-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) DeleteSender(req *http.Request) (future VirtualNetworkRulesDeleteFuture, err error) { + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get gets a virtual network rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// virtualNetworkRuleName - the name of the virtual network rule. +func (client VirtualNetworkRulesClient) Get(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (result VirtualNetworkRule, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, serverName, virtualNetworkRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client VirtualNetworkRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "virtualNetworkRuleName": autorest.Encode("path", virtualNetworkRuleName), + } + + const APIVersion = "2017-12-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) GetResponder(resp *http.Response) (result VirtualNetworkRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListByServer gets a list of virtual network rules in a server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +func (client VirtualNetworkRulesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result VirtualNetworkRuleListResultPage, err error) { + result.fn = client.listByServerNextResults + req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) + if err != nil { + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "ListByServer", nil, "Failure preparing request") + return + } + + resp, err := client.ListByServerSender(req) + if err != nil { + result.vnrlr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "ListByServer", resp, "Failure sending request") + return + } + + result.vnrlr, err = client.ListByServerResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "ListByServer", resp, "Failure responding to request") + } + + return +} + +// ListByServerPreparer prepares the ListByServer request. +func (client VirtualNetworkRulesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-12-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/servers/{serverName}/virtualNetworkRules", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByServerSender sends the ListByServer request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) ListByServerSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByServerResponder handles the response to the ListByServer request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) ListByServerResponder(resp *http.Response) (result VirtualNetworkRuleListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByServerNextResults retrieves the next set of results, if any. +func (client VirtualNetworkRulesClient) listByServerNextResults(lastResults VirtualNetworkRuleListResult) (result VirtualNetworkRuleListResult, err error) { + req, err := lastResults.virtualNetworkRuleListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "listByServerNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByServerSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "listByServerNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByServerResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mysql.VirtualNetworkRulesClient", "listByServerNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByServerComplete enumerates all values, automatically crossing page boundaries as required. +func (client VirtualNetworkRulesClient) ListByServerComplete(ctx context.Context, resourceGroupName string, serverName string) (result VirtualNetworkRuleListResultIterator, err error) { + result.page, err = client.ListByServer(ctx, resourceGroupName, serverName) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationgateways.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationgateways.go index 7206327b0cee..fe19916146da 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationgateways.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationgateways.go @@ -88,15 +88,17 @@ func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Contex // BackendHealthSender sends the BackendHealth request. The method will close the // http.Response Body if it receives an error. func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysBackendHealthFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -172,15 +174,17 @@ func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Conte // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -241,15 +245,17 @@ func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, reso // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future ApplicationGatewaysDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -838,15 +844,17 @@ func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resou // StartSender sends the Start request. The method will close the // http.Response Body if it receives an error. func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future ApplicationGatewaysStartFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -906,15 +914,17 @@ func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resour // StopSender sends the Stop request. The method will close the // http.Response Body if it receives an error. func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future ApplicationGatewaysStopFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -977,15 +987,17 @@ func (client ApplicationGatewaysClient) UpdateTagsPreparer(ctx context.Context, // UpdateTagsSender sends the UpdateTags request. The method will close the // http.Response Body if it receives an error. func (client ApplicationGatewaysClient) UpdateTagsSender(req *http.Request) (future ApplicationGatewaysUpdateTagsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationsecuritygroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationsecuritygroups.go index 133c1552c7e9..4d1a255a47be 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationsecuritygroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/applicationsecuritygroups.go @@ -86,15 +86,17 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdatePreparer(ctx context // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ApplicationSecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (future ApplicationSecurityGroupsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -155,15 +157,17 @@ func (client ApplicationSecurityGroupsClient) DeletePreparer(ctx context.Context // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ApplicationSecurityGroupsClient) DeleteSender(req *http.Request) (future ApplicationSecurityGroupsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizations.go index 8e947afac02f..2860cd697334 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizations.go @@ -91,15 +91,17 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -162,15 +164,17 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitpeerings.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitpeerings.go index 5813098efc78..b129f3c2ed80 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitpeerings.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuitpeerings.go @@ -88,15 +88,17 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx conte // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -159,15 +161,17 @@ func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Conte // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuits.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuits.go index add90435b89d..0a11eb94914a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuits.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/expressroutecircuits.go @@ -86,15 +86,17 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Cont // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -155,15 +157,17 @@ func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, res // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -613,15 +617,17 @@ func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Contex // ListArpTableSender sends the ListArpTable request. The method will close the // http.Response Body if it receives an error. func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsListArpTableFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -687,15 +693,17 @@ func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Con // ListRoutesTableSender sends the ListRoutesTable request. The method will close the // http.Response Body if it receives an error. func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -761,15 +769,17 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx cont // ListRoutesTableSummarySender sends the ListRoutesTableSummary request. The method will close the // http.Response Body if it receives an error. func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -833,15 +843,17 @@ func (client ExpressRouteCircuitsClient) UpdateTagsPreparer(ctx context.Context, // UpdateTagsSender sends the UpdateTags request. The method will close the // http.Response Body if it receives an error. func (client ExpressRouteCircuitsClient) UpdateTagsSender(req *http.Request) (future ExpressRouteCircuitsUpdateTagsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/inboundnatrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/inboundnatrules.go index 3820400e26e7..64c604441c6a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/inboundnatrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/inboundnatrules.go @@ -108,15 +108,17 @@ func (client InboundNatRulesClient) CreateOrUpdatePreparer(ctx context.Context, // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client InboundNatRulesClient) CreateOrUpdateSender(req *http.Request) (future InboundNatRulesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -179,15 +181,17 @@ func (client InboundNatRulesClient) DeletePreparer(ctx context.Context, resource // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client InboundNatRulesClient) DeleteSender(req *http.Request) (future InboundNatRulesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaces.go index 55a0fe6d9cf4..5632e32b2276 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaces.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/interfaces.go @@ -86,15 +86,17 @@ func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resou // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future InterfacesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -155,15 +157,17 @@ func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroup // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client InterfacesClient) DeleteSender(req *http.Request) (future InterfacesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -294,15 +298,17 @@ func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Contex // GetEffectiveRouteTableSender sends the GetEffectiveRouteTable request. The method will close the // http.Response Body if it receives an error. func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGetEffectiveRouteTableFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -699,15 +705,17 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx co // ListEffectiveNetworkSecurityGroupsSender sends the ListEffectiveNetworkSecurityGroups request. The method will close the // http.Response Body if it receives an error. func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1068,15 +1076,17 @@ func (client InterfacesClient) UpdateTagsPreparer(ctx context.Context, resourceG // UpdateTagsSender sends the UpdateTags request. The method will close the // http.Response Body if it receives an error. func (client InterfacesClient) UpdateTagsSender(req *http.Request) (future InterfacesUpdateTagsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancers.go index d2706bd2bea3..f62ad7b99d64 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/loadbalancers.go @@ -86,15 +86,17 @@ func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, re // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -155,15 +157,17 @@ func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGr // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBalancersDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -480,15 +484,17 @@ func (client LoadBalancersClient) UpdateTagsPreparer(ctx context.Context, resour // UpdateTagsSender sends the UpdateTags request. The method will close the // http.Response Body if it receives an error. func (client LoadBalancersClient) UpdateTagsSender(req *http.Request) (future LoadBalancersUpdateTagsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/localnetworkgateways.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/localnetworkgateways.go index 7872ca81439c..b20ca1df7b68 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/localnetworkgateways.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/localnetworkgateways.go @@ -95,15 +95,17 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Cont // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -170,15 +172,17 @@ func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, res // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -413,15 +417,17 @@ func (client LocalNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Context, // UpdateTagsSender sends the UpdateTags request. The method will close the // http.Response Body if it receives an error. func (client LocalNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (future LocalNetworkGatewaysUpdateTagsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/models.go index 15cf9c6f0335..794e1c31c615 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/models.go @@ -3166,12 +3166,11 @@ type ApplicationGatewayRequestRoutingRulePropertiesFormat struct { // long-running operation. type ApplicationGatewaysBackendHealthFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGatewaysClient) (agbh ApplicationGatewayBackendHealth, err error) { +func (future *ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGatewaysClient) (agbh ApplicationGatewayBackendHealth, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3179,34 +3178,15 @@ func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGa return } if !done { - return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysBackendHealthFuture") - } - if future.PollingMethod() == azure.PollingLocation { - agbh, err = client.BackendHealthResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysBackendHealthFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if agbh.Response.Response, err = future.GetResult(sender); err == nil && agbh.Response.Response.StatusCode != http.StatusNoContent { + agbh, err = client.BackendHealthResponder(agbh.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", agbh.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure sending request") - return - } - agbh, err = client.BackendHealthResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure responding to request") } return } @@ -3215,12 +3195,11 @@ func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGa // long-running operation. type ApplicationGatewaysCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) { +func (future *ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3228,34 +3207,15 @@ func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationG return } if !done { - return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ag, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ag.Response.Response, err = future.GetResult(sender); err == nil && ag.Response.Response.StatusCode != http.StatusNoContent { + ag, err = client.CreateOrUpdateResponder(ag.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", ag.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - ag, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -3264,12 +3224,11 @@ func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationG // operation. type ApplicationGatewaysDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) { +func (future *ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3277,35 +3236,10 @@ func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysC return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -3518,12 +3452,11 @@ type ApplicationGatewaySslPredefinedPolicyPropertiesFormat struct { // operation. type ApplicationGatewaysStartFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ApplicationGatewaysStartFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) { +func (future *ApplicationGatewaysStartFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3531,35 +3464,10 @@ func (future ApplicationGatewaysStartFuture) Result(client ApplicationGatewaysCl return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStartFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.StartResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStartFuture") return } - ar, err = client.StartResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -3567,12 +3475,11 @@ func (future ApplicationGatewaysStartFuture) Result(client ApplicationGatewaysCl // operation. type ApplicationGatewaysStopFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ApplicationGatewaysStopFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) { +func (future *ApplicationGatewaysStopFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3580,35 +3487,10 @@ func (future ApplicationGatewaysStopFuture) Result(client ApplicationGatewaysCli return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStopFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.StopResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStopFuture") return } - ar, err = client.StopResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -3616,12 +3498,11 @@ func (future ApplicationGatewaysStopFuture) Result(client ApplicationGatewaysCli // operation. type ApplicationGatewaysUpdateTagsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ApplicationGatewaysUpdateTagsFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) { +func (future *ApplicationGatewaysUpdateTagsFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3629,34 +3510,15 @@ func (future ApplicationGatewaysUpdateTagsFuture) Result(client ApplicationGatew return } if !done { - return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysUpdateTagsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ag, err = client.UpdateTagsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysUpdateTagsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ag.Response.Response, err = future.GetResult(sender); err == nil && ag.Response.Response.StatusCode != http.StatusNoContent { + ag, err = client.UpdateTagsResponder(ag.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", ag.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", resp, "Failure sending request") - return - } - ag, err = client.UpdateTagsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", resp, "Failure responding to request") } return } @@ -4024,12 +3886,11 @@ type ApplicationSecurityGroupPropertiesFormat struct { // long-running operation. type ApplicationSecurityGroupsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ApplicationSecurityGroupsCreateOrUpdateFuture) Result(client ApplicationSecurityGroupsClient) (asg ApplicationSecurityGroup, err error) { +func (future *ApplicationSecurityGroupsCreateOrUpdateFuture) Result(client ApplicationSecurityGroupsClient) (asg ApplicationSecurityGroup, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4037,34 +3898,15 @@ func (future ApplicationSecurityGroupsCreateOrUpdateFuture) Result(client Applic return } if !done { - return asg, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - asg, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if asg.Response.Response, err = future.GetResult(sender); err == nil && asg.Response.Response.StatusCode != http.StatusNoContent { + asg, err = client.CreateOrUpdateResponder(asg.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", asg.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - asg, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -4073,12 +3915,11 @@ func (future ApplicationSecurityGroupsCreateOrUpdateFuture) Result(client Applic // operation. type ApplicationSecurityGroupsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ApplicationSecurityGroupsDeleteFuture) Result(client ApplicationSecurityGroupsClient) (ar autorest.Response, err error) { +func (future *ApplicationSecurityGroupsDeleteFuture) Result(client ApplicationSecurityGroupsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4086,35 +3927,10 @@ func (future ApplicationSecurityGroupsDeleteFuture) Result(client ApplicationSec return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -5294,12 +5110,11 @@ func (erca *ExpressRouteCircuitAuthorization) UnmarshalJSON(body []byte) error { // of a long-running operation. type ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (erca ExpressRouteCircuitAuthorization, err error) { +func (future *ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (erca ExpressRouteCircuitAuthorization, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -5307,34 +5122,15 @@ func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(clien return } if !done { - return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - erca, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if erca.Response.Response, err = future.GetResult(sender); err == nil && erca.Response.Response.StatusCode != http.StatusNoContent { + erca, err = client.CreateOrUpdateResponder(erca.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", erca.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - erca, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -5343,12 +5139,11 @@ func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(clien // long-running operation. type ExpressRouteCircuitAuthorizationsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (ar autorest.Response, err error) { +func (future *ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -5356,35 +5151,10 @@ func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client Expres return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -5733,12 +5503,11 @@ type ExpressRouteCircuitPeeringPropertiesFormat struct { // long-running operation. type ExpressRouteCircuitPeeringsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsClient) (ercp ExpressRouteCircuitPeering, err error) { +func (future *ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsClient) (ercp ExpressRouteCircuitPeering, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -5746,34 +5515,15 @@ func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client Expr return } if !done { - return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ercp, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ercp.Response.Response, err = future.GetResult(sender); err == nil && ercp.Response.Response.StatusCode != http.StatusNoContent { + ercp, err = client.CreateOrUpdateResponder(ercp.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", ercp.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - ercp, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -5782,12 +5532,11 @@ func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client Expr // long-running operation. type ExpressRouteCircuitPeeringsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRouteCircuitPeeringsClient) (ar autorest.Response, err error) { +func (future *ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRouteCircuitPeeringsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -5795,35 +5544,10 @@ func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRoute return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -5892,12 +5616,11 @@ type ExpressRouteCircuitsArpTableListResult struct { // long-running operation. type ExpressRouteCircuitsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) { +func (future *ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -5905,34 +5628,15 @@ func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRout return } if !done { - return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - erc, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if erc.Response.Response, err = future.GetResult(sender); err == nil && erc.Response.Response.StatusCode != http.StatusNoContent { + erc, err = client.CreateOrUpdateResponder(erc.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", erc.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - erc, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -5941,12 +5645,11 @@ func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRout // operation. type ExpressRouteCircuitsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuitsClient) (ar autorest.Response, err error) { +func (future *ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuitsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -5954,35 +5657,10 @@ func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuit return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -6010,12 +5688,11 @@ type ExpressRouteCircuitSku struct { // long-running operation. type ExpressRouteCircuitsListArpTableFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteCircuitsClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) { +func (future *ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteCircuitsClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -6023,34 +5700,15 @@ func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteC return } if !done { - return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListArpTableFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ercatlr, err = client.ListArpTableResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListArpTableFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ercatlr.Response.Response, err = future.GetResult(sender); err == nil && ercatlr.Response.Response.StatusCode != http.StatusNoContent { + ercatlr, err = client.ListArpTableResponder(ercatlr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", ercatlr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure sending request") - return - } - ercatlr, err = client.ListArpTableResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure responding to request") } return } @@ -6059,12 +5717,11 @@ func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteC // long-running operation. type ExpressRouteCircuitsListRoutesTableFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRouteCircuitsClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) { +func (future *ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRouteCircuitsClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -6072,34 +5729,15 @@ func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRou return } if !done { - return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ercrtlr, err = client.ListRoutesTableResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ercrtlr.Response.Response, err = future.GetResult(sender); err == nil && ercrtlr.Response.Response.StatusCode != http.StatusNoContent { + ercrtlr, err = client.ListRoutesTableResponder(ercrtlr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", ercrtlr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure sending request") - return - } - ercrtlr, err = client.ListRoutesTableResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure responding to request") } return } @@ -6108,12 +5746,11 @@ func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRou // long-running operation. type ExpressRouteCircuitsListRoutesTableSummaryFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) { +func (future *ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -6121,34 +5758,15 @@ func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client Exp return } if !done { - return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableSummaryFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ercrtslr, err = client.ListRoutesTableSummaryResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableSummaryFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ercrtslr.Response.Response, err = future.GetResult(sender); err == nil && ercrtslr.Response.Response.StatusCode != http.StatusNoContent { + ercrtslr, err = client.ListRoutesTableSummaryResponder(ercrtslr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", ercrtslr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure sending request") - return - } - ercrtslr, err = client.ListRoutesTableSummaryResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request") } return } @@ -6190,12 +5808,11 @@ type ExpressRouteCircuitStats struct { // operation. type ExpressRouteCircuitsUpdateTagsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ExpressRouteCircuitsUpdateTagsFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) { +func (future *ExpressRouteCircuitsUpdateTagsFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -6203,34 +5820,15 @@ func (future ExpressRouteCircuitsUpdateTagsFuture) Result(client ExpressRouteCir return } if !done { - return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsUpdateTagsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - erc, err = client.UpdateTagsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsUpdateTagsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if erc.Response.Response, err = future.GetResult(sender); err == nil && erc.Response.Response.StatusCode != http.StatusNoContent { + erc, err = client.UpdateTagsResponder(erc.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", erc.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", resp, "Failure sending request") - return - } - erc, err = client.UpdateTagsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", resp, "Failure responding to request") } return } @@ -6981,12 +6579,11 @@ type InboundNatRulePropertiesFormat struct { // operation. type InboundNatRulesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesClient) (inr InboundNatRule, err error) { +func (future *InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesClient) (inr InboundNatRule, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -6994,34 +6591,15 @@ func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesC return } if !done { - return inr, azure.NewAsyncOpIncompleteError("network.InboundNatRulesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - inr, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.InboundNatRulesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if inr.Response.Response, err = future.GetResult(sender); err == nil && inr.Response.Response.StatusCode != http.StatusNoContent { + inr, err = client.CreateOrUpdateResponder(inr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", inr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - inr, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -7030,12 +6608,11 @@ func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesC // operation. type InboundNatRulesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) (ar autorest.Response, err error) { +func (future *InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -7043,35 +6620,10 @@ func (future InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) ( return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.InboundNatRulesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.InboundNatRulesDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -7664,12 +7216,11 @@ type InterfacePropertiesFormat struct { // operation. type InterfacesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i Interface, err error) { +func (future *InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i Interface, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -7677,34 +7228,15 @@ func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i return } if !done { - return i, azure.NewAsyncOpIncompleteError("network.InterfacesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - i, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.InterfacesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if i.Response.Response, err = future.GetResult(sender); err == nil && i.Response.Response.StatusCode != http.StatusNoContent { + i, err = client.CreateOrUpdateResponder(i.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", i.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - i, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -7712,12 +7244,11 @@ func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i // InterfacesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type InterfacesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autorest.Response, err error) { +func (future *InterfacesDeleteFuture) Result(client InterfacesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -7725,35 +7256,10 @@ func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autores return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.InterfacesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.InterfacesDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -7761,12 +7267,11 @@ func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autores // long-running operation. type InterfacesGetEffectiveRouteTableFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesClient) (erlr EffectiveRouteListResult, err error) { +func (future *InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesClient) (erlr EffectiveRouteListResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -7774,34 +7279,15 @@ func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesCli return } if !done { - return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGetEffectiveRouteTableFuture") - } - if future.PollingMethod() == azure.PollingLocation { - erlr, err = client.GetEffectiveRouteTableResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.InterfacesGetEffectiveRouteTableFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if erlr.Response.Response, err = future.GetResult(sender); err == nil && erlr.Response.Response.StatusCode != http.StatusNoContent { + erlr, err = client.GetEffectiveRouteTableResponder(erlr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", erlr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request") - return - } - erlr, err = client.GetEffectiveRouteTableResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request") } return } @@ -7810,12 +7296,11 @@ func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesCli // long-running operation. type InterfacesListEffectiveNetworkSecurityGroupsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) { +func (future *InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -7823,34 +7308,15 @@ func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client I return } if !done { - return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesListEffectiveNetworkSecurityGroupsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.InterfacesListEffectiveNetworkSecurityGroupsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ensglr.Response.Response, err = future.GetResult(sender); err == nil && ensglr.Response.Response.StatusCode != http.StatusNoContent { + ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(ensglr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", ensglr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request") - return - } - ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request") } return } @@ -7858,12 +7324,11 @@ func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client I // InterfacesUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running operation. type InterfacesUpdateTagsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future InterfacesUpdateTagsFuture) Result(client InterfacesClient) (i Interface, err error) { +func (future *InterfacesUpdateTagsFuture) Result(client InterfacesClient) (i Interface, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -7871,34 +7336,15 @@ func (future InterfacesUpdateTagsFuture) Result(client InterfacesClient) (i Inte return } if !done { - return i, azure.NewAsyncOpIncompleteError("network.InterfacesUpdateTagsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - i, err = client.UpdateTagsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.InterfacesUpdateTagsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if i.Response.Response, err = future.GetResult(sender); err == nil && i.Response.Response.StatusCode != http.StatusNoContent { + i, err = client.UpdateTagsResponder(i.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", i.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", resp, "Failure sending request") - return - } - i, err = client.UpdateTagsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", resp, "Failure responding to request") } return } @@ -8718,12 +8164,11 @@ type LoadBalancerPropertiesFormat struct { // operation. type LoadBalancersCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) { +func (future *LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -8731,34 +8176,15 @@ func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClien return } if !done { - return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - lb, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.LoadBalancersCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if lb.Response.Response, err = future.GetResult(sender); err == nil && lb.Response.Response.StatusCode != http.StatusNoContent { + lb, err = client.CreateOrUpdateResponder(lb.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", lb.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - lb, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -8766,12 +8192,11 @@ func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClien // LoadBalancersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type LoadBalancersDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar autorest.Response, err error) { +func (future *LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -8779,35 +8204,10 @@ func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar a return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.LoadBalancersDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -8821,12 +8221,11 @@ type LoadBalancerSku struct { // operation. type LoadBalancersUpdateTagsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future LoadBalancersUpdateTagsFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) { +func (future *LoadBalancersUpdateTagsFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -8834,34 +8233,15 @@ func (future LoadBalancersUpdateTagsFuture) Result(client LoadBalancersClient) ( return } if !done { - return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersUpdateTagsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - lb, err = client.UpdateTagsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.LoadBalancersUpdateTagsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if lb.Response.Response, err = future.GetResult(sender); err == nil && lb.Response.Response.StatusCode != http.StatusNoContent { + lb, err = client.UpdateTagsResponder(lb.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", lb.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", resp, "Failure sending request") - return - } - lb, err = client.UpdateTagsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", resp, "Failure responding to request") } return } @@ -9218,12 +8598,11 @@ type LocalNetworkGatewayPropertiesFormat struct { // long-running operation. type LocalNetworkGatewaysCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) { +func (future *LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9231,34 +8610,15 @@ func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetwor return } if !done { - return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysCreateOrUpdateFuture") + err = azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysCreateOrUpdateFuture") + return } - if future.PollingMethod() == azure.PollingLocation { - lng, err = client.CreateOrUpdateResponder(future.Response()) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if lng.Response.Response, err = future.GetResult(sender); err == nil && lng.Response.Response.StatusCode != http.StatusNoContent { + lng, err = client.CreateOrUpdateResponder(lng.Response.Response) if err != nil { - err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") + err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", lng.Response.Response, "Failure responding to request") } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - lng, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -9267,12 +8627,11 @@ func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetwor // operation. type LocalNetworkGatewaysDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGatewaysClient) (ar autorest.Response, err error) { +func (future *LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGatewaysClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9280,35 +8639,10 @@ func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGateway return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -9316,12 +8650,11 @@ func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGateway // operation. type LocalNetworkGatewaysUpdateTagsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future LocalNetworkGatewaysUpdateTagsFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) { +func (future *LocalNetworkGatewaysUpdateTagsFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9329,34 +8662,15 @@ func (future LocalNetworkGatewaysUpdateTagsFuture) Result(client LocalNetworkGat return } if !done { - return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysUpdateTagsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - lng, err = client.UpdateTagsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysUpdateTagsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if lng.Response.Response, err = future.GetResult(sender); err == nil && lng.Response.Response.StatusCode != http.StatusNoContent { + lng, err = client.UpdateTagsResponder(lng.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", lng.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure sending request") - return - } - lng, err = client.UpdateTagsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure responding to request") } return } @@ -9918,12 +9232,11 @@ type PacketCaptureResultProperties struct { // PacketCapturesCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type PacketCapturesCreateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pcr PacketCaptureResult, err error) { +func (future *PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pcr PacketCaptureResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9931,34 +9244,15 @@ func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pc return } if !done { - return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesCreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - pcr, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.PacketCapturesCreateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if pcr.Response.Response, err = future.GetResult(sender); err == nil && pcr.Response.Response.StatusCode != http.StatusNoContent { + pcr, err = client.CreateResponder(pcr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", pcr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure sending request") - return - } - pcr, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure responding to request") } return } @@ -9966,12 +9260,11 @@ func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pc // PacketCapturesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type PacketCapturesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) { +func (future *PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9979,35 +9272,10 @@ func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.PacketCapturesDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -10015,12 +9283,11 @@ func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar // operation. type PacketCapturesGetStatusFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient) (pcqsr PacketCaptureQueryStatusResult, err error) { +func (future *PacketCapturesGetStatusFuture) Result(client PacketCapturesClient) (pcqsr PacketCaptureQueryStatusResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -10028,34 +9295,15 @@ func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient) return } if !done { - return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGetStatusFuture") - } - if future.PollingMethod() == azure.PollingLocation { - pcqsr, err = client.GetStatusResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.PacketCapturesGetStatusFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if pcqsr.Response.Response, err = future.GetResult(sender); err == nil && pcqsr.Response.Response.StatusCode != http.StatusNoContent { + pcqsr, err = client.GetStatusResponder(pcqsr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", pcqsr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure sending request") - return - } - pcqsr, err = client.GetStatusResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure responding to request") } return } @@ -10063,12 +9311,11 @@ func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient) // PacketCapturesStopFuture an abstraction for monitoring and retrieving the results of a long-running operation. type PacketCapturesStopFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) { +func (future *PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -10076,35 +9323,10 @@ func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar a return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesStopFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.StopResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.PacketCapturesStopFuture") return } - ar, err = client.StopResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -10586,12 +9808,11 @@ type PublicIPAddressDNSSettings struct { // operation. type PublicIPAddressesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) { +func (future *PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -10599,34 +9820,15 @@ func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddres return } if !done { - return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - pia, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.PublicIPAddressesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if pia.Response.Response, err = future.GetResult(sender); err == nil && pia.Response.Response.StatusCode != http.StatusNoContent { + pia, err = client.CreateOrUpdateResponder(pia.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", pia.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - pia, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -10635,12 +9837,11 @@ func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddres // operation. type PublicIPAddressesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClient) (ar autorest.Response, err error) { +func (future *PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -10648,35 +9849,10 @@ func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClien return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.PublicIPAddressesDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -10684,12 +9860,11 @@ func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClien // operation. type PublicIPAddressesUpdateTagsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future PublicIPAddressesUpdateTagsFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) { +func (future *PublicIPAddressesUpdateTagsFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -10697,34 +9872,15 @@ func (future PublicIPAddressesUpdateTagsFuture) Result(client PublicIPAddressesC return } if !done { - return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesUpdateTagsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - pia, err = client.UpdateTagsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.PublicIPAddressesUpdateTagsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if pia.Response.Response, err = future.GetResult(sender); err == nil && pia.Response.Response.StatusCode != http.StatusNoContent { + pia, err = client.UpdateTagsResponder(pia.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", pia.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", resp, "Failure sending request") - return - } - pia, err = client.UpdateTagsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", resp, "Failure responding to request") } return } @@ -11541,12 +10697,11 @@ type RouteFilterRulePropertiesFormat struct { // operation. type RouteFilterRulesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) { +func (future *RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -11554,34 +10709,15 @@ func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRule return } if !done { - return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - rfr, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.RouteFilterRulesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if rfr.Response.Response, err = future.GetResult(sender); err == nil && rfr.Response.Response.StatusCode != http.StatusNoContent { + rfr, err = client.CreateOrUpdateResponder(rfr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", rfr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - rfr, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -11590,12 +10726,11 @@ func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRule // operation. type RouteFilterRulesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient) (ar autorest.Response, err error) { +func (future *RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -11603,35 +10738,10 @@ func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient) return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.RouteFilterRulesDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -11639,12 +10749,11 @@ func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient) // operation. type RouteFilterRulesUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) { +func (future *RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -11652,34 +10761,15 @@ func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient) return } if !done { - return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - rfr, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.RouteFilterRulesUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if rfr.Response.Response, err = future.GetResult(sender); err == nil && rfr.Response.Response.StatusCode != http.StatusNoContent { + rfr, err = client.UpdateResponder(rfr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", rfr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure sending request") - return - } - rfr, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -11688,12 +10778,11 @@ func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient) // operation. type RouteFiltersCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) { +func (future *RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -11701,34 +10790,15 @@ func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient) return } if !done { - return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - rf, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.RouteFiltersCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if rf.Response.Response, err = future.GetResult(sender); err == nil && rf.Response.Response.StatusCode != http.StatusNoContent { + rf, err = client.CreateOrUpdateResponder(rf.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", rf.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - rf, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -11736,12 +10806,11 @@ func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient) // RouteFiltersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type RouteFiltersDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar autorest.Response, err error) { +func (future *RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -11749,47 +10818,21 @@ func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar aut return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.RouteFiltersDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // RouteFiltersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type RouteFiltersUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) { +func (future *RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -11797,34 +10840,15 @@ func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf Rou return } if !done { - return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - rf, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.RouteFiltersUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if rf.Response.Response, err = future.GetResult(sender); err == nil && rf.Response.Response.StatusCode != http.StatusNoContent { + rf, err = client.UpdateResponder(rf.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", rf.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure sending request") - return - } - rf, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -11946,12 +10970,11 @@ type RoutePropertiesFormat struct { // RoutesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type RoutesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, err error) { +func (future *RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -11959,34 +10982,15 @@ func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, e return } if !done { - return r, azure.NewAsyncOpIncompleteError("network.RoutesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - r, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.RoutesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if r.Response.Response, err = future.GetResult(sender); err == nil && r.Response.Response.StatusCode != http.StatusNoContent { + r, err = client.CreateOrUpdateResponder(r.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", r.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - r, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -11994,12 +10998,11 @@ func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, e // RoutesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type RoutesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Response, err error) { +func (future *RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -12007,35 +11010,10 @@ func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Respon return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.RoutesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.RoutesDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -12279,12 +11257,11 @@ type RouteTablePropertiesFormat struct { // operation. type RouteTablesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (rt RouteTable, err error) { +func (future *RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (rt RouteTable, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -12292,34 +11269,15 @@ func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) ( return } if !done { - return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - rt, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.RouteTablesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if rt.Response.Response, err = future.GetResult(sender); err == nil && rt.Response.Response.StatusCode != http.StatusNoContent { + rt, err = client.CreateOrUpdateResponder(rt.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", rt.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - rt, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -12327,12 +11285,11 @@ func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) ( // RouteTablesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type RouteTablesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autorest.Response, err error) { +func (future *RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -12340,35 +11297,10 @@ func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autor return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.RouteTablesDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -12376,12 +11308,11 @@ func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autor // operation. type RouteTablesUpdateTagsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future RouteTablesUpdateTagsFuture) Result(client RouteTablesClient) (rt RouteTable, err error) { +func (future *RouteTablesUpdateTagsFuture) Result(client RouteTablesClient) (rt RouteTable, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -12389,34 +11320,15 @@ func (future RouteTablesUpdateTagsFuture) Result(client RouteTablesClient) (rt R return } if !done { - return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesUpdateTagsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - rt, err = client.UpdateTagsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.RouteTablesUpdateTagsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if rt.Response.Response, err = future.GetResult(sender); err == nil && rt.Response.Response.StatusCode != http.StatusNoContent { + rt, err = client.UpdateTagsResponder(rt.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", rt.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", resp, "Failure sending request") - return - } - rt, err = client.UpdateTagsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", resp, "Failure responding to request") } return } @@ -12674,12 +11586,11 @@ type SecurityGroupPropertiesFormat struct { // operation. type SecurityGroupsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) { +func (future *SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -12687,34 +11598,15 @@ func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsCli return } if !done { - return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sg, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.SecurityGroupsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sg.Response.Response, err = future.GetResult(sender); err == nil && sg.Response.Response.StatusCode != http.StatusNoContent { + sg, err = client.CreateOrUpdateResponder(sg.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", sg.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - sg, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -12722,12 +11614,11 @@ func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsCli // SecurityGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SecurityGroupsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar autorest.Response, err error) { +func (future *SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -12735,35 +11626,10 @@ func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.SecurityGroupsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -12771,12 +11637,11 @@ func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar // operation. type SecurityGroupsUpdateTagsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SecurityGroupsUpdateTagsFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) { +func (future *SecurityGroupsUpdateTagsFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -12784,34 +11649,15 @@ func (future SecurityGroupsUpdateTagsFuture) Result(client SecurityGroupsClient) return } if !done { - return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsUpdateTagsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sg, err = client.UpdateTagsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.SecurityGroupsUpdateTagsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sg.Response.Response, err = future.GetResult(sender); err == nil && sg.Response.Response.StatusCode != http.StatusNoContent { + sg, err = client.UpdateTagsResponder(sg.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", sg.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", resp, "Failure sending request") - return - } - sg, err = client.UpdateTagsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", resp, "Failure responding to request") } return } @@ -13064,12 +11910,11 @@ type SecurityRulePropertiesFormat struct { // operation. type SecurityRulesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClient) (sr SecurityRule, err error) { +func (future *SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClient) (sr SecurityRule, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -13077,34 +11922,15 @@ func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClien return } if !done { - return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sr, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.SecurityRulesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sr.Response.Response, err = future.GetResult(sender); err == nil && sr.Response.Response.StatusCode != http.StatusNoContent { + sr, err = client.CreateOrUpdateResponder(sr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", sr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - sr, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -13112,12 +11938,11 @@ func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClien // SecurityRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SecurityRulesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar autorest.Response, err error) { +func (future *SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -13125,35 +11950,10 @@ func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar a return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.SecurityRulesDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -13387,12 +12187,11 @@ type SubnetPropertiesFormat struct { // operation. type SubnetsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet, err error) { +func (future *SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -13400,34 +12199,15 @@ func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet return } if !done { - return s, azure.NewAsyncOpIncompleteError("network.SubnetsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.SubnetsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.CreateOrUpdateResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -13435,12 +12215,11 @@ func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet // SubnetsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SubnetsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Response, err error) { +func (future *SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -13448,35 +12227,10 @@ func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Resp return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.SubnetsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.SubnetsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -14492,12 +13246,11 @@ type VirtualNetworkGatewayConnectionPropertiesFormat struct { // a long-running operation. type VirtualNetworkGatewayConnectionsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngc VirtualNetworkGatewayConnection, err error) { +func (future *VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngc VirtualNetworkGatewayConnection, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -14505,34 +13258,15 @@ func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client return } if !done { - return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - vngc, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if vngc.Response.Response, err = future.GetResult(sender); err == nil && vngc.Response.Response.StatusCode != http.StatusNoContent { + vngc, err = client.CreateOrUpdateResponder(vngc.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", vngc.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - vngc, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -14541,12 +13275,11 @@ func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client // long-running operation. type VirtualNetworkGatewayConnectionsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client VirtualNetworkGatewayConnectionsClient) (ar autorest.Response, err error) { +func (future *VirtualNetworkGatewayConnectionsDeleteFuture) Result(client VirtualNetworkGatewayConnectionsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -14554,35 +13287,10 @@ func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client Virtual return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -14590,12 +13298,11 @@ func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client Virtual // a long-running operation. type VirtualNetworkGatewayConnectionsResetSharedKeyFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (crsk ConnectionResetSharedKey, err error) { +func (future *VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (crsk ConnectionResetSharedKey, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -14603,34 +13310,15 @@ func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client return } if !done { - return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture") - } - if future.PollingMethod() == azure.PollingLocation { - crsk, err = client.ResetSharedKeyResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if crsk.Response.Response, err = future.GetResult(sender); err == nil && crsk.Response.Response.StatusCode != http.StatusNoContent { + crsk, err = client.ResetSharedKeyResponder(crsk.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", crsk.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure sending request") - return - } - crsk, err = client.ResetSharedKeyResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure responding to request") } return } @@ -14639,12 +13327,11 @@ func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client // long-running operation. type VirtualNetworkGatewayConnectionsSetSharedKeyFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (csk ConnectionSharedKey, err error) { +func (future *VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (csk ConnectionSharedKey, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -14652,34 +13339,15 @@ func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client V return } if !done { - return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture") - } - if future.PollingMethod() == azure.PollingLocation { - csk, err = client.SetSharedKeyResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if csk.Response.Response, err = future.GetResult(sender); err == nil && csk.Response.Response.StatusCode != http.StatusNoContent { + csk, err = client.SetSharedKeyResponder(csk.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", csk.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure sending request") - return - } - csk, err = client.SetSharedKeyResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure responding to request") } return } @@ -14688,12 +13356,11 @@ func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client V // long-running operation. type VirtualNetworkGatewayConnectionsUpdateTagsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewayConnectionsUpdateTagsFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngcle VirtualNetworkGatewayConnectionListEntity, err error) { +func (future *VirtualNetworkGatewayConnectionsUpdateTagsFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngcle VirtualNetworkGatewayConnectionListEntity, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -14701,34 +13368,15 @@ func (future VirtualNetworkGatewayConnectionsUpdateTagsFuture) Result(client Vir return } if !done { - return vngcle, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsUpdateTagsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - vngcle, err = client.UpdateTagsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsUpdateTagsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if vngcle.Response.Response, err = future.GetResult(sender); err == nil && vngcle.Response.Response.StatusCode != http.StatusNoContent { + vngcle, err = client.UpdateTagsResponder(vngcle.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", vngcle.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", resp, "Failure sending request") - return - } - vngcle, err = client.UpdateTagsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", resp, "Failure responding to request") } return } @@ -15063,12 +13711,11 @@ type VirtualNetworkGatewayPropertiesFormat struct { // long-running operation. type VirtualNetworkGatewaysCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) { +func (future *VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -15076,34 +13723,15 @@ func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNe return } if !done { - return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - vng, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if vng.Response.Response, err = future.GetResult(sender); err == nil && vng.Response.Response.StatusCode != http.StatusNoContent { + vng, err = client.CreateOrUpdateResponder(vng.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", vng.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - vng, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -15112,12 +13740,11 @@ func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNe // operation. type VirtualNetworkGatewaysDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGatewaysClient) (ar autorest.Response, err error) { +func (future *VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGatewaysClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -15125,35 +13752,10 @@ func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGat return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -15161,12 +13763,11 @@ func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGat // a long-running operation. type VirtualNetworkGatewaysGeneratevpnclientpackageFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) { +func (future *VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -15174,34 +13775,15 @@ func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client return } if !done { - return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.GeneratevpnclientpackageResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.GeneratevpnclientpackageResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.GeneratevpnclientpackageResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", resp, "Failure responding to request") } return } @@ -15210,12 +13792,11 @@ func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client // long-running operation. type VirtualNetworkGatewaysGenerateVpnProfileFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) { +func (future *VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -15223,34 +13804,15 @@ func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client Virtu return } if !done { - return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGenerateVpnProfileFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.GenerateVpnProfileResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGenerateVpnProfileFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.GenerateVpnProfileResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.GenerateVpnProfileResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", resp, "Failure responding to request") } return } @@ -15259,12 +13821,11 @@ func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client Virtu // long-running operation. type VirtualNetworkGatewaysGetAdvertisedRoutesFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) { +func (future *VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -15272,34 +13833,15 @@ func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client Virt return } if !done { - return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture") - } - if future.PollingMethod() == azure.PollingLocation { - grlr, err = client.GetAdvertisedRoutesResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if grlr.Response.Response, err = future.GetResult(sender); err == nil && grlr.Response.Response.StatusCode != http.StatusNoContent { + grlr, err = client.GetAdvertisedRoutesResponder(grlr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", grlr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request") - return - } - grlr, err = client.GetAdvertisedRoutesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request") } return } @@ -15308,12 +13850,11 @@ func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client Virt // long-running operation. type VirtualNetworkGatewaysGetBgpPeerStatusFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysClient) (bpslr BgpPeerStatusListResult, err error) { +func (future *VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysClient) (bpslr BgpPeerStatusListResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -15321,34 +13862,15 @@ func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client Virtual return } if !done { - return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetBgpPeerStatusFuture") - } - if future.PollingMethod() == azure.PollingLocation { - bpslr, err = client.GetBgpPeerStatusResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetBgpPeerStatusFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if bpslr.Response.Response, err = future.GetResult(sender); err == nil && bpslr.Response.Response.StatusCode != http.StatusNoContent { + bpslr, err = client.GetBgpPeerStatusResponder(bpslr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", bpslr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure sending request") - return - } - bpslr, err = client.GetBgpPeerStatusResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request") } return } @@ -15357,12 +13879,11 @@ func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client Virtual // long-running operation. type VirtualNetworkGatewaysGetLearnedRoutesFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) { +func (future *VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -15370,34 +13891,15 @@ func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client Virtual return } if !done { - return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetLearnedRoutesFuture") - } - if future.PollingMethod() == azure.PollingLocation { - grlr, err = client.GetLearnedRoutesResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetLearnedRoutesFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if grlr.Response.Response, err = future.GetResult(sender); err == nil && grlr.Response.Response.StatusCode != http.StatusNoContent { + grlr, err = client.GetLearnedRoutesResponder(grlr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", grlr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure sending request") - return - } - grlr, err = client.GetLearnedRoutesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure responding to request") } return } @@ -15406,12 +13908,11 @@ func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client Virtual // a long-running operation. type VirtualNetworkGatewaysGetVpnProfilePackageURLFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) { +func (future *VirtualNetworkGatewaysGetVpnProfilePackageURLFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -15419,34 +13920,15 @@ func (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture) Result(client return } if !done { - return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.GetVpnProfilePackageURLResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.GetVpnProfilePackageURLResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.GetVpnProfilePackageURLResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", resp, "Failure responding to request") } return } @@ -15465,12 +13947,11 @@ type VirtualNetworkGatewaySku struct { // operation. type VirtualNetworkGatewaysResetFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) { +func (future *VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -15478,34 +13959,15 @@ func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGate return } if !done { - return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysResetFuture") - } - if future.PollingMethod() == azure.PollingLocation { - vng, err = client.ResetResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysResetFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if vng.Response.Response, err = future.GetResult(sender); err == nil && vng.Response.Response.StatusCode != http.StatusNoContent { + vng, err = client.ResetResponder(vng.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", vng.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure sending request") - return - } - vng, err = client.ResetResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure responding to request") } return } @@ -15514,12 +13976,11 @@ func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGate // long-running operation. type VirtualNetworkGatewaysUpdateTagsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkGatewaysUpdateTagsFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) { +func (future *VirtualNetworkGatewaysUpdateTagsFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -15527,34 +13988,15 @@ func (future VirtualNetworkGatewaysUpdateTagsFuture) Result(client VirtualNetwor return } if !done { - return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysUpdateTagsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - vng, err = client.UpdateTagsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysUpdateTagsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if vng.Response.Response, err = future.GetResult(sender); err == nil && vng.Response.Response.StatusCode != http.StatusNoContent { + vng, err = client.UpdateTagsResponder(vng.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", vng.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure sending request") - return - } - vng, err = client.UpdateTagsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure responding to request") } return } @@ -15972,12 +14414,11 @@ type VirtualNetworkPeeringPropertiesFormat struct { // long-running operation. type VirtualNetworkPeeringsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsClient) (vnp VirtualNetworkPeering, err error) { +func (future *VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsClient) (vnp VirtualNetworkPeering, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -15985,34 +14426,15 @@ func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNe return } if !done { - return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - vnp, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if vnp.Response.Response, err = future.GetResult(sender); err == nil && vnp.Response.Response.StatusCode != http.StatusNoContent { + vnp, err = client.CreateOrUpdateResponder(vnp.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", vnp.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - vnp, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -16021,12 +14443,11 @@ func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNe // operation. type VirtualNetworkPeeringsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPeeringsClient) (ar autorest.Response, err error) { +func (future *VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPeeringsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -16034,35 +14455,10 @@ func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPee return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -16090,12 +14486,11 @@ type VirtualNetworkPropertiesFormat struct { // operation. type VirtualNetworksCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) { +func (future *VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -16103,34 +14498,15 @@ func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksC return } if !done { - return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - vn, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworksCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if vn.Response.Response, err = future.GetResult(sender); err == nil && vn.Response.Response.StatusCode != http.StatusNoContent { + vn, err = client.CreateOrUpdateResponder(vn.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", vn.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - vn, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -16139,12 +14515,11 @@ func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksC // operation. type VirtualNetworksDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (ar autorest.Response, err error) { +func (future *VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -16152,35 +14527,10 @@ func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) ( return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworksDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -16188,12 +14538,11 @@ func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) ( // operation. type VirtualNetworksUpdateTagsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworksUpdateTagsFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) { +func (future *VirtualNetworksUpdateTagsFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -16201,34 +14550,15 @@ func (future VirtualNetworksUpdateTagsFuture) Result(client VirtualNetworksClien return } if !done { - return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksUpdateTagsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - vn, err = client.UpdateTagsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.VirtualNetworksUpdateTagsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if vn.Response.Response, err = future.GetResult(sender); err == nil && vn.Response.Response.StatusCode != http.StatusNoContent { + vn, err = client.UpdateTagsResponder(vn.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", vn.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", resp, "Failure sending request") - return - } - vn, err = client.UpdateTagsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", resp, "Failure responding to request") } return } @@ -16611,12 +14941,11 @@ type WatcherPropertiesFormat struct { // operation. type WatchersCheckConnectivityFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci ConnectivityInformation, err error) { +func (future *WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci ConnectivityInformation, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -16624,34 +14953,15 @@ func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci return } if !done { - return ci, azure.NewAsyncOpIncompleteError("network.WatchersCheckConnectivityFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ci, err = client.CheckConnectivityResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.WatchersCheckConnectivityFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ci.Response.Response, err = future.GetResult(sender); err == nil && ci.Response.Response.StatusCode != http.StatusNoContent { + ci, err = client.CheckConnectivityResponder(ci.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", ci.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure sending request") - return - } - ci, err = client.CheckConnectivityResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure responding to request") } return } @@ -16659,12 +14969,11 @@ func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci // WatchersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type WatchersDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Response, err error) { +func (future *WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -16672,35 +14981,10 @@ func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Re return } if !done { - return ar, azure.NewAsyncOpIncompleteError("network.WatchersDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("network.WatchersDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -16708,12 +14992,11 @@ func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Re // long-running operation. type WatchersGetAzureReachabilityReportFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WatchersGetAzureReachabilityReportFuture) Result(client WatchersClient) (arr AzureReachabilityReport, err error) { +func (future *WatchersGetAzureReachabilityReportFuture) Result(client WatchersClient) (arr AzureReachabilityReport, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -16721,34 +15004,15 @@ func (future WatchersGetAzureReachabilityReportFuture) Result(client WatchersCli return } if !done { - return arr, azure.NewAsyncOpIncompleteError("network.WatchersGetAzureReachabilityReportFuture") - } - if future.PollingMethod() == azure.PollingLocation { - arr, err = client.GetAzureReachabilityReportResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.WatchersGetAzureReachabilityReportFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if arr.Response.Response, err = future.GetResult(sender); err == nil && arr.Response.Response.StatusCode != http.StatusNoContent { + arr, err = client.GetAzureReachabilityReportResponder(arr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", arr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", resp, "Failure sending request") - return - } - arr, err = client.GetAzureReachabilityReportResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", resp, "Failure responding to request") } return } @@ -16757,12 +15021,11 @@ func (future WatchersGetAzureReachabilityReportFuture) Result(client WatchersCli // operation. type WatchersGetFlowLogStatusFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) { +func (future *WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -16770,34 +15033,15 @@ func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli return } if !done { - return fli, azure.NewAsyncOpIncompleteError("network.WatchersGetFlowLogStatusFuture") - } - if future.PollingMethod() == azure.PollingLocation { - fli, err = client.GetFlowLogStatusResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.WatchersGetFlowLogStatusFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if fli.Response.Response, err = future.GetResult(sender); err == nil && fli.Response.Response.StatusCode != http.StatusNoContent { + fli, err = client.GetFlowLogStatusResponder(fli.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", fli.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure sending request") - return - } - fli, err = client.GetFlowLogStatusResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure responding to request") } return } @@ -16805,12 +15049,11 @@ func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli // WatchersGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running operation. type WatchersGetNextHopFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHopResult, err error) { +func (future *WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHopResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -16818,34 +15061,15 @@ func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHo return } if !done { - return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGetNextHopFuture") - } - if future.PollingMethod() == azure.PollingLocation { - nhr, err = client.GetNextHopResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.WatchersGetNextHopFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if nhr.Response.Response, err = future.GetResult(sender); err == nil && nhr.Response.Response.StatusCode != http.StatusNoContent { + nhr, err = client.GetNextHopResponder(nhr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", nhr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure sending request") - return - } - nhr, err = client.GetNextHopResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure responding to request") } return } @@ -16854,12 +15078,11 @@ func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHo // operation. type WatchersGetTroubleshootingFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) { +func (future *WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -16867,34 +15090,15 @@ func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr return } if !done { - return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingFuture") - } - if future.PollingMethod() == azure.PollingLocation { - tr, err = client.GetTroubleshootingResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if tr.Response.Response, err = future.GetResult(sender); err == nil && tr.Response.Response.StatusCode != http.StatusNoContent { + tr, err = client.GetTroubleshootingResponder(tr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", tr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure sending request") - return - } - tr, err = client.GetTroubleshootingResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure responding to request") } return } @@ -16903,12 +15107,11 @@ func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr // long-running operation. type WatchersGetTroubleshootingResultFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) { +func (future *WatchersGetTroubleshootingResultFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -16916,34 +15119,15 @@ func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClien return } if !done { - return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingResultFuture") - } - if future.PollingMethod() == azure.PollingLocation { - tr, err = client.GetTroubleshootingResultResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingResultFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if tr.Response.Response, err = future.GetResult(sender); err == nil && tr.Response.Response.StatusCode != http.StatusNoContent { + tr, err = client.GetTroubleshootingResultResponder(tr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", tr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure sending request") - return - } - tr, err = client.GetTroubleshootingResultResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request") } return } @@ -16952,12 +15136,11 @@ func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClien // operation. type WatchersGetVMSecurityRulesFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sgvr SecurityGroupViewResult, err error) { +func (future *WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sgvr SecurityGroupViewResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -16965,34 +15148,15 @@ func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sg return } if !done { - return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGetVMSecurityRulesFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sgvr, err = client.GetVMSecurityRulesResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.WatchersGetVMSecurityRulesFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sgvr.Response.Response, err = future.GetResult(sender); err == nil && sgvr.Response.Response.StatusCode != http.StatusNoContent { + sgvr, err = client.GetVMSecurityRulesResponder(sgvr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", sgvr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure sending request") - return - } - sgvr, err = client.GetVMSecurityRulesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request") } return } @@ -17001,12 +15165,11 @@ func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sg // operation. type WatchersListAvailableProvidersFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WatchersListAvailableProvidersFuture) Result(client WatchersClient) (apl AvailableProvidersList, err error) { +func (future *WatchersListAvailableProvidersFuture) Result(client WatchersClient) (apl AvailableProvidersList, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -17014,34 +15177,15 @@ func (future WatchersListAvailableProvidersFuture) Result(client WatchersClient) return } if !done { - return apl, azure.NewAsyncOpIncompleteError("network.WatchersListAvailableProvidersFuture") - } - if future.PollingMethod() == azure.PollingLocation { - apl, err = client.ListAvailableProvidersResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.WatchersListAvailableProvidersFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if apl.Response.Response, err = future.GetResult(sender); err == nil && apl.Response.Response.StatusCode != http.StatusNoContent { + apl, err = client.ListAvailableProvidersResponder(apl.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", apl.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", resp, "Failure sending request") - return - } - apl, err = client.ListAvailableProvidersResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", resp, "Failure responding to request") } return } @@ -17050,12 +15194,11 @@ func (future WatchersListAvailableProvidersFuture) Result(client WatchersClient) // operation. type WatchersSetFlowLogConfigurationFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) { +func (future *WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -17063,34 +15206,15 @@ func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient return } if !done { - return fli, azure.NewAsyncOpIncompleteError("network.WatchersSetFlowLogConfigurationFuture") - } - if future.PollingMethod() == azure.PollingLocation { - fli, err = client.SetFlowLogConfigurationResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.WatchersSetFlowLogConfigurationFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if fli.Response.Response, err = future.GetResult(sender); err == nil && fli.Response.Response.StatusCode != http.StatusNoContent { + fli, err = client.SetFlowLogConfigurationResponder(fli.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", fli.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request") - return - } - fli, err = client.SetFlowLogConfigurationResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request") } return } @@ -17098,12 +15222,11 @@ func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient // WatchersVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running operation. type WatchersVerifyIPFlowFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr VerificationIPFlowResult, err error) { +func (future *WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr VerificationIPFlowResult, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -17111,34 +15234,15 @@ func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr Ver return } if !done { - return vifr, azure.NewAsyncOpIncompleteError("network.WatchersVerifyIPFlowFuture") - } - if future.PollingMethod() == azure.PollingLocation { - vifr, err = client.VerifyIPFlowResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("network.WatchersVerifyIPFlowFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if vifr.Response.Response, err = future.GetResult(sender); err == nil && vifr.Response.Response.StatusCode != http.StatusNoContent { + vifr, err = client.VerifyIPFlowResponder(vifr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", vifr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure sending request") - return - } - vifr, err = client.VerifyIPFlowResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/packetcaptures.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/packetcaptures.go index 36bf64892572..78b6b80d90b5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/packetcaptures.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/packetcaptures.go @@ -98,15 +98,17 @@ func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceG // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client PacketCapturesClient) CreateSender(req *http.Request) (future PacketCapturesCreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -169,15 +171,17 @@ func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceG // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client PacketCapturesClient) DeleteSender(req *http.Request) (future PacketCapturesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -308,15 +312,17 @@ func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resour // GetStatusSender sends the GetStatus request. The method will close the // http.Response Body if it receives an error. func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future PacketCapturesGetStatusFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -446,15 +452,17 @@ func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGro // StopSender sends the Stop request. The method will close the // http.Response Body if it receives an error. func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketCapturesStopFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/publicipaddresses.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/publicipaddresses.go index 301b84597169..c49d425fe4e3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/publicipaddresses.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/publicipaddresses.go @@ -98,15 +98,17 @@ func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -167,15 +169,17 @@ func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resour // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future PublicIPAddressesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -769,15 +773,17 @@ func (client PublicIPAddressesClient) UpdateTagsPreparer(ctx context.Context, re // UpdateTagsSender sends the UpdateTags request. The method will close the // http.Response Body if it receives an error. func (client PublicIPAddressesClient) UpdateTagsSender(req *http.Request) (future PublicIPAddressesUpdateTagsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilterrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilterrules.go index 152ac5e1dc52..70181ed68c97 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilterrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilterrules.go @@ -98,15 +98,17 @@ func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context, // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -169,15 +171,17 @@ func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourc // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future RouteFilterRulesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -406,15 +410,17 @@ func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourc // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future RouteFilterRulesUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilters.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilters.go index db8f0ecc1c1a..5c4f503fd698 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilters.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routefilters.go @@ -86,15 +86,17 @@ func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, res // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -155,15 +157,17 @@ func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGro // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFiltersDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -480,15 +484,17 @@ func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGro // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFiltersUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routes.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routes.go index 8d4054bd5771..a1ac17b7decf 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routes.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routes.go @@ -88,15 +88,17 @@ func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceG // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future RoutesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -159,15 +161,17 @@ func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routetables.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routetables.go index f953d9e82224..c839f21b0606 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routetables.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/routetables.go @@ -86,15 +86,17 @@ func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, reso // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -155,15 +157,17 @@ func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGrou // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTablesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -480,15 +484,17 @@ func (client RouteTablesClient) UpdateTagsPreparer(ctx context.Context, resource // UpdateTagsSender sends the UpdateTags request. The method will close the // http.Response Body if it receives an error. func (client RouteTablesClient) UpdateTagsSender(req *http.Request) (future RouteTablesUpdateTagsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securitygroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securitygroups.go index d8ab89df0dff..e20eaeef3928 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securitygroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securitygroups.go @@ -86,15 +86,17 @@ func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, r // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -155,15 +157,17 @@ func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceG // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future SecurityGroupsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -480,15 +484,17 @@ func (client SecurityGroupsClient) UpdateTagsPreparer(ctx context.Context, resou // UpdateTagsSender sends the UpdateTags request. The method will close the // http.Response Body if it receives an error. func (client SecurityGroupsClient) UpdateTagsSender(req *http.Request) (future SecurityGroupsUpdateTagsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securityrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securityrules.go index d7489b377973..e1761f25235a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securityrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/securityrules.go @@ -88,15 +88,17 @@ func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, re // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -159,15 +161,17 @@ func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGr // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SecurityRulesClient) DeleteSender(req *http.Request) (future SecurityRulesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/subnets.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/subnets.go index 16d25635463d..13f8a8bf15ab 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/subnets.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/subnets.go @@ -88,15 +88,17 @@ func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resource // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future SubnetsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -159,15 +161,17 @@ func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupNam // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnections.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnections.go index 011f852f3abf..694d1f4f480e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnections.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnections.go @@ -101,15 +101,17 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -170,15 +172,17 @@ func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context. // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -482,15 +486,17 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx // ResetSharedKeySender sends the ResetSharedKey request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -563,15 +569,17 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx co // SetSharedKeySender sends the SetSharedKey request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -635,15 +643,17 @@ func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsPreparer(ctx cont // UpdateTagsSender sends the UpdateTags request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewayConnectionsUpdateTagsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgateways.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgateways.go index 5c027ce5df59..b45b6bd82c04 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgateways.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkgateways.go @@ -93,15 +93,17 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Co // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -162,15 +164,17 @@ func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, r // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -234,15 +238,17 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx // GeneratevpnclientpackageSender sends the Generatevpnclientpackage request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageSender(req *http.Request) (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -307,15 +313,17 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfilePreparer(ctx contex // GenerateVpnProfileSender sends the GenerateVpnProfile request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewaysClient) GenerateVpnProfileSender(req *http.Request) (future VirtualNetworkGatewaysGenerateVpnProfileFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -446,15 +454,17 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx conte // GetAdvertisedRoutesSender sends the GetAdvertisedRoutes request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -519,15 +529,17 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context. // GetBgpPeerStatusSender sends the GetBgpPeerStatus request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -589,15 +601,17 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context. // GetLearnedRoutesSender sends the GetLearnedRoutes request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -659,15 +673,17 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLPreparer(ctx c // GetVpnProfilePackageURLSender sends the GetVpnProfilePackageURL request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLSender(req *http.Request) (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -921,15 +937,17 @@ func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, re // ResetSender sends the Reset request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysResetFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1060,15 +1078,17 @@ func (client VirtualNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Contex // UpdateTagsSender sends the UpdateTags request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewaysUpdateTagsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkpeerings.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkpeerings.go index 47c8df88da5e..a0a54eea9ffc 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkpeerings.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworkpeerings.go @@ -89,15 +89,17 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Co // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -160,15 +162,17 @@ func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, r // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworks.go index cdc9dbf334b5..afcd4b75c620 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworks.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/virtualnetworks.go @@ -157,15 +157,17 @@ func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context, // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -226,15 +228,17 @@ func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resource // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future VirtualNetworksDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -646,15 +650,17 @@ func (client VirtualNetworksClient) UpdateTagsPreparer(ctx context.Context, reso // UpdateTagsSender sends the UpdateTags request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworksClient) UpdateTagsSender(req *http.Request) (future VirtualNetworksUpdateTagsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/watchers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/watchers.go index 25c50de7dd11..992df7b254ad 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/watchers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network/watchers.go @@ -96,15 +96,17 @@ func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, reso // CheckConnectivitySender sends the CheckConnectivity request. The method will close the // http.Response Body if it receives an error. func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future WatchersCheckConnectivityFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -235,15 +237,17 @@ func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupNa // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -383,15 +387,17 @@ func (client WatchersClient) GetAzureReachabilityReportPreparer(ctx context.Cont // GetAzureReachabilityReportSender sends the GetAzureReachabilityReport request. The method will close the // http.Response Body if it receives an error. func (client WatchersClient) GetAzureReachabilityReportSender(req *http.Request) (future WatchersGetAzureReachabilityReportFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -461,15 +467,17 @@ func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resou // GetFlowLogStatusSender sends the GetFlowLogStatus request. The method will close the // http.Response Body if it receives an error. func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGetFlowLogStatusFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -541,15 +549,17 @@ func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGro // GetNextHopSender sends the GetNextHop request. The method will close the // http.Response Body if it receives an error. func (client WatchersClient) GetNextHopSender(req *http.Request) (future WatchersGetNextHopFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -699,15 +709,17 @@ func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, res // GetTroubleshootingSender sends the GetTroubleshooting request. The method will close the // http.Response Body if it receives an error. func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future WatchersGetTroubleshootingFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -777,15 +789,17 @@ func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Contex // GetTroubleshootingResultSender sends the GetTroubleshootingResult request. The method will close the // http.Response Body if it receives an error. func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGetTroubleshootingResultFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -855,15 +869,17 @@ func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, res // GetVMSecurityRulesSender sends the GetVMSecurityRules request. The method will close the // http.Response Body if it receives an error. func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGetVMSecurityRulesFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1054,15 +1070,17 @@ func (client WatchersClient) ListAvailableProvidersPreparer(ctx context.Context, // ListAvailableProvidersSender sends the ListAvailableProviders request. The method will close the // http.Response Body if it receives an error. func (client WatchersClient) ListAvailableProvidersSender(req *http.Request) (future WatchersListAvailableProvidersFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1136,15 +1154,17 @@ func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context // SetFlowLogConfigurationSender sends the SetFlowLogConfiguration request. The method will close the // http.Response Body if it receives an error. func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersSetFlowLogConfigurationFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1288,15 +1308,17 @@ func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceG // VerifyIPFlowSender sends the VerifyIPFlow request. The method will close the // http.Response Body if it receives an error. func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future WatchersVerifyIPFlowFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/checknameavailability.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/checknameavailability.go index 16b170eca333..ba3edddcfb20 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/checknameavailability.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/checknameavailability.go @@ -26,8 +26,8 @@ import ( ) // CheckNameAvailabilityClient is the the Microsoft Azure management API provides create, read, update, and delete -// functionality for Azure PostgreSQL resources including servers, databases, firewall rules, log files and -// configurations with new business model. +// functionality for Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, security +// alert policies, log files and configurations with new business model. type CheckNameAvailabilityClient struct { BaseClient } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/client.go index 610ebe022c1a..13f6e3a49759 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/client.go @@ -1,7 +1,8 @@ // Package postgresql implements the Azure ARM Postgresql service API version 2017-12-01. // // The Microsoft Azure management API provides create, read, update, and delete functionality for Azure PostgreSQL -// resources including servers, databases, firewall rules, log files and configurations with new business model. +// resources including servers, databases, firewall rules, VNET rules, security alert policies, log files and +// configurations with new business model. package postgresql // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/configurations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/configurations.go index 11407a4e7fdd..62adef66e5d1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/configurations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/configurations.go @@ -25,8 +25,8 @@ import ( ) // ConfigurationsClient is the the Microsoft Azure management API provides create, read, update, and delete -// functionality for Azure PostgreSQL resources including servers, databases, firewall rules, log files and -// configurations with new business model. +// functionality for Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, security +// alert policies, log files and configurations with new business model. type ConfigurationsClient struct { BaseClient } @@ -91,15 +91,17 @@ func (client ConfigurationsClient) CreateOrUpdatePreparer(ctx context.Context, r // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ConfigurationsClient) CreateOrUpdateSender(req *http.Request) (future ConfigurationsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/databases.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/databases.go index 26d6cf9c72c3..d069e2d9e73c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/databases.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/databases.go @@ -25,8 +25,8 @@ import ( ) // DatabasesClient is the the Microsoft Azure management API provides create, read, update, and delete functionality -// for Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations with new -// business model. +// for Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, security alert policies, +// log files and configurations with new business model. type DatabasesClient struct { BaseClient } @@ -91,15 +91,17 @@ func (client DatabasesClient) CreateOrUpdatePreparer(ctx context.Context, resour // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) CreateOrUpdateSender(req *http.Request) (future DatabasesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -163,15 +165,17 @@ func (client DatabasesClient) DeletePreparer(ctx context.Context, resourceGroupN // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) DeleteSender(req *http.Request) (future DatabasesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/firewallrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/firewallrules.go index 68d03021ee70..eacdf075f25d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/firewallrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/firewallrules.go @@ -26,8 +26,8 @@ import ( ) // FirewallRulesClient is the the Microsoft Azure management API provides create, read, update, and delete -// functionality for Azure PostgreSQL resources including servers, databases, firewall rules, log files and -// configurations with new business model. +// functionality for Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, security +// alert policies, log files and configurations with new business model. type FirewallRulesClient struct { BaseClient } @@ -103,15 +103,17 @@ func (client FirewallRulesClient) CreateOrUpdatePreparer(ctx context.Context, re // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client FirewallRulesClient) CreateOrUpdateSender(req *http.Request) (future FirewallRulesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -175,15 +177,17 @@ func (client FirewallRulesClient) DeletePreparer(ctx context.Context, resourceGr // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client FirewallRulesClient) DeleteSender(req *http.Request) (future FirewallRulesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/locationbasedperformancetier.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/locationbasedperformancetier.go index e10c0dd75038..e67344f714bf 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/locationbasedperformancetier.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/locationbasedperformancetier.go @@ -25,8 +25,8 @@ import ( ) // LocationBasedPerformanceTierClient is the the Microsoft Azure management API provides create, read, update, and -// delete functionality for Azure PostgreSQL resources including servers, databases, firewall rules, log files and -// configurations with new business model. +// delete functionality for Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, +// security alert policies, log files and configurations with new business model. type LocationBasedPerformanceTierClient struct { BaseClient } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/logfiles.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/logfiles.go index e6213a5df282..af9c90a14003 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/logfiles.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/logfiles.go @@ -25,8 +25,8 @@ import ( ) // LogFilesClient is the the Microsoft Azure management API provides create, read, update, and delete functionality for -// Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations with new -// business model. +// Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, security alert policies, log +// files and configurations with new business model. type LogFilesClient struct { BaseClient } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/models.go index 229fc1302c98..9467e3fd8e52 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/models.go @@ -22,6 +22,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/date" + "github.com/Azure/go-autorest/autorest/to" "net/http" ) @@ -76,6 +77,21 @@ func PossibleOperationOriginValues() []OperationOrigin { return []OperationOrigin{NotSpecified, System, User} } +// ServerSecurityAlertPolicyState enumerates the values for server security alert policy state. +type ServerSecurityAlertPolicyState string + +const ( + // ServerSecurityAlertPolicyStateDisabled ... + ServerSecurityAlertPolicyStateDisabled ServerSecurityAlertPolicyState = "Disabled" + // ServerSecurityAlertPolicyStateEnabled ... + ServerSecurityAlertPolicyStateEnabled ServerSecurityAlertPolicyState = "Enabled" +) + +// PossibleServerSecurityAlertPolicyStateValues returns an array of possible values for the ServerSecurityAlertPolicyState const type. +func PossibleServerSecurityAlertPolicyStateValues() []ServerSecurityAlertPolicyState { + return []ServerSecurityAlertPolicyState{ServerSecurityAlertPolicyStateDisabled, ServerSecurityAlertPolicyStateEnabled} +} + // ServerState enumerates the values for server state. type ServerState string @@ -140,6 +156,27 @@ func PossibleSslEnforcementEnumValues() []SslEnforcementEnum { return []SslEnforcementEnum{SslEnforcementEnumDisabled, SslEnforcementEnumEnabled} } +// VirtualNetworkRuleState enumerates the values for virtual network rule state. +type VirtualNetworkRuleState string + +const ( + // Deleting ... + Deleting VirtualNetworkRuleState = "Deleting" + // Initializing ... + Initializing VirtualNetworkRuleState = "Initializing" + // InProgress ... + InProgress VirtualNetworkRuleState = "InProgress" + // Ready ... + Ready VirtualNetworkRuleState = "Ready" + // Unknown ... + Unknown VirtualNetworkRuleState = "Unknown" +) + +// PossibleVirtualNetworkRuleStateValues returns an array of possible values for the VirtualNetworkRuleState const type. +func PossibleVirtualNetworkRuleStateValues() []VirtualNetworkRuleState { + return []VirtualNetworkRuleState{Deleting, Initializing, InProgress, Ready, Unknown} +} + // Configuration represents a Configuration. type Configuration struct { autorest.Response `json:"-"` @@ -249,12 +286,11 @@ type ConfigurationProperties struct { // operation. type ConfigurationsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ConfigurationsCreateOrUpdateFuture) Result(client ConfigurationsClient) (c Configuration, err error) { +func (future *ConfigurationsCreateOrUpdateFuture) Result(client ConfigurationsClient) (c Configuration, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -262,34 +298,15 @@ func (future ConfigurationsCreateOrUpdateFuture) Result(client ConfigurationsCli return } if !done { - return c, azure.NewAsyncOpIncompleteError("postgresql.ConfigurationsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - c, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.ConfigurationsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("postgresql.ConfigurationsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if c.Response.Response, err = future.GetResult(sender); err == nil && c.Response.Response.StatusCode != http.StatusNoContent { + c, err = client.CreateOrUpdateResponder(c.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "postgresql.ConfigurationsCreateOrUpdateFuture", "Result", c.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.ConfigurationsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - c, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.ConfigurationsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -395,12 +412,11 @@ type DatabaseProperties struct { // operation. type DatabasesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Database, err error) { +func (future *DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Database, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -408,34 +424,15 @@ func (future DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Da return } if !done { - return d, azure.NewAsyncOpIncompleteError("postgresql.DatabasesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - d, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.DatabasesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("postgresql.DatabasesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if d.Response.Response, err = future.GetResult(sender); err == nil && d.Response.Response.StatusCode != http.StatusNoContent { + d, err = client.CreateOrUpdateResponder(d.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "postgresql.DatabasesCreateOrUpdateFuture", "Result", d.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.DatabasesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - d, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.DatabasesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -443,12 +440,11 @@ func (future DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Da // DatabasesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabasesDeleteFuture) Result(client DatabasesClient) (ar autorest.Response, err error) { +func (future *DatabasesDeleteFuture) Result(client DatabasesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -456,35 +452,10 @@ func (future DatabasesDeleteFuture) Result(client DatabasesClient) (ar autorest. return } if !done { - return ar, azure.NewAsyncOpIncompleteError("postgresql.DatabasesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.DatabasesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.DatabasesDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("postgresql.DatabasesDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.DatabasesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -589,12 +560,11 @@ type FirewallRuleProperties struct { // operation. type FirewallRulesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future FirewallRulesCreateOrUpdateFuture) Result(client FirewallRulesClient) (fr FirewallRule, err error) { +func (future *FirewallRulesCreateOrUpdateFuture) Result(client FirewallRulesClient) (fr FirewallRule, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -602,34 +572,15 @@ func (future FirewallRulesCreateOrUpdateFuture) Result(client FirewallRulesClien return } if !done { - return fr, azure.NewAsyncOpIncompleteError("postgresql.FirewallRulesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - fr, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("postgresql.FirewallRulesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if fr.Response.Response, err = future.GetResult(sender); err == nil && fr.Response.Response.StatusCode != http.StatusNoContent { + fr, err = client.CreateOrUpdateResponder(fr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesCreateOrUpdateFuture", "Result", fr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - fr, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -637,12 +588,11 @@ func (future FirewallRulesCreateOrUpdateFuture) Result(client FirewallRulesClien // FirewallRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type FirewallRulesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future FirewallRulesDeleteFuture) Result(client FirewallRulesClient) (ar autorest.Response, err error) { +func (future *FirewallRulesDeleteFuture) Result(client FirewallRulesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -650,35 +600,10 @@ func (future FirewallRulesDeleteFuture) Result(client FirewallRulesClient) (ar a return } if !done { - return ar, azure.NewAsyncOpIncompleteError("postgresql.FirewallRulesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("postgresql.FirewallRulesDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -897,6 +822,24 @@ type ProxyResource struct { Type *string `json:"type,omitempty"` } +// SecurityAlertPolicyProperties properties of a security alert policy. +type SecurityAlertPolicyProperties struct { + // State - Specifies the state of the policy, whether it is enabled or disabled. Possible values include: 'ServerSecurityAlertPolicyStateEnabled', 'ServerSecurityAlertPolicyStateDisabled' + State ServerSecurityAlertPolicyState `json:"state,omitempty"` + // DisabledAlerts - Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly + DisabledAlerts *[]string `json:"disabledAlerts,omitempty"` + // EmailAddresses - Specifies an array of e-mail addresses to which the alert is sent. + EmailAddresses *[]string `json:"emailAddresses,omitempty"` + // EmailAccountAdmins - Specifies that the alert is sent to the account administrators. + EmailAccountAdmins *bool `json:"emailAccountAdmins,omitempty"` + // StorageEndpoint - Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs. + StorageEndpoint *string `json:"storageEndpoint,omitempty"` + // StorageAccountAccessKey - Specifies the identifier key of the Threat Detection audit storage account. + StorageAccountAccessKey *string `json:"storageAccountAccessKey,omitempty"` + // RetentionDays - Specifies the number of days to keep in the Threat Detection audit logs. + RetentionDays *int32 `json:"retentionDays,omitempty"` +} + // Server represents a server. type Server struct { autorest.Response `json:"-"` @@ -1430,12 +1373,11 @@ func (spfr ServerPropertiesForRestore) AsBasicServerPropertiesForCreate() (Basic // ServersCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServersCreateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServersCreateFuture) Result(client ServersClient) (s Server, err error) { +func (future *ServersCreateFuture) Result(client ServersClient) (s Server, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1443,34 +1385,15 @@ func (future ServersCreateFuture) Result(client ServersClient) (s Server, err er return } if !done { - return s, azure.NewAsyncOpIncompleteError("postgresql.ServersCreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.ServersCreateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("postgresql.ServersCreateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.CreateResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "postgresql.ServersCreateFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.ServersCreateFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.ServersCreateFuture", "Result", resp, "Failure responding to request") } return } @@ -1478,12 +1401,11 @@ func (future ServersCreateFuture) Result(client ServersClient) (s Server, err er // ServersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServersDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServersDeleteFuture) Result(client ServersClient) (ar autorest.Response, err error) { +func (future *ServersDeleteFuture) Result(client ServersClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1491,47 +1413,132 @@ func (future ServersDeleteFuture) Result(client ServersClient) (ar autorest.Resp return } if !done { - return ar, azure.NewAsyncOpIncompleteError("postgresql.ServersDeleteFuture") + err = azure.NewAsyncOpIncompleteError("postgresql.ServersDeleteFuture") + return } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.ServersDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + ar.Response = future.Response() + return +} + +// ServerSecurityAlertPoliciesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a +// long-running operation. +type ServerSecurityAlertPoliciesCreateOrUpdateFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *ServerSecurityAlertPoliciesCreateOrUpdateFuture) Result(client ServerSecurityAlertPoliciesClient) (ssap ServerSecurityAlertPolicy, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServerSecurityAlertPoliciesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + if !done { + err = azure.NewAsyncOpIncompleteError("postgresql.ServerSecurityAlertPoliciesCreateOrUpdateFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ssap.Response.Response, err = future.GetResult(sender); err == nil && ssap.Response.Response.StatusCode != http.StatusNoContent { + ssap, err = client.CreateOrUpdateResponder(ssap.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "postgresql.ServerSecurityAlertPoliciesCreateOrUpdateFuture", "Result", ssap.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.ServersDeleteFuture", "Result", resp, "Failure sending request") - return + return +} + +// ServerSecurityAlertPolicy a server security alert policy. +type ServerSecurityAlertPolicy struct { + autorest.Response `json:"-"` + // SecurityAlertPolicyProperties - Resource properties. + *SecurityAlertPolicyProperties `json:"properties,omitempty"` + // ID - Resource ID + ID *string `json:"id,omitempty"` + // Name - Resource name. + Name *string `json:"name,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for ServerSecurityAlertPolicy. +func (ssap ServerSecurityAlertPolicy) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ssap.SecurityAlertPolicyProperties != nil { + objectMap["properties"] = ssap.SecurityAlertPolicyProperties + } + if ssap.ID != nil { + objectMap["id"] = ssap.ID } - ar, err = client.DeleteResponder(resp) + if ssap.Name != nil { + objectMap["name"] = ssap.Name + } + if ssap.Type != nil { + objectMap["type"] = ssap.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for ServerSecurityAlertPolicy struct. +func (ssap *ServerSecurityAlertPolicy) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.ServersDeleteFuture", "Result", resp, "Failure responding to request") + return err } - return + for k, v := range m { + switch k { + case "properties": + if v != nil { + var securityAlertPolicyProperties SecurityAlertPolicyProperties + err = json.Unmarshal(*v, &securityAlertPolicyProperties) + if err != nil { + return err + } + ssap.SecurityAlertPolicyProperties = &securityAlertPolicyProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + ssap.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + ssap.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + ssap.Type = &typeVar + } + } + } + + return nil } // ServersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServersUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServersUpdateFuture) Result(client ServersClient) (s Server, err error) { +func (future *ServersUpdateFuture) Result(client ServersClient) (s Server, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1539,34 +1546,15 @@ func (future ServersUpdateFuture) Result(client ServersClient) (s Server, err er return } if !done { - return s, azure.NewAsyncOpIncompleteError("postgresql.ServersUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.ServersUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("postgresql.ServersUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.UpdateResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "postgresql.ServersUpdateFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.ServersUpdateFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "postgresql.ServersUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -1708,3 +1696,249 @@ func (tr TrackedResource) MarshalJSON() ([]byte, error) { } return json.Marshal(objectMap) } + +// VirtualNetworkRule a virtual network rule. +type VirtualNetworkRule struct { + autorest.Response `json:"-"` + // VirtualNetworkRuleProperties - Resource properties. + *VirtualNetworkRuleProperties `json:"properties,omitempty"` + // ID - Resource ID + ID *string `json:"id,omitempty"` + // Name - Resource name. + Name *string `json:"name,omitempty"` + // Type - Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for VirtualNetworkRule. +func (vnr VirtualNetworkRule) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if vnr.VirtualNetworkRuleProperties != nil { + objectMap["properties"] = vnr.VirtualNetworkRuleProperties + } + if vnr.ID != nil { + objectMap["id"] = vnr.ID + } + if vnr.Name != nil { + objectMap["name"] = vnr.Name + } + if vnr.Type != nil { + objectMap["type"] = vnr.Type + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for VirtualNetworkRule struct. +func (vnr *VirtualNetworkRule) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var virtualNetworkRuleProperties VirtualNetworkRuleProperties + err = json.Unmarshal(*v, &virtualNetworkRuleProperties) + if err != nil { + return err + } + vnr.VirtualNetworkRuleProperties = &virtualNetworkRuleProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + vnr.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + vnr.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + vnr.Type = &typeVar + } + } + } + + return nil +} + +// VirtualNetworkRuleListResult a list of virtual network rules. +type VirtualNetworkRuleListResult struct { + autorest.Response `json:"-"` + // Value - Array of results. + Value *[]VirtualNetworkRule `json:"value,omitempty"` + // NextLink - Link to retrieve next page of results. + NextLink *string `json:"nextLink,omitempty"` +} + +// VirtualNetworkRuleListResultIterator provides access to a complete listing of VirtualNetworkRule values. +type VirtualNetworkRuleListResultIterator struct { + i int + page VirtualNetworkRuleListResultPage +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *VirtualNetworkRuleListResultIterator) Next() error { + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err := iter.page.Next() + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter VirtualNetworkRuleListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter VirtualNetworkRuleListResultIterator) Response() VirtualNetworkRuleListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter VirtualNetworkRuleListResultIterator) Value() VirtualNetworkRule { + if !iter.page.NotDone() { + return VirtualNetworkRule{} + } + return iter.page.Values()[iter.i] +} + +// IsEmpty returns true if the ListResult contains no values. +func (vnrlr VirtualNetworkRuleListResult) IsEmpty() bool { + return vnrlr.Value == nil || len(*vnrlr.Value) == 0 +} + +// virtualNetworkRuleListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (vnrlr VirtualNetworkRuleListResult) virtualNetworkRuleListResultPreparer() (*http.Request, error) { + if vnrlr.NextLink == nil || len(to.String(vnrlr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare(&http.Request{}, + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(vnrlr.NextLink))) +} + +// VirtualNetworkRuleListResultPage contains a page of VirtualNetworkRule values. +type VirtualNetworkRuleListResultPage struct { + fn func(VirtualNetworkRuleListResult) (VirtualNetworkRuleListResult, error) + vnrlr VirtualNetworkRuleListResult +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *VirtualNetworkRuleListResultPage) Next() error { + next, err := page.fn(page.vnrlr) + if err != nil { + return err + } + page.vnrlr = next + return nil +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page VirtualNetworkRuleListResultPage) NotDone() bool { + return !page.vnrlr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page VirtualNetworkRuleListResultPage) Response() VirtualNetworkRuleListResult { + return page.vnrlr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page VirtualNetworkRuleListResultPage) Values() []VirtualNetworkRule { + if page.vnrlr.IsEmpty() { + return nil + } + return *page.vnrlr.Value +} + +// VirtualNetworkRuleProperties properties of a virtual network rule. +type VirtualNetworkRuleProperties struct { + // VirtualNetworkSubnetID - The ARM resource id of the virtual network subnet. + VirtualNetworkSubnetID *string `json:"virtualNetworkSubnetId,omitempty"` + // IgnoreMissingVnetServiceEndpoint - Create firewall rule before the virtual network has vnet service endpoint enabled. + IgnoreMissingVnetServiceEndpoint *bool `json:"ignoreMissingVnetServiceEndpoint,omitempty"` + // State - Virtual Network Rule State. Possible values include: 'Initializing', 'InProgress', 'Ready', 'Deleting', 'Unknown' + State VirtualNetworkRuleState `json:"state,omitempty"` +} + +// VirtualNetworkRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a +// long-running operation. +type VirtualNetworkRulesCreateOrUpdateFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *VirtualNetworkRulesCreateOrUpdateFuture) Result(client VirtualNetworkRulesClient) (vnr VirtualNetworkRule, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("postgresql.VirtualNetworkRulesCreateOrUpdateFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if vnr.Response.Response, err = future.GetResult(sender); err == nil && vnr.Response.Response.StatusCode != http.StatusNoContent { + vnr, err = client.CreateOrUpdateResponder(vnr.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesCreateOrUpdateFuture", "Result", vnr.Response.Response, "Failure responding to request") + } + } + return +} + +// VirtualNetworkRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type VirtualNetworkRulesDeleteFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *VirtualNetworkRulesDeleteFuture) Result(client VirtualNetworkRulesClient) (ar autorest.Response, err error) { + var done bool + done, err = future.Done(client) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesDeleteFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("postgresql.VirtualNetworkRulesDeleteFuture") + return + } + ar.Response = future.Response() + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/operations.go index 807f91ba9419..76e4b8e7bdd9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/operations.go @@ -25,8 +25,8 @@ import ( ) // OperationsClient is the the Microsoft Azure management API provides create, read, update, and delete functionality -// for Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations with new -// business model. +// for Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, security alert policies, +// log files and configurations with new business model. type OperationsClient struct { BaseClient } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/servers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/servers.go index 5dfe1291ab55..aaae22bbb618 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/servers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/servers.go @@ -26,8 +26,8 @@ import ( ) // ServersClient is the the Microsoft Azure management API provides create, read, update, and delete functionality for -// Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations with new -// business model. +// Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, security alert policies, log +// files and configurations with new business model. type ServersClient struct { BaseClient } @@ -101,15 +101,17 @@ func (client ServersClient) CreatePreparer(ctx context.Context, resourceGroupNam // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) CreateSender(req *http.Request) (future ServersCreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -171,15 +173,17 @@ func (client ServersClient) DeletePreparer(ctx context.Context, resourceGroupNam // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) DeleteSender(req *http.Request) (future ServersDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -440,15 +444,17 @@ func (client ServersClient) UpdatePreparer(ctx context.Context, resourceGroupNam // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) UpdateSender(req *http.Request) (future ServersUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/serversecurityalertpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/serversecurityalertpolicies.go new file mode 100644 index 000000000000..002c2755d165 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/serversecurityalertpolicies.go @@ -0,0 +1,187 @@ +package postgresql + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// ServerSecurityAlertPoliciesClient is the the Microsoft Azure management API provides create, read, update, and +// delete functionality for Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, +// security alert policies, log files and configurations with new business model. +type ServerSecurityAlertPoliciesClient struct { + BaseClient +} + +// NewServerSecurityAlertPoliciesClient creates an instance of the ServerSecurityAlertPoliciesClient client. +func NewServerSecurityAlertPoliciesClient(subscriptionID string) ServerSecurityAlertPoliciesClient { + return NewServerSecurityAlertPoliciesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewServerSecurityAlertPoliciesClientWithBaseURI creates an instance of the ServerSecurityAlertPoliciesClient client. +func NewServerSecurityAlertPoliciesClientWithBaseURI(baseURI string, subscriptionID string) ServerSecurityAlertPoliciesClient { + return ServerSecurityAlertPoliciesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate creates or updates a threat detection policy. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// parameters - the server security alert policy. +func (client ServerSecurityAlertPoliciesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, parameters ServerSecurityAlertPolicy) (result ServerSecurityAlertPoliciesCreateOrUpdateFuture, err error) { + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServerSecurityAlertPoliciesClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + result, err = client.CreateOrUpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServerSecurityAlertPoliciesClient", "CreateOrUpdate", result.Response(), "Failure sending request") + return + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client ServerSecurityAlertPoliciesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, parameters ServerSecurityAlertPolicy) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "securityAlertPolicyName": autorest.Encode("path", "Default"), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-12-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/securityAlertPolicies/{securityAlertPolicyName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client ServerSecurityAlertPoliciesClient) CreateOrUpdateSender(req *http.Request) (future ServerSecurityAlertPoliciesCreateOrUpdateFuture, err error) { + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client ServerSecurityAlertPoliciesClient) CreateOrUpdateResponder(resp *http.Response) (result ServerSecurityAlertPolicy, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Get get a server's security alert policy. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +func (client ServerSecurityAlertPoliciesClient) Get(ctx context.Context, resourceGroupName string, serverName string) (result ServerSecurityAlertPolicy, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, serverName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServerSecurityAlertPoliciesClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "postgresql.ServerSecurityAlertPoliciesClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServerSecurityAlertPoliciesClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client ServerSecurityAlertPoliciesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "securityAlertPolicyName": autorest.Encode("path", "Default"), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-12-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/securityAlertPolicies/{securityAlertPolicyName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client ServerSecurityAlertPoliciesClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client ServerSecurityAlertPoliciesClient) GetResponder(resp *http.Response) (result ServerSecurityAlertPolicy, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/virtualnetworkrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/virtualnetworkrules.go new file mode 100644 index 000000000000..19aa5bde5fd7 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql/virtualnetworkrules.go @@ -0,0 +1,366 @@ +package postgresql + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// VirtualNetworkRulesClient is the the Microsoft Azure management API provides create, read, update, and delete +// functionality for Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, security +// alert policies, log files and configurations with new business model. +type VirtualNetworkRulesClient struct { + BaseClient +} + +// NewVirtualNetworkRulesClient creates an instance of the VirtualNetworkRulesClient client. +func NewVirtualNetworkRulesClient(subscriptionID string) VirtualNetworkRulesClient { + return NewVirtualNetworkRulesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewVirtualNetworkRulesClientWithBaseURI creates an instance of the VirtualNetworkRulesClient client. +func NewVirtualNetworkRulesClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkRulesClient { + return VirtualNetworkRulesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate creates or updates an existing virtual network rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// virtualNetworkRuleName - the name of the virtual network rule. +// parameters - the requested virtual Network Rule Resource state. +func (client VirtualNetworkRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string, parameters VirtualNetworkRule) (result VirtualNetworkRulesCreateOrUpdateFuture, err error) { + if err := validation.Validate([]validation.Validation{ + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkRuleProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.VirtualNetworkRuleProperties.VirtualNetworkSubnetID", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil { + return result, validation.NewError("postgresql.VirtualNetworkRulesClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, virtualNetworkRuleName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + result, err = client.CreateOrUpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request") + return + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client VirtualNetworkRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string, parameters VirtualNetworkRule) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "virtualNetworkRuleName": autorest.Encode("path", virtualNetworkRuleName), + } + + const APIVersion = "2017-12-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkRulesCreateOrUpdateFuture, err error) { + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes the virtual network rule with the given name. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// virtualNetworkRuleName - the name of the virtual network rule. +func (client VirtualNetworkRulesClient) Delete(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (result VirtualNetworkRulesDeleteFuture, err error) { + req, err := client.DeletePreparer(ctx, resourceGroupName, serverName, virtualNetworkRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "Delete", nil, "Failure preparing request") + return + } + + result, err = client.DeleteSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "Delete", result.Response(), "Failure sending request") + return + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client VirtualNetworkRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "virtualNetworkRuleName": autorest.Encode("path", virtualNetworkRuleName), + } + + const APIVersion = "2017-12-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) DeleteSender(req *http.Request) (future VirtualNetworkRulesDeleteFuture, err error) { + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get gets a virtual network rule. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +// virtualNetworkRuleName - the name of the virtual network rule. +func (client VirtualNetworkRulesClient) Get(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (result VirtualNetworkRule, err error) { + req, err := client.GetPreparer(ctx, resourceGroupName, serverName, virtualNetworkRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client VirtualNetworkRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, serverName string, virtualNetworkRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "virtualNetworkRuleName": autorest.Encode("path", virtualNetworkRuleName), + } + + const APIVersion = "2017-12-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) GetResponder(resp *http.Response) (result VirtualNetworkRule, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListByServer gets a list of virtual network rules in a server. +// Parameters: +// resourceGroupName - the name of the resource group that contains the resource. You can obtain this value +// from the Azure Resource Manager API or the portal. +// serverName - the name of the server. +func (client VirtualNetworkRulesClient) ListByServer(ctx context.Context, resourceGroupName string, serverName string) (result VirtualNetworkRuleListResultPage, err error) { + result.fn = client.listByServerNextResults + req, err := client.ListByServerPreparer(ctx, resourceGroupName, serverName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "ListByServer", nil, "Failure preparing request") + return + } + + resp, err := client.ListByServerSender(req) + if err != nil { + result.vnrlr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "ListByServer", resp, "Failure sending request") + return + } + + result.vnrlr, err = client.ListByServerResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "ListByServer", resp, "Failure responding to request") + } + + return +} + +// ListByServerPreparer prepares the ListByServer request. +func (client VirtualNetworkRulesClient) ListByServerPreparer(ctx context.Context, resourceGroupName string, serverName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-12-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/virtualNetworkRules", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByServerSender sends the ListByServer request. The method will close the +// http.Response Body if it receives an error. +func (client VirtualNetworkRulesClient) ListByServerSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// ListByServerResponder handles the response to the ListByServer request. The method always +// closes the http.Response Body. +func (client VirtualNetworkRulesClient) ListByServerResponder(resp *http.Response) (result VirtualNetworkRuleListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByServerNextResults retrieves the next set of results, if any. +func (client VirtualNetworkRulesClient) listByServerNextResults(lastResults VirtualNetworkRuleListResult) (result VirtualNetworkRuleListResult, err error) { + req, err := lastResults.virtualNetworkRuleListResultPreparer() + if err != nil { + return result, autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "listByServerNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByServerSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "listByServerNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByServerResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.VirtualNetworkRulesClient", "listByServerNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByServerComplete enumerates all values, automatically crossing page boundaries as required. +func (client VirtualNetworkRulesClient) ListByServerComplete(ctx context.Context, resourceGroupName string, serverName string) (result VirtualNetworkRuleListResultIterator, err error) { + result.page, err = client.ListByServer(ctx, resourceGroupName, serverName) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go index d13266704458..6041417caef3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/models.go @@ -840,12 +840,11 @@ type WorkspaceProperties struct { // operation. type WorkspacesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future WorkspacesCreateOrUpdateFuture) Result(client WorkspacesClient) (w Workspace, err error) { +func (future *WorkspacesCreateOrUpdateFuture) Result(client WorkspacesClient) (w Workspace, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -853,34 +852,15 @@ func (future WorkspacesCreateOrUpdateFuture) Result(client WorkspacesClient) (w return } if !done { - return w, azure.NewAsyncOpIncompleteError("operationalinsights.WorkspacesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - w, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "operationalinsights.WorkspacesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("operationalinsights.WorkspacesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if w.Response.Response, err = future.GetResult(sender); err == nil && w.Response.Response.StatusCode != http.StatusNoContent { + w, err = client.CreateOrUpdateResponder(w.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "operationalinsights.WorkspacesCreateOrUpdateFuture", "Result", w.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "operationalinsights.WorkspacesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - w, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "operationalinsights.WorkspacesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go index 91278e3cccc5..f047c6afc6f2 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights/workspaces.go @@ -102,15 +102,17 @@ func (client WorkspacesClient) CreateOrUpdatePreparer(ctx context.Context, resou // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client WorkspacesClient) CreateOrUpdateSender(req *http.Request) (future WorkspacesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go index faae3cc0990f..4434c8d8829b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionpolicies.go @@ -101,15 +101,17 @@ func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdatePreparer(ctx c // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionPoliciesClient) CreateOrUpdateSender(req *http.Request) (future BackupLongTermRetentionPoliciesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go index b3d59e262403..81316d00023a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/backuplongtermretentionvaults.go @@ -99,15 +99,17 @@ func (client BackupLongTermRetentionVaultsClient) CreateOrUpdatePreparer(ctx con // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client BackupLongTermRetentionVaultsClient) CreateOrUpdateSender(req *http.Request) (future BackupLongTermRetentionVaultsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go index 1b9d2fae1576..0633f3963616 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databaseblobauditingpolicies.go @@ -47,7 +47,7 @@ func NewDatabaseBlobAuditingPoliciesClientWithBaseURI(baseURI string, subscripti // resourceGroupName - the name of the resource group that contains the resource. You can obtain this value // from the Azure Resource Manager API or the portal. // serverName - the name of the server. -// databaseName - the name of the database for which the blob auditing policy will be defined. +// databaseName - the name of the database. // parameters - the database blob auditing policy. func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, serverName string, databaseName string, parameters DatabaseBlobAuditingPolicy) (result DatabaseBlobAuditingPolicy, err error) { req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, serverName, databaseName, parameters) @@ -121,7 +121,7 @@ func (client DatabaseBlobAuditingPoliciesClient) CreateOrUpdateResponder(resp *h // resourceGroupName - the name of the resource group that contains the resource. You can obtain this value // from the Azure Resource Manager API or the portal. // serverName - the name of the server. -// databaseName - the name of the database for which the blob audit policy is defined. +// databaseName - the name of the database. func (client DatabaseBlobAuditingPoliciesClient) Get(ctx context.Context, resourceGroupName string, serverName string, databaseName string) (result DatabaseBlobAuditingPolicy, err error) { req, err := client.GetPreparer(ctx, resourceGroupName, serverName, databaseName) if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databases.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databases.go index 58a2cf31f9a2..8417ebc15b75 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databases.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/databases.go @@ -101,15 +101,17 @@ func (client DatabasesClient) CreateImportOperationPreparer(ctx context.Context, // CreateImportOperationSender sends the CreateImportOperation request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) CreateImportOperationSender(req *http.Request) (future DatabasesCreateImportOperationFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -176,15 +178,17 @@ func (client DatabasesClient) CreateOrUpdatePreparer(ctx context.Context, resour // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) CreateOrUpdateSender(req *http.Request) (future DatabasesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -329,15 +333,17 @@ func (client DatabasesClient) ExportPreparer(ctx context.Context, resourceGroupN // ExportSender sends the Export request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ExportSender(req *http.Request) (future DatabasesExportFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -628,15 +634,17 @@ func (client DatabasesClient) ImportPreparer(ctx context.Context, resourceGroupN // ImportSender sends the Import request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ImportSender(req *http.Request) (future DatabasesImportFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1059,15 +1067,17 @@ func (client DatabasesClient) PausePreparer(ctx context.Context, resourceGroupNa // PauseSender sends the Pause request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) PauseSender(req *http.Request) (future DatabasesPauseFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1130,15 +1140,17 @@ func (client DatabasesClient) ResumePreparer(ctx context.Context, resourceGroupN // ResumeSender sends the Resume request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) ResumeSender(req *http.Request) (future DatabasesResumeFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1204,15 +1216,17 @@ func (client DatabasesClient) UpdatePreparer(ctx context.Context, resourceGroupN // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client DatabasesClient) UpdateSender(req *http.Request) (future DatabasesUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpools.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpools.go index f22c556db196..c872c28ea70c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpools.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/elasticpools.go @@ -91,15 +91,17 @@ func (client ElasticPoolsClient) CreateOrUpdatePreparer(ctx context.Context, res // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) CreateOrUpdateSender(req *http.Request) (future ElasticPoolsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -515,15 +517,17 @@ func (client ElasticPoolsClient) UpdatePreparer(ctx context.Context, resourceGro // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ElasticPoolsClient) UpdateSender(req *http.Request) (future ElasticPoolsUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go index 1fb5984331c4..645c86c4c8e7 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/encryptionprotectors.go @@ -90,15 +90,17 @@ func (client EncryptionProtectorsClient) CreateOrUpdatePreparer(ctx context.Cont // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client EncryptionProtectorsClient) CreateOrUpdateSender(req *http.Request) (future EncryptionProtectorsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/failovergroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/failovergroups.go index 5e6afe4aa96f..114ab721211a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/failovergroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/failovergroups.go @@ -101,15 +101,17 @@ func (client FailoverGroupsClient) CreateOrUpdatePreparer(ctx context.Context, r // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) CreateOrUpdateSender(req *http.Request) (future FailoverGroupsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -173,15 +175,17 @@ func (client FailoverGroupsClient) DeletePreparer(ctx context.Context, resourceG // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) DeleteSender(req *http.Request) (future FailoverGroupsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -244,15 +248,17 @@ func (client FailoverGroupsClient) FailoverPreparer(ctx context.Context, resourc // FailoverSender sends the Failover request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) FailoverSender(req *http.Request) (future FailoverGroupsFailoverFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -317,15 +323,17 @@ func (client FailoverGroupsClient) ForceFailoverAllowDataLossPreparer(ctx contex // ForceFailoverAllowDataLossSender sends the ForceFailoverAllowDataLoss request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) ForceFailoverAllowDataLossSender(req *http.Request) (future FailoverGroupsForceFailoverAllowDataLossFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -558,15 +566,17 @@ func (client FailoverGroupsClient) UpdatePreparer(ctx context.Context, resourceG // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client FailoverGroupsClient) UpdateSender(req *http.Request) (future FailoverGroupsUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/managedinstances.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/managedinstances.go index 974afbfb3141..64efddd7e24c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/managedinstances.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/managedinstances.go @@ -97,15 +97,17 @@ func (client ManagedInstancesClient) CreateOrUpdatePreparer(ctx context.Context, // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ManagedInstancesClient) CreateOrUpdateSender(req *http.Request) (future ManagedInstancesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -167,15 +169,17 @@ func (client ManagedInstancesClient) DeletePreparer(ctx context.Context, resourc // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ManagedInstancesClient) DeleteSender(req *http.Request) (future ManagedInstancesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -491,15 +495,17 @@ func (client ManagedInstancesClient) UpdatePreparer(ctx context.Context, resourc // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ManagedInstancesClient) UpdateSender(req *http.Request) (future ManagedInstancesUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/models.go index 8e20a0065a76..a0ab829d4887 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/models.go @@ -1036,12 +1036,11 @@ func PossibleVirtualNetworkRuleStateValues() []VirtualNetworkRuleState { // a long-running operation. type BackupLongTermRetentionPoliciesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future BackupLongTermRetentionPoliciesCreateOrUpdateFuture) Result(client BackupLongTermRetentionPoliciesClient) (bltrp BackupLongTermRetentionPolicy, err error) { +func (future *BackupLongTermRetentionPoliciesCreateOrUpdateFuture) Result(client BackupLongTermRetentionPoliciesClient) (bltrp BackupLongTermRetentionPolicy, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1049,34 +1048,15 @@ func (future BackupLongTermRetentionPoliciesCreateOrUpdateFuture) Result(client return } if !done { - return bltrp, azure.NewAsyncOpIncompleteError("sql.BackupLongTermRetentionPoliciesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - bltrp, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.BackupLongTermRetentionPoliciesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.BackupLongTermRetentionPoliciesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if bltrp.Response.Response, err = future.GetResult(sender); err == nil && bltrp.Response.Response.StatusCode != http.StatusNoContent { + bltrp, err = client.CreateOrUpdateResponder(bltrp.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.BackupLongTermRetentionPoliciesCreateOrUpdateFuture", "Result", bltrp.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.BackupLongTermRetentionPoliciesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - bltrp, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.BackupLongTermRetentionPoliciesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -1305,12 +1285,11 @@ type BackupLongTermRetentionVaultProperties struct { // long-running operation. type BackupLongTermRetentionVaultsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future BackupLongTermRetentionVaultsCreateOrUpdateFuture) Result(client BackupLongTermRetentionVaultsClient) (bltrv BackupLongTermRetentionVault, err error) { +func (future *BackupLongTermRetentionVaultsCreateOrUpdateFuture) Result(client BackupLongTermRetentionVaultsClient) (bltrv BackupLongTermRetentionVault, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1318,34 +1297,15 @@ func (future BackupLongTermRetentionVaultsCreateOrUpdateFuture) Result(client Ba return } if !done { - return bltrv, azure.NewAsyncOpIncompleteError("sql.BackupLongTermRetentionVaultsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - bltrv, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.BackupLongTermRetentionVaultsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.BackupLongTermRetentionVaultsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if bltrv.Response.Response, err = future.GetResult(sender); err == nil && bltrv.Response.Response.StatusCode != http.StatusNoContent { + bltrv, err = client.CreateOrUpdateResponder(bltrv.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.BackupLongTermRetentionVaultsCreateOrUpdateFuture", "Result", bltrv.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.BackupLongTermRetentionVaultsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - bltrv, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.BackupLongTermRetentionVaultsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -1378,10 +1338,10 @@ type Database struct { Kind *string `json:"kind,omitempty"` // DatabaseProperties - The properties representing the resource. *DatabaseProperties `json:"properties,omitempty"` - // Tags - Resource tags. - Tags map[string]*string `json:"tags"` // Location - Resource location. Location *string `json:"location,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` // ID - Resource ID. ID *string `json:"id,omitempty"` // Name - Resource name. @@ -1399,12 +1359,12 @@ func (d Database) MarshalJSON() ([]byte, error) { if d.DatabaseProperties != nil { objectMap["properties"] = d.DatabaseProperties } - if d.Tags != nil { - objectMap["tags"] = d.Tags - } if d.Location != nil { objectMap["location"] = d.Location } + if d.Tags != nil { + objectMap["tags"] = d.Tags + } if d.ID != nil { objectMap["id"] = d.ID } @@ -1444,23 +1404,23 @@ func (d *Database) UnmarshalJSON(body []byte) error { } d.DatabaseProperties = &databaseProperties } - case "tags": + case "location": if v != nil { - var tags map[string]*string - err = json.Unmarshal(*v, &tags) + var location string + err = json.Unmarshal(*v, &location) if err != nil { return err } - d.Tags = tags + d.Location = &location } - case "location": + case "tags": if v != nil { - var location string - err = json.Unmarshal(*v, &location) + var tags map[string]*string + err = json.Unmarshal(*v, &tags) if err != nil { return err } - d.Location = &location + d.Tags = tags } case "id": if v != nil { @@ -1601,11 +1561,67 @@ type DatabaseBlobAuditingPolicyProperties struct { StorageAccountAccessKey *string `json:"storageAccountAccessKey,omitempty"` // RetentionDays - Specifies the number of days to keep in the audit logs. RetentionDays *int32 `json:"retentionDays,omitempty"` - // AuditActionsAndGroups - Specifies the Actions and Actions-Groups to audit. + // AuditActionsAndGroups - Specifies the Actions-Groups and Actions to audit. + // + // The recommended set of action groups to use is the following combination - this will audit all the queries and stored procedures executed against the database, as well as successful and failed logins: + // + // BATCH_COMPLETED_GROUP, + // SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP, + // FAILED_DATABASE_AUTHENTICATION_GROUP. + // + // This above combination is also the set that is configured by default when enabling auditing from the Azure portal. + // + // The supported action groups to audit are (note: choose only specific groups that cover your auditing needs. Using unnecessary groups could lead to very large quantities of audit records): + // + // APPLICATION_ROLE_CHANGE_PASSWORD_GROUP + // BACKUP_RESTORE_GROUP + // DATABASE_LOGOUT_GROUP + // DATABASE_OBJECT_CHANGE_GROUP + // DATABASE_OBJECT_OWNERSHIP_CHANGE_GROUP + // DATABASE_OBJECT_PERMISSION_CHANGE_GROUP + // DATABASE_OPERATION_GROUP + // DATABASE_PERMISSION_CHANGE_GROUP + // DATABASE_PRINCIPAL_CHANGE_GROUP + // DATABASE_PRINCIPAL_IMPERSONATION_GROUP + // DATABASE_ROLE_MEMBER_CHANGE_GROUP + // FAILED_DATABASE_AUTHENTICATION_GROUP + // SCHEMA_OBJECT_ACCESS_GROUP + // SCHEMA_OBJECT_CHANGE_GROUP + // SCHEMA_OBJECT_OWNERSHIP_CHANGE_GROUP + // SCHEMA_OBJECT_PERMISSION_CHANGE_GROUP + // SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP + // USER_CHANGE_PASSWORD_GROUP + // BATCH_STARTED_GROUP + // BATCH_COMPLETED_GROUP + // + // These are groups that cover all sql statements and stored procedures executed against the database, and should not be used in combination with other groups as this will result in duplicate audit logs. + // + // For more information, see [Database-Level Audit Action Groups](https://docs.microsoft.com/en-us/sql/relational-databases/security/auditing/sql-server-audit-action-groups-and-actions#database-level-audit-action-groups). + // + // For Database auditing policy, specific Actions can also be specified (note that Actions cannot be specified for Server auditing policy). The supported actions to audit are: + // SELECT + // UPDATE + // INSERT + // DELETE + // EXECUTE + // RECEIVE + // REFERENCES + // + // The general form for defining an action to be audited is: + // ON BY + // + // Note that in the above format can refer to an object like a table, view, or stored procedure, or an entire database or schema. For the latter cases, the forms DATABASE:: and SCHEMA:: are used, respectively. + // + // For example: + // SELECT on dbo.myTable by public + // SELECT on DATABASE::myDatabase by public + // SELECT on SCHEMA::mySchema by public + // + // For more information, see [Database-Level Audit Actions](https://docs.microsoft.com/en-us/sql/relational-databases/security/auditing/sql-server-audit-action-groups-and-actions#database-level-audit-actions) AuditActionsAndGroups *[]string `json:"auditActionsAndGroups,omitempty"` // StorageAccountSubscriptionID - Specifies the blob storage subscription Id. StorageAccountSubscriptionID *uuid.UUID `json:"storageAccountSubscriptionId,omitempty"` - // IsStorageSecondaryKeyInUse - Specifies whether storageAccountAccessKey value is the storage’s secondary key. + // IsStorageSecondaryKeyInUse - Specifies whether storageAccountAccessKey value is the storage's secondary key. IsStorageSecondaryKeyInUse *bool `json:"isStorageSecondaryKeyInUse,omitempty"` } @@ -1684,12 +1700,11 @@ type DatabaseProperties struct { // operation. type DatabasesCreateImportOperationFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabasesCreateImportOperationFuture) Result(client DatabasesClient) (ier ImportExportResponse, err error) { +func (future *DatabasesCreateImportOperationFuture) Result(client DatabasesClient) (ier ImportExportResponse, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1697,34 +1712,15 @@ func (future DatabasesCreateImportOperationFuture) Result(client DatabasesClient return } if !done { - return ier, azure.NewAsyncOpIncompleteError("sql.DatabasesCreateImportOperationFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ier, err = client.CreateImportOperationResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesCreateImportOperationFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.DatabasesCreateImportOperationFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ier.Response.Response, err = future.GetResult(sender); err == nil && ier.Response.Response.StatusCode != http.StatusNoContent { + ier, err = client.CreateImportOperationResponder(ier.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.DatabasesCreateImportOperationFuture", "Result", ier.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesCreateImportOperationFuture", "Result", resp, "Failure sending request") - return - } - ier, err = client.CreateImportOperationResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesCreateImportOperationFuture", "Result", resp, "Failure responding to request") } return } @@ -1733,12 +1729,11 @@ func (future DatabasesCreateImportOperationFuture) Result(client DatabasesClient // operation. type DatabasesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Database, err error) { +func (future *DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Database, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1746,34 +1741,15 @@ func (future DatabasesCreateOrUpdateFuture) Result(client DatabasesClient) (d Da return } if !done { - return d, azure.NewAsyncOpIncompleteError("sql.DatabasesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - d, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.DatabasesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if d.Response.Response, err = future.GetResult(sender); err == nil && d.Response.Response.StatusCode != http.StatusNoContent { + d, err = client.CreateOrUpdateResponder(d.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.DatabasesCreateOrUpdateFuture", "Result", d.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - d, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -1911,12 +1887,11 @@ type DatabaseSecurityAlertPolicyProperties struct { // DatabasesExportFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesExportFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabasesExportFuture) Result(client DatabasesClient) (ier ImportExportResponse, err error) { +func (future *DatabasesExportFuture) Result(client DatabasesClient) (ier ImportExportResponse, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1924,34 +1899,15 @@ func (future DatabasesExportFuture) Result(client DatabasesClient) (ier ImportEx return } if !done { - return ier, azure.NewAsyncOpIncompleteError("sql.DatabasesExportFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ier, err = client.ExportResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesExportFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.DatabasesExportFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ier.Response.Response, err = future.GetResult(sender); err == nil && ier.Response.Response.StatusCode != http.StatusNoContent { + ier, err = client.ExportResponder(ier.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.DatabasesExportFuture", "Result", ier.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesExportFuture", "Result", resp, "Failure sending request") - return - } - ier, err = client.ExportResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesExportFuture", "Result", resp, "Failure responding to request") } return } @@ -1959,12 +1915,11 @@ func (future DatabasesExportFuture) Result(client DatabasesClient) (ier ImportEx // DatabasesImportFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesImportFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabasesImportFuture) Result(client DatabasesClient) (ier ImportExportResponse, err error) { +func (future *DatabasesImportFuture) Result(client DatabasesClient) (ier ImportExportResponse, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1972,34 +1927,15 @@ func (future DatabasesImportFuture) Result(client DatabasesClient) (ier ImportEx return } if !done { - return ier, azure.NewAsyncOpIncompleteError("sql.DatabasesImportFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ier, err = client.ImportResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesImportFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.DatabasesImportFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ier.Response.Response, err = future.GetResult(sender); err == nil && ier.Response.Response.StatusCode != http.StatusNoContent { + ier, err = client.ImportResponder(ier.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.DatabasesImportFuture", "Result", ier.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesImportFuture", "Result", resp, "Failure sending request") - return - } - ier, err = client.ImportResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesImportFuture", "Result", resp, "Failure responding to request") } return } @@ -2007,12 +1943,11 @@ func (future DatabasesImportFuture) Result(client DatabasesClient) (ier ImportEx // DatabasesPauseFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesPauseFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabasesPauseFuture) Result(client DatabasesClient) (ar autorest.Response, err error) { +func (future *DatabasesPauseFuture) Result(client DatabasesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2020,47 +1955,21 @@ func (future DatabasesPauseFuture) Result(client DatabasesClient) (ar autorest.R return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.DatabasesPauseFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.PauseResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesPauseFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.DatabasesPauseFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesPauseFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.PauseResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesPauseFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // DatabasesResumeFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesResumeFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabasesResumeFuture) Result(client DatabasesClient) (ar autorest.Response, err error) { +func (future *DatabasesResumeFuture) Result(client DatabasesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2068,47 +1977,21 @@ func (future DatabasesResumeFuture) Result(client DatabasesClient) (ar autorest. return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.DatabasesResumeFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.ResumeResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesResumeFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.DatabasesResumeFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesResumeFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.ResumeResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesResumeFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // DatabasesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DatabasesUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DatabasesUpdateFuture) Result(client DatabasesClient) (d Database, err error) { +func (future *DatabasesUpdateFuture) Result(client DatabasesClient) (d Database, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2116,34 +1999,15 @@ func (future DatabasesUpdateFuture) Result(client DatabasesClient) (d Database, return } if !done { - return d, azure.NewAsyncOpIncompleteError("sql.DatabasesUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - d, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.DatabasesUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if d.Response.Response, err = future.GetResult(sender); err == nil && d.Response.Response.StatusCode != http.StatusNoContent { + d, err = client.UpdateResponder(d.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.DatabasesUpdateFuture", "Result", d.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesUpdateFuture", "Result", resp, "Failure sending request") - return - } - d, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.DatabasesUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -2554,10 +2418,10 @@ type ElasticPool struct { *ElasticPoolProperties `json:"properties,omitempty"` // Kind - Kind of elastic pool. This is metadata used for the Azure portal experience. Kind *string `json:"kind,omitempty"` - // Tags - Resource tags. - Tags map[string]*string `json:"tags"` // Location - Resource location. Location *string `json:"location,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` // ID - Resource ID. ID *string `json:"id,omitempty"` // Name - Resource name. @@ -2575,12 +2439,12 @@ func (ep ElasticPool) MarshalJSON() ([]byte, error) { if ep.Kind != nil { objectMap["kind"] = ep.Kind } - if ep.Tags != nil { - objectMap["tags"] = ep.Tags - } if ep.Location != nil { objectMap["location"] = ep.Location } + if ep.Tags != nil { + objectMap["tags"] = ep.Tags + } if ep.ID != nil { objectMap["id"] = ep.ID } @@ -2620,23 +2484,23 @@ func (ep *ElasticPool) UnmarshalJSON(body []byte) error { } ep.Kind = &kind } - case "tags": + case "location": if v != nil { - var tags map[string]*string - err = json.Unmarshal(*v, &tags) + var location string + err = json.Unmarshal(*v, &location) if err != nil { return err } - ep.Tags = tags + ep.Location = &location } - case "location": + case "tags": if v != nil { - var location string - err = json.Unmarshal(*v, &location) + var tags map[string]*string + err = json.Unmarshal(*v, &tags) if err != nil { return err } - ep.Location = &location + ep.Tags = tags } case "id": if v != nil { @@ -3038,12 +2902,11 @@ type ElasticPoolProperties struct { // operation. type ElasticPoolsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ElasticPoolsCreateOrUpdateFuture) Result(client ElasticPoolsClient) (ep ElasticPool, err error) { +func (future *ElasticPoolsCreateOrUpdateFuture) Result(client ElasticPoolsClient) (ep ElasticPool, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3051,34 +2914,15 @@ func (future ElasticPoolsCreateOrUpdateFuture) Result(client ElasticPoolsClient) return } if !done { - return ep, azure.NewAsyncOpIncompleteError("sql.ElasticPoolsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ep, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ElasticPoolsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.ElasticPoolsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ep.Response.Response, err = future.GetResult(sender); err == nil && ep.Response.Response.StatusCode != http.StatusNoContent { + ep, err = client.CreateOrUpdateResponder(ep.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.ElasticPoolsCreateOrUpdateFuture", "Result", ep.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ElasticPoolsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - ep, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ElasticPoolsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -3086,12 +2930,11 @@ func (future ElasticPoolsCreateOrUpdateFuture) Result(client ElasticPoolsClient) // ElasticPoolsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ElasticPoolsUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ElasticPoolsUpdateFuture) Result(client ElasticPoolsClient) (ep ElasticPool, err error) { +func (future *ElasticPoolsUpdateFuture) Result(client ElasticPoolsClient) (ep ElasticPool, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3099,34 +2942,15 @@ func (future ElasticPoolsUpdateFuture) Result(client ElasticPoolsClient) (ep Ela return } if !done { - return ep, azure.NewAsyncOpIncompleteError("sql.ElasticPoolsUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ep, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ElasticPoolsUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.ElasticPoolsUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ep.Response.Response, err = future.GetResult(sender); err == nil && ep.Response.Response.StatusCode != http.StatusNoContent { + ep, err = client.UpdateResponder(ep.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.ElasticPoolsUpdateFuture", "Result", ep.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ElasticPoolsUpdateFuture", "Result", resp, "Failure sending request") - return - } - ep, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ElasticPoolsUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -3456,12 +3280,11 @@ type EncryptionProtectorProperties struct { // long-running operation. type EncryptionProtectorsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future EncryptionProtectorsCreateOrUpdateFuture) Result(client EncryptionProtectorsClient) (ep EncryptionProtector, err error) { +func (future *EncryptionProtectorsCreateOrUpdateFuture) Result(client EncryptionProtectorsClient) (ep EncryptionProtector, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3469,34 +3292,15 @@ func (future EncryptionProtectorsCreateOrUpdateFuture) Result(client EncryptionP return } if !done { - return ep, azure.NewAsyncOpIncompleteError("sql.EncryptionProtectorsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ep, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.EncryptionProtectorsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.EncryptionProtectorsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ep.Response.Response, err = future.GetResult(sender); err == nil && ep.Response.Response.StatusCode != http.StatusNoContent { + ep, err = client.CreateOrUpdateResponder(ep.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.EncryptionProtectorsCreateOrUpdateFuture", "Result", ep.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.EncryptionProtectorsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - ep, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.EncryptionProtectorsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -3763,12 +3567,11 @@ type FailoverGroupReadWriteEndpoint struct { // operation. type FailoverGroupsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future FailoverGroupsCreateOrUpdateFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { +func (future *FailoverGroupsCreateOrUpdateFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3776,34 +3579,15 @@ func (future FailoverGroupsCreateOrUpdateFuture) Result(client FailoverGroupsCli return } if !done { - return fg, azure.NewAsyncOpIncompleteError("sql.FailoverGroupsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - fg, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.FailoverGroupsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if fg.Response.Response, err = future.GetResult(sender); err == nil && fg.Response.Response.StatusCode != http.StatusNoContent { + fg, err = client.CreateOrUpdateResponder(fg.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.FailoverGroupsCreateOrUpdateFuture", "Result", fg.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - fg, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -3811,12 +3595,11 @@ func (future FailoverGroupsCreateOrUpdateFuture) Result(client FailoverGroupsCli // FailoverGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type FailoverGroupsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future FailoverGroupsDeleteFuture) Result(client FailoverGroupsClient) (ar autorest.Response, err error) { +func (future *FailoverGroupsDeleteFuture) Result(client FailoverGroupsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3824,35 +3607,10 @@ func (future FailoverGroupsDeleteFuture) Result(client FailoverGroupsClient) (ar return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.FailoverGroupsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.FailoverGroupsDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -3860,12 +3618,11 @@ func (future FailoverGroupsDeleteFuture) Result(client FailoverGroupsClient) (ar // operation. type FailoverGroupsFailoverFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future FailoverGroupsFailoverFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { +func (future *FailoverGroupsFailoverFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3873,34 +3630,15 @@ func (future FailoverGroupsFailoverFuture) Result(client FailoverGroupsClient) ( return } if !done { - return fg, azure.NewAsyncOpIncompleteError("sql.FailoverGroupsFailoverFuture") - } - if future.PollingMethod() == azure.PollingLocation { - fg, err = client.FailoverResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsFailoverFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.FailoverGroupsFailoverFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if fg.Response.Response, err = future.GetResult(sender); err == nil && fg.Response.Response.StatusCode != http.StatusNoContent { + fg, err = client.FailoverResponder(fg.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.FailoverGroupsFailoverFuture", "Result", fg.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsFailoverFuture", "Result", resp, "Failure sending request") - return - } - fg, err = client.FailoverResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsFailoverFuture", "Result", resp, "Failure responding to request") } return } @@ -3909,12 +3647,11 @@ func (future FailoverGroupsFailoverFuture) Result(client FailoverGroupsClient) ( // long-running operation. type FailoverGroupsForceFailoverAllowDataLossFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future FailoverGroupsForceFailoverAllowDataLossFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { +func (future *FailoverGroupsForceFailoverAllowDataLossFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3922,34 +3659,15 @@ func (future FailoverGroupsForceFailoverAllowDataLossFuture) Result(client Failo return } if !done { - return fg, azure.NewAsyncOpIncompleteError("sql.FailoverGroupsForceFailoverAllowDataLossFuture") - } - if future.PollingMethod() == azure.PollingLocation { - fg, err = client.ForceFailoverAllowDataLossResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsForceFailoverAllowDataLossFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.FailoverGroupsForceFailoverAllowDataLossFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if fg.Response.Response, err = future.GetResult(sender); err == nil && fg.Response.Response.StatusCode != http.StatusNoContent { + fg, err = client.ForceFailoverAllowDataLossResponder(fg.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.FailoverGroupsForceFailoverAllowDataLossFuture", "Result", fg.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsForceFailoverAllowDataLossFuture", "Result", resp, "Failure sending request") - return - } - fg, err = client.ForceFailoverAllowDataLossResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsForceFailoverAllowDataLossFuture", "Result", resp, "Failure responding to request") } return } @@ -3957,12 +3675,11 @@ func (future FailoverGroupsForceFailoverAllowDataLossFuture) Result(client Failo // FailoverGroupsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type FailoverGroupsUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future FailoverGroupsUpdateFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { +func (future *FailoverGroupsUpdateFuture) Result(client FailoverGroupsClient) (fg FailoverGroup, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3970,34 +3687,15 @@ func (future FailoverGroupsUpdateFuture) Result(client FailoverGroupsClient) (fg return } if !done { - return fg, azure.NewAsyncOpIncompleteError("sql.FailoverGroupsUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - fg, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.FailoverGroupsUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if fg.Response.Response, err = future.GetResult(sender); err == nil && fg.Response.Response.StatusCode != http.StatusNoContent { + fg, err = client.UpdateResponder(fg.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.FailoverGroupsUpdateFuture", "Result", fg.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsUpdateFuture", "Result", resp, "Failure sending request") - return - } - fg, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.FailoverGroupsUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -4550,10 +4248,10 @@ type ManagedInstance struct { Sku *Sku `json:"sku,omitempty"` // ManagedInstanceProperties - Resource properties. *ManagedInstanceProperties `json:"properties,omitempty"` - // Tags - Resource tags. - Tags map[string]*string `json:"tags"` // Location - Resource location. Location *string `json:"location,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` // ID - Resource ID. ID *string `json:"id,omitempty"` // Name - Resource name. @@ -4574,12 +4272,12 @@ func (mi ManagedInstance) MarshalJSON() ([]byte, error) { if mi.ManagedInstanceProperties != nil { objectMap["properties"] = mi.ManagedInstanceProperties } - if mi.Tags != nil { - objectMap["tags"] = mi.Tags - } if mi.Location != nil { objectMap["location"] = mi.Location } + if mi.Tags != nil { + objectMap["tags"] = mi.Tags + } if mi.ID != nil { objectMap["id"] = mi.ID } @@ -4628,23 +4326,23 @@ func (mi *ManagedInstance) UnmarshalJSON(body []byte) error { } mi.ManagedInstanceProperties = &managedInstanceProperties } - case "tags": + case "location": if v != nil { - var tags map[string]*string - err = json.Unmarshal(*v, &tags) + var location string + err = json.Unmarshal(*v, &location) if err != nil { return err } - mi.Tags = tags + mi.Location = &location } - case "location": + case "tags": if v != nil { - var location string - err = json.Unmarshal(*v, &location) + var tags map[string]*string + err = json.Unmarshal(*v, &tags) if err != nil { return err } - mi.Location = &location + mi.Tags = tags } case "id": if v != nil { @@ -4805,12 +4503,11 @@ type ManagedInstanceProperties struct { // operation. type ManagedInstancesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ManagedInstancesCreateOrUpdateFuture) Result(client ManagedInstancesClient) (mi ManagedInstance, err error) { +func (future *ManagedInstancesCreateOrUpdateFuture) Result(client ManagedInstancesClient) (mi ManagedInstance, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4818,34 +4515,15 @@ func (future ManagedInstancesCreateOrUpdateFuture) Result(client ManagedInstance return } if !done { - return mi, azure.NewAsyncOpIncompleteError("sql.ManagedInstancesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - mi, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ManagedInstancesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.ManagedInstancesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if mi.Response.Response, err = future.GetResult(sender); err == nil && mi.Response.Response.StatusCode != http.StatusNoContent { + mi, err = client.CreateOrUpdateResponder(mi.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesCreateOrUpdateFuture", "Result", mi.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ManagedInstancesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - mi, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ManagedInstancesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -4854,12 +4532,11 @@ func (future ManagedInstancesCreateOrUpdateFuture) Result(client ManagedInstance // operation. type ManagedInstancesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ManagedInstancesDeleteFuture) Result(client ManagedInstancesClient) (ar autorest.Response, err error) { +func (future *ManagedInstancesDeleteFuture) Result(client ManagedInstancesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4867,35 +4544,10 @@ func (future ManagedInstancesDeleteFuture) Result(client ManagedInstancesClient) return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.ManagedInstancesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ManagedInstancesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.ManagedInstancesDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ManagedInstancesDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ManagedInstancesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -4903,12 +4555,11 @@ func (future ManagedInstancesDeleteFuture) Result(client ManagedInstancesClient) // operation. type ManagedInstancesUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ManagedInstancesUpdateFuture) Result(client ManagedInstancesClient) (mi ManagedInstance, err error) { +func (future *ManagedInstancesUpdateFuture) Result(client ManagedInstancesClient) (mi ManagedInstance, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4916,34 +4567,15 @@ func (future ManagedInstancesUpdateFuture) Result(client ManagedInstancesClient) return } if !done { - return mi, azure.NewAsyncOpIncompleteError("sql.ManagedInstancesUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - mi, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ManagedInstancesUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.ManagedInstancesUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if mi.Response.Response, err = future.GetResult(sender); err == nil && mi.Response.Response.StatusCode != http.StatusNoContent { + mi, err = client.UpdateResponder(mi.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.ManagedInstancesUpdateFuture", "Result", mi.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ManagedInstancesUpdateFuture", "Result", resp, "Failure sending request") - return - } - mi, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ManagedInstancesUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -5628,12 +5260,11 @@ type ReplicationLinkProperties struct { // long-running operation. type ReplicationLinksFailoverAllowDataLossFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ReplicationLinksFailoverAllowDataLossFuture) Result(client ReplicationLinksClient) (ar autorest.Response, err error) { +func (future *ReplicationLinksFailoverAllowDataLossFuture) Result(client ReplicationLinksClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -5641,35 +5272,10 @@ func (future ReplicationLinksFailoverAllowDataLossFuture) Result(client Replicat return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.ReplicationLinksFailoverAllowDataLossFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.FailoverAllowDataLossResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ReplicationLinksFailoverAllowDataLossFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ReplicationLinksFailoverAllowDataLossFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("sql.ReplicationLinksFailoverAllowDataLossFuture") return } - ar, err = client.FailoverAllowDataLossResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ReplicationLinksFailoverAllowDataLossFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -5677,12 +5283,11 @@ func (future ReplicationLinksFailoverAllowDataLossFuture) Result(client Replicat // operation. type ReplicationLinksFailoverFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ReplicationLinksFailoverFuture) Result(client ReplicationLinksClient) (ar autorest.Response, err error) { +func (future *ReplicationLinksFailoverFuture) Result(client ReplicationLinksClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -5690,35 +5295,10 @@ func (future ReplicationLinksFailoverFuture) Result(client ReplicationLinksClien return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.ReplicationLinksFailoverFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.FailoverResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ReplicationLinksFailoverFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ReplicationLinksFailoverFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("sql.ReplicationLinksFailoverFuture") return } - ar, err = client.FailoverResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ReplicationLinksFailoverFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -5972,10 +5552,10 @@ type Server struct { Kind *string `json:"kind,omitempty"` // ServerProperties - Resource properties. *ServerProperties `json:"properties,omitempty"` - // Tags - Resource tags. - Tags map[string]*string `json:"tags"` // Location - Resource location. Location *string `json:"location,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` // ID - Resource ID. ID *string `json:"id,omitempty"` // Name - Resource name. @@ -5996,12 +5576,12 @@ func (s Server) MarshalJSON() ([]byte, error) { if s.ServerProperties != nil { objectMap["properties"] = s.ServerProperties } - if s.Tags != nil { - objectMap["tags"] = s.Tags - } if s.Location != nil { objectMap["location"] = s.Location } + if s.Tags != nil { + objectMap["tags"] = s.Tags + } if s.ID != nil { objectMap["id"] = s.ID } @@ -6050,23 +5630,23 @@ func (s *Server) UnmarshalJSON(body []byte) error { } s.ServerProperties = &serverProperties } - case "tags": + case "location": if v != nil { - var tags map[string]*string - err = json.Unmarshal(*v, &tags) + var location string + err = json.Unmarshal(*v, &location) if err != nil { return err } - s.Tags = tags + s.Location = &location } - case "location": + case "tags": if v != nil { - var location string - err = json.Unmarshal(*v, &location) + var tags map[string]*string + err = json.Unmarshal(*v, &tags) if err != nil { return err } - s.Location = &location + s.Tags = tags } case "id": if v != nil { @@ -6206,12 +5786,11 @@ func (saaa *ServerAzureADAdministrator) UnmarshalJSON(body []byte) error { // long-running operation. type ServerAzureADAdministratorsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServerAzureADAdministratorsCreateOrUpdateFuture) Result(client ServerAzureADAdministratorsClient) (saaa ServerAzureADAdministrator, err error) { +func (future *ServerAzureADAdministratorsCreateOrUpdateFuture) Result(client ServerAzureADAdministratorsClient) (saaa ServerAzureADAdministrator, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -6219,34 +5798,15 @@ func (future ServerAzureADAdministratorsCreateOrUpdateFuture) Result(client Serv return } if !done { - return saaa, azure.NewAsyncOpIncompleteError("sql.ServerAzureADAdministratorsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - saaa, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerAzureADAdministratorsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.ServerAzureADAdministratorsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if saaa.Response.Response, err = future.GetResult(sender); err == nil && saaa.Response.Response.StatusCode != http.StatusNoContent { + saaa, err = client.CreateOrUpdateResponder(saaa.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.ServerAzureADAdministratorsCreateOrUpdateFuture", "Result", saaa.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerAzureADAdministratorsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - saaa, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerAzureADAdministratorsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -6255,12 +5815,11 @@ func (future ServerAzureADAdministratorsCreateOrUpdateFuture) Result(client Serv // long-running operation. type ServerAzureADAdministratorsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServerAzureADAdministratorsDeleteFuture) Result(client ServerAzureADAdministratorsClient) (saaa ServerAzureADAdministrator, err error) { +func (future *ServerAzureADAdministratorsDeleteFuture) Result(client ServerAzureADAdministratorsClient) (saaa ServerAzureADAdministrator, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -6268,34 +5827,15 @@ func (future ServerAzureADAdministratorsDeleteFuture) Result(client ServerAzureA return } if !done { - return saaa, azure.NewAsyncOpIncompleteError("sql.ServerAzureADAdministratorsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - saaa, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerAzureADAdministratorsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.ServerAzureADAdministratorsDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if saaa.Response.Response, err = future.GetResult(sender); err == nil && saaa.Response.Response.StatusCode != http.StatusNoContent { + saaa, err = client.DeleteResponder(saaa.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.ServerAzureADAdministratorsDeleteFuture", "Result", saaa.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerAzureADAdministratorsDeleteFuture", "Result", resp, "Failure sending request") - return - } - saaa, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerAzureADAdministratorsDeleteFuture", "Result", resp, "Failure responding to request") } return } @@ -6429,12 +5969,11 @@ type ServerCommunicationLinkProperties struct { // long-running operation. type ServerCommunicationLinksCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServerCommunicationLinksCreateOrUpdateFuture) Result(client ServerCommunicationLinksClient) (scl ServerCommunicationLink, err error) { +func (future *ServerCommunicationLinksCreateOrUpdateFuture) Result(client ServerCommunicationLinksClient) (scl ServerCommunicationLink, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -6442,34 +5981,15 @@ func (future ServerCommunicationLinksCreateOrUpdateFuture) Result(client ServerC return } if !done { - return scl, azure.NewAsyncOpIncompleteError("sql.ServerCommunicationLinksCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - scl, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerCommunicationLinksCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.ServerCommunicationLinksCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if scl.Response.Response, err = future.GetResult(sender); err == nil && scl.Response.Response.StatusCode != http.StatusNoContent { + scl, err = client.CreateOrUpdateResponder(scl.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.ServerCommunicationLinksCreateOrUpdateFuture", "Result", scl.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerCommunicationLinksCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - scl, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerCommunicationLinksCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -6820,12 +6340,11 @@ type ServerKeyProperties struct { // operation. type ServerKeysCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServerKeysCreateOrUpdateFuture) Result(client ServerKeysClient) (sk ServerKey, err error) { +func (future *ServerKeysCreateOrUpdateFuture) Result(client ServerKeysClient) (sk ServerKey, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -6833,34 +6352,15 @@ func (future ServerKeysCreateOrUpdateFuture) Result(client ServerKeysClient) (sk return } if !done { - return sk, azure.NewAsyncOpIncompleteError("sql.ServerKeysCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sk, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerKeysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.ServerKeysCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sk.Response.Response, err = future.GetResult(sender); err == nil && sk.Response.Response.StatusCode != http.StatusNoContent { + sk, err = client.CreateOrUpdateResponder(sk.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.ServerKeysCreateOrUpdateFuture", "Result", sk.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerKeysCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - sk, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerKeysCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -6868,12 +6368,11 @@ func (future ServerKeysCreateOrUpdateFuture) Result(client ServerKeysClient) (sk // ServerKeysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServerKeysDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServerKeysDeleteFuture) Result(client ServerKeysClient) (ar autorest.Response, err error) { +func (future *ServerKeysDeleteFuture) Result(client ServerKeysClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -6881,35 +6380,10 @@ func (future ServerKeysDeleteFuture) Result(client ServerKeysClient) (ar autores return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.ServerKeysDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerKeysDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerKeysDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("sql.ServerKeysDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServerKeysDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -7033,12 +6507,11 @@ type ServerProperties struct { // operation. type ServersCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServersCreateOrUpdateFuture) Result(client ServersClient) (s Server, err error) { +func (future *ServersCreateOrUpdateFuture) Result(client ServersClient) (s Server, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -7046,34 +6519,15 @@ func (future ServersCreateOrUpdateFuture) Result(client ServersClient) (s Server return } if !done { - return s, azure.NewAsyncOpIncompleteError("sql.ServersCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.ServersCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.CreateOrUpdateResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.ServersCreateOrUpdateFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServersCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServersCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -7081,12 +6535,11 @@ func (future ServersCreateOrUpdateFuture) Result(client ServersClient) (s Server // ServersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServersDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServersDeleteFuture) Result(client ServersClient) (ar autorest.Response, err error) { +func (future *ServersDeleteFuture) Result(client ServersClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -7094,47 +6547,21 @@ func (future ServersDeleteFuture) Result(client ServersClient) (ar autorest.Resp return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.ServersDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServersDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServersDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("sql.ServersDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServersDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // ServersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ServersUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServersUpdateFuture) Result(client ServersClient) (s Server, err error) { +func (future *ServersUpdateFuture) Result(client ServersClient) (s Server, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -7142,34 +6569,15 @@ func (future ServersUpdateFuture) Result(client ServersClient) (s Server, err er return } if !done { - return s, azure.NewAsyncOpIncompleteError("sql.ServersUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServersUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.ServersUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.UpdateResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.ServersUpdateFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServersUpdateFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.ServersUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -7518,17 +6926,17 @@ type ServiceTierAdvisorProperties struct { Confidence *float64 `json:"confidence,omitempty"` } -// Sku an ARM Resource SKU. +// Sku the resource model definition representing SKU type Sku struct { - // Name - The name of the SKU, typically, a letter + Number code, e.g. P3. + // Name - The name of the SKU. Ex - P3. It is typically a letter+number code Name *string `json:"name,omitempty"` - // Tier - The tier of the particular SKU, e.g. Basic, Premium. + // Tier - This field is required to be implemented by the Resource Provider if the service has more than one tier, but is not required on a PUT. Tier *string `json:"tier,omitempty"` - // Size - Size of the particular SKU + // Size - The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code. Size *string `json:"size,omitempty"` // Family - If the service has different generations of hardware, for the same SKU, then that can be captured here. Family *string `json:"family,omitempty"` - // Capacity - Capacity of the particular SKU. + // Capacity - If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted. Capacity *int32 `json:"capacity,omitempty"` } @@ -8151,12 +7559,11 @@ type SyncAgentProperties struct { // operation. type SyncAgentsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SyncAgentsCreateOrUpdateFuture) Result(client SyncAgentsClient) (sa SyncAgent, err error) { +func (future *SyncAgentsCreateOrUpdateFuture) Result(client SyncAgentsClient) (sa SyncAgent, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -8164,34 +7571,15 @@ func (future SyncAgentsCreateOrUpdateFuture) Result(client SyncAgentsClient) (sa return } if !done { - return sa, azure.NewAsyncOpIncompleteError("sql.SyncAgentsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sa, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncAgentsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.SyncAgentsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sa.Response.Response, err = future.GetResult(sender); err == nil && sa.Response.Response.StatusCode != http.StatusNoContent { + sa, err = client.CreateOrUpdateResponder(sa.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.SyncAgentsCreateOrUpdateFuture", "Result", sa.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncAgentsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - sa, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncAgentsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -8199,12 +7587,11 @@ func (future SyncAgentsCreateOrUpdateFuture) Result(client SyncAgentsClient) (sa // SyncAgentsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncAgentsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SyncAgentsDeleteFuture) Result(client SyncAgentsClient) (ar autorest.Response, err error) { +func (future *SyncAgentsDeleteFuture) Result(client SyncAgentsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -8212,35 +7599,10 @@ func (future SyncAgentsDeleteFuture) Result(client SyncAgentsClient) (ar autores return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.SyncAgentsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncAgentsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncAgentsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("sql.SyncAgentsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncAgentsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -8847,12 +8209,11 @@ type SyncGroupSchemaTableColumn struct { // operation. type SyncGroupsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SyncGroupsCreateOrUpdateFuture) Result(client SyncGroupsClient) (sg SyncGroup, err error) { +func (future *SyncGroupsCreateOrUpdateFuture) Result(client SyncGroupsClient) (sg SyncGroup, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -8860,34 +8221,15 @@ func (future SyncGroupsCreateOrUpdateFuture) Result(client SyncGroupsClient) (sg return } if !done { - return sg, azure.NewAsyncOpIncompleteError("sql.SyncGroupsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sg, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.SyncGroupsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sg.Response.Response, err = future.GetResult(sender); err == nil && sg.Response.Response.StatusCode != http.StatusNoContent { + sg, err = client.CreateOrUpdateResponder(sg.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.SyncGroupsCreateOrUpdateFuture", "Result", sg.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - sg, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -8895,12 +8237,11 @@ func (future SyncGroupsCreateOrUpdateFuture) Result(client SyncGroupsClient) (sg // SyncGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncGroupsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SyncGroupsDeleteFuture) Result(client SyncGroupsClient) (ar autorest.Response, err error) { +func (future *SyncGroupsDeleteFuture) Result(client SyncGroupsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -8908,35 +8249,10 @@ func (future SyncGroupsDeleteFuture) Result(client SyncGroupsClient) (ar autores return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.SyncGroupsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncGroupsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("sql.SyncGroupsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncGroupsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -8944,12 +8260,11 @@ func (future SyncGroupsDeleteFuture) Result(client SyncGroupsClient) (ar autores // operation. type SyncGroupsRefreshHubSchemaFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SyncGroupsRefreshHubSchemaFuture) Result(client SyncGroupsClient) (ar autorest.Response, err error) { +func (future *SyncGroupsRefreshHubSchemaFuture) Result(client SyncGroupsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -8957,47 +8272,21 @@ func (future SyncGroupsRefreshHubSchemaFuture) Result(client SyncGroupsClient) ( return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.SyncGroupsRefreshHubSchemaFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.RefreshHubSchemaResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncGroupsRefreshHubSchemaFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncGroupsRefreshHubSchemaFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("sql.SyncGroupsRefreshHubSchemaFuture") return } - ar, err = client.RefreshHubSchemaResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncGroupsRefreshHubSchemaFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // SyncGroupsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncGroupsUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SyncGroupsUpdateFuture) Result(client SyncGroupsClient) (sg SyncGroup, err error) { +func (future *SyncGroupsUpdateFuture) Result(client SyncGroupsClient) (sg SyncGroup, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9005,34 +8294,15 @@ func (future SyncGroupsUpdateFuture) Result(client SyncGroupsClient) (sg SyncGro return } if !done { - return sg, azure.NewAsyncOpIncompleteError("sql.SyncGroupsUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sg, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncGroupsUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.SyncGroupsUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sg.Response.Response, err = future.GetResult(sender); err == nil && sg.Response.Response.StatusCode != http.StatusNoContent { + sg, err = client.UpdateResponder(sg.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.SyncGroupsUpdateFuture", "Result", sg.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncGroupsUpdateFuture", "Result", resp, "Failure sending request") - return - } - sg, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncGroupsUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -9247,12 +8517,11 @@ type SyncMemberProperties struct { // operation. type SyncMembersCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SyncMembersCreateOrUpdateFuture) Result(client SyncMembersClient) (sm SyncMember, err error) { +func (future *SyncMembersCreateOrUpdateFuture) Result(client SyncMembersClient) (sm SyncMember, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9260,34 +8529,15 @@ func (future SyncMembersCreateOrUpdateFuture) Result(client SyncMembersClient) ( return } if !done { - return sm, azure.NewAsyncOpIncompleteError("sql.SyncMembersCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sm, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncMembersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.SyncMembersCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sm.Response.Response, err = future.GetResult(sender); err == nil && sm.Response.Response.StatusCode != http.StatusNoContent { + sm, err = client.CreateOrUpdateResponder(sm.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.SyncMembersCreateOrUpdateFuture", "Result", sm.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncMembersCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - sm, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncMembersCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -9295,12 +8545,11 @@ func (future SyncMembersCreateOrUpdateFuture) Result(client SyncMembersClient) ( // SyncMembersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncMembersDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SyncMembersDeleteFuture) Result(client SyncMembersClient) (ar autorest.Response, err error) { +func (future *SyncMembersDeleteFuture) Result(client SyncMembersClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9308,35 +8557,10 @@ func (future SyncMembersDeleteFuture) Result(client SyncMembersClient) (ar autor return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.SyncMembersDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncMembersDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncMembersDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("sql.SyncMembersDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncMembersDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -9344,12 +8568,11 @@ func (future SyncMembersDeleteFuture) Result(client SyncMembersClient) (ar autor // operation. type SyncMembersRefreshMemberSchemaFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SyncMembersRefreshMemberSchemaFuture) Result(client SyncMembersClient) (ar autorest.Response, err error) { +func (future *SyncMembersRefreshMemberSchemaFuture) Result(client SyncMembersClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9357,47 +8580,21 @@ func (future SyncMembersRefreshMemberSchemaFuture) Result(client SyncMembersClie return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.SyncMembersRefreshMemberSchemaFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.RefreshMemberSchemaResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncMembersRefreshMemberSchemaFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.SyncMembersRefreshMemberSchemaFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncMembersRefreshMemberSchemaFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.RefreshMemberSchemaResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncMembersRefreshMemberSchemaFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // SyncMembersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type SyncMembersUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future SyncMembersUpdateFuture) Result(client SyncMembersClient) (sm SyncMember, err error) { +func (future *SyncMembersUpdateFuture) Result(client SyncMembersClient) (sm SyncMember, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9405,44 +8602,25 @@ func (future SyncMembersUpdateFuture) Result(client SyncMembersClient) (sm SyncM return } if !done { - return sm, azure.NewAsyncOpIncompleteError("sql.SyncMembersUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sm, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncMembersUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.SyncMembersUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sm.Response.Response, err = future.GetResult(sender); err == nil && sm.Response.Response.StatusCode != http.StatusNoContent { + sm, err = client.UpdateResponder(sm.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.SyncMembersUpdateFuture", "Result", sm.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncMembersUpdateFuture", "Result", resp, "Failure sending request") - return - } - sm, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.SyncMembersUpdateFuture", "Result", resp, "Failure responding to request") } return } // TrackedResource ARM tracked top level resource. type TrackedResource struct { - // Tags - Resource tags. - Tags map[string]*string `json:"tags"` // Location - Resource location. Location *string `json:"location,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` // ID - Resource ID. ID *string `json:"id,omitempty"` // Name - Resource name. @@ -9454,12 +8632,12 @@ type TrackedResource struct { // MarshalJSON is the custom marshaler for TrackedResource. func (tr TrackedResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) - if tr.Tags != nil { - objectMap["tags"] = tr.Tags - } if tr.Location != nil { objectMap["location"] = tr.Location } + if tr.Tags != nil { + objectMap["tags"] = tr.Tags + } if tr.ID != nil { objectMap["id"] = tr.ID } @@ -9884,12 +9062,11 @@ type VirtualNetworkRuleProperties struct { // long-running operation. type VirtualNetworkRulesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkRulesCreateOrUpdateFuture) Result(client VirtualNetworkRulesClient) (vnr VirtualNetworkRule, err error) { +func (future *VirtualNetworkRulesCreateOrUpdateFuture) Result(client VirtualNetworkRulesClient) (vnr VirtualNetworkRule, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9897,34 +9074,15 @@ func (future VirtualNetworkRulesCreateOrUpdateFuture) Result(client VirtualNetwo return } if !done { - return vnr, azure.NewAsyncOpIncompleteError("sql.VirtualNetworkRulesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - vnr, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.VirtualNetworkRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.VirtualNetworkRulesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if vnr.Response.Response, err = future.GetResult(sender); err == nil && vnr.Response.Response.StatusCode != http.StatusNoContent { + vnr, err = client.CreateOrUpdateResponder(vnr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "sql.VirtualNetworkRulesCreateOrUpdateFuture", "Result", vnr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.VirtualNetworkRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - vnr, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.VirtualNetworkRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -9933,12 +9091,11 @@ func (future VirtualNetworkRulesCreateOrUpdateFuture) Result(client VirtualNetwo // operation. type VirtualNetworkRulesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future VirtualNetworkRulesDeleteFuture) Result(client VirtualNetworkRulesClient) (ar autorest.Response, err error) { +func (future *VirtualNetworkRulesDeleteFuture) Result(client VirtualNetworkRulesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9946,34 +9103,9 @@ func (future VirtualNetworkRulesDeleteFuture) Result(client VirtualNetworkRulesC return } if !done { - return ar, azure.NewAsyncOpIncompleteError("sql.VirtualNetworkRulesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.VirtualNetworkRulesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("sql.VirtualNetworkRulesDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.VirtualNetworkRulesDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "sql.VirtualNetworkRulesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go index 38dd9bdadf0a..d4560b265371 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/replicationlinks.go @@ -161,15 +161,17 @@ func (client ReplicationLinksClient) FailoverPreparer(ctx context.Context, resou // FailoverSender sends the Failover request. The method will close the // http.Response Body if it receives an error. func (client ReplicationLinksClient) FailoverSender(req *http.Request) (future ReplicationLinksFailoverFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -235,15 +237,17 @@ func (client ReplicationLinksClient) FailoverAllowDataLossPreparer(ctx context.C // FailoverAllowDataLossSender sends the FailoverAllowDataLoss request. The method will close the // http.Response Body if it receives an error. func (client ReplicationLinksClient) FailoverAllowDataLossSender(req *http.Request) (future ReplicationLinksFailoverAllowDataLossFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go index 9d0595fc77f5..21b4055b1d4a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverazureadadministrators.go @@ -103,15 +103,17 @@ func (client ServerAzureADAdministratorsClient) CreateOrUpdatePreparer(ctx conte // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServerAzureADAdministratorsClient) CreateOrUpdateSender(req *http.Request) (future ServerAzureADAdministratorsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -174,15 +176,17 @@ func (client ServerAzureADAdministratorsClient) DeletePreparer(ctx context.Conte // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServerAzureADAdministratorsClient) DeleteSender(req *http.Request) (future ServerAzureADAdministratorsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go index 9c619b85b1c4..d59823088d01 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servercommunicationlinks.go @@ -99,15 +99,17 @@ func (client ServerCommunicationLinksClient) CreateOrUpdatePreparer(ctx context. // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServerCommunicationLinksClient) CreateOrUpdateSender(req *http.Request) (future ServerCommunicationLinksCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverkeys.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverkeys.go index 81086a04876a..a70e07c8509e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverkeys.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/serverkeys.go @@ -94,15 +94,17 @@ func (client ServerKeysClient) CreateOrUpdatePreparer(ctx context.Context, resou // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServerKeysClient) CreateOrUpdateSender(req *http.Request) (future ServerKeysCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -166,15 +168,17 @@ func (client ServerKeysClient) DeletePreparer(ctx context.Context, resourceGroup // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServerKeysClient) DeleteSender(req *http.Request) (future ServerKeysDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servers.go index b3a35b00d80c..78d1a37f603e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/servers.go @@ -163,15 +163,17 @@ func (client ServersClient) CreateOrUpdatePreparer(ctx context.Context, resource // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) CreateOrUpdateSender(req *http.Request) (future ServersCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -233,15 +235,17 @@ func (client ServersClient) DeletePreparer(ctx context.Context, resourceGroupNam // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) DeleteSender(req *http.Request) (future ServersDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -557,15 +561,17 @@ func (client ServersClient) UpdatePreparer(ctx context.Context, resourceGroupNam // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client ServersClient) UpdateSender(req *http.Request) (future ServersUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncagents.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncagents.go index 6b587e7383e9..83be0b22baa7 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncagents.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncagents.go @@ -91,15 +91,17 @@ func (client SyncAgentsClient) CreateOrUpdatePreparer(ctx context.Context, resou // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) CreateOrUpdateSender(req *http.Request) (future SyncAgentsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -163,15 +165,17 @@ func (client SyncAgentsClient) DeletePreparer(ctx context.Context, resourceGroup // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SyncAgentsClient) DeleteSender(req *http.Request) (future SyncAgentsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncgroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncgroups.go index 5b405d5c9977..e1d7d22092a7 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncgroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncgroups.go @@ -164,15 +164,17 @@ func (client SyncGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resou // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) CreateOrUpdateSender(req *http.Request) (future SyncGroupsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -238,15 +240,17 @@ func (client SyncGroupsClient) DeletePreparer(ctx context.Context, resourceGroup // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) DeleteSender(req *http.Request) (future SyncGroupsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -784,15 +788,17 @@ func (client SyncGroupsClient) RefreshHubSchemaPreparer(ctx context.Context, res // RefreshHubSchemaSender sends the RefreshHubSchema request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) RefreshHubSchemaSender(req *http.Request) (future SyncGroupsRefreshHubSchemaFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -931,15 +937,17 @@ func (client SyncGroupsClient) UpdatePreparer(ctx context.Context, resourceGroup // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client SyncGroupsClient) UpdateSender(req *http.Request) (future SyncGroupsUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncmembers.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncmembers.go index 01e211f11b08..28c36fba46d2 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncmembers.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/syncmembers.go @@ -95,15 +95,17 @@ func (client SyncMembersClient) CreateOrUpdatePreparer(ctx context.Context, reso // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) CreateOrUpdateSender(req *http.Request) (future SyncMembersCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -171,15 +173,17 @@ func (client SyncMembersClient) DeletePreparer(ctx context.Context, resourceGrou // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) DeleteSender(req *http.Request) (future SyncMembersDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -522,15 +526,17 @@ func (client SyncMembersClient) RefreshMemberSchemaPreparer(ctx context.Context, // RefreshMemberSchemaSender sends the RefreshMemberSchema request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) RefreshMemberSchemaSender(req *http.Request) (future SyncMembersRefreshMemberSchemaFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -600,15 +606,17 @@ func (client SyncMembersClient) UpdatePreparer(ctx context.Context, resourceGrou // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client SyncMembersClient) UpdateSender(req *http.Request) (future SyncMembersUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go index ab735d07f476..957b02b25a48 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql/virtualnetworkrules.go @@ -99,15 +99,17 @@ func (client VirtualNetworkRulesClient) CreateOrUpdatePreparer(ctx context.Conte // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkRulesClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkRulesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -171,15 +173,17 @@ func (client VirtualNetworkRulesClient) DeletePreparer(ctx context.Context, reso // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client VirtualNetworkRulesClient) DeleteSender(req *http.Request) (future VirtualNetworkRulesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/linkedserver.go b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/linkedserver.go index 393872ad30ad..efef2fad0daf 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/linkedserver.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/linkedserver.go @@ -98,15 +98,17 @@ func (client LinkedServerClient) CreatePreparer(ctx context.Context, resourceGro // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client LinkedServerClient) CreateSender(req *http.Request) (future LinkedServerCreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/models.go index 4e10cd26d9fa..0dbe32832c46 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/models.go @@ -241,12 +241,11 @@ func (cp CommonProperties) MarshalJSON() ([]byte, error) { // CreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type CreateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future CreateFuture) Result(client Client) (rt ResourceType, err error) { +func (future *CreateFuture) Result(client Client) (rt ResourceType, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -254,34 +253,15 @@ func (future CreateFuture) Result(client Client) (rt ResourceType, err error) { return } if !done { - return rt, azure.NewAsyncOpIncompleteError("redis.CreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - rt, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.CreateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("redis.CreateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if rt.Response.Response, err = future.GetResult(sender); err == nil && rt.Response.Response.StatusCode != http.StatusNoContent { + rt, err = client.CreateResponder(rt.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "redis.CreateFuture", "Result", rt.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.CreateFuture", "Result", resp, "Failure sending request") - return - } - rt, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.CreateFuture", "Result", resp, "Failure responding to request") } return } @@ -420,12 +400,11 @@ func (cp CreateProperties) MarshalJSON() ([]byte, error) { // DeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DeleteFuture) Result(client Client) (ar autorest.Response, err error) { +func (future *DeleteFuture) Result(client Client) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -433,47 +412,21 @@ func (future DeleteFuture) Result(client Client) (ar autorest.Response, err erro return } if !done { - return ar, azure.NewAsyncOpIncompleteError("redis.DeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.DeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("redis.DeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.DeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.DeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // ExportDataFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ExportDataFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ExportDataFuture) Result(client Client) (ar autorest.Response, err error) { +func (future *ExportDataFuture) Result(client Client) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -481,35 +434,10 @@ func (future ExportDataFuture) Result(client Client) (ar autorest.Response, err return } if !done { - return ar, azure.NewAsyncOpIncompleteError("redis.ExportDataFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.ExportDataResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.ExportDataFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("redis.ExportDataFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.ExportDataFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.ExportDataResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.ExportDataFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -765,12 +693,11 @@ type ForceRebootResponse struct { // ImportDataFuture an abstraction for monitoring and retrieving the results of a long-running operation. type ImportDataFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ImportDataFuture) Result(client Client) (ar autorest.Response, err error) { +func (future *ImportDataFuture) Result(client Client) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -778,35 +705,10 @@ func (future ImportDataFuture) Result(client Client) (ar autorest.Response, err return } if !done { - return ar, azure.NewAsyncOpIncompleteError("redis.ImportDataFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.ImportDataResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.ImportDataFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.ImportDataFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("redis.ImportDataFuture") return } - ar, err = client.ImportDataResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.ImportDataFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -827,12 +729,11 @@ type LinkedServer struct { // LinkedServerCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type LinkedServerCreateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future LinkedServerCreateFuture) Result(client LinkedServerClient) (lswp LinkedServerWithProperties, err error) { +func (future *LinkedServerCreateFuture) Result(client LinkedServerClient) (lswp LinkedServerWithProperties, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -840,34 +741,15 @@ func (future LinkedServerCreateFuture) Result(client LinkedServerClient) (lswp L return } if !done { - return lswp, azure.NewAsyncOpIncompleteError("redis.LinkedServerCreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - lswp, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.LinkedServerCreateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("redis.LinkedServerCreateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if lswp.Response.Response, err = future.GetResult(sender); err == nil && lswp.Response.Response.StatusCode != http.StatusNoContent { + lswp, err = client.CreateResponder(lswp.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "redis.LinkedServerCreateFuture", "Result", lswp.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.LinkedServerCreateFuture", "Result", resp, "Failure sending request") - return - } - lswp, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "redis.LinkedServerCreateFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/redis.go b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/redis.go index f92814c2b178..6f7d7a63e4d8 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/redis.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis/redis.go @@ -174,15 +174,17 @@ func (client Client) CreatePreparer(ctx context.Context, resourceGroupName strin // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client Client) CreateSender(req *http.Request) (future CreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -243,15 +245,17 @@ func (client Client) DeletePreparer(ctx context.Context, resourceGroupName strin // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client Client) DeleteSender(req *http.Request) (future DeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -321,15 +325,17 @@ func (client Client) ExportDataPreparer(ctx context.Context, resourceGroupName s // ExportDataSender sends the ExportData request. The method will close the // http.Response Body if it receives an error. func (client Client) ExportDataSender(req *http.Request) (future ExportDataFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -536,15 +542,17 @@ func (client Client) ImportDataPreparer(ctx context.Context, resourceGroupName s // ImportDataSender sends the ImportData request. The method will close the // http.Response Body if it receives an error. func (client Client) ImportDataSender(req *http.Request) (future ImportDataFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/models.go index fc6eb79269b4..5a775156f068 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/models.go @@ -805,12 +805,11 @@ type NamespaceProperties struct { // operation. type NamespacesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (n Namespace, err error) { +func (future *NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (n Namespace, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -818,34 +817,15 @@ func (future NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (n return } if !done { - return n, azure.NewAsyncOpIncompleteError("relay.NamespacesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - n, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "relay.NamespacesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("relay.NamespacesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if n.Response.Response, err = future.GetResult(sender); err == nil && n.Response.Response.StatusCode != http.StatusNoContent { + n, err = client.CreateOrUpdateResponder(n.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "relay.NamespacesCreateOrUpdateFuture", "Result", n.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "relay.NamespacesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - n, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "relay.NamespacesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -853,12 +833,11 @@ func (future NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (n // NamespacesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type NamespacesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future NamespacesDeleteFuture) Result(client NamespacesClient) (ar autorest.Response, err error) { +func (future *NamespacesDeleteFuture) Result(client NamespacesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -866,35 +845,10 @@ func (future NamespacesDeleteFuture) Result(client NamespacesClient) (ar autores return } if !done { - return ar, azure.NewAsyncOpIncompleteError("relay.NamespacesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "relay.NamespacesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("relay.NamespacesDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "relay.NamespacesDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "relay.NamespacesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/namespaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/namespaces.go index f1dd78a83e27..25b1b98db90f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/namespaces.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay/namespaces.go @@ -172,15 +172,17 @@ func (client NamespacesClient) CreateOrUpdatePreparer(ctx context.Context, resou // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client NamespacesClient) CreateOrUpdateSender(req *http.Request) (future NamespacesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -340,15 +342,17 @@ func (client NamespacesClient) DeletePreparer(ctx context.Context, resourceGroup // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client NamespacesClient) DeleteSender(req *http.Request) (future NamespacesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deployments.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deployments.go index df1779aff929..d27a542c0f74 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deployments.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deployments.go @@ -266,15 +266,17 @@ func (client DeploymentsClient) CreateOrUpdatePreparer(ctx context.Context, reso // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DeploymentsClient) CreateOrUpdateSender(req *http.Request) (future DeploymentsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -354,15 +356,17 @@ func (client DeploymentsClient) DeletePreparer(ctx context.Context, resourceGrou // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client DeploymentsClient) DeleteSender(req *http.Request) (future DeploymentsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/groups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/groups.go index ad361bc9d3c2..012de7818c65 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/groups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/groups.go @@ -241,15 +241,17 @@ func (client GroupsClient) DeletePreparer(ctx context.Context, resourceGroupName // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client GroupsClient) DeleteSender(req *http.Request) (future GroupsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/models.go index 9e3263cf8ddc..691edfa3597e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/models.go @@ -83,12 +83,11 @@ type BasicDependency struct { // CreateOrUpdateByIDFuture an abstraction for monitoring and retrieving the results of a long-running operation. type CreateOrUpdateByIDFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future CreateOrUpdateByIDFuture) Result(client Client) (gr GenericResource, err error) { +func (future *CreateOrUpdateByIDFuture) Result(client Client) (gr GenericResource, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -96,34 +95,15 @@ func (future CreateOrUpdateByIDFuture) Result(client Client) (gr GenericResource return } if !done { - return gr, azure.NewAsyncOpIncompleteError("resources.CreateOrUpdateByIDFuture") - } - if future.PollingMethod() == azure.PollingLocation { - gr, err = client.CreateOrUpdateByIDResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.CreateOrUpdateByIDFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("resources.CreateOrUpdateByIDFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if gr.Response.Response, err = future.GetResult(sender); err == nil && gr.Response.Response.StatusCode != http.StatusNoContent { + gr, err = client.CreateOrUpdateByIDResponder(gr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "resources.CreateOrUpdateByIDFuture", "Result", gr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.CreateOrUpdateByIDFuture", "Result", resp, "Failure sending request") - return - } - gr, err = client.CreateOrUpdateByIDResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.CreateOrUpdateByIDFuture", "Result", resp, "Failure responding to request") } return } @@ -131,12 +111,11 @@ func (future CreateOrUpdateByIDFuture) Result(client Client) (gr GenericResource // CreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type CreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future CreateOrUpdateFuture) Result(client Client) (gr GenericResource, err error) { +func (future *CreateOrUpdateFuture) Result(client Client) (gr GenericResource, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -144,34 +123,15 @@ func (future CreateOrUpdateFuture) Result(client Client) (gr GenericResource, er return } if !done { - return gr, azure.NewAsyncOpIncompleteError("resources.CreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - gr, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.CreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("resources.CreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if gr.Response.Response, err = future.GetResult(sender); err == nil && gr.Response.Response.StatusCode != http.StatusNoContent { + gr, err = client.CreateOrUpdateResponder(gr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "resources.CreateOrUpdateFuture", "Result", gr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.CreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - gr, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.CreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -185,12 +145,11 @@ type DebugSetting struct { // DeleteByIDFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DeleteByIDFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DeleteByIDFuture) Result(client Client) (ar autorest.Response, err error) { +func (future *DeleteByIDFuture) Result(client Client) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -198,47 +157,21 @@ func (future DeleteByIDFuture) Result(client Client) (ar autorest.Response, err return } if !done { - return ar, azure.NewAsyncOpIncompleteError("resources.DeleteByIDFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteByIDResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.DeleteByIDFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("resources.DeleteByIDFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.DeleteByIDFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteByIDResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.DeleteByIDFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // DeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DeleteFuture) Result(client Client) (ar autorest.Response, err error) { +func (future *DeleteFuture) Result(client Client) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -246,35 +179,10 @@ func (future DeleteFuture) Result(client Client) (ar autorest.Response, err erro return } if !done { - return ar, azure.NewAsyncOpIncompleteError("resources.DeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.DeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("resources.DeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.DeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.DeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -603,12 +511,11 @@ type DeploymentPropertiesExtended struct { // operation. type DeploymentsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DeploymentsCreateOrUpdateFuture) Result(client DeploymentsClient) (de DeploymentExtended, err error) { +func (future *DeploymentsCreateOrUpdateFuture) Result(client DeploymentsClient) (de DeploymentExtended, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -616,34 +523,15 @@ func (future DeploymentsCreateOrUpdateFuture) Result(client DeploymentsClient) ( return } if !done { - return de, azure.NewAsyncOpIncompleteError("resources.DeploymentsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - de, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.DeploymentsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("resources.DeploymentsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if de.Response.Response, err = future.GetResult(sender); err == nil && de.Response.Response.StatusCode != http.StatusNoContent { + de, err = client.CreateOrUpdateResponder(de.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "resources.DeploymentsCreateOrUpdateFuture", "Result", de.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.DeploymentsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - de, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.DeploymentsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -651,12 +539,11 @@ func (future DeploymentsCreateOrUpdateFuture) Result(client DeploymentsClient) ( // DeploymentsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DeploymentsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DeploymentsDeleteFuture) Result(client DeploymentsClient) (ar autorest.Response, err error) { +func (future *DeploymentsDeleteFuture) Result(client DeploymentsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -664,35 +551,10 @@ func (future DeploymentsDeleteFuture) Result(client DeploymentsClient) (ar autor return } if !done { - return ar, azure.NewAsyncOpIncompleteError("resources.DeploymentsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.DeploymentsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.DeploymentsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("resources.DeploymentsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.DeploymentsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -984,12 +846,11 @@ type GroupProperties struct { // GroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type GroupsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future GroupsDeleteFuture) Result(client GroupsClient) (ar autorest.Response, err error) { +func (future *GroupsDeleteFuture) Result(client GroupsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -997,35 +858,10 @@ func (future GroupsDeleteFuture) Result(client GroupsClient) (ar autorest.Respon return } if !done { - return ar, azure.NewAsyncOpIncompleteError("resources.GroupsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.GroupsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("resources.GroupsDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.GroupsDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.GroupsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -1170,12 +1006,11 @@ type MoveInfo struct { // MoveResourcesFuture an abstraction for monitoring and retrieving the results of a long-running operation. type MoveResourcesFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future MoveResourcesFuture) Result(client Client) (ar autorest.Response, err error) { +func (future *MoveResourcesFuture) Result(client Client) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1183,35 +1018,10 @@ func (future MoveResourcesFuture) Result(client Client) (ar autorest.Response, e return } if !done { - return ar, azure.NewAsyncOpIncompleteError("resources.MoveResourcesFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.MoveResourcesResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.MoveResourcesFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("resources.MoveResourcesFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.MoveResourcesFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.MoveResourcesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.MoveResourcesFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -1613,12 +1423,11 @@ type TemplateLink struct { // UpdateByIDFuture an abstraction for monitoring and retrieving the results of a long-running operation. type UpdateByIDFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future UpdateByIDFuture) Result(client Client) (gr GenericResource, err error) { +func (future *UpdateByIDFuture) Result(client Client) (gr GenericResource, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1626,34 +1435,15 @@ func (future UpdateByIDFuture) Result(client Client) (gr GenericResource, err er return } if !done { - return gr, azure.NewAsyncOpIncompleteError("resources.UpdateByIDFuture") - } - if future.PollingMethod() == azure.PollingLocation { - gr, err = client.UpdateByIDResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.UpdateByIDFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("resources.UpdateByIDFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if gr.Response.Response, err = future.GetResult(sender); err == nil && gr.Response.Response.StatusCode != http.StatusNoContent { + gr, err = client.UpdateByIDResponder(gr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "resources.UpdateByIDFuture", "Result", gr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.UpdateByIDFuture", "Result", resp, "Failure sending request") - return - } - gr, err = client.UpdateByIDResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.UpdateByIDFuture", "Result", resp, "Failure responding to request") } return } @@ -1661,12 +1451,11 @@ func (future UpdateByIDFuture) Result(client Client) (gr GenericResource, err er // UpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type UpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future UpdateFuture) Result(client Client) (gr GenericResource, err error) { +func (future *UpdateFuture) Result(client Client) (gr GenericResource, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1674,34 +1463,15 @@ func (future UpdateFuture) Result(client Client) (gr GenericResource, err error) return } if !done { - return gr, azure.NewAsyncOpIncompleteError("resources.UpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - gr, err = client.UpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.UpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("resources.UpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if gr.Response.Response, err = future.GetResult(sender); err == nil && gr.Response.Response.StatusCode != http.StatusNoContent { + gr, err = client.UpdateResponder(gr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "resources.UpdateFuture", "Result", gr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.UpdateFuture", "Result", resp, "Failure sending request") - return - } - gr, err = client.UpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.UpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -1710,12 +1480,11 @@ func (future UpdateFuture) Result(client Client) (gr GenericResource, err error) // operation. type ValidateMoveResourcesFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ValidateMoveResourcesFuture) Result(client Client) (ar autorest.Response, err error) { +func (future *ValidateMoveResourcesFuture) Result(client Client) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1723,34 +1492,9 @@ func (future ValidateMoveResourcesFuture) Result(client Client) (ar autorest.Res return } if !done { - return ar, azure.NewAsyncOpIncompleteError("resources.ValidateMoveResourcesFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.ValidateMoveResourcesResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.ValidateMoveResourcesFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("resources.ValidateMoveResourcesFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.ValidateMoveResourcesFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.ValidateMoveResourcesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "resources.ValidateMoveResourcesFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/resources.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/resources.go index 5ea79e2684d3..bd8987cf1f64 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/resources.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/resources.go @@ -250,15 +250,17 @@ func (client Client) CreateOrUpdatePreparer(ctx context.Context, resourceGroupNa // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client Client) CreateOrUpdateSender(req *http.Request) (future CreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -328,15 +330,17 @@ func (client Client) CreateOrUpdateByIDPreparer(ctx context.Context, resourceID // CreateOrUpdateByIDSender sends the CreateOrUpdateByID request. The method will close the // http.Response Body if it receives an error. func (client Client) CreateOrUpdateByIDSender(req *http.Request) (future CreateOrUpdateByIDFuture, err error) { - sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -412,15 +416,17 @@ func (client Client) DeletePreparer(ctx context.Context, resourceGroupName strin // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client Client) DeleteSender(req *http.Request) (future DeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -479,15 +485,17 @@ func (client Client) DeleteByIDPreparer(ctx context.Context, resourceID string) // DeleteByIDSender sends the DeleteByID request. The method will close the // http.Response Body if it receives an error. func (client Client) DeleteByIDSender(req *http.Request) (future DeleteByIDFuture, err error) { - sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -922,15 +930,17 @@ func (client Client) MoveResourcesPreparer(ctx context.Context, sourceResourceGr // MoveResourcesSender sends the MoveResources request. The method will close the // http.Response Body if it receives an error. func (client Client) MoveResourcesSender(req *http.Request) (future MoveResourcesFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1007,15 +1017,17 @@ func (client Client) UpdatePreparer(ctx context.Context, resourceGroupName strin // UpdateSender sends the Update request. The method will close the // http.Response Body if it receives an error. func (client Client) UpdateSender(req *http.Request) (future UpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1078,15 +1090,17 @@ func (client Client) UpdateByIDPreparer(ctx context.Context, resourceID string, // UpdateByIDSender sends the UpdateByID request. The method will close the // http.Response Body if it receives an error. func (client Client) UpdateByIDSender(req *http.Request) (future UpdateByIDFuture, err error) { - sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1160,15 +1174,17 @@ func (client Client) ValidateMoveResourcesPreparer(ctx context.Context, sourceRe // ValidateMoveResourcesSender sends the ValidateMoveResources request. The method will close the // http.Response Body if it receives an error. func (client Client) ValidateMoveResourcesSender(req *http.Request) (future ValidateMoveResourcesFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusConflict)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusConflict)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/jobcollections.go b/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/jobcollections.go index 70ea9c497f39..69420001a33d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/jobcollections.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/jobcollections.go @@ -153,15 +153,17 @@ func (client JobCollectionsClient) DeletePreparer(ctx context.Context, resourceG // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client JobCollectionsClient) DeleteSender(req *http.Request) (future JobCollectionsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -221,15 +223,17 @@ func (client JobCollectionsClient) DisablePreparer(ctx context.Context, resource // DisableSender sends the Disable request. The method will close the // http.Response Body if it receives an error. func (client JobCollectionsClient) DisableSender(req *http.Request) (future JobCollectionsDisableFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -289,15 +293,17 @@ func (client JobCollectionsClient) EnablePreparer(ctx context.Context, resourceG // EnableSender sends the Enable request. The method will close the // http.Response Body if it receives an error. func (client JobCollectionsClient) EnableSender(req *http.Request) (future JobCollectionsEnableFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/models.go index 05df9ac07583..cdbaa23e2b60 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler/models.go @@ -760,12 +760,11 @@ type JobCollectionQuota struct { // JobCollectionsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type JobCollectionsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future JobCollectionsDeleteFuture) Result(client JobCollectionsClient) (ar autorest.Response, err error) { +func (future *JobCollectionsDeleteFuture) Result(client JobCollectionsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -773,35 +772,10 @@ func (future JobCollectionsDeleteFuture) Result(client JobCollectionsClient) (ar return } if !done { - return ar, azure.NewAsyncOpIncompleteError("scheduler.JobCollectionsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "scheduler.JobCollectionsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "scheduler.JobCollectionsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("scheduler.JobCollectionsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "scheduler.JobCollectionsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -809,12 +783,11 @@ func (future JobCollectionsDeleteFuture) Result(client JobCollectionsClient) (ar // operation. type JobCollectionsDisableFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future JobCollectionsDisableFuture) Result(client JobCollectionsClient) (ar autorest.Response, err error) { +func (future *JobCollectionsDisableFuture) Result(client JobCollectionsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -822,47 +795,21 @@ func (future JobCollectionsDisableFuture) Result(client JobCollectionsClient) (a return } if !done { - return ar, azure.NewAsyncOpIncompleteError("scheduler.JobCollectionsDisableFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DisableResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "scheduler.JobCollectionsDisableFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("scheduler.JobCollectionsDisableFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "scheduler.JobCollectionsDisableFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DisableResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "scheduler.JobCollectionsDisableFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // JobCollectionsEnableFuture an abstraction for monitoring and retrieving the results of a long-running operation. type JobCollectionsEnableFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future JobCollectionsEnableFuture) Result(client JobCollectionsClient) (ar autorest.Response, err error) { +func (future *JobCollectionsEnableFuture) Result(client JobCollectionsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -870,35 +817,10 @@ func (future JobCollectionsEnableFuture) Result(client JobCollectionsClient) (ar return } if !done { - return ar, azure.NewAsyncOpIncompleteError("scheduler.JobCollectionsEnableFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.EnableResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "scheduler.JobCollectionsEnableFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("scheduler.JobCollectionsEnableFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "scheduler.JobCollectionsEnableFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.EnableResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "scheduler.JobCollectionsEnableFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/models.go index 15f10f1068bb..69d2976bcb1a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/models.go @@ -408,12 +408,11 @@ type ServiceProperties struct { // operation. type ServicesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future ServicesCreateOrUpdateFuture) Result(client ServicesClient) (s Service, err error) { +func (future *ServicesCreateOrUpdateFuture) Result(client ServicesClient) (s Service, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -421,34 +420,15 @@ func (future ServicesCreateOrUpdateFuture) Result(client ServicesClient) (s Serv return } if !done { - return s, azure.NewAsyncOpIncompleteError("search.ServicesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "search.ServicesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("search.ServicesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.CreateOrUpdateResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "search.ServicesCreateOrUpdateFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "search.ServicesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "search.ServicesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/services.go b/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/services.go index b7f1d5bd363e..56ddc928d300 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/services.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search/services.go @@ -195,15 +195,17 @@ func (client ServicesClient) CreateOrUpdatePreparer(ctx context.Context, resourc // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client ServicesClient) CreateOrUpdateSender(req *http.Request) (future ServicesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/migrationconfigs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/migrationconfigs.go index cb865975dfda..0849340f3520 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/migrationconfigs.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/migrationconfigs.go @@ -183,15 +183,17 @@ func (client MigrationConfigsClient) CreateAndStartMigrationPreparer(ctx context // CreateAndStartMigrationSender sends the CreateAndStartMigration request. The method will close the // http.Response Body if it receives an error. func (client MigrationConfigsClient) CreateAndStartMigrationSender(req *http.Request) (future MigrationConfigsCreateAndStartMigrationFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/models.go index 11fb5f557b47..b65c94052a4d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/models.go @@ -1018,12 +1018,11 @@ type MigrationConfigPropertiesProperties struct { // long-running operation. type MigrationConfigsCreateAndStartMigrationFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future MigrationConfigsCreateAndStartMigrationFuture) Result(client MigrationConfigsClient) (mcp MigrationConfigProperties, err error) { +func (future *MigrationConfigsCreateAndStartMigrationFuture) Result(client MigrationConfigsClient) (mcp MigrationConfigProperties, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1031,34 +1030,15 @@ func (future MigrationConfigsCreateAndStartMigrationFuture) Result(client Migrat return } if !done { - return mcp, azure.NewAsyncOpIncompleteError("servicebus.MigrationConfigsCreateAndStartMigrationFuture") - } - if future.PollingMethod() == azure.PollingLocation { - mcp, err = client.CreateAndStartMigrationResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsCreateAndStartMigrationFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("servicebus.MigrationConfigsCreateAndStartMigrationFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if mcp.Response.Response, err = future.GetResult(sender); err == nil && mcp.Response.Response.StatusCode != http.StatusNoContent { + mcp, err = client.CreateAndStartMigrationResponder(mcp.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsCreateAndStartMigrationFuture", "Result", mcp.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsCreateAndStartMigrationFuture", "Result", resp, "Failure sending request") - return - } - mcp, err = client.CreateAndStartMigrationResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "servicebus.MigrationConfigsCreateAndStartMigrationFuture", "Result", resp, "Failure responding to request") } return } @@ -1067,12 +1047,11 @@ func (future MigrationConfigsCreateAndStartMigrationFuture) Result(client Migrat // operation. type NamespacesCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (sn SBNamespace, err error) { +func (future *NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (sn SBNamespace, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1080,34 +1059,15 @@ func (future NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (sn return } if !done { - return sn, azure.NewAsyncOpIncompleteError("servicebus.NamespacesCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sn, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "servicebus.NamespacesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("servicebus.NamespacesCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sn.Response.Response, err = future.GetResult(sender); err == nil && sn.Response.Response.StatusCode != http.StatusNoContent { + sn, err = client.CreateOrUpdateResponder(sn.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "servicebus.NamespacesCreateOrUpdateFuture", "Result", sn.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "servicebus.NamespacesCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - sn, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "servicebus.NamespacesCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -1115,12 +1075,11 @@ func (future NamespacesCreateOrUpdateFuture) Result(client NamespacesClient) (sn // NamespacesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type NamespacesDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future NamespacesDeleteFuture) Result(client NamespacesClient) (ar autorest.Response, err error) { +func (future *NamespacesDeleteFuture) Result(client NamespacesClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1128,35 +1087,10 @@ func (future NamespacesDeleteFuture) Result(client NamespacesClient) (ar autores return } if !done { - return ar, azure.NewAsyncOpIncompleteError("servicebus.NamespacesDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "servicebus.NamespacesDeleteFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("servicebus.NamespacesDeleteFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "servicebus.NamespacesDeleteFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "servicebus.NamespacesDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/namespaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/namespaces.go index 6ff40a7ffb13..1bbefa9b8a4e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/namespaces.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus/namespaces.go @@ -167,15 +167,17 @@ func (client NamespacesClient) CreateOrUpdatePreparer(ctx context.Context, resou // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client NamespacesClient) CreateOrUpdateSender(req *http.Request) (future NamespacesCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -334,15 +336,17 @@ func (client NamespacesClient) DeletePreparer(ctx context.Context, resourceGroup // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client NamespacesClient) DeleteSender(req *http.Request) (future NamespacesDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage/accounts.go b/vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage/accounts.go index c1ffd6b6e035..56dc300ec18f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage/accounts.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage/accounts.go @@ -186,15 +186,17 @@ func (client AccountsClient) CreatePreparer(ctx context.Context, resourceGroupNa // CreateSender sends the Create request. The method will close the // http.Response Body if it receives an error. func (client AccountsClient) CreateSender(req *http.Request) (future AccountsCreateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage/models.go index 9e31bb4e522d..c215a75c8e59 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage/models.go @@ -755,12 +755,11 @@ type AccountSasParameters struct { // AccountsCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type AccountsCreateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AccountsCreateFuture) Result(client AccountsClient) (a Account, err error) { +func (future *AccountsCreateFuture) Result(client AccountsClient) (a Account, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -768,34 +767,15 @@ func (future AccountsCreateFuture) Result(client AccountsClient) (a Account, err return } if !done { - return a, azure.NewAsyncOpIncompleteError("storage.AccountsCreateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - a, err = client.CreateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "storage.AccountsCreateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("storage.AccountsCreateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if a.Response.Response, err = future.GetResult(sender); err == nil && a.Response.Response.StatusCode != http.StatusNoContent { + a, err = client.CreateResponder(a.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "storage.AccountsCreateFuture", "Result", a.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "storage.AccountsCreateFuture", "Result", resp, "Failure sending request") - return - } - a, err = client.CreateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "storage.AccountsCreateFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/apps.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/apps.go index f79664516a72..414b7700fd44 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/apps.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/apps.go @@ -924,15 +924,17 @@ func (client AppsClient) CreateFunctionPreparer(ctx context.Context, resourceGro // CreateFunctionSender sends the CreateFunction request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) CreateFunctionSender(req *http.Request) (future AppsCreateFunctionFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1009,15 +1011,17 @@ func (client AppsClient) CreateInstanceFunctionSlotPreparer(ctx context.Context, // CreateInstanceFunctionSlotSender sends the CreateInstanceFunctionSlot request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) CreateInstanceFunctionSlotSender(req *http.Request) (future AppsCreateInstanceFunctionSlotFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1091,15 +1095,17 @@ func (client AppsClient) CreateInstanceMSDeployOperationPreparer(ctx context.Con // CreateInstanceMSDeployOperationSender sends the CreateInstanceMSDeployOperation request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) CreateInstanceMSDeployOperationSender(req *http.Request) (future AppsCreateInstanceMSDeployOperationFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusConflict)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusConflict)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1175,15 +1181,17 @@ func (client AppsClient) CreateInstanceMSDeployOperationSlotPreparer(ctx context // CreateInstanceMSDeployOperationSlotSender sends the CreateInstanceMSDeployOperationSlot request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) CreateInstanceMSDeployOperationSlotSender(req *http.Request) (future AppsCreateInstanceMSDeployOperationSlotFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusConflict)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusConflict)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1255,15 +1263,17 @@ func (client AppsClient) CreateMSDeployOperationPreparer(ctx context.Context, re // CreateMSDeployOperationSender sends the CreateMSDeployOperation request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) CreateMSDeployOperationSender(req *http.Request) (future AppsCreateMSDeployOperationFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusConflict)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusConflict)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1337,15 +1347,17 @@ func (client AppsClient) CreateMSDeployOperationSlotPreparer(ctx context.Context // CreateMSDeployOperationSlotSender sends the CreateMSDeployOperationSlot request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) CreateMSDeployOperationSlotSender(req *http.Request) (future AppsCreateMSDeployOperationSlotFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusConflict)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusConflict)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -1433,15 +1445,17 @@ func (client AppsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGro // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) CreateOrUpdateSender(req *http.Request) (future AppsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -2547,15 +2561,17 @@ func (client AppsClient) CreateOrUpdateSlotPreparer(ctx context.Context, resourc // CreateOrUpdateSlotSender sends the CreateOrUpdateSlot request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) CreateOrUpdateSlotSender(req *http.Request) (future AppsCreateOrUpdateSlotFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -2627,15 +2643,17 @@ func (client AppsClient) CreateOrUpdateSourceControlPreparer(ctx context.Context // CreateOrUpdateSourceControlSender sends the CreateOrUpdateSourceControl request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) CreateOrUpdateSourceControlSender(req *http.Request) (future AppsCreateOrUpdateSourceControlFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -2710,15 +2728,17 @@ func (client AppsClient) CreateOrUpdateSourceControlSlotPreparer(ctx context.Con // CreateOrUpdateSourceControlSlotSender sends the CreateOrUpdateSourceControlSlot request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) CreateOrUpdateSourceControlSlotSender(req *http.Request) (future AppsCreateOrUpdateSourceControlSlotFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -12530,15 +12550,17 @@ func (client AppsClient) InstallSiteExtensionPreparer(ctx context.Context, resou // InstallSiteExtensionSender sends the InstallSiteExtension request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) InstallSiteExtensionSender(req *http.Request) (future AppsInstallSiteExtensionFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusTooManyRequests)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusTooManyRequests)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -12612,15 +12634,17 @@ func (client AppsClient) InstallSiteExtensionSlotPreparer(ctx context.Context, r // InstallSiteExtensionSlotSender sends the InstallSiteExtensionSlot request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) InstallSiteExtensionSlotSender(req *http.Request) (future AppsInstallSiteExtensionSlotFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusTooManyRequests)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusTooManyRequests)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -18665,15 +18689,17 @@ func (client AppsClient) ListPublishingCredentialsPreparer(ctx context.Context, // ListPublishingCredentialsSender sends the ListPublishingCredentials request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) ListPublishingCredentialsSender(req *http.Request) (future AppsListPublishingCredentialsFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -18745,15 +18771,17 @@ func (client AppsClient) ListPublishingCredentialsSlotPreparer(ctx context.Conte // ListPublishingCredentialsSlotSender sends the ListPublishingCredentialsSlot request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) ListPublishingCredentialsSlotSender(req *http.Request) (future AppsListPublishingCredentialsSlotFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -21266,15 +21294,17 @@ func (client AppsClient) MigrateMySQLPreparer(ctx context.Context, resourceGroup // MigrateMySQLSender sends the MigrateMySQL request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) MigrateMySQLSender(req *http.Request) (future AppsMigrateMySQLFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -21353,15 +21383,17 @@ func (client AppsClient) MigrateStoragePreparer(ctx context.Context, subscriptio // MigrateStorageSender sends the MigrateStorage request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) MigrateStorageSender(req *http.Request) (future AppsMigrateStorageFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -21437,15 +21469,17 @@ func (client AppsClient) RecoverPreparer(ctx context.Context, resourceGroupName // RecoverSender sends the Recover request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) RecoverSender(req *http.Request) (future AppsRecoverFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -21677,15 +21711,17 @@ func (client AppsClient) RecoverSlotPreparer(ctx context.Context, resourceGroupN // RecoverSlotSender sends the RecoverSlot request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) RecoverSlotSender(req *http.Request) (future AppsRecoverSlotFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -22086,15 +22122,17 @@ func (client AppsClient) RestorePreparer(ctx context.Context, resourceGroupName // RestoreSender sends the Restore request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) RestoreSender(req *http.Request) (future AppsRestoreFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -22176,15 +22214,17 @@ func (client AppsClient) RestoreSlotPreparer(ctx context.Context, resourceGroupN // RestoreSlotSender sends the RestoreSlot request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) RestoreSlotSender(req *http.Request) (future AppsRestoreSlotFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -23354,15 +23394,17 @@ func (client AppsClient) SwapSlotSlotPreparer(ctx context.Context, resourceGroup // SwapSlotSlotSender sends the SwapSlotSlot request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) SwapSlotSlotSender(req *http.Request) (future AppsSwapSlotSlotFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -23436,15 +23478,17 @@ func (client AppsClient) SwapSlotWithProductionPreparer(ctx context.Context, res // SwapSlotWithProductionSender sends the SwapSlotWithProduction request. The method will close the // http.Response Body if it receives an error. func (client AppsClient) SwapSlotWithProductionSender(req *http.Request) (future AppsSwapSlotWithProductionFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appservicecertificateorders.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appservicecertificateorders.go index f78fcb530c1b..ba9c790ce435 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appservicecertificateorders.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appservicecertificateorders.go @@ -102,15 +102,17 @@ func (client AppServiceCertificateOrdersClient) CreateOrUpdatePreparer(ctx conte // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client AppServiceCertificateOrdersClient) CreateOrUpdateSender(req *http.Request) (future AppServiceCertificateOrdersCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -184,15 +186,17 @@ func (client AppServiceCertificateOrdersClient) CreateOrUpdateCertificatePrepare // CreateOrUpdateCertificateSender sends the CreateOrUpdateCertificate request. The method will close the // http.Response Body if it receives an error. func (client AppServiceCertificateOrdersClient) CreateOrUpdateCertificateSender(req *http.Request) (future AppServiceCertificateOrdersCreateOrUpdateCertificateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceenvironments.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceenvironments.go index 94aaabefff5d..71e8670b63f2 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceenvironments.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceenvironments.go @@ -102,15 +102,17 @@ func (client AppServiceEnvironmentsClient) CreateOrUpdatePreparer(ctx context.Co // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client AppServiceEnvironmentsClient) CreateOrUpdateSender(req *http.Request) (future AppServiceEnvironmentsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -182,15 +184,17 @@ func (client AppServiceEnvironmentsClient) CreateOrUpdateMultiRolePoolPreparer(c // CreateOrUpdateMultiRolePoolSender sends the CreateOrUpdateMultiRolePool request. The method will close the // http.Response Body if it receives an error. func (client AppServiceEnvironmentsClient) CreateOrUpdateMultiRolePoolSender(req *http.Request) (future AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -264,15 +268,17 @@ func (client AppServiceEnvironmentsClient) CreateOrUpdateWorkerPoolPreparer(ctx // CreateOrUpdateWorkerPoolSender sends the CreateOrUpdateWorkerPool request. The method will close the // http.Response Body if it receives an error. func (client AppServiceEnvironmentsClient) CreateOrUpdateWorkerPoolSender(req *http.Request) (future AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -346,15 +352,17 @@ func (client AppServiceEnvironmentsClient) DeletePreparer(ctx context.Context, r // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. func (client AppServiceEnvironmentsClient) DeleteSender(req *http.Request) (future AppServiceEnvironmentsDeleteFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -3337,15 +3345,17 @@ func (client AppServiceEnvironmentsClient) ResumePreparer(ctx context.Context, r // ResumeSender sends the Resume request. The method will close the // http.Response Body if it receives an error. func (client AppServiceEnvironmentsClient) ResumeSender(req *http.Request) (future AppServiceEnvironmentsResumeFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -3391,7 +3401,6 @@ func (client AppServiceEnvironmentsClient) ResumeComplete(ctx context.Context, r var future AppServiceEnvironmentsResumeFuture future, err = client.Resume(ctx, resourceGroupName, name) result.Future = future.Future - result.req = future.req return } @@ -3447,15 +3456,17 @@ func (client AppServiceEnvironmentsClient) SuspendPreparer(ctx context.Context, // SuspendSender sends the Suspend request. The method will close the // http.Response Body if it receives an error. func (client AppServiceEnvironmentsClient) SuspendSender(req *http.Request) (future AppServiceEnvironmentsSuspendFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } @@ -3501,7 +3512,6 @@ func (client AppServiceEnvironmentsClient) SuspendComplete(ctx context.Context, var future AppServiceEnvironmentsSuspendFuture future, err = client.Suspend(ctx, resourceGroupName, name) result.Future = future.Future - result.req = future.req return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceplans.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceplans.go index 626581873c2f..9e55f7e36a22 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceplans.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/appserviceplans.go @@ -98,15 +98,17 @@ func (client AppServicePlansClient) CreateOrUpdatePreparer(ctx context.Context, // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client AppServicePlansClient) CreateOrUpdateSender(req *http.Request) (future AppServicePlansCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/domains.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/domains.go index 6ddd2a46f378..f3e13e731689 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/domains.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/domains.go @@ -219,15 +219,17 @@ func (client DomainsClient) CreateOrUpdatePreparer(ctx context.Context, resource // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the // http.Response Body if it receives an error. func (client DomainsClient) CreateOrUpdateSender(req *http.Request) (future DomainsCreateOrUpdateFuture, err error) { - sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client)) - future.Future = azure.NewFuture(req) - future.req = req - _, err = future.Done(sender) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + err = autorest.Respond(resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) if err != nil { return } - err = autorest.Respond(future.Response(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted)) + future.Future, err = azure.NewFutureFromResponse(resp) return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/models.go index 5572b29f4fde..64adf3543aa3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web/models.go @@ -1712,12 +1712,11 @@ func (page ApplicationStackCollectionPage) Values() []ApplicationStack { // AppsCreateFunctionFuture an abstraction for monitoring and retrieving the results of a long-running operation. type AppsCreateFunctionFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsCreateFunctionFuture) Result(client AppsClient) (fe FunctionEnvelope, err error) { +func (future *AppsCreateFunctionFuture) Result(client AppsClient) (fe FunctionEnvelope, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1725,34 +1724,15 @@ func (future AppsCreateFunctionFuture) Result(client AppsClient) (fe FunctionEnv return } if !done { - return fe, azure.NewAsyncOpIncompleteError("web.AppsCreateFunctionFuture") - } - if future.PollingMethod() == azure.PollingLocation { - fe, err = client.CreateFunctionResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateFunctionFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsCreateFunctionFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if fe.Response.Response, err = future.GetResult(sender); err == nil && fe.Response.Response.StatusCode != http.StatusNoContent { + fe, err = client.CreateFunctionResponder(fe.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsCreateFunctionFuture", "Result", fe.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateFunctionFuture", "Result", resp, "Failure sending request") - return - } - fe, err = client.CreateFunctionResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateFunctionFuture", "Result", resp, "Failure responding to request") } return } @@ -1761,12 +1741,11 @@ func (future AppsCreateFunctionFuture) Result(client AppsClient) (fe FunctionEnv // operation. type AppsCreateInstanceFunctionSlotFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsCreateInstanceFunctionSlotFuture) Result(client AppsClient) (fe FunctionEnvelope, err error) { +func (future *AppsCreateInstanceFunctionSlotFuture) Result(client AppsClient) (fe FunctionEnvelope, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1774,34 +1753,15 @@ func (future AppsCreateInstanceFunctionSlotFuture) Result(client AppsClient) (fe return } if !done { - return fe, azure.NewAsyncOpIncompleteError("web.AppsCreateInstanceFunctionSlotFuture") - } - if future.PollingMethod() == azure.PollingLocation { - fe, err = client.CreateInstanceFunctionSlotResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateInstanceFunctionSlotFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsCreateInstanceFunctionSlotFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if fe.Response.Response, err = future.GetResult(sender); err == nil && fe.Response.Response.StatusCode != http.StatusNoContent { + fe, err = client.CreateInstanceFunctionSlotResponder(fe.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsCreateInstanceFunctionSlotFuture", "Result", fe.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateInstanceFunctionSlotFuture", "Result", resp, "Failure sending request") - return - } - fe, err = client.CreateInstanceFunctionSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateInstanceFunctionSlotFuture", "Result", resp, "Failure responding to request") } return } @@ -1810,12 +1770,11 @@ func (future AppsCreateInstanceFunctionSlotFuture) Result(client AppsClient) (fe // long-running operation. type AppsCreateInstanceMSDeployOperationFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsCreateInstanceMSDeployOperationFuture) Result(client AppsClient) (mds MSDeployStatus, err error) { +func (future *AppsCreateInstanceMSDeployOperationFuture) Result(client AppsClient) (mds MSDeployStatus, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1823,34 +1782,15 @@ func (future AppsCreateInstanceMSDeployOperationFuture) Result(client AppsClient return } if !done { - return mds, azure.NewAsyncOpIncompleteError("web.AppsCreateInstanceMSDeployOperationFuture") - } - if future.PollingMethod() == azure.PollingLocation { - mds, err = client.CreateInstanceMSDeployOperationResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateInstanceMSDeployOperationFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsCreateInstanceMSDeployOperationFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if mds.Response.Response, err = future.GetResult(sender); err == nil && mds.Response.Response.StatusCode != http.StatusNoContent { + mds, err = client.CreateInstanceMSDeployOperationResponder(mds.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsCreateInstanceMSDeployOperationFuture", "Result", mds.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateInstanceMSDeployOperationFuture", "Result", resp, "Failure sending request") - return - } - mds, err = client.CreateInstanceMSDeployOperationResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateInstanceMSDeployOperationFuture", "Result", resp, "Failure responding to request") } return } @@ -1859,12 +1799,11 @@ func (future AppsCreateInstanceMSDeployOperationFuture) Result(client AppsClient // long-running operation. type AppsCreateInstanceMSDeployOperationSlotFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsCreateInstanceMSDeployOperationSlotFuture) Result(client AppsClient) (mds MSDeployStatus, err error) { +func (future *AppsCreateInstanceMSDeployOperationSlotFuture) Result(client AppsClient) (mds MSDeployStatus, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1872,34 +1811,15 @@ func (future AppsCreateInstanceMSDeployOperationSlotFuture) Result(client AppsCl return } if !done { - return mds, azure.NewAsyncOpIncompleteError("web.AppsCreateInstanceMSDeployOperationSlotFuture") - } - if future.PollingMethod() == azure.PollingLocation { - mds, err = client.CreateInstanceMSDeployOperationSlotResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateInstanceMSDeployOperationSlotFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsCreateInstanceMSDeployOperationSlotFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if mds.Response.Response, err = future.GetResult(sender); err == nil && mds.Response.Response.StatusCode != http.StatusNoContent { + mds, err = client.CreateInstanceMSDeployOperationSlotResponder(mds.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsCreateInstanceMSDeployOperationSlotFuture", "Result", mds.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateInstanceMSDeployOperationSlotFuture", "Result", resp, "Failure sending request") - return - } - mds, err = client.CreateInstanceMSDeployOperationSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateInstanceMSDeployOperationSlotFuture", "Result", resp, "Failure responding to request") } return } @@ -1908,12 +1828,11 @@ func (future AppsCreateInstanceMSDeployOperationSlotFuture) Result(client AppsCl // operation. type AppsCreateMSDeployOperationFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsCreateMSDeployOperationFuture) Result(client AppsClient) (mds MSDeployStatus, err error) { +func (future *AppsCreateMSDeployOperationFuture) Result(client AppsClient) (mds MSDeployStatus, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1921,34 +1840,15 @@ func (future AppsCreateMSDeployOperationFuture) Result(client AppsClient) (mds M return } if !done { - return mds, azure.NewAsyncOpIncompleteError("web.AppsCreateMSDeployOperationFuture") - } - if future.PollingMethod() == azure.PollingLocation { - mds, err = client.CreateMSDeployOperationResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateMSDeployOperationFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsCreateMSDeployOperationFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if mds.Response.Response, err = future.GetResult(sender); err == nil && mds.Response.Response.StatusCode != http.StatusNoContent { + mds, err = client.CreateMSDeployOperationResponder(mds.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsCreateMSDeployOperationFuture", "Result", mds.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateMSDeployOperationFuture", "Result", resp, "Failure sending request") - return - } - mds, err = client.CreateMSDeployOperationResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateMSDeployOperationFuture", "Result", resp, "Failure responding to request") } return } @@ -1957,12 +1857,11 @@ func (future AppsCreateMSDeployOperationFuture) Result(client AppsClient) (mds M // operation. type AppsCreateMSDeployOperationSlotFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsCreateMSDeployOperationSlotFuture) Result(client AppsClient) (mds MSDeployStatus, err error) { +func (future *AppsCreateMSDeployOperationSlotFuture) Result(client AppsClient) (mds MSDeployStatus, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -1970,34 +1869,15 @@ func (future AppsCreateMSDeployOperationSlotFuture) Result(client AppsClient) (m return } if !done { - return mds, azure.NewAsyncOpIncompleteError("web.AppsCreateMSDeployOperationSlotFuture") - } - if future.PollingMethod() == azure.PollingLocation { - mds, err = client.CreateMSDeployOperationSlotResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateMSDeployOperationSlotFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsCreateMSDeployOperationSlotFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if mds.Response.Response, err = future.GetResult(sender); err == nil && mds.Response.Response.StatusCode != http.StatusNoContent { + mds, err = client.CreateMSDeployOperationSlotResponder(mds.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsCreateMSDeployOperationSlotFuture", "Result", mds.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateMSDeployOperationSlotFuture", "Result", resp, "Failure sending request") - return - } - mds, err = client.CreateMSDeployOperationSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateMSDeployOperationSlotFuture", "Result", resp, "Failure responding to request") } return } @@ -2005,12 +1885,11 @@ func (future AppsCreateMSDeployOperationSlotFuture) Result(client AppsClient) (m // AppsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type AppsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsCreateOrUpdateFuture) Result(client AppsClient) (s Site, err error) { +func (future *AppsCreateOrUpdateFuture) Result(client AppsClient) (s Site, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2018,34 +1897,15 @@ func (future AppsCreateOrUpdateFuture) Result(client AppsClient) (s Site, err er return } if !done { - return s, azure.NewAsyncOpIncompleteError("web.AppsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.CreateOrUpdateResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -2054,12 +1914,11 @@ func (future AppsCreateOrUpdateFuture) Result(client AppsClient) (s Site, err er // operation. type AppsCreateOrUpdateSlotFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsCreateOrUpdateSlotFuture) Result(client AppsClient) (s Site, err error) { +func (future *AppsCreateOrUpdateSlotFuture) Result(client AppsClient) (s Site, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2067,34 +1926,15 @@ func (future AppsCreateOrUpdateSlotFuture) Result(client AppsClient) (s Site, er return } if !done { - return s, azure.NewAsyncOpIncompleteError("web.AppsCreateOrUpdateSlotFuture") - } - if future.PollingMethod() == azure.PollingLocation { - s, err = client.CreateOrUpdateSlotResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateSlotFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsCreateOrUpdateSlotFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.CreateOrUpdateSlotResponder(s.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateSlotFuture", "Result", s.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateSlotFuture", "Result", resp, "Failure sending request") - return - } - s, err = client.CreateOrUpdateSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateSlotFuture", "Result", resp, "Failure responding to request") } return } @@ -2103,12 +1943,11 @@ func (future AppsCreateOrUpdateSlotFuture) Result(client AppsClient) (s Site, er // operation. type AppsCreateOrUpdateSourceControlFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsCreateOrUpdateSourceControlFuture) Result(client AppsClient) (ssc SiteSourceControl, err error) { +func (future *AppsCreateOrUpdateSourceControlFuture) Result(client AppsClient) (ssc SiteSourceControl, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2116,34 +1955,15 @@ func (future AppsCreateOrUpdateSourceControlFuture) Result(client AppsClient) (s return } if !done { - return ssc, azure.NewAsyncOpIncompleteError("web.AppsCreateOrUpdateSourceControlFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ssc, err = client.CreateOrUpdateSourceControlResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateSourceControlFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsCreateOrUpdateSourceControlFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ssc.Response.Response, err = future.GetResult(sender); err == nil && ssc.Response.Response.StatusCode != http.StatusNoContent { + ssc, err = client.CreateOrUpdateSourceControlResponder(ssc.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateSourceControlFuture", "Result", ssc.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateSourceControlFuture", "Result", resp, "Failure sending request") - return - } - ssc, err = client.CreateOrUpdateSourceControlResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateSourceControlFuture", "Result", resp, "Failure responding to request") } return } @@ -2152,12 +1972,11 @@ func (future AppsCreateOrUpdateSourceControlFuture) Result(client AppsClient) (s // long-running operation. type AppsCreateOrUpdateSourceControlSlotFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsCreateOrUpdateSourceControlSlotFuture) Result(client AppsClient) (ssc SiteSourceControl, err error) { +func (future *AppsCreateOrUpdateSourceControlSlotFuture) Result(client AppsClient) (ssc SiteSourceControl, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2165,34 +1984,15 @@ func (future AppsCreateOrUpdateSourceControlSlotFuture) Result(client AppsClient return } if !done { - return ssc, azure.NewAsyncOpIncompleteError("web.AppsCreateOrUpdateSourceControlSlotFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ssc, err = client.CreateOrUpdateSourceControlSlotResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateSourceControlSlotFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsCreateOrUpdateSourceControlSlotFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ssc.Response.Response, err = future.GetResult(sender); err == nil && ssc.Response.Response.StatusCode != http.StatusNoContent { + ssc, err = client.CreateOrUpdateSourceControlSlotResponder(ssc.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateSourceControlSlotFuture", "Result", ssc.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateSourceControlSlotFuture", "Result", resp, "Failure sending request") - return - } - ssc, err = client.CreateOrUpdateSourceControlSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsCreateOrUpdateSourceControlSlotFuture", "Result", resp, "Failure responding to request") } return } @@ -2847,12 +2647,11 @@ func (asco AppServiceCertificateOrderProperties) MarshalJSON() ([]byte, error) { // results of a long-running operation. type AppServiceCertificateOrdersCreateOrUpdateCertificateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppServiceCertificateOrdersCreateOrUpdateCertificateFuture) Result(client AppServiceCertificateOrdersClient) (ascr AppServiceCertificateResource, err error) { +func (future *AppServiceCertificateOrdersCreateOrUpdateCertificateFuture) Result(client AppServiceCertificateOrdersClient) (ascr AppServiceCertificateResource, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2860,34 +2659,15 @@ func (future AppServiceCertificateOrdersCreateOrUpdateCertificateFuture) Result( return } if !done { - return ascr, azure.NewAsyncOpIncompleteError("web.AppServiceCertificateOrdersCreateOrUpdateCertificateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ascr, err = client.CreateOrUpdateCertificateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceCertificateOrdersCreateOrUpdateCertificateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppServiceCertificateOrdersCreateOrUpdateCertificateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if ascr.Response.Response, err = future.GetResult(sender); err == nil && ascr.Response.Response.StatusCode != http.StatusNoContent { + ascr, err = client.CreateOrUpdateCertificateResponder(ascr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppServiceCertificateOrdersCreateOrUpdateCertificateFuture", "Result", ascr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceCertificateOrdersCreateOrUpdateCertificateFuture", "Result", resp, "Failure sending request") - return - } - ascr, err = client.CreateOrUpdateCertificateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceCertificateOrdersCreateOrUpdateCertificateFuture", "Result", resp, "Failure responding to request") } return } @@ -2896,12 +2676,11 @@ func (future AppServiceCertificateOrdersCreateOrUpdateCertificateFuture) Result( // long-running operation. type AppServiceCertificateOrdersCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppServiceCertificateOrdersCreateOrUpdateFuture) Result(client AppServiceCertificateOrdersClient) (asco AppServiceCertificateOrder, err error) { +func (future *AppServiceCertificateOrdersCreateOrUpdateFuture) Result(client AppServiceCertificateOrdersClient) (asco AppServiceCertificateOrder, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -2909,34 +2688,15 @@ func (future AppServiceCertificateOrdersCreateOrUpdateFuture) Result(client AppS return } if !done { - return asco, azure.NewAsyncOpIncompleteError("web.AppServiceCertificateOrdersCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - asco, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceCertificateOrdersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppServiceCertificateOrdersCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if asco.Response.Response, err = future.GetResult(sender); err == nil && asco.Response.Response.StatusCode != http.StatusNoContent { + asco, err = client.CreateOrUpdateResponder(asco.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppServiceCertificateOrdersCreateOrUpdateFuture", "Result", asco.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceCertificateOrdersCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - asco, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceCertificateOrdersCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -3566,12 +3326,11 @@ func (aser *AppServiceEnvironmentResource) UnmarshalJSON(body []byte) error { // long-running operation. type AppServiceEnvironmentsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppServiceEnvironmentsCreateOrUpdateFuture) Result(client AppServiceEnvironmentsClient) (aser AppServiceEnvironmentResource, err error) { +func (future *AppServiceEnvironmentsCreateOrUpdateFuture) Result(client AppServiceEnvironmentsClient) (aser AppServiceEnvironmentResource, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3579,34 +3338,15 @@ func (future AppServiceEnvironmentsCreateOrUpdateFuture) Result(client AppServic return } if !done { - return aser, azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - aser, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if aser.Response.Response, err = future.GetResult(sender); err == nil && aser.Response.Response.StatusCode != http.StatusNoContent { + aser, err = client.CreateOrUpdateResponder(aser.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsCreateOrUpdateFuture", "Result", aser.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - aser, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -3615,12 +3355,11 @@ func (future AppServiceEnvironmentsCreateOrUpdateFuture) Result(client AppServic // of a long-running operation. type AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture) Result(client AppServiceEnvironmentsClient) (wpr WorkerPoolResource, err error) { +func (future *AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture) Result(client AppServiceEnvironmentsClient) (wpr WorkerPoolResource, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3628,34 +3367,15 @@ func (future AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture) Result(cli return } if !done { - return wpr, azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture") - } - if future.PollingMethod() == azure.PollingLocation { - wpr, err = client.CreateOrUpdateMultiRolePoolResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if wpr.Response.Response, err = future.GetResult(sender); err == nil && wpr.Response.Response.StatusCode != http.StatusNoContent { + wpr, err = client.CreateOrUpdateMultiRolePoolResponder(wpr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture", "Result", wpr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture", "Result", resp, "Failure sending request") - return - } - wpr, err = client.CreateOrUpdateMultiRolePoolResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture", "Result", resp, "Failure responding to request") } return } @@ -3664,12 +3384,11 @@ func (future AppServiceEnvironmentsCreateOrUpdateMultiRolePoolFuture) Result(cli // a long-running operation. type AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture) Result(client AppServiceEnvironmentsClient) (wpr WorkerPoolResource, err error) { +func (future *AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture) Result(client AppServiceEnvironmentsClient) (wpr WorkerPoolResource, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3677,34 +3396,15 @@ func (future AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture) Result(client return } if !done { - return wpr, azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture") - } - if future.PollingMethod() == azure.PollingLocation { - wpr, err = client.CreateOrUpdateWorkerPoolResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if wpr.Response.Response, err = future.GetResult(sender); err == nil && wpr.Response.Response.StatusCode != http.StatusNoContent { + wpr, err = client.CreateOrUpdateWorkerPoolResponder(wpr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture", "Result", wpr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture", "Result", resp, "Failure sending request") - return - } - wpr, err = client.CreateOrUpdateWorkerPoolResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture", "Result", resp, "Failure responding to request") } return } @@ -3713,12 +3413,11 @@ func (future AppServiceEnvironmentsCreateOrUpdateWorkerPoolFuture) Result(client // operation. type AppServiceEnvironmentsDeleteFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppServiceEnvironmentsDeleteFuture) Result(client AppServiceEnvironmentsClient) (ar autorest.Response, err error) { +func (future *AppServiceEnvironmentsDeleteFuture) Result(client AppServiceEnvironmentsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3726,35 +3425,10 @@ func (future AppServiceEnvironmentsDeleteFuture) Result(client AppServiceEnviron return } if !done { - return ar, azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsDeleteFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.DeleteResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsDeleteFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsDeleteFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsDeleteFuture") return } - ar, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsDeleteFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -3762,12 +3436,11 @@ func (future AppServiceEnvironmentsDeleteFuture) Result(client AppServiceEnviron // operation. type AppServiceEnvironmentsResumeAllFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppServiceEnvironmentsResumeAllFuture) Result(client AppServiceEnvironmentsClient) (acp AppCollectionPage, err error) { +func (future *AppServiceEnvironmentsResumeAllFuture) Result(client AppServiceEnvironmentsClient) (acp AppCollectionPage, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3775,34 +3448,15 @@ func (future AppServiceEnvironmentsResumeAllFuture) Result(client AppServiceEnvi return } if !done { - return acp, azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsResumeAllFuture") - } - if future.PollingMethod() == azure.PollingLocation { - acp, err = client.ResumeResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsResumeAllFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsResumeAllFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if acp.ac.Response.Response, err = future.GetResult(sender); err == nil && acp.ac.Response.Response.StatusCode != http.StatusNoContent { + acp, err = client.ResumeResponder(acp.ac.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsResumeAllFuture", "Result", acp.ac.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsResumeAllFuture", "Result", resp, "Failure sending request") - return - } - acp, err = client.ResumeResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsResumeAllFuture", "Result", resp, "Failure responding to request") } return } @@ -3811,12 +3465,11 @@ func (future AppServiceEnvironmentsResumeAllFuture) Result(client AppServiceEnvi // operation. type AppServiceEnvironmentsResumeFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppServiceEnvironmentsResumeFuture) Result(client AppServiceEnvironmentsClient) (acp AppCollectionPage, err error) { +func (future *AppServiceEnvironmentsResumeFuture) Result(client AppServiceEnvironmentsClient) (acp AppCollectionPage, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3824,34 +3477,15 @@ func (future AppServiceEnvironmentsResumeFuture) Result(client AppServiceEnviron return } if !done { - return acp, azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsResumeFuture") - } - if future.PollingMethod() == azure.PollingLocation { - acp, err = client.ResumeResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsResumeFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsResumeFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if acp.ac.Response.Response, err = future.GetResult(sender); err == nil && acp.ac.Response.Response.StatusCode != http.StatusNoContent { + acp, err = client.ResumeResponder(acp.ac.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsResumeFuture", "Result", acp.ac.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsResumeFuture", "Result", resp, "Failure sending request") - return - } - acp, err = client.ResumeResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsResumeFuture", "Result", resp, "Failure responding to request") } return } @@ -3860,12 +3494,11 @@ func (future AppServiceEnvironmentsResumeFuture) Result(client AppServiceEnviron // long-running operation. type AppServiceEnvironmentsSuspendAllFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppServiceEnvironmentsSuspendAllFuture) Result(client AppServiceEnvironmentsClient) (acp AppCollectionPage, err error) { +func (future *AppServiceEnvironmentsSuspendAllFuture) Result(client AppServiceEnvironmentsClient) (acp AppCollectionPage, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3873,34 +3506,15 @@ func (future AppServiceEnvironmentsSuspendAllFuture) Result(client AppServiceEnv return } if !done { - return acp, azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsSuspendAllFuture") - } - if future.PollingMethod() == azure.PollingLocation { - acp, err = client.SuspendResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsSuspendAllFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsSuspendAllFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if acp.ac.Response.Response, err = future.GetResult(sender); err == nil && acp.ac.Response.Response.StatusCode != http.StatusNoContent { + acp, err = client.SuspendResponder(acp.ac.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsSuspendAllFuture", "Result", acp.ac.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsSuspendAllFuture", "Result", resp, "Failure sending request") - return - } - acp, err = client.SuspendResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsSuspendAllFuture", "Result", resp, "Failure responding to request") } return } @@ -3909,12 +3523,11 @@ func (future AppServiceEnvironmentsSuspendAllFuture) Result(client AppServiceEnv // operation. type AppServiceEnvironmentsSuspendFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppServiceEnvironmentsSuspendFuture) Result(client AppServiceEnvironmentsClient) (acp AppCollectionPage, err error) { +func (future *AppServiceEnvironmentsSuspendFuture) Result(client AppServiceEnvironmentsClient) (acp AppCollectionPage, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -3922,34 +3535,15 @@ func (future AppServiceEnvironmentsSuspendFuture) Result(client AppServiceEnviro return } if !done { - return acp, azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsSuspendFuture") - } - if future.PollingMethod() == azure.PollingLocation { - acp, err = client.SuspendResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsSuspendFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppServiceEnvironmentsSuspendFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if acp.ac.Response.Response, err = future.GetResult(sender); err == nil && acp.ac.Response.Response.StatusCode != http.StatusNoContent { + acp, err = client.SuspendResponder(acp.ac.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsSuspendFuture", "Result", acp.ac.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsSuspendFuture", "Result", resp, "Failure sending request") - return - } - acp, err = client.SuspendResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsSuspendFuture", "Result", resp, "Failure responding to request") } return } @@ -4370,12 +3964,11 @@ type AppServicePlanProperties struct { // operation. type AppServicePlansCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppServicePlansCreateOrUpdateFuture) Result(client AppServicePlansClient) (asp AppServicePlan, err error) { +func (future *AppServicePlansCreateOrUpdateFuture) Result(client AppServicePlansClient) (asp AppServicePlan, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4383,34 +3976,15 @@ func (future AppServicePlansCreateOrUpdateFuture) Result(client AppServicePlansC return } if !done { - return asp, azure.NewAsyncOpIncompleteError("web.AppServicePlansCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - asp, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServicePlansCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppServicePlansCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if asp.Response.Response, err = future.GetResult(sender); err == nil && asp.Response.Response.StatusCode != http.StatusNoContent { + asp, err = client.CreateOrUpdateResponder(asp.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppServicePlansCreateOrUpdateFuture", "Result", asp.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServicePlansCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - asp, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServicePlansCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } @@ -4419,12 +3993,11 @@ func (future AppServicePlansCreateOrUpdateFuture) Result(client AppServicePlansC // operation. type AppsInstallSiteExtensionFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsInstallSiteExtensionFuture) Result(client AppsClient) (sei SiteExtensionInfo, err error) { +func (future *AppsInstallSiteExtensionFuture) Result(client AppsClient) (sei SiteExtensionInfo, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4432,34 +4005,15 @@ func (future AppsInstallSiteExtensionFuture) Result(client AppsClient) (sei Site return } if !done { - return sei, azure.NewAsyncOpIncompleteError("web.AppsInstallSiteExtensionFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sei, err = client.InstallSiteExtensionResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsInstallSiteExtensionFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsInstallSiteExtensionFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sei.Response.Response, err = future.GetResult(sender); err == nil && sei.Response.Response.StatusCode != http.StatusNoContent { + sei, err = client.InstallSiteExtensionResponder(sei.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsInstallSiteExtensionFuture", "Result", sei.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsInstallSiteExtensionFuture", "Result", resp, "Failure sending request") - return - } - sei, err = client.InstallSiteExtensionResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsInstallSiteExtensionFuture", "Result", resp, "Failure responding to request") } return } @@ -4468,12 +4022,11 @@ func (future AppsInstallSiteExtensionFuture) Result(client AppsClient) (sei Site // operation. type AppsInstallSiteExtensionSlotFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsInstallSiteExtensionSlotFuture) Result(client AppsClient) (sei SiteExtensionInfo, err error) { +func (future *AppsInstallSiteExtensionSlotFuture) Result(client AppsClient) (sei SiteExtensionInfo, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4481,34 +4034,15 @@ func (future AppsInstallSiteExtensionSlotFuture) Result(client AppsClient) (sei return } if !done { - return sei, azure.NewAsyncOpIncompleteError("web.AppsInstallSiteExtensionSlotFuture") - } - if future.PollingMethod() == azure.PollingLocation { - sei, err = client.InstallSiteExtensionSlotResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsInstallSiteExtensionSlotFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsInstallSiteExtensionSlotFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if sei.Response.Response, err = future.GetResult(sender); err == nil && sei.Response.Response.StatusCode != http.StatusNoContent { + sei, err = client.InstallSiteExtensionSlotResponder(sei.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsInstallSiteExtensionSlotFuture", "Result", sei.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsInstallSiteExtensionSlotFuture", "Result", resp, "Failure sending request") - return - } - sei, err = client.InstallSiteExtensionSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsInstallSiteExtensionSlotFuture", "Result", resp, "Failure responding to request") } return } @@ -4517,12 +4051,11 @@ func (future AppsInstallSiteExtensionSlotFuture) Result(client AppsClient) (sei // operation. type AppsListPublishingCredentialsFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsListPublishingCredentialsFuture) Result(client AppsClient) (u User, err error) { +func (future *AppsListPublishingCredentialsFuture) Result(client AppsClient) (u User, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4530,34 +4063,15 @@ func (future AppsListPublishingCredentialsFuture) Result(client AppsClient) (u U return } if !done { - return u, azure.NewAsyncOpIncompleteError("web.AppsListPublishingCredentialsFuture") - } - if future.PollingMethod() == azure.PollingLocation { - u, err = client.ListPublishingCredentialsResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsListPublishingCredentialsFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsListPublishingCredentialsFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if u.Response.Response, err = future.GetResult(sender); err == nil && u.Response.Response.StatusCode != http.StatusNoContent { + u, err = client.ListPublishingCredentialsResponder(u.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsListPublishingCredentialsFuture", "Result", u.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsListPublishingCredentialsFuture", "Result", resp, "Failure sending request") - return - } - u, err = client.ListPublishingCredentialsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsListPublishingCredentialsFuture", "Result", resp, "Failure responding to request") } return } @@ -4566,12 +4080,11 @@ func (future AppsListPublishingCredentialsFuture) Result(client AppsClient) (u U // long-running operation. type AppsListPublishingCredentialsSlotFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsListPublishingCredentialsSlotFuture) Result(client AppsClient) (u User, err error) { +func (future *AppsListPublishingCredentialsSlotFuture) Result(client AppsClient) (u User, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4579,34 +4092,15 @@ func (future AppsListPublishingCredentialsSlotFuture) Result(client AppsClient) return } if !done { - return u, azure.NewAsyncOpIncompleteError("web.AppsListPublishingCredentialsSlotFuture") - } - if future.PollingMethod() == azure.PollingLocation { - u, err = client.ListPublishingCredentialsSlotResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsListPublishingCredentialsSlotFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsListPublishingCredentialsSlotFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if u.Response.Response, err = future.GetResult(sender); err == nil && u.Response.Response.StatusCode != http.StatusNoContent { + u, err = client.ListPublishingCredentialsSlotResponder(u.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsListPublishingCredentialsSlotFuture", "Result", u.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsListPublishingCredentialsSlotFuture", "Result", resp, "Failure sending request") - return - } - u, err = client.ListPublishingCredentialsSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsListPublishingCredentialsSlotFuture", "Result", resp, "Failure responding to request") } return } @@ -4614,12 +4108,11 @@ func (future AppsListPublishingCredentialsSlotFuture) Result(client AppsClient) // AppsMigrateMySQLFuture an abstraction for monitoring and retrieving the results of a long-running operation. type AppsMigrateMySQLFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsMigrateMySQLFuture) Result(client AppsClient) (o Operation, err error) { +func (future *AppsMigrateMySQLFuture) Result(client AppsClient) (o Operation, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4627,34 +4120,15 @@ func (future AppsMigrateMySQLFuture) Result(client AppsClient) (o Operation, err return } if !done { - return o, azure.NewAsyncOpIncompleteError("web.AppsMigrateMySQLFuture") - } - if future.PollingMethod() == azure.PollingLocation { - o, err = client.MigrateMySQLResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsMigrateMySQLFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsMigrateMySQLFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if o.Response.Response, err = future.GetResult(sender); err == nil && o.Response.Response.StatusCode != http.StatusNoContent { + o, err = client.MigrateMySQLResponder(o.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsMigrateMySQLFuture", "Result", o.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsMigrateMySQLFuture", "Result", resp, "Failure sending request") - return - } - o, err = client.MigrateMySQLResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsMigrateMySQLFuture", "Result", resp, "Failure responding to request") } return } @@ -4662,12 +4136,11 @@ func (future AppsMigrateMySQLFuture) Result(client AppsClient) (o Operation, err // AppsMigrateStorageFuture an abstraction for monitoring and retrieving the results of a long-running operation. type AppsMigrateStorageFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsMigrateStorageFuture) Result(client AppsClient) (smr StorageMigrationResponse, err error) { +func (future *AppsMigrateStorageFuture) Result(client AppsClient) (smr StorageMigrationResponse, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4675,34 +4148,15 @@ func (future AppsMigrateStorageFuture) Result(client AppsClient) (smr StorageMig return } if !done { - return smr, azure.NewAsyncOpIncompleteError("web.AppsMigrateStorageFuture") - } - if future.PollingMethod() == azure.PollingLocation { - smr, err = client.MigrateStorageResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsMigrateStorageFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsMigrateStorageFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if smr.Response.Response, err = future.GetResult(sender); err == nil && smr.Response.Response.StatusCode != http.StatusNoContent { + smr, err = client.MigrateStorageResponder(smr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsMigrateStorageFuture", "Result", smr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsMigrateStorageFuture", "Result", resp, "Failure sending request") - return - } - smr, err = client.MigrateStorageResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsMigrateStorageFuture", "Result", resp, "Failure responding to request") } return } @@ -4710,12 +4164,11 @@ func (future AppsMigrateStorageFuture) Result(client AppsClient) (smr StorageMig // AppsRecoverFuture an abstraction for monitoring and retrieving the results of a long-running operation. type AppsRecoverFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsRecoverFuture) Result(client AppsClient) (ar autorest.Response, err error) { +func (future *AppsRecoverFuture) Result(client AppsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4723,47 +4176,21 @@ func (future AppsRecoverFuture) Result(client AppsClient) (ar autorest.Response, return } if !done { - return ar, azure.NewAsyncOpIncompleteError("web.AppsRecoverFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.RecoverResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsRecoverFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsRecoverFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("web.AppsRecoverFuture") return } - ar, err = client.RecoverResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsRecoverFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // AppsRecoverSlotFuture an abstraction for monitoring and retrieving the results of a long-running operation. type AppsRecoverSlotFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsRecoverSlotFuture) Result(client AppsClient) (ar autorest.Response, err error) { +func (future *AppsRecoverSlotFuture) Result(client AppsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4771,47 +4198,21 @@ func (future AppsRecoverSlotFuture) Result(client AppsClient) (ar autorest.Respo return } if !done { - return ar, azure.NewAsyncOpIncompleteError("web.AppsRecoverSlotFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.RecoverSlotResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsRecoverSlotFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsRecoverSlotFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("web.AppsRecoverSlotFuture") return } - ar, err = client.RecoverSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsRecoverSlotFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } // AppsRestoreFuture an abstraction for monitoring and retrieving the results of a long-running operation. type AppsRestoreFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsRestoreFuture) Result(client AppsClient) (rr RestoreResponse, err error) { +func (future *AppsRestoreFuture) Result(client AppsClient) (rr RestoreResponse, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4819,34 +4220,15 @@ func (future AppsRestoreFuture) Result(client AppsClient) (rr RestoreResponse, e return } if !done { - return rr, azure.NewAsyncOpIncompleteError("web.AppsRestoreFuture") - } - if future.PollingMethod() == azure.PollingLocation { - rr, err = client.RestoreResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsRestoreFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsRestoreFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if rr.Response.Response, err = future.GetResult(sender); err == nil && rr.Response.Response.StatusCode != http.StatusNoContent { + rr, err = client.RestoreResponder(rr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsRestoreFuture", "Result", rr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsRestoreFuture", "Result", resp, "Failure sending request") - return - } - rr, err = client.RestoreResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsRestoreFuture", "Result", resp, "Failure responding to request") } return } @@ -4854,12 +4236,11 @@ func (future AppsRestoreFuture) Result(client AppsClient) (rr RestoreResponse, e // AppsRestoreSlotFuture an abstraction for monitoring and retrieving the results of a long-running operation. type AppsRestoreSlotFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsRestoreSlotFuture) Result(client AppsClient) (rr RestoreResponse, err error) { +func (future *AppsRestoreSlotFuture) Result(client AppsClient) (rr RestoreResponse, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4867,34 +4248,15 @@ func (future AppsRestoreSlotFuture) Result(client AppsClient) (rr RestoreRespons return } if !done { - return rr, azure.NewAsyncOpIncompleteError("web.AppsRestoreSlotFuture") - } - if future.PollingMethod() == azure.PollingLocation { - rr, err = client.RestoreSlotResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsRestoreSlotFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsRestoreSlotFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if rr.Response.Response, err = future.GetResult(sender); err == nil && rr.Response.Response.StatusCode != http.StatusNoContent { + rr, err = client.RestoreSlotResponder(rr.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.AppsRestoreSlotFuture", "Result", rr.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsRestoreSlotFuture", "Result", resp, "Failure sending request") - return - } - rr, err = client.RestoreSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsRestoreSlotFuture", "Result", resp, "Failure responding to request") } return } @@ -4902,12 +4264,11 @@ func (future AppsRestoreSlotFuture) Result(client AppsClient) (rr RestoreRespons // AppsSwapSlotSlotFuture an abstraction for monitoring and retrieving the results of a long-running operation. type AppsSwapSlotSlotFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsSwapSlotSlotFuture) Result(client AppsClient) (ar autorest.Response, err error) { +func (future *AppsSwapSlotSlotFuture) Result(client AppsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4915,35 +4276,10 @@ func (future AppsSwapSlotSlotFuture) Result(client AppsClient) (ar autorest.Resp return } if !done { - return ar, azure.NewAsyncOpIncompleteError("web.AppsSwapSlotSlotFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.SwapSlotSlotResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsSwapSlotSlotFuture", "Result", future.Response(), "Failure responding to request") - } - return - } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsSwapSlotSlotFuture", "Result", resp, "Failure sending request") + err = azure.NewAsyncOpIncompleteError("web.AppsSwapSlotSlotFuture") return } - ar, err = client.SwapSlotSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsSwapSlotSlotFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -4951,12 +4287,11 @@ func (future AppsSwapSlotSlotFuture) Result(client AppsClient) (ar autorest.Resp // operation. type AppsSwapSlotWithProductionFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future AppsSwapSlotWithProductionFuture) Result(client AppsClient) (ar autorest.Response, err error) { +func (future *AppsSwapSlotWithProductionFuture) Result(client AppsClient) (ar autorest.Response, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -4964,35 +4299,10 @@ func (future AppsSwapSlotWithProductionFuture) Result(client AppsClient) (ar aut return } if !done { - return ar, azure.NewAsyncOpIncompleteError("web.AppsSwapSlotWithProductionFuture") - } - if future.PollingMethod() == azure.PollingLocation { - ar, err = client.SwapSlotWithProductionResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsSwapSlotWithProductionFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.AppsSwapSlotWithProductionFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) - if err != nil { - return - } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsSwapSlotWithProductionFuture", "Result", resp, "Failure sending request") - return - } - ar, err = client.SwapSlotWithProductionResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsSwapSlotWithProductionFuture", "Result", resp, "Failure responding to request") - } + ar.Response = future.Response() return } @@ -9199,12 +8509,11 @@ type DomainRecommendationSearchParameters struct { // operation. type DomainsCreateOrUpdateFuture struct { azure.Future - req *http.Request } // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. -func (future DomainsCreateOrUpdateFuture) Result(client DomainsClient) (d Domain, err error) { +func (future *DomainsCreateOrUpdateFuture) Result(client DomainsClient) (d Domain, err error) { var done bool done, err = future.Done(client) if err != nil { @@ -9212,34 +8521,15 @@ func (future DomainsCreateOrUpdateFuture) Result(client DomainsClient) (d Domain return } if !done { - return d, azure.NewAsyncOpIncompleteError("web.DomainsCreateOrUpdateFuture") - } - if future.PollingMethod() == azure.PollingLocation { - d, err = client.CreateOrUpdateResponder(future.Response()) - if err != nil { - err = autorest.NewErrorWithError(err, "web.DomainsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request") - } + err = azure.NewAsyncOpIncompleteError("web.DomainsCreateOrUpdateFuture") return } - var req *http.Request - var resp *http.Response - if future.PollingURL() != "" { - req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil) + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if d.Response.Response, err = future.GetResult(sender); err == nil && d.Response.Response.StatusCode != http.StatusNoContent { + d, err = client.CreateOrUpdateResponder(d.Response.Response) if err != nil { - return + err = autorest.NewErrorWithError(err, "web.DomainsCreateOrUpdateFuture", "Result", d.Response.Response, "Failure responding to request") } - } else { - req = autorest.ChangeToGet(future.req) - } - resp, err = autorest.SendWithSender(client, req, - autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if err != nil { - err = autorest.NewErrorWithError(err, "web.DomainsCreateOrUpdateFuture", "Result", resp, "Failure sending request") - return - } - d, err = client.CreateOrUpdateResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.DomainsCreateOrUpdateFuture", "Result", resp, "Failure responding to request") } return } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/README.md b/vendor/github.com/Azure/azure-sdk-for-go/storage/README.md index 49e48cdf1efa..459b45831c0e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/README.md +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/README.md @@ -1,9 +1,13 @@ # Azure Storage SDK for Go (Preview) :exclamation: IMPORTANT: This package is in maintenance only and will be deprecated in the -future. Consider using the new package for blobs currently in preview at -[github.com/Azure/azure-storage-blob-go](https://github.com/Azure/azure-storage-blob-go). -New Table, Queue and File packages are also in development. +future. Please use one of the following packages instead. + +| Service | Import Path/Repo | +|---------|------------------| +| Storage - Blobs | [github.com/Azure/azure-storage-blob-go](https://github.com/Azure/azure-storage-blob-go) | +| Storage - Files | [github.com/Azure/azure-storage-file-go](https://github.com/Azure/azure-storage-file-go) | +| Storage - Queues | [github.com/Azure/azure-storage-queue-go](https://github.com/Azure/azure-storage-queue-go) | The `github.com/Azure/azure-sdk-for-go/storage` package is used to manage [Azure Storage](https://docs.microsoft.com/en-us/azure/storage/) data plane diff --git a/vendor/github.com/Azure/azure-sdk-for-go/version/version.go b/vendor/github.com/Azure/azure-sdk-for-go/version/version.go index 0bf03ceee37f..fe6c1f7b48f6 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/version/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/version/version.go @@ -18,4 +18,4 @@ package version // Changes may cause incorrect behavior and will be lost if the code is regenerated. // Number contains the semantic version of this SDK. -const Number = "v16.2.1" +const Number = "v17.4.0" diff --git a/vendor/github.com/Azure/go-autorest/autorest/adal/config.go b/vendor/github.com/Azure/go-autorest/autorest/adal/config.go index f570d540a623..bee5e61ddb2c 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/adal/config.go +++ b/vendor/github.com/Azure/go-autorest/autorest/adal/config.go @@ -26,10 +26,10 @@ const ( // OAuthConfig represents the endpoints needed // in OAuth operations type OAuthConfig struct { - AuthorityEndpoint url.URL - AuthorizeEndpoint url.URL - TokenEndpoint url.URL - DeviceCodeEndpoint url.URL + AuthorityEndpoint url.URL `json:"authorityEndpoint"` + AuthorizeEndpoint url.URL `json:"authorizeEndpoint"` + TokenEndpoint url.URL `json:"tokenEndpoint"` + DeviceCodeEndpoint url.URL `json:"deviceCodeEndpoint"` } // IsZero returns true if the OAuthConfig object is zero-initialized. diff --git a/vendor/github.com/Azure/go-autorest/autorest/adal/token.go b/vendor/github.com/Azure/go-autorest/autorest/adal/token.go index 67c5a0b0ba50..c17ad2474616 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/adal/token.go +++ b/vendor/github.com/Azure/go-autorest/autorest/adal/token.go @@ -22,8 +22,10 @@ import ( "crypto/x509" "encoding/base64" "encoding/json" + "errors" "fmt" "io/ioutil" + "math" "net" "net/http" "net/url" @@ -136,6 +138,12 @@ func (t *Token) OAuthToken() string { return t.AccessToken } +// ServicePrincipalSecret is an interface that allows various secret mechanism to fill the form +// that is submitted when acquiring an oAuth token. +type ServicePrincipalSecret interface { + SetAuthenticationValues(spt *ServicePrincipalToken, values *url.Values) error +} + // ServicePrincipalNoSecret represents a secret type that contains no secret // meaning it is not valid for fetching a fresh token. This is used by Manual type ServicePrincipalNoSecret struct { @@ -147,15 +155,19 @@ func (noSecret *ServicePrincipalNoSecret) SetAuthenticationValues(spt *ServicePr return fmt.Errorf("Manually created ServicePrincipalToken does not contain secret material to retrieve a new access token") } -// ServicePrincipalSecret is an interface that allows various secret mechanism to fill the form -// that is submitted when acquiring an oAuth token. -type ServicePrincipalSecret interface { - SetAuthenticationValues(spt *ServicePrincipalToken, values *url.Values) error +// MarshalJSON implements the json.Marshaler interface. +func (noSecret ServicePrincipalNoSecret) MarshalJSON() ([]byte, error) { + type tokenType struct { + Type string `json:"type"` + } + return json.Marshal(tokenType{ + Type: "ServicePrincipalNoSecret", + }) } // ServicePrincipalTokenSecret implements ServicePrincipalSecret for client_secret type authorization. type ServicePrincipalTokenSecret struct { - ClientSecret string + ClientSecret string `json:"value"` } // SetAuthenticationValues is a method of the interface ServicePrincipalSecret. @@ -165,49 +177,24 @@ func (tokenSecret *ServicePrincipalTokenSecret) SetAuthenticationValues(spt *Ser return nil } +// MarshalJSON implements the json.Marshaler interface. +func (tokenSecret ServicePrincipalTokenSecret) MarshalJSON() ([]byte, error) { + type tokenType struct { + Type string `json:"type"` + Value string `json:"value"` + } + return json.Marshal(tokenType{ + Type: "ServicePrincipalTokenSecret", + Value: tokenSecret.ClientSecret, + }) +} + // ServicePrincipalCertificateSecret implements ServicePrincipalSecret for generic RSA cert auth with signed JWTs. type ServicePrincipalCertificateSecret struct { Certificate *x509.Certificate PrivateKey *rsa.PrivateKey } -// ServicePrincipalMSISecret implements ServicePrincipalSecret for machines running the MSI Extension. -type ServicePrincipalMSISecret struct { -} - -// ServicePrincipalUsernamePasswordSecret implements ServicePrincipalSecret for username and password auth. -type ServicePrincipalUsernamePasswordSecret struct { - Username string - Password string -} - -// ServicePrincipalAuthorizationCodeSecret implements ServicePrincipalSecret for authorization code auth. -type ServicePrincipalAuthorizationCodeSecret struct { - ClientSecret string - AuthorizationCode string - RedirectURI string -} - -// SetAuthenticationValues is a method of the interface ServicePrincipalSecret. -func (secret *ServicePrincipalAuthorizationCodeSecret) SetAuthenticationValues(spt *ServicePrincipalToken, v *url.Values) error { - v.Set("code", secret.AuthorizationCode) - v.Set("client_secret", secret.ClientSecret) - v.Set("redirect_uri", secret.RedirectURI) - return nil -} - -// SetAuthenticationValues is a method of the interface ServicePrincipalSecret. -func (secret *ServicePrincipalUsernamePasswordSecret) SetAuthenticationValues(spt *ServicePrincipalToken, v *url.Values) error { - v.Set("username", secret.Username) - v.Set("password", secret.Password) - return nil -} - -// SetAuthenticationValues is a method of the interface ServicePrincipalSecret. -func (msiSecret *ServicePrincipalMSISecret) SetAuthenticationValues(spt *ServicePrincipalToken, v *url.Values) error { - return nil -} - // SignJwt returns the JWT signed with the certificate's private key. func (secret *ServicePrincipalCertificateSecret) SignJwt(spt *ServicePrincipalToken) (string, error) { hasher := sha1.New() @@ -228,9 +215,9 @@ func (secret *ServicePrincipalCertificateSecret) SignJwt(spt *ServicePrincipalTo token := jwt.New(jwt.SigningMethodRS256) token.Header["x5t"] = thumbprint token.Claims = jwt.MapClaims{ - "aud": spt.oauthConfig.TokenEndpoint.String(), - "iss": spt.clientID, - "sub": spt.clientID, + "aud": spt.inner.OauthConfig.TokenEndpoint.String(), + "iss": spt.inner.ClientID, + "sub": spt.inner.ClientID, "jti": base64.URLEncoding.EncodeToString(jti), "nbf": time.Now().Unix(), "exp": time.Now().Add(time.Hour * 24).Unix(), @@ -253,21 +240,151 @@ func (secret *ServicePrincipalCertificateSecret) SetAuthenticationValues(spt *Se return nil } +// MarshalJSON implements the json.Marshaler interface. +func (secret ServicePrincipalCertificateSecret) MarshalJSON() ([]byte, error) { + return nil, errors.New("marshalling ServicePrincipalCertificateSecret is not supported") +} + +// ServicePrincipalMSISecret implements ServicePrincipalSecret for machines running the MSI Extension. +type ServicePrincipalMSISecret struct { +} + +// SetAuthenticationValues is a method of the interface ServicePrincipalSecret. +func (msiSecret *ServicePrincipalMSISecret) SetAuthenticationValues(spt *ServicePrincipalToken, v *url.Values) error { + return nil +} + +// MarshalJSON implements the json.Marshaler interface. +func (msiSecret ServicePrincipalMSISecret) MarshalJSON() ([]byte, error) { + return nil, errors.New("marshalling ServicePrincipalMSISecret is not supported") +} + +// ServicePrincipalUsernamePasswordSecret implements ServicePrincipalSecret for username and password auth. +type ServicePrincipalUsernamePasswordSecret struct { + Username string `json:"username"` + Password string `json:"password"` +} + +// SetAuthenticationValues is a method of the interface ServicePrincipalSecret. +func (secret *ServicePrincipalUsernamePasswordSecret) SetAuthenticationValues(spt *ServicePrincipalToken, v *url.Values) error { + v.Set("username", secret.Username) + v.Set("password", secret.Password) + return nil +} + +// MarshalJSON implements the json.Marshaler interface. +func (secret ServicePrincipalUsernamePasswordSecret) MarshalJSON() ([]byte, error) { + type tokenType struct { + Type string `json:"type"` + Username string `json:"username"` + Password string `json:"password"` + } + return json.Marshal(tokenType{ + Type: "ServicePrincipalUsernamePasswordSecret", + Username: secret.Username, + Password: secret.Password, + }) +} + +// ServicePrincipalAuthorizationCodeSecret implements ServicePrincipalSecret for authorization code auth. +type ServicePrincipalAuthorizationCodeSecret struct { + ClientSecret string `json:"value"` + AuthorizationCode string `json:"authCode"` + RedirectURI string `json:"redirect"` +} + +// SetAuthenticationValues is a method of the interface ServicePrincipalSecret. +func (secret *ServicePrincipalAuthorizationCodeSecret) SetAuthenticationValues(spt *ServicePrincipalToken, v *url.Values) error { + v.Set("code", secret.AuthorizationCode) + v.Set("client_secret", secret.ClientSecret) + v.Set("redirect_uri", secret.RedirectURI) + return nil +} + +// MarshalJSON implements the json.Marshaler interface. +func (secret ServicePrincipalAuthorizationCodeSecret) MarshalJSON() ([]byte, error) { + type tokenType struct { + Type string `json:"type"` + Value string `json:"value"` + AuthCode string `json:"authCode"` + Redirect string `json:"redirect"` + } + return json.Marshal(tokenType{ + Type: "ServicePrincipalAuthorizationCodeSecret", + Value: secret.ClientSecret, + AuthCode: secret.AuthorizationCode, + Redirect: secret.RedirectURI, + }) +} + // ServicePrincipalToken encapsulates a Token created for a Service Principal. type ServicePrincipalToken struct { - token Token - secret ServicePrincipalSecret - oauthConfig OAuthConfig - clientID string - resource string - autoRefresh bool - refreshLock *sync.RWMutex - refreshWithin time.Duration - sender Sender - + inner servicePrincipalToken + refreshLock *sync.RWMutex + sender Sender refreshCallbacks []TokenRefreshCallback } +// MarshalTokenJSON returns the marshalled inner token. +func (spt ServicePrincipalToken) MarshalTokenJSON() ([]byte, error) { + return json.Marshal(spt.inner.Token) +} + +// SetRefreshCallbacks replaces any existing refresh callbacks with the specified callbacks. +func (spt *ServicePrincipalToken) SetRefreshCallbacks(callbacks []TokenRefreshCallback) { + spt.refreshCallbacks = callbacks +} + +// MarshalJSON implements the json.Marshaler interface. +func (spt ServicePrincipalToken) MarshalJSON() ([]byte, error) { + return json.Marshal(spt.inner) +} + +// UnmarshalJSON implements the json.Unmarshaler interface. +func (spt *ServicePrincipalToken) UnmarshalJSON(data []byte) error { + // need to determine the token type + raw := map[string]interface{}{} + err := json.Unmarshal(data, &raw) + if err != nil { + return err + } + secret := raw["secret"].(map[string]interface{}) + switch secret["type"] { + case "ServicePrincipalNoSecret": + spt.inner.Secret = &ServicePrincipalNoSecret{} + case "ServicePrincipalTokenSecret": + spt.inner.Secret = &ServicePrincipalTokenSecret{} + case "ServicePrincipalCertificateSecret": + return errors.New("unmarshalling ServicePrincipalCertificateSecret is not supported") + case "ServicePrincipalMSISecret": + return errors.New("unmarshalling ServicePrincipalMSISecret is not supported") + case "ServicePrincipalUsernamePasswordSecret": + spt.inner.Secret = &ServicePrincipalUsernamePasswordSecret{} + case "ServicePrincipalAuthorizationCodeSecret": + spt.inner.Secret = &ServicePrincipalAuthorizationCodeSecret{} + default: + return fmt.Errorf("unrecognized token type '%s'", secret["type"]) + } + err = json.Unmarshal(data, &spt.inner) + if err != nil { + return err + } + spt.refreshLock = &sync.RWMutex{} + spt.sender = &http.Client{} + return nil +} + +// internal type used for marshalling/unmarshalling +type servicePrincipalToken struct { + Token Token `json:"token"` + Secret ServicePrincipalSecret `json:"secret"` + OauthConfig OAuthConfig `json:"oauth"` + ClientID string `json:"clientID"` + Resource string `json:"resource"` + AutoRefresh bool `json:"autoRefresh"` + RefreshWithin time.Duration `json:"refreshWithin"` +} + func validateOAuthConfig(oac OAuthConfig) error { if oac.IsZero() { return fmt.Errorf("parameter 'oauthConfig' cannot be zero-initialized") @@ -290,13 +407,15 @@ func NewServicePrincipalTokenWithSecret(oauthConfig OAuthConfig, id string, reso return nil, fmt.Errorf("parameter 'secret' cannot be nil") } spt := &ServicePrincipalToken{ - oauthConfig: oauthConfig, - secret: secret, - clientID: id, - resource: resource, - autoRefresh: true, + inner: servicePrincipalToken{ + OauthConfig: oauthConfig, + Secret: secret, + ClientID: id, + Resource: resource, + AutoRefresh: true, + RefreshWithin: defaultRefresh, + }, refreshLock: &sync.RWMutex{}, - refreshWithin: defaultRefresh, sender: &http.Client{}, refreshCallbacks: callbacks, } @@ -327,7 +446,39 @@ func NewServicePrincipalTokenFromManualToken(oauthConfig OAuthConfig, clientID s return nil, err } - spt.token = token + spt.inner.Token = token + + return spt, nil +} + +// NewServicePrincipalTokenFromManualTokenSecret creates a ServicePrincipalToken using the supplied token and secret +func NewServicePrincipalTokenFromManualTokenSecret(oauthConfig OAuthConfig, clientID string, resource string, token Token, secret ServicePrincipalSecret, callbacks ...TokenRefreshCallback) (*ServicePrincipalToken, error) { + if err := validateOAuthConfig(oauthConfig); err != nil { + return nil, err + } + if err := validateStringParam(clientID, "clientID"); err != nil { + return nil, err + } + if err := validateStringParam(resource, "resource"); err != nil { + return nil, err + } + if secret == nil { + return nil, fmt.Errorf("parameter 'secret' cannot be nil") + } + if token.IsZero() { + return nil, fmt.Errorf("parameter 'token' cannot be zero-initialized") + } + spt, err := NewServicePrincipalTokenWithSecret( + oauthConfig, + clientID, + resource, + secret, + callbacks...) + if err != nil { + return nil, err + } + + spt.inner.Token = token return spt, nil } @@ -495,20 +646,22 @@ func newServicePrincipalTokenFromMSI(msiEndpoint, resource string, userAssignedI msiEndpointURL.RawQuery = v.Encode() spt := &ServicePrincipalToken{ - oauthConfig: OAuthConfig{ - TokenEndpoint: *msiEndpointURL, + inner: servicePrincipalToken{ + OauthConfig: OAuthConfig{ + TokenEndpoint: *msiEndpointURL, + }, + Secret: &ServicePrincipalMSISecret{}, + Resource: resource, + AutoRefresh: true, + RefreshWithin: defaultRefresh, }, - secret: &ServicePrincipalMSISecret{}, - resource: resource, - autoRefresh: true, refreshLock: &sync.RWMutex{}, - refreshWithin: defaultRefresh, sender: &http.Client{}, refreshCallbacks: callbacks, } if userAssignedID != nil { - spt.clientID = *userAssignedID + spt.inner.ClientID = *userAssignedID } return spt, nil @@ -543,12 +696,12 @@ func (spt *ServicePrincipalToken) EnsureFresh() error { // EnsureFreshWithContext will refresh the token if it will expire within the refresh window (as set by // RefreshWithin) and autoRefresh flag is on. This method is safe for concurrent use. func (spt *ServicePrincipalToken) EnsureFreshWithContext(ctx context.Context) error { - if spt.autoRefresh && spt.token.WillExpireIn(spt.refreshWithin) { + if spt.inner.AutoRefresh && spt.inner.Token.WillExpireIn(spt.inner.RefreshWithin) { // take the write lock then check to see if the token was already refreshed spt.refreshLock.Lock() defer spt.refreshLock.Unlock() - if spt.token.WillExpireIn(spt.refreshWithin) { - return spt.refreshInternal(ctx, spt.resource) + if spt.inner.Token.WillExpireIn(spt.inner.RefreshWithin) { + return spt.refreshInternal(ctx, spt.inner.Resource) } } return nil @@ -558,7 +711,7 @@ func (spt *ServicePrincipalToken) EnsureFreshWithContext(ctx context.Context) er func (spt *ServicePrincipalToken) InvokeRefreshCallbacks(token Token) error { if spt.refreshCallbacks != nil { for _, callback := range spt.refreshCallbacks { - err := callback(spt.token) + err := callback(spt.inner.Token) if err != nil { return fmt.Errorf("adal: TokenRefreshCallback handler failed. Error = '%v'", err) } @@ -578,7 +731,7 @@ func (spt *ServicePrincipalToken) Refresh() error { func (spt *ServicePrincipalToken) RefreshWithContext(ctx context.Context) error { spt.refreshLock.Lock() defer spt.refreshLock.Unlock() - return spt.refreshInternal(ctx, spt.resource) + return spt.refreshInternal(ctx, spt.inner.Resource) } // RefreshExchange refreshes the token, but for a different resource. @@ -596,7 +749,7 @@ func (spt *ServicePrincipalToken) RefreshExchangeWithContext(ctx context.Context } func (spt *ServicePrincipalToken) getGrantType() string { - switch spt.secret.(type) { + switch spt.inner.Secret.(type) { case *ServicePrincipalUsernamePasswordSecret: return OAuthGrantTypeUserPass case *ServicePrincipalAuthorizationCodeSecret: @@ -615,22 +768,30 @@ func isIMDS(u url.URL) bool { } func (spt *ServicePrincipalToken) refreshInternal(ctx context.Context, resource string) error { - req, err := http.NewRequest(http.MethodPost, spt.oauthConfig.TokenEndpoint.String(), nil) + req, err := http.NewRequest(http.MethodPost, spt.inner.OauthConfig.TokenEndpoint.String(), nil) if err != nil { return fmt.Errorf("adal: Failed to build the refresh request. Error = '%v'", err) } req = req.WithContext(ctx) - if !isIMDS(spt.oauthConfig.TokenEndpoint) { + if !isIMDS(spt.inner.OauthConfig.TokenEndpoint) { v := url.Values{} - v.Set("client_id", spt.clientID) + v.Set("client_id", spt.inner.ClientID) v.Set("resource", resource) - if spt.token.RefreshToken != "" { + if spt.inner.Token.RefreshToken != "" { v.Set("grant_type", OAuthGrantTypeRefreshToken) - v.Set("refresh_token", spt.token.RefreshToken) + v.Set("refresh_token", spt.inner.Token.RefreshToken) + // web apps must specify client_secret when refreshing tokens + // see https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-protocols-oauth-code#refreshing-the-access-tokens + if spt.getGrantType() == OAuthGrantTypeAuthorizationCode { + err := spt.inner.Secret.SetAuthenticationValues(spt, &v) + if err != nil { + return err + } + } } else { v.Set("grant_type", spt.getGrantType()) - err := spt.secret.SetAuthenticationValues(spt, &v) + err := spt.inner.Secret.SetAuthenticationValues(spt, &v) if err != nil { return err } @@ -643,14 +804,14 @@ func (spt *ServicePrincipalToken) refreshInternal(ctx context.Context, resource req.Body = body } - if _, ok := spt.secret.(*ServicePrincipalMSISecret); ok { + if _, ok := spt.inner.Secret.(*ServicePrincipalMSISecret); ok { req.Method = http.MethodGet req.Header.Set(metadataHeader, "true") } var resp *http.Response - if isIMDS(spt.oauthConfig.TokenEndpoint) { - resp, err = retry(spt.sender, req) + if isIMDS(spt.inner.OauthConfig.TokenEndpoint) { + resp, err = retryForIMDS(spt.sender, req) } else { resp, err = spt.sender.Do(req) } @@ -684,12 +845,14 @@ func (spt *ServicePrincipalToken) refreshInternal(ctx context.Context, resource return fmt.Errorf("adal: Failed to unmarshal the service principal token during refresh. Error = '%v' JSON = '%s'", err, string(rb)) } - spt.token = token + spt.inner.Token = token return spt.InvokeRefreshCallbacks(token) } -func retry(sender Sender, req *http.Request) (resp *http.Response, err error) { +// retry logic specific to retrieving a token from the IMDS endpoint +func retryForIMDS(sender Sender, req *http.Request) (resp *http.Response, err error) { + // copied from client.go due to circular dependency retries := []int{ http.StatusRequestTimeout, // 408 http.StatusTooManyRequests, // 429 @@ -698,8 +861,10 @@ func retry(sender Sender, req *http.Request) (resp *http.Response, err error) { http.StatusServiceUnavailable, // 503 http.StatusGatewayTimeout, // 504 } - // Extra retry status codes requered - retries = append(retries, http.StatusNotFound, + // extra retry status codes specific to IMDS + retries = append(retries, + http.StatusNotFound, + http.StatusGone, // all remaining 5xx http.StatusNotImplemented, http.StatusHTTPVersionNotSupported, @@ -709,36 +874,53 @@ func retry(sender Sender, req *http.Request) (resp *http.Response, err error) { http.StatusNotExtended, http.StatusNetworkAuthenticationRequired) + // see https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/how-to-use-vm-token#retry-guidance + + const maxAttempts int = 5 + const maxDelay time.Duration = 60 * time.Second + attempt := 0 - maxAttempts := 5 + delay := time.Duration(0) for attempt < maxAttempts { resp, err = sender.Do(req) // retry on temporary network errors, e.g. transient network failures. - if (err != nil && !isTemporaryNetworkError(err)) || resp.StatusCode == http.StatusOK || !containsInt(retries, resp.StatusCode) { + // if we don't receive a response then assume we can't connect to the + // endpoint so we're likely not running on an Azure VM so don't retry. + if (err != nil && !isTemporaryNetworkError(err)) || resp == nil || resp.StatusCode == http.StatusOK || !containsInt(retries, resp.StatusCode) { return } - if !delay(resp, req.Context().Done()) { - select { - case <-time.After(time.Second): - attempt++ - case <-req.Context().Done(): - err = req.Context().Err() - return - } + // perform exponential backoff with a cap. + // must increment attempt before calculating delay. + attempt++ + // the base value of 2 is the "delta backoff" as specified in the guidance doc + delay += (time.Duration(math.Pow(2, float64(attempt))) * time.Second) + if delay > maxDelay { + delay = maxDelay + } + + select { + case <-time.After(delay): + // intentionally left blank + case <-req.Context().Done(): + err = req.Context().Err() + return } } return } +// returns true if the specified error is a temporary network error or false if it's not. +// if the error doesn't implement the net.Error interface the return value is true. func isTemporaryNetworkError(err error) bool { - if netErr, ok := err.(net.Error); ok && netErr.Temporary() { + if netErr, ok := err.(net.Error); !ok || (ok && netErr.Temporary()) { return true } return false } +// returns true if slice ints contains the value n func containsInt(ints []int, n int) bool { for _, i := range ints { if i == n { @@ -748,31 +930,15 @@ func containsInt(ints []int, n int) bool { return false } -func delay(resp *http.Response, cancel <-chan struct{}) bool { - if resp == nil { - return false - } - retryAfter, _ := strconv.Atoi(resp.Header.Get("Retry-After")) - if resp.StatusCode == http.StatusTooManyRequests && retryAfter > 0 { - select { - case <-time.After(time.Duration(retryAfter) * time.Second): - return true - case <-cancel: - return false - } - } - return false -} - // SetAutoRefresh enables or disables automatic refreshing of stale tokens. func (spt *ServicePrincipalToken) SetAutoRefresh(autoRefresh bool) { - spt.autoRefresh = autoRefresh + spt.inner.AutoRefresh = autoRefresh } // SetRefreshWithin sets the interval within which if the token will expire, EnsureFresh will // refresh the token. func (spt *ServicePrincipalToken) SetRefreshWithin(d time.Duration) { - spt.refreshWithin = d + spt.inner.RefreshWithin = d return } @@ -784,12 +950,12 @@ func (spt *ServicePrincipalToken) SetSender(s Sender) { spt.sender = s } func (spt *ServicePrincipalToken) OAuthToken() string { spt.refreshLock.RLock() defer spt.refreshLock.RUnlock() - return spt.token.OAuthToken() + return spt.inner.Token.OAuthToken() } // Token returns a copy of the current token. func (spt *ServicePrincipalToken) Token() Token { spt.refreshLock.RLock() defer spt.refreshLock.RUnlock() - return spt.token + return spt.inner.Token } diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/async.go b/vendor/github.com/Azure/go-autorest/autorest/azure/async.go index a58e5ef3f1c9..cda1e180acf9 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/async.go +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/async.go @@ -21,11 +21,11 @@ import ( "fmt" "io/ioutil" "net/http" + "net/url" "strings" "time" "github.com/Azure/go-autorest/autorest" - "github.com/Azure/go-autorest/autorest/date" ) const ( @@ -44,84 +44,85 @@ var pollingCodes = [...]int{http.StatusNoContent, http.StatusAccepted, http.Stat // Future provides a mechanism to access the status and results of an asynchronous request. // Since futures are stateful they should be passed by value to avoid race conditions. type Future struct { - req *http.Request - resp *http.Response - ps pollingState + req *http.Request // legacy + pt pollingTracker } // NewFuture returns a new Future object initialized with the specified request. +// Deprecated: Please use NewFutureFromResponse instead. func NewFuture(req *http.Request) Future { return Future{req: req} } -// Response returns the last HTTP response or nil if there isn't one. +// NewFutureFromResponse returns a new Future object initialized +// with the initial response from an asynchronous operation. +func NewFutureFromResponse(resp *http.Response) (Future, error) { + pt, err := createPollingTracker(resp) + if err != nil { + return Future{}, err + } + return Future{pt: pt}, nil +} + +// Response returns the last HTTP response. func (f Future) Response() *http.Response { - return f.resp + if f.pt == nil { + return nil + } + return f.pt.latestResponse() } // Status returns the last status message of the operation. func (f Future) Status() string { - if f.ps.State == "" { - return "Unknown" + if f.pt == nil { + return "" } - return f.ps.State + return f.pt.pollingStatus() } // PollingMethod returns the method used to monitor the status of the asynchronous operation. func (f Future) PollingMethod() PollingMethodType { - return f.ps.PollingMethod + if f.pt == nil { + return PollingUnknown + } + return f.pt.pollingMethod() } // Done queries the service to see if the operation has completed. func (f *Future) Done(sender autorest.Sender) (bool, error) { - // exit early if this future has terminated - if f.ps.hasTerminated() { - return true, f.errorInfo() + // support for legacy Future implementation + if f.req != nil { + resp, err := sender.Do(f.req) + if err != nil { + return false, err + } + pt, err := createPollingTracker(resp) + if err != nil { + return false, err + } + f.pt = pt + f.req = nil } - resp, err := sender.Do(f.req) - f.resp = resp - if err != nil { + // end legacy + if f.pt == nil { + return false, autorest.NewError("Future", "Done", "future is not initialized") + } + if f.pt.hasTerminated() { + return true, f.pt.pollingError() + } + if err := f.pt.pollForStatus(sender); err != nil { return false, err } - - if !autorest.ResponseHasStatusCode(resp, pollingCodes[:]...) { - // check response body for error content - if resp.Body != nil { - type respErr struct { - ServiceError ServiceError `json:"error"` - } - re := respErr{} - - defer resp.Body.Close() - b, err := ioutil.ReadAll(resp.Body) - if err != nil { - return false, err - } - err = json.Unmarshal(b, &re) - if err != nil { - return false, err - } - return false, re.ServiceError - } - - // try to return something meaningful - return false, ServiceError{ - Code: fmt.Sprintf("%v", resp.StatusCode), - Message: resp.Status, - } + if err := f.pt.checkForErrors(); err != nil { + return f.pt.hasTerminated(), err } - - err = updatePollingState(resp, &f.ps) - if err != nil { + if err := f.pt.updatePollingState(f.pt.provisioningStateApplicable()); err != nil { return false, err } - - if f.ps.hasTerminated() { - return true, f.errorInfo() + if err := f.pt.updateHeaders(); err != nil { + return false, err } - - f.req, err = newPollingRequest(f.ps) - return false, err + return f.pt.hasTerminated(), f.pt.pollingError() } // GetPollingDelay returns a duration the application should wait before checking @@ -129,11 +130,15 @@ func (f *Future) Done(sender autorest.Sender) (bool, error) { // the service via the Retry-After response header. If the header wasn't returned // then the function returns the zero-value time.Duration and false. func (f Future) GetPollingDelay() (time.Duration, bool) { - if f.resp == nil { + if f.pt == nil { + return 0, false + } + resp := f.pt.latestResponse() + if resp == nil { return 0, false } - retry := f.resp.Header.Get(autorest.HeaderRetryAfter) + retry := resp.Header.Get(autorest.HeaderRetryAfter) if retry == "" { return 0, false } @@ -150,14 +155,22 @@ func (f Future) GetPollingDelay() (time.Duration, bool) { // running operation has completed, the provided context is cancelled, or the client's // polling duration has been exceeded. It will retry failed polling attempts based on // the retry value defined in the client up to the maximum retry attempts. +// Deprecated: Please use WaitForCompletionRef() instead. func (f Future) WaitForCompletion(ctx context.Context, client autorest.Client) error { + return f.WaitForCompletionRef(ctx, client) +} + +// WaitForCompletionRef will return when one of the following conditions is met: the long +// running operation has completed, the provided context is cancelled, or the client's +// polling duration has been exceeded. It will retry failed polling attempts based on +// the retry value defined in the client up to the maximum retry attempts. +func (f *Future) WaitForCompletionRef(ctx context.Context, client autorest.Client) error { ctx, cancel := context.WithTimeout(ctx, client.PollingDuration) defer cancel() - done, err := f.Done(client) for attempts := 0; !done; done, err = f.Done(client) { if attempts >= client.RetryAttempts { - return autorest.NewErrorWithError(err, "azure", "WaitForCompletion", f.resp, "the number of retries has been exceeded") + return autorest.NewErrorWithError(err, "Future", "WaitForCompletion", f.pt.latestResponse(), "the number of retries has been exceeded") } // we want delayAttempt to be zero in the non-error case so // that DelayForBackoff doesn't perform exponential back-off @@ -181,317 +194,709 @@ func (f Future) WaitForCompletion(ctx context.Context, client autorest.Client) e // wait until the delay elapses or the context is cancelled delayElapsed := autorest.DelayForBackoff(delay, delayAttempt, ctx.Done()) if !delayElapsed { - return autorest.NewErrorWithError(ctx.Err(), "azure", "WaitForCompletion", f.resp, "context has been cancelled") + return autorest.NewErrorWithError(ctx.Err(), "Future", "WaitForCompletion", f.pt.latestResponse(), "context has been cancelled") } } return err } -// if the operation failed the polling state will contain -// error information and implements the error interface -func (f *Future) errorInfo() error { - if !f.ps.hasSucceeded() { - return f.ps - } - return nil -} - // MarshalJSON implements the json.Marshaler interface. func (f Future) MarshalJSON() ([]byte, error) { - return json.Marshal(&f.ps) + return json.Marshal(f.pt) } // UnmarshalJSON implements the json.Unmarshaler interface. func (f *Future) UnmarshalJSON(data []byte) error { - err := json.Unmarshal(data, &f.ps) + // unmarshal into JSON object to determine the tracker type + obj := map[string]interface{}{} + err := json.Unmarshal(data, &obj) if err != nil { return err } - f.req, err = newPollingRequest(f.ps) - return err + if obj["method"] == nil { + return autorest.NewError("Future", "UnmarshalJSON", "missing 'method' property") + } + method := obj["method"].(string) + switch strings.ToUpper(method) { + case http.MethodDelete: + f.pt = &pollingTrackerDelete{} + case http.MethodPatch: + f.pt = &pollingTrackerPatch{} + case http.MethodPost: + f.pt = &pollingTrackerPost{} + case http.MethodPut: + f.pt = &pollingTrackerPut{} + default: + return autorest.NewError("Future", "UnmarshalJSON", "unsupoorted method '%s'", method) + } + // now unmarshal into the tracker + return json.Unmarshal(data, &f.pt) } // PollingURL returns the URL used for retrieving the status of the long-running operation. -// For LROs that use the Location header the final URL value is used to retrieve the result. func (f Future) PollingURL() string { - return f.ps.URI + if f.pt == nil { + return "" + } + return f.pt.pollingURL() +} + +// GetResult should be called once polling has completed successfully. +// It makes the final GET call to retrieve the resultant payload. +func (f Future) GetResult(sender autorest.Sender) (*http.Response, error) { + if f.pt.finalGetURL() == "" { + // we can end up in this situation if the async operation returns a 200 + // with no polling URLs. in that case return the response which should + // contain the JSON payload (only do this for successful terminal cases). + if lr := f.pt.latestResponse(); lr != nil && f.pt.hasSucceeded() { + return lr, nil + } + return nil, autorest.NewError("Future", "GetResult", "missing URL for retrieving result") + } + req, err := http.NewRequest(http.MethodGet, f.pt.finalGetURL(), nil) + if err != nil { + return nil, err + } + return sender.Do(req) } -// DoPollForAsynchronous returns a SendDecorator that polls if the http.Response is for an Azure -// long-running operation. It will delay between requests for the duration specified in the -// RetryAfter header or, if the header is absent, the passed delay. Polling may be canceled by -// closing the optional channel on the http.Request. -func DoPollForAsynchronous(delay time.Duration) autorest.SendDecorator { - return func(s autorest.Sender) autorest.Sender { - return autorest.SenderFunc(func(r *http.Request) (resp *http.Response, err error) { - resp, err = s.Do(r) - if err != nil { - return resp, err - } - if !autorest.ResponseHasStatusCode(resp, pollingCodes[:]...) { - return resp, nil - } +type pollingTracker interface { + // these methods can differ per tracker - ps := pollingState{} - for err == nil { - err = updatePollingState(resp, &ps) - if err != nil { - break - } - if ps.hasTerminated() { - if !ps.hasSucceeded() { - err = ps - } - break - } + // checks the response headers and status code to determine the polling mechanism + updateHeaders() error - r, err = newPollingRequest(ps) - if err != nil { - return resp, err - } - r = r.WithContext(resp.Request.Context()) + // checks the response for tracker-specific error conditions + checkForErrors() error - delay = autorest.GetRetryAfter(resp, delay) - resp, err = autorest.SendWithSender(s, r, - autorest.AfterDelay(delay)) - } + // returns true if provisioning state should be checked + provisioningStateApplicable() bool - return resp, err - }) - } + // methods common to all trackers + + // initializes the tracker's internal state, call this when the tracker is created + initializeState() error + + // makes an HTTP request to check the status of the LRO + pollForStatus(sender autorest.Sender) error + + // updates internal tracker state, call this after each call to pollForStatus + updatePollingState(provStateApl bool) error + + // returns the error response from the service, can be nil + pollingError() error + + // returns the polling method being used + pollingMethod() PollingMethodType + + // returns the state of the LRO as returned from the service + pollingStatus() string + + // returns the URL used for polling status + pollingURL() string + + // returns the URL used for the final GET to retrieve the resource + finalGetURL() string + + // returns true if the LRO is in a terminal state + hasTerminated() bool + + // returns true if the LRO is in a failed terminal state + hasFailed() bool + + // returns true if the LRO is in a successful terminal state + hasSucceeded() bool + + // returns the cached HTTP response after a call to pollForStatus(), can be nil + latestResponse() *http.Response } -func getAsyncOperation(resp *http.Response) string { - return resp.Header.Get(http.CanonicalHeaderKey(headerAsyncOperation)) +type pollingTrackerBase struct { + // resp is the last response, either from the submission of the LRO or from polling + resp *http.Response + + // method is the HTTP verb, this is needed for deserialization + Method string `json:"method"` + + // rawBody is the raw JSON response body + rawBody map[string]interface{} + + // denotes if polling is using async-operation or location header + Pm PollingMethodType `json:"pollingMethod"` + + // the URL to poll for status + URI string `json:"pollingURI"` + + // the state of the LRO as returned from the service + State string `json:"lroState"` + + // the URL to GET for the final result + FinalGetURI string `json:"resultURI"` + + // used to hold an error object returned from the service + Err *ServiceError `json:"error,omitempty"` } -func hasSucceeded(state string) bool { - return strings.EqualFold(state, operationSucceeded) +func (pt *pollingTrackerBase) initializeState() error { + // determine the initial polling state based on response body and/or HTTP status + // code. this is applicable to the initial LRO response, not polling responses! + pt.Method = pt.resp.Request.Method + if err := pt.updateRawBody(); err != nil { + return err + } + switch pt.resp.StatusCode { + case http.StatusOK: + if ps := pt.getProvisioningState(); ps != nil { + pt.State = *ps + } else { + pt.State = operationSucceeded + } + case http.StatusCreated: + if ps := pt.getProvisioningState(); ps != nil { + pt.State = *ps + } else { + pt.State = operationInProgress + } + case http.StatusAccepted: + pt.State = operationInProgress + case http.StatusNoContent: + pt.State = operationSucceeded + default: + pt.State = operationFailed + pt.updateErrorFromResponse() + } + return nil } -func hasTerminated(state string) bool { - return strings.EqualFold(state, operationCanceled) || strings.EqualFold(state, operationFailed) || strings.EqualFold(state, operationSucceeded) +func (pt pollingTrackerBase) getProvisioningState() *string { + if pt.rawBody != nil && pt.rawBody["properties"] != nil { + p := pt.rawBody["properties"].(map[string]interface{}) + if ps := p["provisioningState"]; ps != nil { + s := ps.(string) + return &s + } + } + return nil } -func hasFailed(state string) bool { - return strings.EqualFold(state, operationFailed) +func (pt *pollingTrackerBase) updateRawBody() error { + pt.rawBody = map[string]interface{}{} + if pt.resp.ContentLength != 0 { + defer pt.resp.Body.Close() + b, err := ioutil.ReadAll(pt.resp.Body) + if err != nil { + return autorest.NewErrorWithError(err, "pollingTrackerBase", "updateRawBody", nil, "failed to read response body") + } + // put the body back so it's available to other callers + pt.resp.Body = ioutil.NopCloser(bytes.NewReader(b)) + if err = json.Unmarshal(b, &pt.rawBody); err != nil { + return autorest.NewErrorWithError(err, "pollingTrackerBase", "updateRawBody", nil, "failed to unmarshal response body") + } + } + return nil } -type provisioningTracker interface { - state() string - hasSucceeded() bool - hasTerminated() bool +func (pt *pollingTrackerBase) pollForStatus(sender autorest.Sender) error { + req, err := http.NewRequest(http.MethodGet, pt.URI, nil) + if err != nil { + return autorest.NewErrorWithError(err, "pollingTrackerBase", "pollForStatus", nil, "failed to create HTTP request") + } + // attach the context from the original request if available (it will be absent for deserialized futures) + if pt.resp != nil { + req = req.WithContext(pt.resp.Request.Context()) + } + pt.resp, err = sender.Do(req) + if err != nil { + return autorest.NewErrorWithError(err, "pollingTrackerBase", "pollForStatus", nil, "failed to send HTTP request") + } + if autorest.ResponseHasStatusCode(pt.resp, pollingCodes[:]...) { + // reset the service error on success case + pt.Err = nil + err = pt.updateRawBody() + } else { + // check response body for error content + pt.updateErrorFromResponse() + } + return err } -type operationResource struct { - // Note: - // The specification states services should return the "id" field. However some return it as - // "operationId". - ID string `json:"id"` - OperationID string `json:"operationId"` - Name string `json:"name"` - Status string `json:"status"` - Properties map[string]interface{} `json:"properties"` - OperationError ServiceError `json:"error"` - StartTime date.Time `json:"startTime"` - EndTime date.Time `json:"endTime"` - PercentComplete float64 `json:"percentComplete"` +// attempts to unmarshal a ServiceError type from the response body. +// if that fails then make a best attempt at creating something meaningful. +func (pt *pollingTrackerBase) updateErrorFromResponse() { + var err error + if pt.resp.ContentLength != 0 { + type respErr struct { + ServiceError *ServiceError `json:"error"` + } + re := respErr{} + defer pt.resp.Body.Close() + var b []byte + b, err = ioutil.ReadAll(pt.resp.Body) + if err != nil { + goto Default + } + if err = json.Unmarshal(b, &re); err != nil { + goto Default + } + // unmarshalling the error didn't yield anything, try unwrapped error + if re.ServiceError == nil { + err = json.Unmarshal(b, &re.ServiceError) + if err != nil { + goto Default + } + } + if re.ServiceError != nil { + pt.Err = re.ServiceError + return + } + } +Default: + se := &ServiceError{ + Code: fmt.Sprintf("HTTP status code %v", pt.resp.StatusCode), + Message: pt.resp.Status, + } + if err != nil { + se.InnerError = make(map[string]interface{}) + se.InnerError["unmarshalError"] = err.Error() + } + pt.Err = se } -func (or operationResource) state() string { - return or.Status +func (pt *pollingTrackerBase) updatePollingState(provStateApl bool) error { + if pt.Pm == PollingAsyncOperation && pt.rawBody["status"] != nil { + pt.State = pt.rawBody["status"].(string) + } else { + if pt.resp.StatusCode == http.StatusAccepted { + pt.State = operationInProgress + } else if provStateApl { + if ps := pt.getProvisioningState(); ps != nil { + pt.State = *ps + } else { + pt.State = operationSucceeded + } + } else { + return autorest.NewError("pollingTrackerBase", "updatePollingState", "the response from the async operation has an invalid status code") + } + } + // if the operation has failed update the error state + if pt.hasFailed() { + pt.updateErrorFromResponse() + } + return nil } -func (or operationResource) hasSucceeded() bool { - return hasSucceeded(or.state()) +func (pt pollingTrackerBase) pollingError() error { + if pt.Err == nil { + return nil + } + return pt.Err } -func (or operationResource) hasTerminated() bool { - return hasTerminated(or.state()) +func (pt pollingTrackerBase) pollingMethod() PollingMethodType { + return pt.Pm } -type provisioningProperties struct { - ProvisioningState string `json:"provisioningState"` +func (pt pollingTrackerBase) pollingStatus() string { + return pt.State } -type provisioningStatus struct { - Properties provisioningProperties `json:"properties,omitempty"` - ProvisioningError ServiceError `json:"error,omitempty"` +func (pt pollingTrackerBase) pollingURL() string { + return pt.URI } -func (ps provisioningStatus) state() string { - return ps.Properties.ProvisioningState +func (pt pollingTrackerBase) finalGetURL() string { + return pt.FinalGetURI } -func (ps provisioningStatus) hasSucceeded() bool { - return hasSucceeded(ps.state()) +func (pt pollingTrackerBase) hasTerminated() bool { + return strings.EqualFold(pt.State, operationCanceled) || strings.EqualFold(pt.State, operationFailed) || strings.EqualFold(pt.State, operationSucceeded) } -func (ps provisioningStatus) hasTerminated() bool { - return hasTerminated(ps.state()) +func (pt pollingTrackerBase) hasFailed() bool { + return strings.EqualFold(pt.State, operationCanceled) || strings.EqualFold(pt.State, operationFailed) } -func (ps provisioningStatus) hasProvisioningError() bool { - // code and message are required fields so only check them - return len(ps.ProvisioningError.Code) > 0 || - len(ps.ProvisioningError.Message) > 0 +func (pt pollingTrackerBase) hasSucceeded() bool { + return strings.EqualFold(pt.State, operationSucceeded) } -// PollingMethodType defines a type used for enumerating polling mechanisms. -type PollingMethodType string +func (pt pollingTrackerBase) latestResponse() *http.Response { + return pt.resp +} -const ( - // PollingAsyncOperation indicates the polling method uses the Azure-AsyncOperation header. - PollingAsyncOperation PollingMethodType = "AsyncOperation" +// error checking common to all trackers +func (pt pollingTrackerBase) baseCheckForErrors() error { + // for Azure-AsyncOperations the response body cannot be nil or empty + if pt.Pm == PollingAsyncOperation { + if pt.resp.Body == nil || pt.resp.ContentLength == 0 { + return autorest.NewError("pollingTrackerBase", "baseCheckForErrors", "for Azure-AsyncOperation response body cannot be nil") + } + if pt.rawBody["status"] == nil { + return autorest.NewError("pollingTrackerBase", "baseCheckForErrors", "missing status property in Azure-AsyncOperation response body") + } + } + return nil +} - // PollingLocation indicates the polling method uses the Location header. - PollingLocation PollingMethodType = "Location" +// DELETE - // PollingUnknown indicates an unknown polling method and is the default value. - PollingUnknown PollingMethodType = "" -) +type pollingTrackerDelete struct { + pollingTrackerBase +} -type pollingState struct { - PollingMethod PollingMethodType `json:"pollingMethod"` - URI string `json:"uri"` - State string `json:"state"` - ServiceError *ServiceError `json:"error,omitempty"` +func (pt *pollingTrackerDelete) updateHeaders() error { + // for 201 the Location header is required + if pt.resp.StatusCode == http.StatusCreated { + if lh, err := getURLFromLocationHeader(pt.resp); err != nil { + return err + } else if lh == "" { + return autorest.NewError("pollingTrackerDelete", "updateHeaders", "missing Location header in 201 response") + } else { + pt.URI = lh + } + pt.Pm = PollingLocation + pt.FinalGetURI = pt.URI + } + // for 202 prefer the Azure-AsyncOperation header but fall back to Location if necessary + if pt.resp.StatusCode == http.StatusAccepted { + ao, err := getURLFromAsyncOpHeader(pt.resp) + if err != nil { + return err + } else if ao != "" { + pt.URI = ao + pt.Pm = PollingAsyncOperation + } + // if the Location header is invalid and we already have a polling URL + // then we don't care if the Location header URL is malformed. + if lh, err := getURLFromLocationHeader(pt.resp); err != nil && pt.URI == "" { + return err + } else if lh != "" { + if ao == "" { + pt.URI = lh + pt.Pm = PollingLocation + } + // when both headers are returned we use the value in the Location header for the final GET + pt.FinalGetURI = lh + } + // make sure a polling URL was found + if pt.URI == "" { + return autorest.NewError("pollingTrackerPost", "updateHeaders", "didn't get any suitable polling URLs in 202 response") + } + } + return nil } -func (ps pollingState) hasSucceeded() bool { - return hasSucceeded(ps.State) +func (pt pollingTrackerDelete) checkForErrors() error { + return pt.baseCheckForErrors() } -func (ps pollingState) hasTerminated() bool { - return hasTerminated(ps.State) +func (pt pollingTrackerDelete) provisioningStateApplicable() bool { + return pt.resp.StatusCode == http.StatusOK || pt.resp.StatusCode == http.StatusNoContent } -func (ps pollingState) hasFailed() bool { - return hasFailed(ps.State) +// PATCH + +type pollingTrackerPatch struct { + pollingTrackerBase } -func (ps pollingState) Error() string { - s := fmt.Sprintf("Long running operation terminated with status '%s'", ps.State) - if ps.ServiceError != nil { - s = fmt.Sprintf("%s: %+v", s, *ps.ServiceError) +func (pt *pollingTrackerPatch) updateHeaders() error { + // by default we can use the original URL for polling and final GET + if pt.URI == "" { + pt.URI = pt.resp.Request.URL.String() + } + if pt.FinalGetURI == "" { + pt.FinalGetURI = pt.resp.Request.URL.String() } - return s + if pt.Pm == PollingUnknown { + pt.Pm = PollingRequestURI + } + // for 201 it's permissible for no headers to be returned + if pt.resp.StatusCode == http.StatusCreated { + if ao, err := getURLFromAsyncOpHeader(pt.resp); err != nil { + return err + } else if ao != "" { + pt.URI = ao + pt.Pm = PollingAsyncOperation + } + } + // for 202 prefer the Azure-AsyncOperation header but fall back to Location if necessary + // note the absense of the "final GET" mechanism for PATCH + if pt.resp.StatusCode == http.StatusAccepted { + ao, err := getURLFromAsyncOpHeader(pt.resp) + if err != nil { + return err + } else if ao != "" { + pt.URI = ao + pt.Pm = PollingAsyncOperation + } + if ao == "" { + if lh, err := getURLFromLocationHeader(pt.resp); err != nil { + return err + } else if lh == "" { + return autorest.NewError("pollingTrackerPatch", "updateHeaders", "didn't get any suitable polling URLs in 202 response") + } else { + pt.URI = lh + pt.Pm = PollingLocation + } + } + } + return nil } -// updatePollingState maps the operation status -- retrieved from either a provisioningState -// field, the status field of an OperationResource, or inferred from the HTTP status code -- -// into a well-known states. Since the process begins from the initial request, the state -// always comes from either a the provisioningState returned or is inferred from the HTTP -// status code. Subsequent requests will read an Azure OperationResource object if the -// service initially returned the Azure-AsyncOperation header. The responseFormat field notes -// the expected response format. -func updatePollingState(resp *http.Response, ps *pollingState) error { - // Determine the response shape - // -- The first response will always be a provisioningStatus response; only the polling requests, - // depending on the header returned, may be something otherwise. - var pt provisioningTracker - if ps.PollingMethod == PollingAsyncOperation { - pt = &operationResource{} - } else { - pt = &provisioningStatus{} - } +func (pt pollingTrackerPatch) checkForErrors() error { + return pt.baseCheckForErrors() +} - // If this is the first request (that is, the polling response shape is unknown), determine how - // to poll and what to expect - if ps.PollingMethod == PollingUnknown { - req := resp.Request - if req == nil { - return autorest.NewError("azure", "updatePollingState", "Azure Polling Error - Original HTTP request is missing") - } +func (pt pollingTrackerPatch) provisioningStateApplicable() bool { + return pt.resp.StatusCode == http.StatusOK || pt.resp.StatusCode == http.StatusCreated +} + +// POST + +type pollingTrackerPost struct { + pollingTrackerBase +} - // Prefer the Azure-AsyncOperation header - ps.URI = getAsyncOperation(resp) - if ps.URI != "" { - ps.PollingMethod = PollingAsyncOperation +func (pt *pollingTrackerPost) updateHeaders() error { + // 201 requires Location header + if pt.resp.StatusCode == http.StatusCreated { + if lh, err := getURLFromLocationHeader(pt.resp); err != nil { + return err + } else if lh == "" { + return autorest.NewError("pollingTrackerPost", "updateHeaders", "missing Location header in 201 response") } else { - ps.PollingMethod = PollingLocation + pt.URI = lh + pt.FinalGetURI = lh + pt.Pm = PollingLocation } - - // Else, use the Location header - if ps.URI == "" { - ps.URI = autorest.GetLocation(resp) + } + // for 202 prefer the Azure-AsyncOperation header but fall back to Location if necessary + if pt.resp.StatusCode == http.StatusAccepted { + ao, err := getURLFromAsyncOpHeader(pt.resp) + if err != nil { + return err + } else if ao != "" { + pt.URI = ao + pt.Pm = PollingAsyncOperation } - - // Lastly, requests against an existing resource, use the last request URI - if ps.URI == "" { - m := strings.ToUpper(req.Method) - if m == http.MethodPatch || m == http.MethodPut || m == http.MethodGet { - ps.URI = req.URL.String() + // if the Location header is invalid and we already have a polling URL + // then we don't care if the Location header URL is malformed. + if lh, err := getURLFromLocationHeader(pt.resp); err != nil && pt.URI == "" { + return err + } else if lh != "" { + if ao == "" { + pt.URI = lh + pt.Pm = PollingLocation } + // when both headers are returned we use the value in the Location header for the final GET + pt.FinalGetURI = lh + } + // make sure a polling URL was found + if pt.URI == "" { + return autorest.NewError("pollingTrackerPost", "updateHeaders", "didn't get any suitable polling URLs in 202 response") } } + return nil +} - // Read and interpret the response (saving the Body in case no polling is necessary) - b := &bytes.Buffer{} - err := autorest.Respond(resp, - autorest.ByCopying(b), - autorest.ByUnmarshallingJSON(pt), - autorest.ByClosing()) - resp.Body = ioutil.NopCloser(b) - if err != nil { - return err - } +func (pt pollingTrackerPost) checkForErrors() error { + return pt.baseCheckForErrors() +} - // Interpret the results - // -- Terminal states apply regardless - // -- Unknown states are per-service inprogress states - // -- Otherwise, infer state from HTTP status code - if pt.hasTerminated() { - ps.State = pt.state() - } else if pt.state() != "" { - ps.State = operationInProgress - } else { - switch resp.StatusCode { - case http.StatusAccepted: - ps.State = operationInProgress +func (pt pollingTrackerPost) provisioningStateApplicable() bool { + return pt.resp.StatusCode == http.StatusOK || pt.resp.StatusCode == http.StatusNoContent +} - case http.StatusNoContent, http.StatusCreated, http.StatusOK: - ps.State = operationSucceeded +// PUT - default: - ps.State = operationFailed - } - } +type pollingTrackerPut struct { + pollingTrackerBase +} - if strings.EqualFold(ps.State, operationInProgress) && ps.URI == "" { - return autorest.NewError("azure", "updatePollingState", "Azure Polling Error - Unable to obtain polling URI for %s %s", resp.Request.Method, resp.Request.URL) +func (pt *pollingTrackerPut) updateHeaders() error { + // by default we can use the original URL for polling and final GET + if pt.URI == "" { + pt.URI = pt.resp.Request.URL.String() } - - // For failed operation, check for error code and message in - // -- Operation resource - // -- Response - // -- Otherwise, Unknown - if ps.hasFailed() { - if or, ok := pt.(*operationResource); ok { - ps.ServiceError = &or.OperationError - } else if p, ok := pt.(*provisioningStatus); ok && p.hasProvisioningError() { - ps.ServiceError = &p.ProvisioningError - } else { - ps.ServiceError = &ServiceError{ - Code: "Unknown", - Message: "None", + if pt.FinalGetURI == "" { + pt.FinalGetURI = pt.resp.Request.URL.String() + } + if pt.Pm == PollingUnknown { + pt.Pm = PollingRequestURI + } + // for 201 it's permissible for no headers to be returned + if pt.resp.StatusCode == http.StatusCreated { + if ao, err := getURLFromAsyncOpHeader(pt.resp); err != nil { + return err + } else if ao != "" { + pt.URI = ao + pt.Pm = PollingAsyncOperation + } + } + // for 202 prefer the Azure-AsyncOperation header but fall back to Location if necessary + if pt.resp.StatusCode == http.StatusAccepted { + ao, err := getURLFromAsyncOpHeader(pt.resp) + if err != nil { + return err + } else if ao != "" { + pt.URI = ao + pt.Pm = PollingAsyncOperation + } + // if the Location header is invalid and we already have a polling URL + // then we don't care if the Location header URL is malformed. + if lh, err := getURLFromLocationHeader(pt.resp); err != nil && pt.URI == "" { + return err + } else if lh != "" { + if ao == "" { + pt.URI = lh + pt.Pm = PollingLocation } + // when both headers are returned we use the value in the Location header for the final GET + pt.FinalGetURI = lh + } + // make sure a polling URL was found + if pt.URI == "" { + return autorest.NewError("pollingTrackerPut", "updateHeaders", "didn't get any suitable polling URLs in 202 response") } } return nil } -func newPollingRequest(ps pollingState) (*http.Request, error) { - reqPoll, err := autorest.Prepare(&http.Request{}, - autorest.AsGet(), - autorest.WithBaseURL(ps.URI)) +func (pt pollingTrackerPut) checkForErrors() error { + err := pt.baseCheckForErrors() if err != nil { - return nil, autorest.NewErrorWithError(err, "azure", "newPollingRequest", nil, "Failure creating poll request to %s", ps.URI) + return err + } + // if there are no LRO headers then the body cannot be empty + ao, err := getURLFromAsyncOpHeader(pt.resp) + if err != nil { + return err + } + lh, err := getURLFromLocationHeader(pt.resp) + if err != nil { + return err + } + if ao == "" && lh == "" && len(pt.rawBody) == 0 { + return autorest.NewError("pollingTrackerPut", "checkForErrors", "the response did not contain a body") } + return nil +} + +func (pt pollingTrackerPut) provisioningStateApplicable() bool { + return pt.resp.StatusCode == http.StatusOK || pt.resp.StatusCode == http.StatusCreated +} + +// creates a polling tracker based on the verb of the original request +func createPollingTracker(resp *http.Response) (pollingTracker, error) { + var pt pollingTracker + switch strings.ToUpper(resp.Request.Method) { + case http.MethodDelete: + pt = &pollingTrackerDelete{pollingTrackerBase: pollingTrackerBase{resp: resp}} + case http.MethodPatch: + pt = &pollingTrackerPatch{pollingTrackerBase: pollingTrackerBase{resp: resp}} + case http.MethodPost: + pt = &pollingTrackerPost{pollingTrackerBase: pollingTrackerBase{resp: resp}} + case http.MethodPut: + pt = &pollingTrackerPut{pollingTrackerBase: pollingTrackerBase{resp: resp}} + default: + return nil, autorest.NewError("azure", "createPollingTracker", "unsupported HTTP method %s", resp.Request.Method) + } + if err := pt.initializeState(); err != nil { + return pt, err + } + // this initializes the polling header values, we do this during creation in case the + // initial response send us invalid values; this way the API call will return a non-nil + // error (not doing this means the error shows up in Future.Done) + return pt, pt.updateHeaders() +} + +// gets the polling URL from the Azure-AsyncOperation header. +// ensures the URL is well-formed and absolute. +func getURLFromAsyncOpHeader(resp *http.Response) (string, error) { + s := resp.Header.Get(http.CanonicalHeaderKey(headerAsyncOperation)) + if s == "" { + return "", nil + } + if !isValidURL(s) { + return "", autorest.NewError("azure", "getURLFromAsyncOpHeader", "invalid polling URL '%s'", s) + } + return s, nil +} - return reqPoll, nil +// gets the polling URL from the Location header. +// ensures the URL is well-formed and absolute. +func getURLFromLocationHeader(resp *http.Response) (string, error) { + s := resp.Header.Get(http.CanonicalHeaderKey(autorest.HeaderLocation)) + if s == "" { + return "", nil + } + if !isValidURL(s) { + return "", autorest.NewError("azure", "getURLFromLocationHeader", "invalid polling URL '%s'", s) + } + return s, nil +} + +// verify that the URL is valid and absolute +func isValidURL(s string) bool { + u, err := url.Parse(s) + return err == nil && u.IsAbs() } +// DoPollForAsynchronous returns a SendDecorator that polls if the http.Response is for an Azure +// long-running operation. It will delay between requests for the duration specified in the +// RetryAfter header or, if the header is absent, the passed delay. Polling may be canceled via +// the context associated with the http.Request. +// Deprecated: Prefer using Futures to allow for non-blocking async operations. +func DoPollForAsynchronous(delay time.Duration) autorest.SendDecorator { + return func(s autorest.Sender) autorest.Sender { + return autorest.SenderFunc(func(r *http.Request) (*http.Response, error) { + resp, err := s.Do(r) + if err != nil { + return resp, err + } + if !autorest.ResponseHasStatusCode(resp, pollingCodes[:]...) { + return resp, nil + } + future, err := NewFutureFromResponse(resp) + if err != nil { + return resp, err + } + // retry until either the LRO completes or we receive an error + var done bool + for done, err = future.Done(s); !done && err == nil; done, err = future.Done(s) { + // check for Retry-After delay, if not present use the specified polling delay + if pd, ok := future.GetPollingDelay(); ok { + delay = pd + } + // wait until the delay elapses or the context is cancelled + if delayElapsed := autorest.DelayForBackoff(delay, 0, r.Context().Done()); !delayElapsed { + return future.Response(), + autorest.NewErrorWithError(r.Context().Err(), "azure", "DoPollForAsynchronous", future.Response(), "context has been cancelled") + } + } + return future.Response(), err + }) + } +} + +// PollingMethodType defines a type used for enumerating polling mechanisms. +type PollingMethodType string + +const ( + // PollingAsyncOperation indicates the polling method uses the Azure-AsyncOperation header. + PollingAsyncOperation PollingMethodType = "AsyncOperation" + + // PollingLocation indicates the polling method uses the Location header. + PollingLocation PollingMethodType = "Location" + + // PollingRequestURI indicates the polling method uses the original request URI. + PollingRequestURI PollingMethodType = "RequestURI" + + // PollingUnknown indicates an unknown polling method and is the default value. + PollingUnknown PollingMethodType = "" +) + // AsyncOpIncompleteError is the type that's returned from a future that has not completed. type AsyncOpIncompleteError struct { // FutureType is the name of the type composed of a azure.Future. diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/azure.go b/vendor/github.com/Azure/go-autorest/autorest/azure/azure.go index 18d029526ff5..a702ffe75172 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/azure.go +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/azure.go @@ -279,16 +279,29 @@ func WithErrorUnlessStatusCode(codes ...int) autorest.RespondDecorator { resp.Body = ioutil.NopCloser(&b) if decodeErr != nil { return fmt.Errorf("autorest/azure: error response cannot be parsed: %q error: %v", b.String(), decodeErr) - } else if e.ServiceError == nil { + } + if e.ServiceError == nil { // Check if error is unwrapped ServiceError - if err := json.Unmarshal(b.Bytes(), &e.ServiceError); err != nil || e.ServiceError.Message == "" { - e.ServiceError = &ServiceError{ - Code: "Unknown", - Message: "Unknown service error", - } + if err := json.Unmarshal(b.Bytes(), &e.ServiceError); err != nil { + return err } } - + if e.ServiceError.Message == "" { + // if we're here it means the returned error wasn't OData v4 compliant. + // try to unmarshal the body as raw JSON in hopes of getting something. + rawBody := map[string]interface{}{} + if err := json.Unmarshal(b.Bytes(), &rawBody); err != nil { + return err + } + e.ServiceError = &ServiceError{ + Code: "Unknown", + Message: "Unknown service error", + } + if len(rawBody) > 0 { + e.ServiceError.Details = []map[string]interface{}{rawBody} + } + } + e.Response = resp e.RequestID = ExtractRequestID(resp) if e.StatusCode == nil { e.StatusCode = resp.StatusCode diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/cli/profile.go b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/profile.go index 3e226fe9b265..b62bf03baceb 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/cli/profile.go +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/profile.go @@ -38,6 +38,13 @@ type Subscription struct { Name string `json:"name"` State string `json:"state"` TenantID string `json:"tenantId"` + User *User `json:"user"` +} + +// User represents a User from the Azure CLI +type User struct { + Name string `json:"name"` + Type string `json:"type"` } // ProfilePath returns the path where the Azure Profile is stored from the Azure CLI diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/rp.go b/vendor/github.com/Azure/go-autorest/autorest/azure/rp.go index 65ad0afc82d3..bd34f0ed5a58 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/rp.go +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/rp.go @@ -64,7 +64,7 @@ func DoRetryWithRegistration(client autorest.Client) autorest.SendDecorator { } } } - return resp, fmt.Errorf("failed request: %s", err) + return resp, err }) } } diff --git a/vendor/github.com/Azure/go-autorest/autorest/utility.go b/vendor/github.com/Azure/go-autorest/autorest/utility.go index f3a42bfc268d..bfddd90b5bfa 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/utility.go +++ b/vendor/github.com/Azure/go-autorest/autorest/utility.go @@ -218,9 +218,10 @@ func IsTokenRefreshError(err error) bool { return false } -// IsTemporaryNetworkError returns true if the specified error is a temporary network error. +// IsTemporaryNetworkError returns true if the specified error is a temporary network error or false +// if it's not. If the error doesn't implement the net.Error interface the return value is true. func IsTemporaryNetworkError(err error) bool { - if netErr, ok := err.(net.Error); ok && netErr.Temporary() { + if netErr, ok := err.(net.Error); !ok || (ok && netErr.Temporary()) { return true } return false diff --git a/vendor/github.com/Azure/go-autorest/autorest/validation/validation.go b/vendor/github.com/Azure/go-autorest/autorest/validation/validation.go index d886e0b3fbfc..ae987f8fae60 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/validation/validation.go +++ b/vendor/github.com/Azure/go-autorest/autorest/validation/validation.go @@ -136,29 +136,29 @@ func validatePtr(x reflect.Value, v Constraint) error { func validateInt(x reflect.Value, v Constraint) error { i := x.Int() - r, ok := v.Rule.(int) + r, ok := toInt64(v.Rule) if !ok { return createError(x, v, fmt.Sprintf("rule must be integer value for %v constraint; got: %v", v.Name, v.Rule)) } switch v.Name { case MultipleOf: - if i%int64(r) != 0 { + if i%r != 0 { return createError(x, v, fmt.Sprintf("value must be a multiple of %v", r)) } case ExclusiveMinimum: - if i <= int64(r) { + if i <= r { return createError(x, v, fmt.Sprintf("value must be greater than %v", r)) } case ExclusiveMaximum: - if i >= int64(r) { + if i >= r { return createError(x, v, fmt.Sprintf("value must be less than %v", r)) } case InclusiveMinimum: - if i < int64(r) { + if i < r { return createError(x, v, fmt.Sprintf("value must be greater than or equal to %v", r)) } case InclusiveMaximum: - if i > int64(r) { + if i > r { return createError(x, v, fmt.Sprintf("value must be less than or equal to %v", r)) } default: @@ -388,6 +388,17 @@ func createError(x reflect.Value, v Constraint, err string) error { v.Target, v.Name, getInterfaceValue(x), err) } +func toInt64(v interface{}) (int64, bool) { + if i64, ok := v.(int64); ok { + return i64, true + } + // older generators emit max constants as int, so if int64 fails fall back to int + if i32, ok := v.(int); ok { + return int64(i32), true + } + return 0, false +} + // NewErrorWithValidationError appends package type and method name in // validation error. // diff --git a/vendor/github.com/Azure/go-autorest/autorest/version.go b/vendor/github.com/Azure/go-autorest/autorest/version.go index d265055f51fb..200bc0beb002 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/version.go +++ b/vendor/github.com/Azure/go-autorest/autorest/version.go @@ -16,5 +16,5 @@ package autorest // Version returns the semantic version (see http://semver.org). func Version() string { - return "v10.8.1" + return "v10.11.4" } diff --git a/vendor/vendor.json b/vendor/vendor.json index 9b03f265db4b..0627dfa83501 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,372 +3,372 @@ "ignore": "test", "package": [ { - "checksumSHA1": "I1O9w4/hn+3DtQFbJrgwau5VOXI=", + "checksumSHA1": "v4/I1q4GGrkPUIcI0EDJgZp22bE=", "path": "github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { "checksumSHA1": "cL5VuAorqkBbkDvfOpB8Mh8Mm48=", "path": "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "jNqFdbZdsFgDH9xhq3fXNIk1+eM=", + "checksumSHA1": "uWEEOF98nIAeUIogKZ1BQ90LqRM=", "path": "github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { "checksumSHA1": "kM2PZfGUZRmE9wFeHAFjHFPepzk=", "path": "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-12-01/compute", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "9e+rC0Kd+zgxMrEwaP5l3DXxHM4=", + "checksumSHA1": "a/mbRxz450lwbacAUuG77DpKKJU=", "path": "github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-04-01/containerinstance", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "Uafz6z4ARTszbiN4lBDe9XzLvpc=", + "checksumSHA1": "A4GmPiUDP7xdTUYkvmO/Y3LPCZU=", "path": "github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "OS98xAxprza/yF/IQZqgM8QHf30=", + "checksumSHA1": "3SfpVr+ET9v0Donw7cdrc4KaLgc=", "path": "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "xPqRAsuso4gp81HrMH1RnhbzfCk=", + "checksumSHA1": "BwC5MjJVKWsuReAvdMR4Fk1JNh0=", "path": "github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "MsygGK8s34NdTsbkzvaqHgPLs6I=", + "checksumSHA1": "koKSQ4PgeyIgykEPNEeE2tzRm18=", "path": "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "cdSthV7hZqJYRvbNwWuC0VFzn14=", + "checksumSHA1": "1+iufNHv/JIZ3efJVyy8R8ByEro=", "path": "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "E1YgAbqCDO5VSl+BTF7YgJ1gDds=", + "checksumSHA1": "mdwBbEgubHb6UnwDspop+43Sx8k=", "path": "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "wVJTMg87mLWoBmlniu/UA/YmVe4=", + "checksumSHA1": "5wH3Co0j2XLF+Tnml7Ky++Ves+s=", "path": "github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { "checksumSHA1": "x9ceW8JE2/FgODRSywClj0fRlh8=", "path": "github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "XCm0kJwkGqkv1VL2gUNTU7PIK6o=", + "checksumSHA1": "D8B7LqvFSvImhWlkuv6tKbGrWPk=", "path": "github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "o1oH4ofWhXB67MoFvPDl5sl65j4=", + "checksumSHA1": "usYk7dQDADCaSYFlrjXtczH0/tA=", "path": "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "IT8QxbA8sPbbCR79wiG9UxyRGEw=", + "checksumSHA1": "V8yVJJDoKLdBxvAHshfWc0N6oeA=", "path": "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { "checksumSHA1": "E+QgVQ3X1EvmDta96Xa2aPHrkt4=", "path": "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "k+eOq0DE2aRNVwLFElfc81YE18Y=", + "checksumSHA1": "Juw5Pl5qUEN8CTEgDf+wgRfoYdc=", "path": "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "wRmQ+EBPmpsb6NvjlBXE8Y/JSZA=", + "checksumSHA1": "iQqD1JNk4/F7P9oZDUGX6+tgjYI=", "path": "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "q0OKr6uBD4lgnHN/EIDrv0GQWW8=", + "checksumSHA1": "8LqtzWEGPooyQjmmalXjJvdRGvE=", "path": "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { "checksumSHA1": "e4hCajXDSuWNkUvwA35jMHGm20E=", "path": "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "EoE/UnsEm8MDYl+ox/+aIvs1HSY=", + "checksumSHA1": "igbi1podNhH6Q6u4fiSG35bWVbg=", "path": "github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { "checksumSHA1": "ZKp5VA/YRkH75e8KjQ90X7mKJMs=", "path": "github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "BMQkuDh8dNIdR68pKFIJp28n8yg=", + "checksumSHA1": "jLzkSZFf/yBGECyJHTVOHN2oI2k=", "path": "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { "checksumSHA1": "UWSnIzZywuEpEevbPfbPNLk1dFk=", "path": "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "H9FyJDYC9FApeVyIl7eBnPusRlw=", + "checksumSHA1": "i/Nusgj1Ol8GAQKU3yCcVXQiBlg=", "path": "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "/Tlgqs81ToI+zz4miZcfu5yvZYU=", + "checksumSHA1": "hqDu8DOWFgIe/CHCGPdslDaOZu0=", "path": "github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { "checksumSHA1": "DJY5zDEcGa82/Hbfud8lgHCuvU4=", "path": "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { "checksumSHA1": "DQuP9Nzul8I8SN5fBg0NqWn124Q=", "path": "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/locks", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { "checksumSHA1": "pn550P6giSwxXck8lRRaNOPwxaQ=", "path": "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "G0pRv7MqqQwOFOg6IIaIoSWYwvY=", + "checksumSHA1": "q28aA1gZhbOTuhsePT1I39mnh2Y=", "path": "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "mIu5+RFHKL8U4H/6cQRiP2rUg9Q=", + "checksumSHA1": "kjEY8W+KrvGpfj5940Rbo2e4qwY=", "path": "github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "D6gwM+shQnzYSGV0EnvH+uduzIg=", + "checksumSHA1": "tEyc+LldSLEcCtr4nekzlLu6Mu0=", "path": "github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "47wZjqF3UfIT1Xs56kXJ11zpCNc=", + "checksumSHA1": "p9OIjwfjc8GARnzRcEoKbnXL//g=", "path": "github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "Gtq0yrNJHVALuWjOKpHgLRvvgxA=", + "checksumSHA1": "ySkjHczHi2zN8B1TuWfvKVLGetw=", "path": "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { "checksumSHA1": "HhbwyLbz+/pbGSWb2cp+fAp6YsI=", "path": "github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-05-01/trafficmanager", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "SuQHgkFuOrdDvajcGAImyzyb6+E=", + "checksumSHA1": "oG1Gtnb9nwoV/kOaZQQqxogbR2I=", "path": "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "NAkdZOb1m8R72Av84tCFDXxmD2Q=", + "checksumSHA1": "m3K3q/zhkmRtlIGWqMWgqzWR6C4=", "path": "github.com/Azure/azure-sdk-for-go/storage", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "E0PGco6Wn0cOyCgy9G2dC5O+yfs=", + "checksumSHA1": "Qm+SkjiiVK374BDnrC+CO2B08no=", "path": "github.com/Azure/azure-sdk-for-go/version", - "revision": "4650843026a7fdec254a8d9cf893693a254edd0b", - "revisionTime": "2018-05-04T19:14:26Z", - "version": "v16.2.1", - "versionExact": "v16.2.1" + "revision": "7971189ecf5a584b9211f2527737f94bb979644e", + "revisionTime": "2018-06-19T23:05:49Z", + "version": "=v17.4.0", + "versionExact": "v17.4.0" }, { - "checksumSHA1": "sQy6zpkumGcXs0QZLhYs8An1vlI=", + "checksumSHA1": "sSq0Y8TfUeQfTb9Xcah5cZWKxlY=", "path": "github.com/Azure/go-autorest/autorest", - "revision": "eaa7994b2278094c904d31993d26f56324db3052", - "revisionTime": "2018-05-02T23:02:43Z", - "version": "v10.8.1", - "versionExact": "v10.8.1" + "revision": "e6d2a85bbb5cd2a3162e4942594e1e520e442b0b", + "revisionTime": "2018-06-21T21:09:28Z", + "version": "=v10.11.4", + "versionExact": "v10.11.4" }, { - "checksumSHA1": "Xu6BOMnd2rZzabW6ld1yUrVjBQw=", + "checksumSHA1": "8Le1cIKIwLl6AIB7IxHZsm70HYI=", "path": "github.com/Azure/go-autorest/autorest/adal", - "revision": "eaa7994b2278094c904d31993d26f56324db3052", - "revisionTime": "2018-05-02T23:02:43Z", - "version": "v10.8.1", - "versionExact": "v10.8.1" + "revision": "e6d2a85bbb5cd2a3162e4942594e1e520e442b0b", + "revisionTime": "2018-06-21T21:09:28Z", + "version": "=v10.11.4", + "versionExact": "v10.11.4" }, { - "checksumSHA1": "vUHo41PG/G6Qq+vqD65l9KHFxUs=", + "checksumSHA1": "NT4tlDNlszWmb7gCXnYCkcvQxhs=", "path": "github.com/Azure/go-autorest/autorest/azure", - "revision": "eaa7994b2278094c904d31993d26f56324db3052", - "revisionTime": "2018-05-02T23:02:43Z", - "version": "v10.8.1", - "versionExact": "v10.8.1" + "revision": "e6d2a85bbb5cd2a3162e4942594e1e520e442b0b", + "revisionTime": "2018-06-21T21:09:28Z", + "version": "=v10.11.4", + "versionExact": "v10.11.4" }, { - "checksumSHA1": "+nXRwVB/JVEGe+oLsFhCmSkKPuI=", + "checksumSHA1": "Fkezj7ch01wYNvXzQZdhmeSf/mk=", "path": "github.com/Azure/go-autorest/autorest/azure/cli", - "revision": "eaa7994b2278094c904d31993d26f56324db3052", - "revisionTime": "2018-05-02T23:02:43Z", - "version": "v10.8.1", - "versionExact": "v10.8.1" + "revision": "e6d2a85bbb5cd2a3162e4942594e1e520e442b0b", + "revisionTime": "2018-06-21T21:09:28Z", + "version": "=v10.11.4", + "versionExact": "v10.11.4" }, { "checksumSHA1": "9nXCi9qQsYjxCeajJKWttxgEt0I=", "path": "github.com/Azure/go-autorest/autorest/date", - "revision": "eaa7994b2278094c904d31993d26f56324db3052", - "revisionTime": "2018-05-02T23:02:43Z", - "version": "v10.8.1", - "versionExact": "v10.8.1" + "revision": "e6d2a85bbb5cd2a3162e4942594e1e520e442b0b", + "revisionTime": "2018-06-21T21:09:28Z", + "version": "=v10.11.4", + "versionExact": "v10.11.4" }, { "checksumSHA1": "SbBb2GcJNm5GjuPKGL2777QywR4=", "path": "github.com/Azure/go-autorest/autorest/to", - "revision": "eaa7994b2278094c904d31993d26f56324db3052", - "revisionTime": "2018-05-02T23:02:43Z", - "version": "v10.8.1", - "versionExact": "v10.8.1" + "revision": "e6d2a85bbb5cd2a3162e4942594e1e520e442b0b", + "revisionTime": "2018-06-21T21:09:28Z", + "version": "=v10.11.4", + "versionExact": "v10.11.4" }, { - "checksumSHA1": "5UH4IFIB/98iowPCzzVs4M4MXiQ=", + "checksumSHA1": "HjdLfAF3oA2In8F3FKh/Y+BPyXk=", "path": "github.com/Azure/go-autorest/autorest/validation", - "revision": "eaa7994b2278094c904d31993d26f56324db3052", - "revisionTime": "2018-05-02T23:02:43Z", - "version": "v10.8.1", - "versionExact": "v10.8.1" + "revision": "e6d2a85bbb5cd2a3162e4942594e1e520e442b0b", + "revisionTime": "2018-06-21T21:09:28Z", + "version": "=v10.11.4", + "versionExact": "v10.11.4" }, { "checksumSHA1": "jQh1fnoKPKMURvKkpdRjN695nAQ=", From 388b149e9ad82d9151c5b979a7306db79ed3add1 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 24 Jun 2018 14:45:34 +0200 Subject: [PATCH 318/320] Updating to include #1418 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db09e4d8f1d8..63381fe1946a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ IMPROVEMENTS: +* dependencies: upgrading to v10.11.4 of `Azure/go-autorest` [GH-1418] +* dependencies: upgrading to v17.4.0 of `Azure/azure-sdk-for-go` [GH-1418] * `azurerm_log_analytics_solution` - support for Sovereign Clouds [GH-1410] * `azurerm_log_analytics_workspace` - support for Sovereign Clouds [GH-1410] * `azurerm_log_analytics_workspace` - support for the `PerGB2018` SKU [GH-1079] From f1403facda37e529208d284f874a25bbbac0b14a Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Tue, 26 Jun 2018 07:08:40 -0700 Subject: [PATCH 319/320] Add `timezone` field to Virtual Machine (Windows Configuration) (#1265) * Add timezone field to virtual machine windows profile * Update documentation to reflect the change. * Remove the default value. * Refine VM timezone validation rule. * Add os_profile_windows_config migrate state method. * Add VM timezone acceptance test. * Fix line endings. * Change to some obviously wrong UTC values. * Fix styling issues in PR. * Change the default timezone to empty to align with the old behavior. * Leave timezone as nil if user passes empty string. * Refactoring to always include the empty string ``` $ acctests azurerm TestValidateAzureVirtualMachineTimeZone === RUN TestValidateAzureVirtualMachineTimeZone --- PASS: TestValidateAzureVirtualMachineTimeZone (0.00s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 0.025s ``` * Fix acceptance test of VM for the new hash code of timezone --- azurerm/resource_arm_virtual_machine.go | 18 +++ azurerm/resource_arm_virtual_machine_test.go | 105 +++++++++++++++++ azurerm/validators.go | 115 +++++++++++++++++++ azurerm/validators_test.go | 38 ++++++ website/docs/r/virtual_machine.html.markdown | 1 + 5 files changed, 277 insertions(+) diff --git a/azurerm/resource_arm_virtual_machine.go b/azurerm/resource_arm_virtual_machine.go index 51eb75daa852..bd9690f9a206 100644 --- a/azurerm/resource_arm_virtual_machine.go +++ b/azurerm/resource_arm_virtual_machine.go @@ -386,6 +386,13 @@ func resourceArmVirtualMachine() *schema.Resource { Optional: true, Default: false, }, + "timezone": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ValidateFunc: validateAzureVirtualMachineTimeZone(), + }, "winrm": { Type: schema.TypeList, Optional: true, @@ -1035,6 +1042,10 @@ func flattenAzureRmVirtualMachineOsProfileWindowsConfiguration(config *compute.W result["enable_automatic_upgrades"] = *config.EnableAutomaticUpdates } + if config.TimeZone != nil { + result["timezone"] = *config.TimeZone + } + if config.WinRM != nil { listeners := make([]map[string]interface{}, 0, len(*config.WinRM.Listeners)) for _, i := range *config.WinRM.Listeners { @@ -1311,6 +1322,10 @@ func expandAzureRmVirtualMachineOsProfileWindowsConfig(d *schema.ResourceData) ( config.EnableAutomaticUpdates = &update } + if v := osProfileConfig["timezone"]; v != nil && v.(string) != "" { + config.TimeZone = utils.String(v.(string)) + } + if v := osProfileConfig["winrm"]; v != nil { winRm := v.([]interface{}) if len(winRm) > 0 { @@ -1621,6 +1636,9 @@ func resourceArmVirtualMachineStorageOsProfileWindowsConfigHash(v interface{}) i if v, ok := m["enable_automatic_upgrades"]; ok { buf.WriteString(fmt.Sprintf("%t-", v.(bool))) } + if v, ok := m["timezone"]; ok { + buf.WriteString(fmt.Sprintf("%s-", strings.ToLower(v.(string)))) + } } return hashcode.String(buf.String()) diff --git a/azurerm/resource_arm_virtual_machine_test.go b/azurerm/resource_arm_virtual_machine_test.go index c38b656ef482..722e8be9dee2 100644 --- a/azurerm/resource_arm_virtual_machine_test.go +++ b/azurerm/resource_arm_virtual_machine_test.go @@ -3,8 +3,10 @@ package azurerm import ( "fmt" "net/http" + "testing" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-12-01/compute" + "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) @@ -68,3 +70,106 @@ func testCheckAzureRMVirtualMachineDestroy(s *terraform.State) error { return nil } + +func TestAccAzureRMVirtualMachine_winTimeZone(t *testing.T) { + resourceName := "azurerm_virtual_machine.test" + var vm compute.VirtualMachine + ri := acctest.RandInt() + config := testAccAzureRMVirtualMachine_winTimeZone(ri, testLocation()) + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMVirtualMachineDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMVirtualMachineExists("azurerm_virtual_machine.test", &vm), + resource.TestCheckResourceAttr(resourceName, "os_profile_windows_config.59207889.timezone", "Pacific Standard Time"), + ), + }, + }, + }) +} + +func testAccAzureRMVirtualMachine_winTimeZone(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctvn-%d" + address_space = ["10.0.0.0/16"] + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_subnet" "test" { + name = "acctsub-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_network_interface" "test" { + name = "acctni-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + ip_configuration { + name = "testconfiguration1" + subnet_id = "${azurerm_subnet.test.id}" + private_ip_address_allocation = "dynamic" + } +} + +resource "azurerm_storage_account" "test" { + name = "accsa%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + account_tier = "Standard" + account_replication_type = "LRS" +} + +resource "azurerm_storage_container" "test" { + name = "vhds" + resource_group_name = "${azurerm_resource_group.test.name}" + storage_account_name = "${azurerm_storage_account.test.name}" + container_access_type = "private" +} + +resource "azurerm_virtual_machine" "test" { + name = "acctvm-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + network_interface_ids = ["${azurerm_network_interface.test.id}"] + vm_size = "Standard_D1_v2" + + storage_image_reference { + publisher = "MicrosoftWindowsServer" + offer = "WindowsServer" + sku = "2012-Datacenter" + version = "latest" + } + + storage_os_disk { + name = "myosdisk1" + vhd_uri = "${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}/myosdisk1.vhd" + caching = "ReadWrite" + create_option = "FromImage" + } + + os_profile { + computer_name = "winhost01" + admin_username = "testadmin" + admin_password = "Password1234!" + } + + os_profile_windows_config { + timezone = "Pacific Standard Time" + } +} +`, rInt, location, rInt, rInt, rInt, rInt, rInt) +} diff --git a/azurerm/validators.go b/azurerm/validators.go index 708cdaf2940b..f4ed1e78394c 100644 --- a/azurerm/validators.go +++ b/azurerm/validators.go @@ -8,6 +8,7 @@ import ( "github.com/Azure/go-autorest/autorest/date" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" "github.com/satori/uuid" ) @@ -76,6 +77,120 @@ func validateIso8601Duration() schema.SchemaValidateFunc { } } +func validateAzureVirtualMachineTimeZone() schema.SchemaValidateFunc { + // Candidates are listed here: http://jackstromberg.com/2017/01/list-of-time-zones-consumed-by-azure/ + candidates := []string{ + "", + "Afghanistan Standard Time", + "Alaskan Standard Time", + "Arab Standard Time", + "Arabian Standard Time", + "Arabic Standard Time", + "Argentina Standard Time", + "Atlantic Standard Time", + "AUS Central Standard Time", + "AUS Eastern Standard Time", + "Azerbaijan Standard Time", + "Azores Standard Time", + "Bahia Standard Time", + "Bangladesh Standard Time", + "Belarus Standard Time", + "Canada Central Standard Time", + "Cape Verde Standard Time", + "Caucasus Standard Time", + "Cen. Australia Standard Time", + "Central America Standard Time", + "Central Asia Standard Time", + "Central Brazilian Standard Time", + "Central Europe Standard Time", + "Central European Standard Time", + "Central Pacific Standard Time", + "Central Standard Time (Mexico)", + "Central Standard Time", + "China Standard Time", + "Dateline Standard Time", + "E. Africa Standard Time", + "E. Australia Standard Time", + "E. Europe Standard Time", + "E. South America Standard Time", + "Eastern Standard Time (Mexico)", + "Eastern Standard Time", + "Egypt Standard Time", + "Ekaterinburg Standard Time", + "Fiji Standard Time", + "FLE Standard Time", + "Georgian Standard Time", + "GMT Standard Time", + "Greenland Standard Time", + "Greenwich Standard Time", + "GTB Standard Time", + "Hawaiian Standard Time", + "India Standard Time", + "Iran Standard Time", + "Israel Standard Time", + "Jordan Standard Time", + "Kaliningrad Standard Time", + "Korea Standard Time", + "Libya Standard Time", + "Line Islands Standard Time", + "Magadan Standard Time", + "Mauritius Standard Time", + "Middle East Standard Time", + "Montevideo Standard Time", + "Morocco Standard Time", + "Mountain Standard Time (Mexico)", + "Mountain Standard Time", + "Myanmar Standard Time", + "N. Central Asia Standard Time", + "Namibia Standard Time", + "Nepal Standard Time", + "New Zealand Standard Time", + "Newfoundland Standard Time", + "North Asia East Standard Time", + "North Asia Standard Time", + "Pacific SA Standard Time", + "Pacific Standard Time (Mexico)", + "Pacific Standard Time", + "Pakistan Standard Time", + "Paraguay Standard Time", + "Romance Standard Time", + "Russia Time Zone 10", + "Russia Time Zone 11", + "Russia Time Zone 3", + "Russian Standard Time", + "SA Eastern Standard Time", + "SA Pacific Standard Time", + "SA Western Standard Time", + "Samoa Standard Time", + "SE Asia Standard Time", + "Singapore Standard Time", + "South Africa Standard Time", + "Sri Lanka Standard Time", + "Syria Standard Time", + "Taipei Standard Time", + "Tasmania Standard Time", + "Tokyo Standard Time", + "Tonga Standard Time", + "Turkey Standard Time", + "Ulaanbaatar Standard Time", + "US Eastern Standard Time", + "US Mountain Standard Time", + "UTC", + "UTC+12", + "UTC-02", + "UTC-11", + "Venezuela Standard Time", + "Vladivostok Standard Time", + "W. Australia Standard Time", + "W. Central Africa Standard Time", + "W. Europe Standard Time", + "West Asia Standard Time", + "West Pacific Standard Time", + "Yakutsk Standard Time", + } + return validation.StringInSlice(candidates, true) +} + // intBetweenDivisibleBy returns a SchemaValidateFunc which tests if the provided value // is of type int and is between min and max (inclusive) and is divisible by a given number func validateIntBetweenDivisibleBy(min, max, divisor int) schema.SchemaValidateFunc { diff --git a/azurerm/validators_test.go b/azurerm/validators_test.go index 0f130f48f388..281855458f7d 100644 --- a/azurerm/validators_test.go +++ b/azurerm/validators_test.go @@ -213,3 +213,41 @@ func TestValidateCollation(t *testing.T) { } } } + +func TestValidateAzureVirtualMachineTimeZone(t *testing.T) { + cases := []struct { + Value string + Errors int + }{ + { + Value: "", + Errors: 0, + }, + { + Value: "UTC", + Errors: 0, + }, + { + Value: "China Standard Time", + Errors: 0, + }, + { + // Valid UTC time zone + Value: "utc-11", + Errors: 0, + }, + { + // Invalid UTC time zone + Value: "UTC-30", + Errors: 1, + }, + } + + for _, tc := range cases { + _, errors := validateAzureVirtualMachineTimeZone()(tc.Value, "unittest") + + if len(errors) != tc.Errors { + t.Fatalf("Expected validateAzureVMTimeZone to trigger '%d' errors for '%s' - got '%d'", tc.Errors, tc.Value, len(errors)) + } + } +} diff --git a/website/docs/r/virtual_machine.html.markdown b/website/docs/r/virtual_machine.html.markdown index 3986b93a9203..ba640c192fd0 100644 --- a/website/docs/r/virtual_machine.html.markdown +++ b/website/docs/r/virtual_machine.html.markdown @@ -475,6 +475,7 @@ output "principal_id" { * `provision_vm_agent` - (Optional) This value defaults to false. * `enable_automatic_upgrades` - (Optional) This value defaults to false. +* `timezone` - (Optional) Specifies the time zone of the virtual machine, [the possible values are defined here](http://jackstromberg.com/2017/01/list-of-time-zones-consumed-by-azure/). Defaults to `""`. * `winrm` - (Optional) A collection of WinRM configuration blocks as documented below. * `additional_unattend_config` - (Optional) An Additional Unattended Config block as documented below. From b78088b447cc7c2f13ba0be25b34c2f25ee9550c Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 26 Jun 2018 16:09:46 +0200 Subject: [PATCH 320/320] Updating to include #1265 --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63381fe1946a..4d7c0a507c77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,13 @@ IMPROVEMENTS: * dependencies: upgrading to v10.11.4 of `Azure/go-autorest` [GH-1418] * dependencies: upgrading to v17.4.0 of `Azure/azure-sdk-for-go` [GH-1418] +* `azurerm_lb` - addtional validation on properties [GH-1403] * `azurerm_log_analytics_solution` - support for Sovereign Clouds [GH-1410] * `azurerm_log_analytics_workspace` - support for Sovereign Clouds [GH-1410] * `azurerm_log_analytics_workspace` - support for the `PerGB2018` SKU [GH-1079] -* `azurerm_sql_database` - support for importing from a bacpac backup [GH-972] * `azurerm_network_interface` - addtional validation on properties [GH-1403] -* `azurerm_arm_loadbalancer` - addtional validation on properties [GH-1403] +* `azurerm_sql_database` - support for importing from a bacpac backup [GH-972] +* `azurerm_virtual_machine` - support for setting the TimeZone on Windows [GH-1265] BUG FIXES: