Move experimentalFieldMask to separate struct

Signed-off-by: Aleksander Mistewicz <amistewicz@google.com>

cmd/observe/flows.go

@@ -702,8 +702,8 @@ func getFlowsRequest(ofilter *flowFilter, allowlist []string, denylist []string)
 		First:     first,
 	}
 
-	if len(otherOpts.experimentalFieldMask) > 0 {
-		fm, err := fieldmaskpb.New(&flowpb.Flow{}, strings.Split(otherOpts.experimentalFieldMask, ",")...)
+	if len(experimentalOpts.fieldMask) > 0 {
+		fm, err := fieldmaskpb.New(&flowpb.Flow{}, strings.Split(experimentalOpts.fieldMask, ",")...)
 		if err != nil {
 			return nil, fmt.Errorf("failed to construct field mask: %w", err)
 		}

cmd/observe/flows_test.go

@@ -129,7 +129,7 @@ denylist:
 
 func Test_getFlowsRequest_ExperimentalFieldMask_valid(t *testing.T) {
 	selectorOpts.until = ""
-	otherOpts.experimentalFieldMask = "time,verdict"
+	experimentalOpts.fieldMask = "time,verdict"
 	filter := newFlowFilter()
 	req, err := getFlowsRequest(filter, nil, nil)
 	assert.NoError(t, err)
@@ -142,7 +142,7 @@ func Test_getFlowsRequest_ExperimentalFieldMask_valid(t *testing.T) {
 }
 
 func Test_getFlowsRequest_ExperimentalFieldMask_invalid(t *testing.T) {
-	otherOpts.experimentalFieldMask = "time,verdict,invalid-field"
+	experimentalOpts.fieldMask = "time,verdict,invalid-field"
 	filter := newFlowFilter()
 	_, err := getFlowsRequest(filter, nil, nil)
 	assert.ErrorContains(t, err, "invalid-field")

cmd/observe/observe.go

@@ -37,10 +37,13 @@ var (
 	}
 
 	otherOpts struct {
-		ignoreStderr          bool
-		printRawFilters       bool
-		inputFile             string
-		experimentalFieldMask string
+		ignoreStderr    bool
+		printRawFilters bool
+		inputFile       string
+	}
+
+	experimentalOpts struct {
+		fieldMask string
 	}
 
 	printer *hubprinter.Printer
@@ -152,7 +155,7 @@ func init() {
 	otherFlags.StringVar(&otherOpts.inputFile, "input-file", "",
 		"Query flows from this file instead of the server. Use '-' to read from stdin.")
 
-	otherFlags.StringVar(&otherOpts.experimentalFieldMask, "experimental-field-mask", "",
+	otherFlags.StringVar(&experimentalOpts.fieldMask, "experimental-field-mask", "",
 		"Experimental: Comma-separated list of fields for mask. Fields not in the mask will be removed from server response.")
 }