Merge branch 'development' into nullable-linodes

Josh Sager · GitHub Enterprise · commit abbd580f1eca · 2018-06-15T09:52:07.000-04:00
diff --git a/index.html b/index.html
@@ -18,7 +18,7 @@
     </style>
   </head>
   <body>
-    <redoc spec-url="/openapi.yaml" expand-responses="200" hide-download-button path-in-middle-panel required-props-first></redoc>
+    <redoc spec-url="/openapi.yaml" expand-responses="200" hide-download-button path-in-middle-panel required-props-first no-auto-auth></redoc>
     <script src="/redoc.standalone.js"> </script>
   </body>
 </html>
diff --git a/openapi.yaml b/openapi.yaml
@@ -28,7 +28,7 @@ info:
     [View our Changelog](/changelog) to see release
     notes on all changes made to our API.
 
-    # Access
+    # Access and Authentication
 
     Some endpoints are publicly accessible without requiring authentication.
     All endpoints affecting your Account, however, require either a Personal
@@ -44,6 +44,12 @@ info:
     All scopes for the OAuth security model (defined below) apply to this
     security model as well.
 
+    ### Authentication
+
+    | Security Scheme Type: | HTTP |
+    |-----------------------|------|
+    | **HTTP Authorization Scheme** | bearer |
+
     ## OAuth
 
     The OAuth workflow is a three-step process to authenticate a User before an
@@ -91,10 +97,11 @@ info:
     Authorization: Bearer 03d084436a6c91fbafd5c4b20c82e5056a2e9ce1635920c30dc8d81dc7a6665c
     ```
 
-    ## Authentication Schema
+    ### Authentication
 
-    See our [Authentication Schema](/#section/Authentication) for
-    information on scopes and authorization/token URLs.
+    | Security Scheme Type: | Oauth2 |
+    |-----------------------|--------|
+    | **AuthorizationCode Oauth Flow** |  **Authorization URL:** https://login.linode.com/oauth/authorize<br />**Token URL:** https://login.linode.com/oauth/token<br />**Scopes:**<br /><ul><li>`account:read_only` - Allows access to GET information about your Account.</li><li>`account:read_write` - Allows access to all endpoints related to your Account.</li><li>`domains:read_only` - Allows access to GET Domains on your Account.</li><li>`domains:read_write` - Allows access to all Domain endpoints.</li><li>`events:read_only` - Allows access to GET your Events.</li><li>`events:read_write` - Allows access to all endpoints related to your Events.</li><li>`images:read_only` - Allows access to GET your Images.</li><li>`images:read_write` - Allows access to all endpoints related to your Images.</li><li>`ips:read_only` - Allows access to GET your ips.</li><li>`ips:read_write` - Allows access to all endpoints related to your ips.</li><li>`linodes:read_only` - Allows access to GET Linodes on your Account.</li><li>`linodes:read_write` - Allow access to all endpoints related to your Linodes.</li><li>`longview:read_only` - Allows access to GET your Longview Clients.</li><li>`longview:read_write` - Allows access to all endpoints related to your Longview Clients.</li><li>`nodebalancers:read_only` - Allows access to GET NodeBalancers on your Account.</li><li>`nodebalancers:read_write` - Allows access to all NodeBalancer endpoints.</li><li>`stackscripts:read_only` - Allows access to GET your StackScripts.</li><li>`stackscripts:read_write` - Allows access to all endpoints related to your StackScripts.</li><li>`volumes:read_only` - Allows access to GET your Volumes.</li><li>`volumes:read_write` - Allows access to all endpoints related to your Volumes.</li></ul><br />|
 
     # Requests
 
@@ -5010,7 +5017,12 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/StackScript'
+              required:
+              - script
+              - label
+              - images
+              allOf:
+              - $ref: '#/components/schemas/StackScript'
       responses:
         '200':
           description: StackScript successfully created.
@@ -8396,8 +8408,6 @@ paths:
         content:
           application/json:
             schema:
-              required:
-              - label
               properties:
                 scopes:
                   type: string
@@ -13309,6 +13319,7 @@ components:
           example: keys_only
         authorized_keys:
           type: array
+          nullable: true
           items:
             type: string
             format: ssh-key
@@ -13508,6 +13519,7 @@ components:
         closed:
           x-linode-filterable: true
           type: string
+          nullable: true
           format: date-time
           readOnly: true
           description: >
@@ -13528,6 +13540,7 @@ components:
           x-linode-cli-display: 5
         entity:
           type: object
+          nullable: true
           readOnly: true
           description: >
             The entity this Ticket was opened for.
@@ -13610,6 +13623,7 @@ components:
           example: '2015-06-04T16:07:03'
         updated_by:
           type: string
+          nullable: true
           readOnly: true
           description: >
             The User who last updated this Ticket.
@@ -13939,6 +13953,7 @@ components:
           x-linode-cli-display: 5
         linode_id:
           type: integer
+          nullable: true
           description: >
             If a Volume is attached to a specific Linode, the ID of that Linode
             will be displayed here.
