Make resource definition functions public (#7324) (#5235)

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/7324.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google-beta/config.go

@@ -603,7 +603,7 @@ func (c *Config) LoadAndValidate(ctx context.Context) error {
 	return nil
 }
 
-func expandProviderBatchingConfig(v interface{}) (*batchingConfig, error) {
+func ExpandProviderBatchingConfig(v interface{}) (*batchingConfig, error) {
 	config := &batchingConfig{
 		sendAfter:      time.Second * defaultBatchSendIntervalSec,
 		enableBatching: true,

google-beta/config_test.go

@@ -95,7 +95,7 @@ func TestAccConfigLoadValidate_impersonated(t *testing.T) {
 	}
 	testAccPreCheck(t)
 
-	serviceaccount := multiEnvSearch([]string{"IMPERSONATE_SERVICE_ACCOUNT_ACCTEST"})
+	serviceaccount := MultiEnvSearch([]string{"IMPERSONATE_SERVICE_ACCOUNT_ACCTEST"})
 	creds := getTestCredsFromEnv()
 	proj := getTestProjectFromEnv()
 
@@ -127,7 +127,7 @@ func TestAccConfigLoadValidate_accessTokenImpersonated(t *testing.T) {
 
 	creds := getTestCredsFromEnv()
 	proj := getTestProjectFromEnv()
-	serviceaccount := multiEnvSearch([]string{"IMPERSONATE_SERVICE_ACCOUNT_ACCTEST"})
+	serviceaccount := MultiEnvSearch([]string{"IMPERSONATE_SERVICE_ACCOUNT_ACCTEST"})
 
 	c, err := google.CredentialsFromJSON(context.Background(), []byte(creds), DefaultClientScopes...)
 	if err != nil {
@@ -222,7 +222,7 @@ func TestConfigLoadAndValidate_customScopes(t *testing.T) {
 
 func TestConfigLoadAndValidate_defaultBatchingConfig(t *testing.T) {
 	// Use default batching config
-	batchCfg, err := expandProviderBatchingConfig(nil)
+	batchCfg, err := ExpandProviderBatchingConfig(nil)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -247,7 +247,7 @@ func TestConfigLoadAndValidate_defaultBatchingConfig(t *testing.T) {
 }
 
 func TestConfigLoadAndValidate_customBatchingConfig(t *testing.T) {
-	batchCfg, err := expandProviderBatchingConfig([]interface{}{
+	batchCfg, err := ExpandProviderBatchingConfig([]interface{}{
 		map[string]interface{}{
 			"send_after":      "1s",
 			"enable_batching": false,

google-beta/data_google_game_services_game_server_deployment_rollout.go

@@ -6,9 +6,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func dataSourceGameServicesGameServerDeploymentRollout() *schema.Resource {
+func DataSourceGameServicesGameServerDeploymentRollout() *schema.Resource {
 
-	dsSchema := datasourceSchemaFromResourceSchema(resourceGameServicesGameServerDeploymentRollout().Schema)
+	dsSchema := datasourceSchemaFromResourceSchema(ResourceGameServicesGameServerDeploymentRollout().Schema)
 	addRequiredFieldsToSchema(dsSchema, "deployment_id")
 
 	return &schema.Resource{

google-beta/data_source_access_approval_folder_service_account.go

@@ -2,10 +2,11 @@ package google
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func dataSourceAccessApprovalFolderServiceAccount() *schema.Resource {
+func DataSourceAccessApprovalFolderServiceAccount() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourceAccessApprovalFolderServiceAccountRead,
 		Schema: map[string]*schema.Schema{

google-beta/data_source_access_approval_organization_service_account.go

@@ -2,10 +2,11 @@ package google
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func dataSourceAccessApprovalOrganizationServiceAccount() *schema.Resource {
+func DataSourceAccessApprovalOrganizationServiceAccount() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourceAccessApprovalOrganizationServiceAccountRead,
 		Schema: map[string]*schema.Schema{

google-beta/data_source_access_approval_project_service_account.go

@@ -2,10 +2,11 @@ package google
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func dataSourceAccessApprovalProjectServiceAccount() *schema.Resource {
+func DataSourceAccessApprovalProjectServiceAccount() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourceAccessApprovalProjectServiceAccountRead,
 		Schema: map[string]*schema.Schema{

google-beta/data_source_artifact_registry_repository.go

@@ -6,9 +6,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func dataSourceArtifactRegistryRepository() *schema.Resource {
+func DataSourceArtifactRegistryRepository() *schema.Resource {
 	// Generate datasource schema from resource
-	dsSchema := datasourceSchemaFromResourceSchema(resourceArtifactRegistryRepository().Schema)
+	dsSchema := datasourceSchemaFromResourceSchema(ResourceArtifactRegistryRepository().Schema)
 
 	// Set 'Required' schema elements
 	addRequiredFieldsToSchema(dsSchema, "repository_id", "location")

google-beta/data_source_certificate_authority.go

@@ -6,8 +6,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func dataSourcePrivatecaCertificateAuthority() *schema.Resource {
-	dsSchema := datasourceSchemaFromResourceSchema(resourcePrivatecaCertificateAuthority().Schema)
+func DataSourcePrivatecaCertificateAuthority() *schema.Resource {
+	dsSchema := datasourceSchemaFromResourceSchema(ResourcePrivatecaCertificateAuthority().Schema)
 	addOptionalFieldsToSchema(dsSchema, "project")
 	addOptionalFieldsToSchema(dsSchema, "location")
 	addOptionalFieldsToSchema(dsSchema, "pool")

google-beta/data_source_cloud_identity_group_memberships.go

@@ -8,9 +8,9 @@ import (
 	cloudidentity "google.golang.org/api/cloudidentity/v1beta1"
 )
 
-func dataSourceGoogleCloudIdentityGroupMemberships() *schema.Resource {
+func DataSourceGoogleCloudIdentityGroupMemberships() *schema.Resource {
 	// Generate datasource schema from resource
-	dsSchema := datasourceSchemaFromResourceSchema(resourceCloudIdentityGroupMembership().Schema)
+	dsSchema := datasourceSchemaFromResourceSchema(ResourceCloudIdentityGroupMembership().Schema)
 
 	return &schema.Resource{
 		Read: dataSourceGoogleCloudIdentityGroupMembershipsRead,