conflicts resolved

Snowflake-Labs · Oct 23, 2024 · 55ee85b · 55ee85b
1 parent 9cbbca0
commit 55ee85b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/acceptance/bettertestspoc/assert/resourceassert/gen/resource_schema_def.go b/pkg/acceptance/bettertestspoc/assert/resourceassert/gen/resource_schema_def.go
@@ -88,7 +88,8 @@ var allResourceSchemaDefs = []ResourceSchemaDef{
 	{
 		name:   "SecretWithGenericString",
 		schema: resources.SecretWithGenericString().Schema,
-  },
+	},
+	{
 		name:   "StreamOnDirectoryTable",
 		schema: resources.StreamOnDirectoryTable().Schema,
 	},

diff --git a/pkg/resources/custom_diffs.go b/pkg/resources/custom_diffs.go
@@ -221,7 +221,7 @@ func RecreateWhenSecretTypeChangedExternally(secretType sdk.SecretType) schema.C
 				}
 				if isRefreshTokenExpiryTimeEmpty {
 					return errors.Join(diff.SetNew("secret_type", "<changed externally>"), diff.ForceNew("secret_type"))
-	      }
+				}
 			}
 		}
 		return nil
-Original file line number
+Diff line change
@@ Expand Up @@
     				}
     				if isRefreshTokenExpiryTimeEmpty {
     					return errors.Join(diff.SetNew("secret_type", "<changed externally>"), diff.ForceNew("secret_type"))
-    	      }
+    				}
     			}
     		}
     		return nil
@@ Expand Down @@