Reformat with Go Imports

killianmuldoon · togashidm · commit 2e50bef59845 · 2021-04-02T20:20:11.000+01:00
TAS code imports have drifted from correct formatting over time.
This change runs Go Imports across the project to ensure compliance
with Go Import rules.
diff --git a/cmd/main.go b/cmd/main.go
@@ -2,6 +2,12 @@ package main
 
 import (
 	"flag"
+	"log"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
+
 	"github.com/intel/telemetry-aware-scheduling/pkg/controller"
 	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
 	"github.com/intel/telemetry-aware-scheduling/pkg/scheduler"
@@ -14,13 +20,9 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	"log"
-	"os"
-	"os/signal"
-	"syscall"
-	"time"
 
 	"context"
+
 	tascache "github.com/intel/telemetry-aware-scheduling/pkg/cache"
 )
 
diff --git a/pkg/cache/autoupdating.go b/pkg/cache/autoupdating.go
@@ -3,11 +3,12 @@ package cache
 import (
 	"errors"
 	"fmt"
-	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
-	telemetrypolicy "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
 	"log"
 	"sync"
 	"time"
+
+	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
+	telemetrypolicy "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
 )
 
 const (
diff --git a/pkg/cache/autoupdating_test.go b/pkg/cache/autoupdating_test.go
@@ -1,12 +1,13 @@
 package cache
 
 import (
-	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
-	telemetrypolicy "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
 	"log"
 	"reflect"
 	"testing"
 	"time"
+
+	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
+	telemetrypolicy "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
 )
 
 func TestNodeMetricsCache_PeriodicUpdate(t *testing.T) {
diff --git a/pkg/cache/mocks.go b/pkg/cache/mocks.go
@@ -2,11 +2,12 @@ package cache
 
 //This file contains mock methods and objects which are used to test across the TAS packages.
 import (
+	"time"
+
 	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
 	telemetrypolicy "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"time"
 )
 
 //MockEmptySelfUpdatingCache returns auto updating cache
diff --git a/pkg/cache/types.go b/pkg/cache/types.go
@@ -1,9 +1,10 @@
 package cache
 
 import (
+	"time"
+
 	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
 	telemetrypolicy "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
-	"time"
 )
 
 //Reader is the functionality to read metrics and policies from the cache
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -5,6 +5,8 @@ package controller
 import (
 	"context"
 	"errors"
+	"log"
+
 	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"
@@ -13,7 +15,6 @@ import (
 	core "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/client-go/tools/cache"
-	"log"
 )
 
 //Run starts the controller watching on the Informer queue and doesnt' stop it until the Done signal is received from context
diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go
@@ -4,11 +4,12 @@ package controller
 
 import (
 	"context"
-	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
-	strategy "github.com/intel/telemetry-aware-scheduling/pkg/strategies/core"
 	"net/http/httptest"
 	"testing"
 
+	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
+	strategy "github.com/intel/telemetry-aware-scheduling/pkg/strategies/core"
+
 	"k8s.io/client-go/rest"
 )
 
diff --git a/pkg/metrics/client_test.go b/pkg/metrics/client_test.go
@@ -4,12 +4,13 @@ import (
 	"bytes"
 	"fmt"
 	"io/ioutil"
-	"k8s.io/client-go/tools/clientcmd"
 	"log"
 	"reflect"
 	"testing"
 	"time"
 
+	"k8s.io/client-go/tools/clientcmd"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/metrics/mocks.go b/pkg/metrics/mocks.go
@@ -5,11 +5,12 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
+	"time"
+
 	"k8s.io/apimachinery/pkg/api/resource"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-	"time"
 )
 
 //DummyRestClientConfig  Mocks used for testing in the metrics and other packages
diff --git a/pkg/scheduler/types.go b/pkg/scheduler/types.go
@@ -1,8 +1,9 @@
 package scheduler
 
 import (
-	v1 "k8s.io/api/core/v1"
 	"net/http"
+
+	v1 "k8s.io/api/core/v1"
 )
 
 //ExtenderScheduler has the capabilities needed to prioritize and filter nodes based on http requests.
diff --git a/pkg/strategies/core/enforcer.go b/pkg/strategies/core/enforcer.go
@@ -1,11 +1,12 @@
 package core
 
 import (
-	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
-	"k8s.io/client-go/kubernetes"
 	"log"
 	"sync"
 	"time"
+
+	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
+	"k8s.io/client-go/kubernetes"
 )
 
 //MetricEnforcer instruments behavior to register strategies and trigger their enforcement actions.
diff --git a/pkg/strategies/core/enforcer_test.go b/pkg/strategies/core/enforcer_test.go
@@ -1,11 +1,12 @@
 package core
 
 import (
-	"k8s.io/client-go/kubernetes"
-	testclient "k8s.io/client-go/kubernetes/fake"
 	"log"
 	"reflect"
 	"testing"
+
+	"k8s.io/client-go/kubernetes"
+	testclient "k8s.io/client-go/kubernetes/fake"
 )
 
 var mockedStrategy = &MockStrategy{StrategyTypeMock: "mocko"}
diff --git a/pkg/strategies/core/operator.go b/pkg/strategies/core/operator.go
@@ -1,10 +1,11 @@
 package core
 
 import (
+	"sort"
+
 	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
 	telempol "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"sort"
 )
 
 //EvaluateRule returns a boolean after implementing the function described in the TASPolicyRule.
diff --git a/pkg/strategies/core/operator_test.go b/pkg/strategies/core/operator_test.go
@@ -1,13 +1,14 @@
 package core
 
 import (
-	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
-	telemetrypolicy "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
-	"k8s.io/apimachinery/pkg/api/resource"
 	"log"
 	"reflect"
 	"testing"
 	"time"
+
+	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
+	telemetrypolicy "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
+	"k8s.io/apimachinery/pkg/api/resource"
 )
 
 func testNodeMetricCustomInfo(nodeNames []string, numbers []int64) metrics.NodeMetricsInfo {
diff --git a/pkg/strategies/core/types.go b/pkg/strategies/core/types.go
@@ -3,8 +3,9 @@
 package core
 
 import (
-	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
 	"time"
+
+	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
 )
 
 //Interface describes expected behavior of a specific strategy.
diff --git a/pkg/strategies/deschedule/enforce.go b/pkg/strategies/deschedule/enforce.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+
 	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
 	strategy "github.com/intel/telemetry-aware-scheduling/pkg/strategies/core"
 	v1 "k8s.io/api/core/v1"
diff --git a/pkg/strategies/deschedule/enforce_test.go b/pkg/strategies/deschedule/enforce_test.go
@@ -2,6 +2,10 @@ package deschedule
 
 import (
 	"context"
+	"log"
+	"testing"
+	"time"
+
 	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
 	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
 	strategy "github.com/intel/telemetry-aware-scheduling/pkg/strategies/core"
@@ -11,9 +15,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	testclient "k8s.io/client-go/kubernetes/fake"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
-	"log"
-	"testing"
-	"time"
 )
 
 func TestDescheduleStrategy_Enforce(t *testing.T) {
diff --git a/pkg/strategies/deschedule/strategy.go b/pkg/strategies/deschedule/strategy.go
@@ -5,10 +5,11 @@ package deschedule
 
 import (
 	"fmt"
+	"log"
+
 	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
 	"github.com/intel/telemetry-aware-scheduling/pkg/strategies/core"
 	telempol "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
-	"log"
 )
 
 //StrategyType is set to de-schedule.
diff --git a/pkg/strategies/deschedule/strategy_test.go b/pkg/strategies/deschedule/strategy_test.go
@@ -4,15 +4,16 @@
 package deschedule
 
 import (
+	"log"
+	"reflect"
+	"testing"
+	"time"
+
 	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
 	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
 	"github.com/intel/telemetry-aware-scheduling/pkg/strategies/core"
 	v1 "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"log"
-	"reflect"
-	"testing"
-	"time"
 )
 
 func TestDescheduleStrategy_SetPolicyName(t *testing.T) {
diff --git a/pkg/strategies/dontschedule/strategy.go b/pkg/strategies/dontschedule/strategy.go
@@ -4,10 +4,11 @@ package dontschedule
 
 import (
 	"fmt"
+	"log"
+
 	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
 	"github.com/intel/telemetry-aware-scheduling/pkg/strategies/core"
 	telemetryPolicyV1 "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
-	"log"
 )
 
 //Strategy represents the TAS policy strategies.
diff --git a/pkg/strategies/dontschedule/strategy_test.go b/pkg/strategies/dontschedule/strategy_test.go
@@ -1,14 +1,15 @@
 package dontschedule
 
 import (
+	"reflect"
+	"testing"
+	"time"
+
 	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
 	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
 	"github.com/intel/telemetry-aware-scheduling/pkg/strategies/core"
 	v1 "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"reflect"
-	"testing"
-	"time"
 )
 
 func TestDontScheduleStrategy_Violated(t *testing.T) {
diff --git a/pkg/telemetrypolicy/client/v1alpha1/client.go b/pkg/telemetrypolicy/client/v1alpha1/client.go
@@ -2,6 +2,7 @@ package client
 
 import (
 	"context"
+
 	telemetrypolicy "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
diff --git a/pkg/telemetryscheduler/scheduler_test.go b/pkg/telemetryscheduler/scheduler_test.go
@@ -5,20 +5,21 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
 	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
 	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
 	"github.com/intel/telemetry-aware-scheduling/pkg/scheduler"
 	telpolv1 "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
 	telpolclient "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/client/v1alpha1"
-	"io/ioutil"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/rest"
-	"log"
-	"net/http"
-	"net/http/httptest"
-	"testing"
 )
 
 var prioritizerArgs1 = scheduler.ExtenderArgs{
diff --git a/pkg/telemetryscheduler/telemetryscheduler.go b/pkg/telemetryscheduler/telemetryscheduler.go
@@ -5,6 +5,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log"
+	"net/http"
+	"strings"
+
 	"github.com/intel/telemetry-aware-scheduling/pkg/cache"
 	"github.com/intel/telemetry-aware-scheduling/pkg/metrics"
 	"github.com/intel/telemetry-aware-scheduling/pkg/scheduler"
@@ -13,9 +17,6 @@ import (
 	"github.com/intel/telemetry-aware-scheduling/pkg/strategies/scheduleonmetric"
 	telemetrypolicy "github.com/intel/telemetry-aware-scheduling/pkg/telemetrypolicy/api/v1alpha1"
 	v1 "k8s.io/api/core/v1"
-	"log"
-	"net/http"
-	"strings"
 )
 
 var tasPolicy = "telemetry-policy"

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`package scheduler`
`2`	`2`
`3`	`3`	`import (`
`4`		`- v1 "k8s.io/api/core/v1"`
`5`	`4`	`"net/http"`
	`5`	`+`
	`6`	`+ v1 "k8s.io/api/core/v1"`
`6`	`7`	`)`
`7`	`8`
`8`	`9`	`//ExtenderScheduler has the capabilities needed to prioritize and filter nodes based on http requests.`