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

resource/aws_securitylake_subscriber_notification: Fixes #37332

Merged
merged 16 commits into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions .changelog/37332.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
```release-note:enhancement
resource/aws_securitylake_subscriber_notification: Deprecates `endpoint_id` in favor of `subscriber_endpoint`
```

```release-note:bug
resource/aws_securitylake_subscriber_notification: Requires value for `configuration.https_notification_configuration.endpoint`
```

```release-note:enhancement
resource/aws_securitylake_subscriber_notification: Better handles importing resource
```

```release-note:enhancement
resource/aws_securitylake_subscriber_notification: Handles `configuration.https_notification_configuration.authorization_api_key_value` as sensitive value
```

```release-note:bug
resource/aws_securitylake_subscriber_notification: No longer recreates resource when not needed
```
12 changes: 6 additions & 6 deletions internal/service/securitylake/exports_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ var (
ResourceSubscriber = newSubscriberResource
ResourceSubscriberNotification = newSubscriberNotificationResource

FindAWSLogSourceBySourceName = findAWSLogSourceBySourceName
FindCustomLogSourceBySourceName = findCustomLogSourceBySourceName
FindDataLakeByARN = findDataLakeByARN
FindDataLakes = findDataLakes
FindSubscriberByID = findSubscriberByID
FindSubscriberNotificationByEndPointID = findSubscriberNotificationByEndPointID
FindAWSLogSourceBySourceName = findAWSLogSourceBySourceName
FindCustomLogSourceBySourceName = findCustomLogSourceBySourceName
FindDataLakeByARN = findDataLakeByARN
FindDataLakes = findDataLakes
FindSubscriberByID = findSubscriberByID
FindSubscriberNotificationBySubscriberID = findSubscriberNotificationBySubscriberID
)
14 changes: 8 additions & 6 deletions internal/service/securitylake/securitylake_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"context"
"testing"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/securitylake"
awstypes "github.com/aws/aws-sdk-go-v2/service/securitylake/types"
"github.com/aws/aws-sdk-go/aws"
"github.com/hashicorp/aws-sdk-go-base/v2/tfawserr"
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
Expand Down Expand Up @@ -61,10 +61,12 @@ func TestAccSecurityLake_serial(t *testing.T) {
"migrateSource": testAccSubscriber_migrate_source,
},
"SubscriberNotification": {
"basic": testAccSubscriberNotification_basic,
"https": testAccSubscriberNotification_https,
"disappears": testAccSubscriberNotification_disappears,
"update": testAccSubscriberNotification_update,
"disappears": testAccSubscriberNotification_disappears,
"https_basic": testAccSubscriberNotification_https_basic,
"update": testAccSubscriberNotification_update,
"sqs_basic": testAccSubscriberNotification_sqs_basic,
"apiKeyNameOnly": testAccSubscriberNotification_https_apiKeyNameOnly,
"apiKey": testAccSubscriberNotification_https_apiKey,
},
}

Expand Down Expand Up @@ -92,7 +94,7 @@ func testAccPreCheck(ctx context.Context, t *testing.T) {
t.Fatalf("getting current identity: %s", err)
}

if aws.StringValue(organization.MasterAccountId) == aws.StringValue(callerIdentity.Account) {
if aws.ToString(organization.MasterAccountId) == aws.ToString(callerIdentity.Account) {
t.Skip("this AWS account must not be the management account of an AWS Organization")
}

Expand Down
Loading
Loading