[Cherry-pick] Port CEL fixes for release v0.6.1

[dibyom]

Changes

This cherry-picks two PRs for v0.6.1:

1. Fix issue with list results. #652
2. Fix the declarations for compareSecret. #658

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

• Includes tests (if functionality changed/added)
• Includes docs (if user facing)
• Commit messages follow commit message best practices

See the contribution guide for more details.

[dibyom]

@bigkevmcd A unit test fails when I cherry-pick #652 . Any ideas on what to fix here?
It also fails in #661: https://tekton-releases.appspot.com/build/tekton-prow/pr-logs/pull/tektoncd_triggers/661/pull-tekton-triggers-unit-tests/1280616596846415872/

[tekton-robot]

The following is the coverage report on the affected files.
Say /test pull-tekton-triggers-go-coverage to re-run this coverage report

File	Old Coverage	New Coverage	Delta
pkg/interceptors/cel/cel.go	87.9%	87.5%	-0.4
pkg/interceptors/cel/triggers.go	88.3%	87.2%	-1.1

[bigkevmcd]

t> @bigkevmcd A unit test fails when I cherry-pick #652 . Any ideas on what to fix here?

It also fails in #661: https://tekton-releases.appspot.com/build/tekton-prow/pr-logs/pull/tektoncd_triggers/661/pull-tekton-triggers-unit-tests/1280616596846415872/

I ran into this earlier, and my gut feeling is that it's a bug in protojson, sometimes it puts a space between list elements in the JSON output, and sometimes it doesn't.

Unfortunately the JSON marshaling that was used before is now deprecated, and the PR checks failed because of this.

The - 32 in the error log is basically saying there's no space char (ascii 32) in the output where one is expected.

Spaces clearly don't affect the parsing of the result, but lemme see if I can improve the parsing of the test.

[bigkevmcd]

This is the issue golang/protobuf#1121

[bigkevmcd]

diff --git a/pkg/interceptors/cel/cel_test.go b/pkg/interceptors/cel/cel_test.go
index 3dd13303..ddd597fa 100644
--- a/pkg/interceptors/cel/cel_test.go
+++ b/pkg/interceptors/cel/cel_test.go
@@ -18,6 +18,7 @@ package cel

 import (
        "bytes"
+       "encoding/json"
        "io"
        "io/ioutil"
        "net/http"
@@ -242,7 +243,8 @@ func TestInterceptor_ExecuteTrigger(t *testing.T) {
                                rt.Fatalf("error reading response body: %v", err)
                        }
                        defer resp.Body.Close()
-                       if diff := cmp.Diff(tt.want, got); diff != "" {
+
+                       if diff := cmp.Diff(mustUnmarshal(t, tt.want), mustUnmarshal(t, got)); diff != "" {
                                rt.Errorf("Interceptor.ExecuteTrigger (-want, +got) = %s", diff)
                        }
                })
@@ -635,3 +637,13 @@ func makeSecret() *corev1.Secret {
                },
        }
 }
+
+func mustUnmarshal(t *testing.T, b []byte) map[string]interface{} {
+       t.Helper()
+       v := map[string]interface{}{}
+       err := json.Unmarshal(b, &v)
+       if err != nil {
+               t.Fatalf("failed to unmarshal the body '%s': %s", b, err)
+       }
+       return v
+}

[tekton-robot]

The following is the coverage report on the affected files.
Say /test pull-tekton-triggers-go-coverage to re-run this coverage report

File	Old Coverage	New Coverage	Delta
pkg/interceptors/cel/cel.go	87.9%	87.5%	-0.4
pkg/interceptors/cel/triggers.go	88.3%	87.2%	-1.1

[tekton-robot]

The following is the coverage report on the affected files.
Say /test pull-tekton-triggers-go-coverage to re-run this coverage report

File	Old Coverage	New Coverage	Delta
pkg/interceptors/cel/cel.go	87.9%	87.5%	-0.4
pkg/interceptors/cel/triggers.go	88.3%	87.2%	-1.1

[wlynch]

/lgtm

[tekton-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wlynch

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [wlynch]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment