Merge pull request #9 from oracle-terraform-modules/dev

Update required variables.

Author: yimw

modules/iam-compartment/main.tf

@@ -5,9 +5,10 @@
 ########################
 
 resource "oci_identity_compartment" "this" {
-  count       = "${var.compartment_create ? 1 : 0}"
-  name        = "${var.compartment_name}"
-  description = "${var.compartment_description}"
+  count          = "${var.compartment_create ? 1 : 0}"
+  compartment_id = "${var.tenancy_ocid}"
+  name           = "${var.compartment_name}"
+  description    = "${var.compartment_description}"
 }
 
 data "oci_identity_compartments" "this" {

modules/iam-dynamic-group/variables.tf

@@ -8,14 +8,13 @@ variable "dynamic_group_name" {
   description = "The name you assign to the group during creation. The name must be unique across all compartments in the tenancy. "
 }
 
-// The description is only used if dynamic_group_create = true.
 variable "dynamic_group_description" {
   description = "The description you assign to the Group. Does not have to be unique, and it's changeable. "
   default     = ""
 }
 
 variable "dynamic_group_create" {
-  description = "Create the group or not. If true, the user must have permissions to create the group; If false, group data will be returned about the group if it exists, if not found, then an empty string will be returned for the group ID."
+  description = "Create the dynamic group or not. If true, the user must have permissions to create the group; If false, group data will be returned about the group if it exists, if not found, then an empty string will be returned for the group ID."
   default     = true
 }
 

modules/iam-group/main.tf

@@ -4,9 +4,10 @@
 # Group
 ########################
 resource "oci_identity_group" "this" {
-  count       = "${var.group_create ? 1 : 0}"
-  name        = "${var.group_name}"
-  description = "${var.group_description}"
+  count          = "${var.group_create ? 1 : 0}"
+  compartment_id = "${var.tenancy_ocid}"
+  name           = "${var.group_name}"
+  description    = "${var.group_description}"
 }
 
 data "oci_identity_groups" "this" {
@@ -31,7 +32,8 @@ resource "oci_identity_user_group_membership" "this" {
   # https://github.com/hashicorp/terraform/issues/12570
   # count    = "${length(var.user_ids)}"
   # use workaround here
-  count    = "${var.user_count}"
+  count = "${var.user_count}"
+
   user_id  = "${var.user_ids[count.index]}"
   group_id = "${var.group_create ? element(concat(oci_identity_group.this.*.id, list("")), 0) : lookup(local.group_ids[0], "id")}"
 }

modules/iam-user/main.tf

@@ -4,9 +4,10 @@
 # User
 ########################
 resource "oci_identity_user" "this" {
-  count       = "${var.user_create ? 1 : 0}"
-  name        = "${var.user_name}"
-  description = "${var.user_description}"
+  count          = "${var.user_create ? 1 : 0}"
+  compartment_id = "${var.tenancy_ocid}"
+  name           = "${var.user_name}"
+  description    = "${var.user_description}"
 }
 
 data "oci_identity_users" "this" {

modules/iam-user/variables.tf

@@ -15,6 +15,6 @@ variable "user_description" {
 }
 
 variable "user_create" {
-  description = "Create the group or not. If true, the user must have permissions to create the user; If false, user data will be returned about the user if it exists, if not found, then an empty string will be returned for the user ID."
+  description = "Create the user or not. If true, the user must have permissions to create the user; If false, user data will be returned about the user if it exists, if not found, then an empty string will be returned for the user ID."
   default     = true
 }