golint: reduce ineffective assignment warnings

o use error from ParseUint o use modified from .Merge Fixes the following warning ... err assigned and not used (ineffassign) ... modified assigned and not used (ineffassign) Related-to: #153 (Resolve golint warnings) Signed-off-by: Alexander Alemayhu <alexander@alemayhu.com>
cilium · Mar 18, 2017 · 251a89d · 251a89d
1 parent d71b9bd
commit 251a89d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/cilium/cmd/bpf_policy_add.go b/cilium/cmd/bpf_policy_add.go
@@ -55,6 +55,10 @@ func updatePolicyKey(cmd *cobra.Command, args []string, add bool) {
 	}
 
 	peerLbl, err := strconv.ParseUint(args[1], 10, 32)
+	if err != nil {
+		Fatalf("Failed to convert %s", args[1])
+	}
+
 	if add == true {
 		if err := policyMap.AllowConsumer(uint32(peerLbl)); err != nil {
 			Fatalf("Cannot add policy key: %s", err)

diff --git a/pkg/policy/policy_test.go b/pkg/policy/policy_test.go
@@ -631,6 +631,7 @@ func (s *PolicyTestSuite) TestNodeMerge(c *C) {
 	c.Assert(aNode.CanMerge(&unmergeableNode), Not(Equals), nil)
 
 	modified, err = aNode.Merge(&unmergeableNode)
+	c.Assert(modified, Equals, false)
 	c.Assert(err, Not(Equals), nil)
 }