diff --git a/cloudevents-binding.md b/cloudevents-binding.md index 886c2e1..a9cfc7a 100644 --- a/cloudevents-binding.md +++ b/cloudevents-binding.md @@ -8,13 +8,13 @@ description: > CloudEvents Binding for CDEvents --- --> -# CloudEvents Binding for CDEvents +# CloudEvents Binding for CDEvents -## Abstract +## Abstract The CloudEvents Binding for CDEvents defines how CDEvents are mapped to CloudEvents headers and body. -## Table Of Contents +## Table Of Contents - [CloudEvents Context](#cloudevents-context) @@ -113,7 +113,7 @@ Content-Length: nnnn "type": "taskRun", "content": { "task": "my-task", - "url": "/apis/tekton.dev/v1beta1/namespaces/default/taskruns/my-taskrun-123" + "uri": "/apis/tekton.dev/v1beta1/namespaces/default/taskruns/my-taskrun-123" "pipelineRun": { "id": "/somewherelse/pipelinerun-123", "source": "/staging/jenkins/" diff --git a/conformance/environment_created.json b/conformance/environment_created.json index 5d4d913..b530770 100644 --- a/conformance/environment_created.json +++ b/conformance/environment_created.json @@ -45,7 +45,7 @@ "type": "environment", "content": { "name": "testEnv", - "url": "https://example.org/testEnv" + "uri": "https://example.org/testEnv" } } } diff --git a/conformance/environment_modified.json b/conformance/environment_modified.json index e0db006..88438f9 100644 --- a/conformance/environment_modified.json +++ b/conformance/environment_modified.json @@ -45,7 +45,7 @@ "type": "environment", "content": { "name": "testEnv", - "url": "https://example.org/testEnv" + "uri": "https://example.org/testEnv" } } } diff --git a/conformance/pipelinerun_finished.json b/conformance/pipelinerun_finished.json index bc28e88..39a5455 100644 --- a/conformance/pipelinerun_finished.json +++ b/conformance/pipelinerun_finished.json @@ -45,7 +45,7 @@ "type": "pipelineRun", "content": { "pipelineName": "myPipeline", - "url": "https://www.example.com/mySubject123", + "uri": "https://www.example.com/mySubject123", "outcome": "failure", "errors": "Something went wrong\nWith some more details" } diff --git a/conformance/pipelinerun_queued.json b/conformance/pipelinerun_queued.json index f2a9f35..dca95e4 100644 --- a/conformance/pipelinerun_queued.json +++ b/conformance/pipelinerun_queued.json @@ -45,7 +45,7 @@ "type": "pipelineRun", "content": { "pipelineName": "myPipeline", - "url": "https://www.example.com/mySubject123" + "uri": "https://www.example.com/mySubject123" } } } diff --git a/conformance/pipelinerun_started.json b/conformance/pipelinerun_started.json index 0e0e0b3..c5091ec 100644 --- a/conformance/pipelinerun_started.json +++ b/conformance/pipelinerun_started.json @@ -45,7 +45,7 @@ "type": "pipelineRun", "content": { "pipelineName": "myPipeline", - "url": "https://www.example.com/mySubject123" + "uri": "https://www.example.com/mySubject123" } } } diff --git a/conformance/repository_created.json b/conformance/repository_created.json index d35240b..7c5f803 100644 --- a/conformance/repository_created.json +++ b/conformance/repository_created.json @@ -46,7 +46,7 @@ "content": { "name": "TestRepo", "owner": "TestOrg", - "url": "https://example.org/TestOrg/TestRepo", + "uri": "https://example.org/TestOrg/TestRepo", "viewUrl": "https://example.org/view/TestOrg/TestRepo" } } diff --git a/conformance/repository_deleted.json b/conformance/repository_deleted.json index 6686976..e4ad66e 100644 --- a/conformance/repository_deleted.json +++ b/conformance/repository_deleted.json @@ -46,7 +46,7 @@ "content": { "name": "TestRepo", "owner": "TestOrg", - "url": "https://example.org/TestOrg/TestRepo", + "uri": "https://example.org/TestOrg/TestRepo", "viewUrl": "https://example.org/view/TestOrg/TestRepo" } } diff --git a/conformance/repository_modified.json b/conformance/repository_modified.json index 2529f4a..951ceea 100644 --- a/conformance/repository_modified.json +++ b/conformance/repository_modified.json @@ -46,7 +46,7 @@ "content": { "name": "TestRepo", "owner": "TestOrg", - "url": "https://example.org/TestOrg/TestRepo", + "uri": "https://example.org/TestOrg/TestRepo", "viewUrl": "https://example.org/view/TestOrg/TestRepo" } } diff --git a/conformance/taskrun_finished.json b/conformance/taskrun_finished.json index 5cbeb6e..56e69a5 100644 --- a/conformance/taskrun_finished.json +++ b/conformance/taskrun_finished.json @@ -45,7 +45,7 @@ "type": "taskRun", "content": { "taskName": "myTask", - "url": "https://www.example.com/mySubject123", + "uri": "https://www.example.com/mySubject123", "pipelineRun": { "id": "mySubject123" }, diff --git a/conformance/taskrun_started.json b/conformance/taskrun_started.json index cfe67b4..c7e7d88 100644 --- a/conformance/taskrun_started.json +++ b/conformance/taskrun_started.json @@ -45,7 +45,7 @@ "type": "taskRun", "content": { "taskName": "myTask", - "url": "https://www.example.com/mySubject123", + "uri": "https://www.example.com/mySubject123", "pipelineRun": { "id": "mySubject123" } diff --git a/links.md b/links.md index c7795e0..75f8c28 100644 --- a/links.md +++ b/links.md @@ -186,7 +186,7 @@ systems to act accordingly based off the ending notation. "type": "pipelineRun", "content": { "pipelineName": "myPipeline", - "url": "https://www.example.com/mySubject123" + "uri": "https://www.example.com/mySubject123" } } } @@ -221,7 +221,7 @@ further, we can allow for a path link between `pipelinerun.queued` to the "type": "pipelineRun", "content": { "pipelineName": "myPipeline", - "url": "https://www.example.com/mySubject123" + "uri": "https://www.example.com/mySubject123" } } } @@ -433,7 +433,7 @@ sender generates this id. "type": "pipelineRun", "content": { "pipelineName": "myPipeline", - "url": "https://www.example.com/mySubject123" + "uri": "https://www.example.com/mySubject123" } } } diff --git a/schemas/environmentcreated.json b/schemas/environmentcreated.json index cba0e1a..f16633d 100644 --- a/schemas/environmentcreated.json +++ b/schemas/environmentcreated.json @@ -75,8 +75,9 @@ "name": { "type": "string" }, - "url": { - "type": "string" + "uri": { + "type": "string", + "format": "uri" } }, "additionalProperties": false, diff --git a/schemas/environmentmodified.json b/schemas/environmentmodified.json index f5b2b44..02e05df 100644 --- a/schemas/environmentmodified.json +++ b/schemas/environmentmodified.json @@ -75,8 +75,9 @@ "name": { "type": "string" }, - "url": { - "type": "string" + "uri": { + "type": "string", + "format": "uri" } }, "additionalProperties": false, diff --git a/schemas/pipelinerunfinished.json b/schemas/pipelinerunfinished.json index 33d3085..8910f63 100644 --- a/schemas/pipelinerunfinished.json +++ b/schemas/pipelinerunfinished.json @@ -75,8 +75,9 @@ "pipelineName": { "type": "string" }, - "url": { - "type": "string" + "uri": { + "type": "string", + "format": "uri" }, "outcome": { "type": "string" diff --git a/schemas/pipelinerunqueued.json b/schemas/pipelinerunqueued.json index 444a14a..d865bfe 100644 --- a/schemas/pipelinerunqueued.json +++ b/schemas/pipelinerunqueued.json @@ -75,8 +75,9 @@ "pipelineName": { "type": "string" }, - "url": { - "type": "string" + "uri": { + "type": "string", + "format": "uri" } }, "additionalProperties": false, diff --git a/schemas/pipelinerunstarted.json b/schemas/pipelinerunstarted.json index efd3b76..0dc2712 100644 --- a/schemas/pipelinerunstarted.json +++ b/schemas/pipelinerunstarted.json @@ -75,8 +75,9 @@ "pipelineName": { "type": "string" }, - "url": { - "type": "string" + "uri": { + "type": "string", + "format": "uri" } }, "additionalProperties": false, diff --git a/schemas/repositorycreated.json b/schemas/repositorycreated.json index a601191..26c2b25 100644 --- a/schemas/repositorycreated.json +++ b/schemas/repositorycreated.json @@ -79,12 +79,13 @@ "owner": { "type": "string" }, - "url": { + "uri": { "type": "string", - "minLength": 1 + "format": "uri" }, "viewUrl": { - "type": "string" + "type": "string", + "format": "uri" } }, "additionalProperties": false, diff --git a/schemas/repositorydeleted.json b/schemas/repositorydeleted.json index 02329fe..d90deda 100644 --- a/schemas/repositorydeleted.json +++ b/schemas/repositorydeleted.json @@ -78,11 +78,13 @@ "owner": { "type": "string" }, - "url": { - "type": "string" + "uri": { + "type": "string", + "format": "uri" }, "viewUrl": { - "type": "string" + "type": "string", + "format": "uri" } }, "additionalProperties": false, diff --git a/schemas/repositorymodified.json b/schemas/repositorymodified.json index c3c51fd..e344354 100644 --- a/schemas/repositorymodified.json +++ b/schemas/repositorymodified.json @@ -78,11 +78,13 @@ "owner": { "type": "string" }, - "url": { - "type": "string" + "uri": { + "type": "string", + "format": "uri" }, "viewUrl": { - "type": "string" + "type": "string", + "format": "uri" } }, "additionalProperties": false, diff --git a/schemas/taskrunfinished.json b/schemas/taskrunfinished.json index 78f241c..042c841 100644 --- a/schemas/taskrunfinished.json +++ b/schemas/taskrunfinished.json @@ -75,8 +75,9 @@ "taskName": { "type": "string" }, - "url": { - "type": "string" + "uri": { + "type": "string", + "format": "uri" }, "pipelineRun": { "properties": { diff --git a/schemas/taskrunstarted.json b/schemas/taskrunstarted.json index 80c71e7..6f7e924 100644 --- a/schemas/taskrunstarted.json +++ b/schemas/taskrunstarted.json @@ -75,8 +75,9 @@ "taskName": { "type": "string" }, - "url": { - "type": "string" + "uri": { + "type": "string", + "format": "uri" }, "pipelineRun": { "properties": { diff --git a/schemas/testsuiterunqueued.json b/schemas/testsuiterunqueued.json index 9e4fa55..b10d98d 100644 --- a/schemas/testsuiterunqueued.json +++ b/schemas/testsuiterunqueued.json @@ -123,7 +123,7 @@ "name": { "type": "string" }, - "url": { + "uri": { "type": "string", "format": "uri" } diff --git a/spec.md b/spec.md index fd27ec7..db3716f 100644 --- a/spec.md +++ b/spec.md @@ -423,7 +423,7 @@ defined in the [vocabulary](#vocabulary): ```json "content" : { "task": "my-task", - "url": "/apis/tekton.dev/v1beta1/namespaces/default/taskruns/my-taskrun-123" + "uri": "/apis/tekton.dev/v1beta1/namespaces/default/taskruns/my-taskrun-123" } ``` @@ -468,7 +468,7 @@ The following example shows `context` and `subject` together, rendered as JSON. "type": "taskRun", "content": { "task": "my-task", - "url": "/apis/tekton.dev/v1beta1/namespaces/default/taskruns/my-taskrun-123", + "uri": "/apis/tekton.dev/v1beta1/namespaces/default/taskruns/my-taskrun-123", "pipelineRun": { "id": "my-distributed-pipelinerun", "source": "/tenant1/tekton/"