Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

F/resource aws pinpoint email channel #19361

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
568483c
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
5273c73
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
f2c5be9
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
1e48317
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
29747b7
Merge remote-tracking branch 'origin/master'
nikhil-goenka Apr 30, 2021
98e41ce
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
598e773
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
15ec17c
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
bc225f5
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
e1724ca
Merge remote-tracking branch 'origin/master'
nikhil-goenka May 1, 2021
4a0d439
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
6de2c69
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
4b02fb8
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
2cec2e1
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
00dfa0f
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
8d235f4
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
91e1233
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
bdc8152
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
1f438fa
Merge remote-tracking branch 'origin/master'
nikhil-goenka May 2, 2021
05b240f
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
03029df
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
d0e44c2
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
38111b2
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
8a438a5
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
514ec73
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
3a1bb6e
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
37a7e37
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
f50d10e
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
2d998a6
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
f3142cb
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
8c765d8
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
bb2cc6c
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
7075f84
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
94bf75b
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
00f5a58
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
388ac4a
Merge remote-tracking branch 'origin/master'
nikhil-goenka May 6, 2021
5417d9c
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
e784c3b
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
5b72f62
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
be2dae4
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
fb49eab
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
0c9c79a
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
5eee775
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
330efec
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
675d548
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
70780c2
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
1b1da85
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
ba6b5e0
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
604dfee
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
103ac16
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
47c5534
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
710a1e1
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
25ad290
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
abea1ec
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
e62a926
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
fb77f7e
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
6c24ed9
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
a8109ad
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
f130f74
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
e27dc7c
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
718cfb9
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
7680fb4
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
c427fd6
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
c4cee22
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
d5b61ff
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
f4cba16
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
9cbf792
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
e3de636
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
3e55b93
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
949263c
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
da27901
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
b0001c1
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
17720db
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
8338f01
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
0bb9465
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
89162b3
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
47800b9
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
419bef8
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
e4c474d
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
7c79b3b
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
ca14080
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
40e3fb9
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
7d6c499
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
ff5d36f
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
8201dff
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
1dc05d5
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
251522c
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
1a9362e
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
ffa817d
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
29a93d9
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
9f4ebbc
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
063a82a
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
e39aff0
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
bed33fb
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
4900a69
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
33cc32a
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
5dc41d9
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
feb3ae7
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
50554ff
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 22, 2021
361eaf4
f/aws_securityhub_member: email is optional variable
nikhil-goenka Apr 25, 2021
fe5310c
Merge remote-tracking branch 'origin/master'
nikhil-goenka May 13, 2021
c1d952d
aws_pinpoint_email_channel: Role arn is optional
nikhil-goenka May 13, 2021
143a217
aws_pinpoint_email_channel: Role arn is optional
nikhil-goenka May 13, 2021
2dceb8a
Add CHANGELOG entry.
ewbankkit May 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/19361.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_pinpoint_email_channel: `role_arn` argument is optional
```
7 changes: 5 additions & 2 deletions aws/resource_aws_pinpoint_email_channel.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func resourceAwsPinpointEmailChannel() *schema.Resource {
},
"role_arn": {
Type: schema.TypeString,
Required: true,
Optional: true,
ValidateFunc: validateArn,
},
"messages_per_second": {
Expand All @@ -67,7 +67,10 @@ func resourceAwsPinpointEmailChannelUpsert(d *schema.ResourceData, meta interfac
params.Enabled = aws.Bool(d.Get("enabled").(bool))
params.FromAddress = aws.String(d.Get("from_address").(string))
params.Identity = aws.String(d.Get("identity").(string))
params.RoleArn = aws.String(d.Get("role_arn").(string))

if v, ok := d.GetOk("role_arn"); ok {
params.RoleArn = aws.String(v.(string))
}

if v, ok := d.GetOk("configuration_set"); ok {
params.ConfigurationSet = aws.String(v.(string))
Expand Down
50 changes: 50 additions & 0 deletions aws/resource_aws_pinpoint_email_channel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,34 @@ func TestAccAWSPinpointEmailChannel_configurationSet(t *testing.T) {
},
})
}

func TestAccAWSPinpointEmailChannel_noRole(t *testing.T) {
var channel pinpoint.EmailChannelResponse
resourceName := "aws_pinpoint_email_channel.test"
rName := acctest.RandomWithPrefix("tf-acc-test")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSPinpointApp(t) },
ErrorCheck: testAccErrorCheck(t, pinpoint.EndpointsID),
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSPinpointEmailChannelDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSPinpointEmailChannelConfigNoRole("user@example.com", rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSPinpointEmailChannelExists(resourceName, &channel),
resource.TestCheckResourceAttrPair(resourceName, "configuration_set", "aws_ses_configuration_set.test", "arn"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccAWSPinpointEmailChannel_disappears(t *testing.T) {
var channel pinpoint.EmailChannelResponse
resourceName := "aws_pinpoint_email_channel.test"
Expand Down Expand Up @@ -244,6 +272,28 @@ EOF
`, fromAddress, rName)
}

func testAccAWSPinpointEmailChannelConfigNoRole(fromAddress, rName string) string {
return fmt.Sprintf(`
resource "aws_pinpoint_app" "test" {}

resource "aws_ses_configuration_set" "test" {
name = %[2]q
}

resource "aws_pinpoint_email_channel" "test" {
application_id = aws_pinpoint_app.test.application_id
enabled = "false"
from_address = %[1]q
identity = aws_ses_domain_identity.test.arn
configuration_set = aws_ses_configuration_set.test.arn
}

resource "aws_ses_domain_identity" "test" {
domain = "example.com"
}
`, fromAddress, rName)
}

func testAccCheckAWSPinpointEmailChannelDestroy(s *terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).pinpointconn

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/pinpoint_email_channel.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ The following arguments are supported:
* `configuration_set` - (Optional) The ARN of the Amazon SES configuration set that you want to apply to messages that you send through the channel.
* `from_address` - (Required) The email address used to send emails from.
* `identity` - (Required) The ARN of an identity verified with SES.
* `role_arn` - (Required) The ARN of an IAM Role used to submit events to Mobile Analytics' event ingestion service.
* `role_arn` - (Optional) The ARN of an IAM Role used to submit events to Mobile Analytics' event ingestion service.

## Attributes Reference

Expand Down