Expose privateIp and faultDomain for OKE cluster node

Author: jotruon

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Added
 - Support for updating `shape` attribute in `oci_database_db_system` resource
 - Support for CPE builder on IPSec console
+- Support for exposing `private_ip` and `fault_domain` for OKE cluster node 
 
 ## 3.64.0 (February 26, 2020)
 

oci/containerengine_node_pool_resource.go

@@ -268,6 +268,10 @@ func ContainerengineNodePoolResource() *schema.Resource {
 								},
 							},
 						},
+						"fault_domain": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 						"id": {
 							Type:     schema.TypeString,
 							Computed: true,
@@ -284,6 +288,10 @@ func ContainerengineNodePoolResource() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+						"private_ip": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 						"public_ip": {
 							Type:     schema.TypeString,
 							Computed: true,
@@ -834,6 +842,10 @@ func NodeToMap(obj oci_containerengine.Node) map[string]interface{} {
 		result["error"] = []interface{}{NodeErrorToMap(obj.NodeError)}
 	}
 
+	if obj.FaultDomain != nil {
+		result["fault_domain"] = string(*obj.FaultDomain)
+	}
+
 	if obj.Id != nil {
 		result["id"] = string(*obj.Id)
 	}
@@ -850,6 +862,10 @@ func NodeToMap(obj oci_containerengine.Node) map[string]interface{} {
 		result["node_pool_id"] = string(*obj.NodePoolId)
 	}
 
+	if obj.PrivateIp != nil {
+		result["private_ip"] = string(*obj.PrivateIp)
+	}
+
 	if obj.PublicIp != nil {
 		result["public_ip"] = string(*obj.PublicIp)
 	}

oci/containerengine_node_pool_resource_test.go

@@ -246,6 +246,8 @@ func TestResourceContainerengineNodePool_regionalsubnet(t *testing.T) {
 					resource.TestCheckResourceAttr(singularDatasourceName, "node_shape", "VM.Standard2.1"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "ssh_public_key", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOuBJgh6lTmQvQJ4BA3RCJdSmxRtmiXAQEEIP68/G4gF3XuZdKEYTFeputacmRq9yO5ZnNXgO9akdUgePpf8+CfFtveQxmN5xo3HVCDKxu/70lbMgeu7+wJzrMOlzj+a4zNq2j0Ww2VWMsisJ6eV3bJTnO/9VLGCOC8M9noaOlcKcLgIYy4aDM724MxFX2lgn7o6rVADHRxkvLEXPVqYT4syvYw+8OVSnNgE4MJLxaw8/2K0qp19YlQyiriIXfQpci3ThxwLjymYRPj+kjU1xIxv6qbFQzHR7ds0pSWp1U06cIoKPfCazU9hGWW8yIe/vzfTbWrt2DK6pLwBn/G0x3 sample"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "subnet_ids.#", "1"),
+					// "nodes" is not set until the instances in the node_pool are "Available" so we can't assert the nodes property
+					//resource.TestCheckResourceAttrSet(singularDatasourceName, "nodes"),
 				),
 			},
 		},

website/docs/d/containerengine_node_pool.html.markdown

@@ -61,10 +61,12 @@ The following attributes are exported:
 		* `code` - A short error code that defines the upstream error, meant for programmatic parsing. See [API Errors](https://docs.cloud.oracle.com/iaas/Content/API/References/apierrors.htm).
 		* `message` - A human-readable error string of the upstream error.
 		* `status` - The status of the HTTP response encountered in the upstream error.
+	* `fault_domain` - The fault domain of this node.
 	* `id` - The OCID of the compute instance backing this node.
 	* `lifecycle_details` - Details about the state of the node.
 	* `name` - The name of the node.
 	* `node_pool_id` - The OCID of the node pool to which this node belongs.
+	* `private_ip` - The private IP address of this node.
 	* `public_ip` - The public IP address of this node.
 	* `state` - The state of the node.
 	* `subnet_id` - The OCID of the subnet in which this node is placed.

website/docs/d/containerengine_node_pools.html.markdown

@@ -73,10 +73,12 @@ The following attributes are exported:
 		* `code` - A short error code that defines the upstream error, meant for programmatic parsing. See [API Errors](https://docs.cloud.oracle.com/iaas/Content/API/References/apierrors.htm).
 		* `message` - A human-readable error string of the upstream error.
 		* `status` - The status of the HTTP response encountered in the upstream error.
+	* `fault_domain` - The fault domain of this node.
 	* `id` - The OCID of the compute instance backing this node.
 	* `lifecycle_details` - Details about the state of the node.
 	* `name` - The name of the node.
 	* `node_pool_id` - The OCID of the node pool to which this node belongs.
+	* `private_ip` - The private IP address of this node.
 	* `public_ip` - The public IP address of this node.
 	* `state` - The state of the node.
 	* `subnet_id` - The OCID of the subnet in which this node is placed.

website/docs/r/containerengine_node_pool.html.markdown

@@ -109,10 +109,12 @@ The following attributes are exported:
 		* `code` - A short error code that defines the upstream error, meant for programmatic parsing. See [API Errors](https://docs.cloud.oracle.com/iaas/Content/API/References/apierrors.htm).
 		* `message` - A human-readable error string of the upstream error.
 		* `status` - The status of the HTTP response encountered in the upstream error.
+	* `fault_domain` - The fault domain of this node.
 	* `id` - The OCID of the compute instance backing this node.
 	* `lifecycle_details` - Details about the state of the node.
 	* `name` - The name of the node.
 	* `node_pool_id` - The OCID of the node pool to which this node belongs.
+	* `private_ip` - The private IP address of this node.
 	* `public_ip` - The public IP address of this node.
 	* `state` - The state of the node.
 	* `subnet_id` - The OCID of the subnet in which this node is placed.