Skip to content

Commit 481e72d

Browse files
Piyush Nimbalkarpure-jliao
Piyush Nimbalkar
authored and
pure-jliao
committed
Formatting and test fixes after vendor update
Signed-off-by: Piyush Nimbalkar <[email protected]>
1 parent 891ff28 commit 481e72d

File tree

25 files changed

+1751
-903
lines changed

25 files changed

+1751
-903
lines changed

‎Makefile‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,6 @@ vendor:
9797
# Tools download (if missing)
9898
# - please make sure $GOPATH/bin is in your path, also do not use $GOBIN
9999

100-
$(GOPATH)/bin/golint:
101-
go get -u golang.org/x/lint/golint
102-
103-
$(GOPATH)/bin/errcheck:
104-
GO111MODULE=off go get -u github.com/kisielk/errcheck
105-
106-
$(GOPATH)/bin/staticcheck:
107-
GOFLAGS="" go install honnef.co/go/tools/cmd/[email protected]
108-
109100
$(GOPATH)/bin/revive:
110101
GO111MODULE=off go get -u github.com/mgechev/revive
111102

@@ -126,18 +117,20 @@ lint:
126117

127118
vet:
128119
# go vet check ...
129-
@go vet $(PKGS)
120+
@go vet ./...
130121

131122
check-fmt:
132123
# gofmt check ...
133124
@bash -c "diff -u <(echo -n) <(gofmt -l -d -s -e $(GO_FILES))"
134125

135-
errcheck: $(GOPATH)/bin/errcheck
126+
errcheck:
136127
# errcheck check ...
128+
@GO111MODULE=off go get -u github.com/kisielk/errcheck
137129
@errcheck -verbose -blank $(PKGS)
138130

139-
staticcheck: $(GOPATH)/bin/staticcheck
131+
staticcheck:
140132
# staticcheck check ...
133+
@GOFLAGS="" go install honnef.co/go/tools/cmd/[email protected]
141134
@staticcheck $(PKGS)
142135

143136
revive: $(GOPATH)/bin/revive

‎cmd/operator/operator.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,10 @@ func run(c *cli.Context) {
136136
if pprofEnabled {
137137
go func() {
138138
log.Infof("pprof profiling is enabled, creating profiling server at port %v", defaultPprofPort)
139-
http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", defaultPprofPort), nil)
139+
err := http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", defaultPprofPort), nil)
140+
if err != nil {
141+
log.Errorf("Error setting up profiling server. %v", err)
142+
}
140143
}()
141144
}
142145

‎drivers/storage/portworx/alert_manager_component_test.go‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ func TestAlertManagerInstall(t *testing.T) {
2727
k8sClient := testutil.FakeK8sClient()
2828
recorder := record.NewFakeRecorder(1)
2929
driver := portworx{}
30-
driver.Init(k8sClient, runtime.NewScheme(), recorder)
30+
err := driver.Init(k8sClient, runtime.NewScheme(), recorder)
31+
require.NoError(t, err)
3132

3233
cluster := &corev1.StorageCluster{
3334
ObjectMeta: metav1.ObjectMeta{
@@ -47,7 +48,7 @@ func TestAlertManagerInstall(t *testing.T) {
4748
driver.SetDefaultsOnStorageCluster(cluster)
4849
cluster.Spec.Placement = nil
4950

50-
err := driver.PreInstall(cluster)
51+
err = driver.PreInstall(cluster)
5152
require.NoError(t, err)
5253
require.Len(t, recorder.Events, 1)
5354
require.Contains(t, <-recorder.Events,
@@ -56,7 +57,7 @@ func TestAlertManagerInstall(t *testing.T) {
5657
v1.EventTypeWarning, util.FailedComponentReason, cluster.Namespace, component.AlertManagerConfigSecretName))
5758

5859
// Create an alert manager config, so alert manager install can proceed
59-
k8sClient.Create(
60+
err = k8sClient.Create(
6061
context.TODO(),
6162
&v1.Secret{
6263
ObjectMeta: metav1.ObjectMeta{
@@ -66,6 +67,7 @@ func TestAlertManagerInstall(t *testing.T) {
6667
},
6768
&client.CreateOptions{},
6869
)
70+
require.NoError(t, err)
6971

7072
err = driver.PreInstall(cluster)
7173
require.NoError(t, err)
@@ -101,7 +103,8 @@ func TestRemoveAlertManager(t *testing.T) {
101103
reregisterComponents()
102104
k8sClient := testutil.FakeK8sClient()
103105
driver := portworx{}
104-
driver.Init(k8sClient, runtime.NewScheme(), record.NewFakeRecorder(0))
106+
err := driver.Init(k8sClient, runtime.NewScheme(), record.NewFakeRecorder(0))
107+
require.NoError(t, err)
105108

106109
cluster := &corev1.StorageCluster{
107110
ObjectMeta: metav1.ObjectMeta{
@@ -120,7 +123,7 @@ func TestRemoveAlertManager(t *testing.T) {
120123
}
121124
driver.SetDefaultsOnStorageCluster(cluster)
122125

123-
k8sClient.Create(
126+
err = k8sClient.Create(
124127
context.TODO(),
125128
&v1.Secret{
126129
ObjectMeta: metav1.ObjectMeta{
@@ -130,8 +133,9 @@ func TestRemoveAlertManager(t *testing.T) {
130133
},
131134
&client.CreateOptions{},
132135
)
136+
require.NoError(t, err)
133137

134-
err := driver.PreInstall(cluster)
138+
err = driver.PreInstall(cluster)
135139
require.NoError(t, err)
136140

137141
service := &v1.Service{}
@@ -160,7 +164,8 @@ func TestDisableAlertManager(t *testing.T) {
160164
reregisterComponents()
161165
k8sClient := testutil.FakeK8sClient()
162166
driver := portworx{}
163-
driver.Init(k8sClient, runtime.NewScheme(), record.NewFakeRecorder(0))
167+
err := driver.Init(k8sClient, runtime.NewScheme(), record.NewFakeRecorder(0))
168+
require.NoError(t, err)
164169

165170
cluster := &corev1.StorageCluster{
166171
ObjectMeta: metav1.ObjectMeta{
@@ -179,7 +184,7 @@ func TestDisableAlertManager(t *testing.T) {
179184
}
180185
driver.SetDefaultsOnStorageCluster(cluster)
181186

182-
k8sClient.Create(
187+
err = k8sClient.Create(
183188
context.TODO(),
184189
&v1.Secret{
185190
ObjectMeta: metav1.ObjectMeta{
@@ -189,8 +194,9 @@ func TestDisableAlertManager(t *testing.T) {
189194
},
190195
&client.CreateOptions{},
191196
)
197+
require.NoError(t, err)
192198

193-
err := driver.PreInstall(cluster)
199+
err = driver.PreInstall(cluster)
194200
require.NoError(t, err)
195201

196202
service := &v1.Service{}

‎drivers/storage/portworx/cloud_storage_test.go‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ func TestGetStorageNodeConfigValidConfigMap(t *testing.T) {
105105
mockCtrl := gomock.NewController(t)
106106
defer mockCtrl.Finish()
107107

108-
setupMockStorageManager(mockCtrl)
108+
err := setupMockStorageManager(mockCtrl)
109+
require.NoError(t, err)
109110

110111
_, yamlData := generateValidYamlData(t)
111112

@@ -205,7 +206,8 @@ func TestGetStorageNodeConfigDifferentInstancesPerZone(t *testing.T) {
205206
mockCtrl := gomock.NewController(t)
206207
defer mockCtrl.Finish()
207208

208-
setupMockStorageManager(mockCtrl)
209+
err := setupMockStorageManager(mockCtrl)
210+
require.NoError(t, err)
209211
_, yamlData := generateValidYamlData(t)
210212

211213
k8sClient := testutil.FakeK8sClient(
@@ -306,8 +308,8 @@ func TestGetStorageNodeConfigMultipleDriveCounts(t *testing.T) {
306308
mockCtrl := gomock.NewController(t)
307309
defer mockCtrl.Finish()
308310

309-
setupMockStorageManager(mockCtrl)
310-
311+
err := setupMockStorageManager(mockCtrl)
312+
require.NoError(t, err)
311313
_, yamlData := generateValidYamlData(t)
312314

313315
k8sClient := testutil.FakeK8sClient(
@@ -424,7 +426,8 @@ func TestGetStorageNodeConfigSpecCountMismatch(t *testing.T) {
424426
mockCtrl := gomock.NewController(t)
425427
defer mockCtrl.Finish()
426428

427-
setupMockStorageManager(mockCtrl)
429+
err := setupMockStorageManager(mockCtrl)
430+
require.NoError(t, err)
428431

429432
_, yamlData := generateValidYamlData(t)
430433

@@ -491,7 +494,7 @@ func TestGetStorageNodeConfigSpecCountMismatch(t *testing.T) {
491494
},
492495
}, nil)
493496

494-
_, err := p.GetStorageNodeConfig(inputSpecs, inputInstancesPerZone)
497+
_, err = p.GetStorageNodeConfig(inputSpecs, inputInstancesPerZone)
495498
require.Error(t, err, "Expected an error on GetStorageNodeConfig")
496499
require.Contains(t, err.Error(), "got an incorrect storage distribution", "Expected a different error")
497500
}
@@ -611,7 +614,7 @@ func generateValidYamlData(t *testing.T) (cloudops.StorageDecisionMatrix, []byte
611614
return inputMatrix, yamlBytes
612615
}
613616

614-
func setupMockStorageManager(mockCtrl *gomock.Controller) {
617+
func setupMockStorageManager(mockCtrl *gomock.Controller) error {
615618
mockStorageManager = mock.NewMockStorageManager(mockCtrl)
616619

617620
initFn := func(matrix cloudops.StorageDecisionMatrix) (cloudops.StorageManager, error) {
@@ -621,9 +624,12 @@ func setupMockStorageManager(mockCtrl *gomock.Controller) {
621624
_, err := cloudops.NewStorageManager(cloudops.StorageDecisionMatrix{}, cloudops.ProviderType("mock"))
622625
if err != nil {
623626
// mock is not registered
624-
cloudops.RegisterStorageManager(
627+
if err := cloudops.RegisterStorageManager(
625628
testProviderType,
626629
initFn,
627-
)
630+
); err != nil {
631+
return err
632+
}
628633
}
634+
return nil
629635
}

‎drivers/storage/portworx/component/security.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func (c *security) getPrivateKeyOrGenerate(cluster *corev1.StorageCluster, envVa
193193

194194
// check for pre-existing secret
195195
secret := &v1.Secret{}
196-
c.k8sClient.Get(context.TODO(), types.NamespacedName{
196+
err = c.k8sClient.Get(context.TODO(), types.NamespacedName{
197197
Namespace: cluster.Namespace,
198198
Name: secretName,
199199
}, secret)

‎drivers/storage/portworx/component/securitycontextconstraints.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,12 @@ func (s *scc) Priority() int32 {
4545

4646
func (s *scc) Initialize(k8sClient client.Client, k8sVersion version.Version, scheme *runtime.Scheme, recorder record.EventRecorder) {
4747
s.k8sClient = k8sClient
48-
ocp_secv1.Install(s.k8sClient.Scheme())
49-
apiextensionsv1.AddToScheme(s.k8sClient.Scheme())
48+
if err := ocp_secv1.Install(s.k8sClient.Scheme()); err != nil {
49+
logrus.Errorf("Failed to add openshift objects to the scheme. %v", err)
50+
}
51+
if err := apiextensionsv1.AddToScheme(s.k8sClient.Scheme()); err != nil {
52+
logrus.Errorf("Failed to add api-extensions-v1 objects to the scheme. %v", err)
53+
}
5054
}
5155

5256
func (s *scc) IsPausedForMigration(cluster *opcorev1.StorageCluster) bool {

0 commit comments

Comments
 (0)