Skip to content

Commit 9e1e33d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #136 from humblec/cnew
Replace and correct imports in integration tests
2 parents 3f512d1 + b4b2831 commit 9e1e33d

File tree

6 files changed

+65
-65
lines changed

6 files changed

+65
-65
lines changed

‎.cloudbuild.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
. release-tools/prow.sh
44

55
# Extract tag-n-hash value from GIT_TAG (form vYYYYMMDD-tag-n-hash) for REV value.
6-
REV=v$(echo $GIT_TAG | cut -f3- -d 'v')
6+
REV=v$(echo "$GIT_TAG" | cut -f3- -d 'v')
77

8-
run_with_go "${CSI_PROW_GO_VERSION_BUILD}" make build REV=${REV}
9-
cp bin/csi-proxy.exe bin/csi-proxy-${PULL_BASE_REF}.exe
8+
run_with_go "${CSI_PROW_GO_VERSION_BUILD}" make build REV="${REV}"
9+
cp bin/csi-proxy.exe bin/csi-proxy-"${PULL_BASE_REF}".exe

‎cmd/csi-proxy/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ limitations under the License.
1414
package main
1515

1616
var (
17-
version string = "Unknown"
17+
version = "Unknown"
1818
)

‎integrationtests/apigroups/server/dummy/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66

77
"github.com/kubernetes-csi/csi-proxy/client/apiversion"
8-
internal "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal"
8+
"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal"
99
)
1010

1111
// Server is the internal server for the dummy API group.

‎integrationtests/iscsi_test.go

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import (
55
"fmt"
66
"testing"
77

8-
disk_api "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1"
9-
iscsi_api "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha2"
10-
system_api "github.com/kubernetes-csi/csi-proxy/client/api/system/v1alpha1"
11-
disk_client "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1"
12-
iscsi_client "github.com/kubernetes-csi/csi-proxy/client/groups/iscsi/v1alpha2"
13-
system_client "github.com/kubernetes-csi/csi-proxy/client/groups/system/v1alpha1"
8+
diskApi "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1"
9+
iscsiApi "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha2"
10+
systemApi "github.com/kubernetes-csi/csi-proxy/client/api/system/v1alpha1"
11+
diskClient "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1"
12+
iscsiClient "github.com/kubernetes-csi/csi-proxy/client/groups/iscsi/v1alpha2"
13+
systemClient "github.com/kubernetes-csi/csi-proxy/client/groups/system/v1alpha1"
1414
"github.com/stretchr/testify/assert"
1515
"github.com/stretchr/testify/require"
1616
)
@@ -56,62 +56,62 @@ func e2e_test(t *testing.T) {
5656

5757
defer requireCleanup(t)
5858

59-
iscsi, err := iscsi_client.NewClient()
59+
iscsi, err := iscsiClient.NewClient()
6060
require.Nil(t, err)
6161

6262
defer func() { assert.NoError(t, iscsi.Close()) }()
6363

64-
disk, err := disk_client.NewClient()
64+
disk, err := diskClient.NewClient()
6565
require.Nil(t, err)
6666

6767
defer func() { assert.NoError(t, disk.Close()) }()
6868

69-
system, err := system_client.NewClient()
69+
system, err := systemClient.NewClient()
7070
require.Nil(t, err)
7171

7272
defer func() { assert.NoError(t, system.Close()) }()
7373

74-
startReq := &system_api.StartServiceRequest{Name: "MSiSCSI"}
74+
startReq := &systemApi.StartServiceRequest{Name: "MSiSCSI"}
7575
_, err = system.StartService(context.TODO(), startReq)
7676
require.NoError(t, err)
7777

78-
tp := &iscsi_api.TargetPortal{
78+
tp := &iscsiApi.TargetPortal{
7979
TargetAddress: config.Ip,
8080
TargetPort: defaultIscsiPort,
8181
}
8282

83-
addTpReq := &iscsi_api.AddTargetPortalRequest{
83+
addTpReq := &iscsiApi.AddTargetPortalRequest{
8484
TargetPortal: tp,
8585
}
8686
_, err = iscsi.AddTargetPortal(context.Background(), addTpReq)
8787
assert.Nil(t, err)
8888

89-
discReq := &iscsi_api.DiscoverTargetPortalRequest{TargetPortal: tp}
89+
discReq := &iscsiApi.DiscoverTargetPortalRequest{TargetPortal: tp}
9090
discResp, err := iscsi.DiscoverTargetPortal(context.TODO(), discReq)
9191
if assert.Nil(t, err) {
9292
assert.Contains(t, discResp.Iqns, config.Iqn)
9393
}
9494

95-
connectReq := &iscsi_api.ConnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
95+
connectReq := &iscsiApi.ConnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
9696
_, err = iscsi.ConnectTarget(context.TODO(), connectReq)
9797
assert.Nil(t, err)
9898

99-
tgtDisksReq := &iscsi_api.GetTargetDisksRequest{TargetPortal: tp, Iqn: config.Iqn}
99+
tgtDisksReq := &iscsiApi.GetTargetDisksRequest{TargetPortal: tp, Iqn: config.Iqn}
100100
tgtDisksResp, err := iscsi.GetTargetDisks(context.TODO(), tgtDisksReq)
101101
require.Nil(t, err)
102102
require.Len(t, tgtDisksResp.DiskIDs, 1)
103103

104104
diskId := tgtDisksResp.DiskIDs[0]
105105

106-
attachReq := &disk_api.SetAttachStateRequest{DiskID: diskId, IsOnline: true}
106+
attachReq := &diskApi.SetAttachStateRequest{DiskID: diskId, IsOnline: true}
107107
_, err = disk.SetAttachState(context.TODO(), attachReq)
108108
require.Nil(t, err)
109109

110-
partReq := &disk_api.PartitionDiskRequest{DiskID: diskId}
110+
partReq := &diskApi.PartitionDiskRequest{DiskID: diskId}
111111
_, err = disk.PartitionDisk(context.TODO(), partReq)
112112
assert.Nil(t, err)
113113

114-
detachReq := &disk_api.SetAttachStateRequest{DiskID: diskId, IsOnline: false}
114+
detachReq := &diskApi.SetAttachStateRequest{DiskID: diskId, IsOnline: false}
115115
_, err = disk.SetAttachState(context.TODO(), detachReq)
116116
assert.Nil(t, err)
117117
}
@@ -122,42 +122,42 @@ func targetTest(t *testing.T) {
122122

123123
defer requireCleanup(t)
124124

125-
client, err := iscsi_client.NewClient()
125+
client, err := iscsiClient.NewClient()
126126
require.Nil(t, err)
127127

128128
defer func() { assert.NoError(t, client.Close()) }()
129129

130-
system, err := system_client.NewClient()
130+
system, err := systemClient.NewClient()
131131
require.Nil(t, err)
132132

133133
defer func() { assert.NoError(t, system.Close()) }()
134134

135-
startReq := &system_api.StartServiceRequest{Name: "MSiSCSI"}
135+
startReq := &systemApi.StartServiceRequest{Name: "MSiSCSI"}
136136
_, err = system.StartService(context.TODO(), startReq)
137137
require.NoError(t, err)
138138

139-
tp := &iscsi_api.TargetPortal{
139+
tp := &iscsiApi.TargetPortal{
140140
TargetAddress: config.Ip,
141141
TargetPort: defaultIscsiPort,
142142
}
143143

144-
addTpReq := &iscsi_api.AddTargetPortalRequest{
144+
addTpReq := &iscsiApi.AddTargetPortalRequest{
145145
TargetPortal: tp,
146146
}
147147
_, err = client.AddTargetPortal(context.Background(), addTpReq)
148148
assert.Nil(t, err)
149149

150-
discReq := &iscsi_api.DiscoverTargetPortalRequest{TargetPortal: tp}
150+
discReq := &iscsiApi.DiscoverTargetPortalRequest{TargetPortal: tp}
151151
discResp, err := client.DiscoverTargetPortal(context.TODO(), discReq)
152152
if assert.Nil(t, err) {
153153
assert.Contains(t, discResp.Iqns, config.Iqn)
154154
}
155155

156-
connectReq := &iscsi_api.ConnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
156+
connectReq := &iscsiApi.ConnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
157157
_, err = client.ConnectTarget(context.TODO(), connectReq)
158158
assert.Nil(t, err)
159159

160-
disconReq := &iscsi_api.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
160+
disconReq := &iscsiApi.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
161161
_, err = client.DisconnectTarget(context.TODO(), disconReq)
162162
assert.Nil(t, err)
163163
}
@@ -175,48 +175,48 @@ func targetChapTest(t *testing.T) {
175175
err = setChap(targetName, username, password)
176176
require.NoError(t, err)
177177

178-
client, err := iscsi_client.NewClient()
178+
client, err := iscsiClient.NewClient()
179179
require.Nil(t, err)
180180

181181
defer func() { assert.NoError(t, client.Close()) }()
182182

183-
system, err := system_client.NewClient()
183+
system, err := systemClient.NewClient()
184184
require.Nil(t, err)
185185

186186
defer func() { assert.NoError(t, system.Close()) }()
187187

188-
startReq := &system_api.StartServiceRequest{Name: "MSiSCSI"}
188+
startReq := &systemApi.StartServiceRequest{Name: "MSiSCSI"}
189189
_, err = system.StartService(context.TODO(), startReq)
190190
require.NoError(t, err)
191191

192-
tp := &iscsi_api.TargetPortal{
192+
tp := &iscsiApi.TargetPortal{
193193
TargetAddress: config.Ip,
194194
TargetPort: defaultIscsiPort,
195195
}
196196

197-
addTpReq := &iscsi_api.AddTargetPortalRequest{
197+
addTpReq := &iscsiApi.AddTargetPortalRequest{
198198
TargetPortal: tp,
199199
}
200200
_, err = client.AddTargetPortal(context.Background(), addTpReq)
201201
assert.Nil(t, err)
202202

203-
discReq := &iscsi_api.DiscoverTargetPortalRequest{TargetPortal: tp}
203+
discReq := &iscsiApi.DiscoverTargetPortalRequest{TargetPortal: tp}
204204
discResp, err := client.DiscoverTargetPortal(context.TODO(), discReq)
205205
if assert.Nil(t, err) {
206206
assert.Contains(t, discResp.Iqns, config.Iqn)
207207
}
208208

209-
connectReq := &iscsi_api.ConnectTargetRequest{
209+
connectReq := &iscsiApi.ConnectTargetRequest{
210210
TargetPortal: tp,
211211
Iqn: config.Iqn,
212212
ChapUsername: username,
213213
ChapSecret: password,
214-
AuthType: iscsi_api.AuthenticationType_ONE_WAY_CHAP,
214+
AuthType: iscsiApi.AuthenticationType_ONE_WAY_CHAP,
215215
}
216216
_, err = client.ConnectTarget(context.TODO(), connectReq)
217217
assert.Nil(t, err)
218218

219-
disconReq := &iscsi_api.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
219+
disconReq := &iscsiApi.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
220220
_, err = client.DisconnectTarget(context.TODO(), disconReq)
221221
assert.Nil(t, err)
222222
}
@@ -238,30 +238,30 @@ func targetMutualChapTest(t *testing.T) {
238238
err = setReverseChap(targetName, reverse_password)
239239
require.NoError(t, err)
240240

241-
client, err := iscsi_client.NewClient()
241+
client, err := iscsiClient.NewClient()
242242
require.Nil(t, err)
243243

244244
defer func() { assert.NoError(t, client.Close()) }()
245245

246-
system, err := system_client.NewClient()
246+
system, err := systemClient.NewClient()
247247
require.Nil(t, err)
248248

249249
defer func() { assert.NoError(t, system.Close()) }()
250250

251251
{
252-
req := &system_api.StartServiceRequest{Name: "MSiSCSI"}
252+
req := &systemApi.StartServiceRequest{Name: "MSiSCSI"}
253253
resp, err := system.StartService(context.TODO(), req)
254254
require.NoError(t, err)
255255
assert.NotNil(t, resp)
256256
}
257257

258-
tp := &iscsi_api.TargetPortal{
258+
tp := &iscsiApi.TargetPortal{
259259
TargetAddress: config.Ip,
260260
TargetPort: defaultIscsiPort,
261261
}
262262

263263
{
264-
req := &iscsi_api.AddTargetPortalRequest{
264+
req := &iscsiApi.AddTargetPortalRequest{
265265
TargetPortal: tp,
266266
}
267267
resp, err := client.AddTargetPortal(context.Background(), req)
@@ -270,7 +270,7 @@ func targetMutualChapTest(t *testing.T) {
270270
}
271271

272272
{
273-
req := &iscsi_api.DiscoverTargetPortalRequest{TargetPortal: tp}
273+
req := &iscsiApi.DiscoverTargetPortalRequest{TargetPortal: tp}
274274
resp, err := client.DiscoverTargetPortal(context.TODO(), req)
275275
if assert.Nil(t, err) && assert.NotNil(t, resp) {
276276
assert.Contains(t, resp.Iqns, config.Iqn)
@@ -279,25 +279,25 @@ func targetMutualChapTest(t *testing.T) {
279279

280280
{
281281
// Try using a wrong initiator password and expect error on connection
282-
req := &iscsi_api.SetMutualChapSecretRequest{MutualChapSecret: "made-up-pass"}
282+
req := &iscsiApi.SetMutualChapSecretRequest{MutualChapSecret: "made-up-pass"}
283283
resp, err := client.SetMutualChapSecret(context.TODO(), req)
284284
require.NoError(t, err)
285285
assert.NotNil(t, resp)
286286
}
287287

288-
connectReq := &iscsi_api.ConnectTargetRequest{
288+
connectReq := &iscsiApi.ConnectTargetRequest{
289289
TargetPortal: tp,
290290
Iqn: config.Iqn,
291291
ChapUsername: username,
292292
ChapSecret: password,
293-
AuthType: iscsi_api.AuthenticationType_MUTUAL_CHAP,
293+
AuthType: iscsiApi.AuthenticationType_MUTUAL_CHAP,
294294
}
295295

296296
_, err = client.ConnectTarget(context.TODO(), connectReq)
297297
assert.NotNil(t, err)
298298

299299
{
300-
req := &iscsi_api.SetMutualChapSecretRequest{MutualChapSecret: reverse_password}
300+
req := &iscsiApi.SetMutualChapSecretRequest{MutualChapSecret: reverse_password}
301301
resp, err := client.SetMutualChapSecret(context.TODO(), req)
302302
require.NoError(t, err)
303303
assert.NotNil(t, resp)
@@ -307,7 +307,7 @@ func targetMutualChapTest(t *testing.T) {
307307
assert.Nil(t, err)
308308

309309
{
310-
req := &iscsi_api.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
310+
req := &iscsiApi.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
311311
resp, err := client.DisconnectTarget(context.TODO(), req)
312312
assert.Nil(t, err)
313313
assert.NotNil(t, resp)
@@ -320,34 +320,34 @@ func targetPortalTest(t *testing.T, port uint32) {
320320

321321
defer requireCleanup(t)
322322

323-
client, err := iscsi_client.NewClient()
323+
client, err := iscsiClient.NewClient()
324324
require.Nil(t, err)
325325

326326
defer func() { assert.NoError(t, client.Close()) }()
327327

328-
system, err := system_client.NewClient()
328+
system, err := systemClient.NewClient()
329329
require.Nil(t, err)
330330

331331
defer func() { assert.NoError(t, system.Close()) }()
332332

333-
startReq := &system_api.StartServiceRequest{Name: "MSiSCSI"}
333+
startReq := &systemApi.StartServiceRequest{Name: "MSiSCSI"}
334334
_, err = system.StartService(context.TODO(), startReq)
335335
require.NoError(t, err)
336336

337-
tp := &iscsi_api.TargetPortal{
337+
tp := &iscsiApi.TargetPortal{
338338
TargetAddress: config.Ip,
339339
TargetPort: port,
340340
}
341341

342-
listReq := &iscsi_api.ListTargetPortalsRequest{}
342+
listReq := &iscsiApi.ListTargetPortalsRequest{}
343343

344344
listResp, err := client.ListTargetPortals(context.Background(), listReq)
345345
if assert.Nil(t, err) {
346346
assert.Len(t, listResp.TargetPortals, 0,
347347
"Expect no registered target portals")
348348
}
349349

350-
addTpReq := &iscsi_api.AddTargetPortalRequest{TargetPortal: tp}
350+
addTpReq := &iscsiApi.AddTargetPortalRequest{TargetPortal: tp}
351351
_, err = client.AddTargetPortal(context.Background(), addTpReq)
352352
assert.Nil(t, err)
353353

@@ -364,7 +364,7 @@ func targetPortalTest(t *testing.T, port uint32) {
364364
assert.Equal(t, gotListResp.TargetPortals[0].TargetAddress, tp.TargetAddress)
365365
}
366366

367-
remReq := &iscsi_api.RemoveTargetPortalRequest{
367+
remReq := &iscsiApi.RemoveTargetPortalRequest{
368368
TargetPortal: tp,
369369
}
370370
_, err = client.RemoveTargetPortal(context.Background(), remReq)

‎integrationtests/smb_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
const letterset = "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
2222

23-
var seededRand *rand.Rand = rand.New(rand.NewSource(time.Now().UnixNano()))
23+
var seededRand = rand.New(rand.NewSource(time.Now().UnixNano()))
2424

2525
func stringWithCharset(length int, charset string) string {
2626
b := make([]byte, length)

‎internal/server/server.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ func NewServer(apiGroups ...srvtypes.APIGroup) *Server {
3939
// others).
4040
// If passed a listeningChan, it will close it when it's started listening.
4141
func (s *Server) Start(listeningChan chan interface{}) []error {
42-
doneChan, errors := s.startListening()
43-
if len(errors) != 0 {
44-
return errors
42+
doneChan, ListenErr := s.startListening()
43+
if len(ListenErr) != 0 {
44+
return ListenErr
4545
}
4646
defer close(doneChan)
4747

@@ -62,9 +62,9 @@ func (s *Server) startListening() (chan *versionedAPIDone, []error) {
6262
}
6363
s.started = true
6464

65-
listeners, errors := s.createListeners()
66-
if len(errors) != 0 {
67-
return nil, errors
65+
listeners, ListenErr := s.createListeners()
66+
if len(ListenErr) != 0 {
67+
return nil, ListenErr
6868
}
6969

7070
return s.createAndStartGRPCServers(listeners), nil

0 commit comments

Comments
 (0)