Add test for regexp

coder · Emyrk · Aug 8, 2023 · Aug 2, 2023 · Aug 2, 2023 · Aug 2, 2023
commit f8ea15db394316b7d64d74bb232ce0af4cc1b0c4
diff --git a/cli/clibase/option_test.go b/cli/clibase/option_test.go
@@ -72,6 +72,40 @@ func TestOptionSet_ParseFlags(t *testing.T) {
 		err := os.FlagSet().Parse([]string{"--some-unknown", "foo"})
 		require.Error(t, err)
 	})
+
+	t.Run("RegexValid", func(t *testing.T) {
+		t.Parallel()
+
+		var regexpString clibase.Regexp
+
+		os := clibase.OptionSet{
+			clibase.Option{
+				Name:  "RegexpString",
+				Value: &regexpString,
+				Flag:  "regexp-string",
+			},
+		}
+
+		err := os.FlagSet().Parse([]string{"--regexp-string", "$test^"})
+		require.NoError(t, err)
+	})
+
+	t.Run("RegexInvalid", func(t *testing.T) {
+		t.Parallel()
+
+		var regexpString clibase.Regexp
+
+		os := clibase.OptionSet{
+			clibase.Option{
+				Name:  "RegexpString",
+				Value: &regexpString,
+				Flag:  "regexp-string",
+			},
+		}
+
+		err := os.FlagSet().Parse([]string{"--regexp-string", "(("})
+		require.Error(t, err)
+	})
 }
 
 func TestOptionSet_ParseEnv(t *testing.T) {

diff --git a/cli/clibase/values.go b/cli/clibase/values.go
@@ -471,7 +471,7 @@ func RegexpOf(s *regexp.Regexp) *Regexp {
 func (s *Regexp) Set(v string) error {
 	exp, err := regexp.Compile(v)
 	if err != nil {
-		return xerrors.Errorf("invalid regexp %q: %w", v, err)
+		return xerrors.Errorf("invalid regex expression: %w", v, err)
 	}
 	*s = Regexp(*exp)
 	return nil

diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -1082,7 +1082,7 @@ when required by your organization's security policy.`,
 			Description: "If provided any group name not matching the regex is ignored. This allows for filtering out groups that are not needed. This filter is applied after the group mapping.",
 			Flag:        "oidc-group-regex-filter",
 			Env:         "CODER_OIDC_GROUP_REGEX_FILTER",
-			Default:     "",
+			Default:     "*",
 			Value:       &c.OIDC.GroupRegexFilter,
 			Group:       &deploymentGroupOIDC,
 			YAML:        "groupRegexFilter",