Merge branch '6.2-dev' into 6.3-dev

components/examples/certificate.json

@@ -1,12 +1,22 @@
 {
   "certificate": {
+    "id": 1,
+    "name": "Certificate 1",
+    "description": null,
+    "domainName": null,
     "accountId": 1,
-    "certFile": "certFileContent",
-    "domainName": "test.local",
+    "integrationId": null,
+    "enabled": true,
     "generated": false,
-    "id": 1,
-    "keyFile": "keyFileContent",
-    "name": "Test Cert",
-    "wildcard": true
+    "wildcard": false,
+    "selfSigned": false,
+    "type": {
+      "id": 1,
+      "code": "internal"
+    },
+    "category": null,
+    "commonName": null,
+    "certType": "server",
+    "keyFileMD5": "2f3949be9d591e4f6847e946db2fba78"
   }
 }

components/examples/certificates.json

@@ -1,15 +1,69 @@
 {
-  "certificateCount": 1,
   "certificates": [
     {
+      "id": 263,
+      "name": "Certificate 1",
+      "description": null,
+      "domainName": null,
       "accountId": 1,
-      "certFile": "certFileContent",
-      "domainName": "test.local",
+      "integrationId": null,
+      "enabled": true,
       "generated": false,
-      "id": 1,
-      "keyFile": "keyFileContent",
-      "name": "Test Cert",
-      "wildcard": true
+      "wildcard": false,
+      "selfSigned": false,
+      "type": {
+        "id": 1,
+        "code": "internal"
+      },
+      "category": null,
+      "commonName": null,
+      "certType": "server",
+      "keyFileMD5": "2f3949be9d591e4f6847e946db2fba78"
+    },
+    {
+      "id": 262,
+      "name": "Certificate 2",
+      "description": null,
+      "domainName": null,
+      "accountId": 1,
+      "integrationId": null,
+      "enabled": true,
+      "generated": false,
+      "wildcard": false,
+      "selfSigned": false,
+      "type": {
+        "id": 1,
+        "code": "internal"
+      },
+      "category": null,
+      "commonName": null,
+      "certType": "server",
+      "keyFileMD5": "2f3949be9d591e4f6847e946db2fba78"
+    },
+    {
+      "id": 313,
+      "name": "tomcat certificate for node nsxt-m01",
+      "description": null,
+      "domainName": null,
+      "accountId": 1,
+      "integrationId": 72,
+      "enabled": true,
+      "generated": false,
+      "wildcard": true,
+      "selfSigned": true,
+      "type": {
+        "id": 9,
+        "code": "nsxtSelfSignedCertificate"
+      },
+      "category": "nsxt.certificate.23",
+      "commonName": null,
+      "certType": "selfSigned"
     }
-  ]
-}
+  ],
+  "meta": {
+    "offset": 0,
+    "max": 100,
+    "size": 3,
+    "total": 3
+  }
+}

components/schemas/certificate.yaml

@@ -1,18 +1,47 @@
-accountId: 
+id: 
   type: integer
   format: int64
-certFile: 
+name: 
   type: string
+description: 
+  type: string
+  nullable: true
 domainName: 
   type: string
-generated: 
-  type: boolean
-id: 
+  nullable: true
+accountId: 
   type: integer
   format: int64
-keyFile: 
-  type: string
-name: 
-  type: string
+integrationId: 
+  type: integer
+  format: int64
+  nullable: true
+enabled: 
+  type: boolean
+generated: 
+  type: boolean
 wildcard: 
   type: boolean
+selfSigned:
+  type: boolean
+type: 
+  type: object
+  properties:
+    id: 
+      type: integer
+      format: int64
+    code: 
+      type: string
+  nullable: true
+category: 
+  type: string
+  nullable: true
+commonName: 
+  type: string
+  nullable: true
+certType: 
+  type: string
+  nullable: true
+keyFileMD5: 
+  type: string
+  nullable: true

components/schemas/certificateCreate.yaml

@@ -1,16 +1,30 @@
 name: 
   type: string
   description: A unique name scoped to your account for the key
+description: 
+  type: string
+  description: A description of the certificate
 certFile: 
   type: string
   description: The contents of the certificate file
 keyFile: 
   type: string
   description: The contents of the key file
+chainFile: 
+  type: string
+  description: The contents of the root certificate file
 domainName: 
   type: string
   description: The domain name this certificate is tied to
 wildcard: 
   type: boolean
-  description: Wether or not this certificate is a wildcard cert
-  default: false
+  description: Whether or not this certificate is a wildcard cert
+  default: false
+type: 
+  type: string
+  description: Certificate Type Code to create a certificate of a type other than the default 'internal'.
+  default: 'internal'
+integrationId:
+  type: integer
+  format: int64
+  description: ID of the Service (Trust Integration) to create the certificate with, if using a type other than 'internal'. eg. Internal, NSXT or Venafi