Added - Support for Cost Management: Scheduled Reports 2.0

Author: Terraform Team Automation

examples/metering_computation/schedule/main.tf

@@ -0,0 +1,58 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+
+// These variables would commonly be defined as environment variables or sourced in a .env file
+
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "region" {
+}
+
+provider "oci" {
+  region           = var.region
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+}
+
+variable "time_scheduled" {
+  default = "2022-10-02T00:00:00.000Z"
+}
+
+resource "oci_metering_computation_schedule" "test_schedule" {
+  #Required
+  compartment_id       = var.tenancy_ocid
+  name                 = "name"
+  time_scheduled       = var.time_scheduled
+  schedule_recurrences = "DAILY"
+  result_location {
+    #Required
+    bucket        = "costCsv"
+    location_type = "OBJECT_STORAGE"
+    namespace     = "r1uoqjtybbv4"
+    region        = "us-seattle-1"
+  }
+  query_properties {
+    #Required
+    date_range {
+      #Required
+      date_range_type         = "DYNAMIC"
+      dynamic_date_range_type = "LAST_7_DAYS" 
+    }
+    granularity = "DAILY"
+  }
+
+  #Optional
+  description          = "description"
+  output_file_format   = "CSV"
+}

internal/integrationtest/metering_computation_schedule_test.go

@@ -47,7 +47,9 @@ var (
 		"query_properties":     acctest.RepresentationGroup{RepType: acctest.Required, Group: MeteringComputationScheduleQueryPropertiesRepresentation},
 		"result_location":      acctest.RepresentationGroup{RepType: acctest.Required, Group: MeteringComputationScheduleResultLocationRepresentation},
 		"schedule_recurrences": acctest.Representation{RepType: acctest.Required, Create: `DAILY`},
-		"time_scheduled":       acctest.Representation{RepType: acctest.Required, Create: `2022-06-19T00:00:00Z`},
+		"time_scheduled":       acctest.Representation{RepType: acctest.Required, Create: `2022-10-19T00:00:00Z`},
+		"description":          acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
+		"output_file_format":   acctest.Representation{RepType: acctest.Optional, Create: `CSV`, Update: `PDF`},
 	}
 	MeteringComputationScheduleQueryPropertiesRepresentation = map[string]interface{}{
 		"date_range":  acctest.RepresentationGroup{RepType: acctest.Required, Group: MeteringComputationScheduleQueryPropertiesDateRangeRepresentation},
@@ -103,7 +105,7 @@ func TestMeteringComputationScheduleResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "result_location.0.namespace", "idy3u7psgoxm"),
 				resource.TestCheckResourceAttr(resourceName, "result_location.0.region", "us-ashburn-1"),
 				resource.TestCheckResourceAttr(resourceName, "schedule_recurrences", "DAILY"),
-				resource.TestCheckResourceAttr(resourceName, "time_scheduled", "2022-06-19T00:00:00Z"),
+				resource.TestCheckResourceAttr(resourceName, "time_scheduled", "2022-10-19T00:00:00Z"),
 
 				func(s *terraform.State) (err error) {
 					resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -135,6 +137,8 @@ func TestMeteringComputationScheduleResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "result_location.0.namespace", "idy3u7psgoxm"),
 				resource.TestCheckResourceAttr(resourceName, "result_location.0.region", "us-ashburn-1"),
 				resource.TestCheckResourceAttr(resourceName, "schedule_recurrences", "DAILY"),
+				resource.TestCheckResourceAttr(resourceName, "description", "description"),
+				resource.TestCheckResourceAttr(resourceName, "output_file_format", "CSV"),
 
 				func(s *terraform.State) (err error) {
 					resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -167,6 +171,8 @@ func TestMeteringComputationScheduleResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "result_location.0.namespace", "idy3u7psgoxm"),
 				resource.TestCheckResourceAttr(resourceName, "result_location.0.region", "us-ashburn-1"),
 				resource.TestCheckResourceAttr(resourceName, "schedule_recurrences", "DAILY"),
+				resource.TestCheckResourceAttr(resourceName, "description", "description2"),
+				resource.TestCheckResourceAttr(resourceName, "output_file_format", "PDF"),
 
 				func(s *terraform.State) (err error) {
 					resId2, err = acctest.FromInstanceState(s, resourceName, "id")

internal/service/metering_computation/metering_computation_schedule_data_source.go

@@ -75,12 +75,18 @@ func (s *MeteringComputationScheduleDataSourceCrud) SetData() error {
 		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
 	}
 
+	if s.Res.Description != nil {
+		s.D.Set("description", *s.Res.Description)
+	}
+
 	s.D.Set("freeform_tags", s.Res.FreeformTags)
 
 	if s.Res.Name != nil {
 		s.D.Set("name", *s.Res.Name)
 	}
 
+	s.D.Set("output_file_format", s.Res.OutputFileFormat)
+
 	if s.Res.QueryProperties != nil {
 		s.D.Set("query_properties", []interface{}{QueryPropertiesToMap(s.Res.QueryProperties)})
 	} else {
@@ -97,6 +103,10 @@ func (s *MeteringComputationScheduleDataSourceCrud) SetData() error {
 		s.D.Set("result_location", nil)
 	}
 
+	if s.Res.SavedReportId != nil {
+		s.D.Set("saved_report_id", *s.Res.SavedReportId)
+	}
+
 	if s.Res.ScheduleRecurrences != nil {
 		s.D.Set("schedule_recurrences", *s.Res.ScheduleRecurrences)
 	}
@@ -111,6 +121,10 @@ func (s *MeteringComputationScheduleDataSourceCrud) SetData() error {
 		s.D.Set("time_created", s.Res.TimeCreated.String())
 	}
 
+	if s.Res.TimeNextRun != nil {
+		s.D.Set("time_next_run", s.Res.TimeNextRun.String())
+	}
+
 	if s.Res.TimeScheduled != nil {
 		s.D.Set("time_scheduled", s.Res.TimeScheduled.Format(time.RFC3339Nano))
 	}