From f49b74051cc47d99b2dc017ad4e8edf585fc0896 Mon Sep 17 00:00:00 2001
From: Matthew Wong <mattwon@amazon.com>
Date: Tue, 1 Jun 2021 12:48:54 -0700
Subject: [PATCH] Don't count reserved partitions (gpt) when checking if any
 exist

---
 internal/os/disk/api.go        | 14 +++++++-------
 internal/server/disk/server.go | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/internal/os/disk/api.go b/internal/os/disk/api.go
index 79b42c8d..69b9b4de 100644
--- a/internal/os/disk/api.go
+++ b/internal/os/disk/api.go
@@ -33,10 +33,10 @@ type API interface {
 	IsDiskInitialized(diskNumber uint32) (bool, error)
 	// InitializeDisk initializes the disk `diskNumber`
 	InitializeDisk(diskNumber uint32) error
-	// PartitionsExist checks if the disk `diskNumber` has any partitions.
-	PartitionsExist(diskNumber uint32) (bool, error)
-	// CreatePartitoin creates a partition in disk `diskNumber`
-	CreatePartition(diskNumber uint32) error
+	// BasicPartitionsExist checks if the disk `diskNumber` has any basic partitions.
+	BasicPartitionsExist(diskNumber uint32) (bool, error)
+	// CreateBasicPartition creates a partition in disk `diskNumber`
+	CreateBasicPartition(diskNumber uint32) error
 	// Rescan updates the host storage cache (re-enumerates disk, partition and volume objects)
 	Rescan() error
 	// GetDiskNumberByName gets a disk number by page83 ID (disk name)
@@ -157,8 +157,8 @@ func (DiskAPI) InitializeDisk(diskNumber uint32) error {
 	return nil
 }
 
-func (DiskAPI) PartitionsExist(diskNumber uint32) (bool, error) {
-	cmd := fmt.Sprintf("Get-Partition | Where DiskNumber -eq %d", diskNumber)
+func (DiskAPI) BasicPartitionsExist(diskNumber uint32) (bool, error) {
+	cmd := fmt.Sprintf("Get-Partition | Where DiskNumber -eq %d | Where Type -eq Basic", diskNumber)
 	out, err := runExec(cmd)
 	if err != nil {
 		return false, fmt.Errorf("error checking presence of partitions on disk %d: %v, %v", diskNumber, out, err)
@@ -170,7 +170,7 @@ func (DiskAPI) PartitionsExist(diskNumber uint32) (bool, error) {
 	return false, nil
 }
 
-func (DiskAPI) CreatePartition(diskNumber uint32) error {
+func (DiskAPI) CreateBasicPartition(diskNumber uint32) error {
 	cmd := fmt.Sprintf("New-Partition -DiskNumber %d -UseMaximumSize", diskNumber)
 	out, err := runExec(cmd)
 	if err != nil {
diff --git a/internal/server/disk/server.go b/internal/server/disk/server.go
index 2d2beab3..4b0945f1 100644
--- a/internal/server/disk/server.go
+++ b/internal/server/disk/server.go
@@ -66,17 +66,17 @@ func (s *Server) PartitionDisk(context context.Context, request *internal.Partit
 		klog.V(4).Infof("Disk %d already initialized", diskNumber)
 	}
 
-	klog.V(4).Infof("Checking if disk %d is partitioned", diskNumber)
-	partitioned, err := s.hostAPI.PartitionsExist(diskNumber)
+	klog.V(4).Infof("Checking if disk %d has basic partitions", diskNumber)
+	partitioned, err := s.hostAPI.BasicPartitionsExist(diskNumber)
 	if err != nil {
-		klog.Errorf("failed check PartitionsExist %v", err)
+		klog.Errorf("failed check BasicPartitionsExist %v", err)
 		return response, err
 	}
 	if !partitioned {
-		klog.V(4).Infof("Creating partition on disk %d", diskNumber)
-		err = s.hostAPI.CreatePartition(diskNumber)
+		klog.V(4).Infof("Creating basic partition on disk %d", diskNumber)
+		err = s.hostAPI.CreateBasicPartition(diskNumber)
 		if err != nil {
-			klog.Errorf("failed CreatePartition %v", err)
+			klog.Errorf("failed CreateBasicPartition %v", err)
 			return response, err
 		}
 	} else {