Amend find functions; reduce conditionals

hashicorp · Aug 2, 2022 · 6787fc1 · 6787fc1
1 parent 4a2bb85
commit 6787fc1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/internal/service/waf/find.go b/internal/service/waf/find.go
@@ -12,14 +12,14 @@ import (
 )
 
 func FindSubscribedRuleGroupByNameOrMetricName(ctx context.Context, conn *waf.WAF, name string, metricName string) (*waf.SubscribedRuleGroupSummary, error) {
-	if name == "" && metricName == "" {
-		return nil, errors.New("must specify either name or metricName")
-	}
-
 	hasName := name != ""
 	hasMetricName := metricName != ""
 	hasMatch := false
 
+	if !hasName && !hasMetricName {
+		return nil, errors.New("must specify either name or metricName")
+	}
+
 	input := &waf.ListSubscribedRuleGroupsInput{}
 
 	matchingRuleGroup := &waf.SubscribedRuleGroupSummary{}

diff --git a/internal/service/wafregional/find.go b/internal/service/wafregional/find.go
@@ -21,14 +21,14 @@ func FindRegexMatchSetByID(conn *wafregional.WAFRegional, id string) (*waf.Regex
 }
 
 func FindSubscribedRuleGroupByNameOrMetricName(ctx context.Context, conn *wafregional.WAFRegional, name string, metricName string) (*waf.SubscribedRuleGroupSummary, error) {
-	if name == "" && metricName == "" {
-		return nil, errors.New("must specify either name or metricName")
-	}
-
 	hasName := name != ""
 	hasMetricName := metricName != ""
 	hasMatch := false
 
+	if !hasName && !hasMetricName {
+		return nil, errors.New("must specify either name or metricName")
+	}
+
 	input := &waf.ListSubscribedRuleGroupsInput{}
 
 	matchingRuleGroup := &waf.SubscribedRuleGroupSummary{}