Merge pull request brainly#118 from mmichaelb/fix-serverless-errors

fix quota check for serverless redshift

Author: mmichaelb

redshift/config.go

@@ -25,6 +25,7 @@ type Config struct {
 	SSLMode  string
 	MaxConns int
 
+	serverlessCheckMutex *sync.Mutex
 	isServerless         bool
 	checkedForServerless bool
 }
@@ -52,6 +53,11 @@ func (c *Config) NewClient(database string) *Client {
 }
 
 func (c *Config) IsServerless(db *DBConnection) (bool, error) {
+	if c.serverlessCheckMutex == nil {
+		c.serverlessCheckMutex = &sync.Mutex{}
+	}
+	c.serverlessCheckMutex.Lock()
+	defer c.serverlessCheckMutex.Unlock()
 	if c.checkedForServerless {
 		return c.isServerless, nil
 	}

redshift/resource_redshift_schema.go

@@ -455,16 +455,23 @@ func resourceRedshiftSchemaReadLocal(db *DBConnection, d *schema.ResourceData) e
 		return err
 	}
 
-	if !isServerless {
-		err := db.QueryRow(`
+	if isServerless {
+		err = db.QueryRow(`
+			SELECT COALESCE(quota, 0)
+			FROM svv_redshift_schema_quota
+			WHERE database_name = $1 
+			  AND schema_name = $2
+		`, db.client.databaseName, d.Get(schemaNameAttr)).Scan(&schemaQuota)
+	} else {
+		err = db.QueryRow(`
 			SELECT
 			COALESCE(quota, 0)
 			FROM svv_schema_quota_state
 			WHERE schema_id = $1
 		`, d.Id()).Scan(&schemaQuota)
-		if err != nil && err != sql.ErrNoRows {
-			return err
-		}
+	}
+	if err != nil && err != sql.ErrNoRows {
+		return err
 	}
 	d.Set(schemaQuotaAttr, schemaQuota)
 	d.Set(schemaExternalSchemaAttr, nil)