Add storage_control_folder_intelligence_config resource.

mmv1/products/storagecontrol/FolderIntelligenceConfig.yaml

@@ -0,0 +1,179 @@
+# Copyright 2025 Google Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+# API resource name
+name: 'FolderIntelligenceConfig'
+kind: 'storagecontrol#intelligenceconfig'
+# Resource description for the provider documentation.
+description: |
+  The Folder Storage Intelligence resource represents GCS Storage Intelligence operating on individual GCP Folder. Storage Intelligence is a singleton resource and individual instance exists on each GCP Folder.
+
+  Storage Intelligence is for Storage Admins to manage GCP storage assets at scale for performance, cost, security & compliance.
+
+docs:
+  warning: |
+    Storage Intelligence Config is a singleton resource which cannot be created or deleted. A single instance of Storage Intelligence Config exist for each GCP Folder. Terraform does not create or destroy this resource.
+    Terraform resource creation for this resource is simply an update operation on existing resource with specified properties. Terraform deletion won't have any effect on this resource rather it will only remove it from the state file.
+
+# URL for the resource's standard Get method. https://google.aip.dev/131
+self_link: 'folders/{{name}}/locations/global/intelligenceConfig'
+
+custom_code:
+  custom_create: templates/terraform/custom_create/storage_control_folder_intelligence.go.tmpl
+
+# The HTTP verb used to update a resource. Allowed values: :POST, :PUT, :PATCH. Default: :PUT.
+update_verb: 'PATCH'
+# If true, the resource sets an `updateMask` query parameter listing modified
+# fields when updating the resource. If false, it does not.
+update_mask: true
+
+exclude_delete: true
+
+import_format:
+  - 'folders/{{name}}/locations/global/intelligenceConfig'
+
+# If true, code for handling long-running operations is generated along with
+# the resource. If false, that code is not generated.
+autogen_async: false
+
+properties:
+  # Fields go here
+  - name: 'name'
+    type: String
+    required: true
+    immutable: true
+    url_param_only: true
+    description: |
+      Identifier of the GCP Folder. For GCP Folder, this field can be folder number.
+  - name: 'editionConfig'
+    type: String
+    required: false
+    default_from_api: true
+    description: |
+      Edition configuration of the Storage Intelligence resource. Valid values are INHERIT, TRIAL, DISABLED and STANDARD.
+  - name: 'updateTime'
+    type: String
+    output: true
+    description: |
+      The time at which the Storage Intelligence Config resource is last updated.
+  - name: 'filter'
+    type: NestedObject
+    diff_suppress_func: 'intelligenceFilterDiffSuppress'
+    description: |
+      Filter over location and bucket using include or exclude semantics. Resources that match the include or exclude filter are exclusively included or excluded from the Storage Intelligence plan.
+    properties:
+      - name: excludedCloudStorageBuckets
+        type: NestedObject
+        required: false
+        description: |
+          Buckets to exclude from the Storage Intelligence plan.
+        conflicts:
+          - 'filter.0.included_cloud_storage_buckets'
+        at_least_one_of:
+          - 'filter.0.included_cloud_storage_buckets'
+          - 'filter.0.excluded_cloud_storage_buckets'
+          - 'filter.0.included_cloud_storage_locations'
+          - 'filter.0.excluded_cloud_storage_locations'
+        diff_suppress_func: 'intelligenceFilterExcludedCloudStorageBucketsDiffSuppress'
+        properties:
+          - name: bucketIdRegexes
+            required: true
+            type: Array
+            send_empty_value: true
+            item_type:
+              type: String
+            description: |
+              List of bucket id regexes to exclude in the storage intelligence plan.
+      - name: includedCloudStorageBuckets
+        type: NestedObject
+        required: false
+        description: |
+          Buckets to include in the Storage Intelligence plan.
+        conflicts:
+          - 'filter.0.excluded_cloud_storage_buckets'
+        at_least_one_of:
+          - 'filter.0.included_cloud_storage_buckets'
+          - 'filter.0.excluded_cloud_storage_buckets'
+          - 'filter.0.included_cloud_storage_locations'
+          - 'filter.0.excluded_cloud_storage_locations'
+        diff_suppress_func: 'intelligenceFilterincludedCloudStorageBucketsDiffSuppress'
+        properties:
+          - name: bucketIdRegexes
+            required: true
+            send_empty_value: true
+            type: Array
+            item_type:
+              type: String
+            description: |
+              List of bucket id regexes to exclude in the storage intelligence plan.
+      - name: excludedCloudStorageLocations
+        type: NestedObject
+        required: false
+        description: |
+          Locations to exclude from the Storage Intelligence plan.
+        conflicts:
+          - 'filter.0.included_cloud_storage_locations'
+        at_least_one_of:
+          - 'filter.0.included_cloud_storage_buckets'
+          - 'filter.0.excluded_cloud_storage_buckets'
+          - 'filter.0.included_cloud_storage_locations'
+          - 'filter.0.excluded_cloud_storage_locations'
+        diff_suppress_func: 'intelligenceFilterExcludedCloudStorageLocationsDiffSuppress'
+        properties:
+          - name: locations
+            type: Array
+            required: true
+            send_empty_value: true
+            description: |
+              List of locations.
+            item_type:
+              type: String
+      - name: includedCloudStorageLocations
+        type: NestedObject
+        required: false
+        description: |
+          Locations to include in the Storage Intelligence plan.
+        conflicts:
+          - 'filter.0.excluded_cloud_storage_locations'
+        at_least_one_of:
+          - 'filter.0.included_cloud_storage_buckets'
+          - 'filter.0.excluded_cloud_storage_buckets'
+          - 'filter.0.included_cloud_storage_locations'
+          - 'filter.0.excluded_cloud_storage_locations'
+        diff_suppress_func: 'intelligenceFilterincludedCloudStorageLocationsDiffSuppress'
+        properties:
+          - name: locations
+            type: Array
+            required: true
+            send_empty_value: true
+            description: |
+              List of locations.
+            item_type:
+              type: String
+  - name: 'effectiveIntelligenceConfig'
+    output: true
+    description: |
+      The Intelligence config that is effective for the resource.
+    type: NestedObject
+    properties:
+      - name: intelligenceConfig
+        type: String
+        output: true
+        description: |
+          The Intelligence config resource that is applied for the target resource.
+      - name: effectiveEdition
+        type: String
+        output: true
+        description: |
+          The `StorageIntelligence` edition that is applicable for the resource.

mmv1/products/storagecontrol/ProjectIntelligenceConfig.yaml

@@ -61,7 +61,7 @@ properties:
     required: false
     default_from_api: true
     description: |
-      Edition configuration of the Storage Intelligence resource. Valid values are INHERIT, DISABLED and STANDARD.
+      Edition configuration of the Storage Intelligence resource. Valid values are INHERIT, TRIAL, DISABLED and STANDARD.
   - name: 'updateTime'
     type: String
     output: true

mmv1/templates/terraform/custom_create/storage_control_folder_intelligence.go.tmpl

@@ -0,0 +1,72 @@
+
+	userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)
+	if err != nil {
+		return err
+	}
+
+	obj := make(map[string]interface{})
+	editionConfigProp, err := expandStorageControlFolderIntelligenceConfigEditionConfig(d.Get("edition_config"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("edition_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(editionConfigProp)) && (ok || !reflect.DeepEqual(v, editionConfigProp)) {
+		obj["editionConfig"] = editionConfigProp
+	}
+	filterProp, err := expandStorageControlFolderIntelligenceConfigFilter(d.Get("filter"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("filter"); !tpgresource.IsEmptyValue(reflect.ValueOf(filterProp)) && (ok || !reflect.DeepEqual(v, filterProp)) {
+		obj["filter"] = filterProp
+	}
+
+	url, err := tpgresource.ReplaceVars(d, config, "{{"{{"}}StorageControlBasePath{{"}}"}}folders/{{"{{"}}name{{"}}"}}/locations/global/intelligenceConfig")
+	if err != nil {
+		return err
+	}
+
+	log.Printf("[DEBUG] Patching Intelligence config: %#v", obj)
+	billingProject := ""
+
+	// err == nil indicates that the billing_project value was found
+	if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
+		billingProject = bp
+	}
+
+	headers := make(http.Header)
+  updateMask := []string{"filter"}
+
+	if d.HasChange("edition_config") {
+		updateMask = append(updateMask, "editionConfig")
+	}
+	// updateMask is a URL parameter but not present in the schema, so ReplaceVars
+	// won't set it
+	url, err = transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})
+	if err != nil {
+		return err
+	}
+
+	url = strings.ReplaceAll(url, "storage/v1", "v2")
+
+	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		Config:    config,
+		Method:    "PATCH",
+		Project:   billingProject,
+		RawURL:    url,
+		UserAgent: userAgent,
+		Body:      obj,
+		Timeout:   d.Timeout(schema.TimeoutCreate),
+		Headers:   headers,
+	})
+	if err != nil {
+		return fmt.Errorf("Error patching Intelligence config: %s", err)
+	}
+
+	// Store the ID now
+	id, err := tpgresource.ReplaceVars(d, config, "folders/{{"{{"}}name{{"}}"}}/locations/global/intelligenceConfig")
+	if err != nil {
+		return fmt.Errorf("Error constructing id: %s", err)
+	}
+	d.SetId(id)
+
+	log.Printf("[DEBUG] Finished patching Intelligence config %q: %#v", d.Id(), res)
+
+	return resourceStorageControlFolderIntelligenceConfigRead(d, meta)

mmv1/third_party/terraform/provider/provider_mmv1_resources.go.tmpl

@@ -243,9 +243,10 @@ 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_object_signed_url":                 storage.DataSourceGoogleSignedUrl(),
 	"google_storage_project_service_account":           storage.DataSourceGoogleStorageProjectServiceAccount(),
-  "google_storage_control_project_intelligence_config":  storagecontrol.DataSourceGoogleStorageControlProjectIntelligenceConfig(),
+	"google_storage_control_project_intelligence_config":  storagecontrol.DataSourceGoogleStorageControlProjectIntelligenceConfig(),
 	"google_storage_transfer_project_service_account":  storagetransfer.DataSourceGoogleStorageTransferProjectServiceAccount(),
 	"google_tags_tag_key":                              tags.DataSourceGoogleTagsTagKey(),
 	"google_tags_tag_keys":                             tags.DataSourceGoogleTagsTagKeys(),

mmv1/third_party/terraform/services/storagecontrol/data_source_storage_control_folder_intelligence_config.go

@@ -0,0 +1,40 @@
+package storagecontrol
+
+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 {
+
+	dsSchema := tpgresource.DatasourceSchemaFromResourceSchema(ResourceStorageControlFolderIntelligenceConfig().Schema)
+	tpgresource.AddRequiredFieldsToSchema(dsSchema, "name")
+
+	return &schema.Resource{
+		Read:   dataSourceGoogleStorageControlFolderIntelligenceConfigRead,
+		Schema: dsSchema,
+	}
+}
+
+func dataSourceGoogleStorageControlFolderIntelligenceConfigRead(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)
+	}
+	d.SetId(id)
+	err = resourceStorageControlFolderIntelligenceConfigRead(d, meta)
+	if err != nil {
+		return err
+	}
+
+	if d.Id() == "" {
+		return fmt.Errorf("%s not found", id)
+	}
+
+	return nil
+}

mmv1/third_party/terraform/services/storagecontrol/data_source_storage_control_folder_intelligence_config_test.go

@@ -0,0 +1,61 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+package storagecontrol_test
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	"github.com/hashicorp/terraform-provider-google/google/envvar"
+)
+
+func TestAccDataSourceGoogleStorageControlFolderIntelligenceConfig_basic(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+		"org_id":        envvar.GetTestOrgFromEnv(t),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		ExternalProviders: map[string]resource.ExternalProvider{
+			"time": {},
+		},
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceGoogleStorageControlFolderIntelligenceConfig_basic(context),
+				Check: resource.ComposeTestCheckFunc(
+					acctest.CheckDataSourceStateMatchesResourceState("data.google_storage_control_folder_intelligence_config.folder_storage_intelligence", "google_storage_control_folder_intelligence_config.folder_storage_intelligence"),
+				),
+			},
+		},
+	})
+}
+
+func testAccDataSourceGoogleStorageControlFolderIntelligenceConfig_basic(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_folder" "folder" {
+  parent       = "organizations/%{org_id}"
+  display_name = "tf-test-folder-name%{random_suffix}"
+  deletion_protection=false
+}
+
+resource "time_sleep" "wait_120_seconds" {
+  depends_on = [google_folder.folder]
+  create_duration = "120s"
+}
+
+resource "google_storage_control_folder_intelligence_config" "folder_storage_intelligence" {
+  name = google_folder.folder.folder_id
+  edition_config = "STANDARD"
+  depends_on = [time_sleep.wait_120_seconds]
+}
+
+data "google_storage_control_folder_intelligence_config" "folder_storage_intelligence" {
+  name = google_storage_control_folder_intelligence_config.folder_storage_intelligence.name
+}
+`, context)
+}