Support read timeout for SQL loop and better error handling

betr-io · Jun 20, 2023 · a89b550 · a89b550
1 parent 3f19729
commit a89b550
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/mssql/resource_login.go b/mssql/resource_login.go
@@ -71,6 +71,7 @@ func resourceLogin() *schema.Resource {
     },
     Timeouts: &schema.ResourceTimeout{
       Default: defaultTimeout,
+      Read: defaultTimeout,
     },
   }
 }

diff --git a/mssql/resource_user.go b/mssql/resource_user.go
@@ -89,6 +89,7 @@ func resourceUser() *schema.Resource {
 		},
 		Timeouts: &schema.ResourceTimeout{
 			Default: defaultTimeout,
+			Read: defaultTimeout,
 		},
 	}
 }

diff --git a/sql/sql.go b/sql/sql.go
@@ -249,15 +249,24 @@ func connectLoop(connector driver.Connector, timeout time.Duration) (*sql.DB, er
       if err == nil {
         return db, nil
       }
-      if strings.Contains(err.Error(), "Login failed") {
+      if strings.Contains(strings.ToLower(err.Error()), "login failed") {
         return nil, err
       }
-      if strings.Contains(err.Error(), "Login error") {
+      if strings.Contains(strings.ToLower(err.Error()), "login error") {
         return nil, err
       }
       if strings.Contains(err.Error(), "error retrieving access token") {
         return nil, err
       }
+      if strings.Contains(err.Error(), "AuthenticationFailedError") {
+        return nil, err
+      }
+      if strings.Contains(err.Error(), "credential") {
+        return nil, err
+      }
+      if strings.Contains(err.Error(), "request failed") {
+        return nil, err
+      }
       log.Println(errors.Wrap(err, "failed to connect to database"))
     }
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,6 +71,7 @@ func resourceLogin() *schema.Resource { @@
         },
         Timeouts: &schema.ResourceTimeout{
           Default: defaultTimeout,
+          Read: defaultTimeout,
         },
       }
     }
@@ Expand Down @@