[Bug Fix] Fixes PostgreSQL collation issues #396 and #760

azurerm/resource_arm_postgresql_database.go

@@ -41,9 +41,10 @@ func resourceArmPostgreSQLDatabase() *schema.Resource {
 			},
 
 			"collation": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validateCollation(),
 			},
 		},
 	}
@@ -119,8 +120,7 @@ func resourceArmPostgreSQLDatabaseRead(d *schema.ResourceData, meta interface{})
 	d.Set("resource_group_name", resGroup)
 	d.Set("server_name", serverName)
 	d.Set("charset", resp.Charset)
-	d.Set("collation", resp.Collation)
-
+	d.Set("collation", utils.AzureRMNormalizeCollation(d.Get("collation").(string), "-", "_", -1))
 	return nil
 }
 

azurerm/resource_arm_postgresql_server.go

@@ -372,6 +372,8 @@ func expandAzureRmPostgreSQLServerSku(d *schema.ResourceData) *postgresql.Sku {
 	skus := d.Get("sku").([]interface{})
 	sku := skus[0].(map[string]interface{})
 
+	fmt.Printf("[SKU]: %s", sku)
+
 	name := sku["name"].(string)
 	capacity := sku["capacity"].(int)
 	tier := sku["tier"].(string)

azurerm/utils/utils.go

@@ -1,5 +1,7 @@
 package utils
 
+import "strings"
+
 func Bool(input bool) *bool {
 	return &input
 }
@@ -15,3 +17,8 @@ func Int64(input int64) *int64 {
 func String(input string) *string {
 	return &input
 }
+
+func AzureRMNormalizeCollation(input string, find string, replace string, count int) *string {
+	collation := strings.Replace(input, find, replace, count)
+	return &collation
+}

azurerm/validators.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math"
 	"regexp"
+	"strings"
 	"time"
 
 	"github.com/Azure/go-autorest/autorest/date"
@@ -99,3 +100,20 @@ func validateIntBetweenDivisibleBy(min, max, divisor int) schema.SchemaValidateF
 		return
 	}
 }
+
+func validateCollation() schema.SchemaValidateFunc {
+	return func(i interface{}, k string) (s []string, es []error) {
+		v, ok := i.(string)
+		if !ok {
+			es = append(es, fmt.Errorf("expected type of %s to be string", k))
+			return
+		}
+
+		if strings.Contains(v, "-") {
+			es = append(es, fmt.Errorf("%s contains invalid characters, only underscores are supported, got %s", k, v))
+			return
+		}
+
+		return
+	}
+}

azurerm/validators_test.go

@@ -178,7 +178,38 @@ func TestValidateIntBetweenDivisibleBy(t *testing.T) {
 	for _, tc := range cases {
 		_, errors := validateIntBetweenDivisibleBy(tc.Min, tc.Max, tc.Div)(tc.Value, strconv.Itoa(tc.Value.(int)))
 		if len(errors) != tc.Errors {
-			t.Fatalf("Expected intBetweenDivisibleBy to trigger '%d' errors for '%s' - got '%d' ['%s']", tc.Errors, tc.Value, len(errors), errors[0])
+			t.Fatalf("Expected intBetweenDivisibleBy to trigger '%d' errors for '%s' - got '%d'", tc.Errors, tc.Value, len(errors))
+		}
+	}
+}
+
+func TestValidateCollation(t *testing.T) {
+	cases := []struct {
+		Value  string
+		Errors int
+	}{
+		{
+			Value:  "en-US",
+			Errors: 1,
+		},
+		{
+			Value:  "en_US",
+			Errors: 0,
+		},
+		{
+			Value:  "en US",
+			Errors: 0,
+		},
+		{
+			Value:  "English_United States.1252",
+			Errors: 0,
+		},
+	}
+
+	for _, tc := range cases {
+		_, errors := validateCollation()(tc.Value, "collation")
+		if len(errors) != tc.Errors {
+			t.Fatalf("Expected validateCollation to trigger '%d' errors for '%s' - got '%d'", tc.Errors, tc.Value, len(errors))
 		}
 	}
 }

website/docs/r/postgresql_server.html.markdown

@@ -73,7 +73,7 @@ The following arguments are supported:
 `sku` supports the following:
 
 * `name` - (Required) Specifies the SKU Name for this PostgreSQL Server. The name of the SKU, follows the `tier` + `family` + `cores` pattern (e.g. B_Gen4_1, GP_Gen5_8). For more information see the [product documentation](https://docs.microsoft.com/en-us/rest/api/postgresql/servers/create#sku).
-    
+
 * `capacity` - (Required) The scale up/out capacity, representing server's compute units.
 
 * `tier` - (Required) The tier of the particular SKU. Possible values are `Basic`, `GeneralPurpose`, and `MemoryOptimized`. For more information see the [product documentation](https://docs.microsoft.com/en-us/azure/postgresql/concepts-pricing-tiers).