Merge remote-tracking branch 'origin/ingress' into ingress

Author: sjmiller609

cmd/api/api/volumes.go

@@ -289,9 +289,9 @@ func volumeToOAPI(vol volumes.Volume) oapi.Volume {
 
 	// Convert attachments
 	if len(vol.Attachments) > 0 {
-		attachments := make([]oapi.VolumeAttachmentInfo, len(vol.Attachments))
+		attachments := make([]oapi.VolumeAttachedInstance, len(vol.Attachments))
 		for i, att := range vol.Attachments {
-			attachments[i] = oapi.VolumeAttachmentInfo{
+			attachments[i] = oapi.VolumeAttachedInstance{
 				InstanceId: att.InstanceID,
 				MountPath:  att.MountPath,
 				Readonly:   att.Readonly,

lib/oapi/oapi.go

@@ -334,7 +334,7 @@ components:
           description: Size in gigabytes
           example: 10
 
-    VolumeAttachmentInfo:
+    VolumeAttachedInstance:
       type: object
       required: [instance_id, mount_path, readonly]
       properties:
@@ -371,7 +371,7 @@ components:
           type: array
           description: List of current attachments (empty if not attached)
           items:
-            $ref: "#/components/schemas/VolumeAttachmentInfo"
+            $ref: "#/components/schemas/VolumeAttachedInstance"
         created_at:
           type: string
           format: date-time