Skip to content

Commit 9c557ee

Browse files
yoheiuedaQi Feng Huo
yoheiueda
authored and
Qi Feng Huo
committed
csi-wrapper: Fix lint errors
Fix the errors reported by golangci-lint. TODO comments are added where return value is not checked. Fixes confidential-containers#846 Signed-off-by: Yohei Ueda <[email protected]>
1 parent 7a268a3 commit 9c557ee

File tree

9 files changed

+89
-88
lines changed

9 files changed

+89
-88
lines changed

‎volumes/csi-wrapper/cmd/csi-controller-wrapper/main.go

+4-12
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ import (
1212
"github.com/confidential-containers/cloud-api-adaptor/volumes/csi-wrapper/pkg/peerpodvolume"
1313
"github.com/confidential-containers/cloud-api-adaptor/volumes/csi-wrapper/pkg/wrapper"
1414
"github.com/golang/glog"
15-
"k8s.io/client-go/rest"
1615
"k8s.io/client-go/tools/clientcmd"
1716
)
1817

1918
func init() {
20-
flag.Set("logtostderr", "true")
19+
_ = flag.Set("logtostderr", "true") // TODO: error check
2120
}
2221

2322
func main() {
@@ -42,7 +41,7 @@ func main() {
4241

4342
k8sconfig, err := clientcmd.BuildConfigFromFlags("", "")
4443
if err != nil {
45-
glog.Fatalf("Build kubeconfig failed: %w", err)
44+
glog.Fatalf("Build kubeconfig failed: %v", err)
4645
}
4746
peerPodVolumeClient := peerpodvolumeV1alpha1.NewForConfigOrDie(k8sconfig)
4847

@@ -56,22 +55,15 @@ func main() {
5655
controllerService.DeleteFunction,
5756
)
5857
if err != nil {
59-
glog.Fatalf("Initialize peer pod Volume Controller monitor failed: %w", err)
58+
glog.Fatalf("Initialize peer pod Volume Controller monitor failed: %v", err)
6059
}
6160
go func() {
6261
if err := podVolumeMonitor.Start(context.Background()); err != nil {
63-
glog.Fatalf("Running peer pod Volume Controller monitor failed: %w", err)
62+
glog.Fatalf("Running peer pod Volume Controller monitor failed: %v", err)
6463
}
6564
}()
6665

6766
if err := wrapper.Run(cfg.Endpoint, identityService, controllerService, nil); err != nil {
6867
glog.Fatalf("Failed to run csi controller plugin wrapper: %s", err.Error())
6968
}
7069
}
71-
72-
func getClientConfig(kubeconfig string) (*rest.Config, error) {
73-
if kubeconfig != "" {
74-
return clientcmd.BuildConfigFromFlags("", kubeconfig)
75-
}
76-
return rest.InClusterConfig()
77-
}

‎volumes/csi-wrapper/cmd/csi-node-wrapper/main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
)
1717

1818
func init() {
19-
flag.Set("logtostderr", "true")
19+
_ = flag.Set("logtostderr", "true") // TODO: error check
2020
}
2121

2222
func main() {
@@ -35,7 +35,7 @@ func main() {
3535

3636
k8sconfig, err := clientcmd.BuildConfigFromFlags("", "")
3737
if err != nil {
38-
glog.Fatalf("Build kubeconfig failed: %w", err)
38+
glog.Fatalf("Build kubeconfig failed: %v", err)
3939
}
4040
peerPodVolumeClient := peerpodvolumeV1alpha1.NewForConfigOrDie(k8sconfig)
4141

@@ -49,11 +49,11 @@ func main() {
4949
nodeService.DeleteFunction,
5050
)
5151
if err != nil {
52-
glog.Fatalf("Initialize peer pod Volume Node monitor failed: %w", err)
52+
glog.Fatalf("Initialize peer pod Volume Node monitor failed: %v", err)
5353
}
5454
go func() {
5555
if err := podVolumeMonitor.Start(context.Background()); err != nil {
56-
glog.Fatalf("Running peer pod Volume Node monitor failed: %w", err)
56+
glog.Fatalf("Running peer pod Volume Node monitor failed: %v", err)
5757
}
5858
}()
5959

‎volumes/csi-wrapper/cmd/csi-podvm-wrapper/main.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
)
2121

2222
func init() {
23-
flag.Set("logtostderr", "true")
23+
_ = flag.Set("logtostderr", "true") // TODO: error check
2424
}
2525

2626
func main() {
@@ -46,7 +46,7 @@ func main() {
4646

4747
k8sconfig, err := clientcmd.BuildConfigFromFlags("", "")
4848
if err != nil {
49-
glog.Fatalf("Build kubeconfig failed: %w", err)
49+
glog.Fatalf("Build kubeconfig failed: %v", err)
5050
}
5151
peerPodVolumeClient := peerpodvolumeV1alpha1.NewForConfigOrDie(k8sconfig)
5252

@@ -60,11 +60,11 @@ func main() {
6060
podvmService.DeleteFunction,
6161
)
6262
if err != nil {
63-
glog.Fatalf("Initialize peer pod Volume Node monitor failed: %w", err)
63+
glog.Fatalf("Initialize peer pod Volume Node monitor failed: %v", err)
6464
}
6565
go func() {
6666
if err := podVolumeMonitor.Start(context.Background()); err != nil {
67-
glog.Fatalf("Running peer pod Volume Node monitor failed: %w", err)
67+
glog.Fatalf("Running peer pod Volume Node monitor failed: %v", err)
6868
}
6969
}()
7070

@@ -74,10 +74,10 @@ func main() {
7474
}
7575
peerpodVolumes, err := peerPodVolumeClient.PeerpodV1alpha1().PeerpodVolumes(cfg.Namespace).List(context.Background(), options)
7676
if err != nil {
77-
glog.Fatalf("Failed to get peerpodVolume crd object by podUid: %v, err: %w", podUid, err)
77+
glog.Fatalf("Failed to get peerpodVolume crd object by podUid: %v, err: %v", podUid, err)
7878
}
7979
if len(peerpodVolumes.Items) != 1 {
80-
glog.Fatalf("Only one peerpodVolume crd object is expected but got: %w", len(peerpodVolumes.Items))
80+
glog.Fatalf("Only one peerpodVolume crd object is expected but got: %v", len(peerpodVolumes.Items))
8181
}
8282
savedPeerpodvolume := peerpodVolumes.Items[0]
8383
savedPeerpodvolume.Spec.PodName = podName

‎volumes/csi-wrapper/pkg/peerpodvolume/monitor.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package peerpodvolume
22

33
import (
44
"context"
5-
"log"
65
"sync"
76
"time"
87

@@ -11,7 +10,7 @@ import (
1110
informers "github.com/confidential-containers/cloud-api-adaptor/volumes/csi-wrapper/pkg/generated/peerpodvolume/informers/externalversions"
1211
)
1312

14-
var logger = log.New(log.Writer(), "[peerpodvolume/monitor] ", log.LstdFlags|log.Lmsgprefix)
13+
// var logger = log.New(log.Writer(), "[peerpodvolume/monitor] ", log.LstdFlags|log.Lmsgprefix)
1514

1615
type CsiPodVolumeMonitor interface {
1716
Start(context.Context) error
@@ -65,7 +64,7 @@ func (m *csiPodVolumeMonitor) Start(ctx context.Context) error {
6564

6665
select {
6766
case <-ctx.Done():
68-
m.Shutdown()
67+
_ = m.Shutdown() // TODO: error check
6968
case <-m.stopCh:
7069
}
7170

‎volumes/csi-wrapper/pkg/wrapper/controllerservice.go

+17-14
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"github.com/golang/glog"
1818
"github.com/golang/protobuf/jsonpb"
1919
"google.golang.org/grpc"
20+
"google.golang.org/grpc/credentials/insecure"
2021
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2122
)
2223

@@ -55,7 +56,7 @@ func NewControllerService(targetEndpoint, namespace string, peerpodvolumeClientS
5556
}
5657

5758
func (s *ControllerService) redirect(ctx context.Context, req interface{}, fn func(context.Context, csi.ControllerClient)) error {
58-
conn, err := grpc.Dial(s.TargetEndpoint, grpc.WithInsecure(), grpc.WithBlock())
59+
conn, err := grpc.Dial(s.TargetEndpoint, grpc.WithBlock(), grpc.WithTransportCredentials(insecure.NewCredentials()))
5960
if err != nil {
6061
return err
6162
}
@@ -99,7 +100,7 @@ func (s *ControllerService) CreateVolume(ctx context.Context, req *csi.CreateVol
99100
}
100101
_, err = s.PeerpodvolumeClient.PeerpodV1alpha1().PeerpodVolumes(s.Namespace).Create(context.Background(), newPeerpodvolume, metav1.CreateOptions{})
101102
if err != nil {
102-
glog.Error("Error happens while creating peerPodVolume with volumeID: %v, err: %v", volumeID, err.Error())
103+
glog.Errorf("Error happens while creating peerPodVolume with volumeID: %v, err: %v", volumeID, err.Error())
103104
} else {
104105
glog.Infof("Peerpodvolume object is created")
105106
}
@@ -122,7 +123,7 @@ func (s *ControllerService) DeleteVolume(ctx context.Context, req *csi.DeleteVol
122123
} else {
123124
ppErr := s.PeerpodvolumeClient.PeerpodV1alpha1().PeerpodVolumes(s.Namespace).Delete(context.Background(), volumeID, metav1.DeleteOptions{})
124125
if ppErr != nil {
125-
glog.Warning("Failed to delete to Peerpodvolume by volumeID: %v, err: %v", volumeID, ppErr.Error())
126+
glog.Warningf("Failed to delete to Peerpodvolume by volumeID: %v, err: %v", volumeID, ppErr.Error())
126127
} else {
127128
glog.Infof("The peerPodVolume is deleted, volumeID: %v", volumeID)
128129
}
@@ -179,15 +180,15 @@ func (s *ControllerService) ControllerPublishVolume(ctx context.Context, req *cs
179180
savedPeerpodvolume.Spec.WrapperControllerPublishVolumeRes = string(resJsonString)
180181
savedPeerpodvolume, err = s.PeerpodvolumeClient.PeerpodV1alpha1().PeerpodVolumes(s.Namespace).Update(context.Background(), savedPeerpodvolume, metav1.UpdateOptions{})
181182
if err != nil {
182-
glog.Error("Error happens while Update PeerpodVolume in ControllerPublishVolume, err: %v", err.Error())
183+
glog.Errorf("Error happens while Update PeerpodVolume in ControllerPublishVolume, err: %v", err.Error())
183184
return
184185
}
185186
savedPeerpodvolume.Status = v1alpha1.PeerpodVolumeStatus{
186187
State: v1alpha1.ControllerPublishVolumeCached,
187188
}
188189
_, err = s.PeerpodvolumeClient.PeerpodV1alpha1().PeerpodVolumes(s.Namespace).UpdateStatus(context.Background(), savedPeerpodvolume, metav1.UpdateOptions{})
189190
if err != nil {
190-
glog.Error("Error happens while Update PeerpodVolume status to ControllerPublishVolumeCached, err: %v", err.Error())
191+
glog.Errorf("Error happens while Update PeerpodVolume status to ControllerPublishVolumeCached, err: %v", err.Error())
191192
}
192193
}
193194
return
@@ -210,10 +211,11 @@ func (s *ControllerService) ControllerUnpublishVolume(ctx context.Context, req *
210211
req.NodeId = savedPeerpodvolume.Spec.VMID
211212
glog.Infof("The modified ControllerUnpublishVolumeRequest is :%v", req)
212213
ctx := context.Background()
213-
s.redirect(ctx, req, func(ctx context.Context, client csi.ControllerClient) {
214+
// TODO: error check
215+
_ = s.redirect(ctx, req, func(ctx context.Context, client csi.ControllerClient) {
214216
response, err := client.ControllerUnpublishVolume(ctx, req)
215217
if err != nil {
216-
glog.Error("Failed to run ControllerUnpublishVolume with modified ControllerUnpublishVolume, err: %v", err.Error())
218+
glog.Errorf("Failed to run ControllerUnpublishVolume with modified ControllerUnpublishVolume, err: %v", err.Error())
217219
} else {
218220
glog.Infof("The ControllerUnpublishVolumeResponse for peer pod is :%v", response)
219221
}
@@ -242,15 +244,15 @@ func (s *ControllerService) ControllerUnpublishVolume(ctx context.Context, req *
242244
savedPeerpodvolume.Spec.WrapperNodeUnstageVolumeReq = ""
243245
updatedSavedPeerpodvolume, err := s.PeerpodvolumeClient.PeerpodV1alpha1().PeerpodVolumes(s.Namespace).Update(context.Background(), savedPeerpodvolume, metav1.UpdateOptions{})
244246
if err != nil {
245-
glog.Error("Error happens while clean PeerpodVolume specs, err: %v", err.Error())
247+
glog.Errorf("Error happens while clean PeerpodVolume specs, err: %v", err.Error())
246248
}
247249

248250
updatedSavedPeerpodvolume.Status = v1alpha1.PeerpodVolumeStatus{
249251
State: "",
250252
}
251253
_, err = s.PeerpodvolumeClient.PeerpodV1alpha1().PeerpodVolumes(s.Namespace).UpdateStatus(context.Background(), updatedSavedPeerpodvolume, metav1.UpdateOptions{})
252254
if err != nil {
253-
glog.Error("Error happens while Update PeerpodVolume status to ControllerUnpublishVolumeApplied, err: %v", err.Error())
255+
glog.Errorf("Error happens while Update PeerpodVolume status to ControllerUnpublishVolumeApplied, err: %v", err.Error())
254256
}
255257

256258
res = &csi.ControllerUnpublishVolumeResponse{}
@@ -359,15 +361,16 @@ func (s *ControllerService) SyncHandler(peerPodVolume *peerpodvolumeV1alpha1.Pee
359361
wrapperRequest := peerPodVolume.Spec.WrapperControllerPublishVolumeReq
360362
var modifiedRequest csi.ControllerPublishVolumeRequest
361363
if err := (&jsonpb.Unmarshaler{}).Unmarshal(bytes.NewReader([]byte(wrapperRequest)), &modifiedRequest); err != nil {
362-
glog.Error("Failed to convert to ControllerPublishVolumeRequest, err: %v", err.Error())
364+
glog.Errorf("Failed to convert to ControllerPublishVolumeRequest, err: %v", err.Error())
363365
} else {
364366
modifiedRequest.NodeId = vsiID
365367
glog.Infof("The modified ControllerPublishVolumeRequest is :%v", modifiedRequest)
366368
ctx := context.Background()
367-
s.redirect(ctx, modifiedRequest, func(ctx context.Context, client csi.ControllerClient) {
369+
// TODO: error check
370+
_ = s.redirect(ctx, modifiedRequest, func(ctx context.Context, client csi.ControllerClient) {
368371
response, err := client.ControllerPublishVolume(ctx, &modifiedRequest)
369372
if err != nil {
370-
glog.Error("Failed to reproduce ControllerPublishVolume with modified ControllerPublishVolumeRequest, err: %v", err.Error())
373+
glog.Errorf("Failed to reproduce ControllerPublishVolume with modified ControllerPublishVolumeRequest, err: %v", err.Error())
371374
} else {
372375
glog.Infof("The ControllerPublishVolumeResponse for peer pod is :%v", response)
373376
var resBuf bytes.Buffer
@@ -382,15 +385,15 @@ func (s *ControllerService) SyncHandler(peerPodVolume *peerpodvolumeV1alpha1.Pee
382385
peerPodVolume.Spec.DevicePath = devicePath
383386
updatedPeerPodVolume, err := s.PeerpodvolumeClient.PeerpodV1alpha1().PeerpodVolumes(s.Namespace).Update(context.Background(), peerPodVolume, metav1.UpdateOptions{})
384387
if err != nil {
385-
glog.Error("Error happens while Update PeerpodVolume with ControllerPublishVolumeResponse for peer pod, err: %v", err.Error())
388+
glog.Errorf("Error happens while Update PeerpodVolume with ControllerPublishVolumeResponse for peer pod, err: %v", err.Error())
386389
return
387390
}
388391
updatedPeerPodVolume.Status = v1alpha1.PeerpodVolumeStatus{
389392
State: v1alpha1.ControllerPublishVolumeApplied,
390393
}
391394
_, err = s.PeerpodvolumeClient.PeerpodV1alpha1().PeerpodVolumes(s.Namespace).UpdateStatus(context.Background(), updatedPeerPodVolume, metav1.UpdateOptions{})
392395
if err != nil {
393-
glog.Error("Error happens while Update PeerpodVolume status to ControllerPublishVolumeApplied, err: %v", err.Error())
396+
glog.Errorf("Error happens while Update PeerpodVolume status to ControllerPublishVolumeApplied, err: %v", err.Error())
394397
}
395398
}
396399
})

‎volumes/csi-wrapper/pkg/wrapper/identityservice.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
"github.com/container-storage-interface/spec/lib/go/csi"
1111
"google.golang.org/grpc"
12+
"google.golang.org/grpc/credentials/insecure"
1213
)
1314

1415
type IdentityService struct {
@@ -22,7 +23,7 @@ func NewIdentityService(targetEndpoint string) *IdentityService {
2223
}
2324

2425
func (s *IdentityService) redirect(ctx context.Context, req interface{}, fn func(context.Context, csi.IdentityClient)) error {
25-
conn, err := grpc.Dial(s.TargetEndpoint, grpc.WithInsecure(), grpc.WithBlock())
26+
conn, err := grpc.Dial(s.TargetEndpoint, grpc.WithBlock(), grpc.WithTransportCredentials(insecure.NewCredentials()))
2627
if err != nil {
2728
return err
2829
}

0 commit comments

Comments
 (0)