From 8fe2db90215aa8a64dfe969540bcd5bcf07c1f7b Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 5 Sep 2017 10:18:21 +0100 Subject: [PATCH 01/27] Adding a Sweeper for CosmosDB Accounts --- .../resource_arm_cosmos_db_account_test.go | 52 ++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_cosmos_db_account_test.go b/azurerm/resource_arm_cosmos_db_account_test.go index 46d17a3bc6d3..a4b3a902bd82 100644 --- a/azurerm/resource_arm_cosmos_db_account_test.go +++ b/azurerm/resource_arm_cosmos_db_account_test.go @@ -2,14 +2,64 @@ 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" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) +func init() { + resource.AddTestSweepers("azurerm_cosmosdb_account", &resource.Sweeper{ + Name: "azurerm_cosmosdb_account", + F: testSweepCosmosDBAccount, + }) +} + +func testSweepCosmosDBAccount(region string) error { + armClient, err := buildConfigForSweepers() + if err != nil { + return err + } + + client := (*armClient).cosmosDBClient + + log.Printf("Retrieving the CosmosDB Accounts..") + results, err := client.List() + if err != nil { + return fmt.Errorf("Error Listing on CosmosDB Accounts: %+v", err) + } + + for _, account := range *results.Value { + if !shouldSweepAcceptanceTestResource(*account.Name, *account.Location, region) { + continue + } + + resourceId, err := parseAzureResourceID(*account.ID) + if err != nil { + return err + } + + resourceGroup := resourceId.ResourceGroup + name := resourceId.Path["databaseAccounts"] + + log.Printf("Deleting CosmosDB Account '%s' in Resource Group '%s'", name, resourceGroup) + deleteResp, deleteErr := client.Delete(resourceGroup, name, make(chan struct{})) + resp := <-deleteResp + err = <-deleteErr + if err != nil { + if !utils.ResponseWasNotFound(resp) { + return err + } + } + } + + return nil +} + func TestAccAzureRMCosmosDBAccountName_validation(t *testing.T) { str := acctest.RandString(50) cases := []struct { @@ -194,7 +244,7 @@ func testCheckAzureRMCosmosDBAccountDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*ArmClient).cosmosDBClient for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_cosmos_db" { + if rs.Type != "azurerm_cosmosdb_account" { continue } From d8c142d303a82370534e50393c07f737e9867500 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 9 Jul 2017 14:22:02 -0700 Subject: [PATCH 02/27] Adding support for PostgreSQL Servers --- azurerm/config.go | 9 + azurerm/import_arm_postgresql_server_test.go | 34 ++ azurerm/provider.go | 34 +- azurerm/resource_arm_postgresql_server.go | 305 ++++++++++++++++++ .../resource_arm_postgresql_server_test.go | 110 +++++++ website/azurerm.erb | 13 + .../docs/r/postgresql_server.html.markdown | 88 +++++ 7 files changed, 577 insertions(+), 16 deletions(-) create mode 100644 azurerm/import_arm_postgresql_server_test.go create mode 100644 azurerm/resource_arm_postgresql_server.go create mode 100644 azurerm/resource_arm_postgresql_server_test.go create mode 100644 website/docs/r/postgresql_server.html.markdown diff --git a/azurerm/config.go b/azurerm/config.go index d6eef74e042f..169608c3c81b 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -20,6 +20,7 @@ import ( "github.com/Azure/azure-sdk-for-go/arm/graphrbac" "github.com/Azure/azure-sdk-for-go/arm/keyvault" "github.com/Azure/azure-sdk-for-go/arm/network" + "github.com/Azure/azure-sdk-for-go/arm/postgresql" "github.com/Azure/azure-sdk-for-go/arm/redis" "github.com/Azure/azure-sdk-for-go/arm/resources/resources" "github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions" @@ -90,6 +91,8 @@ type ArmClient struct { eventHubConsumerGroupClient eventhub.ConsumerGroupsClient eventHubNamespacesClient eventhub.NamespacesClient + postgresqlServersClient postgresql.ServersClient + providers resources.ProvidersClient resourceGroupClient resources.GroupsClient tagsClient resources.TagsClient @@ -401,6 +404,12 @@ func (c *Config) getArmClient() (*ArmClient, error) { vnpc.Sender = autorest.CreateSender(withRequestLogging()) client.vnetPeeringsClient = vnpc + psc := postgresql.NewServersClientWithBaseURI(endpoint, c.SubscriptionID) + setUserAgent(&psc.Client) + psc.Authorizer = auth + psc.Sender = autorest.CreateSender(withRequestLogging()) + client.postgresqlServersClient = psc + rtc := network.NewRouteTablesClientWithBaseURI(endpoint, c.SubscriptionID) setUserAgent(&rtc.Client) rtc.Authorizer = auth diff --git a/azurerm/import_arm_postgresql_server_test.go b/azurerm/import_arm_postgresql_server_test.go new file mode 100644 index 000000000000..da8da9aa5d20 --- /dev/null +++ b/azurerm/import_arm_postgresql_server_test.go @@ -0,0 +1,34 @@ +package azurerm + +import ( + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccAzureRMPostgreSQLServer_importBasic(t *testing.T) { + resourceName := "azurerm_postgresql_server.test" + + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLServer_basic(ri) + + 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 + }, + }, + }, + }) +} diff --git a/azurerm/provider.go b/azurerm/provider.go index 3fa362c062a0..54536838ef8d 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -104,6 +104,7 @@ func Provider() terraform.ResourceProvider { "azurerm_network_interface": resourceArmNetworkInterface(), "azurerm_network_security_group": resourceArmNetworkSecurityGroup(), "azurerm_network_security_rule": resourceArmNetworkSecurityRule(), + "azurerm_postgresql_server": resourceArmPostgreSQLServer(), "azurerm_public_ip": resourceArmPublicIp(), "azurerm_redis_cache": resourceArmRedisCache(), "azurerm_resource_group": resourceArmResourceGroup(), @@ -239,22 +240,23 @@ var providerRegistrationOnce sync.Once func determineAzureResourceProvidersToRegister(providerList []resources.Provider) map[string]struct{} { providers := map[string]struct{}{ - "Microsoft.Cache": struct{}{}, - "Microsoft.Cdn": struct{}{}, - "Microsoft.Compute": struct{}{}, - "Microsoft.ContainerRegistry": struct{}{}, - "Microsoft.ContainerService": struct{}{}, - "Microsoft.DocumentDB": struct{}{}, - "Microsoft.EventGrid": struct{}{}, - "Microsoft.EventHub": struct{}{}, - "Microsoft.KeyVault": struct{}{}, - "microsoft.insights": struct{}{}, - "Microsoft.Network": struct{}{}, - "Microsoft.Resources": struct{}{}, - "Microsoft.Search": struct{}{}, - "Microsoft.ServiceBus": struct{}{}, - "Microsoft.Sql": struct{}{}, - "Microsoft.Storage": struct{}{}, + "Microsoft.Cache": {}, + "Microsoft.Cdn": {}, + "Microsoft.Compute": {}, + "Microsoft.ContainerRegistry": {}, + "Microsoft.ContainerService": {}, + "Microsoft.DBforPostgreSQL": {}, + "Microsoft.DocumentDB": {}, + "Microsoft.EventGrid": {}, + "Microsoft.EventHub": {}, + "Microsoft.KeyVault": {}, + "microsoft.insights": {}, + "Microsoft.Network": {}, + "Microsoft.Resources": {}, + "Microsoft.Search": {}, + "Microsoft.ServiceBus": {}, + "Microsoft.Sql": {}, + "Microsoft.Storage": {}, } // filter out any providers already registered diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go new file mode 100644 index 000000000000..261e909959b4 --- /dev/null +++ b/azurerm/resource_arm_postgresql_server.go @@ -0,0 +1,305 @@ +package azurerm + +import ( + "fmt" + "log" + "net/http" + "strconv" + + "github.com/Azure/azure-sdk-for-go/arm/postgresql" + "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" + "github.com/jen20/riviera/azure" +) + +func resourceArmPostgreSQLServer() *schema.Resource { + return &schema.Resource{ + Create: resourceArmPostgreSQLServerCreate, + Read: resourceArmPostgreSQLServerRead, + Update: resourceArmPostgreSQLServerUpdate, + Delete: resourceArmPostgreSQLServerDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "location": locationSchema(), + + "resource_group_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "sku": { + Type: schema.TypeSet, + Required: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "PGSQLB50", + "PGSQLB100", + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + + "capacity": { + Type: schema.TypeInt, + Required: true, + ValidateFunc: validation.IntInSlice([]int{ + 50, + 100, + }), + }, + + "tier": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + string(postgresql.Basic), + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + }, + }, + }, + + "administrator_login": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "administrator_login_password": { + Type: schema.TypeString, + Required: true, + Sensitive: true, + }, + + "version": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + string(postgresql.NineFullStopFive), + string(postgresql.NineFullStopSix), + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ForceNew: true, + }, + + "storage_mb": { + Type: schema.TypeInt, + Required: true, + ForceNew: true, + ValidateFunc: validation.IntInSlice([]int{ + 51200, + 102400, + }), + }, + + "ssl_enforcement": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + string(postgresql.SslEnforcementEnumDisabled), + string(postgresql.SslEnforcementEnumEnabled), + }, true), + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + }, + + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + + "tags": tagsSchema(), + }, + } +} + +func resourceArmPostgreSQLServerCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlServersClient + + log.Printf("[INFO] preparing arguments for AzureRM PostgreSQL Server creation.") + + name := d.Get("name").(string) + location := d.Get("location").(string) + resGroup := 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) + + tags := d.Get("tags").(map[string]interface{}) + + sku := expandAzureRmPostgreSQLServerSku(d, storageMB) + + properties := postgresql.ServerForCreate{ + Location: &location, + Sku: sku, + Properties: &postgresql.ServerPropertiesForCreate{ + Version: postgresql.ServerVersion(version), + StorageMB: azure.Int64(int64(storageMB)), + SslEnforcement: postgresql.SslEnforcementEnum(sslEnforcement), + AdministratorLogin: azure.String(adminLogin), + AdministratorLoginPassword: azure.String(adminLoginPassword), + }, + Tags: expandTags(tags), + } + + _, error := client.Create(resGroup, name, properties, make(chan struct{})) + err := <-error + if err != nil { + return err + } + + read, err := client.Get(resGroup, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Cannot read PostgreSQL Server %s (resource group %s) ID", name, resGroup) + } + + d.SetId(*read.ID) + + return resourceArmPostgreSQLServerRead(d, meta) +} + +func resourceArmPostgreSQLServerUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlServersClient + + log.Printf("[INFO] preparing arguments for AzureRM PostgreSQL Server update.") + + name := d.Get("name").(string) + resGroup := 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) + + tags := d.Get("tags").(map[string]interface{}) + + properties := postgresql.ServerUpdateParameters{ + Sku: sku, + ServerUpdateParametersProperties: &postgresql.ServerUpdateParametersProperties{ + SslEnforcement: postgresql.SslEnforcementEnum(sslEnforcement), + StorageMB: azure.Int64(int64(storageMB)), + Version: postgresql.ServerVersion(version), + AdministratorLoginPassword: azure.String(adminLoginPassword), + }, + Tags: expandTags(tags), + } + + _, error := client.Update(resGroup, name, properties, make(chan struct{})) + err := <-error + if err != nil { + return err + } + + read, err := client.Get(resGroup, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Cannot read PostgreSQL Server %s (resource group %s) ID", name, resGroup) + } + + d.SetId(*read.ID) + + return resourceArmPostgreSQLServerRead(d, meta) +} + +func resourceArmPostgreSQLServerRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlServersClient + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resGroup := id.ResourceGroup + name := id.Path["servers"] + + resp, err := client.Get(resGroup, name) + if err != nil { + if resp.StatusCode == http.StatusNotFound { + d.SetId("") + return nil + } + return fmt.Errorf("Error making Read request on Azure PostgreSQL Server %s: %+v", name, err) + } + + d.Set("name", resp.Name) + d.Set("resource_group_name", resGroup) + d.Set("location", azureRMNormalizeLocation(*resp.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)) + + flattenAndSetAzureRmPostgreSQLServerSku(d, resp.Sku) + flattenAndSetTags(d, resp.Tags) + + // Computed + d.Set("fqdn", resp.FullyQualifiedDomainName) + + return nil +} + +func resourceArmPostgreSQLServerDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlServersClient + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resGroup := id.ResourceGroup + name := id.Path["servers"] + + _, error := client.Delete(resGroup, name, make(chan struct{})) + err = <-error + + return err +} + +func expandAzureRmPostgreSQLServerSku(d *schema.ResourceData, storageMB int) *postgresql.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) + + return &postgresql.Sku{ + Name: azure.String(name), + Capacity: azure.Int32(int32(capacity)), + Tier: postgresql.SkuTier(tier), + Size: azure.String(strconv.Itoa(storageMB)), + } +} + +func flattenAndSetAzureRmPostgreSQLServerSku(d *schema.ResourceData, resp *postgresql.Sku) { + values := map[string]interface{}{} + + values["name"] = *resp.Name + values["capacity"] = int(*resp.Capacity) + values["tier"] = string(resp.Tier) + + sku := []interface{}{values} + d.Set("sku", sku) +} diff --git a/azurerm/resource_arm_postgresql_server_test.go b/azurerm/resource_arm_postgresql_server_test.go new file mode 100644 index 000000000000..eed1dc25a072 --- /dev/null +++ b/azurerm/resource_arm_postgresql_server_test.go @@ -0,0 +1,110 @@ +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 TestAccAzureRMPostgreSQLServer_basic(t *testing.T) { + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLServer_basic(ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLServerDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPostgreSQLServerExists("azurerm_postgresql_server.test"), + ), + }, + }, + }) +} + +func testCheckAzureRMPostgreSQLServerExists(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) + } + + 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 PostgreSQL Server: %s", name) + } + + client := testAccProvider.Meta().(*ArmClient).postgresqlServersClient + + resp, err := client.Get(resourceGroup, name) + if err != nil { + return fmt.Errorf("Bad: Get on postgresqlServersClient: %s", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: PostgreSQL Server %q (resource group: %q) does not exist", name, resourceGroup) + } + + return nil + } +} + +func testCheckAzureRMPostgreSQLServerDestroy(s *terraform.State) error { + client := testAccProvider.Meta().(*ArmClient).postgresqlServersClient + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_postgresql_server" { + continue + } + + name := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := client.Get(resourceGroup, name) + + if err != nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("PostgreSQL Server still exists:\n%#v", resp) + } + } + + return nil +} + +func testAccAzureRMPostgreSQLServer_basic(rInt int) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "West US" +} +resource "azurerm_postgresql_server" "test" { + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "PGSQLB50" + capacity = 50 + tier = "Basic" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.5" + storage_mb = 51200 + ssl_enforcement = "Enabled" +} +`, rInt, rInt) +} diff --git a/website/azurerm.erb b/website/azurerm.erb index 0c5f79ef7612..33c1063705b6 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -109,6 +109,19 @@ + > + Database Resources + + + > DNS Resources
    diff --git a/website/docs/r/postgresql_server.html.markdown b/website/docs/r/postgresql_server.html.markdown new file mode 100644 index 000000000000..697da6114373 --- /dev/null +++ b/website/docs/r/postgresql_server.html.markdown @@ -0,0 +1,88 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_postgresql_server" +sidebar_current: "docs-azurerm-resource-postgresql-server" +description: |- + Create a PostgreSQL Server. +--- + +# azurerm\_postgresql\_server + +Create a PostgreSQL Server. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "test" { + name = "api-rg-pro" + location = "West Europe" +} + +resource "azurerm_postgresql_server" "test" { + name = "postgresql-server-1" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "PGSQLB50" + capacity = 50 + tier = "Basic" + } + + administrator_login = "psqladminun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.5" + storage_mb = "51200" + ssl_enforcement = "Enabled" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `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. + +* `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. + +* `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 `51200` and `102400`. Changing this forces a new resource to be created. + +* `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: + +* `name` - (Optional) Specifies the SKU Name for this PostgreSQL Server. Possible values are `PGSQLB50` and `PGSQLB100`. +* `capacity` - (Optional) Specifies the DTU's for this PostgreSQL Server. Possible values are `50` and `100` DTU's. +* `tier` - (Optional) Specifies the SKU Tier for this PostgreSQL Server. At this time the only allowed value is `Basic`. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the PostgreSQL Server. + +* `fqdn` - The FQDN of the PostgreSQL Server. + +## Import + +PostgreSQL Server's can be imported using the `resource id`, e.g. + +``` +terraform import azurerm_postgresql_server.server1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.DBforPostgreSQL/servers/server1 +``` From 02b3713634bc70ad4bfa851380a2abc3d5dffd0b Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 9 Jul 2017 15:06:14 -0700 Subject: [PATCH 03/27] Adding support for PostgreSQL Databases --- azurerm/config.go | 9 +- .../import_arm_postgresql_database_test.go | 31 ++++ azurerm/provider.go | 1 + azurerm/resource_arm_postgresql_database.go | 138 ++++++++++++++++++ .../resource_arm_postgresql_database_test.go | 121 +++++++++++++++ .../resource_arm_postgresql_server_test.go | 3 +- website/azurerm.erb | 4 + .../docs/r/postgresql_database.html.markdown | 75 ++++++++++ 8 files changed, 380 insertions(+), 2 deletions(-) create mode 100644 azurerm/import_arm_postgresql_database_test.go create mode 100644 azurerm/resource_arm_postgresql_database.go create mode 100644 azurerm/resource_arm_postgresql_database_test.go create mode 100644 website/docs/r/postgresql_database.html.markdown diff --git a/azurerm/config.go b/azurerm/config.go index 169608c3c81b..0029e6f554bc 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -91,7 +91,8 @@ type ArmClient struct { eventHubConsumerGroupClient eventhub.ConsumerGroupsClient eventHubNamespacesClient eventhub.NamespacesClient - postgresqlServersClient postgresql.ServersClient + postgresqlDatabasesClient postgresql.DatabasesClient + postgresqlServersClient postgresql.ServersClient providers resources.ProvidersClient resourceGroupClient resources.GroupsClient @@ -404,6 +405,12 @@ func (c *Config) getArmClient() (*ArmClient, error) { vnpc.Sender = autorest.CreateSender(withRequestLogging()) client.vnetPeeringsClient = vnpc + pdbc := postgresql.NewDatabasesClientWithBaseURI(endpoint, c.SubscriptionID) + setUserAgent(&pdbc.Client) + pdbc.Authorizer = auth + pdbc.Sender = autorest.CreateSender(withRequestLogging()) + client.postgresqlDatabasesClient = pdbc + psc := postgresql.NewServersClientWithBaseURI(endpoint, c.SubscriptionID) setUserAgent(&psc.Client) psc.Authorizer = auth diff --git a/azurerm/import_arm_postgresql_database_test.go b/azurerm/import_arm_postgresql_database_test.go new file mode 100644 index 000000000000..c0cce08cda91 --- /dev/null +++ b/azurerm/import_arm_postgresql_database_test.go @@ -0,0 +1,31 @@ +package azurerm + +import ( + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccAzureRMPostgreSQLDatabase_importBasic(t *testing.T) { + resourceName := "azurerm_postgresql_database.test" + + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLDatabase_basic(ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLDatabaseDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} diff --git a/azurerm/provider.go b/azurerm/provider.go index 54536838ef8d..7aac56d1e3bd 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -104,6 +104,7 @@ func Provider() terraform.ResourceProvider { "azurerm_network_interface": resourceArmNetworkInterface(), "azurerm_network_security_group": resourceArmNetworkSecurityGroup(), "azurerm_network_security_rule": resourceArmNetworkSecurityRule(), + "azurerm_postgresql_database": resourceArmPostgreSQLDatabase(), "azurerm_postgresql_server": resourceArmPostgreSQLServer(), "azurerm_public_ip": resourceArmPublicIp(), "azurerm_redis_cache": resourceArmRedisCache(), diff --git a/azurerm/resource_arm_postgresql_database.go b/azurerm/resource_arm_postgresql_database.go new file mode 100644 index 000000000000..f8a96a6da952 --- /dev/null +++ b/azurerm/resource_arm_postgresql_database.go @@ -0,0 +1,138 @@ +package azurerm + +import ( + "fmt" + "log" + "net/http" + + "github.com/Azure/azure-sdk-for-go/arm/postgresql" + "github.com/hashicorp/terraform/helper/schema" + "github.com/jen20/riviera/azure" +) + +func resourceArmPostgreSQLDatabase() *schema.Resource { + return &schema.Resource{ + Create: resourceArmPostgreSQLDatabaseCreate, + Read: resourceArmPostgreSQLDatabaseRead, + Delete: resourceArmPostgreSQLDatabaseDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "resource_group_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "server_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "charset": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "collation": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + }, + } +} + +func resourceArmPostgreSQLDatabaseCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlDatabasesClient + + log.Printf("[INFO] preparing arguments for AzureRM PostgreSQL Database creation.") + + name := d.Get("name").(string) + resGroup := d.Get("resource_group_name").(string) + serverName := d.Get("server_name").(string) + + charset := d.Get("charset").(string) + collation := d.Get("collation").(string) + + properties := postgresql.Database{ + DatabaseProperties: &postgresql.DatabaseProperties{ + Charset: azure.String(charset), + Collation: azure.String(collation), + }, + } + + _, error := client.Create(resGroup, serverName, name, properties, make(chan struct{})) + err := <-error + if err != nil { + return err + } + + read, err := client.Get(resGroup, serverName, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Cannot read PostgreSQL Database %s (resource group %s) ID", name, resGroup) + } + + d.SetId(*read.ID) + + return resourceArmPostgreSQLDatabaseRead(d, meta) +} + +func resourceArmPostgreSQLDatabaseRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlDatabasesClient + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resGroup := id.ResourceGroup + serverName := id.Path["servers"] + name := id.Path["databases"] + + resp, err := client.Get(resGroup, serverName, name) + if err != nil { + if resp.StatusCode == http.StatusNotFound { + d.SetId("") + return nil + } + return fmt.Errorf("Error making Read request on Azure PostgreSQL Database %s: %+v", name, err) + } + + 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) + + return nil +} + +func resourceArmPostgreSQLDatabaseDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlDatabasesClient + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resGroup := id.ResourceGroup + serverName := id.Path["servers"] + name := id.Path["databases"] + + _, error := client.Delete(resGroup, serverName, name, make(chan struct{})) + err = <-error + + return err +} diff --git a/azurerm/resource_arm_postgresql_database_test.go b/azurerm/resource_arm_postgresql_database_test.go new file mode 100644 index 000000000000..47d094197f41 --- /dev/null +++ b/azurerm/resource_arm_postgresql_database_test.go @@ -0,0 +1,121 @@ +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 TestAccAzureRMPostgreSQLDatabase_basic(t *testing.T) { + resourceName := "azurerm_postgresql_database.test" + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLDatabase_basic(ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLDatabaseDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPostgreSQLDatabaseExists(resourceName), + ), + }, + }, + }) +} + +func testCheckAzureRMPostgreSQLDatabaseExists(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) + } + + name := rs.Primary.Attributes["name"] + serverName := rs.Primary.Attributes["server_name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for PostgreSQL Database: %s", name) + } + + client := testAccProvider.Meta().(*ArmClient).postgresqlDatabasesClient + + resp, err := client.Get(resourceGroup, serverName, name) + if err != nil { + return fmt.Errorf("Bad: Get on postgresqlDatabasesClient: %s", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: PostgreSQL Database %q (server %q resource group: %q) does not exist", name, serverName, resourceGroup) + } + + return nil + } +} + +func testCheckAzureRMPostgreSQLDatabaseDestroy(s *terraform.State) error { + client := testAccProvider.Meta().(*ArmClient).postgresqlDatabasesClient + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_postgresql_database" { + continue + } + + name := rs.Primary.Attributes["name"] + serverName := rs.Primary.Attributes["server_name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := client.Get(resourceGroup, serverName, name) + + if err != nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("PostgreSQL Database still exists:\n%#v", resp) + } + } + + return nil +} + +func testAccAzureRMPostgreSQLDatabase_basic(rInt int) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "West US" +} +resource "azurerm_postgresql_server" "test" { + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "PGSQLB50" + capacity = 50 + tier = "Basic" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.6" + storage_mb = 51200 + 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, rInt, rInt) +} diff --git a/azurerm/resource_arm_postgresql_server_test.go b/azurerm/resource_arm_postgresql_server_test.go index eed1dc25a072..1f441f06cac5 100644 --- a/azurerm/resource_arm_postgresql_server_test.go +++ b/azurerm/resource_arm_postgresql_server_test.go @@ -11,6 +11,7 @@ import ( ) func TestAccAzureRMPostgreSQLServer_basic(t *testing.T) { + resourceName := "azurerm_postgresql_server.test" ri := acctest.RandInt() config := testAccAzureRMPostgreSQLServer_basic(ri) @@ -22,7 +23,7 @@ func TestAccAzureRMPostgreSQLServer_basic(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMPostgreSQLServerExists("azurerm_postgresql_server.test"), + testCheckAzureRMPostgreSQLServerExists(resourceName), ), }, }, diff --git a/website/azurerm.erb b/website/azurerm.erb index 33c1063705b6..37e97dc47c59 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -113,6 +113,10 @@ Database Resources
      + > + azurerm_postgresql_database + + > azurerm_postgresql_server diff --git a/website/docs/r/postgresql_database.html.markdown b/website/docs/r/postgresql_database.html.markdown new file mode 100644 index 000000000000..ec28a37ddff1 --- /dev/null +++ b/website/docs/r/postgresql_database.html.markdown @@ -0,0 +1,75 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_postgresql_database" +sidebar_current: "docs-azurerm-resource-postgresql-database" +description: |- + Creates a PostgreSQL Database within a PostgreSQL Server. +--- + +# azurerm\_postgresql\_database + +Creates a PostgreSQL Database within a PostgreSQL Server + +## Example Usage + +```hcl +resource "azurerm_resource_group" "test" { + name = "api-rg-pro" + location = "West Europe" +} + +resource "azurerm_postgresql_server" "test" { + name = "postgresql-server-1" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "PGSQLB50" + capacity = 50 + tier = "Basic" + } + + administrator_login = "psqladminun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.5" + storage_mb = "51200" + ssl_enforcement = "Enabled" +} + +resource "azurerm_postgresql_database" "test" { + name = "exampledb" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_postgresql_server.test.name}" + charset = "UTF8" + collation = "English_United States.1252" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the PostgreSQL Database, which needs [to be a valid PostgreSQL identifier](https://www.postgresql.org/docs/current/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS). Changing this forces a + new resource to be created. + +* `server_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 the PostgreSQL Server exists. Changing this forces a new resource to be created. + +* `charset` - (Required) Specifies the Charset for the PostgreSQL Database. Changing this forces a new resource to be created. + +* `collation` - (Required) Specifies the Collation for the PostgreSQL Database. Changing this forces a new resource to be created. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the PostgreSQL Database. + +## Import + +PostgreSQL Database's can be imported using the `resource id`, e.g. + +``` +terraform import azurerm_postgresql_database.database1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.DBforPostgreSQL/servers/server1/databases/database1 +``` From 83f333a08806c70f1a182fab662d466630060277 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 9 Jul 2017 15:56:09 -0700 Subject: [PATCH 04/27] Adding support for Firewall Rules --- azurerm/config.go | 11 +- ...mport_arm_postgresql_firewall_rule_test.go | 31 ++++ azurerm/provider.go | 1 + .../resource_arm_postgresql_firewall_rule.go | 137 ++++++++++++++++++ ...ource_arm_postgresql_firewall_rule_test.go | 122 ++++++++++++++++ website/azurerm.erb | 4 + .../r/postgresql_firewall_rule.html.markdown | 110 ++++++++++++++ 7 files changed, 414 insertions(+), 2 deletions(-) create mode 100644 azurerm/import_arm_postgresql_firewall_rule_test.go create mode 100644 azurerm/resource_arm_postgresql_firewall_rule.go create mode 100644 azurerm/resource_arm_postgresql_firewall_rule_test.go create mode 100644 website/docs/r/postgresql_firewall_rule.html.markdown diff --git a/azurerm/config.go b/azurerm/config.go index 0029e6f554bc..0ba75564b098 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -91,8 +91,9 @@ type ArmClient struct { eventHubConsumerGroupClient eventhub.ConsumerGroupsClient eventHubNamespacesClient eventhub.NamespacesClient - postgresqlDatabasesClient postgresql.DatabasesClient - postgresqlServersClient postgresql.ServersClient + postgresqlDatabasesClient postgresql.DatabasesClient + postgresqlFirewallRulesClient postgresql.FirewallRulesClient + postgresqlServersClient postgresql.ServersClient providers resources.ProvidersClient resourceGroupClient resources.GroupsClient @@ -411,6 +412,12 @@ func (c *Config) getArmClient() (*ArmClient, error) { pdbc.Sender = autorest.CreateSender(withRequestLogging()) client.postgresqlDatabasesClient = pdbc + pfwc := postgresql.NewFirewallRulesClientWithBaseURI(endpoint, c.SubscriptionID) + setUserAgent(&pfwc.Client) + pfwc.Authorizer = auth + pfwc.Sender = autorest.CreateSender(withRequestLogging()) + client.postgresqlFirewallRulesClient = pfwc + psc := postgresql.NewServersClientWithBaseURI(endpoint, c.SubscriptionID) setUserAgent(&psc.Client) psc.Authorizer = auth diff --git a/azurerm/import_arm_postgresql_firewall_rule_test.go b/azurerm/import_arm_postgresql_firewall_rule_test.go new file mode 100644 index 000000000000..748ea9734da3 --- /dev/null +++ b/azurerm/import_arm_postgresql_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 TestAccAzureRMPostgreSQLFirewallRule_importBasic(t *testing.T) { + resourceName := "azurerm_postgresql_firewall_rule.test" + + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLFirewallRule_basic(ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLFirewallRuleDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} diff --git a/azurerm/provider.go b/azurerm/provider.go index 7aac56d1e3bd..e81082437250 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -105,6 +105,7 @@ func Provider() terraform.ResourceProvider { "azurerm_network_security_group": resourceArmNetworkSecurityGroup(), "azurerm_network_security_rule": resourceArmNetworkSecurityRule(), "azurerm_postgresql_database": resourceArmPostgreSQLDatabase(), + "azurerm_postgresql_firewall_rule": resourceArmPostgreSQLFirewallRule(), "azurerm_postgresql_server": resourceArmPostgreSQLServer(), "azurerm_public_ip": resourceArmPublicIp(), "azurerm_redis_cache": resourceArmRedisCache(), diff --git a/azurerm/resource_arm_postgresql_firewall_rule.go b/azurerm/resource_arm_postgresql_firewall_rule.go new file mode 100644 index 000000000000..f8d49c4b8bb8 --- /dev/null +++ b/azurerm/resource_arm_postgresql_firewall_rule.go @@ -0,0 +1,137 @@ +package azurerm + +import ( + "fmt" + "log" + "net/http" + + "github.com/Azure/azure-sdk-for-go/arm/postgresql" + "github.com/hashicorp/terraform/helper/schema" + "github.com/jen20/riviera/azure" +) + +func resourceArmPostgreSQLFirewallRule() *schema.Resource { + return &schema.Resource{ + Create: resourceArmPostgreSQLFirewallRuleCreate, + Read: resourceArmPostgreSQLFirewallRuleRead, + Delete: resourceArmPostgreSQLFirewallRuleDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "resource_group_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "server_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "start_ip_address": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "end_ip_address": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + }, + } +} + +func resourceArmPostgreSQLFirewallRuleCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlFirewallRulesClient + + log.Printf("[INFO] preparing arguments for AzureRM PostgreSQL Firewall Rule creation.") + + name := d.Get("name").(string) + resGroup := d.Get("resource_group_name").(string) + serverName := d.Get("server_name").(string) + startIPAddress := d.Get("start_ip_address").(string) + endIPAddress := d.Get("end_ip_address").(string) + + properties := postgresql.FirewallRule{ + FirewallRuleProperties: &postgresql.FirewallRuleProperties{ + StartIPAddress: azure.String(startIPAddress), + EndIPAddress: azure.String(endIPAddress), + }, + } + + _, error := client.Create(resGroup, serverName, name, properties, make(chan struct{})) + err := <-error + if err != nil { + return err + } + + read, err := client.Get(resGroup, serverName, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Cannot read PostgreSQL Firewall Rule %s (resource group %s) ID", name, resGroup) + } + + d.SetId(*read.ID) + + return resourceArmPostgreSQLFirewallRuleRead(d, meta) +} + +func resourceArmPostgreSQLFirewallRuleRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlFirewallRulesClient + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resGroup := id.ResourceGroup + serverName := id.Path["servers"] + name := id.Path["firewallRules"] + + resp, err := client.Get(resGroup, serverName, name) + if err != nil { + if resp.StatusCode == http.StatusNotFound { + d.SetId("") + return nil + } + return fmt.Errorf("Error making Read request on Azure PostgreSQL Firewall Rule %s: %+v", name, err) + } + + d.Set("name", resp.Name) + d.Set("resource_group_name", resGroup) + d.Set("server_name", serverName) + d.Set("start_ip_address", resp.StartIPAddress) + d.Set("end_ip_address", resp.EndIPAddress) + + return nil +} + +func resourceArmPostgreSQLFirewallRuleDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlFirewallRulesClient + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resGroup := id.ResourceGroup + serverName := id.Path["servers"] + name := id.Path["firewallRules"] + + _, error := client.Delete(resGroup, serverName, name, make(chan struct{})) + err = <-error + + return err +} diff --git a/azurerm/resource_arm_postgresql_firewall_rule_test.go b/azurerm/resource_arm_postgresql_firewall_rule_test.go new file mode 100644 index 000000000000..86ee7cb48a26 --- /dev/null +++ b/azurerm/resource_arm_postgresql_firewall_rule_test.go @@ -0,0 +1,122 @@ +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 TestAccAzureRMPostgreSQLFirewallRule_basic(t *testing.T) { + resourceName := "azurerm_postgresql_firewall_rule.test" + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLFirewallRule_basic(ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLFirewallRuleDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPostgreSQLFirewallRuleExists(resourceName), + ), + }, + }, + }) +} + +func testCheckAzureRMPostgreSQLFirewallRuleExists(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) + } + + name := rs.Primary.Attributes["name"] + serverName := rs.Primary.Attributes["server_name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for PostgreSQL Firewall Rule: %s", name) + } + + client := testAccProvider.Meta().(*ArmClient).postgresqlFirewallRulesClient + + resp, err := client.Get(resourceGroup, serverName, name) + if err != nil { + return fmt.Errorf("Bad: Get on postgresqlFirewallRulesClient: %s", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: PostgreSQL Firewall Rule %q (server %q resource group: %q) does not exist", name, serverName, resourceGroup) + } + + return nil + } +} + +func testCheckAzureRMPostgreSQLFirewallRuleDestroy(s *terraform.State) error { + client := testAccProvider.Meta().(*ArmClient).postgresqlDatabasesClient + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_postgresql_firewall_rule" { + continue + } + + name := rs.Primary.Attributes["name"] + serverName := rs.Primary.Attributes["server_name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := client.Get(resourceGroup, serverName, name) + + if err != nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("PostgreSQL Firewall Rule still exists:\n%#v", resp) + } + } + + return nil +} + +func testAccAzureRMPostgreSQLFirewallRule_basic(rInt int) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "West US" +} + +resource "azurerm_postgresql_server" "test" { + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "PGSQLB50" + capacity = 50 + tier = "Basic" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.6" + storage_mb = 51200 + ssl_enforcement = "Enabled" +} + +resource "azurerm_postgresql_firewall_rule" "test" { + name = "acctestfwrule-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_postgresql_server.test.name}" + start_ip_address = "0.0.0.0" + end_ip_address = "255.255.255.255" +} +`, rInt, rInt, rInt) +} diff --git a/website/azurerm.erb b/website/azurerm.erb index 37e97dc47c59..1260e36c5fdf 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -117,6 +117,10 @@ azurerm_postgresql_database + > + azurerm_postgresql_firewall_rule + + > azurerm_postgresql_server diff --git a/website/docs/r/postgresql_firewall_rule.html.markdown b/website/docs/r/postgresql_firewall_rule.html.markdown new file mode 100644 index 000000000000..49a8ae5a7bbb --- /dev/null +++ b/website/docs/r/postgresql_firewall_rule.html.markdown @@ -0,0 +1,110 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_postgresql_firewall_rule" +sidebar_current: "docs-azurerm-resource-postgresql-firewall-rule" +description: |- + Creates a Firewall Rule for a PostgreSQL Server. +--- + +# azurerm\_postgresql\_firewall\_rule + +Creates a Firewall Rule for a PostgreSQL Server + +## Example Usage (Single IP Address) + +```hcl +resource "azurerm_resource_group" "test" { + name = "api-rg-pro" + location = "West Europe" +} + +resource "azurerm_postgresql_server" "test" { + name = "postgresql-server-1" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "PGSQLB50" + capacity = 50 + tier = "Basic" + } + + administrator_login = "psqladminun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.5" + storage_mb = "51200" + ssl_enforcement = "Enabled" +} + +resource "azurerm_postgresql_firewall_rule" "test" { + name = "office" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_postgresql_server.test.name}" + start_ip_address = "40.112.8.12" + end_ip_address = "40.112.8.12" +} +``` + +## Example Usage (IP Range) + +```hcl +resource "azurerm_resource_group" "test" { + name = "api-rg-pro" + location = "West Europe" +} + +resource "azurerm_postgresql_server" "test" { + name = "postgresql-server-1" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "PGSQLB50" + capacity = 50 + tier = "Basic" + } + + administrator_login = "psqladminun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.5" + storage_mb = "51200" + ssl_enforcement = "Enabled" +} + +resource "azurerm_postgresql_firewall_rule" "test" { + name = "office" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_postgresql_server.test.name}" + start_ip_address = "40.112.0.0" + end_ip_address = "40.112.255.255" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the PostgreSQL Firewall Rule. Changing this forces a + new resource to be created. + +* `server_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 the PostgreSQL Server exists. Changing this forces a new resource to be created. + +* `start_ip_address` - (Required) Specifies the Charset for the PostgreSQL Database. Changing this forces a new resource to be created. + +* `end_ip_address` - (Required) Specifies the End IP Address associated with this Firewall Rule. Changing this forces a new resource to be created. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the PostgreSQL Firewall Rule. + +## Import + +PostgreSQL Firewall Rule's can be imported using the `resource id`, e.g. + +``` +terraform import azurerm_postgresql_firewall_rule.rule1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.DBforPostgreSQL/servers/server1/firewallRules/rule1 +``` From ce73d017a12dbbbfd92c5ff4e2df46a19a10c54f Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 9 Jul 2017 17:52:16 -0700 Subject: [PATCH 05/27] Moving the intInSlice validator into the azurerm package --- azurerm/resource_arm_postgresql_server.go | 4 +- azurerm/validators.go | 22 ++++++++++- azurerm/validators_test.go | 48 +++++++++++++++++++++-- 3 files changed, 68 insertions(+), 6 deletions(-) diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go index 261e909959b4..7df96bfc19e2 100644 --- a/azurerm/resource_arm_postgresql_server.go +++ b/azurerm/resource_arm_postgresql_server.go @@ -56,7 +56,7 @@ func resourceArmPostgreSQLServer() *schema.Resource { "capacity": { Type: schema.TypeInt, Required: true, - ValidateFunc: validation.IntInSlice([]int{ + ValidateFunc: validateIntInSlice([]int{ 50, 100, }), @@ -101,7 +101,7 @@ func resourceArmPostgreSQLServer() *schema.Resource { Type: schema.TypeInt, Required: true, ForceNew: true, - ValidateFunc: validation.IntInSlice([]int{ + ValidateFunc: validateIntInSlice([]int{ 51200, 102400, }), diff --git a/azurerm/validators.go b/azurerm/validators.go index aa943431c3ae..49c5c83d0a37 100644 --- a/azurerm/validators.go +++ b/azurerm/validators.go @@ -5,6 +5,7 @@ import ( "time" "github.com/Azure/go-autorest/autorest/date" + "github.com/hashicorp/terraform/helper/schema" "github.com/satori/uuid" ) @@ -14,8 +15,27 @@ func validateRFC3339Date(v interface{}, k string) (ws []string, errors []error) if _, err := date.ParseTime(time.RFC3339, dateString); err != nil { errors = append(errors, fmt.Errorf("`%s` is an invalid RFC3339 date: %+v", k, err)) } +} - return +// validateIntInSlice returns a SchemaValidateFunc which tests if the provided value +// is of type int and matches the value of an element in the valid slice +func validateIntInSlice(valid []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 + } + + for _, str := range valid { + if v == str { + return + } + } + + es = append(es, fmt.Errorf("expected %s to be one of %v, got %s", k, valid, v)) + return + } } func validateUUID(v interface{}, k string) (ws []string, errors []error) { diff --git a/azurerm/validators_test.go b/azurerm/validators_test.go index 1053e52d7fda..97f53f78df88 100644 --- a/azurerm/validators_test.go +++ b/azurerm/validators_test.go @@ -1,8 +1,6 @@ package azurerm -import ( - "testing" -) +import "testing" func TestValidateRFC3339Date(t *testing.T) { cases := []struct { @@ -43,3 +41,47 @@ func TestValidateRFC3339Date(t *testing.T) { } } } + +func TestValidateIntInSlice(t *testing.T) { + + cases := []struct { + Input []int + Value int + Errors int + }{ + { + Input: []int{}, + Value: 0, + Errors: 1, + }, + { + Input: []int{1}, + Value: 1, + Errors: 0, + }, + { + Input: []int{1, 2, 3, 4, 5}, + Value: 3, + Errors: 0, + }, + { + Input: []int{1, 3, 5}, + Value: 3, + Errors: 0, + }, + { + Input: []int{1, 3, 5}, + Value: 4, + Errors: 1, + }, + } + + for _, tc := range cases { + _, errors := validateIntInSlice(tc.Input)(tc.Value, "azurerm_postgresql_database") + + if len(errors) != tc.Errors { + t.Fatalf("Expected the validateIntInSlice trigger a validation error for input: %+v looking for %+v", tc.Input, tc.Value) + } + } + +} From fdc7f9e920060e0c343a52bf5f41bf2ae8fae560 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 13 Jul 2017 19:35:13 -0700 Subject: [PATCH 06/27] adding postgres configurations --- azurerm/config.go | 7 +- ...mport_arm_postgresql_configuration_test.go | 34 +++++ azurerm/provider.go | 1 + .../resource_arm_postgresql_configuration.go | 142 ++++++++++++++++++ ...ource_arm_postgresql_configuration_test.go | 126 ++++++++++++++++ website/azurerm.erb | 4 + .../r/postgresql_configuration.html.markdown | 71 +++++++++ 7 files changed, 382 insertions(+), 3 deletions(-) create mode 100644 azurerm/import_arm_postgresql_configuration_test.go create mode 100644 azurerm/resource_arm_postgresql_configuration.go create mode 100644 azurerm/resource_arm_postgresql_configuration_test.go create mode 100644 website/docs/r/postgresql_configuration.html.markdown diff --git a/azurerm/config.go b/azurerm/config.go index 0ba75564b098..35f4c7632c09 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -91,9 +91,10 @@ type ArmClient struct { eventHubConsumerGroupClient eventhub.ConsumerGroupsClient eventHubNamespacesClient eventhub.NamespacesClient - postgresqlDatabasesClient postgresql.DatabasesClient - postgresqlFirewallRulesClient postgresql.FirewallRulesClient - postgresqlServersClient postgresql.ServersClient + postgresqlConfigurationsClient postgresql.ConfigurationsClient + postgresqlDatabasesClient postgresql.DatabasesClient + postgresqlFirewallRulesClient postgresql.FirewallRulesClient + postgresqlServersClient postgresql.ServersClient providers resources.ProvidersClient resourceGroupClient resources.GroupsClient diff --git a/azurerm/import_arm_postgresql_configuration_test.go b/azurerm/import_arm_postgresql_configuration_test.go new file mode 100644 index 000000000000..f26919e17803 --- /dev/null +++ b/azurerm/import_arm_postgresql_configuration_test.go @@ -0,0 +1,34 @@ +package azurerm + +import ( + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccAzureRMPostgreSQLConfiguration_importBackslashQuote(t *testing.T) { + resourceName := "azurerm_postgresql_configuration.test" + + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLConfiguration_backslashQuote(ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: func(s *terraform.State) error { + return testCheckAzureRMPostgreSQLConfigurationReset(s, "safe_encoding") + },, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} diff --git a/azurerm/provider.go b/azurerm/provider.go index e81082437250..e21383aa28ae 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -104,6 +104,7 @@ func Provider() terraform.ResourceProvider { "azurerm_network_interface": resourceArmNetworkInterface(), "azurerm_network_security_group": resourceArmNetworkSecurityGroup(), "azurerm_network_security_rule": resourceArmNetworkSecurityRule(), + "azurerm_postgresql_configuration": resourceArmPostgreSQLConfiguration(), "azurerm_postgresql_database": resourceArmPostgreSQLDatabase(), "azurerm_postgresql_firewall_rule": resourceArmPostgreSQLFirewallRule(), "azurerm_postgresql_server": resourceArmPostgreSQLServer(), diff --git a/azurerm/resource_arm_postgresql_configuration.go b/azurerm/resource_arm_postgresql_configuration.go new file mode 100644 index 000000000000..4a2fb07343c6 --- /dev/null +++ b/azurerm/resource_arm_postgresql_configuration.go @@ -0,0 +1,142 @@ +package azurerm + +import ( + "fmt" + "log" + "net/http" + + "github.com/Azure/azure-sdk-for-go/arm/postgresql" + "github.com/hashicorp/terraform/helper/schema" + "github.com/jen20/riviera/azure" +) + +func resourceArmPostgreSQLConfiguration() *schema.Resource { + return &schema.Resource{ + Create: resourceArmPostgreSQLConfigurationCreateUpdate, + Read: resourceArmPostgreSQLConfigurationRead, + Delete: resourceArmPostgreSQLConfigurationDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "resource_group_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "server_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "value": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + }, + } +} + +func resourceArmPostgreSQLConfigurationCreateUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlConfigurationsClient + + log.Printf("[INFO] preparing arguments for AzureRM PostgreSQL Configuration creation.") + + name := d.Get("name").(string) + resGroup := d.Get("resource_group_name").(string) + serverName := d.Get("server_name").(string) + + value := d.Get("value").(string) + + properties := postgresql.Configuration{ + ConfigurationProperties: &postgresql.ConfigurationProperties{ + Value: azure.String(value), + }, + } + + _, error := client.CreateOrUpdate(resGroup, serverName, name, properties, make(chan struct{})) + err := <-error + if err != nil { + return err + } + + read, err := client.Get(resGroup, serverName, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Cannot read PostgreSQL Configuration %s (resource group %s) ID", name, resGroup) + } + + d.SetId(*read.ID) + + return resourceArmPostgreSQLConfigurationRead(d, meta) +} + +func resourceArmPostgreSQLConfigurationRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlConfigurationsClient + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resGroup := id.ResourceGroup + serverName := id.Path["servers"] + name := id.Path["configurations"] + + resp, err := client.Get(resGroup, serverName, name) + if err != nil { + if resp.StatusCode == http.StatusNotFound { + d.SetId("") + return nil + } + return fmt.Errorf("Error making Read request on Azure PostgreSQL Configuration %s: %+v", name, err) + } + + d.Set("name", resp.Name) + d.Set("server_name", serverName) + d.Set("resource_group_name", resGroup) + + d.Set("value", resp.ConfigurationProperties.Value) + + return nil +} + +func resourceArmPostgreSQLConfigurationDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).postgresqlConfigurationsClient + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resGroup := id.ResourceGroup + serverName := id.Path["servers"] + name := id.Path["configurations"] + + // "delete" = resetting this to the default value + resp, err := client.Get(resGroup, serverName, name) + if err != nil { + return fmt.Errorf("Error retrieving Postgresql Configuration '%s': %+v", name, err) + } + + properties := postgresql.Configuration{ + ConfigurationProperties: &postgresql.ConfigurationProperties{ + // we can alternatively set `source: "system-default"` + Value: resp.DefaultValue, + }, + } + + _, error := client.CreateOrUpdate(resGroup, serverName, name, properties, make(chan struct{})) + err = <-error + return err +} diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go new file mode 100644 index 000000000000..a4abca4759cf --- /dev/null +++ b/azurerm/resource_arm_postgresql_configuration_test.go @@ -0,0 +1,126 @@ +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 TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { + resourceName := "azurerm_postgresql_configuration.test" + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLConfiguration_backslashQuote(ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: func(s *terraform.State) error { + return testCheckAzureRMPostgreSQLConfigurationReset(s, "safe_encoding") + }, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPostgreSQLConfigurationValue(resourceName, "on"), + ), + }, + }, + }) +} + +func testCheckAzureRMPostgreSQLConfigurationValue(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"] + serverName := rs.Primary.Attributes["server_name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for PostgreSQL Configuration: %s", name) + } + + client := testAccProvider.Meta().(*ArmClient).postgresqlConfigurationsClient + + resp, err := client.Get(resourceGroup, serverName, name) + if err != nil { + return fmt.Errorf("Bad: Get on postgresqlConfigurationsClient: %s", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: PostgreSQL Configuration %q (server %q resource group: %q) does not exist", name, serverName, resourceGroup) + } + + if resp.Value != value { + return fmt.Errorf("PostgreSQL Configuration wasn't set. Expected '%s' - got '%s': \n%+v", value, resp.Value, resp) + } + + return nil + } +} + +func testCheckAzureRMPostgreSQLConfigurationReset(s *terraform.State, value string) error { + client := testAccProvider.Meta().(*ArmClient).postgresqlConfigurationsClient + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_postgresql_configuration" { + continue + } + + name := rs.Primary.Attributes["name"] + serverName := rs.Primary.Attributes["server_name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := client.Get(resourceGroup, serverName, name) + + if err != nil { + return nil + } + + if resp.Value != value { + return fmt.Errorf("PostgreSQL Configuration wasn't reset. Expected '%s' - got '%s': \n%+v", value, resp.Value, resp) + } + } + + return nil +} + +func testAccAzureRMPostgreSQLConfiguration_backslashQuote(rInt int) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "West US" +} +resource "azurerm_postgresql_server" "test" { + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "PGSQLB50" + capacity = 50 + tier = "Basic" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.6" + storage_mb = 51200 + ssl_enforcement = "Enabled" +} + +resource "azurerm_postgresql_configuration" "test" { + name = "backslash_quote" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_postgresql_server.test.name}" + value = "on" +} +`, rInt, rInt, rInt) +} diff --git a/website/azurerm.erb b/website/azurerm.erb index 1260e36c5fdf..c4e885a217af 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -113,6 +113,10 @@ Database Resources
        + > + azurerm_postgresql_configration + + > azurerm_postgresql_database diff --git a/website/docs/r/postgresql_configuration.html.markdown b/website/docs/r/postgresql_configuration.html.markdown new file mode 100644 index 000000000000..aff91534bb39 --- /dev/null +++ b/website/docs/r/postgresql_configuration.html.markdown @@ -0,0 +1,71 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_postgresql_configuration" +sidebar_current: "docs-azurerm-resource-postgresql-configuration" +description: |- + Sets a PostgreSQL Configuration value on a PostgreSQL Server. +--- + +# azurerm\_postgresql\_configuration + +Sets a PostgreSQL Configuration value on a PostgreSQL Server. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "test" { + name = "api-rg-pro" + location = "West Europe" +} + +resource "azurerm_postgresql_server" "test" { + name = "postgresql-server-1" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "PGSQLB50" + capacity = 50 + tier = "Basic" + } + + administrator_login = "psqladminun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.5" + storage_mb = "51200" + ssl_enforcement = "Enabled" +} + +resource "azurerm_postgresql_configuration" "test" { + name = "backslash_quote" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_postgresql_server.test.name}" + value = "on" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the PostgreSQL Configration, which needs [to be a valid PostgreSQL configuration name](TODO). Changing this forces a new resource to be created. + +* `server_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 the PostgreSQL Server exists. Changing this forces a new resource to be created. + +* `value` - (Required) Specifies the value of the PostgreSQL Configuration. See the PostgreSQL documentation for valid values. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the PostgreSQL Configuration. + +## Import + +PostgreSQL Configurations can be imported using the `resource id`, e.g. + +``` +terraform import azurerm_postgresql_configuration.backslash_quote /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.DBforPostgreSQL/servers/server1/configurations/backslash_quote +``` From b9dcc26a1cd37aa42752bea45d004475103a46e0 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 3 Aug 2017 11:44:02 +0200 Subject: [PATCH 07/27] Vendoring the Postgresql sdk --- .../azure-sdk-for-go/arm/postgresql/client.go | 52 ++ .../arm/postgresql/configurations.go | 261 +++++++++ .../arm/postgresql/databases.go | 344 ++++++++++++ .../arm/postgresql/firewallrules.go | 360 +++++++++++++ .../arm/postgresql/logfiles.go | 106 ++++ .../azure-sdk-for-go/arm/postgresql/models.go | 418 +++++++++++++++ .../arm/postgresql/operations.go | 97 ++++ .../arm/postgresql/servers.go | 503 ++++++++++++++++++ .../arm/postgresql/version.go | 28 + vendor/vendor.json | 8 + 10 files changed, 2177 insertions(+) create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/client.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/configurations.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/databases.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/firewallrules.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/logfiles.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/models.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/operations.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/servers.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/version.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/client.go new file mode 100644 index 000000000000..68fd46c936a6 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/client.go @@ -0,0 +1,52 @@ +// Package postgresql implements the Azure ARM Postgresql service API version 2017-04-30-preview. +// +// 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. +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 1.1.0.0 +// 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 Postgresql + DefaultBaseURI = "https://management.azure.com" +) + +// ManagementClient is the base client for Postgresql. +type ManagementClient struct { + autorest.Client + BaseURI string + SubscriptionID string +} + +// New creates an instance of the ManagementClient client. +func New(subscriptionID string) ManagementClient { + return NewWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewWithBaseURI creates an instance of the ManagementClient client. +func NewWithBaseURI(baseURI string, subscriptionID string) ManagementClient { + return ManagementClient{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + BaseURI: baseURI, + SubscriptionID: subscriptionID, + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/configurations.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/configurations.go new file mode 100644 index 000000000000..f088d19ffffd --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/configurations.go @@ -0,0 +1,261 @@ +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 1.1.0.0 +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// 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. +type ConfigurationsClient struct { + ManagementClient +} + +// NewConfigurationsClient creates an instance of the ConfigurationsClient client. +func NewConfigurationsClient(subscriptionID string) ConfigurationsClient { + return NewConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewConfigurationsClientWithBaseURI creates an instance of the ConfigurationsClient client. +func NewConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) ConfigurationsClient { + return ConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate updates a configuration of a server. This method may poll for completion. Polling can be canceled by +// passing the cancel channel argument. The channel will be used to cancel polling and any outstanding HTTP requests. +// +// resourceGroupName is the name of the resource group 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. +func (client ConfigurationsClient) CreateOrUpdate(resourceGroupName string, serverName string, configurationName string, parameters Configuration, cancel <-chan struct{}) (<-chan Configuration, <-chan error) { + resultChan := make(chan Configuration, 1) + errChan := make(chan error, 1) + go func() { + var err error + var result Configuration + defer func() { + if err != nil { + errChan <- err + } + resultChan <- result + close(resultChan) + close(errChan) + }() + req, err := client.CreateOrUpdatePreparer(resourceGroupName, serverName, configurationName, parameters, cancel) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ConfigurationsClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "postgresql.ConfigurationsClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ConfigurationsClient", "CreateOrUpdate", resp, "Failure responding to request") + } + }() + return resultChan, errChan +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client ConfigurationsClient) CreateOrUpdatePreparer(resourceGroupName string, serverName string, configurationName string, parameters Configuration, cancel <-chan struct{}) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "configurationName": autorest.Encode("path", configurationName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-30-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsJSON(), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/configurations/{configurationName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{Cancel: cancel}) +} + +// 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) (*http.Response, error) { + return autorest.SendWithSender(client, + req, + azure.DoPollForAsynchronous(client.PollingDelay)) +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client ConfigurationsClient) CreateOrUpdateResponder(resp *http.Response) (result Configuration, 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 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. +func (client ConfigurationsClient) Get(resourceGroupName string, serverName string, configurationName string) (result Configuration, err error) { + req, err := client.GetPreparer(resourceGroupName, serverName, configurationName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ConfigurationsClient", "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.ConfigurationsClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ConfigurationsClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client ConfigurationsClient) GetPreparer(resourceGroupName string, serverName string, configurationName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "configurationName": autorest.Encode("path", configurationName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "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}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/configurations/{configurationName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{}) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client ConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client ConfigurationsClient) GetResponder(resp *http.Response) (result Configuration, 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 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. +func (client ConfigurationsClient) ListByServer(resourceGroupName string, serverName string) (result ConfigurationListResult, err error) { + req, err := client.ListByServerPreparer(resourceGroupName, serverName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ConfigurationsClient", "ListByServer", nil, "Failure preparing request") + return + } + + resp, err := client.ListByServerSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "postgresql.ConfigurationsClient", "ListByServer", resp, "Failure sending request") + return + } + + result, err = client.ListByServerResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ConfigurationsClient", "ListByServer", resp, "Failure responding to request") + } + + return +} + +// ListByServerPreparer prepares the ListByServer request. +func (client ConfigurationsClient) ListByServerPreparer(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-04-30-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.DBforPostgreSQL/servers/{serverName}/configurations", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{}) +} + +// ListByServerSender sends the ListByServer request. The method will close the +// http.Response Body if it receives an error. +func (client ConfigurationsClient) ListByServerSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req) +} + +// ListByServerResponder handles the response to the ListByServer request. The method always +// closes the http.Response Body. +func (client ConfigurationsClient) ListByServerResponder(resp *http.Response) (result ConfigurationListResult, 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/arm/postgresql/databases.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/databases.go new file mode 100644 index 000000000000..610c4f265e75 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/databases.go @@ -0,0 +1,344 @@ +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 1.1.0.0 +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// 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. +type DatabasesClient struct { + ManagementClient +} + +// NewDatabasesClient creates an instance of the DatabasesClient client. +func NewDatabasesClient(subscriptionID string) DatabasesClient { + return NewDatabasesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewDatabasesClientWithBaseURI creates an instance of the DatabasesClient client. +func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient { + return DatabasesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate creates a new database or updates an existing database. This method may poll for completion. Polling +// can be canceled by passing the cancel channel argument. The channel will be used to cancel polling and any +// outstanding HTTP requests. +// +// resourceGroupName is the name of the resource group 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. +func (client DatabasesClient) CreateOrUpdate(resourceGroupName string, serverName string, databaseName string, parameters Database, cancel <-chan struct{}) (<-chan Database, <-chan error) { + resultChan := make(chan Database, 1) + errChan := make(chan error, 1) + go func() { + var err error + var result Database + defer func() { + if err != nil { + errChan <- err + } + resultChan <- result + close(resultChan) + close(errChan) + }() + req, err := client.CreateOrUpdatePreparer(resourceGroupName, serverName, databaseName, parameters, cancel) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.DatabasesClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "postgresql.DatabasesClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.DatabasesClient", "CreateOrUpdate", resp, "Failure responding to request") + } + }() + return resultChan, errChan +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client DatabasesClient) CreateOrUpdatePreparer(resourceGroupName string, serverName string, databaseName string, parameters Database, cancel <-chan struct{}) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "databaseName": autorest.Encode("path", databaseName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-30-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsJSON(), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/databases/{databaseName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{Cancel: cancel}) +} + +// 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) (*http.Response, error) { + return autorest.SendWithSender(client, + req, + azure.DoPollForAsynchronous(client.PollingDelay)) +} + +// 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) { + 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 database. This method may poll for completion. Polling can be canceled by passing the cancel +// channel argument. The channel will be used to cancel polling and any outstanding HTTP requests. +// +// resourceGroupName is the name of the resource group 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. +func (client DatabasesClient) Delete(resourceGroupName string, serverName string, databaseName string, cancel <-chan struct{}) (<-chan autorest.Response, <-chan error) { + resultChan := make(chan autorest.Response, 1) + errChan := make(chan error, 1) + go func() { + var err error + var result autorest.Response + defer func() { + if err != nil { + errChan <- err + } + resultChan <- result + close(resultChan) + close(errChan) + }() + req, err := client.DeletePreparer(resourceGroupName, serverName, databaseName, cancel) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.DatabasesClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "postgresql.DatabasesClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.DatabasesClient", "Delete", resp, "Failure responding to request") + } + }() + return resultChan, errChan +} + +// DeletePreparer prepares the Delete request. +func (client DatabasesClient) DeletePreparer(resourceGroupName string, serverName string, databaseName string, cancel <-chan struct{}) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "databaseName": autorest.Encode("path", databaseName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-30-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.DBforPostgreSQL/servers/{serverName}/databases/{databaseName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{Cancel: cancel}) +} + +// 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) { + return autorest.SendWithSender(client, + req, + azure.DoPollForAsynchronous(client.PollingDelay)) +} + +// 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) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// 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. +func (client DatabasesClient) Get(resourceGroupName string, serverName string, databaseName string) (result Database, err error) { + req, err := client.GetPreparer(resourceGroupName, serverName, databaseName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.DatabasesClient", "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.DatabasesClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.DatabasesClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client DatabasesClient) GetPreparer(resourceGroupName string, serverName string, databaseName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "databaseName": autorest.Encode("path", databaseName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "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}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/databases/{databaseName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{}) +} + +// 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) { + return autorest.SendWithSender(client, req) +} + +// 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) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// 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. +func (client DatabasesClient) ListByServer(resourceGroupName string, serverName string) (result DatabaseListResult, err error) { + req, err := client.ListByServerPreparer(resourceGroupName, serverName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.DatabasesClient", "ListByServer", nil, "Failure preparing request") + return + } + + resp, err := client.ListByServerSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "postgresql.DatabasesClient", "ListByServer", resp, "Failure sending request") + return + } + + result, err = client.ListByServerResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.DatabasesClient", "ListByServer", resp, "Failure responding to request") + } + + return +} + +// ListByServerPreparer prepares the ListByServer request. +func (client DatabasesClient) ListByServerPreparer(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-04-30-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.DBforPostgreSQL/servers/{serverName}/databases", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{}) +} + +// 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) { + return autorest.SendWithSender(client, req) +} + +// 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) { + 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/arm/postgresql/firewallrules.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/firewallrules.go new file mode 100644 index 000000000000..e5f5d6c522bf --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/firewallrules.go @@ -0,0 +1,360 @@ +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 1.1.0.0 +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "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 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 FirewallRulesClient struct { + ManagementClient +} + +// 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 a new firewall rule or updates an existing firewall rule. This method may poll for +// completion. Polling can be canceled by passing the cancel channel argument. The channel will be used to cancel +// polling and any outstanding HTTP requests. +// +// resourceGroupName is the name of the resource group 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. +func (client FirewallRulesClient) CreateOrUpdate(resourceGroupName string, serverName string, firewallRuleName string, parameters FirewallRule, cancel <-chan struct{}) (<-chan FirewallRule, <-chan error) { + resultChan := make(chan FirewallRule, 1) + errChan := make(chan error, 1) + if err := validation.Validate([]validation.Validation{ + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.FirewallRuleProperties", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.FirewallRuleProperties.StartIPAddress", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.FirewallRuleProperties.StartIPAddress", Name: validation.Pattern, Rule: `^(([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])$`, Chain: nil}}}, + {Target: "parameters.FirewallRuleProperties.EndIPAddress", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "parameters.FirewallRuleProperties.EndIPAddress", Name: validation.Pattern, Rule: `^(([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])$`, Chain: nil}}}, + }}}}}); err != nil { + errChan <- validation.NewErrorWithValidationError(err, "postgresql.FirewallRulesClient", "CreateOrUpdate") + close(errChan) + close(resultChan) + return resultChan, errChan + } + + go func() { + var err error + var result FirewallRule + defer func() { + if err != nil { + errChan <- err + } + resultChan <- result + close(resultChan) + close(errChan) + }() + req, err := client.CreateOrUpdatePreparer(resourceGroupName, serverName, firewallRuleName, parameters, cancel) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.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, "postgresql.FirewallRulesClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesClient", "CreateOrUpdate", resp, "Failure responding to request") + } + }() + return resultChan, errChan +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client FirewallRulesClient) CreateOrUpdatePreparer(resourceGroupName string, serverName string, firewallRuleName string, parameters FirewallRule, cancel <-chan struct{}) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "firewallRuleName": autorest.Encode("path", firewallRuleName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-30-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsJSON(), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{Cancel: cancel}) +} + +// 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.DoPollForAsynchronous(client.PollingDelay)) +} + +// 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, http.StatusCreated, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete deletes a server firewall rule. This method may poll for completion. Polling can be canceled by passing the +// cancel channel argument. The channel will be used to cancel polling and any outstanding HTTP requests. +// +// resourceGroupName is the name of the resource group 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. +func (client FirewallRulesClient) Delete(resourceGroupName string, serverName string, firewallRuleName string, cancel <-chan struct{}) (<-chan autorest.Response, <-chan error) { + resultChan := make(chan autorest.Response, 1) + errChan := make(chan error, 1) + go func() { + var err error + var result autorest.Response + defer func() { + if err != nil { + errChan <- err + } + resultChan <- result + close(resultChan) + close(errChan) + }() + req, err := client.DeletePreparer(resourceGroupName, serverName, firewallRuleName, cancel) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesClient", "Delete", resp, "Failure responding to request") + } + }() + return resultChan, errChan +} + +// DeletePreparer prepares the Delete request. +func (client FirewallRulesClient) DeletePreparer(resourceGroupName string, serverName string, firewallRuleName string, cancel <-chan struct{}) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "firewallRuleName": autorest.Encode("path", firewallRuleName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2017-04-30-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.DBforPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{Cancel: cancel}) +} + +// 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.DoPollForAsynchronous(client.PollingDelay)) +} + +// 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.StatusAccepted, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// 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. +func (client FirewallRulesClient) Get(resourceGroupName string, serverName string, firewallRuleName string) (result FirewallRule, err error) { + req, err := client.GetPreparer(resourceGroupName, serverName, firewallRuleName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.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, "postgresql.FirewallRulesClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client FirewallRulesClient) GetPreparer(resourceGroupName string, serverName string, firewallRuleName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "firewallRuleName": autorest.Encode("path", firewallRuleName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "serverName": autorest.Encode("path", serverName), + "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}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{}) +} + +// 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) +} + +// 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 +} + +// 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. +func (client FirewallRulesClient) ListByServer(resourceGroupName string, serverName string) (result FirewallRuleListResult, err error) { + req, err := client.ListByServerPreparer(resourceGroupName, serverName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesClient", "ListByServer", nil, "Failure preparing request") + return + } + + resp, err := client.ListByServerSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesClient", "ListByServer", resp, "Failure sending request") + return + } + + result, err = client.ListByServerResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.FirewallRulesClient", "ListByServer", resp, "Failure responding to request") + } + + return +} + +// ListByServerPreparer prepares the ListByServer request. +func (client FirewallRulesClient) ListByServerPreparer(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-04-30-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.DBforPostgreSQL/servers/{serverName}/firewallRules", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{}) +} + +// 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) { + return autorest.SendWithSender(client, req) +} + +// 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) { + 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/arm/postgresql/logfiles.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/logfiles.go new file mode 100644 index 000000000000..50db7f555b67 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/logfiles.go @@ -0,0 +1,106 @@ +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 1.1.0.0 +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// 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. +type LogFilesClient struct { + ManagementClient +} + +// NewLogFilesClient creates an instance of the LogFilesClient client. +func NewLogFilesClient(subscriptionID string) LogFilesClient { + return NewLogFilesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewLogFilesClientWithBaseURI creates an instance of the LogFilesClient client. +func NewLogFilesClientWithBaseURI(baseURI string, subscriptionID string) LogFilesClient { + return LogFilesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// 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. +func (client LogFilesClient) ListByServer(resourceGroupName string, serverName string) (result LogFileListResult, err error) { + req, err := client.ListByServerPreparer(resourceGroupName, serverName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.LogFilesClient", "ListByServer", nil, "Failure preparing request") + return + } + + resp, err := client.ListByServerSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "postgresql.LogFilesClient", "ListByServer", resp, "Failure sending request") + return + } + + result, err = client.ListByServerResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.LogFilesClient", "ListByServer", resp, "Failure responding to request") + } + + return +} + +// ListByServerPreparer prepares the ListByServer request. +func (client LogFilesClient) ListByServerPreparer(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-04-30-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.DBforPostgreSQL/servers/{serverName}/logFiles", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{}) +} + +// ListByServerSender sends the ListByServer request. The method will close the +// http.Response Body if it receives an error. +func (client LogFilesClient) ListByServerSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req) +} + +// ListByServerResponder handles the response to the ListByServer request. The method always +// closes the http.Response Body. +func (client LogFilesClient) ListByServerResponder(resp *http.Response) (result LogFileListResult, 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/arm/postgresql/models.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/models.go new file mode 100644 index 000000000000..dae190e4ed2a --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/models.go @@ -0,0 +1,418 @@ +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 1.1.0.0 +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "encoding/json" + "errors" + + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/date" +) + +// CreateMode enumerates the mode to create a new server +type CreateMode string + +const ( + // CreateModeDefault specifies the mode to create a new server + CreateModeDefault CreateMode = "Default" + // CreateModePointInTimeRestore specifies the mode to create a new server + CreateModePointInTimeRestore CreateMode = "PointInTimeRestore" +) + +// OperationOrigin enumerates the values for operation origin. +type OperationOrigin string + +const ( + // NotSpecified specifies the not specified state for operation origin. + NotSpecified OperationOrigin = "NotSpecified" + // System specifies the system state for operation origin. + System OperationOrigin = "system" + // User specifies the user state for operation origin. + User OperationOrigin = "user" +) + +// ServerState enumerates the values for server state. +type ServerState string + +const ( + // Disabled specifies the disabled state for server state. + Disabled ServerState = "Disabled" + // Dropping specifies the dropping state for server state. + Dropping ServerState = "Dropping" + // Ready specifies the ready state for server state. + Ready ServerState = "Ready" +) + +// ServerVersion enumerates the values for server version. +type ServerVersion string + +const ( + // NineFullStopFive specifies the nine full stop five state for server version. + NineFullStopFive ServerVersion = "9.5" + // NineFullStopSix specifies the nine full stop six state for server version. + NineFullStopSix ServerVersion = "9.6" +) + +// SkuTier enumerates the values for sku tier. +type SkuTier string + +const ( + // Basic specifies the basic state for sku tier. + Basic SkuTier = "Basic" + // Standard specifies the standard state for sku tier. + Standard SkuTier = "Standard" +) + +// SslEnforcementEnum enumerates the values for ssl enforcement enum. +type SslEnforcementEnum string + +const ( + // SslEnforcementEnumDisabled specifies the ssl enforcement enum disabled state for ssl enforcement enum. + SslEnforcementEnumDisabled SslEnforcementEnum = "Disabled" + // SslEnforcementEnumEnabled specifies the ssl enforcement enum enabled state for ssl enforcement enum. + SslEnforcementEnumEnabled SslEnforcementEnum = "Enabled" +) + +// Configuration is represents a Configuration. +type Configuration struct { + autorest.Response `json:"-"` + ID *string `json:"id,omitempty"` + Name *string `json:"name,omitempty"` + Type *string `json:"type,omitempty"` + *ConfigurationProperties `json:"properties,omitempty"` +} + +// ConfigurationListResult is a list of server configurations. +type ConfigurationListResult struct { + autorest.Response `json:"-"` + Value *[]Configuration `json:"value,omitempty"` +} + +// ConfigurationProperties is the properties of a configuration. +type ConfigurationProperties struct { + Value *string `json:"value,omitempty"` + Description *string `json:"description,omitempty"` + DefaultValue *string `json:"defaultValue,omitempty"` + DataType *string `json:"dataType,omitempty"` + AllowedValues *string `json:"allowedValues,omitempty"` + Source *string `json:"source,omitempty"` +} + +// Database is represents a Database. +type Database struct { + autorest.Response `json:"-"` + ID *string `json:"id,omitempty"` + Name *string `json:"name,omitempty"` + Type *string `json:"type,omitempty"` + *DatabaseProperties `json:"properties,omitempty"` +} + +// DatabaseListResult is a List of databases. +type DatabaseListResult struct { + autorest.Response `json:"-"` + Value *[]Database `json:"value,omitempty"` +} + +// DatabaseProperties is the properties of a database. +type DatabaseProperties struct { + Charset *string `json:"charset,omitempty"` + Collation *string `json:"collation,omitempty"` +} + +// FirewallRule is represents a server firewall rule. +type FirewallRule struct { + autorest.Response `json:"-"` + ID *string `json:"id,omitempty"` + Name *string `json:"name,omitempty"` + Type *string `json:"type,omitempty"` + *FirewallRuleProperties `json:"properties,omitempty"` +} + +// FirewallRuleListResult is a list of firewall rules. +type FirewallRuleListResult struct { + autorest.Response `json:"-"` + Value *[]FirewallRule `json:"value,omitempty"` +} + +// FirewallRuleProperties is the properties of a server firewall rule. +type FirewallRuleProperties struct { + StartIPAddress *string `json:"startIpAddress,omitempty"` + EndIPAddress *string `json:"endIpAddress,omitempty"` +} + +// LogFile is represents a log file. +type LogFile struct { + ID *string `json:"id,omitempty"` + Name *string `json:"name,omitempty"` + Type *string `json:"type,omitempty"` + *LogFileProperties `json:"properties,omitempty"` +} + +// LogFileListResult is a list of log files. +type LogFileListResult struct { + autorest.Response `json:"-"` + Value *[]LogFile `json:"value,omitempty"` +} + +// LogFileProperties is the properties of a log file. +type LogFileProperties struct { + Name *string `json:"name,omitempty"` + SizeInKB *int64 `json:"sizeInKB,omitempty"` + CreatedTime *date.Time `json:"createdTime,omitempty"` + LastModifiedTime *date.Time `json:"lastModifiedTime,omitempty"` + Type *string `json:"type,omitempty"` + URL *string `json:"url,omitempty"` +} + +// Operation is REST API operation definition. +type Operation struct { + Name *string `json:"name,omitempty"` + Display *OperationDisplay `json:"display,omitempty"` + Origin OperationOrigin `json:"origin,omitempty"` + Properties *map[string]*map[string]interface{} `json:"properties,omitempty"` +} + +// OperationDisplay is display metadata associated with the operation. +type OperationDisplay struct { + Provider *string `json:"provider,omitempty"` + Resource *string `json:"resource,omitempty"` + Operation *string `json:"operation,omitempty"` + Description *string `json:"description,omitempty"` +} + +// OperationListResult is a list of resource provider operations. +type OperationListResult struct { + autorest.Response `json:"-"` + Value *[]Operation `json:"value,omitempty"` +} + +// ProxyResource is resource properties. +type ProxyResource struct { + ID *string `json:"id,omitempty"` + Name *string `json:"name,omitempty"` + Type *string `json:"type,omitempty"` +} + +// Server is represents a server. +type Server struct { + autorest.Response `json:"-"` + ID *string `json:"id,omitempty"` + Name *string `json:"name,omitempty"` + Type *string `json:"type,omitempty"` + Location *string `json:"location,omitempty"` + Tags *map[string]*string `json:"tags,omitempty"` + Sku *Sku `json:"sku,omitempty"` + *ServerProperties `json:"properties,omitempty"` +} + +// ServerForCreate is represents a server to be created. +type ServerForCreate struct { + Sku *Sku `json:"sku,omitempty"` + Properties ServerPropertiesForCreate `json:"properties,omitempty"` + Location *string `json:"location,omitempty"` + Tags *map[string]*string `json:"tags,omitempty"` +} + +// UnmarshalJSON is the custom unmarshaler for ServerForCreate model +func (sfc *ServerForCreate) UnmarshalJSON(b []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(b, &m) + if err != nil { + return err + } + + v := m["sku"] + if v != nil { + var sku Sku + err = json.Unmarshal(*m["sku"], &sku) + if err != nil { + return err + } + sfc.Sku = &sku + } + + v = m["properties"] + if v != nil { + p, err := unmarshalServerPropertiesForCreate(*m["properties"]) + if err != nil { + return err + } + sfc.Properties = p + } + + v = m["location"] + if v != nil { + var location string + err = json.Unmarshal(*m["location"], &location) + if err != nil { + return err + } + sfc.Location = &location + } + + v = m["tags"] + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*m["tags"], &tags) + if err != nil { + return err + } + sfc.Tags = &tags + } + + return nil +} + +func unmarshalServerPropertiesForCreate(b []byte) (ServerPropertiesForCreate, error) { + var m map[string]interface{} + err := json.Unmarshal(b, &m) + if err != nil { + return nil, err + } + + switch m["createMode"] { + case string(CreateModeDefault): + var spfdc ServerPropertiesForDefaultCreate + err := json.Unmarshal(b, &spfdc) + return spfdc, err + case string(CreateModePointInTimeRestore): + var spfr ServerPropertiesForRestore + err := json.Unmarshal(b, &spfr) + return spfr, err + default: + return nil, errors.New("Unsupported type") + } +} + +// ServerListResult is a list of servers. +type ServerListResult struct { + autorest.Response `json:"-"` + Value *[]Server `json:"value,omitempty"` +} + +// ServerProperties is the properties of a server. +type ServerProperties struct { + AdministratorLogin *string `json:"administratorLogin,omitempty"` + StorageMB *int64 `json:"storageMB,omitempty"` + Version ServerVersion `json:"version,omitempty"` + SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` + UserVisibleState ServerState `json:"userVisibleState,omitempty"` + FullyQualifiedDomainName *string `json:"fullyQualifiedDomainName,omitempty"` +} + +// ServerPropertiesForCreate is interface used for polymorphic Properties in ServerForCreate +type ServerPropertiesForCreate interface { + AsServerPropertiesForDefaultCreate() (*ServerPropertiesForDefaultCreate, bool) + AsServerPropertiesForRestore() (*ServerPropertiesForRestore, bool) +} + +// ServerPropertiesForDefaultCreate is the properties used to create a new server. +type ServerPropertiesForDefaultCreate struct { + CreateMode CreateMode `json:"createMode,omitempty"` + StorageMB *int64 `json:"storageMB,omitempty"` + Version ServerVersion `json:"version,omitempty"` + SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` + AdministratorLogin *string `json:"administratorLogin,omitempty"` + AdministratorLoginPassword *string `json:"administratorLoginPassword,omitempty"` +} + +// MarshalJSON is the custom marshaler for ServerPropertiesForDefaultCreate +func (spfdc ServerPropertiesForDefaultCreate) MarshalJSON() ([]byte, error) { + spfdc.CreateMode = CreateModeDefault + type Alias ServerPropertiesForDefaultCreate + return json.Marshal(&struct { + Alias + }{ + Alias: (Alias)(spfdc), + }) +} + +// AsServerPropertiesForDefaultCreate is the IServerPropertiesForCreate for ServerPropertiesForDefaultCreate +func (spfdc ServerPropertiesForDefaultCreate) AsServerPropertiesForDefaultCreate() (*ServerPropertiesForDefaultCreate, bool) { + return &spfdc, true +} + +// AsServerPropertiesForRestore is the IServerPropertiesForCreate for ServerPropertiesForDefaultCreate +func (spfdc ServerPropertiesForDefaultCreate) AsServerPropertiesForRestore() (*ServerPropertiesForRestore, bool) { + return nil, false +} + +// ServerPropertiesForRestore is the properties to a new server by restoring from a backup. +type ServerPropertiesForRestore struct { + CreateMode CreateMode `json:"createMode,omitempty"` + StorageMB *int64 `json:"storageMB,omitempty"` + Version ServerVersion `json:"version,omitempty"` + SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` + SourceServerID *string `json:"sourceServerId,omitempty"` + RestorePointInTime *date.Time `json:"restorePointInTime,omitempty"` +} + +// MarshalJSON is the custom marshaler for ServerPropertiesForRestore +func (spfr ServerPropertiesForRestore) MarshalJSON() ([]byte, error) { + spfr.CreateMode = CreateModePointInTimeRestore + type Alias ServerPropertiesForRestore + return json.Marshal(&struct { + Alias + }{ + Alias: (Alias)(spfr), + }) +} + +// AsServerPropertiesForDefaultCreate is the IServerPropertiesForCreate for ServerPropertiesForRestore +func (spfr ServerPropertiesForRestore) AsServerPropertiesForDefaultCreate() (*ServerPropertiesForDefaultCreate, bool) { + return nil, false +} + +// AsServerPropertiesForRestore is the IServerPropertiesForCreate for ServerPropertiesForRestore +func (spfr ServerPropertiesForRestore) AsServerPropertiesForRestore() (*ServerPropertiesForRestore, bool) { + return &spfr, false +} + +// ServerUpdateParameters is parameters allowd to update for a server. +type ServerUpdateParameters struct { + Sku *Sku `json:"sku,omitempty"` + *ServerUpdateParametersProperties `json:"properties,omitempty"` + Tags *map[string]*string `json:"tags,omitempty"` +} + +// ServerUpdateParametersProperties is the properties that can be updated for a server. +type ServerUpdateParametersProperties struct { + StorageMB *int64 `json:"storageMB,omitempty"` + AdministratorLoginPassword *string `json:"administratorLoginPassword,omitempty"` + Version ServerVersion `json:"version,omitempty"` + SslEnforcement SslEnforcementEnum `json:"sslEnforcement,omitempty"` +} + +// Sku is billing information related properties of a server. +type Sku struct { + Name *string `json:"name,omitempty"` + Tier SkuTier `json:"tier,omitempty"` + Capacity *int32 `json:"capacity,omitempty"` + Size *string `json:"size,omitempty"` + Family *string `json:"family,omitempty"` +} + +// TrackedResource is resource properties including location and tags for track resources. +type TrackedResource struct { + ID *string `json:"id,omitempty"` + Name *string `json:"name,omitempty"` + Type *string `json:"type,omitempty"` + Location *string `json:"location,omitempty"` + Tags *map[string]*string `json:"tags,omitempty"` +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/operations.go new file mode 100644 index 000000000000..18ce26ed1003 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/operations.go @@ -0,0 +1,97 @@ +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 1.1.0.0 +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "net/http" +) + +// 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. +type OperationsClient struct { + ManagementClient +} + +// 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 REST API operations. +func (client OperationsClient) List() (result OperationListResult, err error) { + req, err := client.ListPreparer() + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.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, "postgresql.OperationsClient", "List", resp, "Failure sending request") + return + } + + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.OperationsClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client OperationsClient) ListPreparer() (*http.Request, error) { + const APIVersion = "2017-04-30-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPath("/providers/Microsoft.DBforPostgreSQL/operations"), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{}) +} + +// 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) +} + +// 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/arm/postgresql/servers.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/servers.go new file mode 100644 index 000000000000..7143cc0f8ded --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/servers.go @@ -0,0 +1,503 @@ +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 1.1.0.0 +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "net/http" +) + +// 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. +type ServersClient struct { + ManagementClient +} + +// NewServersClient creates an instance of the ServersClient client. +func NewServersClient(subscriptionID string) ServersClient { + return NewServersClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewServersClientWithBaseURI creates an instance of the ServersClient client. +func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient { + return ServersClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate creates a new server or updates an existing server. The update action will overwrite the existing +// server. This method may poll for completion. Polling can be canceled by passing the cancel channel argument. The +// channel will be used to cancel polling and any outstanding HTTP requests. +// +// resourceGroupName is the name of the resource group 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(resourceGroupName string, serverName string, parameters ServerForCreate, cancel <-chan struct{}) (<-chan Server, <-chan error) { + resultChan := make(chan Server, 1) + errChan := make(chan error, 1) + 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.Location", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { + errChan <- validation.NewErrorWithValidationError(err, "postgresql.ServersClient", "CreateOrUpdate") + close(errChan) + close(resultChan) + return resultChan, errChan + } + + go func() { + var err error + var result Server + defer func() { + if err != nil { + errChan <- err + } + resultChan <- result + close(resultChan) + close(errChan) + }() + req, err := client.CreateOrUpdatePreparer(resourceGroupName, serverName, parameters, cancel) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "CreateOrUpdate", resp, "Failure responding to request") + } + }() + return resultChan, errChan +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client ServersClient) CreateOrUpdatePreparer(resourceGroupName string, serverName string, parameters ServerForCreate, cancel <-chan struct{}) (*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" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsJSON(), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{Cancel: cancel}) +} + +// 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) (*http.Response, error) { + return autorest.SendWithSender(client, + req, + azure.DoPollForAsynchronous(client.PollingDelay)) +} + +// 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) { + 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 server. This method may poll for completion. Polling can be canceled by passing the cancel channel +// argument. The channel will be used to cancel polling and any outstanding HTTP requests. +// +// resourceGroupName is the name of the resource group 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 ServersClient) Delete(resourceGroupName string, serverName string, cancel <-chan struct{}) (<-chan autorest.Response, <-chan error) { + resultChan := make(chan autorest.Response, 1) + errChan := make(chan error, 1) + go func() { + var err error + var result autorest.Response + defer func() { + if err != nil { + errChan <- err + } + resultChan <- result + close(resultChan) + close(errChan) + }() + req, err := client.DeletePreparer(resourceGroupName, serverName, cancel) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "Delete", resp, "Failure responding to request") + } + }() + return resultChan, errChan +} + +// DeletePreparer prepares the Delete request. +func (client ServersClient) DeletePreparer(resourceGroupName string, serverName string, cancel <-chan struct{}) (*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" + 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}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{Cancel: cancel}) +} + +// 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) (*http.Response, error) { + return autorest.SendWithSender(client, + req, + azure.DoPollForAsynchronous(client.PollingDelay)) +} + +// 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) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// 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. +func (client ServersClient) Get(resourceGroupName string, serverName string) (result Server, err error) { + req, err := client.GetPreparer(resourceGroupName, serverName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "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.ServersClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client ServersClient) GetPreparer(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-04-30-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.DBforPostgreSQL/servers/{serverName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{}) +} + +// 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) { + return autorest.SendWithSender(client, req) +} + +// 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) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// List list all the servers in a given subscription. +func (client ServersClient) List() (result ServerListResult, err error) { + req, err := client.ListPreparer() + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "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.ServersClient", "List", resp, "Failure sending request") + return + } + + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client ServersClient) ListPreparer() (*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/servers", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{}) +} + +// 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) { + return autorest.SendWithSender(client, req) +} + +// 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) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// 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. +func (client ServersClient) ListByResourceGroup(resourceGroupName string) (result ServerListResult, err error) { + req, err := client.ListByResourceGroupPreparer(resourceGroupName) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "ListByResourceGroup", nil, "Failure preparing request") + return + } + + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "ListByResourceGroup", resp, "Failure sending request") + return + } + + result, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "ListByResourceGroup", resp, "Failure responding to request") + } + + return +} + +// ListByResourceGroupPreparer prepares the ListByResourceGroup request. +func (client ServersClient) ListByResourceGroupPreparer(resourceGroupName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "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}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{}) +} + +// 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) { + return autorest.SendWithSender(client, req) +} + +// 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) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Update updates an existing server. The request body can contain one to many of the properties present in the normal +// server definition. This method may poll for completion. Polling can be canceled by passing the cancel channel +// argument. The channel will be used to cancel polling and any outstanding HTTP requests. +// +// resourceGroupName is the name of the resource group 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. +func (client ServersClient) Update(resourceGroupName string, serverName string, parameters ServerUpdateParameters, cancel <-chan struct{}) (<-chan Server, <-chan error) { + resultChan := make(chan Server, 1) + errChan := make(chan error, 1) + go func() { + var err error + var result Server + defer func() { + if err != nil { + errChan <- err + } + resultChan <- result + close(resultChan) + close(errChan) + }() + req, err := client.UpdatePreparer(resourceGroupName, serverName, parameters, cancel) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "Update", nil, "Failure preparing request") + return + } + + resp, err := client.UpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "Update", resp, "Failure sending request") + return + } + + result, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "postgresql.ServersClient", "Update", resp, "Failure responding to request") + } + }() + return resultChan, errChan +} + +// UpdatePreparer prepares the Update request. +func (client ServersClient) UpdatePreparer(resourceGroupName string, serverName string, parameters ServerUpdateParameters, cancel <-chan struct{}) (*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" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsJSON(), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare(&http.Request{Cancel: cancel}) +} + +// 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) (*http.Response, error) { + return autorest.SendWithSender(client, + req, + azure.DoPollForAsynchronous(client.PollingDelay)) +} + +// 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) { + 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/arm/postgresql/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/version.go new file mode 100644 index 000000000000..1a8cf3c8b43c --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/version.go @@ -0,0 +1,28 @@ +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 1.2.2.0 +// 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/v10.3.0-beta arm-postgresql/2017-04-30-preview" +} + +// Version returns the semantic version (see http://semver.org) of the client. +func Version() string { + return "v10.3.0-beta" +} diff --git a/vendor/vendor.json b/vendor/vendor.json index 410e261168ce..9cd53209f38f 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -106,6 +106,14 @@ "version": "=v10.3.0-beta", "versionExact": "v10.3.0-beta" }, + { + "checksumSHA1": "aJQ7rml6haLjCsNhe5OOPOgqozM=", + "path": "github.com/Azure/azure-sdk-for-go/arm/postgresql", + "revision": "57db66900881e9fd21fd041a9d013514700ecab3", + "revisionTime": "2017-08-18T20:19:01Z", + "version": "=v10.3.0-beta", + "versionExact": "v10.3.0-beta" + }, { "checksumSHA1": "YHH8Yx3wwtuirOhWU74IOoDrLfc=", "path": "github.com/Azure/azure-sdk-for-go/arm/redis", From b2eac49ba7ac8d9b364fac011830599cf550dc41 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 3 Aug 2017 11:44:18 +0200 Subject: [PATCH 08/27] Fixing rebase issues --- azurerm/import_arm_postgresql_configuration_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azurerm/import_arm_postgresql_configuration_test.go b/azurerm/import_arm_postgresql_configuration_test.go index f26919e17803..0999e113d988 100644 --- a/azurerm/import_arm_postgresql_configuration_test.go +++ b/azurerm/import_arm_postgresql_configuration_test.go @@ -15,11 +15,11 @@ func TestAccAzureRMPostgreSQLConfiguration_importBackslashQuote(t *testing.T) { config := testAccAzureRMPostgreSQLConfiguration_backslashQuote(ri) resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, CheckDestroy: func(s *terraform.State) error { return testCheckAzureRMPostgreSQLConfigurationReset(s, "safe_encoding") - },, + }, Steps: []resource.TestStep{ { Config: config, From 58946b401b1dbdb025b687b19396c16a06d70cc2 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 3 Aug 2017 11:46:11 +0200 Subject: [PATCH 09/27] Fixing the build --- azurerm/resource_arm_postgresql_database.go | 2 +- azurerm/resource_arm_postgresql_firewall_rule.go | 2 +- azurerm/resource_arm_postgresql_server.go | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/azurerm/resource_arm_postgresql_database.go b/azurerm/resource_arm_postgresql_database.go index f8a96a6da952..9d05903a5c27 100644 --- a/azurerm/resource_arm_postgresql_database.go +++ b/azurerm/resource_arm_postgresql_database.go @@ -72,7 +72,7 @@ func resourceArmPostgreSQLDatabaseCreate(d *schema.ResourceData, meta interface{ }, } - _, error := client.Create(resGroup, serverName, name, properties, make(chan struct{})) + _, error := client.CreateOrUpdate(resGroup, serverName, name, properties, make(chan struct{})) err := <-error if err != nil { return err diff --git a/azurerm/resource_arm_postgresql_firewall_rule.go b/azurerm/resource_arm_postgresql_firewall_rule.go index f8d49c4b8bb8..efa24a4cd8f4 100644 --- a/azurerm/resource_arm_postgresql_firewall_rule.go +++ b/azurerm/resource_arm_postgresql_firewall_rule.go @@ -71,7 +71,7 @@ func resourceArmPostgreSQLFirewallRuleCreate(d *schema.ResourceData, meta interf }, } - _, error := client.Create(resGroup, serverName, name, properties, make(chan struct{})) + _, error := client.CreateOrUpdate(resGroup, serverName, name, properties, make(chan struct{})) err := <-error if err != nil { return err diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go index 7df96bfc19e2..a6e4428d58ef 100644 --- a/azurerm/resource_arm_postgresql_server.go +++ b/azurerm/resource_arm_postgresql_server.go @@ -149,17 +149,18 @@ func resourceArmPostgreSQLServerCreate(d *schema.ResourceData, meta interface{}) properties := postgresql.ServerForCreate{ Location: &location, Sku: sku, - Properties: &postgresql.ServerPropertiesForCreate{ + Properties: &postgresql.ServerPropertiesForDefaultCreate{ Version: postgresql.ServerVersion(version), StorageMB: azure.Int64(int64(storageMB)), SslEnforcement: postgresql.SslEnforcementEnum(sslEnforcement), AdministratorLogin: azure.String(adminLogin), AdministratorLoginPassword: azure.String(adminLoginPassword), + CreateMode: postgresql.CreateModeDefault, }, Tags: expandTags(tags), } - _, error := client.Create(resGroup, name, properties, make(chan struct{})) + _, error := client.CreateOrUpdate(resGroup, name, properties, make(chan struct{})) err := <-error if err != nil { return err From 2be6cdcc2a8f13ba0df5419c05ad5353fe061d06 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 3 Aug 2017 11:47:10 +0200 Subject: [PATCH 10/27] Fixing the tests --- azurerm/resource_arm_postgresql_configuration_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go index a4abca4759cf..cf486926fc94 100644 --- a/azurerm/resource_arm_postgresql_configuration_test.go +++ b/azurerm/resource_arm_postgresql_configuration_test.go @@ -58,8 +58,8 @@ func testCheckAzureRMPostgreSQLConfigurationValue(name string, value string) res return fmt.Errorf("Bad: PostgreSQL Configuration %q (server %q resource group: %q) does not exist", name, serverName, resourceGroup) } - if resp.Value != value { - return fmt.Errorf("PostgreSQL Configuration wasn't set. Expected '%s' - got '%s': \n%+v", value, resp.Value, resp) + if *resp.Value != value { + return fmt.Errorf("PostgreSQL Configuration wasn't set. Expected '%s' - got '%s': \n%+v", value, *resp.Value, resp) } return nil @@ -84,8 +84,8 @@ func testCheckAzureRMPostgreSQLConfigurationReset(s *terraform.State, value stri return nil } - if resp.Value != value { - return fmt.Errorf("PostgreSQL Configuration wasn't reset. Expected '%s' - got '%s': \n%+v", value, resp.Value, resp) + if *resp.Value != value { + return fmt.Errorf("PostgreSQL Configuration wasn't reset. Expected '%s' - got '%s': \n%+v", value, *resp.Value, resp) } } From 8c533f53af5d638c698e19cdac8123b9a417ce09 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 3 Aug 2017 16:43:26 +0200 Subject: [PATCH 11/27] Fixing the vet issue --- azurerm/resource_arm_postgresql_configuration_test.go | 2 +- azurerm/validators.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go index cf486926fc94..7551db713c8d 100644 --- a/azurerm/resource_arm_postgresql_configuration_test.go +++ b/azurerm/resource_arm_postgresql_configuration_test.go @@ -122,5 +122,5 @@ resource "azurerm_postgresql_configuration" "test" { server_name = "${azurerm_postgresql_server.test.name}" value = "on" } -`, rInt, rInt, rInt) +`, rInt, rInt) } diff --git a/azurerm/validators.go b/azurerm/validators.go index 49c5c83d0a37..2fa2241eecef 100644 --- a/azurerm/validators.go +++ b/azurerm/validators.go @@ -33,7 +33,7 @@ func validateIntInSlice(valid []int) schema.SchemaValidateFunc { } } - es = append(es, fmt.Errorf("expected %s to be one of %v, got %s", k, valid, v)) + es = append(es, fmt.Errorf("expected %s to be one of %v, got %v", k, valid, v)) return } } From e03908f6a6db79abb779e517a2f46433458039b6 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 3 Aug 2017 17:20:34 +0200 Subject: [PATCH 12/27] actually creating the configurations client --- azurerm/config.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azurerm/config.go b/azurerm/config.go index 35f4c7632c09..7620559630d6 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -407,6 +407,12 @@ func (c *Config) getArmClient() (*ArmClient, error) { vnpc.Sender = autorest.CreateSender(withRequestLogging()) client.vnetPeeringsClient = vnpc + pcc := postgresql.NewConfigurationsClientWithBaseURI(endpoint, c.SubscriptionID) + setUserAgent(&pcc.Client) + pcc.Authorizer = auth + pcc.Sender = autorest.CreateSender(withRequestLogging()) + client.postgresqlConfigurationsClient = pcc + pdbc := postgresql.NewDatabasesClientWithBaseURI(endpoint, c.SubscriptionID) setUserAgent(&pdbc.Client) pdbc.Authorizer = auth From 6bb8da0aa671b0bc19f2979f7279cd320a1ed65b Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 4 Aug 2017 10:30:51 +0200 Subject: [PATCH 13/27] PR comments --- azurerm/import_arm_postgresql_server_test.go | 30 ++++++++- .../resource_arm_postgresql_configuration.go | 4 +- ...ource_arm_postgresql_configuration_test.go | 9 +-- azurerm/resource_arm_postgresql_database.go | 3 +- .../resource_arm_postgresql_database_test.go | 12 ++-- .../resource_arm_postgresql_firewall_rule.go | 3 +- ...ource_arm_postgresql_firewall_rule_test.go | 12 ++-- azurerm/resource_arm_postgresql_server.go | 3 +- .../resource_arm_postgresql_server_test.go | 64 ++++++++++++++++--- 9 files changed, 111 insertions(+), 29 deletions(-) diff --git a/azurerm/import_arm_postgresql_server_test.go b/azurerm/import_arm_postgresql_server_test.go index da8da9aa5d20..3f54a830fb2a 100644 --- a/azurerm/import_arm_postgresql_server_test.go +++ b/azurerm/import_arm_postgresql_server_test.go @@ -7,11 +7,37 @@ import ( "github.com/hashicorp/terraform/helper/resource" ) -func TestAccAzureRMPostgreSQLServer_importBasic(t *testing.T) { +func TestAccAzureRMPostgreSQLServer_importBasicNinePointFive(t *testing.T) { resourceName := "azurerm_postgresql_server.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLServer_basic(ri) + config := testAccAzureRMPostgreSQLServer_basicNinePointFive(ri) + + 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_importBasicNinePointSix(t *testing.T) { + resourceName := "azurerm_postgresql_server.test" + + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLServer_basicNinePointSix(ri) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/azurerm/resource_arm_postgresql_configuration.go b/azurerm/resource_arm_postgresql_configuration.go index 4a2fb07343c6..24311abbf12e 100644 --- a/azurerm/resource_arm_postgresql_configuration.go +++ b/azurerm/resource_arm_postgresql_configuration.go @@ -96,17 +96,17 @@ func resourceArmPostgreSQLConfigurationRead(d *schema.ResourceData, meta interfa resp, err := client.Get(resGroup, serverName, name) if err != nil { - if resp.StatusCode == http.StatusNotFound { + if responseWasNotFound(resp) { d.SetId("") return nil } + return fmt.Errorf("Error making Read request on Azure PostgreSQL Configuration %s: %+v", name, err) } d.Set("name", resp.Name) d.Set("server_name", serverName) d.Set("resource_group_name", resGroup) - d.Set("value", resp.ConfigurationProperties.Value) return nil diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go index 7551db713c8d..a6767b7fadba 100644 --- a/azurerm/resource_arm_postgresql_configuration_test.go +++ b/azurerm/resource_arm_postgresql_configuration_test.go @@ -51,7 +51,7 @@ func testCheckAzureRMPostgreSQLConfigurationValue(name string, value string) res resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - return fmt.Errorf("Bad: Get on postgresqlConfigurationsClient: %s", err) + return fmt.Errorf("Bad: Get on postgresqlConfigurationsClient: %+v", err) } if resp.StatusCode == http.StatusNotFound { @@ -81,11 +81,12 @@ func testCheckAzureRMPostgreSQLConfigurationReset(s *terraform.State, value stri resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - return nil + return err } - if *resp.Value != value { - return fmt.Errorf("PostgreSQL Configuration wasn't reset. Expected '%s' - got '%s': \n%+v", value, *resp.Value, resp) + actualValue := *resp.Value + if actualValue != value { + return fmt.Errorf("PostgreSQL Configuration wasn't reset. Expected '%s' - got '%s': \n%+v", value, actualValue, resp) } } diff --git a/azurerm/resource_arm_postgresql_database.go b/azurerm/resource_arm_postgresql_database.go index 9d05903a5c27..d3d17244d901 100644 --- a/azurerm/resource_arm_postgresql_database.go +++ b/azurerm/resource_arm_postgresql_database.go @@ -104,10 +104,11 @@ func resourceArmPostgreSQLDatabaseRead(d *schema.ResourceData, meta interface{}) resp, err := client.Get(resGroup, serverName, name) if err != nil { - if resp.StatusCode == http.StatusNotFound { + if responseWasNotFound(resp) { d.SetId("") return nil } + return fmt.Errorf("Error making Read request on Azure PostgreSQL Database %s: %+v", name, err) } diff --git a/azurerm/resource_arm_postgresql_database_test.go b/azurerm/resource_arm_postgresql_database_test.go index 47d094197f41..c14f5f2eec83 100644 --- a/azurerm/resource_arm_postgresql_database_test.go +++ b/azurerm/resource_arm_postgresql_database_test.go @@ -49,7 +49,7 @@ func testCheckAzureRMPostgreSQLDatabaseExists(name string) resource.TestCheckFun resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - return fmt.Errorf("Bad: Get on postgresqlDatabasesClient: %s", err) + return fmt.Errorf("Bad: Get on postgresqlDatabasesClient: %+v", err) } if resp.StatusCode == http.StatusNotFound { @@ -75,12 +75,14 @@ func testCheckAzureRMPostgreSQLDatabaseDestroy(s *terraform.State) error { resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - return nil - } + if resp.StatusCode == http.StatusNotFound { + return nil + } - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("PostgreSQL Database still exists:\n%#v", resp) + return err } + + return fmt.Errorf("PostgreSQL Database still exists:\n%#v", resp) } return nil diff --git a/azurerm/resource_arm_postgresql_firewall_rule.go b/azurerm/resource_arm_postgresql_firewall_rule.go index efa24a4cd8f4..99e0b6944228 100644 --- a/azurerm/resource_arm_postgresql_firewall_rule.go +++ b/azurerm/resource_arm_postgresql_firewall_rule.go @@ -103,10 +103,11 @@ func resourceArmPostgreSQLFirewallRuleRead(d *schema.ResourceData, meta interfac resp, err := client.Get(resGroup, serverName, name) if err != nil { - if resp.StatusCode == http.StatusNotFound { + if responseWasNotFound(resp.Response) { d.SetId("") return nil } + return fmt.Errorf("Error making Read request on Azure PostgreSQL Firewall Rule %s: %+v", name, err) } diff --git a/azurerm/resource_arm_postgresql_firewall_rule_test.go b/azurerm/resource_arm_postgresql_firewall_rule_test.go index 86ee7cb48a26..74e4ffed4c30 100644 --- a/azurerm/resource_arm_postgresql_firewall_rule_test.go +++ b/azurerm/resource_arm_postgresql_firewall_rule_test.go @@ -49,7 +49,7 @@ func testCheckAzureRMPostgreSQLFirewallRuleExists(name string) resource.TestChec resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - return fmt.Errorf("Bad: Get on postgresqlFirewallRulesClient: %s", err) + return fmt.Errorf("Bad: Get on postgresqlFirewallRulesClient: %+v", err) } if resp.StatusCode == http.StatusNotFound { @@ -75,12 +75,14 @@ func testCheckAzureRMPostgreSQLFirewallRuleDestroy(s *terraform.State) error { resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - return nil - } + if resp.StatusCode == http.StatusNotFound { + return nil + } - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("PostgreSQL Firewall Rule still exists:\n%#v", resp) + return err } + + return fmt.Errorf("PostgreSQL Firewall Rule still exists:\n%#v", resp) } return nil diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go index a6e4428d58ef..cac8a527fdab 100644 --- a/azurerm/resource_arm_postgresql_server.go +++ b/azurerm/resource_arm_postgresql_server.go @@ -237,10 +237,11 @@ func resourceArmPostgreSQLServerRead(d *schema.ResourceData, meta interface{}) e resp, err := client.Get(resGroup, name) if err != nil { - if resp.StatusCode == http.StatusNotFound { + if responseWasNotFound(resp) { d.SetId("") return nil } + return fmt.Errorf("Error making Read request on Azure PostgreSQL Server %s: %+v", name, err) } diff --git a/azurerm/resource_arm_postgresql_server_test.go b/azurerm/resource_arm_postgresql_server_test.go index 1f441f06cac5..881e467cb706 100644 --- a/azurerm/resource_arm_postgresql_server_test.go +++ b/azurerm/resource_arm_postgresql_server_test.go @@ -10,10 +10,30 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAzureRMPostgreSQLServer_basic(t *testing.T) { +func TestAccAzureRMPostgreSQLServer_basicNinePointFive(t *testing.T) { resourceName := "azurerm_postgresql_server.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLServer_basic(ri) + config := testAccAzureRMPostgreSQLServer_basicNinePointFive(ri) + + 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_basicNinePointSix(t *testing.T) { + resourceName := "azurerm_postgresql_server.test" + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLServer_basicNinePointSix(ri) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -48,7 +68,7 @@ func testCheckAzureRMPostgreSQLServerExists(name string) resource.TestCheckFunc resp, err := client.Get(resourceGroup, name) if err != nil { - return fmt.Errorf("Bad: Get on postgresqlServersClient: %s", err) + return fmt.Errorf("Bad: Get on postgresqlServersClient: %+v", err) } if resp.StatusCode == http.StatusNotFound { @@ -73,18 +93,20 @@ func testCheckAzureRMPostgreSQLServerDestroy(s *terraform.State) error { resp, err := client.Get(resourceGroup, name) if err != nil { - return nil - } + if resp.StatusCode == http.StatusNotFound { + return nil + } - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("PostgreSQL Server still exists:\n%#v", resp) + return err } + + return fmt.Errorf("PostgreSQL Server still exists:\n%#v", resp) } return nil } -func testAccAzureRMPostgreSQLServer_basic(rInt int) string { +func testAccAzureRMPostgreSQLServer_basicNinePointFive(rInt int) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -109,3 +131,29 @@ resource "azurerm_postgresql_server" "test" { } `, rInt, rInt) } + +func testAccAzureRMPostgreSQLServer_basicNinePointSix(rInt int) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "West US" +} +resource "azurerm_postgresql_server" "test" { + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "PGSQLB50" + capacity = 50 + tier = "Basic" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "9.6" + storage_mb = 51200 + ssl_enforcement = "Enabled" +} +`, rInt, rInt) +} From 28c2e4fd1c3eddc0108d169d0d1eca9f98be3d24 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 4 Aug 2017 10:37:56 +0200 Subject: [PATCH 14/27] Documentation updates --- .../r/postgresql_configuration.html.markdown | 2 +- .../docs/r/postgresql_database.html.markdown | 4 +-- .../r/postgresql_firewall_rule.html.markdown | 32 ++----------------- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/website/docs/r/postgresql_configuration.html.markdown b/website/docs/r/postgresql_configuration.html.markdown index aff91534bb39..d244eb303bfd 100644 --- a/website/docs/r/postgresql_configuration.html.markdown +++ b/website/docs/r/postgresql_configuration.html.markdown @@ -48,7 +48,7 @@ resource "azurerm_postgresql_configuration" "test" { The following arguments are supported: -* `name` - (Required) Specifies the name of the PostgreSQL Configration, which needs [to be a valid PostgreSQL configuration name](TODO). Changing this forces a new resource to be created. +* `name` - (Required) Specifies the name of the PostgreSQL Configuration, which needs [to be a valid PostgreSQL configuration name](https://www.postgresql.org/docs/current/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIER). Changing this forces a new resource to be created. * `server_name` - (Required) Specifies the name of the PostgreSQL Server. Changing this forces a new resource to be created. diff --git a/website/docs/r/postgresql_database.html.markdown b/website/docs/r/postgresql_database.html.markdown index ec28a37ddff1..b110e98b7a01 100644 --- a/website/docs/r/postgresql_database.html.markdown +++ b/website/docs/r/postgresql_database.html.markdown @@ -56,9 +56,9 @@ The following arguments are supported: * `resource_group_name` - (Required) The name of the resource group in which the PostgreSQL Server exists. Changing this forces a new resource to be created. -* `charset` - (Required) Specifies the Charset for the PostgreSQL Database. Changing this forces a new resource to be created. +* `charset` - (Required) Specifies the Charset for the PostgreSQL Database, which needs [to be a valid PostgreSQL Charset](https://www.postgresql.org/docs/current/static/multibyte.html). Changing this forces a new resource to be created. -* `collation` - (Required) Specifies the Collation for the PostgreSQL Database. Changing this forces a new resource to be created. +* `collation` - (Required) Specifies the Collation for the PostgreSQL Database, which needs [to be a valid PostgreSQL Collation](https://www.postgresql.org/docs/current/static/collation.html). Changing this forces a new resource to be created. ## Attributes Reference diff --git a/website/docs/r/postgresql_firewall_rule.html.markdown b/website/docs/r/postgresql_firewall_rule.html.markdown index 49a8ae5a7bbb..eac6361b06aa 100644 --- a/website/docs/r/postgresql_firewall_rule.html.markdown +++ b/website/docs/r/postgresql_firewall_rule.html.markdown @@ -19,21 +19,7 @@ resource "azurerm_resource_group" "test" { } resource "azurerm_postgresql_server" "test" { - name = "postgresql-server-1" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "PGSQLB50" - capacity = 50 - tier = "Basic" - } - - administrator_login = "psqladminun" - administrator_login_password = "H@Sh1CoR3!" - version = "9.5" - storage_mb = "51200" - ssl_enforcement = "Enabled" + ... } resource "azurerm_postgresql_firewall_rule" "test" { @@ -54,21 +40,7 @@ resource "azurerm_resource_group" "test" { } resource "azurerm_postgresql_server" "test" { - name = "postgresql-server-1" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "PGSQLB50" - capacity = 50 - tier = "Basic" - } - - administrator_login = "psqladminun" - administrator_login_password = "H@Sh1CoR3!" - version = "9.5" - storage_mb = "51200" - ssl_enforcement = "Enabled" + ... } resource "azurerm_postgresql_firewall_rule" "test" { From ae9189b1a707979820fdb550a573e3c186cbd254 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 4 Aug 2017 10:41:21 +0200 Subject: [PATCH 15/27] Combining the DB + SQL sidebar navs --- website/azurerm.erb | 42 ++++++++----------- website/docs/r/sql_database.html.markdown | 2 +- website/docs/r/sql_elasticpool.html.markdown | 2 +- .../docs/r/sql_firewall_rule.html.markdown | 3 +- website/docs/r/sql_server.html.markdown | 2 +- 5 files changed, 22 insertions(+), 29 deletions(-) diff --git a/website/azurerm.erb b/website/azurerm.erb index c4e885a217af..ad9f44fad760 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -129,7 +129,21 @@ azurerm_postgresql_server - + > + azurerm_sql_database + + + > + azurerm_sql_elasticpool + + + > + azurerm_sql_firewall_rule + + + > + azurerm_sql_server +
      @@ -245,12 +259,15 @@ > azurerm_eventhub + > azurerm_eventhub_authorization_rule + > azurerm_eventhub_consumer_group + > azurerm_eventhub_namespace @@ -349,29 +366,6 @@
    - > - SQL Resources - - - > Storage Resources
      diff --git a/website/docs/r/sql_database.html.markdown b/website/docs/r/sql_database.html.markdown index 2381da7b71ba..d41d1ef22a72 100644 --- a/website/docs/r/sql_database.html.markdown +++ b/website/docs/r/sql_database.html.markdown @@ -1,7 +1,7 @@ --- layout: "azurerm" page_title: "Azure Resource Manager: azurerm_sql_database" -sidebar_current: "docs-azurerm-resource-sql-database" +sidebar_current: "docs-azurerm-resource-database-sql-database" description: |- Create a SQL Database. --- diff --git a/website/docs/r/sql_elasticpool.html.markdown b/website/docs/r/sql_elasticpool.html.markdown index a0bda016158c..1d5d5bc487cf 100644 --- a/website/docs/r/sql_elasticpool.html.markdown +++ b/website/docs/r/sql_elasticpool.html.markdown @@ -1,7 +1,7 @@ --- layout: "azurerm" page_title: "Azure Resource Manager: azurerm_sql_elasticpool" -sidebar_current: "docs-azurerm-resource-sql-elasticpool" +sidebar_current: "docs-azurerm-resource-database-sql-elasticpool" description: |- Create a SQL Elastic Pool. --- diff --git a/website/docs/r/sql_firewall_rule.html.markdown b/website/docs/r/sql_firewall_rule.html.markdown index 5d31b10621c3..ab598cd54bfc 100644 --- a/website/docs/r/sql_firewall_rule.html.markdown +++ b/website/docs/r/sql_firewall_rule.html.markdown @@ -1,7 +1,7 @@ --- layout: "azurerm" page_title: "Azure Resource Manager: azurerm_sql_firewall_rule" -sidebar_current: "docs-azurerm-resource-sql-firewall_rule" +sidebar_current: "docs-azurerm-resource-database-sql-firewall_rule" description: |- Create a SQL Firewall Rule. --- @@ -64,4 +64,3 @@ SQL Firewall Rules can be imported using the `resource id`, e.g. ``` terraform import azurerm_sql_firewall_rule.rule1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myresourcegroup/providers/Microsoft.Sql/servers/myserver/firewallRules/rule1 ``` - diff --git a/website/docs/r/sql_server.html.markdown b/website/docs/r/sql_server.html.markdown index b1d791a52035..fdca8d008037 100644 --- a/website/docs/r/sql_server.html.markdown +++ b/website/docs/r/sql_server.html.markdown @@ -1,7 +1,7 @@ --- layout: "azurerm" page_title: "Azure Resource Manager: azurerm_sql_server" -sidebar_current: "docs-azurerm-resource-sql-server" +sidebar_current: "docs-azurerm-resource-database-sql-server" description: |- Manages a SQL Azure Database Server. From f2c67d3d1a761632c419b4e80e647c4583a4f904 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 4 Aug 2017 10:47:51 +0200 Subject: [PATCH 16/27] Fixing the build --- azurerm/resource_arm_postgresql_configuration.go | 3 +-- azurerm/resource_arm_postgresql_database.go | 3 +-- azurerm/resource_arm_postgresql_firewall_rule.go | 1 - azurerm/resource_arm_postgresql_server.go | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/azurerm/resource_arm_postgresql_configuration.go b/azurerm/resource_arm_postgresql_configuration.go index 24311abbf12e..c9ecbdbc2cd0 100644 --- a/azurerm/resource_arm_postgresql_configuration.go +++ b/azurerm/resource_arm_postgresql_configuration.go @@ -3,7 +3,6 @@ package azurerm import ( "fmt" "log" - "net/http" "github.com/Azure/azure-sdk-for-go/arm/postgresql" "github.com/hashicorp/terraform/helper/schema" @@ -96,7 +95,7 @@ func resourceArmPostgreSQLConfigurationRead(d *schema.ResourceData, meta interfa resp, err := client.Get(resGroup, serverName, name) if err != nil { - if responseWasNotFound(resp) { + if responseWasNotFound(resp.Response) { d.SetId("") return nil } diff --git a/azurerm/resource_arm_postgresql_database.go b/azurerm/resource_arm_postgresql_database.go index d3d17244d901..4ce82aa33779 100644 --- a/azurerm/resource_arm_postgresql_database.go +++ b/azurerm/resource_arm_postgresql_database.go @@ -3,7 +3,6 @@ package azurerm import ( "fmt" "log" - "net/http" "github.com/Azure/azure-sdk-for-go/arm/postgresql" "github.com/hashicorp/terraform/helper/schema" @@ -104,7 +103,7 @@ func resourceArmPostgreSQLDatabaseRead(d *schema.ResourceData, meta interface{}) resp, err := client.Get(resGroup, serverName, name) if err != nil { - if responseWasNotFound(resp) { + if responseWasNotFound(resp.Response) { d.SetId("") return nil } diff --git a/azurerm/resource_arm_postgresql_firewall_rule.go b/azurerm/resource_arm_postgresql_firewall_rule.go index 99e0b6944228..49f5bcc82083 100644 --- a/azurerm/resource_arm_postgresql_firewall_rule.go +++ b/azurerm/resource_arm_postgresql_firewall_rule.go @@ -3,7 +3,6 @@ package azurerm import ( "fmt" "log" - "net/http" "github.com/Azure/azure-sdk-for-go/arm/postgresql" "github.com/hashicorp/terraform/helper/schema" diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go index cac8a527fdab..7ac6b73a6d9b 100644 --- a/azurerm/resource_arm_postgresql_server.go +++ b/azurerm/resource_arm_postgresql_server.go @@ -3,7 +3,6 @@ package azurerm import ( "fmt" "log" - "net/http" "strconv" "github.com/Azure/azure-sdk-for-go/arm/postgresql" @@ -237,7 +236,7 @@ func resourceArmPostgreSQLServerRead(d *schema.ResourceData, meta interface{}) e resp, err := client.Get(resGroup, name) if err != nil { - if responseWasNotFound(resp) { + if responseWasNotFound(resp.Response) { d.SetId("") return nil } From 0a646bb7a2e44e51f09c4bc45663dbc2ca4fd532 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 4 Aug 2017 10:57:56 +0200 Subject: [PATCH 17/27] Test covering updating the password + ssl requirement --- .../resource_arm_postgresql_server_test.go | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/azurerm/resource_arm_postgresql_server_test.go b/azurerm/resource_arm_postgresql_server_test.go index 881e467cb706..0c1648160c6a 100644 --- a/azurerm/resource_arm_postgresql_server_test.go +++ b/azurerm/resource_arm_postgresql_server_test.go @@ -50,6 +50,33 @@ func TestAccAzureRMPostgreSQLServer_basicNinePointSix(t *testing.T) { }) } +func TestAccAzureRMPostgreSQLServer_updatePassword(t *testing.T) { + resourceName := "azurerm_postgresql_server.test" + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLServer_basicNinePointSix(ri) + updatedConfig := testAccAzureRMPostgreSQLServer_basicNinePointSixUpdated(ri) + + 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 testCheckAzureRMPostgreSQLServerExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API @@ -157,3 +184,29 @@ resource "azurerm_postgresql_server" "test" { } `, rInt, rInt) } + +func testAccAzureRMPostgreSQLServer_basicNinePointSixUpdated(rInt int) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "West US" +} +resource "azurerm_postgresql_server" "test" { + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "PGSQLB50" + capacity = 50 + tier = "Basic" + } + + administrator_login = "acctestun" + administrator_login_password = "R3dH0TCh1l1P3pp3rs!" + version = "9.6" + storage_mb = 51200 + ssl_enforcement = "Disabled" +} +`, rInt, rInt) +} From 732ef6d50d2820dda81780bba2c80fb1cb62f9ef Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 4 Aug 2017 12:30:19 +0200 Subject: [PATCH 18/27] Testing additional configuration values --- ...mport_arm_postgresql_configuration_test.go | 53 +++++++++++-- ...ource_arm_postgresql_configuration_test.go | 77 ++++++++++++++++--- 2 files changed, 113 insertions(+), 17 deletions(-) diff --git a/azurerm/import_arm_postgresql_configuration_test.go b/azurerm/import_arm_postgresql_configuration_test.go index 0999e113d988..0d5d975c2298 100644 --- a/azurerm/import_arm_postgresql_configuration_test.go +++ b/azurerm/import_arm_postgresql_configuration_test.go @@ -5,7 +5,6 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" - "github.com/hashicorp/terraform/terraform" ) func TestAccAzureRMPostgreSQLConfiguration_importBackslashQuote(t *testing.T) { @@ -15,11 +14,55 @@ func TestAccAzureRMPostgreSQLConfiguration_importBackslashQuote(t *testing.T) { config := testAccAzureRMPostgreSQLConfiguration_backslashQuote(ri) resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: func(s *terraform.State) error { - return testCheckAzureRMPostgreSQLConfigurationReset(s, "safe_encoding") + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLConfigurationReset, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, + }) +} + +func TestAccAzureRMPostgreSQLConfiguration_importClientMinMessages(t *testing.T) { + resourceName := "azurerm_postgresql_configuration.test" + + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLConfiguration_clientMinMessages(ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLConfigurationReset, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMPostgreSQLConfiguration_importDeadlockTimeout(t *testing.T) { + resourceName := "azurerm_postgresql_configuration.test" + + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLConfiguration_deadlockTimeout(ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLConfigurationReset, Steps: []resource.TestStep{ { Config: config, diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go index a6767b7fadba..8a17be10a2f7 100644 --- a/azurerm/resource_arm_postgresql_configuration_test.go +++ b/azurerm/resource_arm_postgresql_configuration_test.go @@ -16,11 +16,9 @@ func TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { config := testAccAzureRMPostgreSQLConfiguration_backslashQuote(ri) resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: func(s *terraform.State) error { - return testCheckAzureRMPostgreSQLConfigurationReset(s, "safe_encoding") - }, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLConfigurationReset, Steps: []resource.TestStep{ { Config: config, @@ -32,6 +30,46 @@ func TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { }) } +func TestAccAzureRMPostgreSQLConfiguration_clientMinMessages(t *testing.T) { + resourceName := "azurerm_postgresql_configuration.test" + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLConfiguration_clientMinMessages(ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLConfigurationReset, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPostgreSQLConfigurationValue(resourceName, "DEBUG5"), + ), + }, + }, + }) +} + +func TestAccAzureRMPostgreSQLConfiguration_deadlockTimeout(t *testing.T) { + resourceName := "azurerm_postgresql_configuration.test" + ri := acctest.RandInt() + config := testAccAzureRMPostgreSQLConfiguration_deadlockTimeout(ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPostgreSQLConfigurationReset, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPostgreSQLConfigurationValue(resourceName, "5000"), + ), + }, + }, + }) +} + func testCheckAzureRMPostgreSQLConfigurationValue(name string, value string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API @@ -66,7 +104,7 @@ func testCheckAzureRMPostgreSQLConfigurationValue(name string, value string) res } } -func testCheckAzureRMPostgreSQLConfigurationReset(s *terraform.State, value string) error { +func testCheckAzureRMPostgreSQLConfigurationReset(s *terraform.State) error { client := testAccProvider.Meta().(*ArmClient).postgresqlConfigurationsClient for _, rs := range s.RootModule().Resources { @@ -81,12 +119,15 @@ func testCheckAzureRMPostgreSQLConfigurationReset(s *terraform.State, value stri resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - return err + if resp.StatusCode != http.StatusNotFound { + return err + } } + defaultValue := *resp.DefaultValue actualValue := *resp.Value - if actualValue != value { - return fmt.Errorf("PostgreSQL Configuration wasn't reset. Expected '%s' - got '%s': \n%+v", value, actualValue, resp) + if defaultValue != actualValue { + return fmt.Errorf("PostgreSQL Configuration wasn't reset. Expected '%s' - got '%s': \n%+v", defaultValue, actualValue, resp) } } @@ -94,6 +135,18 @@ func testCheckAzureRMPostgreSQLConfigurationReset(s *terraform.State, value stri } func testAccAzureRMPostgreSQLConfiguration_backslashQuote(rInt int) string { + return testAccAzureRMPostgreSQLConfiguration_template(rInt, "backslash_quote", "on") +} + +func testAccAzureRMPostgreSQLConfiguration_clientMinMessages(rInt int) string { + return testAccAzureRMPostgreSQLConfiguration_template(rInt, "client_min_messages", "DEBUG5") +} + +func testAccAzureRMPostgreSQLConfiguration_deadlockTimeout(rInt int) string { + return testAccAzureRMPostgreSQLConfiguration_template(rInt, "deadlock_timeout", "5000") +} + +func testAccAzureRMPostgreSQLConfiguration_template(rInt int, name string, value string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -118,10 +171,10 @@ resource "azurerm_postgresql_server" "test" { } resource "azurerm_postgresql_configuration" "test" { - name = "backslash_quote" + name = "%s" resource_group_name = "${azurerm_resource_group.test.name}" server_name = "${azurerm_postgresql_server.test.name}" - value = "on" + value = "%s" } -`, rInt, rInt) +`, rInt, rInt, name, value) } From b2508aa87fd52dbcd493ccbfd1f880d210265b0b Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sat, 19 Aug 2017 21:27:10 +0200 Subject: [PATCH 19/27] Updating the acceptance tests to check for the reset value --- ...ource_arm_postgresql_configuration_test.go | 97 ++++++++++++++----- 1 file changed, 74 insertions(+), 23 deletions(-) diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go index 8a17be10a2f7..b6055eaeb7bc 100644 --- a/azurerm/resource_arm_postgresql_configuration_test.go +++ b/azurerm/resource_arm_postgresql_configuration_test.go @@ -11,9 +11,9 @@ import ( ) func TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { - resourceName := "azurerm_postgresql_configuration.test" ri := acctest.RandInt() config := testAccAzureRMPostgreSQLConfiguration_backslashQuote(ri) + serverOnlyConfig := testAccAzureRMPostgreSQLConfiguration_empty(ri) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -23,7 +23,14 @@ func TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMPostgreSQLConfigurationValue(resourceName, "on"), + testCheckAzureRMPostgreSQLConfigurationValue("azurerm_postgresql_configuration.test", "on"), + ), + }, + { + Config: serverOnlyConfig, + Check: resource.ComposeTestCheckFunc( + // "delete" resets back to the default value + testCheckAzureRMPostgreSQLConfigurationValueReset(ri, "backslash_quote", "safe_encoding"), ), }, }, @@ -31,9 +38,9 @@ func TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { } func TestAccAzureRMPostgreSQLConfiguration_clientMinMessages(t *testing.T) { - resourceName := "azurerm_postgresql_configuration.test" ri := acctest.RandInt() config := testAccAzureRMPostgreSQLConfiguration_clientMinMessages(ri) + serverOnlyConfig := testAccAzureRMPostgreSQLConfiguration_empty(ri) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -43,7 +50,14 @@ func TestAccAzureRMPostgreSQLConfiguration_clientMinMessages(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMPostgreSQLConfigurationValue(resourceName, "DEBUG5"), + testCheckAzureRMPostgreSQLConfigurationValue("azurerm_postgresql_configuration.test", "DEBUG5"), + ), + }, + { + Config: serverOnlyConfig, + Check: resource.ComposeTestCheckFunc( + // "delete" resets back to the default value + testCheckAzureRMPostgreSQLConfigurationValueReset(ri, "client_min_messages", "NOTICE"), ), }, }, @@ -51,9 +65,9 @@ func TestAccAzureRMPostgreSQLConfiguration_clientMinMessages(t *testing.T) { } func TestAccAzureRMPostgreSQLConfiguration_deadlockTimeout(t *testing.T) { - resourceName := "azurerm_postgresql_configuration.test" ri := acctest.RandInt() config := testAccAzureRMPostgreSQLConfiguration_deadlockTimeout(ri) + serverOnlyConfig := testAccAzureRMPostgreSQLConfiguration_empty(ri) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -63,19 +77,26 @@ func TestAccAzureRMPostgreSQLConfiguration_deadlockTimeout(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMPostgreSQLConfigurationValue(resourceName, "5000"), + testCheckAzureRMPostgreSQLConfigurationValue("azurerm_postgresql_configuration.test", "5000"), + ), + }, + { + Config: serverOnlyConfig, + Check: resource.ComposeTestCheckFunc( + // "delete" resets back to the default value + testCheckAzureRMPostgreSQLConfigurationValueReset(ri, "deadlock_timeout", "1000"), ), }, }, }) } -func testCheckAzureRMPostgreSQLConfigurationValue(name string, value string) resource.TestCheckFunc { +func testCheckAzureRMPostgreSQLConfigurationValue(resourceName 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] + rs, ok := s.RootModule().Resources[resourceName] if !ok { - return fmt.Errorf("Not found: %s", name) + return fmt.Errorf("Not found: %s", resourceName) } name := rs.Primary.Attributes["name"] @@ -104,6 +125,34 @@ func testCheckAzureRMPostgreSQLConfigurationValue(name string, value string) res } } +func testCheckAzureRMPostgreSQLConfigurationValueReset(rInt int, configurationName string, value string) resource.TestCheckFunc { + return func(s *terraform.State) error { + + resourceGroup := fmt.Sprintf("acctestRG-%d", rInt) + serverName := fmt.Sprintf("acctestpsqlsvr-%d", rInt) + + client := testAccProvider.Meta().(*ArmClient).postgresqlConfigurationsClient + + resp, err := client.Get(resourceGroup, serverName, configurationName) + if err != nil { + return fmt.Errorf("Bad: Get on postgresqlConfigurationsClient: %+v", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: PostgreSQL Configuration %q (server %q resource group: %q) does not exist", configurationName, serverName, resourceGroup) + } + + actualValue := *resp.Value + defaultValue := *resp.DefaultValue + + if defaultValue != actualValue { + return fmt.Errorf("PostgreSQL Configuration wasn't set to the default value. Expected '%s' - got '%s': \n%+v", value, *resp.Value, resp) + } + + return nil + } +} + func testCheckAzureRMPostgreSQLConfigurationReset(s *terraform.State) error { client := testAccProvider.Meta().(*ArmClient).postgresqlConfigurationsClient @@ -119,15 +168,11 @@ func testCheckAzureRMPostgreSQLConfigurationReset(s *terraform.State) error { resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - if resp.StatusCode != http.StatusNotFound { + if resp.StatusCode == http.StatusNotFound { return err } - } - defaultValue := *resp.DefaultValue - actualValue := *resp.Value - if defaultValue != actualValue { - return fmt.Errorf("PostgreSQL Configuration wasn't reset. Expected '%s' - got '%s': \n%+v", defaultValue, actualValue, resp) + return nil } } @@ -147,6 +192,19 @@ func testAccAzureRMPostgreSQLConfiguration_deadlockTimeout(rInt int) string { } func testAccAzureRMPostgreSQLConfiguration_template(rInt int, name string, value string) string { + server := testAccAzureRMPostgreSQLConfiguration_empty(rInt) + config := fmt.Sprintf(` +resource "azurerm_postgresql_configuration" "test" { + name = "%s" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_postgresql_server.test.name}" + value = "%s" +} +`, name, value) + return server + config +} + +func testAccAzureRMPostgreSQLConfiguration_empty(rInt int) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -169,12 +227,5 @@ resource "azurerm_postgresql_server" "test" { storage_mb = 51200 ssl_enforcement = "Enabled" } - -resource "azurerm_postgresql_configuration" "test" { - name = "%s" - resource_group_name = "${azurerm_resource_group.test.name}" - server_name = "${azurerm_postgresql_server.test.name}" - value = "%s" -} -`, rInt, rInt, name, value) +`, rInt, rInt) } From dd1262df7f392f4ea67b0f8548cf05510dcd3276 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sat, 19 Aug 2017 22:00:39 +0200 Subject: [PATCH 20/27] Updating the CheckDelete to check the Configuration's been deleted --- ...mport_arm_postgresql_configuration_test.go | 6 ++--- ...ource_arm_postgresql_configuration_test.go | 22 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/azurerm/import_arm_postgresql_configuration_test.go b/azurerm/import_arm_postgresql_configuration_test.go index 0d5d975c2298..208181013fec 100644 --- a/azurerm/import_arm_postgresql_configuration_test.go +++ b/azurerm/import_arm_postgresql_configuration_test.go @@ -16,7 +16,7 @@ func TestAccAzureRMPostgreSQLConfiguration_importBackslashQuote(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMPostgreSQLConfigurationReset, + CheckDestroy: testCheckAzureRMPostgreSQLConfigurationDestroy, Steps: []resource.TestStep{ { Config: config, @@ -39,7 +39,7 @@ func TestAccAzureRMPostgreSQLConfiguration_importClientMinMessages(t *testing.T) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMPostgreSQLConfigurationReset, + CheckDestroy: testCheckAzureRMPostgreSQLConfigurationDestroy, Steps: []resource.TestStep{ { Config: config, @@ -62,7 +62,7 @@ func TestAccAzureRMPostgreSQLConfiguration_importDeadlockTimeout(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMPostgreSQLConfigurationReset, + CheckDestroy: testCheckAzureRMPostgreSQLConfigurationDestroy, Steps: []resource.TestStep{ { Config: config, diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go index b6055eaeb7bc..9431d561f11d 100644 --- a/azurerm/resource_arm_postgresql_configuration_test.go +++ b/azurerm/resource_arm_postgresql_configuration_test.go @@ -18,7 +18,7 @@ func TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMPostgreSQLConfigurationReset, + CheckDestroy: testCheckAzureRMPostgreSQLConfigurationDestroy, Steps: []resource.TestStep{ { Config: config, @@ -30,7 +30,7 @@ func TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { Config: serverOnlyConfig, Check: resource.ComposeTestCheckFunc( // "delete" resets back to the default value - testCheckAzureRMPostgreSQLConfigurationValueReset(ri, "backslash_quote", "safe_encoding"), + testCheckAzureRMPostgreSQLConfigurationValueReset(ri, "backslash_quote"), ), }, }, @@ -45,7 +45,7 @@ func TestAccAzureRMPostgreSQLConfiguration_clientMinMessages(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMPostgreSQLConfigurationReset, + CheckDestroy: testCheckAzureRMPostgreSQLConfigurationDestroy, Steps: []resource.TestStep{ { Config: config, @@ -57,7 +57,7 @@ func TestAccAzureRMPostgreSQLConfiguration_clientMinMessages(t *testing.T) { Config: serverOnlyConfig, Check: resource.ComposeTestCheckFunc( // "delete" resets back to the default value - testCheckAzureRMPostgreSQLConfigurationValueReset(ri, "client_min_messages", "NOTICE"), + testCheckAzureRMPostgreSQLConfigurationValueReset(ri, "client_min_messages"), ), }, }, @@ -72,7 +72,7 @@ func TestAccAzureRMPostgreSQLConfiguration_deadlockTimeout(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMPostgreSQLConfigurationReset, + CheckDestroy: testCheckAzureRMPostgreSQLConfigurationDestroy, Steps: []resource.TestStep{ { Config: config, @@ -84,7 +84,7 @@ func TestAccAzureRMPostgreSQLConfiguration_deadlockTimeout(t *testing.T) { Config: serverOnlyConfig, Check: resource.ComposeTestCheckFunc( // "delete" resets back to the default value - testCheckAzureRMPostgreSQLConfigurationValueReset(ri, "deadlock_timeout", "1000"), + testCheckAzureRMPostgreSQLConfigurationValueReset(ri, "deadlock_timeout"), ), }, }, @@ -125,7 +125,7 @@ func testCheckAzureRMPostgreSQLConfigurationValue(resourceName string, value str } } -func testCheckAzureRMPostgreSQLConfigurationValueReset(rInt int, configurationName string, value string) resource.TestCheckFunc { +func testCheckAzureRMPostgreSQLConfigurationValueReset(rInt int, configurationName string) resource.TestCheckFunc { return func(s *terraform.State) error { resourceGroup := fmt.Sprintf("acctestRG-%d", rInt) @@ -146,14 +146,14 @@ func testCheckAzureRMPostgreSQLConfigurationValueReset(rInt int, configurationNa defaultValue := *resp.DefaultValue if defaultValue != actualValue { - return fmt.Errorf("PostgreSQL Configuration wasn't set to the default value. Expected '%s' - got '%s': \n%+v", value, *resp.Value, resp) + return fmt.Errorf("PostgreSQL Configuration wasn't set to the default value. Expected '%s' - got '%s': \n%+v", defaultValue, actualValue, resp) } return nil } } -func testCheckAzureRMPostgreSQLConfigurationReset(s *terraform.State) error { +func testCheckAzureRMPostgreSQLConfigurationDestroy(s *terraform.State) error { client := testAccProvider.Meta().(*ArmClient).postgresqlConfigurationsClient for _, rs := range s.RootModule().Resources { @@ -169,10 +169,10 @@ func testCheckAzureRMPostgreSQLConfigurationReset(s *terraform.State) error { if err != nil { if resp.StatusCode == http.StatusNotFound { - return err + return nil } - return nil + return err } } From 6b569c1289d0328af12c28b71651fbadecdb1a91 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 20 Aug 2017 21:03:13 +0200 Subject: [PATCH 21/27] Making the location dynamic --- ...mport_arm_postgresql_configuration_test.go | 6 +- .../import_arm_postgresql_database_test.go | 2 +- ...mport_arm_postgresql_firewall_rule_test.go | 2 +- azurerm/import_arm_postgresql_server_test.go | 4 +- ...ource_arm_postgresql_configuration_test.go | 56 ++++++------ .../resource_arm_postgresql_database_test.go | 27 +++--- ...ource_arm_postgresql_firewall_rule_test.go | 26 +++--- .../resource_arm_postgresql_server_test.go | 85 ++++++++++--------- 8 files changed, 109 insertions(+), 99 deletions(-) diff --git a/azurerm/import_arm_postgresql_configuration_test.go b/azurerm/import_arm_postgresql_configuration_test.go index 208181013fec..46eeb420ac35 100644 --- a/azurerm/import_arm_postgresql_configuration_test.go +++ b/azurerm/import_arm_postgresql_configuration_test.go @@ -11,7 +11,7 @@ func TestAccAzureRMPostgreSQLConfiguration_importBackslashQuote(t *testing.T) { resourceName := "azurerm_postgresql_configuration.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLConfiguration_backslashQuote(ri) + config := testAccAzureRMPostgreSQLConfiguration_backslashQuote(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -34,7 +34,7 @@ func TestAccAzureRMPostgreSQLConfiguration_importClientMinMessages(t *testing.T) resourceName := "azurerm_postgresql_configuration.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLConfiguration_clientMinMessages(ri) + config := testAccAzureRMPostgreSQLConfiguration_clientMinMessages(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -57,7 +57,7 @@ func TestAccAzureRMPostgreSQLConfiguration_importDeadlockTimeout(t *testing.T) { resourceName := "azurerm_postgresql_configuration.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLConfiguration_deadlockTimeout(ri) + config := testAccAzureRMPostgreSQLConfiguration_deadlockTimeout(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/azurerm/import_arm_postgresql_database_test.go b/azurerm/import_arm_postgresql_database_test.go index c0cce08cda91..96488b7e868f 100644 --- a/azurerm/import_arm_postgresql_database_test.go +++ b/azurerm/import_arm_postgresql_database_test.go @@ -11,7 +11,7 @@ func TestAccAzureRMPostgreSQLDatabase_importBasic(t *testing.T) { resourceName := "azurerm_postgresql_database.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLDatabase_basic(ri) + config := testAccAzureRMPostgreSQLDatabase_basic(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/azurerm/import_arm_postgresql_firewall_rule_test.go b/azurerm/import_arm_postgresql_firewall_rule_test.go index 748ea9734da3..739419f5f676 100644 --- a/azurerm/import_arm_postgresql_firewall_rule_test.go +++ b/azurerm/import_arm_postgresql_firewall_rule_test.go @@ -11,7 +11,7 @@ func TestAccAzureRMPostgreSQLFirewallRule_importBasic(t *testing.T) { resourceName := "azurerm_postgresql_firewall_rule.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLFirewallRule_basic(ri) + config := testAccAzureRMPostgreSQLFirewallRule_basic(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/azurerm/import_arm_postgresql_server_test.go b/azurerm/import_arm_postgresql_server_test.go index 3f54a830fb2a..73798f7bcb02 100644 --- a/azurerm/import_arm_postgresql_server_test.go +++ b/azurerm/import_arm_postgresql_server_test.go @@ -11,7 +11,7 @@ func TestAccAzureRMPostgreSQLServer_importBasicNinePointFive(t *testing.T) { resourceName := "azurerm_postgresql_server.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLServer_basicNinePointFive(ri) + config := testAccAzureRMPostgreSQLServer_basicNinePointFive(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -37,7 +37,7 @@ func TestAccAzureRMPostgreSQLServer_importBasicNinePointSix(t *testing.T) { resourceName := "azurerm_postgresql_server.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLServer_basicNinePointSix(ri) + config := testAccAzureRMPostgreSQLServer_basicNinePointSix(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go index 9431d561f11d..2090e58babe4 100644 --- a/azurerm/resource_arm_postgresql_configuration_test.go +++ b/azurerm/resource_arm_postgresql_configuration_test.go @@ -12,8 +12,9 @@ import ( func TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLConfiguration_backslashQuote(ri) - serverOnlyConfig := testAccAzureRMPostgreSQLConfiguration_empty(ri) + location := testLocation() + config := testAccAzureRMPostgreSQLConfiguration_backslashQuote(ri, location) + serverOnlyConfig := testAccAzureRMPostgreSQLConfiguration_empty(ri, location) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -39,8 +40,9 @@ func TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { func TestAccAzureRMPostgreSQLConfiguration_clientMinMessages(t *testing.T) { ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLConfiguration_clientMinMessages(ri) - serverOnlyConfig := testAccAzureRMPostgreSQLConfiguration_empty(ri) + location := testLocation() + config := testAccAzureRMPostgreSQLConfiguration_clientMinMessages(ri, location) + serverOnlyConfig := testAccAzureRMPostgreSQLConfiguration_empty(ri, location) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -66,8 +68,9 @@ func TestAccAzureRMPostgreSQLConfiguration_clientMinMessages(t *testing.T) { func TestAccAzureRMPostgreSQLConfiguration_deadlockTimeout(t *testing.T) { ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLConfiguration_deadlockTimeout(ri) - serverOnlyConfig := testAccAzureRMPostgreSQLConfiguration_empty(ri) + location := testLocation() + config := testAccAzureRMPostgreSQLConfiguration_deadlockTimeout(ri, location) + serverOnlyConfig := testAccAzureRMPostgreSQLConfiguration_empty(ri, location) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -179,20 +182,20 @@ func testCheckAzureRMPostgreSQLConfigurationDestroy(s *terraform.State) error { return nil } -func testAccAzureRMPostgreSQLConfiguration_backslashQuote(rInt int) string { - return testAccAzureRMPostgreSQLConfiguration_template(rInt, "backslash_quote", "on") +func testAccAzureRMPostgreSQLConfiguration_backslashQuote(rInt int, location string) string { + return testAccAzureRMPostgreSQLConfiguration_template(rInt, location, "backslash_quote", "on") } -func testAccAzureRMPostgreSQLConfiguration_clientMinMessages(rInt int) string { - return testAccAzureRMPostgreSQLConfiguration_template(rInt, "client_min_messages", "DEBUG5") +func testAccAzureRMPostgreSQLConfiguration_clientMinMessages(rInt int, location string) string { + return testAccAzureRMPostgreSQLConfiguration_template(rInt, location, "client_min_messages", "DEBUG5") } -func testAccAzureRMPostgreSQLConfiguration_deadlockTimeout(rInt int) string { - return testAccAzureRMPostgreSQLConfiguration_template(rInt, "deadlock_timeout", "5000") +func testAccAzureRMPostgreSQLConfiguration_deadlockTimeout(rInt int, location string) string { + return testAccAzureRMPostgreSQLConfiguration_template(rInt, location, "deadlock_timeout", "5000") } -func testAccAzureRMPostgreSQLConfiguration_template(rInt int, name string, value string) string { - server := testAccAzureRMPostgreSQLConfiguration_empty(rInt) +func testAccAzureRMPostgreSQLConfiguration_template(rInt int, location string, name string, value string) string { + server := testAccAzureRMPostgreSQLConfiguration_empty(rInt, location) config := fmt.Sprintf(` resource "azurerm_postgresql_configuration" "test" { name = "%s" @@ -204,28 +207,29 @@ resource "azurerm_postgresql_configuration" "test" { return server + config } -func testAccAzureRMPostgreSQLConfiguration_empty(rInt int) string { +func testAccAzureRMPostgreSQLConfiguration_empty(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "West US" + name = "acctestRG-%d" + location = "%s" } + resource "azurerm_postgresql_server" "test" { - name = "acctestpsqlsvr-%d" - location = "${azurerm_resource_group.test.location}" + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" + name = "PGSQLB50" capacity = 50 - tier = "Basic" + tier = "Basic" } - administrator_login = "acctestun" + administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" - version = "9.6" - storage_mb = 51200 - ssl_enforcement = "Enabled" + version = "9.6" + storage_mb = 51200 + ssl_enforcement = "Enabled" } -`, rInt, rInt) +`, rInt, location, rInt) } diff --git a/azurerm/resource_arm_postgresql_database_test.go b/azurerm/resource_arm_postgresql_database_test.go index c14f5f2eec83..90f725227fb2 100644 --- a/azurerm/resource_arm_postgresql_database_test.go +++ b/azurerm/resource_arm_postgresql_database_test.go @@ -13,7 +13,7 @@ import ( func TestAccAzureRMPostgreSQLDatabase_basic(t *testing.T) { resourceName := "azurerm_postgresql_database.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLDatabase_basic(ri) + config := testAccAzureRMPostgreSQLDatabase_basic(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -88,28 +88,29 @@ func testCheckAzureRMPostgreSQLDatabaseDestroy(s *terraform.State) error { return nil } -func testAccAzureRMPostgreSQLDatabase_basic(rInt int) string { +func testAccAzureRMPostgreSQLDatabase_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "West US" + name = "acctestRG-%d" + location = "%s" } + resource "azurerm_postgresql_server" "test" { - name = "acctestpsqlsvr-%d" - location = "${azurerm_resource_group.test.location}" + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" + name = "PGSQLB50" capacity = 50 - tier = "Basic" + tier = "Basic" } - administrator_login = "acctestun" + administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" - version = "9.6" - storage_mb = 51200 - ssl_enforcement = "Enabled" + version = "9.6" + storage_mb = 51200 + ssl_enforcement = "Enabled" } resource "azurerm_postgresql_database" "test" { @@ -119,5 +120,5 @@ resource "azurerm_postgresql_database" "test" { charset = "UTF8" collation = "English_United States.1252" } -`, rInt, rInt, rInt) +`, rInt, location, rInt, rInt) } diff --git a/azurerm/resource_arm_postgresql_firewall_rule_test.go b/azurerm/resource_arm_postgresql_firewall_rule_test.go index 74e4ffed4c30..055c36d1d46d 100644 --- a/azurerm/resource_arm_postgresql_firewall_rule_test.go +++ b/azurerm/resource_arm_postgresql_firewall_rule_test.go @@ -13,7 +13,7 @@ import ( func TestAccAzureRMPostgreSQLFirewallRule_basic(t *testing.T) { resourceName := "azurerm_postgresql_firewall_rule.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLFirewallRule_basic(ri) + config := testAccAzureRMPostgreSQLFirewallRule_basic(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -88,29 +88,29 @@ func testCheckAzureRMPostgreSQLFirewallRuleDestroy(s *terraform.State) error { return nil } -func testAccAzureRMPostgreSQLFirewallRule_basic(rInt int) string { +func testAccAzureRMPostgreSQLFirewallRule_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "West US" + name = "acctestRG-%d" + location = "%s" } resource "azurerm_postgresql_server" "test" { - name = "acctestpsqlsvr-%d" - location = "${azurerm_resource_group.test.location}" + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" + name = "PGSQLB50" capacity = 50 - tier = "Basic" + tier = "Basic" } - administrator_login = "acctestun" + administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" - version = "9.6" - storage_mb = 51200 - ssl_enforcement = "Enabled" + version = "9.6" + storage_mb = 51200 + ssl_enforcement = "Enabled" } resource "azurerm_postgresql_firewall_rule" "test" { @@ -120,5 +120,5 @@ resource "azurerm_postgresql_firewall_rule" "test" { start_ip_address = "0.0.0.0" end_ip_address = "255.255.255.255" } -`, rInt, rInt, rInt) +`, rInt, location, rInt, rInt) } diff --git a/azurerm/resource_arm_postgresql_server_test.go b/azurerm/resource_arm_postgresql_server_test.go index 0c1648160c6a..20cec6949093 100644 --- a/azurerm/resource_arm_postgresql_server_test.go +++ b/azurerm/resource_arm_postgresql_server_test.go @@ -13,7 +13,7 @@ import ( func TestAccAzureRMPostgreSQLServer_basicNinePointFive(t *testing.T) { resourceName := "azurerm_postgresql_server.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLServer_basicNinePointFive(ri) + config := testAccAzureRMPostgreSQLServer_basicNinePointFive(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -33,7 +33,7 @@ func TestAccAzureRMPostgreSQLServer_basicNinePointFive(t *testing.T) { func TestAccAzureRMPostgreSQLServer_basicNinePointSix(t *testing.T) { resourceName := "azurerm_postgresql_server.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLServer_basicNinePointSix(ri) + config := testAccAzureRMPostgreSQLServer_basicNinePointSix(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -53,8 +53,9 @@ func TestAccAzureRMPostgreSQLServer_basicNinePointSix(t *testing.T) { func TestAccAzureRMPostgreSQLServer_updatePassword(t *testing.T) { resourceName := "azurerm_postgresql_server.test" ri := acctest.RandInt() - config := testAccAzureRMPostgreSQLServer_basicNinePointSix(ri) - updatedConfig := testAccAzureRMPostgreSQLServer_basicNinePointSixUpdated(ri) + location := testLocation() + config := testAccAzureRMPostgreSQLServer_basicNinePointSix(ri, location) + updatedConfig := testAccAzureRMPostgreSQLServer_basicNinePointSixUpdated(ri, location) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -133,80 +134,84 @@ func testCheckAzureRMPostgreSQLServerDestroy(s *terraform.State) error { return nil } -func testAccAzureRMPostgreSQLServer_basicNinePointFive(rInt int) string { +func testAccAzureRMPostgreSQLServer_basicNinePointFive(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "West US" + name = "acctestRG-%d" + location = "%s" } + resource "azurerm_postgresql_server" "test" { - name = "acctestpsqlsvr-%d" - location = "${azurerm_resource_group.test.location}" + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" + name = "PGSQLB50" capacity = 50 - tier = "Basic" + tier = "Basic" } - administrator_login = "acctestun" + administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" - version = "9.5" - storage_mb = 51200 - ssl_enforcement = "Enabled" + version = "9.5" + storage_mb = 51200 + ssl_enforcement = "Enabled" } -`, rInt, rInt) +`, rInt, location, rInt) } -func testAccAzureRMPostgreSQLServer_basicNinePointSix(rInt int) string { +func testAccAzureRMPostgreSQLServer_basicNinePointSix(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "West US" + name = "acctestRG-%d" + location = "%s" } + resource "azurerm_postgresql_server" "test" { - name = "acctestpsqlsvr-%d" - location = "${azurerm_resource_group.test.location}" + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" + name = "PGSQLB50" capacity = 50 - tier = "Basic" + tier = "Basic" } - administrator_login = "acctestun" + administrator_login = "acctestun" administrator_login_password = "H@Sh1CoR3!" - version = "9.6" - storage_mb = 51200 - ssl_enforcement = "Enabled" + version = "9.6" + storage_mb = 51200 + ssl_enforcement = "Enabled" } -`, rInt, rInt) +`, rInt, location, rInt) } -func testAccAzureRMPostgreSQLServer_basicNinePointSixUpdated(rInt int) string { +func testAccAzureRMPostgreSQLServer_basicNinePointSixUpdated(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "West US" + name = "acctestRG-%d" + location = "%s" } + resource "azurerm_postgresql_server" "test" { - name = "acctestpsqlsvr-%d" - location = "${azurerm_resource_group.test.location}" + name = "acctestpsqlsvr-%d" + location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku { - name = "PGSQLB50" + name = "PGSQLB50" capacity = 50 - tier = "Basic" + tier = "Basic" } - administrator_login = "acctestun" + administrator_login = "acctestun" administrator_login_password = "R3dH0TCh1l1P3pp3rs!" - version = "9.6" - storage_mb = 51200 - ssl_enforcement = "Disabled" + version = "9.6" + storage_mb = 51200 + ssl_enforcement = "Disabled" } -`, rInt, rInt) + +`, rInt, location, rInt) } From 2f525384d8d5475570cae401a4196ecd8f9a8fa9 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 5 Sep 2017 11:43:33 +0100 Subject: [PATCH 22/27] Resolving rebase issues --- .../resource_arm_postgresql_configuration.go | 6 ++--- azurerm/resource_arm_postgresql_database.go | 8 +++---- .../resource_arm_postgresql_firewall_rule.go | 8 +++---- azurerm/resource_arm_postgresql_server.go | 24 +++++++++---------- azurerm/validators.go | 2 ++ 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/azurerm/resource_arm_postgresql_configuration.go b/azurerm/resource_arm_postgresql_configuration.go index c9ecbdbc2cd0..962237f5671f 100644 --- a/azurerm/resource_arm_postgresql_configuration.go +++ b/azurerm/resource_arm_postgresql_configuration.go @@ -6,7 +6,7 @@ import ( "github.com/Azure/azure-sdk-for-go/arm/postgresql" "github.com/hashicorp/terraform/helper/schema" - "github.com/jen20/riviera/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmPostgreSQLConfiguration() *schema.Resource { @@ -59,7 +59,7 @@ func resourceArmPostgreSQLConfigurationCreateUpdate(d *schema.ResourceData, meta properties := postgresql.Configuration{ ConfigurationProperties: &postgresql.ConfigurationProperties{ - Value: azure.String(value), + Value: utils.String(value), }, } @@ -95,7 +95,7 @@ func resourceArmPostgreSQLConfigurationRead(d *schema.ResourceData, meta interfa resp, err := client.Get(resGroup, serverName, name) if err != nil { - if responseWasNotFound(resp.Response) { + if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } diff --git a/azurerm/resource_arm_postgresql_database.go b/azurerm/resource_arm_postgresql_database.go index 4ce82aa33779..be1dd2a3e558 100644 --- a/azurerm/resource_arm_postgresql_database.go +++ b/azurerm/resource_arm_postgresql_database.go @@ -6,7 +6,7 @@ import ( "github.com/Azure/azure-sdk-for-go/arm/postgresql" "github.com/hashicorp/terraform/helper/schema" - "github.com/jen20/riviera/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmPostgreSQLDatabase() *schema.Resource { @@ -66,8 +66,8 @@ func resourceArmPostgreSQLDatabaseCreate(d *schema.ResourceData, meta interface{ properties := postgresql.Database{ DatabaseProperties: &postgresql.DatabaseProperties{ - Charset: azure.String(charset), - Collation: azure.String(collation), + Charset: utils.String(charset), + Collation: utils.String(collation), }, } @@ -103,7 +103,7 @@ func resourceArmPostgreSQLDatabaseRead(d *schema.ResourceData, meta interface{}) resp, err := client.Get(resGroup, serverName, name) if err != nil { - if responseWasNotFound(resp.Response) { + if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } diff --git a/azurerm/resource_arm_postgresql_firewall_rule.go b/azurerm/resource_arm_postgresql_firewall_rule.go index 49f5bcc82083..1768ca2b2aad 100644 --- a/azurerm/resource_arm_postgresql_firewall_rule.go +++ b/azurerm/resource_arm_postgresql_firewall_rule.go @@ -6,7 +6,7 @@ import ( "github.com/Azure/azure-sdk-for-go/arm/postgresql" "github.com/hashicorp/terraform/helper/schema" - "github.com/jen20/riviera/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmPostgreSQLFirewallRule() *schema.Resource { @@ -65,8 +65,8 @@ func resourceArmPostgreSQLFirewallRuleCreate(d *schema.ResourceData, meta interf properties := postgresql.FirewallRule{ FirewallRuleProperties: &postgresql.FirewallRuleProperties{ - StartIPAddress: azure.String(startIPAddress), - EndIPAddress: azure.String(endIPAddress), + StartIPAddress: utils.String(startIPAddress), + EndIPAddress: utils.String(endIPAddress), }, } @@ -102,7 +102,7 @@ func resourceArmPostgreSQLFirewallRuleRead(d *schema.ResourceData, meta interfac resp, err := client.Get(resGroup, serverName, name) if err != nil { - if responseWasNotFound(resp.Response) { + if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go index 7ac6b73a6d9b..2c0188886310 100644 --- a/azurerm/resource_arm_postgresql_server.go +++ b/azurerm/resource_arm_postgresql_server.go @@ -8,7 +8,7 @@ import ( "github.com/Azure/azure-sdk-for-go/arm/postgresql" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/jen20/riviera/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmPostgreSQLServer() *schema.Resource { @@ -150,10 +150,10 @@ func resourceArmPostgreSQLServerCreate(d *schema.ResourceData, meta interface{}) Sku: sku, Properties: &postgresql.ServerPropertiesForDefaultCreate{ Version: postgresql.ServerVersion(version), - StorageMB: azure.Int64(int64(storageMB)), + StorageMB: utils.Int64(int64(storageMB)), SslEnforcement: postgresql.SslEnforcementEnum(sslEnforcement), - AdministratorLogin: azure.String(adminLogin), - AdministratorLoginPassword: azure.String(adminLoginPassword), + AdministratorLogin: utils.String(adminLogin), + AdministratorLoginPassword: utils.String(adminLoginPassword), CreateMode: postgresql.CreateModeDefault, }, Tags: expandTags(tags), @@ -198,9 +198,9 @@ func resourceArmPostgreSQLServerUpdate(d *schema.ResourceData, meta interface{}) Sku: sku, ServerUpdateParametersProperties: &postgresql.ServerUpdateParametersProperties{ SslEnforcement: postgresql.SslEnforcementEnum(sslEnforcement), - StorageMB: azure.Int64(int64(storageMB)), + StorageMB: utils.Int64(int64(storageMB)), Version: postgresql.ServerVersion(version), - AdministratorLoginPassword: azure.String(adminLoginPassword), + AdministratorLoginPassword: utils.String(adminLoginPassword), }, Tags: expandTags(tags), } @@ -236,7 +236,7 @@ func resourceArmPostgreSQLServerRead(d *schema.ResourceData, meta interface{}) e resp, err := client.Get(resGroup, name) if err != nil { - if responseWasNotFound(resp.Response) { + if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } @@ -272,8 +272,8 @@ func resourceArmPostgreSQLServerDelete(d *schema.ResourceData, meta interface{}) resGroup := id.ResourceGroup name := id.Path["servers"] - _, error := client.Delete(resGroup, name, make(chan struct{})) - err = <-error + _, deleteErr := client.Delete(resGroup, name, make(chan struct{})) + err = <-deleteErr return err } @@ -287,10 +287,10 @@ func expandAzureRmPostgreSQLServerSku(d *schema.ResourceData, storageMB int) *po tier := sku["tier"].(string) return &postgresql.Sku{ - Name: azure.String(name), - Capacity: azure.Int32(int32(capacity)), + Name: utils.String(name), + Capacity: utils.Int32(int32(capacity)), Tier: postgresql.SkuTier(tier), - Size: azure.String(strconv.Itoa(storageMB)), + Size: utils.String(strconv.Itoa(storageMB)), } } diff --git a/azurerm/validators.go b/azurerm/validators.go index 2fa2241eecef..766e186778d1 100644 --- a/azurerm/validators.go +++ b/azurerm/validators.go @@ -15,6 +15,8 @@ func validateRFC3339Date(v interface{}, k string) (ws []string, errors []error) if _, err := date.ParseTime(time.RFC3339, dateString); err != nil { errors = append(errors, fmt.Errorf("`%s` is an invalid RFC3339 date: %+v", k, err)) } + + return } // validateIntInSlice returns a SchemaValidateFunc which tests if the provided value From e9b1264b2aa8b3602a2e7ef1af1a5dd459c4e5a9 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 5 Sep 2017 11:47:24 +0100 Subject: [PATCH 23/27] Updating the tests to the new format --- ...ource_arm_postgresql_configuration_test.go | 19 +++++++++---------- .../resource_arm_postgresql_database_test.go | 11 +++++------ ...ource_arm_postgresql_firewall_rule_test.go | 12 ++++++------ .../resource_arm_postgresql_server_test.go | 12 ++++++------ 4 files changed, 26 insertions(+), 28 deletions(-) diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go index 2090e58babe4..a74c3a06144c 100644 --- a/azurerm/resource_arm_postgresql_configuration_test.go +++ b/azurerm/resource_arm_postgresql_configuration_test.go @@ -2,12 +2,12 @@ package azurerm import ( "fmt" - "net/http" "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 TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { @@ -113,11 +113,11 @@ func testCheckAzureRMPostgreSQLConfigurationValue(resourceName string, value str resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - return fmt.Errorf("Bad: Get on postgresqlConfigurationsClient: %+v", err) - } + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: PostgreSQL Configuration %q (server %q resource group: %q) does not exist", name, serverName, resourceGroup) + } - if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: PostgreSQL Configuration %q (server %q resource group: %q) does not exist", name, serverName, resourceGroup) + return fmt.Errorf("Bad: Get on postgresqlConfigurationsClient: %+v", err) } if *resp.Value != value { @@ -138,13 +138,12 @@ func testCheckAzureRMPostgreSQLConfigurationValueReset(rInt int, configurationNa resp, err := client.Get(resourceGroup, serverName, configurationName) if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: PostgreSQL Configuration %q (server %q resource group: %q) does not exist", configurationName, serverName, resourceGroup) + } return fmt.Errorf("Bad: Get on postgresqlConfigurationsClient: %+v", err) } - if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: PostgreSQL Configuration %q (server %q resource group: %q) does not exist", configurationName, serverName, resourceGroup) - } - actualValue := *resp.Value defaultValue := *resp.DefaultValue @@ -171,7 +170,7 @@ func testCheckAzureRMPostgreSQLConfigurationDestroy(s *terraform.State) error { resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - if resp.StatusCode == http.StatusNotFound { + if utils.ResponseWasNotFound(resp.Response) { return nil } diff --git a/azurerm/resource_arm_postgresql_database_test.go b/azurerm/resource_arm_postgresql_database_test.go index 90f725227fb2..28e60e08b6fd 100644 --- a/azurerm/resource_arm_postgresql_database_test.go +++ b/azurerm/resource_arm_postgresql_database_test.go @@ -2,12 +2,12 @@ package azurerm import ( "fmt" - "net/http" "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 TestAccAzureRMPostgreSQLDatabase_basic(t *testing.T) { @@ -49,13 +49,12 @@ func testCheckAzureRMPostgreSQLDatabaseExists(name string) resource.TestCheckFun resp, err := client.Get(resourceGroup, serverName, name) if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: PostgreSQL Database %q (server %q resource group: %q) does not exist", name, serverName, resourceGroup) + } return fmt.Errorf("Bad: Get on postgresqlDatabasesClient: %+v", err) } - if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: PostgreSQL Database %q (server %q resource group: %q) does not exist", name, serverName, resourceGroup) - } - return nil } } @@ -75,7 +74,7 @@ func testCheckAzureRMPostgreSQLDatabaseDestroy(s *terraform.State) error { resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - if resp.StatusCode == http.StatusNotFound { + if utils.ResponseWasNotFound(resp.Response) { return nil } diff --git a/azurerm/resource_arm_postgresql_firewall_rule_test.go b/azurerm/resource_arm_postgresql_firewall_rule_test.go index 055c36d1d46d..c4595dba028e 100644 --- a/azurerm/resource_arm_postgresql_firewall_rule_test.go +++ b/azurerm/resource_arm_postgresql_firewall_rule_test.go @@ -2,12 +2,12 @@ package azurerm import ( "fmt" - "net/http" "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 TestAccAzureRMPostgreSQLFirewallRule_basic(t *testing.T) { @@ -49,11 +49,11 @@ func testCheckAzureRMPostgreSQLFirewallRuleExists(name string) resource.TestChec resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - return fmt.Errorf("Bad: Get on postgresqlFirewallRulesClient: %+v", err) - } + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: PostgreSQL Firewall Rule %q (server %q resource group: %q) does not exist", name, serverName, resourceGroup) + } - if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: PostgreSQL Firewall Rule %q (server %q resource group: %q) does not exist", name, serverName, resourceGroup) + return fmt.Errorf("Bad: Get on postgresqlFirewallRulesClient: %+v", err) } return nil @@ -75,7 +75,7 @@ func testCheckAzureRMPostgreSQLFirewallRuleDestroy(s *terraform.State) error { resp, err := client.Get(resourceGroup, serverName, name) if err != nil { - if resp.StatusCode == http.StatusNotFound { + if utils.ResponseWasNotFound(resp.Response) { return nil } diff --git a/azurerm/resource_arm_postgresql_server_test.go b/azurerm/resource_arm_postgresql_server_test.go index 20cec6949093..a95dc640ec4d 100644 --- a/azurerm/resource_arm_postgresql_server_test.go +++ b/azurerm/resource_arm_postgresql_server_test.go @@ -2,12 +2,12 @@ package azurerm import ( "fmt" - "net/http" "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 TestAccAzureRMPostgreSQLServer_basicNinePointFive(t *testing.T) { @@ -96,11 +96,11 @@ func testCheckAzureRMPostgreSQLServerExists(name string) resource.TestCheckFunc resp, err := client.Get(resourceGroup, name) if err != nil { - return fmt.Errorf("Bad: Get on postgresqlServersClient: %+v", err) - } + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: PostgreSQL Server %q (resource group: %q) does not exist", name, resourceGroup) + } - if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: PostgreSQL Server %q (resource group: %q) does not exist", name, resourceGroup) + return fmt.Errorf("Bad: Get on postgresqlServersClient: %+v", err) } return nil @@ -121,7 +121,7 @@ func testCheckAzureRMPostgreSQLServerDestroy(s *terraform.State) error { resp, err := client.Get(resourceGroup, name) if err != nil { - if resp.StatusCode == http.StatusNotFound { + if utils.ResponseWasNotFound(resp.Response) { return nil } From f66404eb0f2117328413cc14b4ed11bf5e3ad4c4 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 5 Sep 2017 12:29:05 +0100 Subject: [PATCH 24/27] Adding some addiitonal resource value tests --- azurerm/resource_arm_postgresql_configuration_test.go | 3 ++- azurerm/resource_arm_postgresql_database_test.go | 3 +++ azurerm/resource_arm_postgresql_firewall_rule_test.go | 2 ++ azurerm/resource_arm_postgresql_server_test.go | 8 ++++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go index a74c3a06144c..2e6662cb40ee 100644 --- a/azurerm/resource_arm_postgresql_configuration_test.go +++ b/azurerm/resource_arm_postgresql_configuration_test.go @@ -11,6 +11,7 @@ import ( ) func TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { + resourceName := "azurerm_postgresql_configuration.test" ri := acctest.RandInt() location := testLocation() config := testAccAzureRMPostgreSQLConfiguration_backslashQuote(ri, location) @@ -24,7 +25,7 @@ func TestAccAzureRMPostgreSQLConfiguration_backslashQuote(t *testing.T) { { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMPostgreSQLConfigurationValue("azurerm_postgresql_configuration.test", "on"), + testCheckAzureRMPostgreSQLConfigurationValue(resourceName, "on"), ), }, { diff --git a/azurerm/resource_arm_postgresql_database_test.go b/azurerm/resource_arm_postgresql_database_test.go index 28e60e08b6fd..d531268fb800 100644 --- a/azurerm/resource_arm_postgresql_database_test.go +++ b/azurerm/resource_arm_postgresql_database_test.go @@ -24,6 +24,9 @@ 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"), ), }, }, diff --git a/azurerm/resource_arm_postgresql_firewall_rule_test.go b/azurerm/resource_arm_postgresql_firewall_rule_test.go index c4595dba028e..ad6679231cc8 100644 --- a/azurerm/resource_arm_postgresql_firewall_rule_test.go +++ b/azurerm/resource_arm_postgresql_firewall_rule_test.go @@ -24,6 +24,8 @@ func TestAccAzureRMPostgreSQLFirewallRule_basic(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMPostgreSQLFirewallRuleExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "start_ip_address", "0.0.0.0"), + resource.TestCheckResourceAttr(resourceName, "end_ip_address", "255.255.255.255"), ), }, }, diff --git a/azurerm/resource_arm_postgresql_server_test.go b/azurerm/resource_arm_postgresql_server_test.go index a95dc640ec4d..97c0238391f4 100644 --- a/azurerm/resource_arm_postgresql_server_test.go +++ b/azurerm/resource_arm_postgresql_server_test.go @@ -24,6 +24,10 @@ func TestAccAzureRMPostgreSQLServer_basicNinePointFive(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( 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"), ), }, }, @@ -44,6 +48,10 @@ func TestAccAzureRMPostgreSQLServer_basicNinePointSix(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( 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"), ), }, }, From 5ebf58bf7c3da78adefcf9fe216bba66f7f45dfc Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 5 Sep 2017 14:26:19 +0100 Subject: [PATCH 25/27] Review fixes --- azurerm/resource_arm_postgresql_configuration.go | 1 + azurerm/resource_arm_postgresql_database.go | 1 + azurerm/resource_arm_postgresql_firewall_rule.go | 1 + azurerm/resource_arm_postgresql_server.go | 1 + azurerm/validators.go | 4 ++-- website/docs/r/postgresql_firewall_rule.html.markdown | 4 ++-- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/azurerm/resource_arm_postgresql_configuration.go b/azurerm/resource_arm_postgresql_configuration.go index 962237f5671f..2b8c252aca79 100644 --- a/azurerm/resource_arm_postgresql_configuration.go +++ b/azurerm/resource_arm_postgresql_configuration.go @@ -96,6 +96,7 @@ func resourceArmPostgreSQLConfigurationRead(d *schema.ResourceData, meta interfa resp, err := client.Get(resGroup, serverName, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[WARN] PostgreSQL Configuration '%s' was not found (resource group '%s')", name, resGroup) d.SetId("") return nil } diff --git a/azurerm/resource_arm_postgresql_database.go b/azurerm/resource_arm_postgresql_database.go index be1dd2a3e558..e1445c75befc 100644 --- a/azurerm/resource_arm_postgresql_database.go +++ b/azurerm/resource_arm_postgresql_database.go @@ -104,6 +104,7 @@ func resourceArmPostgreSQLDatabaseRead(d *schema.ResourceData, meta interface{}) resp, err := client.Get(resGroup, serverName, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[WARN] PostgreSQL Database '%s' was not found (resource group '%s')", name, resGroup) d.SetId("") return nil } diff --git a/azurerm/resource_arm_postgresql_firewall_rule.go b/azurerm/resource_arm_postgresql_firewall_rule.go index 1768ca2b2aad..c44c0d653cd6 100644 --- a/azurerm/resource_arm_postgresql_firewall_rule.go +++ b/azurerm/resource_arm_postgresql_firewall_rule.go @@ -103,6 +103,7 @@ func resourceArmPostgreSQLFirewallRuleRead(d *schema.ResourceData, meta interfac resp, err := client.Get(resGroup, serverName, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[WARN] PostgreSQL Firewall Rule '%s' was not found (resource group '%s')", name, resGroup) d.SetId("") return nil } diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go index 2c0188886310..66d83031e44b 100644 --- a/azurerm/resource_arm_postgresql_server.go +++ b/azurerm/resource_arm_postgresql_server.go @@ -237,6 +237,7 @@ func resourceArmPostgreSQLServerRead(d *schema.ResourceData, meta interface{}) e resp, err := client.Get(resGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[WARN] PostgreSQL Server '%s' was not found (resource group '%s')", name, resGroup) d.SetId("") return nil } diff --git a/azurerm/validators.go b/azurerm/validators.go index 766e186778d1..88ae3116a08f 100644 --- a/azurerm/validators.go +++ b/azurerm/validators.go @@ -13,7 +13,7 @@ func validateRFC3339Date(v interface{}, k string) (ws []string, errors []error) dateString := v.(string) if _, err := date.ParseTime(time.RFC3339, dateString); err != nil { - errors = append(errors, fmt.Errorf("`%s` is an invalid RFC3339 date: %+v", k, err)) + errors = append(errors, fmt.Errorf("%q is an invalid RFC3339 date: %+v", k, err)) } return @@ -35,7 +35,7 @@ func validateIntInSlice(valid []int) schema.SchemaValidateFunc { } } - es = append(es, fmt.Errorf("expected %s to be one of %v, got %v", k, valid, v)) + es = append(es, fmt.Errorf("expected %q to be one of %v, got %v", k, valid, v)) return } } diff --git a/website/docs/r/postgresql_firewall_rule.html.markdown b/website/docs/r/postgresql_firewall_rule.html.markdown index eac6361b06aa..2c9b9ef77ba8 100644 --- a/website/docs/r/postgresql_firewall_rule.html.markdown +++ b/website/docs/r/postgresql_firewall_rule.html.markdown @@ -19,7 +19,7 @@ resource "azurerm_resource_group" "test" { } resource "azurerm_postgresql_server" "test" { - ... + # ... } resource "azurerm_postgresql_firewall_rule" "test" { @@ -40,7 +40,7 @@ resource "azurerm_resource_group" "test" { } resource "azurerm_postgresql_server" "test" { - ... + # ... } resource "azurerm_postgresql_firewall_rule" "test" { From d9ba935a8c3442802a15704c524c107739723264 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 5 Sep 2017 15:06:23 +0100 Subject: [PATCH 26/27] Splitting the SKU assignment out --- azurerm/resource_arm_postgresql_server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go index 66d83031e44b..11994e8e2bb0 100644 --- a/azurerm/resource_arm_postgresql_server.go +++ b/azurerm/resource_arm_postgresql_server.go @@ -253,8 +253,8 @@ func resourceArmPostgreSQLServerRead(d *schema.ResourceData, meta interface{}) e 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)) - flattenAndSetAzureRmPostgreSQLServerSku(d, resp.Sku) flattenAndSetTags(d, resp.Tags) // Computed @@ -295,7 +295,7 @@ func expandAzureRmPostgreSQLServerSku(d *schema.ResourceData, storageMB int) *po } } -func flattenAndSetAzureRmPostgreSQLServerSku(d *schema.ResourceData, resp *postgresql.Sku) { +func flattenPostgreSQLServerSku(resp *postgresql.Sku) []interface{} { values := map[string]interface{}{} values["name"] = *resp.Name @@ -303,5 +303,5 @@ func flattenAndSetAzureRmPostgreSQLServerSku(d *schema.ResourceData, resp *postg values["tier"] = string(resp.Tier) sku := []interface{}{values} - d.Set("sku", sku) + return sku } From 5e74f93d439d258782c6bf97ec9474a200108919 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 5 Sep 2017 16:09:15 +0100 Subject: [PATCH 27/27] Detailing the PostgreSQL resources from #210 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecd6d9457558..b68b0f128c65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ ## 0.1.7 (Unreleased) +FEATURES: + +* **New Resource:** `azurerm_postgresql_configuration` [GH-210] +* **New Resource:** `azurerm_postgresql_database` [GH-210] +* **New Resource:** `azurerm_postgresql_firewall_rule` [GH-210] +* **New Resource:** `azurerm_postgresql_server` [GH-210] + IMPROVEMENTS: * `azurerm_cdn_endpoint` - defaulting the `http_port` and `https_port` [GH-301]