Solve issues reported by make lint

kubernetes-sigs · Feb 11, 2020 · 1b7b3c7 · 1b7b3c7
1 parent 31f64c2
commit 1b7b3c7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/endpoint/labels.go b/endpoint/labels.go
@@ -116,7 +116,7 @@ func (l Labels) SerializePlain(withQuotes bool) string {
 }
 
 func (l Labels) Serialize(withQuotes bool, txtEncryptEnabled bool, aesKey []byte) string {
-	if txtEncryptEnabled == false {
+	if !txtEncryptEnabled {
 		return l.SerializePlain(withQuotes)
 	}
 	text := l.SerializePlain(false)
@@ -126,7 +126,7 @@ func (l Labels) Serialize(withQuotes bool, txtEncryptEnabled bool, aesKey []byte
 	if err != nil {
 		log.Debugf("Failed to encrypt the text %#v using the encryption key %#v. Got error %#v.", text, aesKey, err)
 	}
-	if withQuotes == true {
+	if withQuotes {
 		text = fmt.Sprintf("\"%s\"", text)
 	}
 	log.Debugf("Serialized text after encryption is %#v.", text)

diff --git a/endpoint/labels_test.go b/endpoint/labels_test.go
@@ -35,7 +35,6 @@ type LabelsSuite struct {
 	barTextEncrypted             string
 	barTextAsMap                 Labels
 	noHeritageText               string
-	noHeritageAsMap              Labels
 	wrongHeritageText            string
 	multipleHeritageText         string //considered invalid
 }

diff --git a/registry/txt.go b/registry/txt.go
@@ -56,7 +56,7 @@ func NewTXTRegistry(provider provider.Provider, txtPrefix, ownerID string, cache
 	} else if len(txtEncryptAESKey) != 32 {
 		return nil, errors.New("The AES Encryption key must have a length of 32 bytes")
 	}
-	if txtEncryptEnabled == true && txtEncryptAESKey == nil {
+	if txtEncryptEnabled && txtEncryptAESKey == nil {
 		return nil, errors.New("The AES Encryption key must be set when TXT record encryption is enabled")
 	}
 

diff --git a/registry/txt_test.go b/registry/txt_test.go
@@ -55,13 +55,13 @@ func testTXTRegistryNew(t *testing.T) {
 	assert.Equal(t, p, r.provider)
 
 	aesKey := []byte(";k&l)nUC/33:{?d{3)54+,AD?]SX%yh^")
-	r, err = NewTXTRegistry(p, "", "owner", time.Hour, false, nil)
+	_, err = NewTXTRegistry(p, "", "owner", time.Hour, false, nil)
 	require.NoError(t, err)
 
-	r, err = NewTXTRegistry(p, "", "owner", time.Hour, false, aesKey)
+	_, err = NewTXTRegistry(p, "", "owner", time.Hour, false, aesKey)
 	require.NoError(t, err)
 
-	r, err = NewTXTRegistry(p, "", "owner", time.Hour, true, nil)
+	_, err = NewTXTRegistry(p, "", "owner", time.Hour, true, nil)
 	require.Error(t, err)
 
 	r, err = NewTXTRegistry(p, "", "owner", time.Hour, true, aesKey)
@@ -177,8 +177,6 @@ func testTXTRegistryRecordsPrefixed(t *testing.T) {
 	// Ensure prefix is case-insensitive
 	r, _ = NewTXTRegistry(p, "TxT.", "owner", time.Hour, false, nil)
 	records, _ = r.Records(ctx)
-	r, _ = NewTXTRegistry(p, "TxT.", "owner", time.Hour, false, nil)
-	records, _ = r.Records(ctx)
 
 	assert.True(t, testutils.SameEndpointLabels(records, expectedRecords))
 }