Added - Support for Oracle Cloud Advisor v2

Author: taorliu960926

examples/optimizer/main.tf

@@ -31,6 +31,10 @@ provider "oci" {
 data "oci_optimizer_categories" "test_categories" {
   compartment_id = "${var.tenancy_ocid}"
   compartment_id_in_subtree = "true"
+  filter {
+    name   = "name"
+    values = ["cost-management-name"]
+  }
 }
 
 data "oci_optimizer_category" "test_category" {
@@ -163,4 +167,13 @@ data "oci_optimizer_recommendation_strategies" "test_recommendation_strategies"
   #Required
   compartment_id            = "${var.tenancy_ocid}"
   compartment_id_in_subtree = "true"
-}
+}
+
+// profile level
+data "oci_optimizer_profile_levels" "test_profile_levels" {
+  #Required
+  compartment_id            = "${var.tenancy_ocid}"
+  compartment_id_in_subtree = "true"
+  #optional
+  recommendation_name = "cost-management-compute-host-underutilized-name"
+}

oci/optimizer_categories_data_source.go

@@ -62,6 +62,11 @@ func OptimizerCategoriesDataSource() *schema.Resource {
 										Type:     schema.TypeFloat,
 										Computed: true,
 									},
+									"extended_metadata": {
+										Type:     schema.TypeMap,
+										Computed: true,
+										Elem:     schema.TypeString,
+									},
 									"id": {
 										Type:     schema.TypeString,
 										Computed: true,

oci/optimizer_category_data_source.go

@@ -35,6 +35,11 @@ func OptimizerCategoryDataSource() *schema.Resource {
 				Type:     schema.TypeFloat,
 				Computed: true,
 			},
+			"extended_metadata": {
+				Type:     schema.TypeMap,
+				Computed: true,
+				Elem:     schema.TypeString,
+			},
 			"name": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -153,6 +158,8 @@ func (s *OptimizerCategoryDataSourceCrud) SetData() error {
 		s.D.Set("estimated_cost_saving", *s.Res.EstimatedCostSaving)
 	}
 
+	s.D.Set("extended_metadata", s.Res.ExtendedMetadata)
+
 	if s.Res.Name != nil {
 		s.D.Set("name", *s.Res.Name)
 	}
@@ -197,6 +204,8 @@ func CategorySummaryToMap(obj oci_optimizer.CategorySummary) map[string]interfac
 		result["estimated_cost_saving"] = float32(*obj.EstimatedCostSaving)
 	}
 
+	result["extended_metadata"] = obj.ExtendedMetadata
+
 	if obj.Id != nil {
 		result["id"] = string(*obj.Id)
 	}

oci/optimizer_histories_data_source.go

@@ -316,7 +316,7 @@ func HistorySummaryToMap(obj oci_optimizer.HistorySummary) map[string]interface{
 		result["estimated_cost_saving"] = float32(*obj.EstimatedCostSaving)
 	}
 
-	result["extended_metadata"] = obj.ExtendedMetadata
+	result["extended_metadata"] = GenericMapToJsonMap(obj.ExtendedMetadata)
 
 	if obj.Id != nil {
 		result["id"] = string(*obj.Id)

oci/optimizer_profile_data_source.go

@@ -67,6 +67,10 @@ func (s *OptimizerProfileDataSourceCrud) SetData() error {
 
 	s.D.SetId(*s.Res.Id)
 
+	if s.Res.AggregationIntervalInDays != nil {
+		s.D.Set("aggregation_interval_in_days", *s.Res.AggregationIntervalInDays)
+	}
+
 	if s.Res.CompartmentId != nil {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}

oci/optimizer_profile_level_data_source.go

@@ -0,0 +1,234 @@
+// 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_optimizer "github.com/oracle/oci-go-sdk/v51/optimizer"
+)
+
+func init() {
+	RegisterDatasource("oci_optimizer_profile_level", OptimizerProfileLevelDataSource())
+}
+
+func OptimizerProfileLevelDataSource() *schema.Resource {
+	return &schema.Resource{
+		Read: readSingularOptimizerProfileLevel,
+		Schema: map[string]*schema.Schema{
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"compartment_id_in_subtree": {
+				Type:     schema.TypeBool,
+				Required: true,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"recommendation_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			// Computed
+			"items": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"default_interval": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"metrics": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									// Required
+
+									// Optional
+
+									// Computed
+									"name": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"statistic": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"target": {
+										Type:     schema.TypeFloat,
+										Computed: true,
+									},
+									"threshold": {
+										Type:     schema.TypeFloat,
+										Computed: true,
+									},
+								},
+							},
+						},
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"recommendation_name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"time_created": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"time_updated": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"valid_intervals": {
+							Type:     schema.TypeList,
+							Computed: true,
+							MinItems: 1,
+							Elem: &schema.Schema{
+								Type: schema.TypeInt,
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func readSingularOptimizerProfileLevel(d *schema.ResourceData, m interface{}) error {
+	sync := &OptimizerProfileLevelDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).optimizerClient()
+
+	return ReadResource(sync)
+}
+
+type OptimizerProfileLevelDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_optimizer.OptimizerClient
+	Res    *oci_optimizer.ListProfileLevelsResponse
+}
+
+func (s *OptimizerProfileLevelDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *OptimizerProfileLevelDataSourceCrud) Get() error {
+	request := oci_optimizer.ListProfileLevelsRequest{}
+
+	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := compartmentId.(string)
+		request.CompartmentId = &tmp
+	}
+
+	if compartmentIdInSubtree, ok := s.D.GetOkExists("compartment_id_in_subtree"); ok {
+		tmp := compartmentIdInSubtree.(bool)
+		request.CompartmentIdInSubtree = &tmp
+	}
+
+	if name, ok := s.D.GetOkExists("name"); ok {
+		tmp := name.(string)
+		request.Name = &tmp
+	}
+
+	if recommendationName, ok := s.D.GetOkExists("recommendation_name"); ok {
+		tmp := recommendationName.(string)
+		request.RecommendationName = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = GetRetryPolicy(false, "optimizer")
+
+	response, err := s.Client.ListProfileLevels(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *OptimizerProfileLevelDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(GenerateDataSourceHashID("OptimizerProfileLevelDataSource-", OptimizerProfileLevelDataSource(), s.D))
+
+	items := []interface{}{}
+	for _, item := range s.Res.Items {
+		items = append(items, ProfileLevelSummaryToMap(item))
+	}
+	s.D.Set("items", items)
+
+	return nil
+}
+
+func optimizerEvaluatedMetricToMap(obj oci_optimizer.EvaluatedMetric) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.Name != nil {
+		result["name"] = string(*obj.Name)
+	}
+
+	if obj.Statistic != nil {
+		result["statistic"] = string(*obj.Statistic)
+	}
+
+	if obj.Target != nil {
+		result["target"] = float64(*obj.Target)
+	}
+
+	if obj.Threshold != nil {
+		result["threshold"] = float64(*obj.Threshold)
+	}
+
+	return result
+}
+
+func optimizerProfileLevelSummaryToMap(obj oci_optimizer.ProfileLevelSummary) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.DefaultInterval != nil {
+		result["default_interval"] = int(*obj.DefaultInterval)
+	}
+
+	metrics := []interface{}{}
+	for _, item := range obj.Metrics {
+		metrics = append(metrics, EvaluatedMetricToMap(item))
+	}
+	result["metrics"] = metrics
+
+	if obj.Name != nil {
+		result["name"] = string(*obj.Name)
+	}
+
+	if obj.RecommendationName != nil {
+		result["recommendation_name"] = string(*obj.RecommendationName)
+	}
+
+	if obj.TimeCreated != nil {
+		result["time_created"] = obj.TimeCreated.String()
+	}
+
+	if obj.TimeUpdated != nil {
+		result["time_updated"] = obj.TimeUpdated.String()
+	}
+
+	result["valid_intervals"] = obj.ValidIntervals
+
+	return result
+}

oci/optimizer_profile_level_test.go

@@ -0,0 +1,73 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+
+	"github.com/terraform-providers/terraform-provider-oci/httpreplay"
+)
+
+var (
+	profileLevelSingularDataSourceRepresentation = map[string]interface{}{
+		"compartment_id":            Representation{RepType: Required, Create: `${var.compartment_id}`},
+		"compartment_id_in_subtree": Representation{RepType: Required, Create: `true`},
+		"recommendation_name":       Representation{RepType: Required, Create: `${oci_optimizer_recommendation.test_recommendation.name}`},
+	}
+
+	profileLevelDataSourceRepresentation = map[string]interface{}{
+		"compartment_id":            Representation{RepType: Required, Create: `${var.compartment_id}`},
+		"compartment_id_in_subtree": Representation{RepType: Required, Create: `true`},
+		"recommendation_name":       Representation{RepType: Required, Create: `${oci_optimizer_recommendation.test_recommendation.name}`},
+	}
+
+	ProfileLevelResourceConfig = RecommendationResourceDependencies + GenerateResourceFromRepresentationMap("oci_optimizer_recommendation", "test_recommendation", Required, Create, recommendationRepresentation)
+)
+
+// issue-routing-tag: optimizer/default
+func TestOptimizerProfileLevelResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestOptimizerProfileLevelResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := testProviderConfig()
+
+	compartmentId := getEnvSettingWithBlankDefault("tenancy_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	datasourceName := "data.oci_optimizer_profile_levels.test_profile_levels"
+	singularDatasourceName := "data.oci_optimizer_profile_level.test_profile_level"
+
+	SaveConfigContent("", "", "", t)
+
+	ResourceTest(t, nil, []resource.TestStep{
+		// verify datasource
+		{
+			Config: config +
+				GenerateDataSourceFromRepresentationMap("oci_optimizer_profile_levels", "test_profile_levels", Required, Create, profileLevelDataSourceRepresentation) +
+				compartmentIdVariableStr + ProfileLevelResourceConfig,
+			Check: ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(datasourceName, "compartment_id_in_subtree", "true"),
+				resource.TestCheckResourceAttrSet(datasourceName, "recommendation_name"),
+				resource.TestCheckResourceAttrSet(datasourceName, "profile_level_collection.#"),
+				resource.TestCheckResourceAttrSet(datasourceName, "profile_level_collection.0.items.#"),
+			),
+		},
+		// verify singular datasource
+		{
+			Config: config +
+				GenerateDataSourceFromRepresentationMap("oci_optimizer_profile_level", "test_profile_level", Required, Create, profileLevelSingularDataSourceRepresentation) +
+				compartmentIdVariableStr + ProfileLevelResourceConfig,
+			Check: ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id_in_subtree", "true"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "recommendation_name"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "items.#"),
+			),
+		},
+	})
+}