datasource migration for storagecontrol (#14844) (#24003)

modular-magician · web-flow · commit 3631fbead4ff · 2025-08-14T15:05:30.000-07:00
[upstream:94fd424840de5add2ee65fe8a967d601a6011655]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/google/provider/provider_mmv1_resources.go b/google/provider/provider_mmv1_resources.go
@@ -400,9 +400,9 @@ var handwrittenDatasources = map[string]*schema.Resource{
 	"google_storage_bucket_object":                               storage.DataSourceGoogleStorageBucketObject(),
 	"google_storage_bucket_objects":                              storage.DataSourceGoogleStorageBucketObjects(),
 	"google_storage_bucket_object_content":                       storage.DataSourceGoogleStorageBucketObjectContent(),
-	"google_storage_control_folder_intelligence_config":          storagecontrol.DataSourceGoogleStorageControlFolderIntelligenceConfig(),
-	"google_storage_control_organization_intelligence_config":    storagecontrol.DataSourceGoogleStorageControlOrganizationIntelligenceConfig(),
-	"google_storage_control_project_intelligence_config":         storagecontrol.DataSourceGoogleStorageControlProjectIntelligenceConfig(),
+	"google_storage_control_folder_intelligence_config":          storagecontrol.DataSourceStorageControlFolderIntelligenceConfig(),
+	"google_storage_control_organization_intelligence_config":    storagecontrol.DataSourceStorageControlOrganizationIntelligenceConfig(),
+	"google_storage_control_project_intelligence_config":         storagecontrol.DataSourceStorageControlProjectIntelligenceConfig(),
 	"google_storage_insights_dataset_config":                     storageinsights.DataSourceGoogleStorageInsightsDatasetConfig(),
 	"google_storage_object_signed_url":                           storage.DataSourceGoogleSignedUrl(),
 	"google_storage_project_service_account":                     storage.DataSourceGoogleStorageProjectServiceAccount(),
diff --git a/google/services/storagecontrol/data_source_storage_control_folder_intelligence_config.go b/google/services/storagecontrol/data_source_storage_control_folder_intelligence_config.go
@@ -1,14 +1,16 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
+
 // ----------------------------------------------------------------------------
 //
-//	***     AUTO GENERATED CODE    ***    Type: Handwritten     ***
+//	***     AUTO GENERATED CODE    ***    Type: MMv1     ***
 //
 // ----------------------------------------------------------------------------
 //
 //	This code is generated by Magic Modules using the following:
 //
-//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/storagecontrol/data_source_storage_control_folder_intelligence_config.go
+//	Configuration: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/products/storagecontrol/FolderIntelligenceConfig.yaml
+//	Template:      https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/templates/terraform/datasource.go.tmpl
 //
 //	DO NOT EDIT this file directly. Any changes made to this file will be
 //	overwritten during the next generation cycle.
@@ -20,29 +22,37 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/hashicorp/terraform-provider-google/google/tpgresource"
 	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
 )
 
-func DataSourceGoogleStorageControlFolderIntelligenceConfig() *schema.Resource {
+func DataSourceStorageControlFolderIntelligenceConfig() *schema.Resource {
+	rs := ResourceStorageControlFolderIntelligenceConfig().Schema
+
+	dsSchema := tpgresource.DatasourceSchemaFromResourceSchema(rs)
 
-	dsSchema := tpgresource.DatasourceSchemaFromResourceSchema(ResourceStorageControlFolderIntelligenceConfig().Schema)
+	// Set 'Required' schema elements
 	tpgresource.AddRequiredFieldsToSchema(dsSchema, "name")
 
+	// Set 'Optional' schema elements
+	tpgresource.AddOptionalFieldsToSchema(dsSchema)
+
 	return &schema.Resource{
-		Read:   dataSourceGoogleStorageControlFolderIntelligenceConfigRead,
+		Read:   dataSourceStorageControlFolderIntelligenceConfigRead,
 		Schema: dsSchema,
 	}
 }
 
-func dataSourceGoogleStorageControlFolderIntelligenceConfigRead(d *schema.ResourceData, meta interface{}) error {
+func dataSourceStorageControlFolderIntelligenceConfigRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*transport_tpg.Config)
 
 	id, err := tpgresource.ReplaceVars(d, config, "folders/{{name}}/locations/global/intelligenceConfig")
 	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
+		return err
 	}
 	d.SetId(id)
+
 	err = resourceStorageControlFolderIntelligenceConfigRead(d, meta)
 	if err != nil {
 		return err
diff --git a/google/services/storagecontrol/data_source_storage_control_organization_intelligence_config.go b/google/services/storagecontrol/data_source_storage_control_organization_intelligence_config.go
@@ -1,14 +1,16 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
+
 // ----------------------------------------------------------------------------
 //
-//	***     AUTO GENERATED CODE    ***    Type: Handwritten     ***
+//	***     AUTO GENERATED CODE    ***    Type: MMv1     ***
 //
 // ----------------------------------------------------------------------------
 //
 //	This code is generated by Magic Modules using the following:
 //
-//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/storagecontrol/data_source_storage_control_organization_intelligence_config.go
+//	Configuration: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/products/storagecontrol/OrganizationIntelligenceConfig.yaml
+//	Template:      https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/templates/terraform/datasource.go.tmpl
 //
 //	DO NOT EDIT this file directly. Any changes made to this file will be
 //	overwritten during the next generation cycle.
@@ -20,29 +22,37 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/hashicorp/terraform-provider-google/google/tpgresource"
 	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
 )
 
-func DataSourceGoogleStorageControlOrganizationIntelligenceConfig() *schema.Resource {
+func DataSourceStorageControlOrganizationIntelligenceConfig() *schema.Resource {
+	rs := ResourceStorageControlOrganizationIntelligenceConfig().Schema
+
+	dsSchema := tpgresource.DatasourceSchemaFromResourceSchema(rs)
 
-	dsSchema := tpgresource.DatasourceSchemaFromResourceSchema(ResourceStorageControlOrganizationIntelligenceConfig().Schema)
+	// Set 'Required' schema elements
 	tpgresource.AddRequiredFieldsToSchema(dsSchema, "name")
 
+	// Set 'Optional' schema elements
+	tpgresource.AddOptionalFieldsToSchema(dsSchema)
+
 	return &schema.Resource{
-		Read:   dataSourceGoogleStorageControlOrganizationIntelligenceConfigRead,
+		Read:   dataSourceStorageControlOrganizationIntelligenceConfigRead,
 		Schema: dsSchema,
 	}
 }
 
-func dataSourceGoogleStorageControlOrganizationIntelligenceConfigRead(d *schema.ResourceData, meta interface{}) error {
+func dataSourceStorageControlOrganizationIntelligenceConfigRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*transport_tpg.Config)
 
 	id, err := tpgresource.ReplaceVars(d, config, "organizations/{{name}}/locations/global/intelligenceConfig")
 	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
+		return err
 	}
 	d.SetId(id)
+
 	err = resourceStorageControlOrganizationIntelligenceConfigRead(d, meta)
 	if err != nil {
 		return err
diff --git a/google/services/storagecontrol/data_source_storage_control_project_intelligence_config.go b/google/services/storagecontrol/data_source_storage_control_project_intelligence_config.go
@@ -1,14 +1,16 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
+
 // ----------------------------------------------------------------------------
 //
-//	***     AUTO GENERATED CODE    ***    Type: Handwritten     ***
+//	***     AUTO GENERATED CODE    ***    Type: MMv1     ***
 //
 // ----------------------------------------------------------------------------
 //
 //	This code is generated by Magic Modules using the following:
 //
-//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/storagecontrol/data_source_storage_control_project_intelligence_config.go
+//	Configuration: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/products/storagecontrol/ProjectIntelligenceConfig.yaml
+//	Template:      https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/templates/terraform/datasource.go.tmpl
 //
 //	DO NOT EDIT this file directly. Any changes made to this file will be
 //	overwritten during the next generation cycle.
@@ -20,29 +22,37 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/hashicorp/terraform-provider-google/google/tpgresource"
 	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
 )
 
-func DataSourceGoogleStorageControlProjectIntelligenceConfig() *schema.Resource {
+func DataSourceStorageControlProjectIntelligenceConfig() *schema.Resource {
+	rs := ResourceStorageControlProjectIntelligenceConfig().Schema
+
+	dsSchema := tpgresource.DatasourceSchemaFromResourceSchema(rs)
 
-	dsSchema := tpgresource.DatasourceSchemaFromResourceSchema(ResourceStorageControlProjectIntelligenceConfig().Schema)
+	// Set 'Required' schema elements
 	tpgresource.AddRequiredFieldsToSchema(dsSchema, "name")
 
+	// Set 'Optional' schema elements
+	tpgresource.AddOptionalFieldsToSchema(dsSchema)
+
 	return &schema.Resource{
-		Read:   dataSourceGoogleStorageControlProjectIntelligenceConfigRead,
+		Read:   dataSourceStorageControlProjectIntelligenceConfigRead,
 		Schema: dsSchema,
 	}
 }
 
-func dataSourceGoogleStorageControlProjectIntelligenceConfigRead(d *schema.ResourceData, meta interface{}) error {
+func dataSourceStorageControlProjectIntelligenceConfigRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*transport_tpg.Config)
 
 	id, err := tpgresource.ReplaceVars(d, config, "projects/{{name}}/locations/global/intelligenceConfig")
 	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
+		return err
 	}
 	d.SetId(id)
+
 	err = resourceStorageControlProjectIntelligenceConfigRead(d, meta)
 	if err != nil {
 		return err
