Bug Fix - tagging in management_agent

Author: Terraform Team Automation

examples/management_agent/management_agent.tf

@@ -2,9 +2,6 @@
 // Licensed under the Mozilla Public License v2.0
 
 variable "tenancy_ocid" {}
-variable "user_ocid" {}
-variable "fingerprint" {}
-variable "private_key_path" {}
 variable "region" {}
 variable "compartment_ocid" {}
 variable "root_compartment_ocid" {}
@@ -17,9 +14,8 @@ variable "subnet" {
 }
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
-  user_ocid        = var.user_ocid
-  fingerprint      = var.fingerprint
-  private_key_path = var.private_key_path
+  auth = "SecurityToken"
+  config_file_profile = "terraform-federation-test"
   region           = var.region
 }
 
@@ -40,6 +36,8 @@ resource "oci_management_agent_management_agent" "test_management_agent" {
 
   #Optional
   deploy_plugins_id = [data.oci_management_agent_management_agent_plugins.test_management_agent_plugins.management_agent_plugins.1.id]
+  freeform_tags = {"tagKey":"tagValue"}
+
 }
 
 
@@ -188,4 +186,8 @@ resource "oci_management_agent_management_agent" "test_compute_management_agent"
   freeform_tags     = { "TestingTag" : "TestingValue" }
   managed_agent_id  = data.oci_management_agent_management_agents.find_compute_agent.management_agents[0].id
   deploy_plugins_id = [data.oci_management_agent_management_agent_plugins.test_management_agent_plugins.management_agent_plugins.0.id]
+}
+
+output "updated_agent" {
+  value = data.oci_management_agent_management_agents.find_agent.management_agents[0].id
 }

internal/integrationtest/management_agent_management_agent_test.go

@@ -185,6 +185,7 @@ func TestManagementAgentManagementAgentResource_basic(t *testing.T) {
 		"managed_agent_id":  acctest.Representation{RepType: acctest.Required, Create: managementAgentId},
 		"display_name":      acctest.Representation{RepType: acctest.Optional, Create: `terraformTest`, Update: `terraformTest2`},
 		"deploy_plugins_id": acctest.Representation{RepType: acctest.Optional, Create: []string{`${data.oci_management_agent_management_agent_plugins.test_management_agent_plugins.management_agent_plugins.0.id}`}},
+		"freeform_tags":     acctest.Representation{RepType: acctest.Required, Create: map[string]string{"TestingTag": "TestingValue"}, Update: map[string]string{"TestingTag2": "TestingValue2"}},
 	}
 	ManagementAgentRequiredOnlyResource := acctest.GenerateResourceFromRepresentationMap("oci_management_agent_management_agent", "test_management_agent", acctest.Required, acctest.Create, managementAgentRepresentation)
 
@@ -205,6 +206,7 @@ func TestManagementAgentManagementAgentResource_basic(t *testing.T) {
 				acctest.GenerateResourceFromRepresentationMap("oci_management_agent_management_agent",
 					"test_management_agent", acctest.Required, acctest.Create, managementAgentRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 
 				func(s *terraform.State) (err error) {
 					resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -228,6 +230,7 @@ func TestManagementAgentManagementAgentResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(resourceName, "id"),
 				resource.TestCheckResourceAttrSet(resourceName, "version"),
 				resource.TestCheckResourceAttr(resourceName, "display_name", "terraformTest2"),
+				resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 
 				func(s *terraform.State) (err error) {
 					resId2, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -291,7 +294,7 @@ func TestManagementAgentManagementAgentResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "availability_status"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "compartment_id"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "data_source_list.#", "0"),
-				resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "0"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "display_name"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "host"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),

internal/service/management_agent/management_agent_management_agent_resource.go

@@ -993,6 +993,14 @@ func (s *ManagementAgentManagementAgentResourceCrud) mapToMetricDimension(fieldK
 }
 
 func (s *ManagementAgentManagementAgentResourceCrud) Create() error {
+
+	// During create, the user can set new value for tags and or display_name
+	// During create, the s.D is updated with s.Get to the current values in MACS
+	// so we keep a copy of the required values locally, and then set them during the update if necessary
+	freeformtags, freeformtagsok := s.D.GetOkExists("freeform_tags")
+	definedtags, definedtagsok := s.D.GetOkExists("defined_tags")
+	displayname, displaynameok := s.D.GetOkExists("display_name")
+
 	e := s.Get()
 	if e != nil {
 		return e
@@ -1002,6 +1010,18 @@ func (s *ManagementAgentManagementAgentResourceCrud) Create() error {
 		return e
 	}
 
+	if freeformtagsok {
+		log.Printf("[DEBUG] Updating agent freeformtags to %v", freeformtags)
+		s.D.Set("freeform_tags", freeformtags)
+	}
+	if definedtagsok {
+		log.Printf("[DEBUG] Updating agent definedtags to %v", definedtags)
+		s.D.Set("defined_tags", definedtags)
+	}
+	if displaynameok {
+		log.Printf("[DEBUG] Updating agent displayname to %v", displayname)
+		s.D.Set("display_name", displayname)
+	}
 	return s.Update()
 }