Support save report in cost analysis

Author: jotruon

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Added
 - Support for Maintenance Windows History in `database`
+- Support save report in cost analysis
 
 ## 4.18.0 (March 17, 2021)
 

examples/metering_computation/query/main.tf

@@ -0,0 +1,95 @@
+// 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 "compartment_ocid" {
+}
+
+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_usage_ended" {
+  default = "2020-01-02T00:00:00.000Z"
+}
+
+variable "time_usage_started" {
+  default = "2020-01-01T00:00:00.000Z"
+}
+
+variable "dimensions_value" {
+  default = "dimensions_value"
+}
+
+resource "oci_metering_computation_query" "test_query" {
+  #Required
+  compartment_id = var.tenancy_ocid
+  query_definition {
+    #Required
+    cost_analysis_ui {
+
+      #Optional
+      graph               = "BARS"
+      is_cumulative_graph = false
+    }
+    display_name = "tf_display_name"
+    report_query {
+      #Required
+      granularity = "DAILY"
+      tenant_id   = var.tenancy_ocid
+
+      #Optional
+      compartment_depth = 1
+      date_range_name   = "LAST_TEN_DAYS"
+      filter            = <<EOF
+    {
+            "operator": "AND",
+            "dimensions": [],
+            "tags": [],
+            "filters": [
+                {
+    				"operator": "OR",
+                    "dimensions": [
+    				    {
+                            "key": "compartmentName",
+                            "value": "${var.dimensions_value}"
+    					  }
+                    ],
+                    "filters": null,
+                    "tags": []
+    		    }
+            ]
+    }
+    EOF
+
+      group_by = []
+      is_aggregate_by_time = false
+      query_type           = "COST"
+    }
+    version = 1
+  }
+}
+
+data "oci_metering_computation_queries" "test_queries" {
+  #Required
+  compartment_id = var.tenancy_ocid
+}

examples/metering_computation/main.tf renamed to examples/metering_computation/usage/main.tf

@@ -29,12 +29,15 @@ provider "oci" {
 }
 
 variable "time_usage_ended" {
+  default = "2020-01-02T00:00:00.000Z"
 }
 
 variable "time_usage_started" {
+  default = "2020-01-01T00:00:00.000Z"
 }
 
 variable "dimensions_value" {
+  default = "dimensions_value"
 }
 
 resource "oci_metering_computation_usage" "test_usage" {
@@ -76,4 +79,3 @@ EOF
 data "oci_metering_computation_configuration" "test_configuration" {
   tenant_id = var.tenancy_ocid
 }
-

oci/export_definitions.go

@@ -1586,6 +1586,14 @@ var exportMarketplaceAcceptedAgreementHints = &TerraformResourceHints{
 	requireResourceRefresh: true,
 }
 
+var exportMeteringComputationQueryHints = &TerraformResourceHints{
+	resourceClass:          "oci_metering_computation_query",
+	datasourceClass:        "oci_metering_computation_queries",
+	datasourceItemsAttr:    "query_collection",
+	resourceAbbreviation:   "query",
+	requireResourceRefresh: true,
+}
+
 var exportMonitoringAlarmHints = &TerraformResourceHints{
 	resourceClass:          "oci_monitoring_alarm",
 	datasourceClass:        "oci_monitoring_alarms",

oci/export_graphs.go

@@ -706,6 +706,12 @@ var marketplaceResourceGraph = TerraformResourceGraph{
 	},
 }
 
+var meteringComputationResourceGraph = TerraformResourceGraph{
+	"oci_identity_compartment": {
+		{TerraformResourceHints: exportMeteringComputationQueryHints},
+	},
+}
+
 var monitoringResourceGraph = TerraformResourceGraph{
 	"oci_identity_compartment": {
 		{TerraformResourceHints: exportMonitoringAlarmHints},

oci/metering_computation_queries_data_source.go

@@ -0,0 +1,119 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	oci_metering_computation "github.com/oracle/oci-go-sdk/v36/usageapi"
+)
+
+func init() {
+	RegisterDatasource("oci_metering_computation_queries", MeteringComputationQueriesDataSource())
+}
+
+func MeteringComputationQueriesDataSource() *schema.Resource {
+	return &schema.Resource{
+		Read: readMeteringComputationQueries,
+		Schema: map[string]*schema.Schema{
+			"filter": dataSourceFiltersSchema(),
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"query_collection": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+
+						"items": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem:     GetDataSourceItemSchema(MeteringComputationQueryResource()),
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func readMeteringComputationQueries(d *schema.ResourceData, m interface{}) error {
+	sync := &MeteringComputationQueriesDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).usageapiClient()
+
+	return ReadResource(sync)
+}
+
+type MeteringComputationQueriesDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_metering_computation.UsageapiClient
+	Res    *oci_metering_computation.ListQueriesResponse
+}
+
+func (s *MeteringComputationQueriesDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *MeteringComputationQueriesDataSourceCrud) Get() error {
+	request := oci_metering_computation.ListQueriesRequest{}
+
+	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := compartmentId.(string)
+		request.CompartmentId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "metering_computation")
+
+	response, err := s.Client.ListQueries(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	request.Page = s.Res.OpcNextPage
+
+	for request.Page != nil {
+		listResponse, err := s.Client.ListQueries(context.Background(), request)
+		if err != nil {
+			return err
+		}
+
+		s.Res.Items = append(s.Res.Items, listResponse.Items...)
+		request.Page = listResponse.OpcNextPage
+	}
+
+	return nil
+}
+
+func (s *MeteringComputationQueriesDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(GenerateDataSourceHashID("MeteringComputationQueriesDataSource-", MeteringComputationQueriesDataSource(), s.D))
+	resources := []map[string]interface{}{}
+	query := map[string]interface{}{}
+
+	items := []interface{}{}
+	for _, item := range s.Res.Items {
+		items = append(items, QuerySummaryToMap(item))
+	}
+	query["items"] = items
+
+	if f, fOk := s.D.GetOkExists("filter"); fOk {
+		items = ApplyFiltersInCollection(f.(*schema.Set), items, MeteringComputationQueriesDataSource().Schema["query_collection"].Elem.(*schema.Resource).Schema)
+		query["items"] = items
+	}
+
+	resources = append(resources, query)
+	if err := s.D.Set("query_collection", resources); err != nil {
+		return err
+	}
+
+	return nil
+}

oci/metering_computation_query_data_source.go

@@ -0,0 +1,81 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	oci_metering_computation "github.com/oracle/oci-go-sdk/v36/usageapi"
+)
+
+func init() {
+	RegisterDatasource("oci_metering_computation_query", MeteringComputationQueryDataSource())
+}
+
+func MeteringComputationQueryDataSource() *schema.Resource {
+	fieldMap := make(map[string]*schema.Schema)
+	fieldMap["query_id"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+	return GetSingularDataSourceItemSchema(MeteringComputationQueryResource(), fieldMap, readSingularMeteringComputationQuery)
+}
+
+func readSingularMeteringComputationQuery(d *schema.ResourceData, m interface{}) error {
+	sync := &MeteringComputationQueryDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).usageapiClient()
+
+	return ReadResource(sync)
+}
+
+type MeteringComputationQueryDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_metering_computation.UsageapiClient
+	Res    *oci_metering_computation.GetQueryResponse
+}
+
+func (s *MeteringComputationQueryDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *MeteringComputationQueryDataSourceCrud) Get() error {
+	request := oci_metering_computation.GetQueryRequest{}
+
+	if queryId, ok := s.D.GetOkExists("query_id"); ok {
+		tmp := queryId.(string)
+		request.QueryId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "metering_computation")
+
+	response, err := s.Client.GetQuery(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *MeteringComputationQueryDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(*s.Res.Id)
+
+	if s.Res.CompartmentId != nil {
+		s.D.Set("compartment_id", *s.Res.CompartmentId)
+	}
+
+	if s.Res.QueryDefinition != nil {
+		s.D.Set("query_definition", []interface{}{QueryDefinitionToMap(s.Res.QueryDefinition)})
+	} else {
+		s.D.Set("query_definition", nil)
+	}
+
+	return nil
+}