fix: update the layout of the Disks API to match proxying requirements

Fixes #3199 Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
siderolabs · Feb 24, 2021 · 589d018 · 589d018
1 parent 7587af9
commit 589d018
Show file tree

Hide file tree

Showing 5 changed files with 138 additions and 51 deletions.
diff --git a/api/storage/storage.proto b/api/storage/storage.proto
@@ -26,7 +26,8 @@ message Disk {
 }
 
 // DisksResponse represents the response of the `Disks` RPC.
-message DisksResponse{
+message Disks {
   common.Metadata metadata = 1;
   repeated Disk disks = 2;
 }
+message DisksResponse { repeated Disks messages = 1; }
diff --git a/internal/app/storaged/server.go b/internal/app/storaged/server.go
@@ -35,7 +35,11 @@ func (s *Server) Disks(ctx context.Context, in *empty.Empty) (reply *storage.Dis
 	}
 
 	reply = &storage.DisksResponse{
-		Disks: diskList,
+		Messages: []*storage.Disks{
+			{
+				Disks: diskList,
+			},
+		},
 	}
 
 	return reply, nil

diff --git a/internal/pkg/tui/installer/state.go b/internal/pkg/tui/installer/state.go
@@ -71,12 +71,14 @@ func NewState(ctx context.Context, installer *Installer, conn *Connection) (*Sta
 		return nil, err
 	}
 
-	for i, disk := range disks.Disks {
-		if i == 0 {
-			opts.MachineConfig.InstallConfig.InstallDisk = disk.DeviceName
-		}
+	for _, msg := range disks.Messages {
+		for i, disk := range msg.Disks {
+			if i == 0 {
+				opts.MachineConfig.InstallConfig.InstallDisk = disk.DeviceName
+			}
 
-		installDiskOptions = append(installDiskOptions, disk.DeviceName, disk.Model, humanize.Bytes(disk.Size))
+			installDiskOptions = append(installDiskOptions, disk.DeviceName, disk.Model, humanize.Bytes(disk.Size))
+		}
 	}
 
 	var machineTypes []interface{}

diff --git a/pkg/machinery/api/storage/storage.pb.go b/pkg/machinery/api/storage/storage.pb.go
diff --git a/website/content/docs/v0.9/Reference/api.md b/website/content/docs/v0.9/Reference/api.md
@@ -214,6 +214,7 @@ description: Talos gRPC API reference.
 
 - [storage/storage.proto](#storage/storage.proto)
     - [Disk](#storage.Disk)
+    - [Disks](#storage.Disks)
     - [DisksResponse](#storage.DisksResponse)
 
     - [StorageService](#storage.StorageService)
@@ -3375,9 +3376,9 @@ Disk represents a disk.
 
 
 
-<a name="storage.DisksResponse"></a>
+<a name="storage.Disks"></a>
 
-### DisksResponse
+### Disks
 DisksResponse represents the response of the `Disks` RPC.
 
 
@@ -3390,6 +3391,21 @@ DisksResponse represents the response of the `Disks` RPC.
 
 
 
+
+<a name="storage.DisksResponse"></a>
+
+### DisksResponse
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| messages | [Disks](#storage.Disks) | repeated |  |
+
+
+
+
+
  <!-- end messages -->
 
  <!-- end enums -->