update for comments

Author: Sichen Zhao

postgresql/config.go

@@ -169,7 +169,7 @@ type ClientCertificateConfig struct {
 type Config struct {
 	Scheme                          string
 	Host                            string
-	ConnectionHost                  string
+	AWSIAMDBAuthTokenHost           string
 	Port                            int
 	Username                        string
 	Password                        string
@@ -249,10 +249,7 @@ func (c *Config) connParams() []string {
 }
 
 func (c *Config) connStr(database string) string {
-	host := c.ConnectionHost
-	if host == "" {
-		host = c.Host
-	}
+	host = c.Host
 	// For GCP, support both project/region/instance and project:region:instance
 	// (The second one allows to use the output of google_sql_database_instance as host
 	if c.Scheme == "gcppostgres" {

postgresql/provider.go

@@ -46,12 +46,6 @@ func Provider() *schema.Provider {
 				DefaultFunc: schema.EnvDefaultFunc("PGHOST", nil),
 				Description: "Name of PostgreSQL server address",
 			},
-			"connection_host": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				DefaultFunc: schema.EnvDefaultFunc("PGHOST", nil),
-				Description: "Name of PostgreSQL server address to connect to",
-			},
 			"port": {
 				Type:        schema.TypeInt,
 				Optional:    true,
@@ -106,6 +100,13 @@ func Provider() *schema.Provider {
 				Description: "AWS IAM role to assume for IAM auth",
 			},
 
+			"aws_rds_iam_token_host": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("PGHOST", nil),
+				Description: "Name of PostgreSQL server address for AWS RDS IAM to get token",
+			},
+
 			"azure_identity_auth": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -350,18 +351,18 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	port := d.Get("port").(int)
 	username := d.Get("username").(string)
 
-	connectionHost := d.Get("connection_host").(string)
-	if connectionHost == "" {
-		connectionHost = host
-	}
-
 	var password string
 	if d.Get("aws_rds_iam_auth").(bool) {
+		awsIAMTokenHost := d.Get("aws_rds_iam_token_host").(string)
+		if awsIAMTokenHost == "" {
+			awsIAMTokenHost = host
+		}
+
 		profile := d.Get("aws_rds_iam_profile").(string)
 		region := d.Get("aws_rds_iam_region").(string)
 		role := d.Get("aws_rds_iam_provider_role_arn").(string)
 		var err error
-		password, err = getRDSAuthToken(region, profile, role, username, host, port)
+		password, err = getRDSAuthToken(region, profile, role, username, awsIAMTokenHost, port)
 		if err != nil {
 			return nil, err
 		}
@@ -382,7 +383,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config := Config{
 		Scheme:                          d.Get("scheme").(string),
 		Host:                            host,
-		ConnectionHost:                  connectionHost,
+		AWSIAMDBAuthTokenHost:           awsIAMTokenHost,
 		Port:                            port,
 		Username:                        username,
 		Password:                        password,