Undo unnecessary change.

gigerdo · Mar 14, 2024 · 9652d19 · 9652d19
1 parent 8926e04
commit 9652d19
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/ec/ecdatasource/deploymentsdatasource/expanders.go b/ec/ecdatasource/deploymentsdatasource/expanders.go
@@ -77,27 +77,25 @@ func expandFilters(ctx context.Context, state modelV0) (*models.SearchRequest, d
 		})
 	}
 
-	if !state.Tags.IsNull() {
-		var tags = make(map[string]string)
-		tmp := state.Tags.ElementsAs(ctx, &tags, false)
-		diags.Append(tmp...)
-		if diags.HasError() {
-			return nil, diags
-		}
-		var tagQueries []*models.QueryContainer
-		for key, value := range tags {
-			tagQueries = append(tagQueries,
-				newNestedTagQuery(key, value),
-			)
-		}
-		if len(tagQueries) > 0 {
-			queries = append(queries, &models.QueryContainer{
-				Bool: &models.BoolQuery{
-					MinimumShouldMatch: int32(len(tags)),
-					Should:             tagQueries,
-				},
-			})
-		}
+	var tags = make(map[string]string)
+	tmp := state.Tags.ElementsAs(ctx, &tags, false)
+	diags.Append(tmp...)
+	if diags.HasError() {
+		return nil, diags
+	}
+	var tagQueries []*models.QueryContainer
+	for key, value := range tags {
+		tagQueries = append(tagQueries,
+			newNestedTagQuery(key, value),
+		)
+	}
+	if len(tagQueries) > 0 {
+		queries = append(queries, &models.QueryContainer{
+			Bool: &models.BoolQuery{
+				MinimumShouldMatch: int32(len(tags)),
+				Should:             tagQueries,
+			},
+		})
 	}
 
 	type resourceFilter struct {

diff --git a/ec/ecdatasource/deploymentsdatasource/expanders_test.go b/ec/ecdatasource/deploymentsdatasource/expanders_test.go
@@ -163,6 +163,7 @@ func Test_expandFilters(t *testing.T) {
 			args: args{
 				state: modelV0{
 					Name: types.StringValue("test"),
+					Tags: types.MapNull(types.StringType),
 				},
 			},
 			want: &models.SearchRequest{