Skip to content

Commit

Permalink
azurerm_postgresql_flexible_server update postgres flexserver api v…
Browse files Browse the repository at this point in the history 
…ersion to 2021-06-01 (hashicorp#12405)

Changes:

Update flexserver api version to 2021-06-01
Complete flexserver tests use postgres version 13 now
Noteworthy Changes:

cmk_enabled (byokEnforcement) is not exposed in 2021-06-01 anymore
Postgres version 13 also available now
effected resources

azurerm_postgresql_flexible_server
azurerm_postgresql_flexible_server_firewall_rule
Datasource: azurerm_postgresql_flexible_server
This PR address:

Support PostgreSQL Flexible Server Version 13 hashicorp#12375
New Resource azurerm_postgresql_flexible_server_configuration hashicorp#12294
Support for postgresql flexible server database, configuration and firewall_rule hashicorp#11538
  • Loading branch information
Nick Metz authored and yupwei68 committed Jul 26, 2021
1 parent 98d3e52 commit 5554046
Show file tree
Hide file tree
Showing 30 changed files with 1,652 additions and 447 deletions.
2 changes: 1 addition & 1 deletion azurerm/internal/services/postgres/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package client

import (
"github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2020-01-01/postgresql"
"github.com/Azure/azure-sdk-for-go/services/preview/postgresql/mgmt/2020-02-14-preview/postgresqlflexibleservers"
"github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2021-06-01/postgresqlflexibleservers"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
)

Expand Down
29 changes: 18 additions & 11 deletions azurerm/internal/services/postgres/postgresql_flexible_server_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/postgresql/mgmt/2020-02-14-preview/postgresqlflexibleservers"
"github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2021-06-01/postgresqlflexibleservers"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/location"
Expand Down Expand Up @@ -64,8 +64,9 @@ func dataSourcePostgresqlFlexibleServer() *pluginsdk.Resource {
},

"cmk_enabled": {
Type: pluginsdk.TypeString,
Computed: true,
Type: pluginsdk.TypeString,
Computed: true,
Deprecated: "This attribute has been removed from the API and will be removed in version 3.0 of the provider.",
},

"fqdn": {
Expand Down Expand Up @@ -106,21 +107,27 @@ func dataSourceArmPostgresqlFlexibleServerRead(d *pluginsdk.ResourceData, meta i
d.Set("name", id.Name)
d.Set("resource_group_name", id.ResourceGroup)
d.Set("location", location.NormalizeNilable(resp.Location))

// `cmk_enabled` has been removed from API since 2021-06-01
// and should be removed in version 3.0 of the provider.
d.Set("cmk_enabled", "")

if props := resp.ServerProperties; props != nil {
d.Set("administrator_login", props.AdministratorLogin)
d.Set("storage_mb", props.StorageProfile.StorageMB)
d.Set("version", props.Version)
d.Set("cmk_enabled", props.ByokEnforcement)
d.Set("fqdn", props.FullyQualifiedDomainName)
d.Set("public_network_access_enabled", props.PublicNetworkAccess == postgresqlflexibleservers.ServerPublicNetworkAccessStateEnabled)

if props.DelegatedSubnetArguments != nil {
d.Set("delegated_subnet_id", props.DelegatedSubnetArguments.SubnetArmResourceID)
if storage := props.Storage; storage != nil && storage.StorageSizeGB != nil {
d.Set("storage_mb", (*props.Storage.StorageSizeGB * 1024))
}

if backup := props.Backup; backup != nil {
d.Set("backup_retention_days", props.Backup.BackupRetentionDays)
}

if storage := props.StorageProfile; storage != nil {
d.Set("storage_mb", storage.StorageMB)
d.Set("backup_retention_days", storage.BackupRetentionDays)
if network := props.Network; network != nil {
d.Set("delegated_subnet_id", network.DelegatedSubnetResourceID)
d.Set("public_network_access_enabled", network.PublicNetworkAccess == postgresqlflexibleservers.ServerPublicNetworkAccessStateEnabled)
}
}

Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/postgres/postgresql_flexible_server_data_source_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ func TestAccDataSourcePostgresqlflexibleServer_basic(t *testing.T) {
check.That(data.ResourceName).Key("storage_mb").Exists(),
check.That(data.ResourceName).Key("version").Exists(),
check.That(data.ResourceName).Key("backup_retention_days").Exists(),
check.That(data.ResourceName).Key("cmk_enabled").Exists(),
check.That(data.ResourceName).Key("fqdn").Exists(),
check.That(data.ResourceName).Key("public_network_access_enabled").Exists(),
check.That(data.ResourceName).Key("cmk_enabled").IsEmpty(),
),
},
})
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/postgres/postgresql_flexible_server_firewall_rule_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/postgresql/mgmt/2020-02-14-preview/postgresqlflexibleservers"
"github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2021-06-01/postgresqlflexibleservers"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/postgres/parse"
Expand Down
124 changes: 70 additions & 54 deletions azurerm/internal/services/postgres/postgresql_flexible_server_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/postgresql/mgmt/2020-02-14-preview/postgresqlflexibleservers"
"github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2021-06-01/postgresqlflexibleservers"
"github.com/Azure/go-autorest/autorest/date"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
Expand All @@ -22,6 +22,11 @@ import (
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)

const (
ServerMaintenanceWindowEnabled = "Enabled"
ServerMaintenanceWindowDisabled = "Disabled"
)

func resourcePostgresqlFlexibleServer() *pluginsdk.Resource {
return &pluginsdk.Resource{
Create: resourcePostgresqlFlexibleServerCreate,
Expand Down Expand Up @@ -88,8 +93,9 @@ func resourcePostgresqlFlexibleServer() *pluginsdk.Resource {
Computed: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{
string(postgresqlflexibleservers.OneOne),
string(postgresqlflexibleservers.OneTwo),
string(postgresqlflexibleservers.ServerVersionOneOne),
string(postgresqlflexibleservers.ServerVersionOneTwo),
string(postgresqlflexibleservers.ServerVersionOneThree),
}, false),
},

Expand All @@ -100,8 +106,8 @@ func resourcePostgresqlFlexibleServer() *pluginsdk.Resource {
Optional: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{
string(postgresqlflexibleservers.Default),
string(postgresqlflexibleservers.PointInTimeRestore),
string(postgresqlflexibleservers.CreateModeDefault),
string(postgresqlflexibleservers.CreateModePointInTimeRestore),
}, false),
},

Expand Down Expand Up @@ -164,8 +170,9 @@ func resourcePostgresqlFlexibleServer() *pluginsdk.Resource {
},

"cmk_enabled": {
Type: pluginsdk.TypeString,
Computed: true,
Type: pluginsdk.TypeString,
Computed: true,
Deprecated: "This attribute has been removed from the API and will be removed in version 3.0 of the provider.",
},

"fqdn": {
Expand Down Expand Up @@ -205,7 +212,7 @@ func resourcePostgresqlFlexibleServerCreate(d *pluginsdk.ResourceData, meta inte

createMode := d.Get("create_mode").(string)

if postgresqlflexibleservers.CreateMode(createMode) == postgresqlflexibleservers.PointInTimeRestore {
if postgresqlflexibleservers.CreateMode(createMode) == postgresqlflexibleservers.CreateModePointInTimeRestore {
if _, ok := d.GetOk("source_server_id"); !ok {
return fmt.Errorf("`source_server_id` is required when `create_mode` is `PointInTimeRestore`")
}
Expand All @@ -214,7 +221,7 @@ func resourcePostgresqlFlexibleServerCreate(d *pluginsdk.ResourceData, meta inte
}
}

if createMode == "" || postgresqlflexibleservers.CreateMode(createMode) == postgresqlflexibleservers.Default {
if createMode == "" || postgresqlflexibleservers.CreateMode(createMode) == postgresqlflexibleservers.CreateModeDefault {
if _, ok := d.GetOk("administrator_login"); !ok {
return fmt.Errorf("`administrator_login` is required when `create_mode` is `Default`")
}
Expand All @@ -240,10 +247,11 @@ func resourcePostgresqlFlexibleServerCreate(d *pluginsdk.ResourceData, meta inte
parameters := postgresqlflexibleservers.Server{
Location: utils.String(location.Normalize(d.Get("location").(string))),
ServerProperties: &postgresqlflexibleservers.ServerProperties{
CreateMode: postgresqlflexibleservers.CreateMode(d.Get("create_mode").(string)),
DelegatedSubnetArguments: expandArmServerServerPropertiesDelegatedSubnetArguments(d.Get("delegated_subnet_id").(string)),
Version: postgresqlflexibleservers.ServerVersion(d.Get("version").(string)),
StorageProfile: expandArmServerStorageProfile(d),
CreateMode: postgresqlflexibleservers.CreateMode(d.Get("create_mode").(string)),
Network: expandArmServerNetwork(d),
Version: postgresqlflexibleservers.ServerVersion(d.Get("version").(string)),
Storage: expandArmServerStorage(d),
Backup: expandArmServerBackup(d),
},
Sku: sku,
Tags: tags.Expand(d.Get("tags").(map[string]interface{})),
Expand All @@ -262,13 +270,7 @@ func resourcePostgresqlFlexibleServerCreate(d *pluginsdk.ResourceData, meta inte
}

if v, ok := d.GetOk("source_server_id"); ok && v.(string) != "" {
sourceServer, err := parse.FlexibleServerID(v.(string))
if err != nil {
return err
}
parameters.ServerProperties.SourceSubscriptionID = utils.String(sourceServer.SubscriptionId)
parameters.ServerProperties.SourceResourceGroupName = utils.String(sourceServer.ResourceGroup)
parameters.ServerProperties.SourceServerName = utils.String(sourceServer.Name)
parameters.SourceServerResourceID = utils.String(v.(string))
}

pointInTimeUTC := d.Get("point_in_time_restore_time_in_utc").(string)
Expand Down Expand Up @@ -334,28 +336,32 @@ func resourcePostgresqlFlexibleServerRead(d *pluginsdk.ResourceData, meta interf
d.Set("name", id.Name)
d.Set("resource_group_name", id.ResourceGroup)
d.Set("location", location.NormalizeNilable(resp.Location))

// `cmk_enabled` has been removed from API since 2021-06-01
// and should be removed in version 3.0 of the provider.
d.Set("cmk_enabled", "")

if props := resp.ServerProperties; props != nil {
d.Set("administrator_login", props.AdministratorLogin)
d.Set("zone", props.AvailabilityZone)
if props.SourceServerName != nil && props.SourceSubscriptionID != nil && props.SourceResourceGroupName != nil {
d.Set("source_server_id", parse.NewFlexibleServerID(*props.SourceSubscriptionID, *props.SourceResourceGroupName, *props.SourceServerName).ID())
}
d.Set("version", props.Version)
d.Set("cmk_enabled", props.ByokEnforcement)
d.Set("fqdn", props.FullyQualifiedDomainName)
d.Set("public_network_access_enabled", props.PublicNetworkAccess == postgresqlflexibleservers.ServerPublicNetworkAccessStateEnabled)

if props.DelegatedSubnetArguments != nil {
d.Set("delegated_subnet_id", props.DelegatedSubnetArguments.SubnetArmResourceID)
if network := props.Network; network != nil {
d.Set("public_network_access_enabled", network.PublicNetworkAccess == postgresqlflexibleservers.ServerPublicNetworkAccessStateEnabled)
d.Set("delegated_subnet_id", network.DelegatedSubnetResourceID)
}

if err := d.Set("maintenance_window", flattenArmServerMaintenanceWindow(props.MaintenanceWindow)); err != nil {
return fmt.Errorf("setting `maintenance_window`: %+v", err)
}

if storage := props.StorageProfile; storage != nil {
d.Set("storage_mb", storage.StorageMB)
d.Set("backup_retention_days", storage.BackupRetentionDays)
if storage := props.Storage; storage != nil && storage.StorageSizeGB != nil {
d.Set("storage_mb", (*storage.StorageSizeGB * 1024))
}

if backup := props.Backup; backup != nil {
d.Set("backup_retention_days", backup.BackupRetentionDays)
}
}

Expand Down Expand Up @@ -388,8 +394,12 @@ func resourcePostgresqlFlexibleServerUpdate(d *pluginsdk.ResourceData, meta inte
parameters.ServerPropertiesForUpdate.AdministratorLoginPassword = utils.String(d.Get("administrator_password").(string))
}

if d.HasChange("backup_retention_days") || d.HasChange("storage_mb") {
parameters.ServerPropertiesForUpdate.StorageProfile = expandArmServerStorageProfile(d)
if d.HasChange("storage_mb") {
parameters.ServerPropertiesForUpdate.Storage = expandArmServerStorage(d)
}

if d.HasChange("backup_retention_days") {
parameters.ServerPropertiesForUpdate.Backup = expandArmServerBackup(d)
}

if d.HasChange("maintenance_window") {
Expand Down Expand Up @@ -441,26 +451,26 @@ func resourcePostgresqlFlexibleServerDelete(d *pluginsdk.ResourceData, meta inte
return nil
}

func expandArmServerServerPropertiesDelegatedSubnetArguments(input string) *postgresqlflexibleservers.ServerPropertiesDelegatedSubnetArguments {
if len(input) == 0 {
return nil
}
func expandArmServerNetwork(d *pluginsdk.ResourceData) *postgresqlflexibleservers.Network {
network := postgresqlflexibleservers.Network{}

return &postgresqlflexibleservers.ServerPropertiesDelegatedSubnetArguments{
SubnetArmResourceID: utils.String(input),
if v, ok := d.GetOk("delegated_subnet_id"); ok {
network.DelegatedSubnetResourceID = utils.String(v.(string))
}

return &network
}

func expandArmServerMaintenanceWindow(input []interface{}) *postgresqlflexibleservers.MaintenanceWindow {
if len(input) == 0 {
return &postgresqlflexibleservers.MaintenanceWindow{
CustomWindow: utils.String(string(postgresqlflexibleservers.Disabled)),
CustomWindow: utils.String(ServerMaintenanceWindowDisabled),
}
}
v := input[0].(map[string]interface{})

maintenanceWindow := postgresqlflexibleservers.MaintenanceWindow{
CustomWindow: utils.String(string(postgresqlflexibleservers.Enabled)),
CustomWindow: utils.String(ServerMaintenanceWindowEnabled),
StartHour: utils.Int32(int32(v["start_hour"].(int))),
StartMinute: utils.Int32(int32(v["start_minute"].(int))),
DayOfWeek: utils.Int32(int32(v["day_of_week"].(int))),
Expand All @@ -469,20 +479,26 @@ func expandArmServerMaintenanceWindow(input []interface{}) *postgresqlflexiblese
return &maintenanceWindow
}

func expandArmServerStorageProfile(d *pluginsdk.ResourceData) *postgresqlflexibleservers.StorageProfile {
storage := postgresqlflexibleservers.StorageProfile{}

if v, ok := d.GetOk("backup_retention_days"); ok {
storage.BackupRetentionDays = utils.Int32(int32(v.(int)))
}
func expandArmServerStorage(d *pluginsdk.ResourceData) *postgresqlflexibleservers.Storage {
storage := postgresqlflexibleservers.Storage{}

if v, ok := d.GetOk("storage_mb"); ok {
storage.StorageMB = utils.Int32(int32(v.(int)))
storage.StorageSizeGB = utils.Int32(int32(v.(int) / 1024))
}

return &storage
}

func expandArmServerBackup(d *pluginsdk.ResourceData) *postgresqlflexibleservers.Backup {
backup := postgresqlflexibleservers.Backup{}

if v, ok := d.GetOk("backup_retention_days"); ok {
backup.BackupRetentionDays = utils.Int32(int32(v.(int)))
}

return &backup
}

func expandFlexibleServerSku(name string) (*postgresqlflexibleservers.Sku, error) {
if name == "" {
return nil, nil
Expand All @@ -492,11 +508,11 @@ func expandFlexibleServerSku(name string) (*postgresqlflexibleservers.Sku, error
var tier postgresqlflexibleservers.SkuTier
switch strings.TrimSuffix(parts[0], "_") {
case "B":
tier = postgresqlflexibleservers.Burstable
tier = postgresqlflexibleservers.SkuTierBurstable
case "GP":
tier = postgresqlflexibleservers.GeneralPurpose
tier = postgresqlflexibleservers.SkuTierGeneralPurpose
case "MO":
tier = postgresqlflexibleservers.MemoryOptimized
tier = postgresqlflexibleservers.SkuTierMemoryOptimized
default:
return nil, fmt.Errorf("sku_name %s has unknown sku tier %s", name, parts[0])
}
Expand All @@ -514,11 +530,11 @@ func flattenFlexibleServerSku(sku *postgresqlflexibleservers.Sku) (string, error

var tier string
switch sku.Tier {
case postgresqlflexibleservers.Burstable:
case postgresqlflexibleservers.SkuTierBurstable:
tier = "B"
case postgresqlflexibleservers.GeneralPurpose:
case postgresqlflexibleservers.SkuTierGeneralPurpose:
tier = "GP"
case postgresqlflexibleservers.MemoryOptimized:
case postgresqlflexibleservers.SkuTierMemoryOptimized:
tier = "MO"
default:
return "", fmt.Errorf("sku_name has unknown sku tier %s", sku.Tier)
Expand All @@ -528,7 +544,7 @@ func flattenFlexibleServerSku(sku *postgresqlflexibleservers.Sku) (string, error
}

func flattenArmServerMaintenanceWindow(input *postgresqlflexibleservers.MaintenanceWindow) []interface{} {
if input == nil || input.CustomWindow == nil || *input.CustomWindow == string(postgresqlflexibleservers.Disabled) {
if input == nil || input.CustomWindow == nil || *input.CustomWindow == string(ServerMaintenanceWindowDisabled) {
return make([]interface{}, 0)
}

Expand Down
Loading

0 comments on commit 5554046

Please sign in to comment.