Added - Gateway plugin support for Management Agent

Author: richardambridge

examples/management_agent/management_agent.tf

@@ -70,3 +70,8 @@ data "oci_management_agent_management_agent_available_histories" "test_managemen
   time_availability_status_started_less_than       = "2029-09-28T01:01:01.000Z"
 
 }
+
+data "oci_management_agent_management_agent_get_auto_upgradable_config" "test_management_agent_get_auto_upgradable_config" {
+  #Required
+  compartment_id = var.tenancy_ocid
+}

oci/management_agent_management_agent_count_data_source.go

@@ -33,6 +33,10 @@ func ManagementAgentManagementAgentCountDataSource() *schema.Resource {
 				Type:     schema.TypeBool,
 				Optional: true,
 			},
+			"install_type": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			// Computed
 			"items": {
 				Type:     schema.TypeList,
@@ -68,6 +72,10 @@ func ManagementAgentManagementAgentCountDataSource() *schema.Resource {
 										Type:     schema.TypeBool,
 										Computed: true,
 									},
+									"install_type": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
 									"platform_type": {
 										Type:     schema.TypeString,
 										Computed: true,
@@ -130,6 +138,10 @@ func (s *ManagementAgentManagementAgentCountDataSourceCrud) Get() error {
 		request.HasPlugins = &tmp
 	}
 
+	if installType, ok := s.D.GetOkExists("install_type"); ok {
+		request.InstallType = oci_management_agent.SummarizeManagementAgentCountsInstallTypeEnum(installType.(string))
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "management_agent")
 
 	response, err := s.Client.SummarizeManagementAgentCounts(context.Background(), request)
@@ -180,6 +192,8 @@ func ManagementAgentAggregationDimensionsToMap(obj *oci_management_agent.Managem
 		result["has_plugins"] = bool(*obj.HasPlugins)
 	}
 
+	result["install_type"] = string(obj.InstallType)
+
 	result["platform_type"] = string(obj.PlatformType)
 
 	if obj.Version != nil {

oci/management_agent_management_agent_count_test.go

@@ -8,7 +8,6 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 
 	"github.com/terraform-providers/terraform-provider-oci/httpreplay"
 )
@@ -18,6 +17,7 @@ var (
 		"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
 		"group_by":       Representation{repType: Required, create: []string{`version`}},
 		"has_plugins":    Representation{repType: Required, create: `true`},
+		"install_type":   Representation{repType: Required, create: `AGENT`},
 	}
 
 	ManagementAgentCountResourceConfig = ""
@@ -28,7 +28,6 @@ func TestManagementAgentManagementAgentCountResource_basic(t *testing.T) {
 	httpreplay.SetScenario("TestManagementAgentManagementAgentCountResource_basic")
 	defer httpreplay.SaveScenario()
 
-	provider := testAccProvider
 	config := testProviderConfig()
 
 	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
@@ -38,24 +37,19 @@ func TestManagementAgentManagementAgentCountResource_basic(t *testing.T) {
 
 	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.#"),
-				),
-			},
+	ResourceTest(t, nil, []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.TestCheckResourceAttr(singularDatasourceName, "install_type", "AGENT"),
+
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "items.#"),
+			),
 		},
 	})
 }

oci/management_agent_management_agent_data_source.go

@@ -99,6 +99,8 @@ func (s *ManagementAgentManagementAgentDataSourceCrud) SetData() error {
 		s.D.Set("install_path", *s.Res.InstallPath)
 	}
 
+	s.D.Set("install_type", s.Res.InstallType)
+
 	if s.Res.IsAgentAutoUpgradable != nil {
 		s.D.Set("is_agent_auto_upgradable", *s.Res.IsAgentAutoUpgradable)
 	}
@@ -127,6 +129,10 @@ func (s *ManagementAgentManagementAgentDataSourceCrud) SetData() error {
 	}
 	s.D.Set("plugin_list", pluginList)
 
+	if s.Res.ResourceArtifactVersion != nil {
+		s.D.Set("resource_artifact_version", *s.Res.ResourceArtifactVersion)
+	}
+
 	s.D.Set("state", s.Res.LifecycleState)
 
 	if s.Res.TimeCreated != nil {

oci/management_agent_management_agent_get_auto_upgradable_config_data_source.go

@@ -0,0 +1,83 @@
+// 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/v48/managementagent"
+)
+
+func init() {
+	RegisterDatasource("oci_management_agent_management_agent_get_auto_upgradable_config", ManagementAgentManagementAgentGetAutoUpgradableConfigDataSource())
+}
+
+func ManagementAgentManagementAgentGetAutoUpgradableConfigDataSource() *schema.Resource {
+	return &schema.Resource{
+		Read: readSingularManagementAgentManagementAgentGetAutoUpgradableConfig,
+		Schema: map[string]*schema.Schema{
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			// Computed
+			"is_agent_auto_upgradable": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func readSingularManagementAgentManagementAgentGetAutoUpgradableConfig(d *schema.ResourceData, m interface{}) error {
+	sync := &ManagementAgentManagementAgentGetAutoUpgradableConfigDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).managementAgentClient()
+
+	return ReadResource(sync)
+}
+
+type ManagementAgentManagementAgentGetAutoUpgradableConfigDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_management_agent.ManagementAgentClient
+	Res    *oci_management_agent.GetAutoUpgradableConfigResponse
+}
+
+func (s *ManagementAgentManagementAgentGetAutoUpgradableConfigDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *ManagementAgentManagementAgentGetAutoUpgradableConfigDataSourceCrud) Get() error {
+	request := oci_management_agent.GetAutoUpgradableConfigRequest{}
+
+	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := compartmentId.(string)
+		request.CompartmentId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "management_agent")
+
+	response, err := s.Client.GetAutoUpgradableConfig(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *ManagementAgentManagementAgentGetAutoUpgradableConfigDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(GenerateDataSourceHashID("ManagementAgentManagementAgentGetAutoUpgradableConfigDataSource-", ManagementAgentManagementAgentGetAutoUpgradableConfigDataSource(), s.D))
+
+	if s.Res.IsAgentAutoUpgradable != nil {
+		s.D.Set("is_agent_auto_upgradable", *s.Res.IsAgentAutoUpgradable)
+	}
+
+	return nil
+}

oci/management_agent_management_agent_get_auto_upgradable_config_test.go

@@ -0,0 +1,50 @@
+// 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 (
+	managementAgentGetAutoUpgradableConfigSingularDataSourceRepresentation = map[string]interface{}{
+		"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
+	}
+
+	ManagementAgentGetAutoUpgradableConfigResourceConfig = ""
+)
+
+// issue-routing-tag: management_agent/default
+func TestManagementAgentManagementAgentGetAutoUpgradableConfigResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestManagementAgentManagementAgentGetAutoUpgradableConfigResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := testProviderConfig()
+
+	compartmentId := getEnvSettingWithBlankDefault("tenancy_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	singularDatasourceName := "data.oci_management_agent_management_agent_get_auto_upgradable_config.test_management_agent_get_auto_upgradable_config"
+
+	saveConfigContent("", "", "", t)
+
+	ResourceTest(t, nil, []resource.TestStep{
+		// verify singular datasource
+		{
+			Config: config +
+				generateDataSourceFromRepresentationMap("oci_management_agent_management_agent_get_auto_upgradable_config", "test_management_agent_get_auto_upgradable_config", Required, Create, managementAgentGetAutoUpgradableConfigSingularDataSourceRepresentation) +
+				compartmentIdVariableStr + ManagementAgentGetAutoUpgradableConfigResourceConfig,
+			Check: ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
+
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "is_agent_auto_upgradable"),
+			),
+		},
+	})
+}

oci/management_agent_management_agent_image_test.go

@@ -15,6 +15,7 @@ import (
 var (
 	managementAgentImageDataSourceRepresentation = map[string]interface{}{
 		"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
+		"install_type":   Representation{repType: Optional, create: `AGENT`},
 		"state":          Representation{repType: Optional, create: `ACTIVE`},
 	}
 
@@ -43,7 +44,6 @@ func TestManagementAgentManagementAgentImageResource_basic(t *testing.T) {
 				compartmentIdVariableStr + ManagementAgentImageResourceConfig,
 			Check: ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
-
 				resource.TestCheckResourceAttrSet(datasourceName, "management_agent_images.#"),
 				resource.TestCheckResourceAttrSet(datasourceName, "management_agent_images.0.checksum"),
 				resource.TestCheckResourceAttrSet(datasourceName, "management_agent_images.0.id"),
@@ -53,6 +53,7 @@ func TestManagementAgentManagementAgentImageResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(datasourceName, "management_agent_images.0.size"),
 				resource.TestCheckResourceAttrSet(datasourceName, "management_agent_images.0.state"),
 				resource.TestCheckResourceAttrSet(datasourceName, "management_agent_images.0.version"),
+				resource.TestCheckResourceAttr(datasourceName, "management_agent_images.0.state", "ACTIVE"),
 			),
 		},
 	})

oci/management_agent_management_agent_images_data_source.go

@@ -23,6 +23,10 @@ func ManagementAgentManagementAgentImagesDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"install_type": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"name": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -106,6 +110,10 @@ func (s *ManagementAgentManagementAgentImagesDataSourceCrud) Get() error {
 		request.CompartmentId = &tmp
 	}
 
+	if installType, ok := s.D.GetOkExists("install_type"); ok {
+		request.InstallType = oci_management_agent.ListManagementAgentImagesInstallTypeEnum(installType.(string))
+	}
+
 	if name, ok := s.D.GetOkExists("name"); ok {
 		tmp := name.(string)
 		request.Name = &tmp

oci/management_agent_management_agent_plugin_count_data_source.go

@@ -53,6 +53,10 @@ func ManagementAgentManagementAgentPluginCountDataSource() *schema.Resource {
 									// Optional
 
 									// Computed
+									"plugin_display_name": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
 									"plugin_name": {
 										Type:     schema.TypeString,
 										Computed: true,
@@ -141,6 +145,10 @@ func ManagementAgentPluginAggregationToMap(obj oci_management_agent.ManagementAg
 func ManagementAgentPluginAggregationDimensionsToMap(obj *oci_management_agent.ManagementAgentPluginAggregationDimensions) map[string]interface{} {
 	result := map[string]interface{}{}
 
+	if obj.PluginDisplayName != nil {
+		result["plugin_display_name"] = string(*obj.PluginDisplayName)
+	}
+
 	if obj.PluginName != nil {
 		result["plugin_name"] = string(*obj.PluginName)
 	}

oci/management_agent_management_agent_resource.go

@@ -60,7 +60,6 @@ func ManagementAgentManagementAgentResource() *schema.Resource {
 			},
 			"is_agent_auto_upgradable": {
 				Type:     schema.TypeBool,
-				Optional: true,
 				Computed: true,
 			},
 			"deploy_plugins_id": {
@@ -96,6 +95,10 @@ func ManagementAgentManagementAgentResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"install_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"is_customer_deployed": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -149,6 +152,10 @@ func ManagementAgentManagementAgentResource() *schema.Resource {
 					},
 				},
 			},
+			"resource_artifact_version": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -495,6 +502,8 @@ func (s *ManagementAgentManagementAgentResourceCrud) SetData() error {
 		s.D.Set("install_path", *s.Res.InstallPath)
 	}
 
+	s.D.Set("install_type", s.Res.InstallType)
+
 	if s.Res.IsAgentAutoUpgradable != nil {
 		s.D.Set("is_agent_auto_upgradable", *s.Res.IsAgentAutoUpgradable)
 	}
@@ -523,6 +532,10 @@ func (s *ManagementAgentManagementAgentResourceCrud) SetData() error {
 	}
 	s.D.Set("plugin_list", pluginList)
 
+	if s.Res.ResourceArtifactVersion != nil {
+		s.D.Set("resource_artifact_version", *s.Res.ResourceArtifactVersion)
+	}
+
 	s.D.Set("state", s.Res.LifecycleState)
 
 	if s.Res.TimeCreated != nil {