Fix tests

Snowflake-Labs · Dec 12, 2023 · ca422cd · ca422cd
1 parent 36d4cd1
commit ca422cd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/pkg/resources/external_oauth_integration.go b/pkg/resources/external_oauth_integration.go
@@ -217,7 +217,7 @@ func CreateExternalOauthIntegration(d *schema.ResourceData, meta interface{}) er
 
 	d.SetId(ExternalOauthIntegrationID(&input.ExternalOauthIntegration3))
 
-	return nil
+	return ReadExternalOauthIntegration(d, meta)
 }
 
 // ReadExternalOauthIntegration implements schema.ReadFunc.
@@ -543,7 +543,7 @@ func UpdateExternalOauthIntegration(d *schema.ResourceData, meta interface{}) er
 		}
 	}
 
-	return nil
+	return ReadExternalOauthIntegration(d, meta)
 }
 
 // DeleteExternalOauthIntegration implements schema.DeleteFunc.

diff --git a/pkg/resources/user_public_keys_acceptance_test.go b/pkg/resources/user_public_keys_acceptance_test.go
@@ -37,14 +37,16 @@ func TestAcc_UserPublicKeys(t *testing.T) {
 
 					resource.TestCheckResourceAttr("snowflake_user_public_keys.foobar", "rsa_public_key", sshkey1),
 					resource.TestCheckResourceAttr("snowflake_user_public_keys.foobar", "rsa_public_key_2", sshkey2),
+					resource.TestCheckNoResourceAttr("snowflake_user_public_keys.foobar", "has_rsa_public_key"),
 				),
 			},
 			// IMPORT
 			{
-				ResourceName:            "snowflake_user.w",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"password", "rsa_public_key", "rsa_public_key_2", "must_change_password"},
+				ResourceName:      "snowflake_user.w",
+				ImportState:       true,
+				ImportStateVerify: true,
+				// Ignoring because keys are currently altered outside of snowflake_user resource (in snowflake_user_public_keys).
+				ImportStateVerifyIgnore: []string{"password", "rsa_public_key", "rsa_public_key_2", "has_rsa_public_key", "must_change_password"},
 			},
 		},
 	})

diff --git a/pkg/resources/warehouse.go b/pkg/resources/warehouse.go
@@ -419,7 +419,7 @@ func UpdateWarehouse(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
-	return nil
+	return ReadWarehouse(d, meta)
 }
 
 // DeleteWarehouse implements schema.DeleteFunc.

diff --git a/pkg/resources/warehouse_acceptance_test.go b/pkg/resources/warehouse_acceptance_test.go
@@ -50,7 +50,7 @@ func TestAcc_Warehouse(t *testing.T) {
 					resource.TestCheckResourceAttr("snowflake_warehouse.w", "name", prefix2),
 					resource.TestCheckResourceAttr("snowflake_warehouse.w", "comment", "test comment 2"),
 					resource.TestCheckResourceAttr("snowflake_warehouse.w", "auto_suspend", "60"),
-					resource.TestCheckResourceAttr("snowflake_warehouse.w", "warehouse_size", "X-LARGE"),
+					resource.TestCheckResourceAttr("snowflake_warehouse.w", "warehouse_size", "XLARGE"),
 				),
 			},
 			// IMPORT
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
-    	return nil
+    	return ReadWarehouse(d, meta)
     }
     // DeleteWarehouse implements schema.DeleteFunc.
@@ Expand Down @@