Add Update API for Instance Console Connections

Author: Yi Fan

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 3.95.0 (Unreleased)
 - Support for query parameters added to `object_storage` `object` resource
 - Support for custom certificates added to `apigateway` `certificate` resource
+- Support added for update Instance Console Connections
 
 ## 3.94.0 (September 23, 2020)
 

oci/core_instance_console_connection_resource.go

@@ -23,6 +23,7 @@ func CoreInstanceConsoleConnectionResource() *schema.Resource {
 		Timeouts: DefaultTimeout,
 		Create:   createCoreInstanceConsoleConnection,
 		Read:     readCoreInstanceConsoleConnection,
+		Update:   updateCoreInstanceConsoleConnection,
 		Delete:   deleteCoreInstanceConsoleConnection,
 		Schema: map[string]*schema.Schema{
 			// Required
@@ -42,15 +43,13 @@ func CoreInstanceConsoleConnectionResource() *schema.Resource {
 				Type:             schema.TypeMap,
 				Optional:         true,
 				Computed:         true,
-				ForceNew:         true,
 				DiffSuppressFunc: definedTagsDiffSuppressFunction,
 				Elem:             schema.TypeString,
 			},
 			"freeform_tags": {
 				Type:     schema.TypeMap,
 				Optional: true,
 				Computed: true,
-				ForceNew: true,
 				Elem:     schema.TypeString,
 			},
 
@@ -95,6 +94,14 @@ func readCoreInstanceConsoleConnection(d *schema.ResourceData, m interface{}) er
 	return ReadResource(sync)
 }
 
+func updateCoreInstanceConsoleConnection(d *schema.ResourceData, m interface{}) error {
+	sync := &CoreInstanceConsoleConnectionResourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).computeClient()
+
+	return UpdateResource(d, sync)
+}
+
 func deleteCoreInstanceConsoleConnection(d *schema.ResourceData, m interface{}) error {
 	sync := &CoreInstanceConsoleConnectionResourceCrud{}
 	sync.D = d
@@ -192,6 +199,35 @@ func (s *CoreInstanceConsoleConnectionResourceCrud) Get() error {
 	return nil
 }
 
+func (s *CoreInstanceConsoleConnectionResourceCrud) Update() error {
+	request := oci_core.UpdateInstanceConsoleConnectionRequest{}
+
+	if definedTags, ok := s.D.GetOkExists("defined_tags"); ok {
+		convertedDefinedTags, err := mapToDefinedTags(definedTags.(map[string]interface{}))
+		if err != nil {
+			return err
+		}
+		request.DefinedTags = convertedDefinedTags
+	}
+
+	if freeformTags, ok := s.D.GetOkExists("freeform_tags"); ok {
+		request.FreeformTags = objectMapToStringMap(freeformTags.(map[string]interface{}))
+	}
+
+	tmp := s.D.Id()
+	request.InstanceConsoleConnectionId = &tmp
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.UpdateInstanceConsoleConnection(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response.InstanceConsoleConnection
+	return nil
+}
+
 func (s *CoreInstanceConsoleConnectionResourceCrud) Delete() error {
 	request := oci_core.DeleteInstanceConsoleConnectionRequest{}
 

oci/core_instance_console_connection_test.go

@@ -60,7 +60,7 @@ func TestCoreInstanceConsoleConnectionResource_basic(t *testing.T) {
 	resourceName := "oci_core_instance_console_connection.test_instance_console_connection"
 	datasourceName := "data.oci_core_instance_console_connections.test_instance_console_connections"
 
-	var resId string
+	var resId, resId2 string
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() { testAccPreCheck(t) },
@@ -76,6 +76,11 @@ func TestCoreInstanceConsoleConnectionResource_basic(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(resourceName, "instance_id"),
 					resource.TestCheckResourceAttr(resourceName, "public_key", "ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"),
+
+					func(s *terraform.State) (err error) {
+						resId, err = fromInstanceState(s, resourceName, "id")
+						return err
+					},
 				),
 			},
 
@@ -104,6 +109,25 @@ func TestCoreInstanceConsoleConnectionResource_basic(t *testing.T) {
 				),
 			},
 
+			// verify updates to updatable parameters
+			{
+				Config: config + compartmentIdVariableStr + InstanceConsoleConnectionResourceDependencies +
+					generateResourceFromRepresentationMap("oci_core_instance_console_connection", "test_instance_console_connection", Optional, Update, instanceConsoleConnectionRepresentation),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
+					resource.TestCheckResourceAttrSet(resourceName, "instance_id"),
+					resource.TestCheckResourceAttr(resourceName, "public_key", "ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"),
+
+					func(s *terraform.State) (err error) {
+						resId2, err = fromInstanceState(s, resourceName, "id")
+						if resId != resId2 {
+							return fmt.Errorf("Resource recreated when it was supposed to be updated.")
+						}
+						return err
+					},
+				),
+			},
 			// verify datasource
 			{
 				Config: config +

website/docs/r/core_instance_console_connection.html.markdown

@@ -35,8 +35,8 @@ resource "oci_core_instance_console_connection" "test_instance_console_connectio
 
 The following arguments are supported:
 
-* `defined_tags` - (Optional) Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}` 
-* `freeform_tags` - (Optional) Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
+* `defined_tags` - (Optional) (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}` 
+* `freeform_tags` - (Optional) (Updatable) Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
 * `instance_id` - (Required) The OCID of the instance to create the console connection to.
 * `public_key` - (Required) The SSH public key used to authenticate the console connection.