Merge remote-tracking branch 'origin/main' into more-lifecycle

Author: sjmiller609

cmd/api/api/instances.go

@@ -568,9 +568,9 @@ func instanceToOAPI(inst instances.Instance) oapi.Instance {
 
 	// Convert volume attachments
 	if len(inst.Volumes) > 0 {
-		oapiVolumes := make([]oapi.VolumeAttachment, len(inst.Volumes))
+		oapiVolumes := make([]oapi.VolumeMount, len(inst.Volumes))
 		for i, vol := range inst.Volumes {
-			oapiVol := oapi.VolumeAttachment{
+			oapiVol := oapi.VolumeMount{
 				VolumeId:  vol.VolumeID,
 				MountPath: vol.MountPath,
 				Readonly:  lo.ToPtr(vol.Readonly),

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.VolumeAttachedInstance, len(vol.Attachments))
+		attachments := make([]oapi.VolumeAttachment, len(vol.Attachments))
 		for i, att := range vol.Attachments {
-			attachments[i] = oapi.VolumeAttachedInstance{
+			attachments[i] = oapi.VolumeAttachment{
 				InstanceId: att.InstanceID,
 				MountPath:  att.MountPath,
 				Readonly:   att.Readonly,

lib/oapi/oapi.go

@@ -55,7 +55,7 @@ components:
         - Stopped: No VMM running, no snapshot exists
         - Standby: No VMM running, snapshot exists (can be restored)
     
-    VolumeAttachment:
+    VolumeMount:
       type: object
       required: [volume_id, mount_path]
       properties:
@@ -152,7 +152,7 @@ components:
           type: array
           description: Volumes to attach to the instance at creation time
           items:
-            $ref: "#/components/schemas/VolumeAttachment"
+            $ref: "#/components/schemas/VolumeMount"
         # Future: port_mappings, timeout_seconds
 
     Instance:
@@ -220,7 +220,7 @@ components:
           type: array
           description: Volumes attached to the instance
           items:
-            $ref: "#/components/schemas/VolumeAttachment"
+            $ref: "#/components/schemas/VolumeMount"
         created_at:
           type: string
           format: date-time
@@ -334,7 +334,7 @@ components:
           description: Size in gigabytes
           example: 10
 
-    VolumeAttachedInstance:
+    VolumeAttachment:
       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/VolumeAttachedInstance"
+            $ref: "#/components/schemas/VolumeAttachment"
         created_at:
           type: string
           format: date-time

openapi.yaml

@@ -72,7 +72,7 @@ resources:
 
   instances:
     models:
-      volume_attachment: '#/components/schemas/VolumeAttachment'
+      volume_mount: '#/components/schemas/VolumeMount'
       port_mapping: '#/components/schemas/PortMapping'
       instance: '#/components/schemas/Instance'
     methods:
@@ -96,6 +96,7 @@ resources:
   volumes:
     models:
       volume: '#/components/schemas/Volume'
+      volume_attachment: '#/components/schemas/VolumeAttachment'
     methods:
       list: get /volumes
       create: post /volumes