From 4475501ab61a406be9de7a84a1f6bdaf19cd6432 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline Date: Tue, 4 Dec 2018 18:25:59 -0800 Subject: [PATCH 1/2] Added new skus to postgreSQL --- azurerm/resource_arm_postgresql_server.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go index d4c4f6d8a9c7..a97ae024bafb 100644 --- a/azurerm/resource_arm_postgresql_server.go +++ b/azurerm/resource_arm_postgresql_server.go @@ -60,10 +60,12 @@ func resourceArmPostgreSQLServer() *schema.Resource { "GP_Gen5_8", "GP_Gen5_16", "GP_Gen5_32", + "GP_Gen5_64", "MO_Gen5_2", "MO_Gen5_4", "MO_Gen5_8", "MO_Gen5_16", + "MO_Gen5_32", }, true), DiffSuppressFunc: suppress.CaseDifference, }, @@ -78,6 +80,7 @@ func resourceArmPostgreSQLServer() *schema.Resource { 8, 16, 32, + 64, }), }, From 8f1c7099033670980c2c16665c95740fc9db3da9 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline Date: Tue, 4 Dec 2018 18:45:52 -0800 Subject: [PATCH 2/2] Refactor completion code --- azurerm/resource_arm_postgresql_server.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go index a97ae024bafb..bcb928145eea 100644 --- a/azurerm/resource_arm_postgresql_server.go +++ b/azurerm/resource_arm_postgresql_server.go @@ -235,8 +235,7 @@ func resourceArmPostgreSQLServerCreate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error creating PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) } - err = future.WaitForCompletionRef(ctx, client.Client) - if err != nil { + if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { return fmt.Errorf("Error waiting for creation of PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err) }