set create_mode on import

hashicorp · Apr 21, 2020 · 8a39c09 · 8a39c09
1 parent 0d03c88
commit 8a39c09
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 28 deletions.
diff --git a/azurerm/internal/services/postgres/resource_arm_postgresql_server.go b/azurerm/internal/services/postgres/resource_arm_postgresql_server.go
@@ -20,7 +20,6 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/postgres/parse"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/postgres/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags"
-	azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
@@ -32,10 +31,20 @@ func resourceArmPostgreSQLServer() *schema.Resource {
 		Update: resourceArmPostgreSQLServerUpdate,
 		Delete: resourceArmPostgreSQLServerDelete,
 
-		Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error {
-			_, err := parse.PostgresServerServerID(id)
-			return err
-		}),
+		Importer: &schema.ResourceImporter{
+			State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+
+				_, err := parse.PostgresServerServerID(d.Id())
+				return []*schema.ResourceData{d}, err
+
+				d.Set("create_mode", "Default")
+				if v, ok := d.GetOk("create_mode"); ok && v.(string) != "" {
+					d.Set("create_mode", v)
+				}
+
+				return []*schema.ResourceData{d}, nil
+			},
+		},
 
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(60 * time.Minute),

diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go
@@ -26,7 +26,7 @@ func TestAccAzureRMPostgreSQLServer_basicNinePointFive(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }
@@ -44,14 +44,14 @@ func TestAccAzureRMPostgreSQLServer_basicNinePointFiveDeprecated(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 			{
 				Config: testAccAzureRMPostgreSQLServer_basic(data, "9.5"),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }
@@ -69,7 +69,7 @@ func TestAccAzureRMPostgreSQLServer_basicNinePointSix(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }
@@ -87,7 +87,7 @@ func TestAccAzureRMPostgreSQLServer_basicTenPointZero(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }
@@ -105,7 +105,7 @@ func TestAccAzureRMPostgreSQLServer_basicEleven(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }
@@ -123,14 +123,14 @@ func TestAccAzureRMPostgreSQLServer_autogrowOnly(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 			{
 				Config: testAccAzureRMPostgreSQLServer_basic(data, "11"),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }
@@ -171,7 +171,7 @@ func TestAccAzureRMPostgreSQLServer_complete(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }
@@ -189,21 +189,21 @@ func TestAccAzureRMPostgreSQLServer_updatedDeprecated(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 			{
 				Config: testAccAzureRMPostgreSQLServer_completeDeprecated(data, "9.6"),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 			{
 				Config: testAccAzureRMPostgreSQLServer_basicDeprecated(data, "9.6"),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }
@@ -221,21 +221,21 @@ func TestAccAzureRMPostgreSQLServer_updated(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 			{
 				Config: testAccAzureRMPostgreSQLServer_complete(data, "9.6"),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 			{
 				Config: testAccAzureRMPostgreSQLServer_basic(data, "9.6"),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }
@@ -253,14 +253,14 @@ func TestAccAzureRMPostgreSQLServer_completeDeprecatedUpdate(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 			{
 				Config: testAccAzureRMPostgreSQLServer_complete(data, "9.6"),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }
@@ -278,14 +278,14 @@ func TestAccAzureRMPostgreSQLServer_updateSKU(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 			{
 				Config: testAccAzureRMPostgreSQLServer_sku(data, "10.0", "MO_Gen5_16"),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }
@@ -303,15 +303,15 @@ func TestAccAzureRMPostgreSQLServer_createReplica(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 			{
 				Config: testAccAzureRMPostgreSQLServer_createReplica(data, "11"),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 					testCheckAzureRMPostgreSQLServerExists("azurerm_postgresql_server.replica"),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }
@@ -331,7 +331,7 @@ func TestAccAzureRMPostgreSQLServer_createPointInTimeRestore(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists(data.ResourceName),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 			{
 				PreConfig: func() { time.Sleep(restoreTime.Sub(time.Now().Add(-7 * time.Minute))) },
 				Config:    testAccAzureRMPostgreSQLServer_createPointInTimeRestore(data, "11", restoreTime.Format(time.RFC3339)),
@@ -340,7 +340,7 @@ func TestAccAzureRMPostgreSQLServer_createPointInTimeRestore(t *testing.T) {
 					testCheckAzureRMPostgreSQLServerExists("azurerm_postgresql_server.restore"),
 				),
 			},
-			data.ImportStep("administrator_login_password", "create_mode"),
+			data.ImportStep("administrator_login_password"),
 		},
 	})
 }