Merge pull request #24603 from hashicorp/t-sns-remove-service

sns: Remove service from funcs
hashicorp · May 5, 2022 · 36dc508 · 36dc508
2 parents 38f3e35 + 16c87ef
commit 36dc508
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/internal/service/sns/topic_policy.go b/internal/service/sns/topic_policy.go
@@ -117,7 +117,7 @@ func resourceTopicPolicyDelete(d *schema.ResourceData, meta interface{}) error {
 	// It is impossible to delete a policy or set to empty
 	// (confirmed by AWS Support representative)
 	// so we instead set it back to the default one.
-	err := putTopicPolicy(conn, d.Id(), defaultSNSTopicPolicy(d.Id(), d.Get("owner").(string)))
+	err := putTopicPolicy(conn, d.Id(), defaultTopicPolicy(d.Id(), d.Get("owner").(string)))
 
 	if err != nil {
 		return err
@@ -126,7 +126,7 @@ func resourceTopicPolicyDelete(d *schema.ResourceData, meta interface{}) error {
 	return nil
 }
 
-func defaultSNSTopicPolicy(topicArn, accountId string) string {
+func defaultTopicPolicy(topicArn, accountId string) string {
 	return fmt.Sprintf(`{
   "Version": "2008-10-17",
   "Id": "__default_policy_ID",

diff --git a/internal/service/sns/topic_subscription.go b/internal/service/sns/topic_subscription.go
@@ -358,13 +358,13 @@ type TopicSubscriptionRedrivePolicy struct {
 }
 
 func SuppressEquivalentTopicSubscriptionDeliveryPolicy(k, old, new string, d *schema.ResourceData) bool {
-	ob, err := normalizeSnsTopicSubscriptionDeliveryPolicy(old)
+	ob, err := normalizeTopicSubscriptionDeliveryPolicy(old)
 	if err != nil {
 		log.Print(err)
 		return false
 	}
 
-	nb, err := normalizeSnsTopicSubscriptionDeliveryPolicy(new)
+	nb, err := normalizeTopicSubscriptionDeliveryPolicy(new)
 	if err != nil {
 		log.Print(err)
 		return false
@@ -373,7 +373,7 @@ func SuppressEquivalentTopicSubscriptionDeliveryPolicy(k, old, new string, d *sc
 	return verify.JSONBytesEqual(ob, nb)
 }
 
-func normalizeSnsTopicSubscriptionDeliveryPolicy(policy string) ([]byte, error) {
+func normalizeTopicSubscriptionDeliveryPolicy(policy string) ([]byte, error) {
 	var deliveryPolicy TopicSubscriptionDeliveryPolicy
 
 	if err := json.Unmarshal([]byte(policy), &deliveryPolicy); err != nil {