Resolve merge conflicts

docs/resources/standard_database.md

@@ -82,14 +82,14 @@ resource "snowflake_standard_database" "primary" {
 
 Required:
 
-- `enable_for_account` (Block List, Min: 1) Entry to enable replication and optionally failover for a given account identifier. (see [below for nested schema](#nestedblock--replication--enable_for_account))
+- `enable_to_account` (Block List, Min: 1) Entry to enable replication and optionally failover for a given account identifier. (see [below for nested schema](#nestedblock--replication--enable_to_account))
 
 Optional:
 
 - `ignore_edition_check` (Boolean) Allows replicating data to accounts on lower editions in either of the following scenarios: 1. The primary database is in a Business Critical (or higher) account but one or more of the accounts approved for replication are on lower editions. Business Critical Edition is intended for Snowflake accounts with extremely sensitive data. 2. The primary database is in a Business Critical (or higher) account and a signed business associate agreement is in place to store PHI data in the account per HIPAA and HITRUST regulations, but no such agreement is in place for one or more of the accounts approved for replication, regardless if they are Business Critical (or higher) accounts. Both scenarios are prohibited by default in an effort to help prevent account administrators for Business Critical (or higher) accounts from inadvertently replicating sensitive data to accounts on lower editions.
 
-<a id="nestedblock--replication--enable_for_account"></a>
-### Nested Schema for `replication.enable_for_account`
+<a id="nestedblock--replication--enable_to_account"></a>
+### Nested Schema for `replication.enable_to_account`
 
 Required:
 

pkg/helpers/helpers_test.go

@@ -2,9 +2,10 @@ package helpers
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/stretchr/testify/require"
 )

pkg/provider/provider.go

@@ -457,7 +457,6 @@ func getResources() map[string]*schema.Resource {
 		"snowflake_alert":                                   resources.Alert(),
 		"snowflake_api_integration":                         resources.APIIntegration(),
 		"snowflake_database":                                resources.Database(),
-		"snowflake_standard_database":                       resources.StandardDatabase(),
 		"snowflake_database_role":                           resources.DatabaseRole(),
 		"snowflake_dynamic_table":                           resources.DynamicTable(),
 		"snowflake_email_notification_integration":          resources.EmailNotificationIntegration(),
@@ -495,9 +494,12 @@ func getResources() map[string]*schema.Resource {
 		"snowflake_saml_integration":                        resources.SAMLIntegration(),
 		"snowflake_schema":                                  resources.Schema(),
 		"snowflake_scim_integration":                        resources.SCIMIntegration(),
+		"snowflake_secondary_database":                      resources.SecondaryDatabase(),
 		"snowflake_sequence":                                resources.Sequence(),
 		"snowflake_session_parameter":                       resources.SessionParameter(),
 		"snowflake_share":                                   resources.Share(),
+		"snowflake_shared_database":                         resources.SharedDatabase(),
+		"snowflake_standard_database":                       resources.StandardDatabase(),
 		"snowflake_stage":                                   resources.Stage(),
 		"snowflake_storage_integration":                     resources.StorageIntegration(),
 		"snowflake_stream":                                  resources.Stream(),

pkg/resources/testdata/TestAcc_SharedDatabase/complete/test.tf

@@ -1,7 +1,7 @@
 resource "snowflake_shared_database" "test" {
-  name                         = var.name
-  from_share                   = var.from_share
-  comment                      = var.comment
+  name       = var.name
+  from_share = var.from_share
+  comment    = var.comment
 
   external_volume                               = var.external_volume
   catalog                                       = var.catalog