Skip to content

Commit

Permalink
Replay the GCS Tests to ensure that e2e pass
Browse files Browse the repository at this point in the history
  • Loading branch information
khrm authored and tekton-robot committed Jul 15, 2024
1 parent 4582dc4 commit c34e40d
Show file tree
Hide file tree
Showing 15 changed files with 64 additions and 48 deletions.
4 changes: 2 additions & 2 deletions cmd/api/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func main() {
gormConfig.Logger = gormlogger.Default.LogMode(gormlogger.Silent)
}
// Retry database connection, sometimes the database is not ready to accept connection
err = wait.PollImmediate(10*time.Second, 2*time.Minute, func() (bool, error) {
err = wait.PollImmediate(10*time.Second, 2*time.Minute, func() (bool, error) { //nolint:staticcheck
db, err = gorm.Open(postgres.Open(dbURI), gormConfig)
if err != nil {
log.Warnf("Error connecting to database (retrying in 10s): %v", err)
Expand Down Expand Up @@ -270,7 +270,7 @@ func main() {
}

// Setup gRPC gateway to proxy request to gRPC health checks
clientConn, err := grpc.Dial(":"+serverConfig.SERVER_PORT, grpc.WithTransportCredentials(creds), grpc.WithNoProxy())
clientConn, err := grpc.Dial(":"+serverConfig.SERVER_PORT, grpc.WithTransportCredentials(creds), grpc.WithNoProxy()) //nolint:staticcheck
if err != nil {
log.Fatalf("Error dialing gRPC endpoint: %v", err)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/server/cel/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
)

const (
typePipelineRun = "tekton.dev/v1beta1.PipelineRun"
typeTaskRun = "tekton.dev/v1beta1.TaskRun"
typePipelineRun = "tekton.dev/v1.PipelineRun"
typeTaskRun = "tekton.dev/v1.TaskRun"
)

// NewResultsEnv creates a CEL program to build SQL filters for Result objects.
Expand Down
18 changes: 9 additions & 9 deletions pkg/api/server/cel2sql/convert_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,22 +127,22 @@ func TestConvertRecordExpressions(t *testing.T) {
{
name: "data_type field",
in: `data_type == PIPELINE_RUN`,
want: "(type = 'tekton.dev/v1beta1.PipelineRun')",
want: "(type = 'tekton.dev/v1.PipelineRun')",
},
{
name: "index operator with numeric argument in JSON arrays",
in: `data_type == "tekton.dev/v1beta1.TaskRun" && data.status.conditions[0].status == "True"`,
want: "((type = 'tekton.dev/v1beta1.TaskRun') AND ((data->'status'->'conditions'->0->>'status') = 'True'))",
in: `data_type == "tekton.dev/v1.TaskRun" && data.status.conditions[0].status == "True"`,
want: "((type = 'tekton.dev/v1.TaskRun') AND ((data->'status'->'conditions'->0->>'status') = 'True'))",
},
{
name: "index operator as first operation in JSON object",
in: `data_type == "tekton.dev/v1beta1.TaskRun" && data["status"].conditions[0].status == "True"`,
want: "((type = 'tekton.dev/v1beta1.TaskRun') AND ((data->'status'->'conditions'->0->>'status') = 'True'))",
in: `data_type == "tekton.dev/v1.TaskRun" && data["status"].conditions[0].status == "True"`,
want: "((type = 'tekton.dev/v1.TaskRun') AND ((data->'status'->'conditions'->0->>'status') = 'True'))",
},
{
name: "index operator with string argument in JSON object",
in: `data_type == "tekton.dev/v1beta1.TaskRun" && data.status["conditions"][0].status == "True"`,
want: "((type = 'tekton.dev/v1beta1.TaskRun') AND ((data->'status'->'conditions'->0->>'status') = 'True'))",
in: `data_type == "tekton.dev/v1.TaskRun" && data.status["conditions"][0].status == "True"`,
want: "((type = 'tekton.dev/v1.TaskRun') AND ((data->'status'->'conditions'->0->>'status') = 'True'))",
},
{
name: "complex expression with subgroups",
Expand Down Expand Up @@ -229,12 +229,12 @@ func TestConvertResultExpressions(t *testing.T) {
{
name: "comparison with the PIPELINE_RUN const value",
in: `summary.type == PIPELINE_RUN`,
want: "(recordsummary_type = 'tekton.dev/v1beta1.PipelineRun')",
want: "(recordsummary_type = 'tekton.dev/v1.PipelineRun')",
},
{
name: "comparison with the TASK_RUN const value",
in: `summary.type == TASK_RUN`,
want: "(recordsummary_type = 'tekton.dev/v1beta1.TaskRun')",
want: "(recordsummary_type = 'tekton.dev/v1.TaskRun')",
},
{
name: "RecordSummary_Status constants",
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/server/v1alpha2/log/gcs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func TestGCSReadFrom(t *testing.T) {
},
key: gcsTestKey,
}
client, done := NewTestGCPClient(ctx, 8080, t)
client, done := NewTestGCPClient(ctx, 8087, t)
defer done()
gcs.client = client
reader := strings.NewReader(gcsTestLogData)
Expand Down
11 changes: 7 additions & 4 deletions pkg/api/server/v1alpha2/log/testdata/TestGCSDelete.replay
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Initial": "AQAAAA7cZsvyEGJ4dwFK",
"Initial": "AQAAAA7eA/CINF/RhAFK",
"Version": "0.2",
"Converter": {
"ScrubBody": null,
Expand Down Expand Up @@ -37,7 +37,7 @@
},
"Entries": [
{
"ID": "5441cf12eddd37e5",
"ID": "4cd3d6c167de9d89",
"Request": {
"Method": "DELETE",
"URL": "https://storage.googleapis.com/storage/v1/b/tekton-releases-test-results/o/foo%2Fbar%2Flog?alt=json\u0026prettyPrint=false",
Expand All @@ -47,6 +47,9 @@
],
"User-Agent": [
"CLEARED"
],
"X-Goog-Gcs-Idempotency-Token": [
"CLEARED"
]
},
"MediaType": "",
Expand All @@ -73,7 +76,7 @@
"application/json"
],
"Date": [
"Thu, 10 Aug 2023 12:15:47 GMT"
"Tue, 18 Jun 2024 21:18:01 GMT"
],
"Expires": [
"CLEARED"
Expand All @@ -89,7 +92,7 @@
"X-Origin"
],
"X-Guploader-Uploadid": [
"ADPycdtlDvPPPp7pHU18mIFlJbqtmDmir99abjh5KW3gdR18HAfo8Lk6dQiEaIAVjmGJSBxoO6vCYTEyOlvnphP4WJe2X4hjcpDn"
"ACJd0NoXb-kqzzAIr7Y8rUKoTnKGN2Z-bMEFB4csiaBZ65Sn4WjArd-CkCTl8mD8oEUZCe6oew"
]
},
"Body": ""
Expand Down
14 changes: 7 additions & 7 deletions pkg/api/server/v1alpha2/log/testdata/TestGCSReadFrom.replay
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Initial": "AQAAAA7cZsvOK9QJwwFK",
"Initial": "AQAAAA7eA/B/NS8KVgFK",
"Version": "0.2",
"Converter": {
"ScrubBody": null,
Expand Down Expand Up @@ -37,7 +37,7 @@
},
"Entries": [
{
"ID": "86af74cb6dce967e",
"ID": "28c834aa60344c6f",
"Request": {
"Method": "POST",
"URL": "https://storage.googleapis.com/upload/storage/v1/b/tekton-releases-test-results/o?alt=json\u0026name=foo%2Fbar%2Flog\u0026prettyPrint=false\u0026projection=full\u0026uploadType=multipart",
Expand Down Expand Up @@ -68,16 +68,16 @@
"no-cache, no-store, max-age=0, must-revalidate"
],
"Content-Length": [
"2959"
"2974"
],
"Content-Type": [
"application/json; charset=UTF-8"
],
"Date": [
"Thu, 10 Aug 2023 12:15:11 GMT"
"Tue, 18 Jun 2024 21:17:53 GMT"
],
"Etag": [
"CIv58eGI0oADEAE="
"CITlgeuJ5oYDEAE="
],
"Expires": [
"CLEARED"
Expand All @@ -93,10 +93,10 @@
"X-Origin"
],
"X-Guploader-Uploadid": [
"ADPycdtbaIK2fylknYwng0y7bzh4N9raPoUEwV7i65H3CeGUoRkX0Fxqjafj7Y-4_I1RgzJmmppxDCKj0o1knfYcQpgtU2a1tA1N"
"ACJd0Nooz99E9Vbs1NbHpQSZ9eVZXYWU1N2VI_P_5iEpE6DOtIuzHZ7nTVGv6P0Zj3OM94Ua4g4ipkKy8Q"
]
},
"Body": "eyJraW5kIjoic3RvcmFnZSNvYmplY3QiLCJpZCI6InRla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvZm9vL2Jhci9sb2cvMTY5MTY2OTcxMTU4NDM5NSIsInNlbGZMaW5rIjoiaHR0cHM6Ly93d3cuZ29vZ2xlYXBpcy5jb20vc3RvcmFnZS92MS9iL3Rla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvby9mb28lMkZiYXIlMkZsb2ciLCJtZWRpYUxpbmsiOiJodHRwczovL3N0b3JhZ2UuZ29vZ2xlYXBpcy5jb20vZG93bmxvYWQvc3RvcmFnZS92MS9iL3Rla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvby9mb28lMkZiYXIlMkZsb2c/Z2VuZXJhdGlvbj0xNjkxNjY5NzExNTg0Mzk1JmFsdD1tZWRpYSIsIm5hbWUiOiJmb28vYmFyL2xvZyIsImJ1Y2tldCI6InRla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMiLCJnZW5lcmF0aW9uIjoiMTY5MTY2OTcxMTU4NDM5NSIsIm1ldGFnZW5lcmF0aW9uIjoiMSIsImNvbnRlbnRUeXBlIjoidGV4dC9wbGFpbjsgY2hhcnNldD11dGYtOCIsInN0b3JhZ2VDbGFzcyI6Ik5FQVJMSU5FIiwic2l6ZSI6IjExIiwibWQ1SGFzaCI6InprWlhNNERxSXNwMkpad2hhYmhZOHc9PSIsImNyYzMyYyI6Imx5a2NqUT09IiwiZXRhZyI6IkNJdjU4ZUdJMG9BREVBRT0iLCJ0aW1lQ3JlYXRlZCI6IjIwMjMtMDgtMTBUMTI6MTU6MTEuNjMwWiIsInVwZGF0ZWQiOiIyMDIzLTA4LTEwVDEyOjE1OjExLjYzMFoiLCJ0aW1lU3RvcmFnZUNsYXNzVXBkYXRlZCI6IjIwMjMtMDgtMTBUMTI6MTU6MTEuNjMwWiIsImFjbCI6W3sia2luZCI6InN0b3JhZ2Ujb2JqZWN0QWNjZXNzQ29udHJvbCIsIm9iamVjdCI6ImZvby9iYXIvbG9nIiwiZ2VuZXJhdGlvbiI6IjE2OTE2Njk3MTE1ODQzOTUiLCJpZCI6InRla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvZm9vL2Jhci9sb2cvMTY5MTY2OTcxMTU4NDM5NS9wcm9qZWN0LW93bmVycy01NzQyNDgyNzE0OTIiLCJzZWxmTGluayI6Imh0dHBzOi8vd3d3Lmdvb2dsZWFwaXMuY29tL3N0b3JhZ2UvdjEvYi90ZWt0b24tcmVsZWFzZXMtdGVzdC1yZXN1bHRzL28vZm9vJTJGYmFyJTJGbG9nL2FjbC9wcm9qZWN0LW93bmVycy01NzQyNDgyNzE0OTIiLCJidWNrZXQiOiJ0ZWt0b24tcmVsZWFzZXMtdGVzdC1yZXN1bHRzIiwiZW50aXR5IjoicHJvamVjdC1vd25lcnMtNTc0MjQ4MjcxNDkyIiwicm9sZSI6Ik9XTkVSIiwiZXRhZyI6IkNJdjU4ZUdJMG9BREVBRT0iLCJwcm9qZWN0VGVhbSI6eyJwcm9qZWN0TnVtYmVyIjoiNTc0MjQ4MjcxNDkyIiwidGVhbSI6Im93bmVycyJ9fSx7ImtpbmQiOiJzdG9yYWdlI29iamVjdEFjY2Vzc0NvbnRyb2wiLCJvYmplY3QiOiJmb28vYmFyL2xvZyIsImdlbmVyYXRpb24iOiIxNjkxNjY5NzExNTg0Mzk1IiwiaWQiOiJ0ZWt0b24tcmVsZWFzZXMtdGVzdC1yZXN1bHRzL2Zvby9iYXIvbG9nLzE2OTE2Njk3MTE1ODQzOTUvcHJvamVjdC1lZGl0b3JzLTU3NDI0ODI3MTQ5MiIsInNlbGZMaW5rIjoiaHR0cHM6Ly93d3cuZ29vZ2xlYXBpcy5jb20vc3RvcmFnZS92MS9iL3Rla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvby9mb28lMkZiYXIlMkZsb2cvYWNsL3Byb2plY3QtZWRpdG9ycy01NzQyNDgyNzE0OTIiLCJidWNrZXQiOiJ0ZWt0b24tcmVsZWFzZXMtdGVzdC1yZXN1bHRzIiwiZW50aXR5IjoicHJvamVjdC1lZGl0b3JzLTU3NDI0ODI3MTQ5MiIsInJvbGUiOiJPV05FUiIsImV0YWciOiJDSXY1OGVHSTBvQURFQUU9IiwicHJvamVjdFRlYW0iOnsicHJvamVjdE51bWJlciI6IjU3NDI0ODI3MTQ5MiIsInRlYW0iOiJlZGl0b3JzIn19LHsia2luZCI6InN0b3JhZ2Ujb2JqZWN0QWNjZXNzQ29udHJvbCIsIm9iamVjdCI6ImZvby9iYXIvbG9nIiwiZ2VuZXJhdGlvbiI6IjE2OTE2Njk3MTE1ODQzOTUiLCJpZCI6InRla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvZm9vL2Jhci9sb2cvMTY5MTY2OTcxMTU4NDM5NS9wcm9qZWN0LXZpZXdlcnMtNTc0MjQ4MjcxNDkyIiwic2VsZkxpbmsiOiJodHRwczovL3d3dy5nb29nbGVhcGlzLmNvbS9zdG9yYWdlL3YxL2IvdGVrdG9uLXJlbGVhc2VzLXRlc3QtcmVzdWx0cy9vL2ZvbyUyRmJhciUyRmxvZy9hY2wvcHJvamVjdC12aWV3ZXJzLTU3NDI0ODI3MTQ5MiIsImJ1Y2tldCI6InRla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMiLCJlbnRpdHkiOiJwcm9qZWN0LXZpZXdlcnMtNTc0MjQ4MjcxNDkyIiwicm9sZSI6IlJFQURFUiIsImV0YWciOiJDSXY1OGVHSTBvQURFQUU9IiwicHJvamVjdFRlYW0iOnsicHJvamVjdE51bWJlciI6IjU3NDI0ODI3MTQ5MiIsInRlYW0iOiJ2aWV3ZXJzIn19LHsia2luZCI6InN0b3JhZ2Ujb2JqZWN0QWNjZXNzQ29udHJvbCIsIm9iamVjdCI6ImZvby9iYXIvbG9nIiwiZ2VuZXJhdGlvbiI6IjE2OTE2Njk3MTE1ODQzOTUiLCJpZCI6InRla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvZm9vL2Jhci9sb2cvMTY5MTY2OTcxMTU4NDM5NS91c2VyLXJlc3VsdHMtcmVsZWFzZUB0ZWt0b24tcmVsZWFzZXMuaWFtLmdzZXJ2aWNlYWNjb3VudC5jb20iLCJzZWxmTGluayI6Imh0dHBzOi8vd3d3Lmdvb2dsZWFwaXMuY29tL3N0b3JhZ2UvdjEvYi90ZWt0b24tcmVsZWFzZXMtdGVzdC1yZXN1bHRzL28vZm9vJTJGYmFyJTJGbG9nL2FjbC91c2VyLXJlc3VsdHMtcmVsZWFzZUB0ZWt0b24tcmVsZWFzZXMuaWFtLmdzZXJ2aWNlYWNjb3VudC5jb20iLCJidWNrZXQiOiJ0ZWt0b24tcmVsZWFzZXMtdGVzdC1yZXN1bHRzIiwiZW50aXR5IjoidXNlci1yZXN1bHRzLXJlbGVhc2VAdGVrdG9uLXJlbGVhc2VzLmlhbS5nc2VydmljZWFjY291bnQuY29tIiwicm9sZSI6Ik9XTkVSIiwiZW1haWwiOiJyZXN1bHRzLXJlbGVhc2VAdGVrdG9uLXJlbGVhc2VzLmlhbS5nc2VydmljZWFjY291bnQuY29tIiwiZXRhZyI6IkNJdjU4ZUdJMG9BREVBRT0ifV0sIm93bmVyIjp7ImVudGl0eSI6InVzZXItcmVzdWx0cy1yZWxlYXNlQHRla3Rvbi1yZWxlYXNlcy5pYW0uZ3NlcnZpY2VhY2NvdW50LmNvbSJ9fQ=="
"Body": "eyJraW5kIjoic3RvcmFnZSNvYmplY3QiLCJpZCI6InRla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvZm9vL2Jhci9sb2cvMTcxODc0NTQ3Mjk4Nzc4MCIsInNlbGZMaW5rIjoiaHR0cHM6Ly93d3cuZ29vZ2xlYXBpcy5jb20vc3RvcmFnZS92MS9iL3Rla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvby9mb28lMkZiYXIlMkZsb2ciLCJtZWRpYUxpbmsiOiJodHRwczovL3N0b3JhZ2UuZ29vZ2xlYXBpcy5jb20vZG93bmxvYWQvc3RvcmFnZS92MS9iL3Rla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvby9mb28lMkZiYXIlMkZsb2c/Z2VuZXJhdGlvbj0xNzE4NzQ1NDcyOTg3NzgwJmFsdD1tZWRpYSIsIm5hbWUiOiJmb28vYmFyL2xvZyIsImJ1Y2tldCI6InRla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMiLCJnZW5lcmF0aW9uIjoiMTcxODc0NTQ3Mjk4Nzc4MCIsIm1ldGFnZW5lcmF0aW9uIjoiMSIsImNvbnRlbnRUeXBlIjoidGV4dC9wbGFpbjsgY2hhcnNldD11dGYtOCIsInN0b3JhZ2VDbGFzcyI6Ik5FQVJMSU5FIiwic2l6ZSI6IjExIiwibWQ1SGFzaCI6InprWlhNNERxSXNwMkpad2hhYmhZOHc9PSIsImNyYzMyYyI6Imx5a2NqUT09IiwiZXRhZyI6IkNJVGxnZXVKNW9ZREVBRT0iLCJ0aW1lQ3JlYXRlZCI6IjIwMjQtMDYtMThUMjE6MTc6NTMuMDM4WiIsInVwZGF0ZWQiOiIyMDI0LTA2LTE4VDIxOjE3OjUzLjAzOFoiLCJ0aW1lU3RvcmFnZUNsYXNzVXBkYXRlZCI6IjIwMjQtMDYtMThUMjE6MTc6NTMuMDM4WiIsImFjbCI6W3sia2luZCI6InN0b3JhZ2Ujb2JqZWN0QWNjZXNzQ29udHJvbCIsIm9iamVjdCI6ImZvby9iYXIvbG9nIiwiZ2VuZXJhdGlvbiI6IjE3MTg3NDU0NzI5ODc3ODAiLCJpZCI6InRla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvZm9vL2Jhci9sb2cvMTcxODc0NTQ3Mjk4Nzc4MC9wcm9qZWN0LW93bmVycy01NzQyNDgyNzE0OTIiLCJzZWxmTGluayI6Imh0dHBzOi8vd3d3Lmdvb2dsZWFwaXMuY29tL3N0b3JhZ2UvdjEvYi90ZWt0b24tcmVsZWFzZXMtdGVzdC1yZXN1bHRzL28vZm9vJTJGYmFyJTJGbG9nL2FjbC9wcm9qZWN0LW93bmVycy01NzQyNDgyNzE0OTIiLCJidWNrZXQiOiJ0ZWt0b24tcmVsZWFzZXMtdGVzdC1yZXN1bHRzIiwiZW50aXR5IjoicHJvamVjdC1vd25lcnMtNTc0MjQ4MjcxNDkyIiwicm9sZSI6Ik9XTkVSIiwiZXRhZyI6IkNJVGxnZXVKNW9ZREVBRT0iLCJwcm9qZWN0VGVhbSI6eyJwcm9qZWN0TnVtYmVyIjoiNTc0MjQ4MjcxNDkyIiwidGVhbSI6Im93bmVycyJ9fSx7ImtpbmQiOiJzdG9yYWdlI29iamVjdEFjY2Vzc0NvbnRyb2wiLCJvYmplY3QiOiJmb28vYmFyL2xvZyIsImdlbmVyYXRpb24iOiIxNzE4NzQ1NDcyOTg3NzgwIiwiaWQiOiJ0ZWt0b24tcmVsZWFzZXMtdGVzdC1yZXN1bHRzL2Zvby9iYXIvbG9nLzE3MTg3NDU0NzI5ODc3ODAvcHJvamVjdC1lZGl0b3JzLTU3NDI0ODI3MTQ5MiIsInNlbGZMaW5rIjoiaHR0cHM6Ly93d3cuZ29vZ2xlYXBpcy5jb20vc3RvcmFnZS92MS9iL3Rla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvby9mb28lMkZiYXIlMkZsb2cvYWNsL3Byb2plY3QtZWRpdG9ycy01NzQyNDgyNzE0OTIiLCJidWNrZXQiOiJ0ZWt0b24tcmVsZWFzZXMtdGVzdC1yZXN1bHRzIiwiZW50aXR5IjoicHJvamVjdC1lZGl0b3JzLTU3NDI0ODI3MTQ5MiIsInJvbGUiOiJPV05FUiIsImV0YWciOiJDSVRsZ2V1SjVvWURFQUU9IiwicHJvamVjdFRlYW0iOnsicHJvamVjdE51bWJlciI6IjU3NDI0ODI3MTQ5MiIsInRlYW0iOiJlZGl0b3JzIn19LHsia2luZCI6InN0b3JhZ2Ujb2JqZWN0QWNjZXNzQ29udHJvbCIsIm9iamVjdCI6ImZvby9iYXIvbG9nIiwiZ2VuZXJhdGlvbiI6IjE3MTg3NDU0NzI5ODc3ODAiLCJpZCI6InRla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvZm9vL2Jhci9sb2cvMTcxODc0NTQ3Mjk4Nzc4MC9wcm9qZWN0LXZpZXdlcnMtNTc0MjQ4MjcxNDkyIiwic2VsZkxpbmsiOiJodHRwczovL3d3dy5nb29nbGVhcGlzLmNvbS9zdG9yYWdlL3YxL2IvdGVrdG9uLXJlbGVhc2VzLXRlc3QtcmVzdWx0cy9vL2ZvbyUyRmJhciUyRmxvZy9hY2wvcHJvamVjdC12aWV3ZXJzLTU3NDI0ODI3MTQ5MiIsImJ1Y2tldCI6InRla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMiLCJlbnRpdHkiOiJwcm9qZWN0LXZpZXdlcnMtNTc0MjQ4MjcxNDkyIiwicm9sZSI6IlJFQURFUiIsImV0YWciOiJDSVRsZ2V1SjVvWURFQUU9IiwicHJvamVjdFRlYW0iOnsicHJvamVjdE51bWJlciI6IjU3NDI0ODI3MTQ5MiIsInRlYW0iOiJ2aWV3ZXJzIn19LHsia2luZCI6InN0b3JhZ2Ujb2JqZWN0QWNjZXNzQ29udHJvbCIsIm9iamVjdCI6ImZvby9iYXIvbG9nIiwiZ2VuZXJhdGlvbiI6IjE3MTg3NDU0NzI5ODc3ODAiLCJpZCI6InRla3Rvbi1yZWxlYXNlcy10ZXN0LXJlc3VsdHMvZm9vL2Jhci9sb2cvMTcxODc0NTQ3Mjk4Nzc4MC91c2VyLXJlbGVhc2UtcmlnaHQtbWVvd0B0ZWt0b24tcmVsZWFzZXMuaWFtLmdzZXJ2aWNlYWNjb3VudC5jb20iLCJzZWxmTGluayI6Imh0dHBzOi8vd3d3Lmdvb2dsZWFwaXMuY29tL3N0b3JhZ2UvdjEvYi90ZWt0b24tcmVsZWFzZXMtdGVzdC1yZXN1bHRzL28vZm9vJTJGYmFyJTJGbG9nL2FjbC91c2VyLXJlbGVhc2UtcmlnaHQtbWVvd0B0ZWt0b24tcmVsZWFzZXMuaWFtLmdzZXJ2aWNlYWNjb3VudC5jb20iLCJidWNrZXQiOiJ0ZWt0b24tcmVsZWFzZXMtdGVzdC1yZXN1bHRzIiwiZW50aXR5IjoidXNlci1yZWxlYXNlLXJpZ2h0LW1lb3dAdGVrdG9uLXJlbGVhc2VzLmlhbS5nc2VydmljZWFjY291bnQuY29tIiwicm9sZSI6Ik9XTkVSIiwiZW1haWwiOiJyZWxlYXNlLXJpZ2h0LW1lb3dAdGVrdG9uLXJlbGVhc2VzLmlhbS5nc2VydmljZWFjY291bnQuY29tIiwiZXRhZyI6IkNJVGxnZXVKNW9ZREVBRT0ifV0sIm93bmVyIjp7ImVudGl0eSI6InVzZXItcmVsZWFzZS1yaWdodC1tZW93QHRla3Rvbi1yZWxlYXNlcy5pYW0uZ3NlcnZpY2VhY2NvdW50LmNvbSJ9fQ=="
}
}
]
Expand Down
17 changes: 10 additions & 7 deletions pkg/api/server/v1alpha2/log/testdata/TestGCSWriteTo.replay
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Initial": "AQAAAA7cZsvsE0HiRgFK",
"Initial": "AQAAAA7eA/CFEgKKsQFK",
"Version": "0.2",
"Converter": {
"ScrubBody": null,
Expand Down Expand Up @@ -37,10 +37,10 @@
},
"Entries": [
{
"ID": "8decbb664730f732",
"ID": "f43619a071198f3e",
"Request": {
"Method": "GET",
"URL": "https://storage.googleapis.com/tekton-releases-test-results/foo/bar/log",
"URL": "https://storage.googleapis.com/tekton-releases-test-results/foo%2Fbar%2Flog",
"Header": {
"Accept-Encoding": [
"gzip"
Expand All @@ -63,6 +63,9 @@
"Accept-Ranges": [
"bytes"
],
"Age": [
"377"
],
"Alt-Svc": [
"h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000"
],
Expand All @@ -76,7 +79,7 @@
"text/plain; charset=utf-8"
],
"Date": [
"Thu, 10 Aug 2023 12:15:41 GMT"
"Tue, 18 Jun 2024 21:11:40 GMT"
],
"Etag": [
"\"ce46573380ea22ca76259c2169b858f3\""
Expand All @@ -85,13 +88,13 @@
"CLEARED"
],
"Last-Modified": [
"Thu, 10 Aug 2023 12:15:11 GMT"
"Tue, 18 Jun 2024 21:10:51 GMT"
],
"Server": [
"UploadServer"
],
"X-Goog-Generation": [
"1691669711584395"
"1718745051457000"
],
"X-Goog-Hash": [
"crc32c=lykcjQ==",
Expand All @@ -110,7 +113,7 @@
"11"
],
"X-Guploader-Uploadid": [
"ADPycdu25tTzPvvo5t1u2g6eIE4Q-wLH4wnyr-qig6iu0hfFnbCNrnA_tG-0ohE_2ayJxCF78cCJ-8rzlsdo2YcoCNY8FsPkgYoO"
"ACJd0NpW8dO2SFu0wX4xZ3ABzCfa_0V8B2mcRZhQ2kuQAtzBgR72E5DAEknRuW8gAy1d9RvunkbMXDVDlA"
]
},
"Body": "Zm9vLWJhci1sb2c="
Expand Down
6 changes: 4 additions & 2 deletions pkg/cli/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import (
"k8s.io/client-go/tools/clientcmd"
)

//lint:ignore SA1019

// Factory contains the configuration for creating a k8s client.
type Factory struct {
k8s kubernetes.Interface
Expand Down Expand Up @@ -87,7 +89,7 @@ func (f *Factory) ResultsClient(ctx context.Context, overrideAPIAddr string) (pb
if overrideAPIAddr != "" {
addr = overrideAPIAddr
}
conn, err := grpc.DialContext(ctx, addr, grpc.WithBlock(),
conn, err := grpc.DialContext(ctx, addr, grpc.WithBlock(), //nolint:staticcheck
grpc.WithTransportCredentials(creds),
grpc.WithDefaultCallOptions(grpc.PerRPCCredentials(oauth.TokenSource{
TokenSource: oauth2.StaticTokenSource(&oauth2.Token{AccessToken: token}),
Expand Down Expand Up @@ -146,7 +148,7 @@ func (f *Factory) LogClient(ctx context.Context, overrideAPIAddr string) (pb.Log
if overrideAPIAddr != "" {
addr = overrideAPIAddr
}
conn, err := grpc.DialContext(ctx, addr, grpc.WithBlock(),
conn, err := grpc.DialContext(ctx, addr, grpc.WithBlock(), //nolint:staticcheck
grpc.WithTransportCredentials(creds),
grpc.WithDefaultCallOptions(grpc.PerRPCCredentials(oauth.TokenSource{
TokenSource: oauth2.StaticTokenSource(&oauth2.Token{AccessToken: token}),
Expand Down
2 changes: 2 additions & 0 deletions pkg/internal/test/clients.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ const (
)

// NewResultsClient creates new gRPC Results client for testing purpose
//
//nolint:staticcheck
func NewResultsClient(t *testing.T, config *config.Config, opts ...server.Option) (pb.ResultsClient, pb.LogsClient) {
t.Helper()
config.DB_ENABLE_AUTO_MIGRATION = true
Expand Down
2 changes: 1 addition & 1 deletion pkg/watcher/reconciler/dynamic/dynamic.go
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ func (r *Reconciler) storeEvents(ctx context.Context, o results.Object) error {
return err
}

tr, ok := o.(*pipelinev1beta1.TaskRun)
tr, ok := o.(*pipelinev1.TaskRun)

if ok {
podName := tr.Status.PodName
Expand Down
5 changes: 4 additions & 1 deletion pkg/watcher/reconciler/pipelinerun/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,13 @@ func NewControllerWithConfig(ctx context.Context, resultsClient pb.ResultsClient
WorkQueueName: "PipelineRuns",
})

pipelineRunInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
_, err := pipelineRunInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: impl.Enqueue,
UpdateFunc: controller.PassNew(impl.Enqueue),
})
if err != nil {
logger.Panicf("Couldn't register PipelineRun informer event handler: %w", err)
}

return impl
}
5 changes: 4 additions & 1 deletion pkg/watcher/reconciler/taskrun/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,13 @@ func NewControllerWithConfig(ctx context.Context, resultsClient pb.ResultsClient
WorkQueueName: "TaskRuns",
})

informer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
_, err := informer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: impl.Enqueue,
UpdateFunc: controller.PassNew(impl.Enqueue),
})
if err != nil {
logger.Panicf("Couldn't register TaskRun informer event handler: %w", err)
}

return impl
}
2 changes: 1 addition & 1 deletion test/e2e/client/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func NewGRPCClient(serverAddress string, opts ...grpc.DialOption) (GRPCClient, e
defer cancel()

// target := net.JoinHostPort(u.Hostname(), u.Port())
clientConn, err := grpc.DialContext(ctx, u.Host, opts...)
clientConn, err := grpc.DialContext(ctx, u.Host, opts...) //nolint:staticcheck
if err != nil {
return nil, err
}
Expand Down
Loading

0 comments on commit c34e40d

Please sign in to comment.