New Resources: azurerm_postgresql_*

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,11 @@ type ArmClient struct {
 	eventHubConsumerGroupClient eventhub.ConsumerGroupsClient
 	eventHubNamespacesClient    eventhub.NamespacesClient
 
+	postgresqlConfigurationsClient postgresql.ConfigurationsClient
+	postgresqlDatabasesClient      postgresql.DatabasesClient
+	postgresqlFirewallRulesClient  postgresql.FirewallRulesClient
+	postgresqlServersClient        postgresql.ServersClient
+
 	providers           resources.ProvidersClient
 	resourceGroupClient resources.GroupsClient
 	tagsClient          resources.TagsClient
@@ -401,6 +407,30 @@ 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
+	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
+	psc.Sender = autorest.CreateSender(withRequestLogging())
+	client.postgresqlServersClient = psc
+
 	rtc := network.NewRouteTablesClientWithBaseURI(endpoint, c.SubscriptionID)
 	setUserAgent(&rtc.Client)
 	rtc.Authorizer = auth

azurerm/import_arm_postgresql_configuration_test.go

@@ -0,0 +1,77 @@
+package azurerm
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccAzureRMPostgreSQLConfiguration_importBackslashQuote(t *testing.T) {
+	resourceName := "azurerm_postgresql_configuration.test"
+
+	ri := acctest.RandInt()
+	config := testAccAzureRMPostgreSQLConfiguration_backslashQuote(ri, testLocation())
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMPostgreSQLConfigurationDestroy,
+		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, testLocation())
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMPostgreSQLConfigurationDestroy,
+		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, testLocation())
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMPostgreSQLConfigurationDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

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, testLocation())
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMPostgreSQLDatabaseDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

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, testLocation())
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMPostgreSQLFirewallRuleDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

azurerm/import_arm_postgresql_server_test.go

@@ -0,0 +1,60 @@
+package azurerm
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccAzureRMPostgreSQLServer_importBasicNinePointFive(t *testing.T) {
+	resourceName := "azurerm_postgresql_server.test"
+
+	ri := acctest.RandInt()
+	config := testAccAzureRMPostgreSQLServer_basicNinePointFive(ri, testLocation())
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMPostgreSQLServerDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateVerifyIgnore: []string{
+					"administrator_login_password", // not returned as sensitive
+				},
+			},
+		},
+	})
+}
+
+func TestAccAzureRMPostgreSQLServer_importBasicNinePointSix(t *testing.T) {
+	resourceName := "azurerm_postgresql_server.test"
+
+	ri := acctest.RandInt()
+	config := testAccAzureRMPostgreSQLServer_basicNinePointSix(ri, testLocation())
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMPostgreSQLServerDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateVerifyIgnore: []string{
+					"administrator_login_password", // not returned as sensitive
+				},
+			},
+		},
+	})
+}

azurerm/provider.go

@@ -104,6 +104,10 @@ 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(),
 			"azurerm_public_ip":                   resourceArmPublicIp(),
 			"azurerm_redis_cache":                 resourceArmRedisCache(),
 			"azurerm_resource_group":              resourceArmResourceGroup(),
@@ -239,22 +243,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