Skip to content

Commit b5ecf01

Browse files
committed
Use pointers in struct methods to avoid object copies
1 parent 7d50830 commit b5ecf01

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

cmd/generate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var generateCmd = &cobra.Command{
2424
}
2525
bufioReader := bufio.NewReader(reader)
2626

27-
kubeCfg, err := kubeconfig.New(filesystem.Default{}, commander.Default{})
27+
kubeCfg, err := kubeconfig.New(&filesystem.Default{}, &commander.Default{})
2828
if err != nil {
2929
fmt.Println(err)
3030
os.Exit(1)

pkg/commander/commander.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type Commander interface {
1515
type Default struct{}
1616

1717
// Execute executes a command on the actual machine
18-
func (Default) Execute(cmdStr string, args []string, envs []string) (string, error) {
18+
func (d *Default) Execute(cmdStr string, args []string, envs []string) (string, error) {
1919
cmd := exec.Command(cmdStr, args...)
2020
cmd.Env = os.Environ()
2121
cmd.Env = append(cmd.Env, envs...)

pkg/filesystem/filesystem.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type FileSystem interface {
1616
type Default struct{}
1717

1818
// Remove removes a file from Default filesystem
19-
func (Default) Remove(file string) error {
19+
func (d *Default) Remove(file string) error {
2020
if err := os.Remove(file); err != nil {
2121
return err
2222
}
@@ -25,7 +25,7 @@ func (Default) Remove(file string) error {
2525
}
2626

2727
// HomeDir returns the home directory
28-
func (Default) HomeDir() (string, error) {
28+
func (d *Default) HomeDir() (string, error) {
2929
home, err := homedir.Dir()
3030
if err != nil {
3131
return home, err

pkg/kubeconfig/kubeconfig.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type KubeConfig struct {
1717
}
1818

1919
// Delete deletes the kubeconfig file for the given context
20-
func (k KubeConfig) Delete(kubeCfgFile string) error {
20+
func (k *KubeConfig) Delete(kubeCfgFile string) error {
2121
if err := k.filesystem.Remove(kubeCfgFile); err != nil && !os.IsNotExist(err) {
2222
return err
2323
}
@@ -27,7 +27,7 @@ func (k KubeConfig) Delete(kubeCfgFile string) error {
2727

2828
// AddRegionalCluster imports Kubernetes context for
2929
// regional Kubernetes cluster
30-
func (k KubeConfig) AddRegionalCluster(project string, cluster string, region string, kubeCfgFile string) error {
30+
func (k *KubeConfig) AddRegionalCluster(project string, cluster string, region string, kubeCfgFile string) error {
3131
args := []string{
3232
"beta",
3333
"container",
@@ -51,7 +51,7 @@ func (k KubeConfig) AddRegionalCluster(project string, cluster string, region st
5151

5252
// AddZonalCluster imports Kubernetes context for
5353
// zonal Kubernetes cluster
54-
func (k KubeConfig) AddZonalCluster(project string, cluster string, zone string, kubeCfgFile string) error {
54+
func (k *KubeConfig) AddZonalCluster(project string, cluster string, zone string, kubeCfgFile string) error {
5555
args := []string{
5656
"container",
5757
"clusters",
@@ -71,7 +71,7 @@ func (k KubeConfig) AddZonalCluster(project string, cluster string, zone string,
7171
}
7272

7373
// RenameContext renames a Kubernetes context
74-
func (k KubeConfig) RenameContext(oldCtx string, newCtx string, kubeCfgFile string) error {
74+
func (k *KubeConfig) RenameContext(oldCtx string, newCtx string, kubeCfgFile string) error {
7575
args := []string{
7676
"config",
7777
"rename-context",
@@ -89,7 +89,7 @@ func (k KubeConfig) RenameContext(oldCtx string, newCtx string, kubeCfgFile stri
8989
}
9090

9191
// KubeCfgsDir returns the directory in which kube configs are stored
92-
func (k KubeConfig) KubeCfgsDir() string {
92+
func (k *KubeConfig) KubeCfgsDir() string {
9393
return k.kubeCfgsDir
9494
}
9595

pkg/kubetmuxp/kubetmuxp.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type Cluster struct {
2323
}
2424

2525
// DefaultContextName returns default context name
26-
func (c Cluster) DefaultContextName(project string) (string, error) {
26+
func (c *Cluster) DefaultContextName(project string) (string, error) {
2727
if regional, err := c.IsRegional(); err != nil {
2828
return "", err
2929
} else if regional {
@@ -34,7 +34,7 @@ func (c Cluster) DefaultContextName(project string) (string, error) {
3434
}
3535

3636
// IsRegional tells if a cluster is a regional cluster
37-
func (c Cluster) IsRegional() (bool, error) {
37+
func (c *Cluster) IsRegional() (bool, error) {
3838
if c.Region != "" && c.Zone != "" {
3939
return false, fmt.Errorf("Only one of region or zone should be given")
4040
}
@@ -81,7 +81,7 @@ func (c *Config) Load() error {
8181
}
8282

8383
// Process processes kube-tmuxp configs
84-
func (c Config) Process() error {
84+
func (c *Config) Process() error {
8585
kubeCfgsDir := c.kubeCfg.KubeCfgsDir()
8686
for _, project := range c.Projects {
8787
for _, cluster := range project.Clusters {

0 commit comments

Comments
 (0)