Reformat code with gofmt

killianmuldoon · togashidm · commit 7aa8cfc28abd · 2021-04-02T20:20:11.000+01:00
There were a number of go format violations in the project.
This change results in a properly formatted go project.
diff --git a/cmd/main.go b/cmd/main.go
@@ -5,12 +5,12 @@ import (
 	"github.com/intel/telemetry-aware-scheduling/pkg/controller"
 	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
 	"github.com/intel/telemetry-aware-scheduling/pkg/scheduler"
-	"github.com/intel/telemetry-aware-scheduling/pkg/telemetryscheduler"
 	strategy "github.com/intel/telemetry-aware-scheduling/pkg/strategies/core"
 	"github.com/intel/telemetry-aware-scheduling/pkg/strategies/deschedule"
 	"github.com/intel/telemetry-aware-scheduling/pkg/strategies/dontschedule"
 	"github.com/intel/telemetry-aware-scheduling/pkg/strategies/scheduleonmetric"
 	telemetrypolicyclient "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/client/v1alpha1"
+	"github.com/intel/telemetry-aware-scheduling/pkg/telemetryscheduler"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -36,7 +36,7 @@ func main() {
 	flag.StringVar(&syncPeriod, "syncPeriod", "5s", "length of time in seconds between metrics updates")
 	flag.Parse()
 	cache := tascache.NewAutoUpdatingCache()
-	tscheduler  := telemetryscheduler.NewMetricsExtender(cache)
+	tscheduler := telemetryscheduler.NewMetricsExtender(cache)
 	sch := scheduler.Server{ExtenderScheduler: tscheduler}
 	go sch.StartServer(port, certFile, keyFile, caFile, unsafe)
 	tasController(kubeConfig, syncPeriod, cache)
diff --git a/pkg/cache/autoupdating.go b/pkg/cache/autoupdating.go
@@ -92,6 +92,7 @@ func (n *AutoUpdatingCache) ReadPolicy(namespace string, policyName string) (tel
 	}
 	return telemetrypolicy.TASPolicy{}, errors.New("no policy of this name found")
 }
+
 //WritePolicy sends the passed object to be stored in the cache under the namespace/name
 func (n *AutoUpdatingCache) WritePolicy(namespace string, policyName string, policy telemetrypolicy.TASPolicy) error {
 	n.add(fmt.Sprintf(policyPath, namespace, policyName), policy)
diff --git a/pkg/cache/autoupdating_test.go b/pkg/cache/autoupdating_test.go
@@ -86,7 +86,7 @@ func TestNodeMetricsCache_ReadMetric(t *testing.T) {
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
-					t.Errorf("AutoUpdatingCache.ReadMetric() = %v, deleted %v", got, tt.want)
+				t.Errorf("AutoUpdatingCache.ReadMetric() = %v, deleted %v", got, tt.want)
 			}
 		})
 	}
@@ -117,7 +117,7 @@ func TestNodeMetricsCache_ReadPolicy(t *testing.T) {
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
-					t.Errorf("AutoUpdatingCache.ReadPolicy() = %v, deleted %v", got, tt.want)
+				t.Errorf("AutoUpdatingCache.ReadPolicy() = %v, deleted %v", got, tt.want)
 			}
 			if tt.wantErr {
 				t.Errorf("no error fired")
diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go
@@ -38,6 +38,7 @@ func (c concurrentCache) newRequest(t requestType) request {
 		return request{Type: t}
 	}
 }
+
 //run runs a constant goroutine waiting for requests and setting up the initial data structure.
 func (c concurrentCache) run(ch chan request, initialData map[string]interface{}) {
 	cache := initialData
@@ -60,6 +61,7 @@ func (c concurrentCache) run(ch chan request, initialData map[string]interface{}
 		}
 	}
 }
+
 //Send to channel is a helper method that sends the request to the passed channel.
 func sendToChannel(ch chan request, req request) {
 	ch <- req
@@ -81,6 +83,7 @@ func (c concurrentCache) delete(key string) {
 	r.Key = key
 	sendToChannel(c.cache, r)
 }
+
 //Read creates a read request and sends it into the cache channel.
 func (c concurrentCache) read(itemName string) interface{} {
 	r := c.newRequest(READ)
diff --git a/pkg/cache/mocks.go b/pkg/cache/mocks.go
@@ -1,4 +1,5 @@
 package cache
+
 //This file contains mock methods and objects which are used to test across the TAS packages.
 import (
 	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -25,6 +25,7 @@ func (controller *TelemetryPolicyController) Run(context context.Context) {
 	}
 	<-context.Done()
 }
+
 //Watch sets up the watcher on the kubernetes api server and adds event handlers for add, update and delete.
 func (controller *TelemetryPolicyController) watch(context context.Context) (cache.Controller, error) {
 	source := cache.NewListWatchFromClient(
@@ -47,7 +48,6 @@ func (controller *TelemetryPolicyController) watch(context context.Context) (cac
 	return policyController, nil
 }
 
-
 //onAdd fires when the controller sees a new policy in the apiserver. It adds the policy to the cache and adds each of its metrics to the cache.
 // It also adds the strategies contained in the policy to the strategy enforcer.
 func (controller *TelemetryPolicyController) onAdd(obj interface{}) {
@@ -119,7 +119,7 @@ func (controller *TelemetryPolicyController) onUpdate(old, new interface{}) {
 		controller.Enforcer.RemoveStrategy(oldStrat, oldStrat.StrategyType())
 		for _, rule := range oldPol.Spec.Strategies[oldStrat.StrategyType()].Rules {
 			err := controller.DeleteMetric(rule.Metricname)
-			if err != nil{
+			if err != nil {
 				log.Print(err)
 			}
 		}
@@ -153,12 +153,12 @@ func (controller *TelemetryPolicyController) onDelete(obj interface{}) {
 		controller.Enforcer.RemoveStrategy(strt, strt.StrategyType())
 		for _, rule := range polCopy.Spec.Strategies[strt.StrategyType()].Rules {
 			err := controller.DeleteMetric(rule.Metricname)
-			if err != nil{
+			if err != nil {
 				log.Print(err)
 			}
 		}
 	}
-	err:= controller.DeletePolicy(polCopy.Namespace, polCopy.Name)
+	err := controller.DeletePolicy(polCopy.Namespace, polCopy.Name)
 	if err != nil {
 		log.Print(err)
 		return
diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go
@@ -46,4 +46,4 @@ func TestTelemetryPolicyController_Run(t *testing.T) {
 		})
 		mockServer.Close()
 	}
-}
+}
diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
@@ -65,10 +65,10 @@ will not run.
 //handlerWithMiddleware is handler wrapped with middleware to serve the prechecks at endpoint
 func handlerWithMiddleware(handle http.HandlerFunc) http.HandlerFunc {
 	return requestContentType(
-				contentLength(
-					postOnly(handle),
-				),
-			)
+		contentLength(
+			postOnly(handle),
+		),
+	)
 }
 
 //error handler deals with requests sent to an invalid endpoint and returns a 404.
@@ -93,7 +93,7 @@ func checkSymLinks(filename string) error {
 // StartServer starts the HTTP server needed for scheduler.
 // It registers the handlers and checks for existing telemetry policies.
 func (m Server) StartServer(port string, certFile string, keyFile string, caFile string, unsafe bool) {
-	mx:= http.NewServeMux()
+	mx := http.NewServeMux()
 	mx.HandleFunc("/", handlerWithMiddleware(errorHandler))
 	mx.HandleFunc("/scheduler/prioritize", handlerWithMiddleware(m.Prioritize))
 	mx.HandleFunc("/scheduler/filter", handlerWithMiddleware(m.Filter))
@@ -132,13 +132,13 @@ func configureSecureServer(port string, caFile string) *http.Server {
 	caCertPool.AppendCertsFromPEM(caCert)
 
 	cfg := &tls.Config{
-		MinVersion:			tls.VersionTLS12,
-		CurvePreferences:		[]tls.CurveID{tls.CurveP521, tls.CurveP384, tls.CurveP256},
-		ClientCAs:			caCertPool,
-		ClientAuth:			tls.RequireAndVerifyClientCert,
-		PreferServerCipherSuites: 	true,
-		InsecureSkipVerify:       	false,
-		CipherSuites:			[]uint16{
+		MinVersion:               tls.VersionTLS12,
+		CurvePreferences:         []tls.CurveID{tls.CurveP521, tls.CurveP384, tls.CurveP256},
+		ClientCAs:                caCertPool,
+		ClientAuth:               tls.RequireAndVerifyClientCert,
+		PreferServerCipherSuites: true,
+		InsecureSkipVerify:       false,
+		CipherSuites: []uint16{
 			// tls 1.2
 			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
 			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
diff --git a/pkg/strategies/core/enforcer_test.go b/pkg/strategies/core/enforcer_test.go
@@ -288,4 +288,3 @@ func TestMetricEnforcer_RemoveStrategy(t *testing.T) {
 		})
 	}
 }
-
diff --git a/pkg/strategies/core/mocks.go b/pkg/strategies/core/mocks.go
@@ -35,6 +35,6 @@ func (v *MockStrategy) GetPolicyName() string {
 }
 
 //SetPolicyName sets the policy name of the mock strategy
-func (v *MockStrategy) SetPolicyName( policyName string)  {
+func (v *MockStrategy) SetPolicyName(policyName string) {
 
-}
+}
diff --git a/pkg/strategies/core/operator.go b/pkg/strategies/core/operator.go
@@ -23,6 +23,7 @@ func EvaluateRule(value resource.Quantity, rule telempol.TASPolicyRule) bool {
 	}
 	return operators[rule.Operator](value, rule.Target)
 }
+
 //OrderedList will return a list of nodes ordered by their linked metric and operator
 //TODO: Make this method more generic so it can use objects other than nodes.
 func OrderedList(metricsInfo metrics.NodeMetricsInfo, operator string) []NodeSortableMetric {
diff --git a/pkg/strategies/deschedule/enforce.go b/pkg/strategies/deschedule/enforce.go
@@ -129,4 +129,4 @@ func (d *Strategy) nodeStatusForStrategy(enforcer *strategy.MetricEnforcer, cach
 		}
 	}
 	return violations
-}
+}
diff --git a/pkg/strategies/deschedule/enforce_test.go b/pkg/strategies/deschedule/enforce_test.go
@@ -74,4 +74,3 @@ func TestDescheduleStrategy_Enforce(t *testing.T) {
 		})
 	}
 }
-
diff --git a/pkg/strategies/dontschedule/strategy.go b/pkg/strategies/dontschedule/strategy.go
@@ -51,7 +51,7 @@ func (d *Strategy) StrategyType() string {
 
 //Equals implementation which checks to see if all rules and the policy name are equal for this strategy and another.
 //Used to avoid duplications and to find the correct strategy for deletions in the index.
-func (d *Strategy) Equals( other core.Interface) bool {
+func (d *Strategy) Equals(other core.Interface) bool {
 	OtherDontScheduleStrategy, ok := other.(*Strategy)
 	sameName := other.GetPolicyName() == d.GetPolicyName()
 	if ok && sameName && len(d.Rules) > 0 && len(d.Rules) == len(OtherDontScheduleStrategy.Rules) {
@@ -81,6 +81,7 @@ func (d *Strategy) SetPolicyName(policyName string) {
 func (d *Strategy) GetPolicyName() string {
 	return d.PolicyName
 }
+
 //Formats the rules as an interpretable string.
 func ruleToString(rule telemetryPolicyV1.TASPolicyRule) string {
 	return fmt.Sprintf("%v %v %v", rule.Metricname, rule.Operator, rule.Target)
diff --git a/pkg/strategies/dontschedule/strategy_test.go b/pkg/strategies/dontschedule/strategy_test.go
@@ -125,4 +125,3 @@ func TestDontScheduleStrategy_Enforce(t *testing.T) {
 		})
 	}
 }
-
diff --git a/pkg/telemetrypolicy/client/v1alpha1/client.go b/pkg/telemetrypolicy/client/v1alpha1/client.go
@@ -86,6 +86,7 @@ func (client *Client) List(options metav1.ListOptions) (*telemetrypolicy.TASPoli
 func (client *Client) NewListWatch() *cache.ListWatch {
 	return cache.NewListWatchFromClient(client.rest, client.plural, client.namespace, fields.Everything())
 }
+
 // groupversion gives access to the Group Version struct for the API
 func groupVersion() schema.GroupVersion {
 	return schema.GroupVersion{
diff --git a/pkg/telemetryscheduler/scheduler_test.go b/pkg/telemetryscheduler/scheduler_test.go
@@ -71,7 +71,7 @@ var testPolicy2 = telpolv1.TASPolicy{
 			"dontschedule": {
 				PolicyName: "test-policy",
 				Rules: []telpolv1.TASPolicyRule{
-					{Metricname:"dummyMetric1", Operator: "GreaterThan", Target: 40},
+					{Metricname: "dummyMetric1", Operator: "GreaterThan", Target: 40},
 				},
 			},
 		},
@@ -186,8 +186,8 @@ func TestMetricsExtender_Prioritize(t *testing.T) {
 			[]scheduler.HostPriority{{Host: "node B", Score: 10}},
 			true,
 		},
-		{"malformed arguments return error",fields{*dummyClient, cache.MockEmptySelfUpdatingCache(),
-				testPolicy1},
+		{"malformed arguments return error", fields{*dummyClient, cache.MockEmptySelfUpdatingCache(),
+			testPolicy1},
 			args{httptest.NewRequest("POST", "http://localhost/scheduler/prioritize", nil)},
 			map[string]metrics.NodeMetric{"node A": {Value: *resource.NewQuantity(100, resource.DecimalSI)}},
 			scheduler.ExtenderArgs{},
@@ -332,4 +332,3 @@ func TestMetricsExtender_Filter(t *testing.T) {
 		})
 	}
 }
-
diff --git a/pkg/telemetryscheduler/telemetryscheduler.go b/pkg/telemetryscheduler/telemetryscheduler.go
@@ -226,11 +226,10 @@ func (m MetricsExtender) getDontScheduleStrategy(policy telemetrypolicy.TASPolic
 	return dontscheduleStrategy, nil
 }
 
-
 //WriteFilterResponse takes the ExtenderFilterResults struct and writes it as a http response if valid.
 func (m MetricsExtender) WriteFilterResponse(w http.ResponseWriter, result *scheduler.ExtenderFilterResult) {
 	encoder := json.NewEncoder(w)
 	if err := encoder.Encode(result); err != nil {
 		http.Error(w, "Encode error", http.StatusBadRequest)
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ func (n *AutoUpdatingCache) ReadPolicy(namespace string, policyName string) (tel`
`92`	`92`	`}`
`93`	`93`	`return telemetrypolicy.TASPolicy{}, errors.New("no policy of this name found")`
`94`	`94`	`}`
	`95`	`+`
`95`	`96`	`//WritePolicy sends the passed object to be stored in the cache under the namespace/name`
`96`	`97`	`func (n *AutoUpdatingCache) WritePolicy(namespace string, policyName string, policy telemetrypolicy.TASPolicy) error {`
`97`	`98`	`n.add(fmt.Sprintf(policyPath, namespace, policyName), policy)`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func TestNodeMetricsCache_ReadMetric(t *testing.T) {`
`86`	`86`	`return`
`87`	`87`	`}`
`88`	`88`	`if !reflect.DeepEqual(got, tt.want) {`
`89`		`- t.Errorf("AutoUpdatingCache.ReadMetric() = %v, deleted %v", got, tt.want)`
	`89`	`+ t.Errorf("AutoUpdatingCache.ReadMetric() = %v, deleted %v", got, tt.want)`
`90`	`90`	`}`
`91`	`91`	`})`
`92`	`92`	`}`
`@@ -117,7 +117,7 @@ func TestNodeMetricsCache_ReadPolicy(t *testing.T) {`
`117`	`117`	`return`
`118`	`118`	`}`
`119`	`119`	`if !reflect.DeepEqual(got, tt.want) {`
`120`		`- t.Errorf("AutoUpdatingCache.ReadPolicy() = %v, deleted %v", got, tt.want)`
	`120`	`+ t.Errorf("AutoUpdatingCache.ReadPolicy() = %v, deleted %v", got, tt.want)`
`121`	`121`	`}`
`122`	`122`	`if tt.wantErr {`
`123`	`123`	`t.Errorf("no error fired")`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ func (c concurrentCache) newRequest(t requestType) request {`
`38`	`38`	`return request{Type: t}`
`39`	`39`	`}`
`40`	`40`	`}`
	`41`	`+`
`41`	`42`	`//run runs a constant goroutine waiting for requests and setting up the initial data structure.`
`42`	`43`	`func (c concurrentCache) run(ch chan request, initialData map[string]interface{}) {`
`43`	`44`	`cache := initialData`
`@@ -60,6 +61,7 @@ func (c concurrentCache) run(ch chan request, initialData map[string]interface{}`
`60`	`61`	`}`
`61`	`62`	`}`
`62`	`63`	`}`
	`64`	`+`
`63`	`65`	`//Send to channel is a helper method that sends the request to the passed channel.`
`64`	`66`	`func sendToChannel(ch chan request, req request) {`
`65`	`67`	`ch <- req`
`@@ -81,6 +83,7 @@ func (c concurrentCache) delete(key string) {`
`81`	`83`	`r.Key = key`
`82`	`84`	`sendToChannel(c.cache, r)`
`83`	`85`	`}`
	`86`	`+`
`84`	`87`	`//Read creates a read request and sends it into the cache channel.`
`85`	`88`	`func (c concurrentCache) read(itemName string) interface{} {`
`86`	`89`	`r := c.newRequest(READ)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`package cache`
	`2`	`+`
`2`	`3`	`//This file contains mock methods and objects which are used to test across the TAS packages.`
`3`	`4`	`import (`
`4`	`5`	`"github.com/intel/telemetry-aware-scheduling/pkg/metrics"`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ func (controller *TelemetryPolicyController) Run(context context.Context) {`
`25`	`25`	`}`
`26`	`26`	`<-context.Done()`
`27`	`27`	`}`
	`28`	`+`
`28`	`29`	`//Watch sets up the watcher on the kubernetes api server and adds event handlers for add, update and delete.`
`29`	`30`	`func (controller *TelemetryPolicyController) watch(context context.Context) (cache.Controller, error) {`
`30`	`31`	`source := cache.NewListWatchFromClient(`
`@@ -47,7 +48,6 @@ func (controller *TelemetryPolicyController) watch(context context.Context) (cac`
`47`	`48`	`return policyController, nil`
`48`	`49`	`}`
`49`	`50`
`50`		`-`
`51`	`51`	`//onAdd fires when the controller sees a new policy in the apiserver. It adds the policy to the cache and adds each of its metrics to the cache.`
`52`	`52`	`// It also adds the strategies contained in the policy to the strategy enforcer.`
`53`	`53`	`func (controller *TelemetryPolicyController) onAdd(obj interface{}) {`
`@@ -119,7 +119,7 @@ func (controller *TelemetryPolicyController) onUpdate(old, new interface{}) {`
`119`	`119`	`controller.Enforcer.RemoveStrategy(oldStrat, oldStrat.StrategyType())`
`120`	`120`	`for _, rule := range oldPol.Spec.Strategies[oldStrat.StrategyType()].Rules {`
`121`	`121`	`err := controller.DeleteMetric(rule.Metricname)`
`122`		`- if err != nil{`
	`122`	`+ if err != nil {`
`123`	`123`	`log.Print(err)`
`124`	`124`	`}`
`125`	`125`	`}`
`@@ -153,12 +153,12 @@ func (controller *TelemetryPolicyController) onDelete(obj interface{}) {`
`153`	`153`	`controller.Enforcer.RemoveStrategy(strt, strt.StrategyType())`
`154`	`154`	`for _, rule := range polCopy.Spec.Strategies[strt.StrategyType()].Rules {`
`155`	`155`	`err := controller.DeleteMetric(rule.Metricname)`
`156`		`- if err != nil{`
	`156`	`+ if err != nil {`
`157`	`157`	`log.Print(err)`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`	`}`
`161`		`- err:= controller.DeletePolicy(polCopy.Namespace, polCopy.Name)`
	`161`	`+ err := controller.DeletePolicy(polCopy.Namespace, polCopy.Name)`
`162`	`162`	`if err != nil {`
`163`	`163`	`log.Print(err)`
`164`	`164`	`return`
Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,4 @@ func TestTelemetryPolicyController_Run(t *testing.T) {`
`46`	`46`	`})`
`47`	`47`	`mockServer.Close()`
`48`	`48`	`}`
`49`		`-}`
	`49`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -288,4 +288,3 @@ func TestMetricEnforcer_RemoveStrategy(t *testing.T) {`
`288`	`288`	`})`
`289`	`289`	`}`
`290`	`290`	`}`
`291`		`-`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ func (v *MockStrategy) GetPolicyName() string {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`//SetPolicyName sets the policy name of the mock strategy`
`38`		`-func (v *MockStrategy) SetPolicyName( policyName string) {`
	`38`	`+func (v *MockStrategy) SetPolicyName(policyName string) {`
`39`	`39`
`40`		`-}`
	`40`	`+}`