Merge pull request #198 from andyzhangx/rename3

andyzhangx · web-flow · commit 971673f41464 · 2020-08-06T19:00:47.000+08:00
chore: rename driver
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ endif
 IMAGE_TAG = $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION)
 IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGE_NAME):latest
 BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
-LDFLAGS ?= "-X ${PKG}/pkg/blobfuse.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/blobfuse.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/blobfuse.buildDate=${BUILD_DATE} -s -w -extldflags '-static'"
+LDFLAGS ?= "-X ${PKG}/pkg/blob.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/blob.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/blob.buildDate=${BUILD_DATE} -s -w -extldflags '-static'"
 GINKGO_FLAGS = -ginkgo.noColor -ginkgo.v
 GO111MODULE = off
 GOPATH ?= $(shell go env GOPATH)
diff --git a/pkg/blob/azure.go b/pkg/blob/azure.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package blobfuse
+package blob
 
 import (
 	"fmt"
diff --git a/pkg/blob/azure_test.go b/pkg/blob/azure_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package blobfuse
+package blob
 
 import (
 	"fmt"
diff --git a/pkg/blob/blobfuse.go b/pkg/blob/blobfuse.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package blobfuse
+package blob
 
 import (
 	"fmt"
diff --git a/pkg/blob/blobfuse_test.go b/pkg/blob/blobfuse_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package blobfuse
+package blob
 
 import (
 	"errors"
diff --git a/pkg/blob/controllerserver.go b/pkg/blob/controllerserver.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package blobfuse
+package blob
 
 import (
 	"context"
diff --git a/pkg/blob/controllerserver_test.go b/pkg/blob/controllerserver_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package blobfuse
+package blob
 
 import (
 	"context"
diff --git a/pkg/blob/identityserver.go b/pkg/blob/identityserver.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package blobfuse
+package blob
 
 import (
 	"context"
diff --git a/pkg/blob/identityserver_test.go b/pkg/blob/identityserver_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package blobfuse
+package blob
 
 import (
 	"context"
diff --git a/pkg/blob/nodeserver.go b/pkg/blob/nodeserver.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package blobfuse
+package blob
 
 import (
 	"fmt"
diff --git a/pkg/blob/nodeserver_test.go b/pkg/blob/nodeserver_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package blobfuse
+package blob
 
 import (
 	"context"
diff --git a/pkg/blob/version.go b/pkg/blob/version.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package blobfuse
+package blob
 
 import (
 	"fmt"
diff --git a/pkg/blob/version_test.go b/pkg/blob/version_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package blobfuse
+package blob
 
 import (
 	"fmt"
diff --git a/pkg/blobplugin/Dockerfile b/pkg/blobplugin/Dockerfile
@@ -18,7 +18,7 @@ ADD . .
 ARG TARGETARCH
 ARG TARGETOS
 ARG LDFLAGS
-RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -a -ldflags "${LDFLAGS:--X sigs.k8s.io/blobfuse-csi-driver/pkg/blobfuse.driverVersion=latest}" -o _output/blobplugin ./pkg/blobplugin
+RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -a -ldflags "${LDFLAGS:--X sigs.k8s.io/blobfuse-csi-driver/pkg/blob.driverVersion=latest}" -o _output/blobplugin ./pkg/blobplugin
 
 FROM us.gcr.io/k8s-artifacts-prod/build-image/debian-base-amd64:v2.1.0
 COPY --from=builder /go/src/sigs.k8s.io/blobfuse-csi-driver/_output/blobplugin /blobplugin
diff --git a/pkg/blobplugin/main.go b/pkg/blobplugin/main.go
@@ -47,7 +47,7 @@ func main() {
 	klog.InitFlags(nil)
 	flag.Parse()
 	if *version {
-		info, err := blobfuse.GetVersionYAML()
+		info, err := blob.GetVersionYAML()
 		if err != nil {
 			klog.Fatalln(err)
 		}
@@ -64,7 +64,7 @@ func main() {
 }
 
 func handle() {
-	driver := blobfuse.NewDriver(*nodeID)
+	driver := blob.NewDriver(*nodeID)
 	if driver == nil {
 		klog.Fatalln("Failed to initialize Azure Blob Storage CSI driver")
 	}
diff --git a/test/e2e/driver/blobfuse_csi_driver.go b/test/e2e/driver/blobfuse_csi_driver.go
@@ -35,7 +35,7 @@ type blobFuseCSIDriver struct {
 // InitBlobFuseCSIDriver returns blobFuseCSIDriver that implemnts DynamicPVTestDriver interface
 func InitBlobFuseCSIDriver() PVTestDriver {
 	return &blobFuseCSIDriver{
-		driverName: blobfuse.DriverName,
+		driverName: blob.DriverName,
 	}
 }
 
diff --git a/test/e2e/dynamic_provisioning_test.go b/test/e2e/dynamic_provisioning_test.go
@@ -201,7 +201,7 @@ var _ = ginkgo.Describe("[blobfuse-csi-e2e] Dynamic Provisioning", func() {
 		test := testsuites.DynamicallyProvisionedReclaimPolicyTest{
 			CSIDriver:              testDriver,
 			Volumes:                volumes,
-			Blobfuse:               blobfuseDriver,
+			Driver:                 blobDriver,
 			StorageClassParameters: map[string]string{"skuName": "Standard_GRS"},
 		}
 		test.Run(cs, ns)
diff --git a/test/e2e/pre_provisioning_test.go b/test/e2e/pre_provisioning_test.go
@@ -70,7 +70,7 @@ var _ = ginkgo.Describe("[blobfuse-csi-e2e] Pre-Provisioned", func() {
 			req := &csi.DeleteVolumeRequest{
 				VolumeId: volumeID,
 			}
-			_, err := blobfuseDriver.DeleteVolume(context.Background(), req)
+			_, err := blobDriver.DeleteVolume(context.Background(), req)
 			if err != nil {
 				ginkgo.Fail(fmt.Sprintf("create volume %q error: %v", volumeID, err))
 			}
@@ -79,7 +79,7 @@ var _ = ginkgo.Describe("[blobfuse-csi-e2e] Pre-Provisioned", func() {
 
 	ginkgo.It("[env] should use a pre-provisioned volume and mount it as readOnly in a pod", func() {
 		req := makeCreateVolumeReq("pre-provisioned-readOnly")
-		resp, err := blobfuseDriver.CreateVolume(context.Background(), req)
+		resp, err := blobDriver.CreateVolume(context.Background(), req)
 		if err != nil {
 			ginkgo.Fail(fmt.Sprintf("create volume error: %v", err))
 		}
@@ -113,7 +113,7 @@ var _ = ginkgo.Describe("[blobfuse-csi-e2e] Pre-Provisioned", func() {
 
 	ginkgo.It(fmt.Sprintf("[env] should use a pre-provisioned volume and retain PV with reclaimPolicy %q", v1.PersistentVolumeReclaimRetain), func() {
 		req := makeCreateVolumeReq("pre-provisioned-retain-reclaimPolicy")
-		resp, err := blobfuseDriver.CreateVolume(context.Background(), req)
+		resp, err := blobDriver.CreateVolume(context.Background(), req)
 		if err != nil {
 			ginkgo.Fail(fmt.Sprintf("create volume error: %v", err))
 		}
@@ -139,7 +139,7 @@ var _ = ginkgo.Describe("[blobfuse-csi-e2e] Pre-Provisioned", func() {
 
 	ginkgo.It("should use existing credentials in k8s cluster", func() {
 		req := makeCreateVolumeReq("pre-provisioned-existing-credentials")
-		resp, err := blobfuseDriver.CreateVolume(context.Background(), req)
+		resp, err := blobDriver.CreateVolume(context.Background(), req)
 		if err != nil {
 			ginkgo.Fail(fmt.Sprintf("create volume error: %v", err))
 		}
@@ -177,7 +177,7 @@ var _ = ginkgo.Describe("[blobfuse-csi-e2e] Pre-Provisioned", func() {
 
 	ginkgo.It("should use provided credentials", func() {
 		req := makeCreateVolumeReq("pre-provisioned-provided-credentials")
-		resp, err := blobfuseDriver.CreateVolume(context.Background(), req)
+		resp, err := blobDriver.CreateVolume(context.Background(), req)
 		if err != nil {
 			ginkgo.Fail(fmt.Sprintf("create volume error: %v", err))
 		}
@@ -210,7 +210,7 @@ var _ = ginkgo.Describe("[blobfuse-csi-e2e] Pre-Provisioned", func() {
 		test := testsuites.PreProvisionedProvidedCredentiasTest{
 			CSIDriver: testDriver,
 			Pods:      pods,
-			Blobfuse:  blobfuseDriver,
+			Driver:    blobDriver,
 		}
 		test.Run(cs, ns)
 	})
diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
@@ -46,7 +46,7 @@ const (
 	defaultReportDir = "/workspace/_artifacts"
 )
 
-var blobfuseDriver *blobfuse.Driver
+var blobDriver *blob.Driver
 
 type testCmd struct {
 	command  string
@@ -96,10 +96,10 @@ var _ = ginkgo.BeforeSuite(func() {
 	}
 	nodeid := os.Getenv("nodeid")
 	kubeconfig := os.Getenv(kubeconfigEnvVar)
-	blobfuseDriver = blobfuse.NewDriver(nodeid)
+	blobDriver = blob.NewDriver(nodeid)
 	go func() {
 		os.Setenv("AZURE_CREDENTIAL_FILE", credentials.TempAzureCredentialFilePath)
-		blobfuseDriver.Run(fmt.Sprintf("unix:///tmp/csi-%s.sock", uuid.NewUUID().String()), kubeconfig)
+		blobDriver.Run(fmt.Sprintf("unix:///tmp/csi-%s.sock", uuid.NewUUID().String()), kubeconfig)
 	}()
 })
 
diff --git a/test/e2e/testsuites/dynamically_provisioned_reclaim_policy_tester.go b/test/e2e/testsuites/dynamically_provisioned_reclaim_policy_tester.go
@@ -29,7 +29,7 @@ import (
 type DynamicallyProvisionedReclaimPolicyTest struct {
 	CSIDriver              driver.DynamicPVTestDriver
 	Volumes                []VolumeDetails
-	Blobfuse               *blobfuse.Driver
+	Driver                 *blob.Driver
 	StorageClassParameters map[string]string
 }
 
@@ -44,7 +44,7 @@ func (t *DynamicallyProvisionedReclaimPolicyTest) Run(client clientset.Interface
 		if tpvc.ReclaimPolicy() == v1.PersistentVolumeReclaimRetain {
 			tpvc.WaitForPersistentVolumePhase(v1.VolumeReleased)
 			tpvc.DeleteBoundPersistentVolume()
-			tpvc.DeleteBackingVolume(t.Blobfuse)
+			tpvc.DeleteBackingVolume(t.Driver)
 		}
 	}
 }
diff --git a/test/e2e/testsuites/pre_provisioned_existing_credentials_tester.go b/test/e2e/testsuites/pre_provisioned_existing_credentials_tester.go
@@ -39,7 +39,7 @@ type PreProvisionedExistingCredentialsTest struct {
 func (t *PreProvisionedExistingCredentialsTest) Run(client clientset.Interface, namespace *v1.Namespace) {
 	for _, pod := range t.Pods {
 		for n, volume := range pod.Volumes {
-			resourceGroupName, accountName, containerName, err := blobfuse.GetContainerInfo(volume.VolumeID)
+			resourceGroupName, accountName, containerName, err := blob.GetContainerInfo(volume.VolumeID)
 			if err != nil {
 				framework.ExpectNoError(err, fmt.Sprintf("Error GetContainerInfo from volumeID(%s): %v", volume.VolumeID, err))
 				return
diff --git a/test/e2e/testsuites/pre_provisioned_provided_credentials_tester.go b/test/e2e/testsuites/pre_provisioned_provided_credentials_tester.go
@@ -35,13 +35,13 @@ import (
 type PreProvisionedProvidedCredentiasTest struct {
 	CSIDriver driver.PreProvisionedVolumeTestDriver
 	Pods      []PodDetails
-	Blobfuse  *blobfuse.Driver
+	Driver    *blob.Driver
 }
 
 func (t *PreProvisionedProvidedCredentiasTest) Run(client clientset.Interface, namespace *v1.Namespace) {
 	for _, pod := range t.Pods {
 		for n, volume := range pod.Volumes {
-			accountName, accountKey, accountSasToken, containerName, err := t.Blobfuse.GetStorageAccountAndContainer(context.Background(), volume.VolumeID, nil, nil)
+			accountName, accountKey, accountSasToken, containerName, err := t.Driver.GetStorageAccountAndContainer(context.Background(), volume.VolumeID, nil, nil)
 			framework.ExpectNoError(err, fmt.Sprintf("Error GetStorageAccountAndContainer from volumeID(%s): %v", volume.VolumeID, err))
 
 			ginkgo.By("creating the secret")
diff --git a/test/e2e/testsuites/testsuites.go b/test/e2e/testsuites/testsuites.go
@@ -277,7 +277,7 @@ func (t *TestPersistentVolumeClaim) DeleteBoundPersistentVolume() {
 	framework.ExpectNoError(err)
 }
 
-func (t *TestPersistentVolumeClaim) DeleteBackingVolume(azfile *blobfuse.Driver) {
+func (t *TestPersistentVolumeClaim) DeleteBackingVolume(azfile *blob.Driver) {
 	volumeID := t.persistentVolume.Spec.CSI.VolumeHandle
 	ginkgo.By(fmt.Sprintf("deleting blobfuse volume %q", volumeID))
 	req := &csi.DeleteVolumeRequest{
