Fix the declarations for compareSecret.

compareSecret in both its forms was declared as returning a String not a Bool. This fixes both of these.
dibyom · Jul 6, 2020 · 69e02ea · 69e02ea
1 parent 50e82c1
commit 69e02ea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/pkg/interceptors/cel/cel_test.go b/pkg/interceptors/cel/cel_test.go
@@ -189,10 +189,18 @@ func TestInterceptor_ExecuteTrigger(t *testing.T) {
 			payload: ioutil.NopCloser(bytes.NewBufferString(`{"count":1,"measure":1.7}`)),
 			want:    []byte(`{"count":1,"measure":1.7}`),
 		},
+		{
+			name: "validating a secret",
+			CEL: &triggersv1.CELInterceptor{
+				Filter: "header.canonical('X-Secret-Token').compareSecret('token', 'test-secret', 'testing-ns') && body.count == 1.0",
+			},
+			payload: ioutil.NopCloser(bytes.NewBufferString(`{"count":1,"measure":1.7}`)),
+			want:    []byte(`{"count":1,"measure":1.7}`),
+		},
 		{
 			name: "validating a secret in the default namespace",
 			CEL: &triggersv1.CELInterceptor{
-				Filter: "header.canonical('X-Secret-Token').compareSecret('token', 'test-secret')",
+				Filter: "header.canonical('X-Secret-Token').compareSecret('token', 'test-secret') && body.count == 1.0",
 			},
 			payload: ioutil.NopCloser(bytes.NewBufferString(`{"count":1,"measure":1.7}`)),
 			want:    []byte(`{"count":1,"measure":1.7}`),

diff --git a/pkg/interceptors/cel/triggers.go b/pkg/interceptors/cel/triggers.go
@@ -178,7 +178,7 @@ func (triggersLib) CompileOptions() []cel.EnvOption {
 					[]*exprpb.Type{decls.String, decls.Int}, decls.String)),
 			decls.NewFunction("compareSecret",
 				decls.NewInstanceOverload("compareSecret_string_string_string",
-					[]*exprpb.Type{decls.String, decls.String, decls.String, decls.String}, decls.String)),
+					[]*exprpb.Type{decls.String, decls.String, decls.String, decls.String}, decls.Bool)),
 			decls.NewFunction("parseJSON",
 				decls.NewInstanceOverload("parseJSON_string",
 					[]*exprpb.Type{decls.String}, mapStrDyn)),
@@ -190,7 +190,7 @@ func (triggersLib) CompileOptions() []cel.EnvOption {
 					[]*exprpb.Type{decls.String}, mapStrDyn)),
 			decls.NewFunction("compareSecret",
 				decls.NewInstanceOverload("compareSecret_string_string",
-					[]*exprpb.Type{decls.String, decls.String, decls.String}, decls.String)))}
+					[]*exprpb.Type{decls.String, decls.String, decls.String}, decls.Bool)))}
 }
 
 func (t triggersLib) ProgramOptions() []cel.ProgramOption {