From cf1ae93cfb9d1a61c6db90d631fdd212689a4ebd Mon Sep 17 00:00:00 2001
From: Atsushi Ishibashi <atsushi.ishibashi@finatext.com>
Date: Fri, 5 Jan 2018 20:28:01 +0900
Subject: [PATCH] Add ConflictsWith

---
 aws/resource_aws_cognito_user_pool.go      | 16 +++++++++-------
 aws/resource_aws_cognito_user_pool_test.go |  1 -
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/aws/resource_aws_cognito_user_pool.go b/aws/resource_aws_cognito_user_pool.go
index 36f631ca2347..212f7f8557ff 100644
--- a/aws/resource_aws_cognito_user_pool.go
+++ b/aws/resource_aws_cognito_user_pool.go
@@ -352,9 +352,10 @@ func resourceAwsCognitoUserPool() *schema.Resource {
 			},
 
 			"sms_verification_message": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validateCognitoUserPoolSmsVerificationMessage,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validateCognitoUserPoolSmsVerificationMessage,
+				ConflictsWith: []string{"verification_message_template.0.sms_message"},
 			},
 
 			"tags": tagsSchema(),
@@ -413,10 +414,11 @@ func resourceAwsCognitoUserPool() *schema.Resource {
 							ValidateFunc: validateCognitoUserPoolTemplateEmailSubjectByLink,
 						},
 						"sms_message": {
-							Type:         schema.TypeString,
-							Optional:     true,
-							Computed:     true,
-							ValidateFunc: validateCognitoUserPoolTemplateSmsMessage,
+							Type:          schema.TypeString,
+							Optional:      true,
+							Computed:      true,
+							ValidateFunc:  validateCognitoUserPoolTemplateSmsMessage,
+							ConflictsWith: []string{"sms_verification_message"},
 						},
 					},
 				},
diff --git a/aws/resource_aws_cognito_user_pool_test.go b/aws/resource_aws_cognito_user_pool_test.go
index 464a127e2393..2e2e52de0f37 100644
--- a/aws/resource_aws_cognito_user_pool_test.go
+++ b/aws/resource_aws_cognito_user_pool_test.go
@@ -925,7 +925,6 @@ resource "aws_cognito_user_pool" "pool" {
     default_email_option  = "CONFIRM_WITH_LINK"
     email_message_by_link = "{##foobar##}"
     email_subject_by_link = "foobar"
-    sms_message           = "{####} Baz"
   }
 }`, name)
 }