Add support to create role/user

Author: karim-fc

internal/provider/config.go

@@ -20,7 +20,12 @@ func NewConfig(dsnTemplate string) *Config {
 }
 
 func (c *Config) connectToPostgresqlDb(dbName string) (*sql.DB, error) {
-	dsn := fmt.Sprintf(c.dsnTemplate, dbName)
+	dsn := fmt.Sprintf(c.dsnTemplate, "dbname="+dbName)
+	return c.connectToPostgresql(dsn)
+}
+
+func (c *Config) connectToPostgresqlNoDb() (*sql.DB, error) {
+	dsn := fmt.Sprintf(c.dsnTemplate, "")
 	return c.connectToPostgresql(dsn)
 }
 

internal/provider/custom_timestamp_type.go

@@ -0,0 +1,112 @@
+package provider
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/attr/xattr"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/path"
+	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
+)
+
+var (
+	_ basetypes.StringTypable = CustomTimestampType{}
+	_ xattr.TypeWithValidate  = CustomTimestampType{}
+)
+
+type CustomTimestampType struct {
+	basetypes.StringType
+}
+
+func (t CustomTimestampType) Equal(o attr.Type) bool {
+	other, ok := o.(CustomTimestampType)
+
+	if !ok {
+		return false
+	}
+	return t.StringType.Equal(other.StringType)
+}
+
+func (t CustomTimestampType) String() string {
+	return "CustomTimestampType"
+}
+
+func (t CustomTimestampType) ValueFromString(ctx context.Context, in basetypes.StringValue) (basetypes.StringValuable, diag.Diagnostics) {
+	value := CustomTimestampValue{
+		StringValue: in,
+	}
+
+	return value, nil
+}
+
+func (t CustomTimestampType) ValueFromTerraform(ctx context.Context, in tftypes.Value) (attr.Value, error) {
+	attrValue, err := t.StringType.ValueFromTerraform(ctx, in)
+
+	if err != nil {
+		return nil, err
+	}
+
+	stringValue, ok := attrValue.(basetypes.StringValue)
+
+	if !ok {
+		return nil, fmt.Errorf("unexpected value type of %T", attrValue)
+	}
+
+	stringValuable, diags := t.ValueFromString(ctx, stringValue)
+
+	if diags.HasError() {
+		return nil, fmt.Errorf("unexpected error converting StringValue to StringValuable: %v", diags)
+	}
+
+	return stringValuable, nil
+}
+
+func (t CustomTimestampType) ValueType(ctx context.Context) attr.Value {
+	return CustomTimestampValue{}
+}
+
+func (t CustomTimestampType) Validate(ctx context.Context, value tftypes.Value, valuePath path.Path) diag.Diagnostics {
+	if value.IsNull() || !value.IsKnown() {
+		return nil
+	}
+
+	var diags diag.Diagnostics
+	var valueString string
+
+	if err := value.As(&valueString); err != nil {
+		diags.AddAttributeError(
+			valuePath,
+			"Invalid Terraform Value",
+			"An unexpected error occurred while attempting to convert a Terraform value to a string. "+
+				"This generally is an issue with the provider schema implementation. "+
+				"Please contact the provider developers.\n\n"+
+				"Path: "+valuePath.String()+"\n"+
+				"Error: "+err.Error(),
+		)
+		return diags
+	}
+
+	if valueString == "infinity" {
+		return diags
+	}
+
+	if _, err := time.Parse(time.DateTime, valueString); err != nil {
+		diags.AddAttributeError(
+			valuePath,
+			"Invalid DateTime String Value",
+			"An unexpected error occurred while converting a string value that was expected to be a DateTime format. "+
+				"The string format is 'YYYY-MM-DD HH:MM:SS', such as '2006-01-02 15:04:05' or '2006-01-02 15:04:05'.\n\n"+
+				"Path: "+valuePath.String()+"\n"+
+				"Given Value: "+valueString+"\n"+
+				"Error: "+err.Error(),
+		)
+
+		return diags
+	}
+
+	return diags
+}

internal/provider/custom_timestamp_value.go

@@ -0,0 +1,81 @@
+package provider
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
+)
+
+var (
+	_ basetypes.StringValuable                   = CustomTimestampValue{}
+	_ basetypes.StringValuableWithSemanticEquals = CustomTimestampValue{}
+)
+
+type CustomTimestampValue struct {
+	basetypes.StringValue
+}
+
+func (v CustomTimestampValue) Equal(o attr.Value) bool {
+	other, ok := o.(CustomTimestampValue)
+	if !ok {
+		return false
+	}
+	return v.StringValue.Equal(other.StringValue)
+}
+
+func (v CustomTimestampValue) Type(ctx context.Context) attr.Type {
+	return CustomTimestampType{}
+}
+
+func (v CustomTimestampValue) StringSemanticEquals(ctx context.Context, newValuable basetypes.StringValuable) (bool, diag.Diagnostics) {
+	var diags diag.Diagnostics
+	newValue, ok := newValuable.(CustomTimestampValue)
+
+	if !ok {
+		diags.AddError(
+			"Semantic Equality Check Error",
+			"An unexpected value type was received while performing semantic equality checks. "+
+				"Please report this to the provider developers.\n\n"+
+				"Expected Value Type: "+fmt.Sprintf("%T", v)+"\n"+
+				"Got Value Type: "+fmt.Sprintf("%T", newValuable),
+		)
+
+		return false, diags
+	}
+
+	if v.StringValue.ValueString() == "infinity" && newValue.ValueString() == "infinity" {
+		return true, diags
+	}
+
+	priorTime, _ := time.Parse(time.DateTime, v.StringValue.ValueString())
+	newTime, _ := time.Parse(time.DateTime, newValue.ValueString())
+
+	return priorTime.Equal(newTime), diags
+}
+
+func (v CustomTimestampValue) ValueTimestamp() string {
+	return v.StringValue.ValueString()
+}
+
+func NewCustomTimestampValue(value string) CustomTimestampValue {
+	return CustomTimestampValue{
+		StringValue: types.StringValue(value),
+	}
+}
+
+func NewCustomTimestampNull() CustomTimestampValue {
+	return CustomTimestampValue{
+		StringValue: types.StringNull(),
+	}
+}
+
+func NewCustomTimestampUnknown() CustomTimestampValue {
+	return CustomTimestampValue{
+		StringValue: types.StringUnknown(),
+	}
+}

internal/provider/provider.go

@@ -216,7 +216,7 @@ func (p *CloudSqlPostgresqlProvider) Configure(ctx context.Context, req provider
 		)
 	}
 
-	dsnTemplate := fmt.Sprintf("host=%s dbname=%%s user=%s password=%s sslmode=%s", connectionName, username, password, sslMode)
+	dsnTemplate := fmt.Sprintf("host=%s %%s user=%s password=%s sslmode=%s", connectionName, username, password, sslMode)
 
 	dbConfig := NewConfig(dsnTemplate)
 
@@ -229,6 +229,7 @@ func (p *CloudSqlPostgresqlProvider) Resources(ctx context.Context) []func() res
 		newDatabaseGrantResource,
 		newSchemaGrantResource,
 		newTableGrantResource,
+		newRoleResource,
 	}
 }
 

internal/provider/resource_grant_schema.go

@@ -50,7 +50,7 @@ func (r *schemaGrantResource) Metadata(_ context.Context, req resource.MetadataR
 func (r *schemaGrantResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
 	resp.Schema = schema.Schema{
 		Description:         "The `cloudsqlpostgresql_grant_schema` resource creates and manages privileges given to a user or role on a schema",
-		MarkdownDescription: "The cloudsqlpostgresql_grant_schema resource creates and manages privileges given to a user or role on a schema",
+		MarkdownDescription: "The `cloudsqlpostgresql_grant_schema` resource creates and manages privileges given to a user or role on a schema",
 		Attributes: map[string]schema.Attribute{
 			"role": schema.StringAttribute{
 				Description:         "The name of the role to grant privileges on the schema. Can be username or role.",

internal/provider/resource_grant_table.go

@@ -204,7 +204,6 @@ func (r *tableGrantResource) Create(ctx context.Context, req resource.CreateRequ
 }
 
 func (r *tableGrantResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
-
 	var state tableGrantResourceModel
 
 	diags := req.State.Get(ctx, &state)