Commit bab76ac7 authored by Dan Jones's avatar Dan Jones
Browse files

Merge branch '81-validate-uuid-format-in-message-header' into '67-mas-dt'

Resolve "Validate uuid format in message header"

See merge request !50
3 merge requests!59Release v2.0.0,!50Resolve "Validate uuid format in message header",!36Resolve "Create temporary mas-dt branch for initial schema refactor"
Pipeline #233159 passed with stages
in 1 minute and 5 seconds
{ {
"header": { "header": {
"message_ID": "e1237003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "e1237003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2023-03-16T00:00:00Z", "timestamp": "2023-03-16T00:00:00Z",
"version": 2, "version": 2,
"source": "ecosub.ecosub-c2", "source": "ecosub.ecosub-c2",
......
{ {
"header": { "header": {
"message_ID": "t1237003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "t1237003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2023-03-16T00:00:00Z", "timestamp": "2023-03-16T00:00:00Z",
"version": 2, "version": 2,
"source": "hermes.ecosub-2", "source": "hermes.ecosub-2",
......
{ {
"header":{ "header":{
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2024-09-06T00:00:00Z", "timestamp": "2024-09-06T00:00:00Z",
"version": 2, "version": 2,
"source": "ecosub_c2", "source": "ecosub_c2",
......
{ {
"header": { "header": {
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2022-11-16T00:00:00Z", "timestamp": "2022-11-16T00:00:00Z",
"version": 2, "version": 2,
"source": "gui", "source": "gui",
......
{ {
"header": { "header": {
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2022-11-16T00:00:00Z", "timestamp": "2022-11-16T00:00:00Z",
"version": 2, "version": 2,
"source": "gui", "source": "gui",
......
{ {
"header":{ "header":{
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2022-11-16T00:00:00Z", "timestamp": "2022-11-16T00:00:00Z",
"version": 2, "version": 2,
"source": "gui", "source": "gui",
......
{ {
"header":{ "header":{
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2022-11-16T00:00:00Z", "timestamp": "2022-11-16T00:00:00Z",
"version": 1, "version": 1,
"source": "hydrosurv_adapter", "source": "hydrosurv_adapter",
......
{ {
"header": { "header": {
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2022-11-16T00:00:00Z", "timestamp": "2022-11-16T00:00:00Z",
"version": 1, "version": 1,
"source": "hydrosurv_adapter", "source": "hydrosurv_adapter",
......
{ {
"header":{ "header":{
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2022-11-16T00:00:00Z", "timestamp": "2022-11-16T00:00:00Z",
"version": 2, "version": 2,
"source": "autonomy_engine", "source": "autonomy_engine",
......
{ {
"header": { "header": {
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2022-11-16T00:00:00Z", "timestamp": "2022-11-16T00:00:00Z",
"version": 2, "version": 2,
"source": "hydrosurv_adapter", "source": "hydrosurv_adapter",
......
{ {
"header": { "header": {
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2024-09-03T00:00:00Z", "timestamp": "2024-09-03T00:00:00Z",
"version": 1, "version": 1,
"source": "ori", "source": "ori",
......
{ {
"header": { "header": {
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2022-11-16T00:00:00Z", "timestamp": "2022-11-16T00:00:00Z",
"version": 2, "version": 2,
"source": "autonomy_engine", "source": "autonomy_engine",
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"payload":{ "payload":{
"message_type": "mission_plan", "message_type": "mission_plan",
"platform_ID": "alr-52", "platform_ID": "alr-52",
"autonomy_engine_plan_ID": "a427003c-0000-11aa-a1eb-bvcdfghjgfcc", "autonomy_engine_plan_ID": "a427003c-0000-11aa-a1eb-b1cdf2342fcc",
"plan": [ "plan": [
{ {
"action": "move", "action": "move",
......
{ {
"header":{ "header":{
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2022-11-16T00:00:00Z", "timestamp": "2022-11-16T00:00:00Z",
"version": 2, "version": 2,
"source": "noc-c2", "source": "noc-c2",
......
{ {
"header":{ "header":{
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2024-09-05T00:00:00Z", "timestamp": "2024-09-05T00:00:00Z",
"version": "dev", "version": "dev",
"source": "noc-sfmc", "source": "noc-sfmc",
......
{ {
"header":{ "header":{
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2024-09-05T00:00:00Z", "timestamp": "2024-09-05T00:00:00Z",
"version": "2bbede2412f9038c0b1ecd8c2965532ea97264a3", "version": "2bbede2412f9038c0b1ecd8c2965532ea97264a3",
"source": "noc-sfmc", "source": "noc-sfmc",
......
{ {
"header":{ "header":{
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "message_ID": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"timestamp": "2024-09-05T00:00:00Z", "timestamp": "2024-09-05T00:00:00Z",
"version": "v2.0.0-beta.1", "version": "v2.0.0-beta.1",
"source": "noc-sfmc", "source": "noc-sfmc",
......
...@@ -3,8 +3,10 @@ message_header = { ...@@ -3,8 +3,10 @@ message_header = {
"properties": { "properties": {
"message_ID": { "message_ID": {
"type": "string", "type": "string",
"format": "uuid",
"pattern": "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}",
"description": "An identifier for the type of message received.", "description": "An identifier for the type of message received.",
"example": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "example": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
}, },
"timestamp": { "timestamp": {
"type": "string", "type": "string",
......
...@@ -1449,7 +1449,9 @@ ...@@ -1449,7 +1449,9 @@
}, },
"message_ID": { "message_ID": {
"description": "An identifier for the type of message received.", "description": "An identifier for the type of message received.",
"example": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "example": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"format": "uuid",
"pattern": "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}",
"type": "string" "type": "string"
}, },
"source": { "source": {
......
...@@ -7,7 +7,7 @@ message_header = { ...@@ -7,7 +7,7 @@ message_header = {
"message_ID": { "message_ID": {
"type": "string", "type": "string",
"description": "An identifier for the type of message received.", "description": "An identifier for the type of message received.",
"example": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "example": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
}, },
"timestamp": { "timestamp": {
"type": "string", "type": "string",
......
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
}, },
"message_ID": { "message_ID": {
"description": "An identifier for the type of message received.", "description": "An identifier for the type of message received.",
"example": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd", "example": "b427003c-0000-11aa-a1eb-b1cdf2342fdd",
"type": "string" "type": "string"
}, },
"source": { "source": {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment