Revert "Add activity journal feature for google_storage_insights_dataset_config" (#15279) (#10824)

[upstream:4c29c61dc50d9eeb2cac1869b1b629de6e091241]

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

Author: modular-magician

.changelog/15279.txt

@@ -0,0 +1,3 @@
+```release-note:breaking-change
+storageinsights: removed `activity_data_retention_period_days` field from `google_storage_insights_dataset_config` resource due to a delayed launch. It will be readded when the feature launches.
+```

google-beta/services/storageinsights/resource_storage_insights_dataset_config.go

@@ -96,11 +96,6 @@ func ResourceStorageInsightsDatasetConfig() *schema.Resource {
 				Required:    true,
 				Description: `Number of days of history that must be retained.`,
 			},
-			"activity_data_retention_period_days": {
-				Type:        schema.TypeInt,
-				Optional:    true,
-				Description: `Number of days of activity data that must be retained. If not specified, retentionPeriodDays will be used. Set to 0 to turn off the activity data.`,
-			},
 			"description": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -358,12 +353,6 @@ func resourceStorageInsightsDatasetConfigCreate(d *schema.ResourceData, meta int
 	} else if v, ok := d.GetOkExists("retention_period_days"); !tpgresource.IsEmptyValue(reflect.ValueOf(retentionPeriodDaysProp)) && (ok || !reflect.DeepEqual(v, retentionPeriodDaysProp)) {
 		obj["retentionPeriodDays"] = retentionPeriodDaysProp
 	}
-	activityDataRetentionPeriodDaysProp, err := expandStorageInsightsDatasetConfigActivityDataRetentionPeriodDays(d.Get("activity_data_retention_period_days"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("activity_data_retention_period_days"); !tpgresource.IsEmptyValue(reflect.ValueOf(activityDataRetentionPeriodDaysProp)) && (ok || !reflect.DeepEqual(v, activityDataRetentionPeriodDaysProp)) {
-		obj["activityDataRetentionPeriodDays"] = activityDataRetentionPeriodDaysProp
-	}
 	identityProp, err := expandStorageInsightsDatasetConfigIdentity(d.Get("identity"), d, config)
 	if err != nil {
 		return err
@@ -578,9 +567,6 @@ func resourceStorageInsightsDatasetConfigRead(d *schema.ResourceData, meta inter
 	if err := d.Set("retention_period_days", flattenStorageInsightsDatasetConfigRetentionPeriodDays(res["retentionPeriodDays"], d, config)); err != nil {
 		return fmt.Errorf("Error reading DatasetConfig: %s", err)
 	}
-	if err := d.Set("activity_data_retention_period_days", flattenStorageInsightsDatasetConfigActivityDataRetentionPeriodDays(res["activityDataRetentionPeriodDays"], d, config)); err != nil {
-		return fmt.Errorf("Error reading DatasetConfig: %s", err)
-	}
 	if err := d.Set("link", flattenStorageInsightsDatasetConfigLink(res["link"], d, config)); err != nil {
 		return fmt.Errorf("Error reading DatasetConfig: %s", err)
 	}
@@ -646,12 +632,6 @@ func resourceStorageInsightsDatasetConfigUpdate(d *schema.ResourceData, meta int
 	} else if v, ok := d.GetOkExists("retention_period_days"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, retentionPeriodDaysProp)) {
 		obj["retentionPeriodDays"] = retentionPeriodDaysProp
 	}
-	activityDataRetentionPeriodDaysProp, err := expandStorageInsightsDatasetConfigActivityDataRetentionPeriodDays(d.Get("activity_data_retention_period_days"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("activity_data_retention_period_days"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, activityDataRetentionPeriodDaysProp)) {
-		obj["activityDataRetentionPeriodDays"] = activityDataRetentionPeriodDaysProp
-	}
 	descriptionProp, err := expandStorageInsightsDatasetConfigDescription(d.Get("description"), d, config)
 	if err != nil {
 		return err
@@ -718,10 +698,6 @@ func resourceStorageInsightsDatasetConfigUpdate(d *schema.ResourceData, meta int
 		updateMask = append(updateMask, "retentionPeriodDays")
 	}
 
-	if d.HasChange("activity_data_retention_period_days") {
-		updateMask = append(updateMask, "activityDataRetentionPeriodDays")
-	}
-
 	if d.HasChange("description") {
 		updateMask = append(updateMask, "description")
 	}
@@ -982,23 +958,6 @@ func flattenStorageInsightsDatasetConfigRetentionPeriodDays(v interface{}, d *sc
 	return v // let terraform core handle it otherwise
 }
 
-func flattenStorageInsightsDatasetConfigActivityDataRetentionPeriodDays(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	// Handles the string fixed64 format
-	if strVal, ok := v.(string); ok {
-		if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
-			return intVal
-		}
-	}
-
-	// number values are represented as float64
-	if floatVal, ok := v.(float64); ok {
-		intVal := int(floatVal)
-		return intVal
-	}
-
-	return v // let terraform core handle it otherwise
-}
-
 func flattenStorageInsightsDatasetConfigLink(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return nil
@@ -1217,10 +1176,6 @@ func expandStorageInsightsDatasetConfigRetentionPeriodDays(v interface{}, d tpgr
 	return v, nil
 }
 
-func expandStorageInsightsDatasetConfigActivityDataRetentionPeriodDays(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
-	return v, nil
-}
-
 func expandStorageInsightsDatasetConfigIdentity(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	if v == nil {
 		return nil, nil

google-beta/services/storageinsights/resource_storage_insights_dataset_config_generated_meta.yaml

@@ -5,7 +5,6 @@ api_service_name: 'storageinsights.googleapis.com'
 api_version: 'v1'
 api_resource_type_kind: 'DatasetConfig'
 fields:
-  - field: 'activity_data_retention_period_days'
   - field: 'create_time'
   - field: 'dataset_config_id'
     provider_only: true

google-beta/services/storageinsights/resource_storage_insights_dataset_config_generated_test.go

@@ -116,7 +116,6 @@ resource "google_storage_insights_dataset_config" "config_excludes" {
     location = "us-central1"
     dataset_config_id = "tf_test_my_config_excludes%{random_suffix}"
     retention_period_days = 1
-    activity_data_retention_period_days = 2
     organization_scope = true
     identity {
         type = "IDENTITY_TYPE_PER_PROJECT"

google-beta/services/storageinsights/resource_storage_insights_dataset_config_test.go

@@ -236,7 +236,6 @@ resource "google_storage_insights_dataset_config" "config" {
   location = "us-central1"
   dataset_config_id = "tf_test_my_config%{random_suffix}"
   retention_period_days = 1
-  activity_data_retention_period_days = 2
   source_folders {
     folder_numbers = ["123", "456"]
   }
@@ -253,7 +252,6 @@ resource "google_storage_insights_dataset_config" "config" {
   location = "us-central1"
   dataset_config_id = "tf_test_my_config%{random_suffix}"
   retention_period_days = 1
-  activity_data_retention_period_days = 0
   organization_scope = true
   identity {
     type = "IDENTITY_TYPE_PER_CONFIG"

website/docs/r/storage_insights_dataset_config.html.markdown

@@ -78,7 +78,6 @@ resource "google_storage_insights_dataset_config" "config_excludes" {
     location = "us-central1"
     dataset_config_id = "my_config_excludes"
     retention_period_days = 1
-    activity_data_retention_period_days = 2
     organization_scope = true
     identity {
         type = "IDENTITY_TYPE_PER_PROJECT"
@@ -129,10 +128,6 @@ The following arguments are supported:
   (Optional)
   If set to true, the request includes all the newly created buckets in the dataset that meet the inclusion and exclusion rules.
 
-* `activity_data_retention_period_days` -
-  (Optional)
-  Number of days of activity data that must be retained. If not specified, retentionPeriodDays will be used. Set to 0 to turn off the activity data.
-
 * `description` -
   (Optional)
   An optional user-provided description for the dataset configuration with a maximum length of 256 characters.