chore: add multiline parsing and refactor share cred behavior

Author: ibuildthecloud

integration/cred_test.go

@@ -14,22 +14,6 @@ func TestGPTScriptCredential(t *testing.T) {
 	require.Contains(t, out, "CREDENTIAL")
 }
 
-// TestCredentialScopes makes sure that environment variables set by credential tools and shared credential tools
-// are only available to the correct tools. See scripts/credscopes.gpt for more details.
-func TestCredentialScopes(t *testing.T) {
-	out, err := RunScript("scripts/cred_scopes.gpt", "--sub-tool", "oneOne")
-	require.NoError(t, err)
-	require.Contains(t, out, "good")
-
-	out, err = RunScript("scripts/cred_scopes.gpt", "--sub-tool", "twoOne")
-	require.NoError(t, err)
-	require.Contains(t, out, "good")
-
-	out, err = RunScript("scripts/cred_scopes.gpt", "--sub-tool", "twoTwo")
-	require.NoError(t, err)
-	require.Contains(t, out, "good")
-}
-
 // TestCredentialExpirationEnv tests a GPTScript with two credentials that expire at different times.
 // One expires after two hours, and the other expires after one hour.
 // This test makes sure that the GPTSCRIPT_CREDENTIAL_EXPIRATION environment variable is set to the nearer expiration time (1h).

integration/scripts/cred_scopes.gpt

@@ -73,7 +73,6 @@ func (a *AuthConfig) UnmarshalJSON(data []byte) error {
 type CLIConfig struct {
 	Auths            map[string]AuthConfig `json:"auths,omitempty"`
 	CredentialsStore string                `json:"credsStore,omitempty"`
-	GatewayURL       string                `json:"gatewayURL,omitempty"`
 	Integrations     map[string]string     `json:"integrations,omitempty"`
 
 	auths     map[string]types.AuthConfig

pkg/config/cliconfig.go

@@ -225,7 +225,7 @@ func validateCredentialCtx(ctxs []string) error {
 	}
 
 	// check alphanumeric
-	r := regexp.MustCompile("^[a-zA-Z0-9]+$")
+	r := regexp.MustCompile("^[-a-zA-Z0-9]+$")
 	for _, c := range ctxs {
 		if !r.MatchString(c) {
 			return fmt.Errorf("credential contexts must be alphanumeric")