azurerm_postgresql_server: allow to set public_network_access_enabled when the PITR is enabled

internal/services/postgres/postgresql_server_resource.go

@@ -439,11 +439,6 @@ func resourcePostgreSQLServerCreate(d *pluginsdk.ResourceData, meta interface{})
 			return fmt.Errorf("restore_point_in_time must be set when create_mode is PointInTimeRestore")
 		}
 
-		// d.GetOk cannot identify whether user sets the property that is bool type and has default value. So it has to identify it using `d.GetRawConfig()`
-		if v := d.GetRawConfig().AsValueMap()["public_network_access_enabled"]; !v.IsNull() {
-			return fmt.Errorf("`public_network_access_enabled` doesn't support PointInTimeRestore mode")
-		}
-
 		props = &servers.ServerPropertiesForRestore{
 			SourceServerId:           source,
 			RestorePointInTime:       v.(string),
@@ -531,6 +526,19 @@ func resourcePostgreSQLServerCreate(d *pluginsdk.ResourceData, meta interface{})
 		}
 	}
 
+	if mode == servers.CreateModePointInTimeRestore {
+		log.Printf("[INFO] updating `public_network_access_enabled` for %s", id)
+		properties := servers.ServerUpdateParameters{
+			Properties: &servers.ServerUpdateParametersProperties{
+				PublicNetworkAccess: &publicAccess,
+			},
+		}
+
+		if err = client.UpdateThenPoll(ctx, id, properties); err != nil {
+			return fmt.Errorf("updating Public Network Access for PointInTimeRestore %q: %+v", id, err)
+		}
+	}
+
 	return resourcePostgreSQLServerRead(d, meta)
 }
 
@@ -636,18 +644,11 @@ func resourcePostgreSQLServerUpdate(d *pluginsdk.ResourceData, meta interface{})
 		Tags: tags.Expand(d.Get("tags").(map[string]interface{})),
 	}
 
-	if mode == servers.CreateModePointInTimeRestore {
-		// d.GetOk cannot identify whether user sets the property that is bool type and has default value. So it has to identify it using `d.GetRawConfig()`
-		if v := d.GetRawConfig().AsValueMap()["public_network_access_enabled"]; !v.IsNull() {
-			return fmt.Errorf("`public_network_access_enabled` doesn't support PointInTimeRestore mode")
-		}
-	} else {
-		publicAccess := servers.PublicNetworkAccessEnumEnabled
-		if v := d.Get("public_network_access_enabled"); !v.(bool) {
-			publicAccess = servers.PublicNetworkAccessEnumDisabled
-		}
-		properties.Properties.PublicNetworkAccess = &publicAccess
+	publicAccess := servers.PublicNetworkAccessEnumEnabled
+	if v := d.Get("public_network_access_enabled"); !v.(bool) {
+		publicAccess = servers.PublicNetworkAccessEnumDisabled
 	}
+	properties.Properties.PublicNetworkAccess = &publicAccess
 
 	oldCreateMode, newCreateMode := d.GetChange("create_mode")
 	replicaUpdatedToDefault := servers.CreateMode(oldCreateMode.(string)) == servers.CreateModeReplica && servers.CreateMode(newCreateMode.(string)) == servers.CreateModeDefault

internal/services/postgres/postgresql_server_resource_test.go

@@ -798,7 +798,8 @@ resource "azurerm_postgresql_server" "restore" {
   creation_source_server_id = azurerm_postgresql_server.test.id
   restore_point_in_time     = "%[3]s"
 
-  ssl_enforcement_enabled = true
+  ssl_enforcement_enabled       = true
+  public_network_access_enabled = false
 }
 `, r.gp(data, version), data.RandomInteger, restoreTime, version)
 }

website/docs/r/postgresql_server.html.markdown

@@ -78,8 +78,6 @@ The following arguments are supported:
 
 * `public_network_access_enabled` - (Optional) Whether or not public network access is allowed for this server. Defaults to `true`.
 
--> **NOTE:** `public_network_access_enabled` doesn't support PointInTimeRestore mode.
-
 * `restore_point_in_time` - (Optional) When `create_mode` is `PointInTimeRestore` the point in time to restore from `creation_source_server_id`. It should be provided in [RFC3339](https://www.rfc-editor.org/rfc/rfc3339) format, e.g. `2013-11-08T22:00:40Z`.
 
 * `ssl_enforcement_enabled` - (Required) Specifies if SSL should be enforced on connections. Possible values are `true` and `false`.