fix(sample) - Update soft_delete_window(seconds) from int to float in the soft delete relative cost analyzer. (GoogleCloudPlatform#11245)

janitbidhan · web-flow · commit d7b18c3d3602 · 2024-02-23T09:54:39.000-08:00
* docs(samples): Updating readme for soft delete cost analyzer script

* Updating the way of calculations
Reviewed by team: cl/608673793

* Updating the comments

* reformatting the comments

* fix(sample) - Update seconds from int to float in the soft delete relative cost analyzer.
diff --git a/storage/cost-analysis/README.md b/storage/cost-analysis/README.md
@@ -29,7 +29,7 @@ NOTE: Due to the specific functionality related to Google Cloud APIs, this guide
 **Command-Line Arguments**
 * `project_name` - (**Required**): Specifies your GCP project name.
 * `--cost_threshold` - (Optional, default=0): Sets a relative cost threshold.
-* `--soft_delete_window` - (Optional, default= 604800 (i.e. 7 days)): Time window (in seconds) for considering soft-deleted objects..
+* `--soft_delete_window` - (Optional, default= 604800.0 (i.e. 7 days)): Time window (in seconds) for considering soft-deleted objects..
 * `--agg_days` - (Optional, default=30): The period over which to combine and aggregate results.
 * `--lookback_days` - (Optional, default=360): Time window (in days) for considering the how old the bucket to be.
 * `--list` - (Optional, default=False): Produces a simple list of bucket names.
diff --git a/storage/cost-analysis/storage_soft_delete_relative_cost_analyzer.py b/storage/cost-analysis/storage_soft_delete_relative_cost_analyzer.py
@@ -57,7 +57,7 @@ def get_relative_cost(storage_class: str) -> float:
 
 def get_soft_delete_cost(
     project_name: str,
-    soft_delete_window: int,
+    soft_delete_window: float,
     agg_days: int,
     lookback_days: int,
 ) -> Dict[str, List[Dict[str, float]]]:
@@ -98,7 +98,7 @@ def get_soft_delete_cost(
 def calculate_soft_delete_costs(
     project_name: str,
     query_client: monitoring_client.QueryServiceClient,
-    soft_delete_window: int,
+    soft_delete_window: float,
     storage_ratios_by_bucket: Dict[str, float],
     agg_days: int,
     lookback_days: int,
@@ -234,7 +234,7 @@ def get_storage_class_ratio(
 def soft_delete_relative_cost_analyzer(
     project_name: str,
     cost_threshold: float = 0.0,
-    soft_delete_window: int = 604800,
+    soft_delete_window: float = 604800,
     agg_days: int = 30,
     lookback_days: int = 360,
     list_buckets: bool = False,
@@ -292,8 +292,8 @@ def soft_delete_relative_cost_analyzer_main() -> None:
     )
     parser.add_argument(
         "--soft_delete_window",
-        type=int,
-        default=604800,
+        type=float,
+        default=604800.0,
         help="Time window (in seconds) for considering soft-deleted objects.",
     )
     parser.add_argument(
