Support nesting and deleting compartments

Author: ccushing

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 3.6.0 (November 01, 2018)
+## 3.6.0 (Unreleased)
 
 ### Added
 - New parameters `db_name` and `state` in `oci_database_database` data source
@@ -12,6 +12,7 @@
 - Support for specifying a Key Management Service key when backing up or restoring a block storage volume in the Block Volume service
 - Support enabling cost tracking for tags using `is_cost_tracking` field
 - Support returning maintenance reboot time for compute instances using `time_maintenance_reboot_due` field
+- Support nesting and deleting compartments. Compartment delete requires opt in, see compartment documentation
 
 ### Fixed
 - Data type for properties with type as TypeSet to TypeList in following datasources: `oci_core_route_tables`, `oci_core_security_lists`, `oci_core_volume`, and `oci_core_service_gateways` to allow referencing by indexes in Terraform configs.

docs/examples/concepts/nested_compartments/main.tf

@@ -0,0 +1,59 @@
+/*
+ * This example demonstrates how to work with nested compartments.
+ */
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "compartment_ocid" {}
+variable "region" {}
+
+provider "oci" {
+  region           = "${var.region}"
+  tenancy_ocid     = "${var.tenancy_ocid}"
+  user_ocid        = "${var.user_ocid}"
+  fingerprint      = "${var.fingerprint}"
+  private_key_path = "${var.private_key_path}"
+}
+
+resource "oci_identity_compartment" "parent-compartment" {
+  name           = "parent-compartment"
+  description    = "compartment that holds a compartment"
+  compartment_id = "${var.tenancy_ocid}"
+}
+
+resource "oci_identity_compartment" "child-compartment" {
+  name           = "child-compartment"
+  description    = "compartment inside another compartment"
+  compartment_id = "${oci_identity_compartment.parent-compartment.id}"
+}
+
+data "oci_identity_compartments" "all-compartments" {
+  compartment_id            = "${oci_identity_compartment.parent-compartment.compartment_id}"
+  compartment_id_in_subtree = "true"
+  access_level              = "ANY"
+
+  filter {
+    name   = "name"
+    values = ["parent-compartment", "child-compartment"]
+  }
+}
+
+data "oci_identity_compartment" "child-compartment" {
+  id = "${oci_identity_compartment.child-compartment.id}"
+}
+
+output "print-child-compartment" {
+  value = <<EOF
+
+  id = ${data.oci_identity_compartment.child-compartment.id}
+  compartment_id = ${data.oci_identity_compartment.child-compartment.compartment_id}
+  name = ${data.oci_identity_compartment.child-compartment.name}
+  description = ${data.oci_identity_compartment.child-compartment.description}
+EOF
+}
+
+output "print-all-compartments" {
+  value = "${data.oci_identity_compartments.all-compartments.compartments}"
+}

oci/identity_compartment_data_source.go

@@ -0,0 +1,143 @@
+// Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+
+package provider
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/hashicorp/terraform/helper/schema"
+	oci_identity "github.com/oracle/oci-go-sdk/identity"
+)
+
+func CompartmentDataSource() *schema.Resource {
+	return &schema.Resource{
+		Read: readSingularCompartment,
+		Schema: map[string]*schema.Schema{
+			"id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			// Computed
+			"defined_tags": {
+				Type:     schema.TypeMap,
+				Computed: true,
+				Elem:     schema.TypeString,
+			},
+			"description": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"freeform_tags": {
+				Type:     schema.TypeMap,
+				Computed: true,
+				Elem:     schema.TypeString,
+			},
+			"inactive_state": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"is_accessible": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"state": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"time_created": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func readSingularCompartment(d *schema.ResourceData, m interface{}) error {
+	sync := &CompartmentDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).identityClient
+
+	return ReadResource(sync)
+}
+
+type CompartmentDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_identity.IdentityClient
+	Res    *oci_identity.GetCompartmentResponse
+}
+
+func (s *CompartmentDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *CompartmentDataSourceCrud) Get() error {
+	request := oci_identity.GetCompartmentRequest{}
+
+	// API ambiguity: the GET identifier for a single compartment is "compartmentId", but on the returned object
+	// it's "id", and "compartmentId" holds the _parent_ compartment id.
+	if id, ok := s.D.GetOkExists("id"); ok {
+		tmp := id.(string)
+		request.CompartmentId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "identity")
+
+	response, err := s.Client.GetCompartment(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *CompartmentDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(*s.Res.Id)
+
+	if s.Res.DefinedTags != nil {
+		s.D.Set("defined_tags", definedTagsToMap(s.Res.DefinedTags))
+	}
+
+	if s.Res.CompartmentId != nil {
+		s.D.Set("compartment_id", *s.Res.CompartmentId)
+	}
+
+	if s.Res.Description != nil {
+		s.D.Set("description", *s.Res.Description)
+	}
+
+	s.D.Set("freeform_tags", s.Res.FreeformTags)
+
+	if s.Res.InactiveStatus != nil {
+		s.D.Set("inactive_state", strconv.FormatInt(*s.Res.InactiveStatus, 10))
+	}
+
+	if s.Res.IsAccessible != nil {
+		s.D.Set("is_accessible", *s.Res.IsAccessible)
+	}
+
+	if s.Res.Name != nil {
+		s.D.Set("name", *s.Res.Name)
+	}
+
+	s.D.Set("state", s.Res.LifecycleState)
+
+	if s.Res.TimeCreated != nil {
+		s.D.Set("time_created", s.Res.TimeCreated.String())
+	}
+
+	return nil
+}