Make attached disk logic package private

Author: julianKatz

pkg/mount-manager/safe-mounter-v1_windows.go

@@ -185,7 +185,7 @@ func (mounter *CSIProxyMounterV1) Unmount(target string) error {
 
 func (mounter *CSIProxyMounterV1) GetDiskNumber(deviceName string, partition string, volumeKey string) (string, error) {
 	// First, get Google Cloud metadata to find the nvmeNamespaceIdentifier for this device
-	googleDisks, err := AttachedDisks()
+	googleDisks, err := attachedDisks()
 	if err != nil {
 		klog.V(4).Infof("Failed to get Google Cloud metadata, falling back to legacy method: %v", err)
 		return mounter.getDiskNumberLegacy(deviceName)
@@ -337,13 +337,13 @@ func (mounter *CSIProxyMounterV1) convertEUIToDecimal(euiValue string) (uint64,
 }
 
 // Helper function to get Google Cloud metadata
-func (mounter *CSIProxyMounterV1) getGoogleCloudDisks() ([]GoogleCloudDisk, error) {
+func (mounter *CSIProxyMounterV1) getGoogleCloudDisks() ([]googleCloudDisk, error) {
 	disksResp, err := metadata.GetWithContext(context.Background(), "instance/disks/?recursive=true")
 	if err != nil {
 		return nil, fmt.Errorf("failed to get disks using metadata package: %v", err)
 	}
 
-	var disks []GoogleCloudDisk
+	var disks []googleCloudDisk
 	if err := json.Unmarshal([]byte(disksResp), &disks); err != nil {
 		return nil, fmt.Errorf("failed to parse JSON response: %v", err)
 	}

pkg/mount-manager/safe-mounter-v1beta_windows.go

@@ -200,7 +200,7 @@ func (mounter *CSIProxyMounterV1Beta) Unmount(target string) error {
 
 func (mounter *CSIProxyMounterV1Beta) GetDiskNumber(deviceName string, partition string, volumeKey string) (string, error) {
 	// First, get Google Cloud metadata to find the nvmeNamespaceIdentifier for this device
-	googleDisks, err := AttachedDisks()
+	googleDisks, err := attachedDisks()
 	if err != nil {
 		klog.V(4).Infof("Failed to get Google Cloud metadata, falling back to legacy method: %v", err)
 		return mounter.getDiskNumberLegacy(deviceName)

pkg/mount-manager/safe-mounter_windows.go

@@ -87,7 +87,7 @@ func NewSafeMounter(int, time.Duration) (*mount.SafeFormatAndMount, error) {
 	return nil, err
 }
 
-type GoogleCloudDisk struct {
+type googleCloudDisk struct {
 	DeviceName              string `json:"deviceName"`
 	Index                   int    `json:"index"`
 	Interface               string `json:"interface"`
@@ -96,15 +96,15 @@ type GoogleCloudDisk struct {
 	Type                    string `json:"type"`
 }
 
-// AttachedDisks returns the list of disks attached to the instance from which
+// attachedDisks returns the list of disks attached to the instance from which
 // the metadata server is called.
-func AttachedDisks() ([]GoogleCloudDisk, error) {
+func attachedDisks() ([]googleCloudDisk, error) {
 	disksResp, err := metadata.GetWithContext(context.Background(), "instance/disks/?recursive=true")
 	if err != nil {
 		return nil, fmt.Errorf("failed to get disks using metadata package: %v", err)
 	}
 
-	var disks []GoogleCloudDisk
+	var disks []googleCloudDisk
 	if err := json.Unmarshal([]byte(disksResp), &disks); err != nil {
 		return nil, fmt.Errorf("failed to parse JSON response: %v", err)
 	}