Merge pull request #37332 from hashicorp/td-seclake-subscribernotification-fixes

resource/aws_securitylake_subscriber_notification: Fixes

Author: gdavison

.changelog/37332.txt

@@ -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
+```

internal/service/securitylake/exports_test.go

@@ -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
 )

internal/service/securitylake/securitylake_test.go

@@ -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"
@@ -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,
 		},
 	}
 
@@ -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")
 	}