From 1dbf44bc40b645ae95aef94ce5a4ae18bf9123f3 Mon Sep 17 00:00:00 2001
From: Lars Lehtonen <lars.lehtonen@gmail.com>
Date: Wed, 13 Nov 2019 05:20:01 -0800
Subject: [PATCH] command/agent: Prune Dead Code (#6682)

* remove unused MockPeriodicJob() from tests
* remove unused getIndex() from tests
* remove unused checkIndex() from tests
* remove unused assertIndex() from tests
* remove unused Agent.findLoopbackDevice()
---
 command/agent/agent.go             | 34 ------------------------------
 command/agent/http_test.go         | 31 ---------------------------
 command/agent/testingutils_test.go | 11 ----------
 3 files changed, 76 deletions(-)

diff --git a/command/agent/agent.go b/command/agent/agent.go
index 26f9e00a8..7695d7dea 100644
--- a/command/agent/agent.go
+++ b/command/agent/agent.go
@@ -832,40 +832,6 @@ func (a *Agent) reservePortsForClient(conf *clientconfig.Config) error {
 	return nil
 }
 
-// findLoopbackDevice iterates through all the interfaces on a machine and
-// returns the ip addr, mask of the loopback device
-func (a *Agent) findLoopbackDevice() (string, string, string, error) {
-	var ifcs []net.Interface
-	var err error
-	ifcs, err = net.Interfaces()
-	if err != nil {
-		return "", "", "", err
-	}
-	for _, ifc := range ifcs {
-		addrs, err := ifc.Addrs()
-		if err != nil {
-			return "", "", "", err
-		}
-		for _, addr := range addrs {
-			var ip net.IP
-			switch v := addr.(type) {
-			case *net.IPNet:
-				ip = v.IP
-			case *net.IPAddr:
-				ip = v.IP
-			}
-			if ip.IsLoopback() {
-				if ip.To4() == nil {
-					continue
-				}
-				return ifc.Name, ip.String(), addr.String(), nil
-			}
-		}
-	}
-
-	return "", "", "", fmt.Errorf("no loopback devices with IPV4 addr found")
-}
-
 // Leave is used gracefully exit. Clients will inform servers
 // of their departure so that allocations can be rescheduled.
 func (a *Agent) Leave() error {
diff --git a/command/agent/http_test.go b/command/agent/http_test.go
index 6c4e637eb..648f8d3b9 100644
--- a/command/agent/http_test.go
+++ b/command/agent/http_test.go
@@ -12,7 +12,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	"strconv"
 	"testing"
 	"time"
 
@@ -525,23 +524,6 @@ func TestHTTP_VerifyHTTPSClient(t *testing.T) {
 	}
 }
 
-// assertIndex tests that X-Nomad-Index is set and non-zero
-func assertIndex(t *testing.T, resp *httptest.ResponseRecorder) {
-	header := resp.Header().Get("X-Nomad-Index")
-	if header == "" || header == "0" {
-		t.Fatalf("Bad: %v", header)
-	}
-}
-
-// checkIndex is like assertIndex but returns an error
-func checkIndex(resp *httptest.ResponseRecorder) error {
-	header := resp.Header().Get("X-Nomad-Index")
-	if header == "" || header == "0" {
-		return fmt.Errorf("Bad: %v", header)
-	}
-	return nil
-}
-
 func TestHTTP_VerifyHTTPSClient_AfterConfigReload(t *testing.T) {
 	t.Parallel()
 	assert := assert.New(t)
@@ -644,19 +626,6 @@ func TestHTTP_VerifyHTTPSClient_AfterConfigReload(t *testing.T) {
 	}
 }
 
-// getIndex parses X-Nomad-Index
-func getIndex(t *testing.T, resp *httptest.ResponseRecorder) uint64 {
-	header := resp.Header().Get("X-Nomad-Index")
-	if header == "" {
-		t.Fatalf("Bad: %v", header)
-	}
-	val, err := strconv.Atoi(header)
-	if err != nil {
-		t.Fatalf("Bad: %v", header)
-	}
-	return uint64(val)
-}
-
 func httpTest(t testing.TB, cb func(c *Config), f func(srv *TestAgent)) {
 	s := makeHTTPServer(t, cb)
 	defer s.Shutdown()
diff --git a/command/agent/testingutils_test.go b/command/agent/testingutils_test.go
index 3d821cd59..8a78f1e36 100644
--- a/command/agent/testingutils_test.go
+++ b/command/agent/testingutils_test.go
@@ -99,17 +99,6 @@ func MockJob() *api.Job {
 	return job
 }
 
-func MockPeriodicJob() *api.Job {
-	j := MockJob()
-	j.Type = helper.StringToPtr("batch")
-	j.Periodic = &api.PeriodicConfig{
-		Enabled:  helper.BoolToPtr(true),
-		SpecType: helper.StringToPtr("cron"),
-		Spec:     helper.StringToPtr("*/30 * * * *"),
-	}
-	return j
-}
-
 func MockRegionalJob() *api.Job {
 	j := MockJob()
 	j.Region = helper.StringToPtr("north-america")