Skip to content

Commit 98c3c4d

Browse files
rartychrartych
authored
Merge branch 'main' into main
2 parents 36710aa + d9bdebb commit 98c3c4d

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

‎artifacts/camara-cloudevents/event-subscription-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ components:
276276
$ref: "#/components/schemas/Protocol"
277277
sink:
278278
type: string
279-
format: url
279+
format: uri
280280
description: The address to which events shall be delivered using the selected protocol.
281281
example: "https://endpoint.example.com/sink"
282282
sinkCredential:

‎artifacts/notification-as-cloud-event.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ components:
328328
value:
329329
id: "123e4567-e89b-12d3-a456-426655440000"
330330
source: "https://notificationSendServer12.supertelco.com"
331-
type: "org.camaraproject.qod.qos-status-changed-event"
331+
type: "org.camaraproject.quality-on-demand.v0.qos-status-changed"
332332
specversion: "1.0"
333333
time: "2023-01-17T13:18:23.682Z"
334334
datacontenttype: "application/json"

‎documentation/API-design-guidelines.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,8 @@ If this capability is present in CAMARA API, the following attributes **must** b
16691669
16701670
| attribute name | type | attribute description | cardinality |
16711671
|----------------|--------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
1672-
| sink | string | https callback address where the notification must be POST-ed. The [security considerations](#notifications-security-considerations) should be followed. | mandatory |
1672+
| mandatory |
1673+
| sink | string | https callback address where the notification must be POST-ed, `format: uri` should be used to require a string that is compliant with [RFC 3986](https://datatracker.ietf.org/doc/html/rfc3986). The [security considerations](#notifications-security-considerations) should be followed. | mandatory |
16731674
| sinkCredential | object | Sink credential provides authentication or authorization information necessary to enable delivery of events to a target. In order to be updated in future this object is polymorphic. See detail below. It is RECOMMENDED for subscription consumer to provide credential to protect notification endpoint. | optional |
16741675
16751676
Several types of `sinkCredential` could be available in the future, but for now only access token credential is managed.
@@ -1759,8 +1760,8 @@ The following table provides `/subscriptions` attributes
17591760
17601761
| name | type | attribute description | cardinality |
17611762
|----------------|--------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|
1762-
| protocol | string | Identifier of a delivery protocol for the event notifications. The values follow the definitions of the [CloudEvent specification](https://github.com/cloudevents/spec/blob/main/subscriptions/spec.md#protocol). **Only** `HTTP` **is allowed for now**. | mandatory |
1763-
| sink | string | The URL, to which event notifications shall be sent. The URI-scheme shall be set according to the definition of the `protocol` value, e.g. the URI-scheme is `https` when `HTTP`is the value of the `protocol` property. The [security considerations](#notifications-security-considerations) should be followed. | mandatory |
1763+
| protocol | string | Identifier of a delivery protocol for the event notifications. The values follow the definitions of the [CloudEvent specification](https://github.com/cloudevents/spec/blob/main/subscriptions/spec.md#protocol). **Only** `HTTP` **is allowed for now**. | mandatory |
1764+
| sink | string | The URL, to which event notifications shall be sent - `format: uri` should be used to require a string that is compliant with [RFC 3986](https://datatracker.ietf.org/doc/html/rfc3986). The URI-scheme shall be set according to the definition of the `protocol` value, e.g. the URI-scheme is `https` when `HTTP`is the value of the `protocol` property. The [security considerations](#notifications-security-considerations) should be followed. | mandatory |
17641765
| sinkCredential | object | Sink credential provides authorization information necessary to enable delivery of events to a target. In order to be updated in future this object is polymorphic. See detail below. To protect the notification endpoint providing sinkCredential is RECOMMENDED. <br> The sinkCredential must **not** be present in `POST` and `GET` responses. | optional |
17651766
| types | string | Type of event subscribed. This attribute **must** be present in the `POST` request. It is required by API project to provide an enum for this attribute. `type` must follow the format: `org.camaraproject.<api-name>.<api-version>.<event-name>` with the `api-version` with letter `v` and the major version like ``org.camaraproject.device-roaming-subscriptions.v1.roaming-status`` - Note: An array of types could be passed **but as of now only one value MUST passed**. Use of multiple value will be open later at API level. | mandatory |
17661767
| config | object | Implementation-specific configuration parameters needed by the subscription manager for acquiring events. In CAMARA we have predefined attributes like ``subscriptionExpireTime``, ``subscriptionMaxEvents`` or ``initialEvent``. See detail below. | mandatory |

0 commit comments

Comments
 (0)