From 260179543a07ecc53f89dc96d8c535f4ead34058 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Mon, 5 Sep 2016 14:46:40 -0700 Subject: [PATCH 1/4] provider/postgres: Clean up definitions and errors This commit brings the Postgres provider up to "new" standards for error wrapping and nested structure definitions. --- builtin/providers/postgresql/provider.go | 15 ++++++------ .../resource_postgresql_database.go | 21 +++++++++-------- .../resource_postgresql_database_test.go | 11 +++++---- .../postgresql/resource_postgresql_role.go | 23 ++++++++++--------- .../resource_postgresql_role_test.go | 2 +- 5 files changed, 37 insertions(+), 35 deletions(-) diff --git a/builtin/providers/postgresql/provider.go b/builtin/providers/postgresql/provider.go index 308c11f616..1bc74b851b 100644 --- a/builtin/providers/postgresql/provider.go +++ b/builtin/providers/postgresql/provider.go @@ -1,8 +1,7 @@ package postgresql import ( - "fmt" - + "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" ) @@ -11,31 +10,31 @@ import ( func Provider() terraform.ResourceProvider { return &schema.Provider{ Schema: map[string]*schema.Schema{ - "host": &schema.Schema{ + "host": { Type: schema.TypeString, Required: true, DefaultFunc: schema.EnvDefaultFunc("POSTGRESQL_HOST", nil), Description: "The postgresql server address", }, - "port": &schema.Schema{ + "port": { Type: schema.TypeInt, Optional: true, Default: 5432, Description: "The postgresql server port", }, - "username": &schema.Schema{ + "username": { Type: schema.TypeString, Required: true, DefaultFunc: schema.EnvDefaultFunc("POSTGRESQL_USERNAME", nil), Description: "Username for postgresql server connection", }, - "password": &schema.Schema{ + "password": { Type: schema.TypeString, Required: true, DefaultFunc: schema.EnvDefaultFunc("POSTGRESQL_PASSWORD", nil), Description: "Password for postgresql server connection", }, - "ssl_mode": &schema.Schema{ + "ssl_mode": { Type: schema.TypeString, Optional: true, Default: "prefer", @@ -63,7 +62,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { client, err := config.NewClient() if err != nil { - return nil, fmt.Errorf("Error initializing Postgresql client: %s", err) + return nil, errwrap.Wrapf("Error initializing Postgresql client: %s", err) } return client, nil diff --git a/builtin/providers/postgresql/resource_postgresql_database.go b/builtin/providers/postgresql/resource_postgresql_database.go index bf01ae42ea..d244619cae 100644 --- a/builtin/providers/postgresql/resource_postgresql_database.go +++ b/builtin/providers/postgresql/resource_postgresql_database.go @@ -5,6 +5,7 @@ import ( "fmt" "strings" + "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" "github.com/lib/pq" ) @@ -17,12 +18,12 @@ func resourcePostgresqlDatabase() *schema.Resource { Delete: resourcePostgresqlDatabaseDelete, Schema: map[string]*schema.Schema{ - "name": &schema.Schema{ + "name": { Type: schema.TypeString, Required: true, ForceNew: true, }, - "owner": &schema.Schema{ + "owner": { Type: schema.TypeString, Optional: true, ForceNew: false, @@ -36,7 +37,7 @@ func resourcePostgresqlDatabaseCreate(d *schema.ResourceData, meta interface{}) client := meta.(*Client) conn, err := client.Connect() if err != nil { - return err + return errwrap.Wrapf("Error connecting to PostgreSQL: {{err}}", err) } defer conn.Close() @@ -60,19 +61,19 @@ func resourcePostgresqlDatabaseCreate(d *schema.ResourceData, meta interface{}) query := fmt.Sprintf("CREATE DATABASE %s %s", pq.QuoteIdentifier(dbName), dbOwnerCfg) _, err = conn.Query(query) if err != nil { - return fmt.Errorf("Error creating postgresql database %s: %s", dbName, err) + return errwrap.Wrapf(fmt.Sprintf("Error creating postgresql database %s: {{err}}", dbName), err) } d.SetId(dbName) - return nil + return resourcePostgresqlDatabaseRead(d, meta) } func resourcePostgresqlDatabaseDelete(d *schema.ResourceData, meta interface{}) error { client := meta.(*Client) conn, err := client.Connect() if err != nil { - return err + return errwrap.Wrapf("Error connecting to PostgreSQL: {{err}}", err) } defer conn.Close() @@ -88,7 +89,7 @@ func resourcePostgresqlDatabaseDelete(d *schema.ResourceData, meta interface{}) query := fmt.Sprintf("DROP DATABASE %s", pq.QuoteIdentifier(dbName)) _, err = conn.Query(query) if err != nil { - return err + return errwrap.Wrapf("Error dropping database: {{err}}", err) } d.SetId("") @@ -113,7 +114,7 @@ func resourcePostgresqlDatabaseRead(d *schema.ResourceData, meta interface{}) er d.SetId("") return nil case err != nil: - return fmt.Errorf("Error reading info about database: %s", err) + return errwrap.Wrapf("Error reading info about database: {{err}}", err) default: d.Set("owner", owner) return nil @@ -136,7 +137,7 @@ func resourcePostgresqlDatabaseUpdate(d *schema.ResourceData, meta interface{}) query := fmt.Sprintf("ALTER DATABASE %s OWNER TO %s", pq.QuoteIdentifier(dbName), pq.QuoteIdentifier(owner)) _, err := conn.Query(query) if err != nil { - return fmt.Errorf("Error updating owner for database: %s", err) + return errwrap.Wrapf("Error updating owner for database: {{err}}", err) } } } @@ -153,7 +154,7 @@ func grantRoleMembership(conn *sql.DB, dbOwner string, connUsername string) erro if strings.Contains(err.Error(), "duplicate key value violates unique constraint") { return nil } - return fmt.Errorf("Error granting membership: %s", err) + return errwrap.Wrapf("Error granting membership: {{err}}", err) } } return nil diff --git a/builtin/providers/postgresql/resource_postgresql_database_test.go b/builtin/providers/postgresql/resource_postgresql_database_test.go index 35d2b271c9..97cc15e6a1 100644 --- a/builtin/providers/postgresql/resource_postgresql_database_test.go +++ b/builtin/providers/postgresql/resource_postgresql_database_test.go @@ -5,6 +5,7 @@ import ( "fmt" "testing" + "errors" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) @@ -16,7 +17,7 @@ func TestAccPostgresqlDatabase_Basic(t *testing.T) { Providers: testAccProviders, CheckDestroy: testAccCheckPostgresqlDatabaseDestroy, Steps: []resource.TestStep{ - resource.TestStep{ + { Config: testAccPostgresqlDatabaseConfig, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlDatabaseExists("postgresql_database.mydb", "myrole"), @@ -37,7 +38,7 @@ func TestAccPostgresqlDatabase_DefaultOwner(t *testing.T) { Providers: testAccProviders, CheckDestroy: testAccCheckPostgresqlDatabaseDestroy, Steps: []resource.TestStep{ - resource.TestStep{ + { Config: testAccPostgresqlDatabaseConfig, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlDatabaseExists("postgresql_database.mydb_default_owner", ""), @@ -64,7 +65,7 @@ func testAccCheckPostgresqlDatabaseDestroy(s *terraform.State) error { } if exists { - return fmt.Errorf("Db still exists after destroy") + return errors.New("Db still exists after destroy") } } @@ -79,7 +80,7 @@ func testAccCheckPostgresqlDatabaseExists(n string, owner string) resource.TestC } if rs.Primary.ID == "" { - return fmt.Errorf("No ID is set") + return errors.New("No ID is set") } actualOwner := rs.Primary.Attributes["owner"] @@ -95,7 +96,7 @@ func testAccCheckPostgresqlDatabaseExists(n string, owner string) resource.TestC } if !exists { - return fmt.Errorf("Db not found") + return errors.New("Db not found") } return nil diff --git a/builtin/providers/postgresql/resource_postgresql_role.go b/builtin/providers/postgresql/resource_postgresql_role.go index 104b5c9d01..7798e820e9 100644 --- a/builtin/providers/postgresql/resource_postgresql_role.go +++ b/builtin/providers/postgresql/resource_postgresql_role.go @@ -4,6 +4,7 @@ import ( "database/sql" "fmt" + "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" "github.com/lib/pq" ) @@ -16,23 +17,23 @@ func resourcePostgresqlRole() *schema.Resource { Delete: resourcePostgresqlRoleDelete, Schema: map[string]*schema.Schema{ - "name": &schema.Schema{ + "name": { Type: schema.TypeString, Required: true, ForceNew: true, }, - "login": &schema.Schema{ + "login": { Type: schema.TypeBool, Optional: true, ForceNew: false, Default: false, }, - "password": &schema.Schema{ + "password": { Type: schema.TypeString, Optional: true, ForceNew: false, }, - "encrypted": &schema.Schema{ + "encrypted": { Type: schema.TypeBool, Optional: true, ForceNew: false, @@ -59,12 +60,12 @@ func resourcePostgresqlRoleCreate(d *schema.ResourceData, meta interface{}) erro query := fmt.Sprintf("CREATE ROLE %s %s %s PASSWORD '%s'", pq.QuoteIdentifier(roleName), loginAttr, encryptedCfg, password) _, err = conn.Query(query) if err != nil { - return fmt.Errorf("Error creating role: %s", err) + return errwrap.Wrapf("Error creating role: {{err}}", err) } d.SetId(roleName) - return nil + return resourcePostgresqlRoleRead(d, meta) } func resourcePostgresqlRoleDelete(d *schema.ResourceData, meta interface{}) error { @@ -80,7 +81,7 @@ func resourcePostgresqlRoleDelete(d *schema.ResourceData, meta interface{}) erro query := fmt.Sprintf("DROP ROLE %s", pq.QuoteIdentifier(roleName)) _, err = conn.Query(query) if err != nil { - return err + return errwrap.Wrapf("Error deleting role: {{err}}", err) } d.SetId("") @@ -105,7 +106,7 @@ func resourcePostgresqlRoleRead(d *schema.ResourceData, meta interface{}) error d.SetId("") return nil case err != nil: - return fmt.Errorf("Error reading info about role: %s", err) + return errwrap.Wrapf("Error reading role: {{err}}", err) default: d.Set("login", canLogin) return nil @@ -129,7 +130,7 @@ func resourcePostgresqlRoleUpdate(d *schema.ResourceData, meta interface{}) erro query := fmt.Sprintf("ALTER ROLE %s %s", pq.QuoteIdentifier(roleName), pq.QuoteIdentifier(loginAttr)) _, err := conn.Query(query) if err != nil { - return fmt.Errorf("Error updating login attribute for role: %s", err) + return errwrap.Wrapf("Error updating login attribute for role: {{err}}", err) } d.SetPartial("login") @@ -142,7 +143,7 @@ func resourcePostgresqlRoleUpdate(d *schema.ResourceData, meta interface{}) erro query := fmt.Sprintf("ALTER ROLE %s %s PASSWORD '%s'", pq.QuoteIdentifier(roleName), encryptedCfg, password) _, err := conn.Query(query) if err != nil { - return fmt.Errorf("Error updating password attribute for role: %s", err) + return errwrap.Wrapf("Error updating password attribute for role: {{err}}", err) } d.SetPartial("password") @@ -154,7 +155,7 @@ func resourcePostgresqlRoleUpdate(d *schema.ResourceData, meta interface{}) erro query := fmt.Sprintf("ALTER ROLE %s %s PASSWORD '%s'", pq.QuoteIdentifier(roleName), encryptedCfg, password) _, err := conn.Query(query) if err != nil { - return fmt.Errorf("Error updating encrypted attribute for role: %s", err) + return errwrap.Wrapf("Error updating encrypted attribute for role: {{err}}", err) } d.SetPartial("encrypted") diff --git a/builtin/providers/postgresql/resource_postgresql_role_test.go b/builtin/providers/postgresql/resource_postgresql_role_test.go index 0839b2ef6c..2188a1ef75 100644 --- a/builtin/providers/postgresql/resource_postgresql_role_test.go +++ b/builtin/providers/postgresql/resource_postgresql_role_test.go @@ -16,7 +16,7 @@ func TestAccPostgresqlRole_Basic(t *testing.T) { Providers: testAccProviders, CheckDestroy: testAccCheckPostgresqlRoleDestroy, Steps: []resource.TestStep{ - resource.TestStep{ + { Config: testAccPostgresqlRoleConfig, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlRoleExists("postgresql_role.myrole2", "true"), From 006ab910b8bcb7a6cef1b569260ae22da2350f5b Mon Sep 17 00:00:00 2001 From: James Nugent Date: Mon, 5 Sep 2016 15:04:08 -0700 Subject: [PATCH 2/4] provider/postgres: Use standard environment vars Previously the provider accepted non-standard environment variables. We now accept the standard PGHOST/PGUSER/PGPASSWORD variables that psql uses in addition the older ones. --- builtin/providers/postgresql/provider.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/providers/postgresql/provider.go b/builtin/providers/postgresql/provider.go index 1bc74b851b..6fbd9f84a9 100644 --- a/builtin/providers/postgresql/provider.go +++ b/builtin/providers/postgresql/provider.go @@ -13,38 +13,38 @@ func Provider() terraform.ResourceProvider { "host": { Type: schema.TypeString, Required: true, - DefaultFunc: schema.EnvDefaultFunc("POSTGRESQL_HOST", nil), - Description: "The postgresql server address", + DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGUSER", "POSTGRESQL_HOST"}, nil), + Description: "The PostgreSQL server address", }, "port": { Type: schema.TypeInt, Optional: true, Default: 5432, - Description: "The postgresql server port", + Description: "The PostgreSQL server port", }, "username": { Type: schema.TypeString, Required: true, - DefaultFunc: schema.EnvDefaultFunc("POSTGRESQL_USERNAME", nil), - Description: "Username for postgresql server connection", + DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGHOST", "POSTGRESQL_HOST"}, nil), + Description: "Username for PostgreSQL server connection", }, "password": { Type: schema.TypeString, Required: true, - DefaultFunc: schema.EnvDefaultFunc("POSTGRESQL_PASSWORD", nil), - Description: "Password for postgresql server connection", + DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGPASSWORD", "POSTGRESQL_PASSWORD"}, nil), + Description: "Password for PostgreSQL server connection", }, "ssl_mode": { Type: schema.TypeString, Optional: true, Default: "prefer", - Description: "Connection mode for postgresql server", + Description: "Connection mode for PostgreSQL server", }, }, ResourcesMap: map[string]*schema.Resource{ - "postgresql_database": resourcePostgresqlDatabase(), - "postgresql_role": resourcePostgresqlRole(), + "postgresql_database": resourcePostgreSQLDatabase(), + "postgresql_role": resourcePostgreSQLRole(), }, ConfigureFunc: providerConfigure, @@ -62,7 +62,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { client, err := config.NewClient() if err != nil { - return nil, errwrap.Wrapf("Error initializing Postgresql client: %s", err) + return nil, errwrap.Wrapf("Error initializing PostgreSQL client: %s", err) } return client, nil From 34a17d3b46d2117b1f719b2ead30ff6219b6c72f Mon Sep 17 00:00:00 2001 From: James Nugent Date: Mon, 5 Sep 2016 15:04:48 -0700 Subject: [PATCH 3/4] provider/postgres: Correct casing -> PostgreSQL --- builtin/providers/postgresql/config.go | 7 +++-- .../resource_postgresql_database.go | 28 +++++++++---------- .../postgresql/resource_postgresql_role.go | 24 ++++++++-------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/builtin/providers/postgresql/config.go b/builtin/providers/postgresql/config.go index 3d80ea6a15..7b53f58fb8 100644 --- a/builtin/providers/postgresql/config.go +++ b/builtin/providers/postgresql/config.go @@ -22,7 +22,7 @@ type Client struct { connStr string } -//NewClient returns new client config +// NewClient returns new client config func (c *Config) NewClient() (*Client, error) { connStr := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=postgres sslmode=%s", c.Host, c.Port, c.Username, c.Password, c.SslMode) @@ -34,11 +34,12 @@ func (c *Config) NewClient() (*Client, error) { return &client, nil } -//Connect will manually connect/diconnect to prevent a large number or db connections being made +// Connect will manually connect/disconnect to prevent a large +// number or db connections being made func (c *Client) Connect() (*sql.DB, error) { db, err := sql.Open("postgres", c.connStr) if err != nil { - return nil, fmt.Errorf("Error connecting to postgresql server: %s", err) + return nil, fmt.Errorf("Error connecting to PostgreSQL server: %s", err) } return db, nil diff --git a/builtin/providers/postgresql/resource_postgresql_database.go b/builtin/providers/postgresql/resource_postgresql_database.go index d244619cae..c48d314626 100644 --- a/builtin/providers/postgresql/resource_postgresql_database.go +++ b/builtin/providers/postgresql/resource_postgresql_database.go @@ -10,12 +10,12 @@ import ( "github.com/lib/pq" ) -func resourcePostgresqlDatabase() *schema.Resource { +func resourcePostgreSQLDatabase() *schema.Resource { return &schema.Resource{ - Create: resourcePostgresqlDatabaseCreate, - Read: resourcePostgresqlDatabaseRead, - Update: resourcePostgresqlDatabaseUpdate, - Delete: resourcePostgresqlDatabaseDelete, + Create: resourcePostgreSQLDatabaseCreate, + Read: resourcePostgreSQLDatabaseRead, + Update: resourcePostgreSQLDatabaseUpdate, + Delete: resourcePostgreSQLDatabaseDelete, Schema: map[string]*schema.Schema{ "name": { @@ -33,7 +33,7 @@ func resourcePostgresqlDatabase() *schema.Resource { } } -func resourcePostgresqlDatabaseCreate(d *schema.ResourceData, meta interface{}) error { +func resourcePostgreSQLDatabaseCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*Client) conn, err := client.Connect() if err != nil { @@ -61,15 +61,15 @@ func resourcePostgresqlDatabaseCreate(d *schema.ResourceData, meta interface{}) query := fmt.Sprintf("CREATE DATABASE %s %s", pq.QuoteIdentifier(dbName), dbOwnerCfg) _, err = conn.Query(query) if err != nil { - return errwrap.Wrapf(fmt.Sprintf("Error creating postgresql database %s: {{err}}", dbName), err) + return errwrap.Wrapf(fmt.Sprintf("Error creating database %s: {{err}}", dbName), err) } d.SetId(dbName) - return resourcePostgresqlDatabaseRead(d, meta) + return resourcePostgreSQLDatabaseRead(d, meta) } -func resourcePostgresqlDatabaseDelete(d *schema.ResourceData, meta interface{}) error { +func resourcePostgreSQLDatabaseDelete(d *schema.ResourceData, meta interface{}) error { client := meta.(*Client) conn, err := client.Connect() if err != nil { @@ -97,7 +97,7 @@ func resourcePostgresqlDatabaseDelete(d *schema.ResourceData, meta interface{}) return nil } -func resourcePostgresqlDatabaseRead(d *schema.ResourceData, meta interface{}) error { +func resourcePostgreSQLDatabaseRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*Client) conn, err := client.Connect() if err != nil { @@ -114,14 +114,14 @@ func resourcePostgresqlDatabaseRead(d *schema.ResourceData, meta interface{}) er d.SetId("") return nil case err != nil: - return errwrap.Wrapf("Error reading info about database: {{err}}", err) + return errwrap.Wrapf("Error reading database: {{err}}", err) default: d.Set("owner", owner) return nil } } -func resourcePostgresqlDatabaseUpdate(d *schema.ResourceData, meta interface{}) error { +func resourcePostgreSQLDatabaseUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*Client) conn, err := client.Connect() if err != nil { @@ -137,12 +137,12 @@ func resourcePostgresqlDatabaseUpdate(d *schema.ResourceData, meta interface{}) query := fmt.Sprintf("ALTER DATABASE %s OWNER TO %s", pq.QuoteIdentifier(dbName), pq.QuoteIdentifier(owner)) _, err := conn.Query(query) if err != nil { - return errwrap.Wrapf("Error updating owner for database: {{err}}", err) + return errwrap.Wrapf("Error updating owner: {{err}}", err) } } } - return resourcePostgresqlDatabaseRead(d, meta) + return resourcePostgreSQLDatabaseRead(d, meta) } func grantRoleMembership(conn *sql.DB, dbOwner string, connUsername string) error { diff --git a/builtin/providers/postgresql/resource_postgresql_role.go b/builtin/providers/postgresql/resource_postgresql_role.go index 7798e820e9..89137fab80 100644 --- a/builtin/providers/postgresql/resource_postgresql_role.go +++ b/builtin/providers/postgresql/resource_postgresql_role.go @@ -9,12 +9,12 @@ import ( "github.com/lib/pq" ) -func resourcePostgresqlRole() *schema.Resource { +func resourcePostgreSQLRole() *schema.Resource { return &schema.Resource{ - Create: resourcePostgresqlRoleCreate, - Read: resourcePostgresqlRoleRead, - Update: resourcePostgresqlRoleUpdate, - Delete: resourcePostgresqlRoleDelete, + Create: resourcePostgreSQLRoleCreate, + Read: resourcePostgreSQLRoleRead, + Update: resourcePostgreSQLRoleUpdate, + Delete: resourcePostgreSQLRoleDelete, Schema: map[string]*schema.Schema{ "name": { @@ -43,7 +43,7 @@ func resourcePostgresqlRole() *schema.Resource { } } -func resourcePostgresqlRoleCreate(d *schema.ResourceData, meta interface{}) error { +func resourcePostgreSQLRoleCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*Client) conn, err := client.Connect() if err != nil { @@ -65,10 +65,10 @@ func resourcePostgresqlRoleCreate(d *schema.ResourceData, meta interface{}) erro d.SetId(roleName) - return resourcePostgresqlRoleRead(d, meta) + return resourcePostgreSQLRoleRead(d, meta) } -func resourcePostgresqlRoleDelete(d *schema.ResourceData, meta interface{}) error { +func resourcePostgreSQLRoleDelete(d *schema.ResourceData, meta interface{}) error { client := meta.(*Client) conn, err := client.Connect() if err != nil { @@ -89,7 +89,7 @@ func resourcePostgresqlRoleDelete(d *schema.ResourceData, meta interface{}) erro return nil } -func resourcePostgresqlRoleRead(d *schema.ResourceData, meta interface{}) error { +func resourcePostgreSQLRoleRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*Client) conn, err := client.Connect() if err != nil { @@ -100,7 +100,7 @@ func resourcePostgresqlRoleRead(d *schema.ResourceData, meta interface{}) error roleName := d.Get("name").(string) var canLogin bool - err = conn.QueryRow("select rolcanlogin from pg_roles where rolname=$1", roleName).Scan(&canLogin) + err = conn.QueryRow("SELECT rolcanlogin FROM pg_roles WHERE rolname=$1", roleName).Scan(&canLogin) switch { case err == sql.ErrNoRows: d.SetId("") @@ -113,7 +113,7 @@ func resourcePostgresqlRoleRead(d *schema.ResourceData, meta interface{}) error } } -func resourcePostgresqlRoleUpdate(d *schema.ResourceData, meta interface{}) error { +func resourcePostgreSQLRoleUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*Client) conn, err := client.Connect() if err != nil { @@ -162,7 +162,7 @@ func resourcePostgresqlRoleUpdate(d *schema.ResourceData, meta interface{}) erro } d.Partial(false) - return resourcePostgresqlRoleRead(d, meta) + return resourcePostgreSQLRoleRead(d, meta) } func getLoginStr(canLogin bool) string { From 44af0d60df24a287bea0f958e902cc5a9fa4b3a7 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Mon, 5 Sep 2016 15:39:57 -0700 Subject: [PATCH 4/4] provider/postgres: Fix acceptance tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` › PGSSLMODE=disable PGHOST=localhost PGUSER=postgres make testacc \ TEST=./builtin/providers/postgresql ==> Checking that code complies with gofmt requirements... go generate $(go list ./... | grep -v /terraform/vendor/) 2016/09/05 15:39:23 Generated command/internal_plugin_list.go TF_ACC=1 go test ./builtin/providers/postgresql -v -timeout 120m === RUN TestProvider --- PASS: TestProvider (0.00s) === RUN TestProvider_impl --- PASS: TestProvider_impl (0.00s) === RUN TestAccPostgresqlDatabase_Basic --- PASS: TestAccPostgresqlDatabase_Basic (0.53s) === RUN TestAccPostgresqlDatabase_DefaultOwner --- PASS: TestAccPostgresqlDatabase_DefaultOwner (0.51s) === RUN TestAccPostgresqlRole_Basic --- PASS: TestAccPostgresqlRole_Basic (0.11s) PASS ok github.com/hashicorp/terraform/builtin/providers/postgresql 1.160s ``` --- builtin/providers/postgresql/provider.go | 8 ++++---- builtin/providers/postgresql/provider_test.go | 13 +++++++------ .../postgresql/resource_postgresql_database.go | 1 - .../postgresql/resource_postgresql_database_test.go | 13 +++++-------- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/builtin/providers/postgresql/provider.go b/builtin/providers/postgresql/provider.go index 6fbd9f84a9..4b73192ada 100644 --- a/builtin/providers/postgresql/provider.go +++ b/builtin/providers/postgresql/provider.go @@ -13,7 +13,7 @@ func Provider() terraform.ResourceProvider { "host": { Type: schema.TypeString, Required: true, - DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGUSER", "POSTGRESQL_HOST"}, nil), + DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGHOST", "POSTGRESQL_HOST"}, nil), Description: "The PostgreSQL server address", }, "port": { @@ -25,19 +25,19 @@ func Provider() terraform.ResourceProvider { "username": { Type: schema.TypeString, Required: true, - DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGHOST", "POSTGRESQL_HOST"}, nil), + DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGUSER", "POSTGRESQL_USER"}, nil), Description: "Username for PostgreSQL server connection", }, "password": { Type: schema.TypeString, - Required: true, + Optional: true, DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGPASSWORD", "POSTGRESQL_PASSWORD"}, nil), Description: "Password for PostgreSQL server connection", }, "ssl_mode": { Type: schema.TypeString, Optional: true, - Default: "prefer", + DefaultFunc: schema.EnvDefaultFunc("PGSSLMODE", "require"), Description: "Connection mode for PostgreSQL server", }, }, diff --git a/builtin/providers/postgresql/provider_test.go b/builtin/providers/postgresql/provider_test.go index 19c65cb38b..9596a0089b 100644 --- a/builtin/providers/postgresql/provider_test.go +++ b/builtin/providers/postgresql/provider_test.go @@ -29,13 +29,14 @@ func TestProvider_impl(t *testing.T) { } func testAccPreCheck(t *testing.T) { - if v := os.Getenv("POSTGRESQL_HOST"); v == "" { - t.Fatal("POSTGRESQL_HOST must be set for acceptance tests") + var host string + if host = os.Getenv("PGHOST"); host == "" { + t.Fatal("PGHOST must be set for acceptance tests") } - if v := os.Getenv("POSTGRESQL_USERNAME"); v == "" { - t.Fatal("POSTGRESQL_USERNAME must be set for acceptance tests") + if v := os.Getenv("PGUSER"); v == "" { + t.Fatal("PGUSER must be set for acceptance tests") } - if v := os.Getenv("POSTGRESQL_PASSWORD"); v == "" { - t.Fatal("POSTGRESQL_PASSWORD must be set for acceptance tests") + if v := os.Getenv("PGPASSWORD"); v == "" && host != "localhost" { + t.Fatal("PGPASSWORD must be set for acceptance tests if PGHOST is not localhost") } } diff --git a/builtin/providers/postgresql/resource_postgresql_database.go b/builtin/providers/postgresql/resource_postgresql_database.go index c48d314626..0cffcaa988 100644 --- a/builtin/providers/postgresql/resource_postgresql_database.go +++ b/builtin/providers/postgresql/resource_postgresql_database.go @@ -26,7 +26,6 @@ func resourcePostgreSQLDatabase() *schema.Resource { "owner": { Type: schema.TypeString, Optional: true, - ForceNew: false, Computed: true, }, }, diff --git a/builtin/providers/postgresql/resource_postgresql_database_test.go b/builtin/providers/postgresql/resource_postgresql_database_test.go index 97cc15e6a1..4fb20e9186 100644 --- a/builtin/providers/postgresql/resource_postgresql_database_test.go +++ b/builtin/providers/postgresql/resource_postgresql_database_test.go @@ -20,7 +20,7 @@ func TestAccPostgresqlDatabase_Basic(t *testing.T) { { Config: testAccPostgresqlDatabaseConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckPostgresqlDatabaseExists("postgresql_database.mydb", "myrole"), + testAccCheckPostgresqlDatabaseExists("postgresql_database.mydb"), resource.TestCheckResourceAttr( "postgresql_database.mydb", "name", "mydb"), resource.TestCheckResourceAttr( @@ -41,9 +41,11 @@ func TestAccPostgresqlDatabase_DefaultOwner(t *testing.T) { { Config: testAccPostgresqlDatabaseConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckPostgresqlDatabaseExists("postgresql_database.mydb_default_owner", ""), + testAccCheckPostgresqlDatabaseExists("postgresql_database.mydb_default_owner"), resource.TestCheckResourceAttr( "postgresql_database.mydb_default_owner", "name", "mydb_default_owner"), + resource.TestCheckResourceAttrSet( + "postgresql_database.mydb_default_owner", "owner"), ), }, }, @@ -72,7 +74,7 @@ func testAccCheckPostgresqlDatabaseDestroy(s *terraform.State) error { return nil } -func testAccCheckPostgresqlDatabaseExists(n string, owner string) resource.TestCheckFunc { +func testAccCheckPostgresqlDatabaseExists(n string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -83,11 +85,6 @@ func testAccCheckPostgresqlDatabaseExists(n string, owner string) resource.TestC return errors.New("No ID is set") } - actualOwner := rs.Primary.Attributes["owner"] - if actualOwner != owner { - return fmt.Errorf("Wrong owner for db expected %s got %s", owner, actualOwner) - } - client := testAccProvider.Meta().(*Client) exists, err := checkDatabaseExists(client, rs.Primary.ID)