Skip to content

Commit 560d854

Browse files
authored
Merge pull request #35 from davidz627/feature/verifyScripts
Simple go verification scripts
2 parents ef6b6e3 + 9c861b9 commit 560d854

File tree

7 files changed

+98
-3
lines changed

7 files changed

+98
-3
lines changed

hack/update-gofmt.sh

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
3+
# Copyright 2018 The Kubernetes Authors.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
set -o errexit
18+
set -o nounset
19+
set -o pipefail
20+
21+
find . -name "*.go" | grep -v "\/vendor\/" | xargs gofmt -s -w

hack/verify-all.sh

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
3+
# Copyright 2018 The Kubernetes Authors.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
set -o errexit
18+
set -o nounset
19+
set -o pipefail
20+
21+
PKG_ROOT=$(git rev-parse --show-toplevel)
22+
23+
${PKG_ROOT}/hack/verify-gofmt.sh
24+
${PKG_ROOT}/hack/verify-govet.sh

hack/verify-gofmt.sh

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/usr/bin/env bash
2+
# Copyright 2018 The Kubernetes Authors.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
set -o errexit
17+
set -o nounset
18+
set -o pipefail
19+
20+
echo "Verifying gofmt"
21+
22+
diff=$(find . -name "*.go" | grep -v "\/vendor\/" | xargs gofmt -s -d 2>&1)
23+
if [[ -n "${diff}" ]]; then
24+
echo "${diff}"
25+
echo
26+
echo "Please run hack/update-gofmt.sh"
27+
exit 1
28+
fi

hack/verify-govet.sh

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
# Copyright 2018 The Kubernetes Authors.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
set -o errexit
17+
set -o nounset
18+
set -o pipefail
19+
20+
echo "Verifying govet"
21+
22+
go vet $(go list ./... | grep -v vendor)

pkg/gce-csi-driver/controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func TestCreateVolumeArguments(t *testing.T) {
205205
if err != nil {
206206
t.Fatalf("Failed to create fake cloud provider: %v", err)
207207
}
208-
err = gceDriver.SetupGCEDriver(fakeCloudProvider, driver, node)
208+
err = gceDriver.SetupGCEDriver(fakeCloudProvider, nil, driver, node)
209209
if err != nil {
210210
t.Fatalf("Failed to setup GCE Driver: %v", err)
211211
}

pkg/gce-csi-driver/identity.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (gceIdentity *GCEIdentityServer) GetPluginCapabilities(ctx context.Context,
4343
glog.V(5).Infof("Using default GetPluginCapabilities")
4444
return &csi.GetPluginCapabilitiesResponse{
4545
Capabilities: []*csi.PluginCapability{
46-
&csi.PluginCapability{
46+
{
4747
Type: &csi.PluginCapability_Service_{
4848
Service: &csi.PluginCapability_Service{
4949
Type: csi.PluginCapability_Service_CONTROLLER_SERVICE,

test/remote/run_remote/run_remote.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ func addPubKeyToInstance(project, zone, name, pubKeyFile string) error {
466466
newMeta := &compute.Metadata{
467467
Fingerprint: fingerprint,
468468
Items: []*compute.MetadataItems{
469-
&compute.MetadataItems{
469+
{
470470
Key: "ssh-keys",
471471
Value: &newKeys,
472472
},

0 commit comments

Comments
 (0)