From 0d81fd81df3d451c51cff678093afebcf4d7f15d Mon Sep 17 00:00:00 2001 From: Kevin Poleunis Date: Tue, 24 Nov 2020 11:41:49 +0100 Subject: [PATCH 1/3] Update MemberStatus values to the currently available through the AWS API --- aws/resource_aws_securityhub_member.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_securityhub_member.go b/aws/resource_aws_securityhub_member.go index 9c02b7bbe83d..fce961242b79 100644 --- a/aws/resource_aws_securityhub_member.go +++ b/aws/resource_aws_securityhub_member.go @@ -10,11 +10,12 @@ import ( ) const ( - SecurityHubMemberStatusCreated = "Created" - SecurityHubMemberStatusInvited = "Invited" - SecurityHubMemberStatusAssociated = "Associated" - SecurityHubMemberStatusResigned = "Resigned" - SecurityHubMemberStatusRemoved = "Removed" + SecurityHubMemberStatusCreated = "Created" + SecurityHubMemberStatusInvited = "Invited" + SecurityHubMemberStatusEnabled = "Enabled" + SecurityHubMemberStatusRemoved = "Removed" + SecurityHubMemberStatusResigned = "Resigned" + SecurityHubMemberStatusDeleted = "Deleted" ) func resourceAwsSecurityHubMember() *schema.Resource { @@ -128,7 +129,7 @@ func resourceAwsSecurityHubMemberRead(d *schema.ResourceData, meta interface{}) status := aws.StringValue(member.MemberStatus) d.Set("member_status", status) - invited := status == SecurityHubMemberStatusInvited || status == SecurityHubMemberStatusAssociated || status == SecurityHubMemberStatusResigned + invited := status == SecurityHubMemberStatusInvited || status == SecurityHubMemberStatusEnabled || status == SecurityHubMemberStatusResigned d.Set("invite", invited) return nil From 09dc8243cec6275cfe1ea96555954f93f1ab21b0 Mon Sep 17 00:00:00 2001 From: reactiveinactive <48753642+reactiveinactive@users.noreply.github.com> Date: Tue, 24 Nov 2020 21:26:27 +0100 Subject: [PATCH 2/3] Update aws/resource_aws_securityhub_member.go Co-authored-by: Brian Flad --- aws/resource_aws_securityhub_member.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_securityhub_member.go b/aws/resource_aws_securityhub_member.go index fce961242b79..89db007251fc 100644 --- a/aws/resource_aws_securityhub_member.go +++ b/aws/resource_aws_securityhub_member.go @@ -10,12 +10,14 @@ import ( ) const ( - SecurityHubMemberStatusCreated = "Created" - SecurityHubMemberStatusInvited = "Invited" - SecurityHubMemberStatusEnabled = "Enabled" - SecurityHubMemberStatusRemoved = "Removed" - SecurityHubMemberStatusResigned = "Resigned" - SecurityHubMemberStatusDeleted = "Deleted" + // Associated is the member status naming for regions that do not support Organizations + SecurityHubMemberStatusAssociated = "Associated" + SecurityHubMemberStatusCreated = "Created" + SecurityHubMemberStatusInvited = "Invited" + SecurityHubMemberStatusEnabled = "Enabled" + SecurityHubMemberStatusRemoved = "Removed" + SecurityHubMemberStatusResigned = "Resigned" + SecurityHubMemberStatusDeleted = "Deleted" ) func resourceAwsSecurityHubMember() *schema.Resource { From b9172ba81d58091dac04bacdc30da30ca71f153c Mon Sep 17 00:00:00 2001 From: reactiveinactive <48753642+reactiveinactive@users.noreply.github.com> Date: Tue, 24 Nov 2020 21:26:35 +0100 Subject: [PATCH 3/3] Update aws/resource_aws_securityhub_member.go Co-authored-by: Brian Flad --- aws/resource_aws_securityhub_member.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_securityhub_member.go b/aws/resource_aws_securityhub_member.go index 89db007251fc..5af714e01095 100644 --- a/aws/resource_aws_securityhub_member.go +++ b/aws/resource_aws_securityhub_member.go @@ -131,7 +131,7 @@ func resourceAwsSecurityHubMemberRead(d *schema.ResourceData, meta interface{}) status := aws.StringValue(member.MemberStatus) d.Set("member_status", status) - invited := status == SecurityHubMemberStatusInvited || status == SecurityHubMemberStatusEnabled || status == SecurityHubMemberStatusResigned + invited := status == SecurityHubMemberStatusInvited || status == SecurityHubMemberStatusEnabled || status == SecurityHubMemberStatusAssociated || status == SecurityHubMemberStatusResigned d.Set("invite", invited) return nil