fix test issue TOP-147 - Identity test failing in orchestration because of missing compartment_id.

Squashed commit of the following:

commit fd8d773b9312f97d6c2e576ddfc4d636c1e7c042
Author: Yuanshu Yun <[email protected]>
Date:   Thu Nov 29 15:41:47 2018 -0800

    fix test issue TOP-147 - Identity test failing in orchestration because of missing compartment_id.

Author: neverdreams

oci/identity_api_key_resource_test.go

@@ -48,6 +48,7 @@ func (s *ResourceIdentityAPIKeyTestSuite) SetupTest() {
 	resource "oci_identity_user" "t" {
 		name = "{{.token}}"
 		description = "automated test user"
+		compartment_id = "${var.tenancy_ocid}"
 	}`, nil)
 	s.ResourceName = "oci_identity_api_key.t"
 }

oci/identity_api_keys_data_source_test.go

@@ -27,6 +27,7 @@ func (s *DatasourceIdentityAPIKeysTestSuite) SetupTest() {
 	resource "oci_identity_user" "t" {
 		name = "{{.userName}}"
 		description = "automated test user"
+		compartment_id = "${var.tenancy_ocid}"
 	}
 	
 	resource "oci_identity_api_key" "t" {

oci/identity_group_resource_test.go

@@ -3,7 +3,9 @@
 package provider
 
 import (
+	"os"
 	"regexp"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
@@ -63,11 +65,7 @@ func (s *ResourceIdentityGroupTestSuite) TestAccResourceIdentityGroup_basic() {
 			},
 			// verify create w/o compartment, verify that it defaults to tenancy
 			{
-				Config: s.Config + tokenFn(`
-				resource "oci_identity_group" "t" {
-					name = "{{.token}}"
-					description = "tf test group"
-				}`, nil),
+				Config: s.Config + tokenFn(identityGroupTestStepConfigFn("tf test group"), nil),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(s.ResourceName, "compartment_id", getEnvSettingWithBlankDefault("tenancy_ocid")),
 					resource.TestCheckResourceAttr(s.ResourceName, "name", token),
@@ -83,11 +81,7 @@ func (s *ResourceIdentityGroupTestSuite) TestAccResourceIdentityGroup_basic() {
 			},
 			// verify update
 			{
-				Config: s.Config + tokenFn(`
-				resource "oci_identity_group" "t" {
-					name = "{{.token}}"
-					description = "tf test group (updated)"
-				}`, nil),
+				Config: s.Config + tokenFn(identityGroupTestStepConfigFn("tf test group (updated)"), nil),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(s.ResourceName, "description", "tf test group (updated)"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "compartment_id"),
@@ -108,6 +102,24 @@ func (s *ResourceIdentityGroupTestSuite) TestAccResourceIdentityGroup_basic() {
 	})
 }
 
+func identityGroupTestStepConfigFn(description string) string {
+	useDelegationToken := strings.EqualFold(os.Getenv("DELEGATION_TOKEN"), "true")
+	if useDelegationToken {
+		return fmt.Sprintf(`
+				resource "oci_identity_group" "t" {
+					name = "{{.token}}"
+					description = "%s"
+					compartment_id = "${var.tenancy_ocid}"
+				}`, description)
+	}
+
+	return fmt.Sprintf(`
+				resource "oci_identity_group" "t" {
+					name = "{{.token}}"
+					description = "%s"
+				}`, description)
+}
+
 func TestResourceIdentityGroupTestSuite(t *testing.T) {
 	suite.Run(t, new(ResourceIdentityGroupTestSuite))
 }

oci/identity_groups_data_source_test.go

@@ -29,6 +29,7 @@ func (s *DatasourceIdentityGroupsTestSuite) SetupTest() {
 	resource "oci_identity_group" "t" {
 		name = "{{.token}}"
 		description = "automated test group"
+		compartment_id = "${var.tenancy_ocid}"
 	}`, nil)
 	s.ResourceName = "data.oci_identity_groups.t"
 }

oci/identity_policies_data_source_test.go

@@ -28,11 +28,13 @@ func (s *DatasourceIdentityPolicyTestSuite) SetupTest() {
 	resource "oci_identity_compartment" "t" {
 		name = "-tf-compartment"
 		description = "tf test compartment"
+		compartment_id = "${var.tenancy_ocid}"
 	}
 
 	resource "oci_identity_group" "t" {
 		name = "{{.token}}"
 		description = "automated test group"
+		compartment_id = "${var.tenancy_ocid}"
 	}
 
 	resource "oci_identity_policy" "p" {

oci/identity_policy_resource_test.go

@@ -30,11 +30,13 @@ func (s *ResourceIdentityPolicyTestSuite) SetupTest() {
 	resource "oci_identity_compartment" "t" {
 		name = "-tf-compartment"
 		description = "tf test compartment"
+		compartment_id = "${var.tenancy_ocid}"
 	}
 	
 	resource "oci_identity_group" "t" {
 		name = "{{.token}}"
 		description = "automated test group"
+		compartment_id = "${var.tenancy_ocid}"
 	}`, nil)
 	s.ResourceName = "oci_identity_policy.p"
 }

oci/identity_policy_test.go

@@ -39,6 +39,7 @@ var (
 resource "oci_identity_compartment" "t" {
 	name = "Network"
 	description = "For network components"
+	compartment_id = "${var.tenancy_ocid}"
 }
 
 resource "oci_identity_group" "t" {

oci/identity_swift_password_resource_test.go

@@ -28,10 +28,12 @@ func (s *ResourceIdentitySwiftPasswordTestSuite) SetupTest() {
 	resource "oci_identity_user" "t" {
 		name = "{{.token}}"
 		description = "tf test user"
+		compartment_id = "${var.tenancy_ocid}"
 	}
   resource "oci_identity_user" "t2" {
 		name = "{{.token}}2"
 		description = "tf test user 2"
+		compartment_id = "${var.tenancy_ocid}"
 	}`, nil)
 
 	s.ResourceName = "oci_identity_swift_password.t"

oci/identity_swift_passwords_data_source_test.go

@@ -27,6 +27,7 @@ func (s *DatasourceIdentitySwiftPasswordsTestSuite) SetupTest() {
 	resource "oci_identity_user" "t" {
 		name = "{{.token}}"
 		description = "tf test user"
+		compartment_id = "${var.tenancy_ocid}"
 	}
 	resource "oci_identity_swift_password" "t" {
 		user_id = "${oci_identity_user.t.id}"

oci/identity_ui_password_resource_test.go

@@ -27,6 +27,7 @@ func (s *ResourceIdentityUIPasswordTestSuite) SetupTest() {
 	resource "oci_identity_user" "t" {
 		name = "-tf-user"
 		description = "tf test user"
+		compartment_id = "${var.tenancy_ocid}"
 	}`, nil)
 
 	s.ResourceName = "oci_identity_ui_password.t"