Skip to content

Remove redundant alias import and replace few function names in ISCSI server #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2021
Merged

Remove redundant alias import and replace few function names in ISCSI server #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integrationtests/apigroups/server/dummy/internal/v1alpha1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"math"

pb "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1alpha1"
internal "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal"
"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal"
)

func convert_pb_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in *pb.ComputeDoubleRequest, out *internal.ComputeDoubleRequest) error {
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/disk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

v1beta3 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
v1beta3client "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/filesystem_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta2"
"github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta2"
v1beta2client "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta2"
)

Expand Down
4 changes: 2 additions & 2 deletions integrationtests/iscsi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ func TestIscsiAPIGroup(t *testing.T) {
})

t.Run("Full flow", func(t *testing.T) {
e2e_test(t)
e2eTest(t)
})

}

func e2e_test(t *testing.T) {
func e2eTest(t *testing.T) {
config, err := setupEnv("e2e")
require.NoError(t, err)

Expand Down
4 changes: 2 additions & 2 deletions internal/server/disk/internal/v1alpha1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v1alpha1
// Add manual conversion functions here to override automatic conversion functions

import (
v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1"
internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1"
"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
)

func Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error {
Expand Down
4 changes: 2 additions & 2 deletions internal/server/disk/internal/v1beta1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v1beta1
// Add manual conversion functions here to override automatic conversion functions

import (
v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these have been bubbling up since v1alpha1: https://github.com/kubernetes-csi/csi-proxy/blob/master/internal/server/disk/internal/v1alpha1/conversion.go#L6 . Can you please apply the fix in v1alpha1 as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.. Updated patch set. PTAL. Thanks @ddebroy

internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
)

func Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error {
Expand Down
4 changes: 2 additions & 2 deletions internal/server/disk/internal/v1beta2/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v1beta2
// Add manual conversion functions here to override automatic conversion functions

import (
v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2"
internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2"
"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
)

func Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error {
Expand Down
4 changes: 2 additions & 2 deletions internal/server/disk/internal/v1beta3/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v1beta3
// Add manual conversion functions here to override automatic conversion functions

import (
v1beta3 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
)

func Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error {
Expand Down
4 changes: 2 additions & 2 deletions internal/server/volume/internal/v1beta1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v1beta1
// Add manual conversion functions here to override automatic conversion functions

import (
v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
internal "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal"
"github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
"github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal"
)

func Convert_internal_VolumeStatsResponse_To_v1beta1_VolumeStatsResponse(in *internal.VolumeStatsResponse, out *v1beta1.VolumeStatsResponse) error {
Expand Down