fix linter complains

srl-labs · Jun 22, 2021 · e30f7ef · e30f7ef
1 parent cf576d4
commit e30f7ef
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/cert/cert.go b/cert/cert.go
@@ -135,7 +135,7 @@ func GenerateRootCa(labCARoot string, csrRootJsonTpl *template.Template, input C
 
 // GenerateCert generates and signs a certificate passed as input and saves the certificate and generated private key by path
 // CA used to sign the cert is passed as ca and caKey file paths
-func GenerateCert(ca string, caKey string, csrJSONTpl *template.Template, input CertInput, targetPath string) (*Certificates, error) {
+func GenerateCert(ca, caKey string, csrJSONTpl *template.Template, input CertInput, targetPath string) (*Certificates, error) {
 	utils.CreateDirectory(targetPath, 0755)
 	var err error
 	csrBuff := new(bytes.Buffer)

diff --git a/clab/graph.go b/clab/graph.go
@@ -38,7 +38,7 @@ func (c *CLab) GenerateGraph(topo string) error {
 
 		attr["label"] = nodeName
 		attr["xlabel"] = node.Config().Kind
-		if len(strings.TrimSpace(node.Config().Group)) != 0 {
+		if strings.TrimSpace(node.Config().Group) != "" {
 			attr["group"] = node.Config().Group
 			if strings.Contains(node.Config().Group, "bb") {
 				attr["fillcolor"] = "blue"

diff --git a/clab/inventory.go b/clab/inventory.go
@@ -21,10 +21,7 @@ func (c *CLab) GenerateInventories() error {
 	if err != nil {
 		return err
 	}
-	if err := c.generateAnsibleInventory(f); err != nil {
-		return err
-	}
-	return nil
+	return c.generateAnsibleInventory(f)
 }
 
 // generateAnsibleInventory generates and writes ansible inventory file to w

diff --git a/nodes/crpd/crpd.go b/nodes/crpd/crpd.go
@@ -40,10 +40,12 @@ func (s *crpd) Init(cfg *types.NodeConfig, opts ...nodes.NodeOption) error {
 	}
 
 	// mount config and log dirs
-	s.cfg.Binds = append(s.cfg.Binds, fmt.Sprint(path.Join(s.cfg.LabDir, "config"), ":/config"))
-	s.cfg.Binds = append(s.cfg.Binds, fmt.Sprint(path.Join(s.cfg.LabDir, "log"), ":/var/log"))
-	// mount sshd_config
-	s.cfg.Binds = append(s.cfg.Binds, fmt.Sprint(path.Join(s.cfg.LabDir, "config/sshd_config"), ":/etc/ssh/sshd_config"))
+	s.cfg.Binds = append(s.cfg.Binds,
+		fmt.Sprint(path.Join(s.cfg.LabDir, "config"), ":/config"),
+		fmt.Sprint(path.Join(s.cfg.LabDir, "log"), ":/var/log"),
+		// mount sshd_config
+		fmt.Sprint(path.Join(s.cfg.LabDir, "config/sshd_config"), ":/etc/ssh/sshd_config"),
+	)
 
 	return nil
 }

diff --git a/nodes/srl/srl.go b/nodes/srl/srl.go
@@ -240,9 +240,5 @@ func generateSRLTopologyFile(src, labDir string, index int) error {
 		return err
 	}
 	defer f.Close()
-
-	if err = tpl.Execute(f, mac); err != nil {
-		return err
-	}
-	return nil
+	return tpl.Execute(f, mac)
 }