Added - Support for Email Delivery: Custom Return Path API

Author: Terraform Team Automation

examples/email/emailreturnpath.tf

@@ -0,0 +1,51 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+
+variable "email_return_path_state" {
+	default = "ACTIVE"
+}
+
+variable "domain_verification_id" {
+
+}
+
+variable "email_domain" {
+	default = "objdomain.email.ap-mumbai-1.oci.oc-test.com"
+}
+
+variable "description" {
+	default = "description2"
+}
+
+variable "department" {
+	default = "Accounting"
+}
+
+
+data "oci_email_email_return_paths" "test_email_return_paths" {
+	compartment_id = var.compartment_ocid
+	filter {
+		name = "id"
+		values = ["${oci_email_email_return_path.test_email_return_path.id}"]
+	}
+	id = "${oci_email_email_return_path.test_email_return_path.id}"
+	name = "tfrp.${oci_email_email_domain.test_email_domain_rp.name}"
+	parent_resource_id = "${oci_email_email_domain.test_email_domain_rp.id}"
+	state = var.email_return_path_state
+}
+
+resource "oci_email_email_domain" "test_email_domain_rp" {
+	compartment_id = var.compartment_ocid
+	domain_verification_id = var.domain_verification_id
+	name = var.email_domain
+}
+
+resource "oci_email_email_return_path" "test_email_return_path" {
+	description = var.description
+	freeform_tags = {
+		"Department" = var.department
+	}
+	name = "tfrp.${oci_email_email_domain.test_email_domain_rp.name}"
+	parent_resource_id = "${oci_email_email_domain.test_email_domain_rp.id}"
+}

examples/email/provider.tf

@@ -22,7 +22,7 @@ variable "compartment_ocid" {
 }
 
 variable "region" {
-  default = "us-ashburn-1"
+  default = "ap-mumbai-1"
 }
 
 provider "oci" {

internal/integrationtest/email_email_domain_test.go

@@ -26,6 +26,9 @@ import (
 )
 
 var (
+	ignoreEmailDomainDefinedTagsChangesRep = map[string]interface{}{
+		"ignore_changes": acctest.Representation{RepType: acctest.Required, Create: []string{`defined_tags`}},
+	}
 	EmailEmailDomainRequiredOnlyResource = EmailEmailDomainResourceDependencies +
 		acctest.GenerateResourceFromRepresentationMap("oci_email_email_domain", "test_email_domain", acctest.Required, acctest.Create, EmailEmailDomainRepresentation)
 
@@ -50,11 +53,13 @@ var (
 	}
 
 	EmailEmailDomainRepresentation = map[string]interface{}{
-		"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
-		"name":           acctest.Representation{RepType: acctest.Required, Create: randomDomain},
-		"defined_tags":   acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
-		"description":    acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
-		"freeform_tags":  acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}},
+		"compartment_id":         acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
+		"name":                   acctest.Representation{RepType: acctest.Required, Create: randomDomain},
+		"defined_tags":           acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
+		"description":            acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
+		"domain_verification_id": acctest.Representation{RepType: acctest.Optional, Create: `NONE`},
+		"freeform_tags":          acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}},
+		"lifecycle":              acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreEmailDomainDefinedTagsChangesRep},
 	}
 
 	EmailEmailDomainResourceDependencies = DefinedTagsDependencies
@@ -108,6 +113,7 @@ func TestEmailEmailDomainResource_basic(t *testing.T) {
 			Check: resource.ComposeAggregateTestCheckFunc(
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(resourceName, "description", "description"),
+				resource.TestCheckResourceAttrSet(resourceName, "domain_verification_id"),
 				resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "id"),
 				resource.TestCheckResourceAttr(resourceName, "name", randomDomain),
@@ -134,6 +140,7 @@ func TestEmailEmailDomainResource_basic(t *testing.T) {
 			Check: resource.ComposeAggregateTestCheckFunc(
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
 				resource.TestCheckResourceAttr(resourceName, "description", "description"),
+				resource.TestCheckResourceAttrSet(resourceName, "domain_verification_id"),
 				resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "id"),
 				resource.TestCheckResourceAttr(resourceName, "name", randomDomain),
@@ -155,6 +162,7 @@ func TestEmailEmailDomainResource_basic(t *testing.T) {
 			Check: resource.ComposeAggregateTestCheckFunc(
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(resourceName, "description", "description2"),
+				resource.TestCheckResourceAttrSet(resourceName, "domain_verification_id"),
 				resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "id"),
 				resource.TestCheckResourceAttr(resourceName, "name", randomDomain),