diff --git a/pkg/cloud/mocks/mock_ec2.go b/pkg/cloud/mocks/mock_ec2.go
index a26a7cb0db..82d3da1384 100644
--- a/pkg/cloud/mocks/mock_ec2.go
+++ b/pkg/cloud/mocks/mock_ec2.go
@@ -6,36 +6,37 @@ package mocks
 
 import (
 	context "context"
+	reflect "reflect"
+
 	request "github.com/aws/aws-sdk-go/aws/request"
 	ec2 "github.com/aws/aws-sdk-go/service/ec2"
 	gomock "github.com/golang/mock/gomock"
-	reflect "reflect"
 )
 
-// MockEC2 is a mock of EC2 interface
+// MockEC2 is a mock of EC2 interface.
 type MockEC2 struct {
 	ctrl     *gomock.Controller
 	recorder *MockEC2MockRecorder
 }
 
-// MockEC2MockRecorder is the mock recorder for MockEC2
+// MockEC2MockRecorder is the mock recorder for MockEC2.
 type MockEC2MockRecorder struct {
 	mock *MockEC2
 }
 
-// NewMockEC2 creates a new mock instance
+// NewMockEC2 creates a new mock instance.
 func NewMockEC2(ctrl *gomock.Controller) *MockEC2 {
 	mock := &MockEC2{ctrl: ctrl}
 	mock.recorder = &MockEC2MockRecorder{mock}
 	return mock
 }
 
-// EXPECT returns an object that allows the caller to indicate expected use
+// EXPECT returns an object that allows the caller to indicate expected use.
 func (m *MockEC2) EXPECT() *MockEC2MockRecorder {
 	return m.recorder
 }
 
-// AttachVolumeWithContext mocks base method
+// AttachVolumeWithContext mocks base method.
 func (m *MockEC2) AttachVolumeWithContext(arg0 context.Context, arg1 *ec2.AttachVolumeInput, arg2 ...request.Option) (*ec2.VolumeAttachment, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -48,14 +49,14 @@ func (m *MockEC2) AttachVolumeWithContext(arg0 context.Context, arg1 *ec2.Attach
 	return ret0, ret1
 }
 
-// AttachVolumeWithContext indicates an expected call of AttachVolumeWithContext
+// AttachVolumeWithContext indicates an expected call of AttachVolumeWithContext.
 func (mr *MockEC2MockRecorder) AttachVolumeWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AttachVolumeWithContext", reflect.TypeOf((*MockEC2)(nil).AttachVolumeWithContext), varargs...)
 }
 
-// CreateSnapshotWithContext mocks base method
+// CreateSnapshotWithContext mocks base method.
 func (m *MockEC2) CreateSnapshotWithContext(arg0 context.Context, arg1 *ec2.CreateSnapshotInput, arg2 ...request.Option) (*ec2.Snapshot, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -68,14 +69,14 @@ func (m *MockEC2) CreateSnapshotWithContext(arg0 context.Context, arg1 *ec2.Crea
 	return ret0, ret1
 }
 
-// CreateSnapshotWithContext indicates an expected call of CreateSnapshotWithContext
+// CreateSnapshotWithContext indicates an expected call of CreateSnapshotWithContext.
 func (mr *MockEC2MockRecorder) CreateSnapshotWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSnapshotWithContext", reflect.TypeOf((*MockEC2)(nil).CreateSnapshotWithContext), varargs...)
 }
 
-// CreateVolumeWithContext mocks base method
+// CreateVolumeWithContext mocks base method.
 func (m *MockEC2) CreateVolumeWithContext(arg0 context.Context, arg1 *ec2.CreateVolumeInput, arg2 ...request.Option) (*ec2.Volume, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -88,14 +89,14 @@ func (m *MockEC2) CreateVolumeWithContext(arg0 context.Context, arg1 *ec2.Create
 	return ret0, ret1
 }
 
-// CreateVolumeWithContext indicates an expected call of CreateVolumeWithContext
+// CreateVolumeWithContext indicates an expected call of CreateVolumeWithContext.
 func (mr *MockEC2MockRecorder) CreateVolumeWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateVolumeWithContext", reflect.TypeOf((*MockEC2)(nil).CreateVolumeWithContext), varargs...)
 }
 
-// DeleteSnapshotWithContext mocks base method
+// DeleteSnapshotWithContext mocks base method.
 func (m *MockEC2) DeleteSnapshotWithContext(arg0 context.Context, arg1 *ec2.DeleteSnapshotInput, arg2 ...request.Option) (*ec2.DeleteSnapshotOutput, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -108,14 +109,14 @@ func (m *MockEC2) DeleteSnapshotWithContext(arg0 context.Context, arg1 *ec2.Dele
 	return ret0, ret1
 }
 
-// DeleteSnapshotWithContext indicates an expected call of DeleteSnapshotWithContext
+// DeleteSnapshotWithContext indicates an expected call of DeleteSnapshotWithContext.
 func (mr *MockEC2MockRecorder) DeleteSnapshotWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSnapshotWithContext", reflect.TypeOf((*MockEC2)(nil).DeleteSnapshotWithContext), varargs...)
 }
 
-// DeleteVolumeWithContext mocks base method
+// DeleteVolumeWithContext mocks base method.
 func (m *MockEC2) DeleteVolumeWithContext(arg0 context.Context, arg1 *ec2.DeleteVolumeInput, arg2 ...request.Option) (*ec2.DeleteVolumeOutput, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -128,14 +129,14 @@ func (m *MockEC2) DeleteVolumeWithContext(arg0 context.Context, arg1 *ec2.Delete
 	return ret0, ret1
 }
 
-// DeleteVolumeWithContext indicates an expected call of DeleteVolumeWithContext
+// DeleteVolumeWithContext indicates an expected call of DeleteVolumeWithContext.
 func (mr *MockEC2MockRecorder) DeleteVolumeWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteVolumeWithContext", reflect.TypeOf((*MockEC2)(nil).DeleteVolumeWithContext), varargs...)
 }
 
-// DescribeAvailabilityZonesWithContext mocks base method
+// DescribeAvailabilityZonesWithContext mocks base method.
 func (m *MockEC2) DescribeAvailabilityZonesWithContext(arg0 context.Context, arg1 *ec2.DescribeAvailabilityZonesInput, arg2 ...request.Option) (*ec2.DescribeAvailabilityZonesOutput, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -148,14 +149,14 @@ func (m *MockEC2) DescribeAvailabilityZonesWithContext(arg0 context.Context, arg
 	return ret0, ret1
 }
 
-// DescribeAvailabilityZonesWithContext indicates an expected call of DescribeAvailabilityZonesWithContext
+// DescribeAvailabilityZonesWithContext indicates an expected call of DescribeAvailabilityZonesWithContext.
 func (mr *MockEC2MockRecorder) DescribeAvailabilityZonesWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeAvailabilityZonesWithContext", reflect.TypeOf((*MockEC2)(nil).DescribeAvailabilityZonesWithContext), varargs...)
 }
 
-// DescribeInstancesWithContext mocks base method
+// DescribeInstancesWithContext mocks base method.
 func (m *MockEC2) DescribeInstancesWithContext(arg0 context.Context, arg1 *ec2.DescribeInstancesInput, arg2 ...request.Option) (*ec2.DescribeInstancesOutput, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -168,14 +169,14 @@ func (m *MockEC2) DescribeInstancesWithContext(arg0 context.Context, arg1 *ec2.D
 	return ret0, ret1
 }
 
-// DescribeInstancesWithContext indicates an expected call of DescribeInstancesWithContext
+// DescribeInstancesWithContext indicates an expected call of DescribeInstancesWithContext.
 func (mr *MockEC2MockRecorder) DescribeInstancesWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeInstancesWithContext", reflect.TypeOf((*MockEC2)(nil).DescribeInstancesWithContext), varargs...)
 }
 
-// DescribeSnapshotsWithContext mocks base method
+// DescribeSnapshotsWithContext mocks base method.
 func (m *MockEC2) DescribeSnapshotsWithContext(arg0 context.Context, arg1 *ec2.DescribeSnapshotsInput, arg2 ...request.Option) (*ec2.DescribeSnapshotsOutput, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -188,14 +189,14 @@ func (m *MockEC2) DescribeSnapshotsWithContext(arg0 context.Context, arg1 *ec2.D
 	return ret0, ret1
 }
 
-// DescribeSnapshotsWithContext indicates an expected call of DescribeSnapshotsWithContext
+// DescribeSnapshotsWithContext indicates an expected call of DescribeSnapshotsWithContext.
 func (mr *MockEC2MockRecorder) DescribeSnapshotsWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeSnapshotsWithContext", reflect.TypeOf((*MockEC2)(nil).DescribeSnapshotsWithContext), varargs...)
 }
 
-// DescribeVolumesModificationsWithContext mocks base method
+// DescribeVolumesModificationsWithContext mocks base method.
 func (m *MockEC2) DescribeVolumesModificationsWithContext(arg0 context.Context, arg1 *ec2.DescribeVolumesModificationsInput, arg2 ...request.Option) (*ec2.DescribeVolumesModificationsOutput, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -208,14 +209,14 @@ func (m *MockEC2) DescribeVolumesModificationsWithContext(arg0 context.Context,
 	return ret0, ret1
 }
 
-// DescribeVolumesModificationsWithContext indicates an expected call of DescribeVolumesModificationsWithContext
+// DescribeVolumesModificationsWithContext indicates an expected call of DescribeVolumesModificationsWithContext.
 func (mr *MockEC2MockRecorder) DescribeVolumesModificationsWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeVolumesModificationsWithContext", reflect.TypeOf((*MockEC2)(nil).DescribeVolumesModificationsWithContext), varargs...)
 }
 
-// DescribeVolumesWithContext mocks base method
+// DescribeVolumesWithContext mocks base method.
 func (m *MockEC2) DescribeVolumesWithContext(arg0 context.Context, arg1 *ec2.DescribeVolumesInput, arg2 ...request.Option) (*ec2.DescribeVolumesOutput, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -228,14 +229,14 @@ func (m *MockEC2) DescribeVolumesWithContext(arg0 context.Context, arg1 *ec2.Des
 	return ret0, ret1
 }
 
-// DescribeVolumesWithContext indicates an expected call of DescribeVolumesWithContext
+// DescribeVolumesWithContext indicates an expected call of DescribeVolumesWithContext.
 func (mr *MockEC2MockRecorder) DescribeVolumesWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeVolumesWithContext", reflect.TypeOf((*MockEC2)(nil).DescribeVolumesWithContext), varargs...)
 }
 
-// DetachVolumeWithContext mocks base method
+// DetachVolumeWithContext mocks base method.
 func (m *MockEC2) DetachVolumeWithContext(arg0 context.Context, arg1 *ec2.DetachVolumeInput, arg2 ...request.Option) (*ec2.VolumeAttachment, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -248,14 +249,14 @@ func (m *MockEC2) DetachVolumeWithContext(arg0 context.Context, arg1 *ec2.Detach
 	return ret0, ret1
 }
 
-// DetachVolumeWithContext indicates an expected call of DetachVolumeWithContext
+// DetachVolumeWithContext indicates an expected call of DetachVolumeWithContext.
 func (mr *MockEC2MockRecorder) DetachVolumeWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DetachVolumeWithContext", reflect.TypeOf((*MockEC2)(nil).DetachVolumeWithContext), varargs...)
 }
 
-// ModifyVolumeWithContext mocks base method
+// ModifyVolumeWithContext mocks base method.
 func (m *MockEC2) ModifyVolumeWithContext(arg0 context.Context, arg1 *ec2.ModifyVolumeInput, arg2 ...request.Option) (*ec2.ModifyVolumeOutput, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -268,7 +269,7 @@ func (m *MockEC2) ModifyVolumeWithContext(arg0 context.Context, arg1 *ec2.Modify
 	return ret0, ret1
 }
 
-// ModifyVolumeWithContext indicates an expected call of ModifyVolumeWithContext
+// ModifyVolumeWithContext indicates an expected call of ModifyVolumeWithContext.
 func (mr *MockEC2MockRecorder) ModifyVolumeWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
diff --git a/pkg/cloud/mocks/mock_ec2metadata.go b/pkg/cloud/mocks/mock_ec2metadata.go
index 2719846d86..42afe920f8 100644
--- a/pkg/cloud/mocks/mock_ec2metadata.go
+++ b/pkg/cloud/mocks/mock_ec2metadata.go
@@ -5,35 +5,36 @@
 package mocks
 
 import (
+	reflect "reflect"
+
 	ec2metadata "github.com/aws/aws-sdk-go/aws/ec2metadata"
 	gomock "github.com/golang/mock/gomock"
-	reflect "reflect"
 )
 
-// MockEC2Metadata is a mock of EC2Metadata interface
+// MockEC2Metadata is a mock of EC2Metadata interface.
 type MockEC2Metadata struct {
 	ctrl     *gomock.Controller
 	recorder *MockEC2MetadataMockRecorder
 }
 
-// MockEC2MetadataMockRecorder is the mock recorder for MockEC2Metadata
+// MockEC2MetadataMockRecorder is the mock recorder for MockEC2Metadata.
 type MockEC2MetadataMockRecorder struct {
 	mock *MockEC2Metadata
 }
 
-// NewMockEC2Metadata creates a new mock instance
+// NewMockEC2Metadata creates a new mock instance.
 func NewMockEC2Metadata(ctrl *gomock.Controller) *MockEC2Metadata {
 	mock := &MockEC2Metadata{ctrl: ctrl}
 	mock.recorder = &MockEC2MetadataMockRecorder{mock}
 	return mock
 }
 
-// EXPECT returns an object that allows the caller to indicate expected use
+// EXPECT returns an object that allows the caller to indicate expected use.
 func (m *MockEC2Metadata) EXPECT() *MockEC2MetadataMockRecorder {
 	return m.recorder
 }
 
-// Available mocks base method
+// Available mocks base method.
 func (m *MockEC2Metadata) Available() bool {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Available")
@@ -41,13 +42,13 @@ func (m *MockEC2Metadata) Available() bool {
 	return ret0
 }
 
-// Available indicates an expected call of Available
+// Available indicates an expected call of Available.
 func (mr *MockEC2MetadataMockRecorder) Available() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Available", reflect.TypeOf((*MockEC2Metadata)(nil).Available))
 }
 
-// GetInstanceIdentityDocument mocks base method
+// GetInstanceIdentityDocument mocks base method.
 func (m *MockEC2Metadata) GetInstanceIdentityDocument() (ec2metadata.EC2InstanceIdentityDocument, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetInstanceIdentityDocument")
@@ -56,13 +57,13 @@ func (m *MockEC2Metadata) GetInstanceIdentityDocument() (ec2metadata.EC2Instance
 	return ret0, ret1
 }
 
-// GetInstanceIdentityDocument indicates an expected call of GetInstanceIdentityDocument
+// GetInstanceIdentityDocument indicates an expected call of GetInstanceIdentityDocument.
 func (mr *MockEC2MetadataMockRecorder) GetInstanceIdentityDocument() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInstanceIdentityDocument", reflect.TypeOf((*MockEC2Metadata)(nil).GetInstanceIdentityDocument))
 }
 
-// GetMetadata mocks base method
+// GetMetadata mocks base method.
 func (m *MockEC2Metadata) GetMetadata(arg0 string) (string, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetMetadata", arg0)
@@ -71,7 +72,7 @@ func (m *MockEC2Metadata) GetMetadata(arg0 string) (string, error) {
 	return ret0, ret1
 }
 
-// GetMetadata indicates an expected call of GetMetadata
+// GetMetadata indicates an expected call of GetMetadata.
 func (mr *MockEC2MetadataMockRecorder) GetMetadata(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMetadata", reflect.TypeOf((*MockEC2Metadata)(nil).GetMetadata), arg0)
diff --git a/pkg/driver/mocks/mock_cloud.go b/pkg/driver/mocks/mock_cloud.go
index e2447acbb1..ea0016d5f4 100644
--- a/pkg/driver/mocks/mock_cloud.go
+++ b/pkg/driver/mocks/mock_cloud.go
@@ -6,35 +6,36 @@ package mocks
 
 import (
 	context "context"
+	reflect "reflect"
+
 	gomock "github.com/golang/mock/gomock"
 	cloud "github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/cloud"
-	reflect "reflect"
 )
 
-// MockCloud is a mock of Cloud interface
+// MockCloud is a mock of Cloud interface.
 type MockCloud struct {
 	ctrl     *gomock.Controller
 	recorder *MockCloudMockRecorder
 }
 
-// MockCloudMockRecorder is the mock recorder for MockCloud
+// MockCloudMockRecorder is the mock recorder for MockCloud.
 type MockCloudMockRecorder struct {
 	mock *MockCloud
 }
 
-// NewMockCloud creates a new mock instance
+// NewMockCloud creates a new mock instance.
 func NewMockCloud(ctrl *gomock.Controller) *MockCloud {
 	mock := &MockCloud{ctrl: ctrl}
 	mock.recorder = &MockCloudMockRecorder{mock}
 	return mock
 }
 
-// EXPECT returns an object that allows the caller to indicate expected use
+// EXPECT returns an object that allows the caller to indicate expected use.
 func (m *MockCloud) EXPECT() *MockCloudMockRecorder {
 	return m.recorder
 }
 
-// AttachDisk mocks base method
+// AttachDisk mocks base method.
 func (m *MockCloud) AttachDisk(arg0 context.Context, arg1, arg2 string) (string, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "AttachDisk", arg0, arg1, arg2)
@@ -43,13 +44,13 @@ func (m *MockCloud) AttachDisk(arg0 context.Context, arg1, arg2 string) (string,
 	return ret0, ret1
 }
 
-// AttachDisk indicates an expected call of AttachDisk
+// AttachDisk indicates an expected call of AttachDisk.
 func (mr *MockCloudMockRecorder) AttachDisk(arg0, arg1, arg2 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AttachDisk", reflect.TypeOf((*MockCloud)(nil).AttachDisk), arg0, arg1, arg2)
 }
 
-// CreateDisk mocks base method
+// CreateDisk mocks base method.
 func (m *MockCloud) CreateDisk(arg0 context.Context, arg1 string, arg2 *cloud.DiskOptions) (*cloud.Disk, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateDisk", arg0, arg1, arg2)
@@ -58,13 +59,13 @@ func (m *MockCloud) CreateDisk(arg0 context.Context, arg1 string, arg2 *cloud.Di
 	return ret0, ret1
 }
 
-// CreateDisk indicates an expected call of CreateDisk
+// CreateDisk indicates an expected call of CreateDisk.
 func (mr *MockCloudMockRecorder) CreateDisk(arg0, arg1, arg2 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateDisk", reflect.TypeOf((*MockCloud)(nil).CreateDisk), arg0, arg1, arg2)
 }
 
-// CreateSnapshot mocks base method
+// CreateSnapshot mocks base method.
 func (m *MockCloud) CreateSnapshot(arg0 context.Context, arg1 string, arg2 *cloud.SnapshotOptions) (*cloud.Snapshot, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateSnapshot", arg0, arg1, arg2)
@@ -73,13 +74,13 @@ func (m *MockCloud) CreateSnapshot(arg0 context.Context, arg1 string, arg2 *clou
 	return ret0, ret1
 }
 
-// CreateSnapshot indicates an expected call of CreateSnapshot
+// CreateSnapshot indicates an expected call of CreateSnapshot.
 func (mr *MockCloudMockRecorder) CreateSnapshot(arg0, arg1, arg2 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSnapshot", reflect.TypeOf((*MockCloud)(nil).CreateSnapshot), arg0, arg1, arg2)
 }
 
-// DeleteDisk mocks base method
+// DeleteDisk mocks base method.
 func (m *MockCloud) DeleteDisk(arg0 context.Context, arg1 string) (bool, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "DeleteDisk", arg0, arg1)
@@ -88,13 +89,13 @@ func (m *MockCloud) DeleteDisk(arg0 context.Context, arg1 string) (bool, error)
 	return ret0, ret1
 }
 
-// DeleteDisk indicates an expected call of DeleteDisk
+// DeleteDisk indicates an expected call of DeleteDisk.
 func (mr *MockCloudMockRecorder) DeleteDisk(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteDisk", reflect.TypeOf((*MockCloud)(nil).DeleteDisk), arg0, arg1)
 }
 
-// DeleteSnapshot mocks base method
+// DeleteSnapshot mocks base method.
 func (m *MockCloud) DeleteSnapshot(arg0 context.Context, arg1 string) (bool, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "DeleteSnapshot", arg0, arg1)
@@ -103,13 +104,13 @@ func (m *MockCloud) DeleteSnapshot(arg0 context.Context, arg1 string) (bool, err
 	return ret0, ret1
 }
 
-// DeleteSnapshot indicates an expected call of DeleteSnapshot
+// DeleteSnapshot indicates an expected call of DeleteSnapshot.
 func (mr *MockCloudMockRecorder) DeleteSnapshot(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSnapshot", reflect.TypeOf((*MockCloud)(nil).DeleteSnapshot), arg0, arg1)
 }
 
-// DetachDisk mocks base method
+// DetachDisk mocks base method.
 func (m *MockCloud) DetachDisk(arg0 context.Context, arg1, arg2 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "DetachDisk", arg0, arg1, arg2)
@@ -117,13 +118,13 @@ func (m *MockCloud) DetachDisk(arg0 context.Context, arg1, arg2 string) error {
 	return ret0
 }
 
-// DetachDisk indicates an expected call of DetachDisk
+// DetachDisk indicates an expected call of DetachDisk.
 func (mr *MockCloudMockRecorder) DetachDisk(arg0, arg1, arg2 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DetachDisk", reflect.TypeOf((*MockCloud)(nil).DetachDisk), arg0, arg1, arg2)
 }
 
-// GetDiskByID mocks base method
+// GetDiskByID mocks base method.
 func (m *MockCloud) GetDiskByID(arg0 context.Context, arg1 string) (*cloud.Disk, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetDiskByID", arg0, arg1)
@@ -132,13 +133,13 @@ func (m *MockCloud) GetDiskByID(arg0 context.Context, arg1 string) (*cloud.Disk,
 	return ret0, ret1
 }
 
-// GetDiskByID indicates an expected call of GetDiskByID
+// GetDiskByID indicates an expected call of GetDiskByID.
 func (mr *MockCloudMockRecorder) GetDiskByID(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDiskByID", reflect.TypeOf((*MockCloud)(nil).GetDiskByID), arg0, arg1)
 }
 
-// GetDiskByName mocks base method
+// GetDiskByName mocks base method.
 func (m *MockCloud) GetDiskByName(arg0 context.Context, arg1 string, arg2 int64) (*cloud.Disk, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetDiskByName", arg0, arg1, arg2)
@@ -147,13 +148,13 @@ func (m *MockCloud) GetDiskByName(arg0 context.Context, arg1 string, arg2 int64)
 	return ret0, ret1
 }
 
-// GetDiskByName indicates an expected call of GetDiskByName
+// GetDiskByName indicates an expected call of GetDiskByName.
 func (mr *MockCloudMockRecorder) GetDiskByName(arg0, arg1, arg2 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDiskByName", reflect.TypeOf((*MockCloud)(nil).GetDiskByName), arg0, arg1, arg2)
 }
 
-// GetSnapshotByID mocks base method
+// GetSnapshotByID mocks base method.
 func (m *MockCloud) GetSnapshotByID(arg0 context.Context, arg1 string) (*cloud.Snapshot, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetSnapshotByID", arg0, arg1)
@@ -162,13 +163,13 @@ func (m *MockCloud) GetSnapshotByID(arg0 context.Context, arg1 string) (*cloud.S
 	return ret0, ret1
 }
 
-// GetSnapshotByID indicates an expected call of GetSnapshotByID
+// GetSnapshotByID indicates an expected call of GetSnapshotByID.
 func (mr *MockCloudMockRecorder) GetSnapshotByID(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSnapshotByID", reflect.TypeOf((*MockCloud)(nil).GetSnapshotByID), arg0, arg1)
 }
 
-// GetSnapshotByName mocks base method
+// GetSnapshotByName mocks base method.
 func (m *MockCloud) GetSnapshotByName(arg0 context.Context, arg1 string) (*cloud.Snapshot, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetSnapshotByName", arg0, arg1)
@@ -177,13 +178,13 @@ func (m *MockCloud) GetSnapshotByName(arg0 context.Context, arg1 string) (*cloud
 	return ret0, ret1
 }
 
-// GetSnapshotByName indicates an expected call of GetSnapshotByName
+// GetSnapshotByName indicates an expected call of GetSnapshotByName.
 func (mr *MockCloudMockRecorder) GetSnapshotByName(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSnapshotByName", reflect.TypeOf((*MockCloud)(nil).GetSnapshotByName), arg0, arg1)
 }
 
-// IsExistInstance mocks base method
+// IsExistInstance mocks base method.
 func (m *MockCloud) IsExistInstance(arg0 context.Context, arg1 string) bool {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "IsExistInstance", arg0, arg1)
@@ -191,13 +192,13 @@ func (m *MockCloud) IsExistInstance(arg0 context.Context, arg1 string) bool {
 	return ret0
 }
 
-// IsExistInstance indicates an expected call of IsExistInstance
+// IsExistInstance indicates an expected call of IsExistInstance.
 func (mr *MockCloudMockRecorder) IsExistInstance(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsExistInstance", reflect.TypeOf((*MockCloud)(nil).IsExistInstance), arg0, arg1)
 }
 
-// ListSnapshots mocks base method
+// ListSnapshots mocks base method.
 func (m *MockCloud) ListSnapshots(arg0 context.Context, arg1 string, arg2 int64, arg3 string) (*cloud.ListSnapshotsResponse, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ListSnapshots", arg0, arg1, arg2, arg3)
@@ -206,13 +207,13 @@ func (m *MockCloud) ListSnapshots(arg0 context.Context, arg1 string, arg2 int64,
 	return ret0, ret1
 }
 
-// ListSnapshots indicates an expected call of ListSnapshots
+// ListSnapshots indicates an expected call of ListSnapshots.
 func (mr *MockCloudMockRecorder) ListSnapshots(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListSnapshots", reflect.TypeOf((*MockCloud)(nil).ListSnapshots), arg0, arg1, arg2, arg3)
 }
 
-// ResizeDisk mocks base method
+// ResizeDisk mocks base method.
 func (m *MockCloud) ResizeDisk(arg0 context.Context, arg1 string, arg2 int64) (int64, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ResizeDisk", arg0, arg1, arg2)
@@ -221,13 +222,13 @@ func (m *MockCloud) ResizeDisk(arg0 context.Context, arg1 string, arg2 int64) (i
 	return ret0, ret1
 }
 
-// ResizeDisk indicates an expected call of ResizeDisk
+// ResizeDisk indicates an expected call of ResizeDisk.
 func (mr *MockCloudMockRecorder) ResizeDisk(arg0, arg1, arg2 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResizeDisk", reflect.TypeOf((*MockCloud)(nil).ResizeDisk), arg0, arg1, arg2)
 }
 
-// WaitForAttachmentState mocks base method
+// WaitForAttachmentState mocks base method.
 func (m *MockCloud) WaitForAttachmentState(arg0 context.Context, arg1, arg2 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "WaitForAttachmentState", arg0, arg1, arg2)
@@ -235,7 +236,7 @@ func (m *MockCloud) WaitForAttachmentState(arg0 context.Context, arg1, arg2 stri
 	return ret0
 }
 
-// WaitForAttachmentState indicates an expected call of WaitForAttachmentState
+// WaitForAttachmentState indicates an expected call of WaitForAttachmentState.
 func (mr *MockCloudMockRecorder) WaitForAttachmentState(arg0, arg1, arg2 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WaitForAttachmentState", reflect.TypeOf((*MockCloud)(nil).WaitForAttachmentState), arg0, arg1, arg2)
diff --git a/pkg/driver/mocks/mock_metadata_service.go b/pkg/driver/mocks/mock_metadata_service.go
index ee2f67173a..791487b1da 100644
--- a/pkg/driver/mocks/mock_metadata_service.go
+++ b/pkg/driver/mocks/mock_metadata_service.go
@@ -5,35 +5,36 @@
 package mocks
 
 import (
+	reflect "reflect"
+
 	arn "github.com/aws/aws-sdk-go/aws/arn"
 	gomock "github.com/golang/mock/gomock"
-	reflect "reflect"
 )
 
-// MockMetadataService is a mock of MetadataService interface
+// MockMetadataService is a mock of MetadataService interface.
 type MockMetadataService struct {
 	ctrl     *gomock.Controller
 	recorder *MockMetadataServiceMockRecorder
 }
 
-// MockMetadataServiceMockRecorder is the mock recorder for MockMetadataService
+// MockMetadataServiceMockRecorder is the mock recorder for MockMetadataService.
 type MockMetadataServiceMockRecorder struct {
 	mock *MockMetadataService
 }
 
-// NewMockMetadataService creates a new mock instance
+// NewMockMetadataService creates a new mock instance.
 func NewMockMetadataService(ctrl *gomock.Controller) *MockMetadataService {
 	mock := &MockMetadataService{ctrl: ctrl}
 	mock.recorder = &MockMetadataServiceMockRecorder{mock}
 	return mock
 }
 
-// EXPECT returns an object that allows the caller to indicate expected use
+// EXPECT returns an object that allows the caller to indicate expected use.
 func (m *MockMetadataService) EXPECT() *MockMetadataServiceMockRecorder {
 	return m.recorder
 }
 
-// GetAvailabilityZone mocks base method
+// GetAvailabilityZone mocks base method.
 func (m *MockMetadataService) GetAvailabilityZone() string {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetAvailabilityZone")
@@ -41,13 +42,13 @@ func (m *MockMetadataService) GetAvailabilityZone() string {
 	return ret0
 }
 
-// GetAvailabilityZone indicates an expected call of GetAvailabilityZone
+// GetAvailabilityZone indicates an expected call of GetAvailabilityZone.
 func (mr *MockMetadataServiceMockRecorder) GetAvailabilityZone() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAvailabilityZone", reflect.TypeOf((*MockMetadataService)(nil).GetAvailabilityZone))
 }
 
-// GetInstanceID mocks base method
+// GetInstanceID mocks base method.
 func (m *MockMetadataService) GetInstanceID() string {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetInstanceID")
@@ -55,13 +56,13 @@ func (m *MockMetadataService) GetInstanceID() string {
 	return ret0
 }
 
-// GetInstanceID indicates an expected call of GetInstanceID
+// GetInstanceID indicates an expected call of GetInstanceID.
 func (mr *MockMetadataServiceMockRecorder) GetInstanceID() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInstanceID", reflect.TypeOf((*MockMetadataService)(nil).GetInstanceID))
 }
 
-// GetInstanceType mocks base method
+// GetInstanceType mocks base method.
 func (m *MockMetadataService) GetInstanceType() string {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetInstanceType")
@@ -69,13 +70,13 @@ func (m *MockMetadataService) GetInstanceType() string {
 	return ret0
 }
 
-// GetInstanceType indicates an expected call of GetInstanceType
+// GetInstanceType indicates an expected call of GetInstanceType.
 func (mr *MockMetadataServiceMockRecorder) GetInstanceType() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInstanceType", reflect.TypeOf((*MockMetadataService)(nil).GetInstanceType))
 }
 
-// GetOutpostArn mocks base method
+// GetOutpostArn mocks base method.
 func (m *MockMetadataService) GetOutpostArn() arn.ARN {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetOutpostArn")
@@ -83,13 +84,13 @@ func (m *MockMetadataService) GetOutpostArn() arn.ARN {
 	return ret0
 }
 
-// GetOutpostArn indicates an expected call of GetOutpostArn
+// GetOutpostArn indicates an expected call of GetOutpostArn.
 func (mr *MockMetadataServiceMockRecorder) GetOutpostArn() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOutpostArn", reflect.TypeOf((*MockMetadataService)(nil).GetOutpostArn))
 }
 
-// GetRegion mocks base method
+// GetRegion mocks base method.
 func (m *MockMetadataService) GetRegion() string {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetRegion")
@@ -97,7 +98,7 @@ func (m *MockMetadataService) GetRegion() string {
 	return ret0
 }
 
-// GetRegion indicates an expected call of GetRegion
+// GetRegion indicates an expected call of GetRegion.
 func (mr *MockMetadataServiceMockRecorder) GetRegion() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRegion", reflect.TypeOf((*MockMetadataService)(nil).GetRegion))
diff --git a/pkg/driver/mocks/mock_mounter.go b/pkg/driver/mocks/mock_mounter.go
index 1a8fd12608..e69b6e90c7 100644
--- a/pkg/driver/mocks/mock_mounter.go
+++ b/pkg/driver/mocks/mock_mounter.go
@@ -6,36 +6,37 @@ package mocks
 
 import (
 	context "context"
+	reflect "reflect"
+
 	gomock "github.com/golang/mock/gomock"
+	mount "k8s.io/mount-utils"
 	exec "k8s.io/utils/exec"
-	mount "k8s.io/utils/mount"
-	reflect "reflect"
 )
 
-// MockMounter is a mock of Mounter interface
+// MockMounter is a mock of Mounter interface.
 type MockMounter struct {
 	ctrl     *gomock.Controller
 	recorder *MockMounterMockRecorder
 }
 
-// MockMounterMockRecorder is the mock recorder for MockMounter
+// MockMounterMockRecorder is the mock recorder for MockMounter.
 type MockMounterMockRecorder struct {
 	mock *MockMounter
 }
 
-// NewMockMounter creates a new mock instance
+// NewMockMounter creates a new mock instance.
 func NewMockMounter(ctrl *gomock.Controller) *MockMounter {
 	mock := &MockMounter{ctrl: ctrl}
 	mock.recorder = &MockMounterMockRecorder{mock}
 	return mock
 }
 
-// EXPECT returns an object that allows the caller to indicate expected use
+// EXPECT returns an object that allows the caller to indicate expected use.
 func (m *MockMounter) EXPECT() *MockMounterMockRecorder {
 	return m.recorder
 }
 
-// Command mocks base method
+// Command mocks base method.
 func (m *MockMounter) Command(arg0 string, arg1 ...string) exec.Cmd {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0}
@@ -47,14 +48,14 @@ func (m *MockMounter) Command(arg0 string, arg1 ...string) exec.Cmd {
 	return ret0
 }
 
-// Command indicates an expected call of Command
+// Command indicates an expected call of Command.
 func (mr *MockMounterMockRecorder) Command(arg0 interface{}, arg1 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0}, arg1...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Command", reflect.TypeOf((*MockMounter)(nil).Command), varargs...)
 }
 
-// CommandContext mocks base method
+// CommandContext mocks base method.
 func (m *MockMounter) CommandContext(arg0 context.Context, arg1 string, arg2 ...string) exec.Cmd {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -66,29 +67,14 @@ func (m *MockMounter) CommandContext(arg0 context.Context, arg1 string, arg2 ...
 	return ret0
 }
 
-// CommandContext indicates an expected call of CommandContext
+// CommandContext indicates an expected call of CommandContext.
 func (mr *MockMounterMockRecorder) CommandContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CommandContext", reflect.TypeOf((*MockMounter)(nil).CommandContext), varargs...)
 }
 
-// ExistsPath mocks base method
-func (m *MockMounter) ExistsPath(arg0 string) (bool, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ExistsPath", arg0)
-	ret0, _ := ret[0].(bool)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ExistsPath indicates an expected call of ExistsPath
-func (mr *MockMounterMockRecorder) ExistsPath(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExistsPath", reflect.TypeOf((*MockMounter)(nil).ExistsPath), arg0)
-}
-
-// FormatAndMount mocks base method
+// FormatAndMount mocks base method.
 func (m *MockMounter) FormatAndMount(arg0, arg1, arg2 string, arg3 []string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "FormatAndMount", arg0, arg1, arg2, arg3)
@@ -96,29 +82,29 @@ func (m *MockMounter) FormatAndMount(arg0, arg1, arg2 string, arg3 []string) err
 	return ret0
 }
 
-// FormatAndMount indicates an expected call of FormatAndMount
+// FormatAndMount indicates an expected call of FormatAndMount.
 func (mr *MockMounterMockRecorder) FormatAndMount(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FormatAndMount", reflect.TypeOf((*MockMounter)(nil).FormatAndMount), arg0, arg1, arg2, arg3)
 }
 
-// GetDeviceName mocks base method
-func (m *MockMounter) GetDeviceName(arg0 string) (string, int, error) {
+// GetDeviceNameFromMount mocks base method.
+func (m *MockMounter) GetDeviceNameFromMount(arg0 string) (string, int, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetDeviceName", arg0)
+	ret := m.ctrl.Call(m, "GetDeviceNameFromMount", arg0)
 	ret0, _ := ret[0].(string)
 	ret1, _ := ret[1].(int)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
 }
 
-// GetDeviceName indicates an expected call of GetDeviceName
-func (mr *MockMounterMockRecorder) GetDeviceName(arg0 interface{}) *gomock.Call {
+// GetDeviceNameFromMount indicates an expected call of GetDeviceNameFromMount.
+func (mr *MockMounterMockRecorder) GetDeviceNameFromMount(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDeviceName", reflect.TypeOf((*MockMounter)(nil).GetDeviceName), arg0)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDeviceNameFromMount", reflect.TypeOf((*MockMounter)(nil).GetDeviceNameFromMount), arg0)
 }
 
-// GetMountRefs mocks base method
+// GetMountRefs mocks base method.
 func (m *MockMounter) GetMountRefs(arg0 string) ([]string, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetMountRefs", arg0)
@@ -127,13 +113,13 @@ func (m *MockMounter) GetMountRefs(arg0 string) ([]string, error) {
 	return ret0, ret1
 }
 
-// GetMountRefs indicates an expected call of GetMountRefs
+// GetMountRefs indicates an expected call of GetMountRefs.
 func (mr *MockMounterMockRecorder) GetMountRefs(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMountRefs", reflect.TypeOf((*MockMounter)(nil).GetMountRefs), arg0)
 }
 
-// IsLikelyNotMountPoint mocks base method
+// IsLikelyNotMountPoint mocks base method.
 func (m *MockMounter) IsLikelyNotMountPoint(arg0 string) (bool, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "IsLikelyNotMountPoint", arg0)
@@ -142,13 +128,13 @@ func (m *MockMounter) IsLikelyNotMountPoint(arg0 string) (bool, error) {
 	return ret0, ret1
 }
 
-// IsLikelyNotMountPoint indicates an expected call of IsLikelyNotMountPoint
+// IsLikelyNotMountPoint indicates an expected call of IsLikelyNotMountPoint.
 func (mr *MockMounterMockRecorder) IsLikelyNotMountPoint(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsLikelyNotMountPoint", reflect.TypeOf((*MockMounter)(nil).IsLikelyNotMountPoint), arg0)
 }
 
-// List mocks base method
+// List mocks base method.
 func (m *MockMounter) List() ([]mount.MountPoint, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "List")
@@ -157,13 +143,13 @@ func (m *MockMounter) List() ([]mount.MountPoint, error) {
 	return ret0, ret1
 }
 
-// List indicates an expected call of List
+// List indicates an expected call of List.
 func (mr *MockMounterMockRecorder) List() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockMounter)(nil).List))
 }
 
-// LookPath mocks base method
+// LookPath mocks base method.
 func (m *MockMounter) LookPath(arg0 string) (string, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "LookPath", arg0)
@@ -172,13 +158,13 @@ func (m *MockMounter) LookPath(arg0 string) (string, error) {
 	return ret0, ret1
 }
 
-// LookPath indicates an expected call of LookPath
+// LookPath indicates an expected call of LookPath.
 func (mr *MockMounterMockRecorder) LookPath(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LookPath", reflect.TypeOf((*MockMounter)(nil).LookPath), arg0)
 }
 
-// MakeDir mocks base method
+// MakeDir mocks base method.
 func (m *MockMounter) MakeDir(arg0 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "MakeDir", arg0)
@@ -186,13 +172,13 @@ func (m *MockMounter) MakeDir(arg0 string) error {
 	return ret0
 }
 
-// MakeDir indicates an expected call of MakeDir
+// MakeDir indicates an expected call of MakeDir.
 func (mr *MockMounterMockRecorder) MakeDir(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MakeDir", reflect.TypeOf((*MockMounter)(nil).MakeDir), arg0)
 }
 
-// MakeFile mocks base method
+// MakeFile mocks base method.
 func (m *MockMounter) MakeFile(arg0 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "MakeFile", arg0)
@@ -200,13 +186,13 @@ func (m *MockMounter) MakeFile(arg0 string) error {
 	return ret0
 }
 
-// MakeFile indicates an expected call of MakeFile
+// MakeFile indicates an expected call of MakeFile.
 func (mr *MockMounterMockRecorder) MakeFile(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MakeFile", reflect.TypeOf((*MockMounter)(nil).MakeFile), arg0)
 }
 
-// Mount mocks base method
+// Mount mocks base method.
 func (m *MockMounter) Mount(arg0, arg1, arg2 string, arg3 []string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Mount", arg0, arg1, arg2, arg3)
@@ -214,13 +200,56 @@ func (m *MockMounter) Mount(arg0, arg1, arg2 string, arg3 []string) error {
 	return ret0
 }
 
-// Mount indicates an expected call of Mount
+// Mount indicates an expected call of Mount.
 func (mr *MockMounterMockRecorder) Mount(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Mount", reflect.TypeOf((*MockMounter)(nil).Mount), arg0, arg1, arg2, arg3)
 }
 
-// Unmount mocks base method
+// MountSensitive mocks base method.
+func (m *MockMounter) MountSensitive(arg0, arg1, arg2 string, arg3, arg4 []string) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "MountSensitive", arg0, arg1, arg2, arg3, arg4)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// MountSensitive indicates an expected call of MountSensitive.
+func (mr *MockMounterMockRecorder) MountSensitive(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MountSensitive", reflect.TypeOf((*MockMounter)(nil).MountSensitive), arg0, arg1, arg2, arg3, arg4)
+}
+
+// MountSensitiveWithoutSystemd mocks base method.
+func (m *MockMounter) MountSensitiveWithoutSystemd(arg0, arg1, arg2 string, arg3, arg4 []string) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "MountSensitiveWithoutSystemd", arg0, arg1, arg2, arg3, arg4)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// MountSensitiveWithoutSystemd indicates an expected call of MountSensitiveWithoutSystemd.
+func (mr *MockMounterMockRecorder) MountSensitiveWithoutSystemd(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MountSensitiveWithoutSystemd", reflect.TypeOf((*MockMounter)(nil).MountSensitiveWithoutSystemd), arg0, arg1, arg2, arg3, arg4)
+}
+
+// PathExists mocks base method.
+func (m *MockMounter) PathExists(arg0 string) (bool, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "PathExists", arg0)
+	ret0, _ := ret[0].(bool)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// PathExists indicates an expected call of PathExists.
+func (mr *MockMounterMockRecorder) PathExists(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PathExists", reflect.TypeOf((*MockMounter)(nil).PathExists), arg0)
+}
+
+// Unmount mocks base method.
 func (m *MockMounter) Unmount(arg0 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Unmount", arg0)
@@ -228,7 +257,7 @@ func (m *MockMounter) Unmount(arg0 string) error {
 	return ret0
 }
 
-// Unmount indicates an expected call of Unmount
+// Unmount indicates an expected call of Unmount.
 func (mr *MockMounterMockRecorder) Unmount(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Unmount", reflect.TypeOf((*MockMounter)(nil).Unmount), arg0)