From 309e86cbd5b042a54c27d55f55219f2af082bd3f Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Thu, 7 Nov 2024 13:08:22 -0700 Subject: [PATCH 1/2] chore: allow dot in credential context --- pkg/credentials/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/credentials/store.go b/pkg/credentials/store.go index 53e81f6b..e602d074 100644 --- a/pkg/credentials/store.go +++ b/pkg/credentials/store.go @@ -195,7 +195,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") From 056b9a1da8eb28e37b954c10e9bd296805260d2b Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 11 Nov 2024 15:00:30 -0700 Subject: [PATCH 2/2] chore: Add GPTSCRIPT_HTTP_ENV_PREFIX to specify http env vars to send --- pkg/engine/http.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkg/engine/http.go b/pkg/engine/http.go index a30c01e1..c1dd67e7 100644 --- a/pkg/engine/http.go +++ b/pkg/engine/http.go @@ -82,6 +82,16 @@ func (e *Engine) runHTTP(ctx context.Context, prg *types.Program, tool types.Too req.Header.Add("X-GPTScript-Env", k+"="+envMap[k]) } } + for _, prefix := range strings.Split(os.Getenv("GPTSCRIPT_HTTP_ENV_PREFIX"), ",") { + if prefix == "" { + continue + } + for _, k := range slices.Sorted(maps.Keys(envMap)) { + if strings.HasPrefix(k, prefix) { + req.Header.Add("X-GPTScript-Env", k+"="+envMap[k]) + } + } + } req.Header.Set("X-GPTScript-Tool-Name", tool.Parameters.Name)