From 6a692c043d122ec6f54c79e7af70d6373ab9372f Mon Sep 17 00:00:00 2001 From: James Dickson Date: Wed, 23 Oct 2024 13:40:54 -0400 Subject: [PATCH] Setup parameter licenseKey and returns new appliance uuid --- components/examples/applianceSettings.json | 1 + components/examples/health.json | 1 + components/examples/setup.json | 3 ++- components/schemas/applianceSettings.yaml | 2 ++ components/schemas/health.yaml | 2 ++ components/schemas/setup.yaml | 3 +++ paths/api@setup.yaml | 3 +++ 7 files changed, 14 insertions(+), 1 deletion(-) diff --git a/components/examples/applianceSettings.json b/components/examples/applianceSettings.json index 1e520fc3..9dba9f8e 100644 --- a/components/examples/applianceSettings.json +++ b/components/examples/applianceSettings.json @@ -1,5 +1,6 @@ { "applianceSettings": { + "uuid": "a26caec3-f2f3-474b-adf1-d85d670ad56f", "applianceUrl": "https://mysite.fqdn.com/", "internalApplianceUrl": "http://192.168.1.14", "corsAllowed": "*", diff --git a/components/examples/health.json b/components/examples/health.json index dc1f1d55..ea736daf 100644 --- a/components/examples/health.json +++ b/components/examples/health.json @@ -4,6 +4,7 @@ "statusMessage": "", "applianceUrl": "https:/fqdn.com/", "buildVersion": "5.4.11", + "uuid": "a26caec3-f2f3-474b-adf1-d85d670ad56f", "setupNeeded": false, "date": "2022-08-22T20:17:14Z", "cpu": { diff --git a/components/examples/setup.json b/components/examples/setup.json index db40f6a2..dd312674 100644 --- a/components/examples/setup.json +++ b/components/examples/setup.json @@ -5,5 +5,6 @@ "lastName": "Anderson", "email": "tanderson@mccorp.com", "username": "tanderson", - "password": "QnW}cg}8}<~:P9YU" + "password": "QnW}cg}8}<~:P9YU", + "licenseKey": "LICENSE_KEY" } \ No newline at end of file diff --git a/components/schemas/applianceSettings.yaml b/components/schemas/applianceSettings.yaml index dbf0b280..427b24fd 100644 --- a/components/schemas/applianceSettings.yaml +++ b/components/schemas/applianceSettings.yaml @@ -1,5 +1,7 @@ type: object properties: + uuid: + type: string applianceUrl: type: string internalApplianceUrl: diff --git a/components/schemas/health.yaml b/components/schemas/health.yaml index 323a476b..31c0c9fc 100644 --- a/components/schemas/health.yaml +++ b/components/schemas/health.yaml @@ -8,6 +8,8 @@ properties: type: string buildVersion: type: string + uuid: + type: string setupNeeded: type: boolean date: diff --git a/components/schemas/setup.yaml b/components/schemas/setup.yaml index 599629dc..990ca61d 100644 --- a/components/schemas/setup.yaml +++ b/components/schemas/setup.yaml @@ -5,6 +5,9 @@ properties: buildVersion: type: string description: Morpheus build version that the server is running. + uuid: + type: string + description: The Appliance Unique ID that is auto generated. applianceUrl: type: string description: The Appliance Server URL as defined under Appliance Settings. diff --git a/paths/api@setup.yaml b/paths/api@setup.yaml index db350daa..8fd3486f 100644 --- a/paths/api@setup.yaml +++ b/paths/api@setup.yaml @@ -66,6 +66,9 @@ post: - register - login default: skip + licenseKey: + type: string + description: License Key to install on setup. - oneOf: - $ref: ../components/schemas/hubLoginObject.yaml - $ref: ../components/schemas/hubRegisterObject.yaml