Merge pull request #118 from davidz627/feature/nodeIDProject

Change NodeID to be fully qualified name

Author: k8s-ci-robot

pkg/common/utils.go

@@ -28,18 +28,21 @@ const (
 	// Volume ID Expected Format
 	// "projects/{projectName}/zones/{zoneName}/disks/{diskName}"
 	// "projects/{projectName}/regions/{regionName}/disks/{diskName}"
-	volIDToplogyKey       = 2
-	volIDToplogyValue     = 3
-	volIDDiskNameValue    = 5
-	volIDTotalElements    = 6
+	volIDToplogyKey    = 2
+	volIDToplogyValue  = 3
+	volIDDiskNameValue = 5
+	volIDTotalElements = 6
+
+	// Snapshot ID
 	snapshotTotalElements = 5
 	snapshotTopologyKey   = 2
 
 	// Node ID Expected Format
-	// "{zoneName}/{instanceName}"
-	nodeIDZoneValue     = 0
-	nodeIDNameValue     = 1
-	nodeIDTotalElements = 2
+	// "projects/{projectName}/zones/{zoneName}/disks/{diskName}"
+	nodeIDFmt           = "projects/%s/zones/%s/instances/%s"
+	nodeIDZoneValue     = 3
+	nodeIDNameValue     = 5
+	nodeIDTotalElements = 6
 
 	regionalDeviceNameSuffix = "_regional"
 )
@@ -83,7 +86,7 @@ func SnapshotIDToKey(id string) (string, error) {
 func NodeIDToZoneAndName(id string) (string, string, error) {
 	splitId := strings.Split(id, "/")
 	if len(splitId) != nodeIDTotalElements {
-		return "", "", fmt.Errorf("failed to get id components. expected {zone}/{name}. Got: %s", id)
+		return "", "", fmt.Errorf("failed to get id components. expected projects/{project}/zones/{zone}/instances/{name}. Got: %s", id)
 	}
 	return splitId[nodeIDZoneValue], splitId[nodeIDNameValue], nil
 }
@@ -117,3 +120,7 @@ func GetDeviceName(volKey *meta.Key) (string, error) {
 		return "", fmt.Errorf("volume key %v neither zonal nor regional", volKey.Name)
 	}
 }
+
+func CreateNodeID(project, zone, name string) string {
+	return fmt.Sprintf(nodeIDFmt, project, zone, name)
+}

pkg/common/utils_test.go

@@ -27,7 +27,6 @@ import (
 const (
 	volIDZoneFmt   = "projects/%s/zones/%s/disks/%s"
 	volIDRegionFmt = "projects/%s/regions/%s/disks/%s"
-	nodeIDFmt      = "%s/%s"
 )
 
 func TestBytesToGb(t *testing.T) {
@@ -154,6 +153,7 @@ func TestVolumeIDToKey(t *testing.T) {
 }
 
 func TestNodeIDToZoneAndName(t *testing.T) {
+	testProject := "test-project"
 	testName := "test-name"
 	testZone := "test-zone"
 
@@ -166,7 +166,7 @@ func TestNodeIDToZoneAndName(t *testing.T) {
 	}{
 		{
 			name:    "normal",
-			nodeID:  fmt.Sprintf(nodeIDFmt, testZone, testName),
+			nodeID:  CreateNodeID(testProject, testZone, testName),
 			expZone: testZone,
 			expName: testName,
 		},

pkg/gce-pd-csi-driver/node.go

@@ -17,7 +17,6 @@ package gceGCEDriver
 import (
 	"fmt"
 	"os"
-	"strings"
 	"sync"
 
 	csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
@@ -271,7 +270,7 @@ func (ns *GCENodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUns
 func (ns *GCENodeServer) NodeGetId(ctx context.Context, req *csi.NodeGetIdRequest) (*csi.NodeGetIdResponse, error) {
 	glog.V(4).Infof("NodeGetId called with req: %#v", req)
 
-	nodeID := strings.Join([]string{ns.MetadataService.GetZone(), ns.MetadataService.GetName()}, "/")
+	nodeID := common.CreateNodeID(ns.MetadataService.GetProject(), ns.MetadataService.GetZone(), ns.MetadataService.GetName())
 
 	return &csi.NodeGetIdResponse{
 		NodeId: nodeID,
@@ -293,7 +292,7 @@ func (ns *GCENodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRe
 		Segments: map[string]string{common.TopologyKeyZone: ns.MetadataService.GetZone()},
 	}
 
-	nodeID := strings.Join([]string{ns.MetadataService.GetZone(), ns.MetadataService.GetName()}, "/")
+	nodeID := common.CreateNodeID(ns.MetadataService.GetProject(), ns.MetadataService.GetZone(), ns.MetadataService.GetName())
 
 	resp := &csi.NodeGetInfoResponse{
 		NodeId: nodeID,

test/remote/instance.go

@@ -32,6 +32,7 @@ import (
 	"google.golang.org/api/googleapi"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
+	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
 )
 
 const (
@@ -62,7 +63,7 @@ func (i *InstanceInfo) GetName() string {
 }
 
 func (i *InstanceInfo) GetNodeID() string {
-	return strings.Join([]string{i.zone, i.name}, "/")
+	return common.CreateNodeID(i.project, i.zone, i.name)
 }
 
 func CreateInstanceInfo(project, instanceZone, name string, cs *compute.Service) (*InstanceInfo, error) {