From d23730a44aa1d0bd976637cd8a38f113a951beec Mon Sep 17 00:00:00 2001
From: Rafal Artych <121048129+rartych@users.noreply.github.com>
Date: Fri, 2 Aug 2024 13:53:17 +0200
Subject: [PATCH 1/3] Update event-subscription-template.yaml

---
 .../event-subscription-template.yaml                   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/artifacts/camara-cloudevents/event-subscription-template.yaml b/artifacts/camara-cloudevents/event-subscription-template.yaml
index aff167e6..cd561b64 100644
--- a/artifacts/camara-cloudevents/event-subscription-template.yaml
+++ b/artifacts/camara-cloudevents/event-subscription-template.yaml
@@ -6,18 +6,17 @@ info:
 
     Note on ``security`` - ``openId`` scope: The value in this yaml `api-name:event-type:grant-level` must be replaced accordingly to the format defined in the guideline document.
 
-  termsOfService: https://swagger.io/terms/
-  contact:
-    email: project-email@sample.com
   license:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0.html
-  version: 0.1.0-wip
+  version: 0.1.0
+  x-camara-commonalities: 0.4.0
+  
 externalDocs:
   description: Product documentation at CAMARA
   url: https://github.com/camaraproject/
 servers:
-  - url: "{apiRoot}/{apiName}/v0"
+  - url: "{apiRoot}/{apiName}/v0.1"
     variables:
       apiRoot:
         default: http://localhost:9091
@@ -471,7 +470,6 @@ components:
         - config
         - types
         - id
-        - startsAt
       properties:
         protocol:
           $ref: "#/components/schemas/Protocol"

From 322ce6a6d5111096f3a1ba761b20a8f14733f243 Mon Sep 17 00:00:00 2001
From: Rafal Artych <121048129+rartych@users.noreply.github.com>
Date: Mon, 5 Aug 2024 14:52:22 +0200
Subject: [PATCH 2/3] Update event-subscription-template.yaml

In Subscription Request description moved to SinkCredential schema; as it is generic enough to be reused in the 2 $ref to this schema, and the allOf removed.
---
 .../camara-cloudevents/event-subscription-template.yaml      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/artifacts/camara-cloudevents/event-subscription-template.yaml b/artifacts/camara-cloudevents/event-subscription-template.yaml
index cd561b64..923b94e7 100644
--- a/artifacts/camara-cloudevents/event-subscription-template.yaml
+++ b/artifacts/camara-cloudevents/event-subscription-template.yaml
@@ -297,9 +297,7 @@ components:
           description: The address to which events shall be delivered using the selected protocol.
           example: "https://endpoint.example.com/sink"
         sinkCredential:
-          allOf:
-            - description: A sink credential provides authentication or authorization information necessary to enable delivery of events to a target.
-            - $ref: "#/components/schemas/SinkCredential"
+          $ref: "#/components/schemas/SinkCredential"
         types:
           description: |
             Camara Event types eligible to be delivered by this subscription.
@@ -358,6 +356,7 @@ components:
             Up to API project decision to keep it.
 
     SinkCredential:
+      description: A sink credential provides authentication or authorization information necessary to enable delivery of events to a target.
       type: object
       properties:
         credentialType:

From 52d754e3f9e938679eef69e8affd431e50610e68 Mon Sep 17 00:00:00 2001
From: Rafal Artych <121048129+rartych@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:29:32 +0200
Subject: [PATCH 3/3] Update event-subscription-template.yaml

'Event-typeNotification' changed to 'EventTypeNotification'
---
 artifacts/camara-cloudevents/event-subscription-template.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/artifacts/camara-cloudevents/event-subscription-template.yaml b/artifacts/camara-cloudevents/event-subscription-template.yaml
index 923b94e7..e28f39e8 100644
--- a/artifacts/camara-cloudevents/event-subscription-template.yaml
+++ b/artifacts/camara-cloudevents/event-subscription-template.yaml
@@ -450,7 +450,7 @@ components:
       description: The detail of the requested event subscription.
       type: object
 
-    Event-typeNotification:
+    EventTypeNotification:
       type: string
       description: |
         event-type - Event triggered when an event-type event occurred
@@ -553,7 +553,7 @@ components:
         source:
           $ref: "#/components/schemas/Source"
         type:
-          $ref: "#/components/schemas/Event-typeNotification"
+          $ref: "#/components/schemas/EventTypeNotification"
         specversion:
           type: string
           description: Version of the specification to which this event conforms (must be 1.0 if it conforms to cloudevents 1.0.2 version)