pkg/contexts: expand CRE.Normalized

Author: jmank88

pkg/contexts/contexts.go

@@ -38,8 +38,16 @@ type CRE struct {
 
 // Normalized returns a possibly modified CRE with normalized values.
 func (c CRE) Normalized() CRE {
+	c.Org = strings.TrimPrefix(c.Org, "org_")
+	c.Org = strings.TrimPrefix(c.Org, "0x")
+	c.Org = strings.ToLower(c.Org)
+
+	c.Owner = strings.TrimPrefix(c.Owner, "owner_")
 	c.Owner = strings.TrimPrefix(c.Owner, "0x")
 	c.Owner = strings.ToLower(c.Owner)
+
+	c.Workflow = strings.TrimPrefix(c.Workflow, "0x")
+	c.Workflow = strings.ToLower(c.Workflow)
 	return c
 }
 

pkg/settings/keys_test.go

@@ -10,9 +10,9 @@ import (
 
 func TestTenant_rawKeys(t *testing.T) {
 	const (
-		org      = "AcmeCorporation"
+		org      = "acmecorporation"
 		owner    = "1234abcd"
-		workflow = "ABCDEFGH"
+		workflow = "abcdefgh"
 		key      = "foo"
 	)
 	for _, test := range []struct {

pkg/settings/limits/resource_test.go

@@ -72,7 +72,7 @@ func ExampleResourceLimiter_Use() {
 func ExampleMultiResourcePoolLimiter() {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
-	ctx = contexts.WithCRE(ctx, contexts.CRE{Org: "orgID", Owner: "owner-id", Workflow: "workflowID"})
+	ctx = contexts.WithCRE(ctx, contexts.CRE{Org: "org-id", Owner: "owner-id", Workflow: "workflow-id"})
 	global := GlobalResourcePoolLimiter[int](100)
 	freeGlobal, err := global.Wait(ctx, 95)
 	if err != nil {