From 24aa4c166bc8926eccfa4a572e4212763f9c4f4f Mon Sep 17 00:00:00 2001
From: "Federico G. Schwindt" <fgsch@users.noreply.github.com>
Date: Sun, 27 Jan 2019 00:23:17 +0000
Subject: [PATCH] Fix Travis CI (#74)

* Fix some errors found by staticcheck

* Report but not fail for unused code
---
 .travis.yml |  2 +-
 waflyctl.go | 31 +++----------------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 85ec3f6..7d590b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_script:
 script:
   - dep ensure 
   - go vet 
-  - staticcheck
+  - staticcheck -fail=-U1000
   - golint -set_exit_status
 
 deploy:
diff --git a/waflyctl.go b/waflyctl.go
index 4f64299..6df3c40 100644
--- a/waflyctl.go
+++ b/waflyctl.go
@@ -34,9 +34,6 @@ var (
 	//logging variables
 	logFile string
 
-	//Trace level logging NOT USED
-	Trace *log.Logger
-
 	//Info level logging
 	Info *log.Logger
 
@@ -49,9 +46,6 @@ var (
 	// version number
 	version = "dev"
 	date    = "unknown"
-
-	//HOMEDIRECTORY static variable
-	HOMEDIRECTORY string
 )
 
 // TOMLConfig is the applications config file
@@ -327,8 +321,6 @@ func Init(configFile string) TOMLConfig {
 
 func getActiveVersion(client fastly.Client, serviceID, apiKey string, config TOMLConfig) int {
 
-	var activeVersion int
-
 	//get version list
 	apiCall := config.APIEndpoint + "/service/" + serviceID
 	resp, err := resty.R().
@@ -348,9 +340,8 @@ func getActiveVersion(client fastly.Client, serviceID, apiKey string, config TOM
 
 	//find the active version
 	for _, version := range body.Versions {
-		if version.Active == true {
-			activeVersion = version.Number
-			return activeVersion
+		if version.Active {
+			return version.Number
 		}
 	}
 
@@ -565,21 +556,6 @@ func FastlyLogging(client fastly.Client, serviceID string, version int, config T
 	return true
 }
 
-// FindCustomerID retrives a customerID using the Fastly API
-func FindCustomerID(client fastly.Client, serviceID string) string {
-
-	//have client return the service Info
-	serviceInfo, err := client.GetService(&fastly.GetServiceInput{
-		ID: serviceID,
-	})
-	if err != nil {
-		Error.Printf("could not find a customer ID for service: %v", serviceID)
-		os.Exit(1)
-
-	}
-	return serviceInfo.CustomerID
-}
-
 func checkWAF(apiKey, apiEndpoint string) bool {
 	apiCall := apiEndpoint + "/verify"
 
@@ -2072,8 +2048,7 @@ func main() {
 	}
 
 	//run init to get our logging configured
-	var config TOMLConfig
-	config = Init(*configFile)
+	config := Init(*configFile)
 
 	config.APIEndpoint = *apiEndpoint