Vendor version plumping to useragent string

Author: davidz627

cmd/main.go

@@ -46,7 +46,7 @@ func handle() {
 	gceDriver := driver.GetGCEDriver()
 
 	//Initialize GCE Driver (Move setup to main?)
-	cloudProvider, err := gce.CreateCloudProvider()
+	cloudProvider, err := gce.CreateCloudProvider(gceDriver.GetVendorVersion())
 	if err != nil {
 		glog.Fatalf("Failed to get cloud provider: %v", err)
 	}

pkg/gce-cloud-provider/gce.go

@@ -46,8 +46,8 @@ type CloudProvider struct {
 
 var _ GCECompute = &CloudProvider{}
 
-func CreateCloudProvider() (*CloudProvider, error) {
-	svc, err := createCloudService()
+func CreateCloudProvider(vendorVersion string) (*CloudProvider, error) {
+	svc, err := createCloudService(vendorVersion)
 	if err != nil {
 		return nil, err
 	}
@@ -66,13 +66,13 @@ func CreateCloudProvider() (*CloudProvider, error) {
 
 }
 
-func createCloudService() (*compute.Service, error) {
+func createCloudService(vendorVersion string) (*compute.Service, error) {
 	// TODO: support alternate methods of authentication
-	svc, err := createCloudServiceWithDefaultServiceAccount()
+	svc, err := createCloudServiceWithDefaultServiceAccount(vendorVersion)
 	return svc, err
 }
 
-func createCloudServiceWithDefaultServiceAccount() (*compute.Service, error) {
+func createCloudServiceWithDefaultServiceAccount(vendorVersion string) (*compute.Service, error) {
 	client, err := newDefaultOauthClient()
 	if err != nil {
 		return nil, err
@@ -82,7 +82,7 @@ func createCloudServiceWithDefaultServiceAccount() (*compute.Service, error) {
 		return nil, err
 	}
 	// TODO(dyzz) parameterize version number
-	service.UserAgent = fmt.Sprintf("GCE CSI Driver/%s (%s %s)", "0.2.0", runtime.GOOS, runtime.GOARCH)
+	service.UserAgent = fmt.Sprintf("GCE CSI Driver/%s (%s %s)", vendorVersion, runtime.GOOS, runtime.GOARCH)
 	return service, nil
 }
 

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

@@ -44,7 +44,13 @@ const (
 )
 
 func GetGCEDriver() *GCEDriver {
-	return &GCEDriver{}
+	return &GCEDriver{
+		vendorVersion: vendorVersion,
+	}
+}
+
+func (gceDriver *GCEDriver) GetVendorVersion() string {
+	return gceDriver.vendorVersion
 }
 
 func (gceDriver *GCEDriver) SetupGCEDriver(cloudProvider gce.GCECompute, mounter mountmanager.Mounter, name, nodeID string) error {
@@ -57,7 +63,6 @@ func (gceDriver *GCEDriver) SetupGCEDriver(cloudProvider gce.GCECompute, mounter
 
 	gceDriver.name = name
 	gceDriver.nodeID = nodeID
-	gceDriver.vendorVersion = vendorVersion
 
 	// Adding Capabilities
 	vcam := []csi.VolumeCapability_AccessMode_Mode{

test/e2e/gce_pd_e2e_test.go

@@ -74,13 +74,14 @@ func TestE2E(t *testing.T) {
 }
 
 var _ = BeforeSuite(func() {
+	var err error
 	// TODO(dyzz): better defaults
 	driverName := "testdriver"
 	nodeID = "gce-pd-csi-e2e"
 
 	// TODO(dyzz): Start a driver
 	gceDriver := driver.GetGCEDriver()
-	cloudProvider, err := gce.CreateCloudProvider()
+	gceCloud, err = gce.CreateCloudProvider(gceDriver.GetVendorVersion())
 
 	Expect(err).To(BeNil(), "Failed to get cloud provider: %v", err)
 
@@ -90,7 +91,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).To(BeNil(), "Failed to get mounter %v", err)
 
 	//Initialize GCE Driver
-	err = gceDriver.SetupGCEDriver(cloudProvider, mounter, driverName, nodeID)
+	err = gceDriver.SetupGCEDriver(gceCloud, mounter, driverName, nodeID)
 	Expect(err).To(BeNil(), "Failed to initialize GCE CSI Driver: %v", err)
 
 	go func() {
@@ -99,7 +100,6 @@ var _ = BeforeSuite(func() {
 
 	client = createCSIClient()
 
-	gceCloud, err = gce.CreateCloudProvider()
 	Expect(err).To(BeNil(), "Failed to create cloud service")
 	// TODO: This is a hack to make sure the driver is fully up before running the tests, theres probably a better way to do this.
 	time.Sleep(20 * time.Second)

test/run-e2e-local.sh

@@ -5,4 +5,4 @@ set -x
 
 readonly PKGDIR=sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
 
-go run "$GOPATH/src/${PKGDIR}/test/remote/run_remote/run_remote.go" --logtostderr --v 2 --project "${PROJECT}" --zone "${ZONE}" --ssh-env gce --delete-instances=true --cleanup=true --results-dir=my_test  --service-account="${IAM_NAME}"
+go run "$GOPATH/src/${PKGDIR}/test/remote/run_remote/run_remote.go" --logtostderr --v 2 --project "${PROJECT}" --zone "${ZONE}" --ssh-env gce --delete-instances=false --cleanup=true --results-dir=my_test  --service-account="${IAM_NAME}"