Skip to content

Commit cddc482

Browse files
committed
fix typo / lint
1 parent d4518bc commit cddc482

File tree

8 files changed

+592
-592
lines changed

8 files changed

+592
-592
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ SETUP_ENVTEST := $(LOCALBIN)/setup-envtest
7474

7575
.PHONY: test
7676
test: manifests generate fmt $(SETUP_ENVTEST)
77-
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test ./controllers $(TEST_ARGS)
77+
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test ./... $(TEST_ARGS)
7878

7979
.PHONY: test-cover
8080
test-cover: ## Run unit and integration tests and generate coverage report
8181
$(MAKE) test TEST_ARGS="$(TEST_ARGS) -coverprofile=coverage.out"
82-
go tool cover -func=coverage.out -o coverate.txt
82+
go tool cover -func=coverage.out -o coverage.txt
8383
go tool cover -html=coverage.out -o coverage.html
8484

8585
##@ Build

cloud/cloudinit/common_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
package cloudinit_test
2-
3-
import (
4-
"testing"
5-
6-
"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/cloudinit"
7-
)
8-
9-
func TestIsValidType(t *testing.T) {
10-
testTypes := []string{"user", "users", "meta", "memetah", "network", "networkig"}
11-
expectedValidity := []bool{true, false, true, false, true, false}
12-
for i, tt := range testTypes {
13-
if cloudinit.IsValidType(tt) != expectedValidity[i] {
14-
t.Errorf("expected validity for %s is %v", tt, expectedValidity[i])
15-
}
16-
}
17-
}
1+
package cloudinit_test
2+
3+
import (
4+
"testing"
5+
6+
"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/cloudinit"
7+
)
8+
9+
func TestIsValidType(t *testing.T) {
10+
testTypes := []string{"user", "users", "meta", "memetah", "network", "networkig"}
11+
expectedValidity := []bool{true, false, true, false, true, false}
12+
for i, tt := range testTypes {
13+
if cloudinit.IsValidType(tt) != expectedValidity[i] {
14+
t.Errorf("expected validity for %s is %v", tt, expectedValidity[i])
15+
}
16+
}
17+
}

cloud/scope/remote.go

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
1-
package scope
2-
3-
import (
4-
"bytes"
5-
"fmt"
6-
"net"
7-
8-
"golang.org/x/crypto/ssh"
9-
)
10-
11-
type SSHClient struct {
12-
*ssh.Client
13-
password string
14-
}
15-
16-
func NewSSHClient(addr, user, password string) (*SSHClient, error) {
17-
sshConfig := &ssh.ClientConfig{
18-
User: user,
19-
Auth: []ssh.AuthMethod{
20-
ssh.Password(password),
21-
},
22-
HostKeyCallback: ssh.HostKeyCallback(func(hostname string, remote net.Addr, key ssh.PublicKey) error { return nil }),
23-
}
24-
conn, err := ssh.Dial("tcp", addr, sshConfig)
25-
if err != nil {
26-
return nil, err
27-
}
28-
return &SSHClient{conn, password}, nil
29-
}
30-
31-
func (conn *SSHClient) RunCommand(cmd string, stdin ...string) (string, error) {
32-
session, err := conn.NewSession()
33-
if err != nil {
34-
return "", err
35-
}
36-
defer session.Close()
37-
38-
var stdout bytes.Buffer
39-
session.Stdout = &stdout
40-
var stderr bytes.Buffer
41-
session.Stderr = &stderr
42-
if err := session.Run(cmd); err != nil {
43-
return stderr.String(), err
44-
}
45-
46-
return stdout.String(), nil
47-
}
48-
49-
func (c *SSHClient) RunWithStdin(cmd, stdin string) (string, error) {
50-
session, err := c.NewSession()
51-
if err != nil {
52-
return "", err
53-
}
54-
defer session.Close()
55-
56-
go func() {
57-
w, _ := session.StdinPipe()
58-
defer w.Close()
59-
fmt.Fprint(w, stdin)
60-
}()
61-
62-
var stdout bytes.Buffer
63-
session.Stdout = &stdout
64-
var stderr bytes.Buffer
65-
session.Stderr = &stderr
66-
if err := session.Run(cmd); err != nil {
67-
return stderr.String(), err
68-
}
69-
70-
return stdout.String(), nil
71-
}
1+
package scope
2+
3+
import (
4+
"bytes"
5+
"fmt"
6+
"net"
7+
8+
"golang.org/x/crypto/ssh"
9+
)
10+
11+
type SSHClient struct {
12+
*ssh.Client
13+
password string
14+
}
15+
16+
func NewSSHClient(addr, user, password string) (*SSHClient, error) {
17+
sshConfig := &ssh.ClientConfig{
18+
User: user,
19+
Auth: []ssh.AuthMethod{
20+
ssh.Password(password),
21+
},
22+
HostKeyCallback: ssh.HostKeyCallback(func(hostname string, remote net.Addr, key ssh.PublicKey) error { return nil }),
23+
}
24+
conn, err := ssh.Dial("tcp", addr, sshConfig)
25+
if err != nil {
26+
return nil, err
27+
}
28+
return &SSHClient{conn, password}, nil
29+
}
30+
31+
func (conn *SSHClient) RunCommand(cmd string, stdin ...string) (string, error) {
32+
session, err := conn.NewSession()
33+
if err != nil {
34+
return "", err
35+
}
36+
defer session.Close()
37+
38+
var stdout bytes.Buffer
39+
session.Stdout = &stdout
40+
var stderr bytes.Buffer
41+
session.Stderr = &stderr
42+
if err := session.Run(cmd); err != nil {
43+
return stderr.String(), err
44+
}
45+
46+
return stdout.String(), nil
47+
}
48+
49+
func (c *SSHClient) RunWithStdin(cmd, stdin string) (string, error) {
50+
session, err := c.NewSession()
51+
if err != nil {
52+
return "", err
53+
}
54+
defer session.Close()
55+
56+
go func() {
57+
w, _ := session.StdinPipe()
58+
defer w.Close()
59+
fmt.Fprint(w, stdin)
60+
}()
61+
62+
var stdout bytes.Buffer
63+
session.Stdout = &stdout
64+
var stderr bytes.Buffer
65+
session.Stderr = &stderr
66+
if err := session.Run(cmd); err != nil {
67+
return stderr.String(), err
68+
}
69+
70+
return stdout.String(), nil
71+
}

0 commit comments

Comments
 (0)