Fix slice handling in Env.Libraries() (#825)

jpbetz · web-flow · commit dd6d31dd8b4d · 2023-08-23T13:48:26.000-07:00
diff --git a/cel/env.go b/cel/env.go
@@ -391,7 +391,7 @@ func (e *Env) HasLibrary(libName string) bool {
 
 // Libraries returns a list of SingletonLibrary that have been configured in the environment.
 func (e *Env) Libraries() []string {
-	libraries := make([]string, len(e.libraries))
+	libraries := make([]string, 0, len(e.libraries))
 	for libName := range e.libraries {
 		libraries = append(libraries, libName)
 	}
diff --git a/cel/env_test.go b/cel/env_test.go
@@ -257,9 +257,13 @@ func TestLibraries(t *testing.T) {
 			t.Errorf("Expected HasLibrary() to return true for '%s'", expected)
 		}
 		libMap := map[string]struct{}{}
-		for _, lib := range e.Libraries() {
+		libraries := e.Libraries()
+		for _, lib := range libraries {
 			libMap[lib] = struct{}{}
 		}
+		if len(libraries) != 2 {
+			t.Errorf("Expected HasLibrary() to contain exactly 2 libraries but got: %v", libraries)
+		}
 
 		if _, ok := libMap[expected]; !ok {
 			t.Errorf("Expected Libraries() to include '%s'", expected)

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ func (e *Env) HasLibrary(libName string) bool {`
`391`	`391`
`392`	`392`	`// Libraries returns a list of SingletonLibrary that have been configured in the environment.`
`393`	`393`	`func (e *Env) Libraries() []string {`
`394`		`- libraries := make([]string, len(e.libraries))`
	`394`	`+ libraries := make([]string, 0, len(e.libraries))`
`395`	`395`	`for libName := range e.libraries {`
`396`	`396`	`libraries = append(libraries, libName)`
`397`	`397`	`}`
Original file line number	Diff line number	Diff line change
`@@ -257,9 +257,13 @@ func TestLibraries(t *testing.T) {`
`257`	`257`	`t.Errorf("Expected HasLibrary() to return true for '%s'", expected)`
`258`	`258`	`}`
`259`	`259`	`libMap := map[string]struct{}{}`
`260`		`- for _, lib := range e.Libraries() {`
	`260`	`+ libraries := e.Libraries()`
	`261`	`+ for _, lib := range libraries {`
`261`	`262`	`libMap[lib] = struct{}{}`
`262`	`263`	`}`
	`264`	`+ if len(libraries) != 2 {`
	`265`	`+ t.Errorf("Expected HasLibrary() to contain exactly 2 libraries but got: %v", libraries)`
	`266`	`+ }`
`263`	`267`
`264`	`268`	`if _, ok := libMap[expected]; !ok {`
`265`	`269`	`t.Errorf("Expected Libraries() to include '%s'", expected)`