OS management support for new Count API

Author: varmax2511

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Added
 - Support change compartment using lifecycle state
 - Support retry for Eventually consistency failure
+- Support for Count API added to `os_management` resource
 
 ## 4.42.0 (September 01, 2021)
 

examples/management_agent/management_agent.tf

@@ -38,7 +38,7 @@ resource "oci_management_agent_management_agent_install_key" "test_management_ag
   #Optional
   allowed_key_install_count = "200"
   display_name              = "displayName"
-  time_expires              = "2021-05-27T17:27:44.398Z"
+  time_expires              = "2022-05-27T17:27:44.398Z"
 }
 
 data "oci_management_agent_management_agent_install_keys" "test_management_agent_install_keys" {
@@ -67,5 +67,6 @@ data "oci_management_agent_management_agent_available_histories" "test_managemen
 
   #Optional
   time_availability_status_ended_greater_than      = "2020-01-15T01:01:01.000Z"
-  time_availability_status_started_less_than       = "2020-09-28T01:01:01.000Z"
-}
+  time_availability_status_started_less_than       = "2029-09-28T01:01:01.000Z"
+
+}

examples/management_agent/management_agent_agents_count.tf

@@ -0,0 +1,9 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+data "oci_management_agent_management_agent_count" "test_management_agent_count" {
+  #Required
+  compartment_id = var.compartment_ocid
+  group_by = ["version"]
+}
+

examples/management_agent/management_agent_plugin_count.tf

@@ -0,0 +1,8 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+data "oci_management_agent_management_agent_plugin_count" "test_management_agent_plugin_count" {
+  #Required
+  compartment_id = var.compartment_ocid
+  group_by = "pluginName"
+}

oci/management_agent_management_agent_count_data_source.go

@@ -0,0 +1,190 @@
+// 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_management_agent "github.com/oracle/oci-go-sdk/v46/managementagent"
+)
+
+func init() {
+	RegisterDatasource("oci_management_agent_management_agent_count", ManagementAgentManagementAgentCountDataSource())
+}
+
+func ManagementAgentManagementAgentCountDataSource() *schema.Resource {
+	return &schema.Resource{
+		Read: readSingularManagementAgentManagementAgentCount,
+		Schema: map[string]*schema.Schema{
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"group_by": {
+				Type:     schema.TypeList,
+				Required: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"has_plugins": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
+			// Computed
+			"items": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"count": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"dimensions": {
+							Type:     schema.TypeList,
+							Computed: true,
+							MaxItems: 1,
+							MinItems: 1,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									// Required
+
+									// Optional
+
+									// Computed
+									"availability_status": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"has_plugins": {
+										Type:     schema.TypeBool,
+										Computed: true,
+									},
+									"platform_type": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"version": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func readSingularManagementAgentManagementAgentCount(d *schema.ResourceData, m interface{}) error {
+	sync := &ManagementAgentManagementAgentCountDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).managementAgentClient()
+
+	return ReadResource(sync)
+}
+
+type ManagementAgentManagementAgentCountDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_management_agent.ManagementAgentClient
+	Res    *oci_management_agent.SummarizeManagementAgentCountsResponse
+}
+
+func (s *ManagementAgentManagementAgentCountDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *ManagementAgentManagementAgentCountDataSourceCrud) Get() error {
+	request := oci_management_agent.SummarizeManagementAgentCountsRequest{}
+
+	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := compartmentId.(string)
+		request.CompartmentId = &tmp
+	}
+
+	if groupBy, ok := s.D.GetOkExists("group_by"); ok {
+		interfaces := groupBy.([]interface{})
+		tmp := make([]oci_management_agent.ManagementAgentGroupByEnum, len(interfaces))
+		for i := range interfaces {
+			if interfaces[i] != nil {
+				tmp[i] = oci_management_agent.ManagementAgentGroupByEnum(interfaces[i].(string))
+			}
+		}
+		if len(tmp) != 0 || s.D.HasChange("group_by") {
+			request.GroupBy = tmp
+		}
+	}
+
+	if hasPlugins, ok := s.D.GetOkExists("has_plugins"); ok {
+		tmp := hasPlugins.(bool)
+		request.HasPlugins = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "management_agent")
+
+	response, err := s.Client.SummarizeManagementAgentCounts(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *ManagementAgentManagementAgentCountDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(GenerateDataSourceHashID("ManagementAgentManagementAgentCountDataSource-", ManagementAgentManagementAgentCountDataSource(), s.D))
+
+	items := []interface{}{}
+	for _, item := range s.Res.Items {
+		items = append(items, ManagementAgentAggregationToMap(item))
+	}
+	s.D.Set("items", items)
+
+	return nil
+}
+
+func ManagementAgentAggregationToMap(obj oci_management_agent.ManagementAgentAggregation) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.Count != nil {
+		result["count"] = int(*obj.Count)
+	}
+
+	if obj.Dimensions != nil {
+		result["dimensions"] = []interface{}{ManagementAgentAggregationDimensionsToMap(obj.Dimensions)}
+	}
+
+	return result
+}
+
+func ManagementAgentAggregationDimensionsToMap(obj *oci_management_agent.ManagementAgentAggregationDimensions) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	result["availability_status"] = string(obj.AvailabilityStatus)
+
+	if obj.HasPlugins != nil {
+		result["has_plugins"] = bool(*obj.HasPlugins)
+	}
+
+	result["platform_type"] = string(obj.PlatformType)
+
+	if obj.Version != nil {
+		result["version"] = string(*obj.Version)
+	}
+
+	return result
+}

oci/management_agent_management_agent_count_test.go

@@ -0,0 +1,61 @@
+// 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/hashicorp/terraform-plugin-sdk/terraform"
+
+	"github.com/terraform-providers/terraform-provider-oci/httpreplay"
+)
+
+var (
+	managementAgentCountSingularDataSourceRepresentation = map[string]interface{}{
+		"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
+		"group_by":       Representation{repType: Required, create: []string{`version`}},
+		"has_plugins":    Representation{repType: Required, create: `true`},
+	}
+
+	ManagementAgentCountResourceConfig = ""
+)
+
+// issue-routing-tag: management_agent/default
+func TestManagementAgentManagementAgentCountResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestManagementAgentManagementAgentCountResource_basic")
+	defer httpreplay.SaveScenario()
+
+	provider := testAccProvider
+	config := testProviderConfig()
+
+	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	singularDatasourceName := "data.oci_management_agent_management_agent_count.test_management_agent_count"
+
+	saveConfigContent("", "", "", t)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() { testAccPreCheck(t) },
+		Providers: map[string]terraform.ResourceProvider{
+			"oci": provider,
+		},
+		Steps: []resource.TestStep{
+			// verify singular datasource
+			{
+				Config: config +
+					generateDataSourceFromRepresentationMap("oci_management_agent_management_agent_count", "test_management_agent_count", Required, Create, managementAgentCountSingularDataSourceRepresentation) +
+					compartmentIdVariableStr + ManagementAgentCountResourceConfig,
+				Check: ComposeAggregateTestCheckFuncWrapper(
+					resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
+					resource.TestCheckResourceAttr(singularDatasourceName, "has_plugins", "true"),
+
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "items.#"),
+				),
+			},
+		},
+	})
+}

oci/management_agent_management_agent_data_source.go

@@ -87,6 +87,10 @@ func (s *ManagementAgentManagementAgentDataSourceCrud) SetData() error {
 		s.D.Set("host", *s.Res.Host)
 	}
 
+	if s.Res.HostId != nil {
+		s.D.Set("host_id", *s.Res.HostId)
+	}
+
 	if s.Res.InstallKeyId != nil {
 		s.D.Set("install_key_id", *s.Res.InstallKeyId)
 	}
@@ -99,6 +103,10 @@ func (s *ManagementAgentManagementAgentDataSourceCrud) SetData() error {
 		s.D.Set("is_agent_auto_upgradable", *s.Res.IsAgentAutoUpgradable)
 	}
 
+	if s.Res.IsCustomerDeployed != nil {
+		s.D.Set("is_customer_deployed", *s.Res.IsCustomerDeployed)
+	}
+
 	if s.Res.LifecycleDetails != nil {
 		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
 	}