From 8068f3cac80a2cbc64e97af040ffd2caf3234f1e Mon Sep 17 00:00:00 2001 From: Fei Xu Date: Sat, 19 May 2018 07:13:34 +0800 Subject: [PATCH] gofmt the project files (#205) --- cmd/version.go | 4 +-- providers/azure/aadMock.go | 14 +++++------ providers/azure/aciMock.go | 8 +++--- providers/azure/aci_test.go | 26 ++++++++++---------- providers/azure/acsCredential.go | 2 +- providers/azure/client/aci/client_test.go | 8 +++--- providers/azure/client/auth.go | 30 +++++++++++------------ providers/azure/config.go | 2 +- vkubelet/apiserver.go | 1 + vkubelet/provider.go | 2 +- vkubelet/vkubelet.go | 10 ++++---- 11 files changed, 54 insertions(+), 53 deletions(-) diff --git a/cmd/version.go b/cmd/version.go index 97bcd30d0..2206716a8 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -17,15 +17,15 @@ package cmd import ( "fmt" - "github.com/virtual-kubelet/virtual-kubelet/version" "github.com/spf13/cobra" + "github.com/virtual-kubelet/virtual-kubelet/version" ) // versionCmd represents the version command var versionCmd = &cobra.Command{ Use: "version", Short: "Show the version of the program", - Long: `Show the version of the program`, + Long: `Show the version of the program`, Run: func(cmd *cobra.Command, args []string) { fmt.Printf("Version: %s, Built: %s", version.Version, version.BuildTime) }, diff --git a/providers/azure/aadMock.go b/providers/azure/aadMock.go index b5d7b76d1..127a7f34f 100644 --- a/providers/azure/aadMock.go +++ b/providers/azure/aadMock.go @@ -13,8 +13,8 @@ import ( // AADMock implements a AAD mock server . type AADMock struct { - server *httptest.Server - OnAcquireToken func(http.ResponseWriter,*http.Request) + server *httptest.Server + OnAcquireToken func(http.ResponseWriter, *http.Request) } // NewAADMock creates a new AAD server mocker. @@ -26,7 +26,7 @@ func NewAADMock() *AADMock { } // Start the AAD server mocker. -func (mock *AADMock)start() { +func (mock *AADMock) start() { if mock.server != nil { return } @@ -40,8 +40,8 @@ func (mock *AADMock)start() { w.WriteHeader(http.StatusOK) token := adal.Token{ AccessToken: "Test Token", - NotBefore: strconv.FormatInt(time.Now().UnixNano(), 10), - ExpiresIn: strconv.FormatInt(int64(time.Minute), 10), + NotBefore: strconv.FormatInt(time.Now().UnixNano(), 10), + ExpiresIn: strconv.FormatInt(int64(time.Minute), 10), } b := new(bytes.Buffer) @@ -51,7 +51,7 @@ func (mock *AADMock)start() { } // GetServerURL returns the mock server URL. -func (mock *AADMock)GetServerURL() string { +func (mock *AADMock) GetServerURL() string { if mock.server != nil { return mock.server.URL } @@ -60,7 +60,7 @@ func (mock *AADMock)GetServerURL() string { } // Close terminates the AAD server mocker. -func (mock *AADMock)Close() { +func (mock *AADMock) Close() { if mock.server != nil { mock.server.Close() mock.server = nil diff --git a/providers/azure/aciMock.go b/providers/azure/aciMock.go index b64dd1bde..022321b6a 100644 --- a/providers/azure/aciMock.go +++ b/providers/azure/aciMock.go @@ -12,10 +12,10 @@ import ( // ACIMock implements a Azure Container Instance mock server. type ACIMock struct { - server *httptest.Server - OnCreate func(string, string, string, *aci.ContainerGroup) (int, interface{}) - OnGetContainerGroups func(string, string) (int, interface{}) - OnGetContainerGroup func(string, string, string) (int, interface{}) + server *httptest.Server + OnCreate func(string, string, string, *aci.ContainerGroup) (int, interface{}) + OnGetContainerGroups func(string, string) (int, interface{}) + OnGetContainerGroup func(string, string, string) (int, interface{}) } const ( diff --git a/providers/azure/aci_test.go b/providers/azure/aci_test.go index bc141a727..81d7e3722 100644 --- a/providers/azure/aci_test.go +++ b/providers/azure/aci_test.go @@ -18,8 +18,8 @@ import ( azure "github.com/virtual-kubelet/virtual-kubelet/providers/azure/client" "github.com/virtual-kubelet/virtual-kubelet/providers/azure/client/aci" "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/api/resource" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" ) @@ -29,7 +29,7 @@ const ( fakeClientID = "f14193ad-4c4c-4876-a18a-c0badb3bbd40" fakeClientSecret = "VGhpcyBpcyBhIHNlY3JldAo=" fakeTenantID = "8cb81aca-83fe-4c6f-b667-4ec09c45a8bf" - fakeNodeName = "vk" + fakeNodeName = "vk" ) // Tests create pod without resource spec @@ -47,7 +47,7 @@ func TestCreatePodWithoutResourceSpec(t *testing.T) { assert.Equal(t, fakeSubscription, subscription, "Subscription doesn't match") assert.Equal(t, fakeResourceGroup, resourceGroup, "Resource group doesn't match") assert.NotNil(t, cg, "Container group is nil") - assert.Equal(t, podNamespace + "-" + podName, containerGroup, "Container group name is not expected") + assert.Equal(t, podNamespace+"-"+podName, containerGroup, "Container group name is not expected") assert.NotNil(t, cg.ContainerGroupProperties, "Container group properties should not be nil") assert.NotNil(t, cg.ContainerGroupProperties.Containers, "Containers should not be nil") assert.Equal(t, 1, len(cg.ContainerGroupProperties.Containers), "1 Container is expected") @@ -95,7 +95,7 @@ func TestCreatePodWithResourceRequestOnly(t *testing.T) { assert.Equal(t, fakeSubscription, subscription, "Subscription doesn't match") assert.Equal(t, fakeResourceGroup, resourceGroup, "Resource group doesn't match") assert.NotNil(t, cg, "Container group is nil") - assert.Equal(t, podNamespace + "-" + podName, containerGroup, "Container group name is not expected") + assert.Equal(t, podNamespace+"-"+podName, containerGroup, "Container group name is not expected") assert.NotNil(t, cg.ContainerGroupProperties, "Container group properties should not be nil") assert.NotNil(t, cg.ContainerGroupProperties.Containers, "Containers should not be nil") assert.Equal(t, 1, len(cg.ContainerGroupProperties.Containers), "1 Container is expected") @@ -120,7 +120,7 @@ func TestCreatePodWithResourceRequestOnly(t *testing.T) { Name: "nginx", Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ - "cpu": resource.MustParse("1.981"), + "cpu": resource.MustParse("1.981"), "memory": resource.MustParse("3.49G"), }, }, @@ -149,7 +149,7 @@ func TestCreatePodWithResourceRequestAndLimit(t *testing.T) { assert.Equal(t, fakeSubscription, subscription, "Subscription doesn't match") assert.Equal(t, fakeResourceGroup, resourceGroup, "Resource group doesn't match") assert.NotNil(t, cg, "Container group is nil") - assert.Equal(t, podNamespace + "-" + podName, containerGroup, "Container group name is not expected") + assert.Equal(t, podNamespace+"-"+podName, containerGroup, "Container group name is not expected") assert.NotNil(t, cg.ContainerGroupProperties, "Container group properties should not be nil") assert.NotNil(t, cg.ContainerGroupProperties.Containers, "Containers should not be nil") assert.Equal(t, 1, len(cg.ContainerGroupProperties.Containers), "1 Container is expected") @@ -175,11 +175,11 @@ func TestCreatePodWithResourceRequestAndLimit(t *testing.T) { Name: "nginx", Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ - "cpu": resource.MustParse("1.981"), + "cpu": resource.MustParse("1.981"), "memory": resource.MustParse("3.49G"), }, Limits: v1.ResourceList{ - "cpu": resource.MustParse("3999m"), + "cpu": resource.MustParse("3999m"), "memory": resource.MustParse("8010M"), }, }, @@ -252,8 +252,8 @@ func TestGetPodsWithoutResourceRequestsLimits(t *testing.T) { }, Resources: aci.ResourceRequirements{ Requests: &aci.ResourceRequests{ - CPU: 0.99, - MemoryInGB: 1.5, + CPU: 0.99, + MemoryInGB: 1.5, }, }, }, @@ -308,7 +308,7 @@ func TestGetPodWithoutResourceRequestsLimits(t *testing.T) { aciServerMocker.OnGetContainerGroup = func(subscription, resourceGroup, containerGroup string) (int, interface{}) { assert.Equal(t, fakeSubscription, subscription, "Subscription doesn't match") assert.Equal(t, fakeResourceGroup, resourceGroup, "Resource group doesn't match") - assert.Equal(t, podNamespace + "-" + podName, containerGroup, "Container group name is not expected") + assert.Equal(t, podNamespace+"-"+podName, containerGroup, "Container group name is not expected") return http.StatusOK, aci.ContainerGroup{ Tags: map[string]string{ @@ -330,8 +330,8 @@ func TestGetPodWithoutResourceRequestsLimits(t *testing.T) { }, Resources: aci.ResourceRequirements{ Requests: &aci.ResourceRequests{ - CPU: 0.99, - MemoryInGB: 1.5, + CPU: 0.99, + MemoryInGB: 1.5, }, }, }, diff --git a/providers/azure/acsCredential.go b/providers/azure/acsCredential.go index 417bbbeca..482aa3aeb 100644 --- a/providers/azure/acsCredential.go +++ b/providers/azure/acsCredential.go @@ -35,4 +35,4 @@ func NewAcsCredential(filepath string) (*AcsCredential, error) { log.Printf("Load ACS credential file %q successfully", filepath) return &cred, nil -} \ No newline at end of file +} diff --git a/providers/azure/client/aci/client_test.go b/providers/azure/client/aci/client_test.go index b4b401792..aa8c9d5e6 100644 --- a/providers/azure/client/aci/client_test.go +++ b/providers/azure/client/aci/client_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" + "github.com/google/uuid" azure "github.com/virtual-kubelet/virtual-kubelet/providers/azure/client" "github.com/virtual-kubelet/virtual-kubelet/providers/azure/client/resourcegroups" - "github.com/google/uuid" ) var ( @@ -72,9 +72,9 @@ func TestMain(m *testing.M) { func TestNewClient(t *testing.T) { auth, err := azure.NewAuthenticationFromFile("../../../../credentials.json") - if err != nil { - log.Fatalf("Failed to load Azure authentication file: %v", err) - } + if err != nil { + log.Fatalf("Failed to load Azure authentication file: %v", err) + } c, err := NewClient(auth) if err != nil { diff --git a/providers/azure/client/auth.go b/providers/azure/client/auth.go index a5348d8f8..ab5387a91 100644 --- a/providers/azure/client/auth.go +++ b/providers/azure/client/auth.go @@ -29,33 +29,33 @@ type Authentication struct { // credentials. func NewAuthentication(azureCloud, clientID, clientSecret, subscriptionID, tenantID string) *Authentication { environment := PublicCloud - + switch azureCloud { case PublicCloud.Name: environment = PublicCloud - break; + break case USGovernmentCloud.Name: environment = USGovernmentCloud - break; + break case ChinaCloud.Name: environment = ChinaCloud - break; + break case GermanCloud.Name: environment = GermanCloud - break; + break } return &Authentication{ - ClientID: clientID, - ClientSecret: clientSecret, - SubscriptionID: subscriptionID, - TenantID: tenantID, - ActiveDirectoryEndpoint: environment.ActiveDirectoryEndpoint, - ResourceManagerEndpoint: environment.ResourceManagerEndpoint, - GraphResourceID: environment.GraphEndpoint, - SQLManagementEndpoint: environment.SQLDatabaseDNSSuffix, - GalleryEndpoint: environment.GalleryEndpoint, - ManagementEndpoint: environment.ServiceManagementEndpoint, + ClientID: clientID, + ClientSecret: clientSecret, + SubscriptionID: subscriptionID, + TenantID: tenantID, + ActiveDirectoryEndpoint: environment.ActiveDirectoryEndpoint, + ResourceManagerEndpoint: environment.ResourceManagerEndpoint, + GraphResourceID: environment.GraphEndpoint, + SQLManagementEndpoint: environment.SQLDatabaseDNSSuffix, + GalleryEndpoint: environment.GalleryEndpoint, + ManagementEndpoint: environment.ServiceManagementEndpoint, } } diff --git a/providers/azure/config.go b/providers/azure/config.go index eff785226..4a391dd92 100644 --- a/providers/azure/config.go +++ b/providers/azure/config.go @@ -5,8 +5,8 @@ import ( "io" "strings" - "github.com/virtual-kubelet/virtual-kubelet/providers" "github.com/BurntSushi/toml" + "github.com/virtual-kubelet/virtual-kubelet/providers" ) type providerConfig struct { diff --git a/vkubelet/apiserver.go b/vkubelet/apiserver.go index d3b7e2383..2ab6ead56 100644 --- a/vkubelet/apiserver.go +++ b/vkubelet/apiserver.go @@ -10,6 +10,7 @@ import ( "github.com/gorilla/mux" ) + var p Provider var r mux.Router diff --git a/vkubelet/provider.go b/vkubelet/provider.go index b73448e02..58ecb6c4f 100644 --- a/vkubelet/provider.go +++ b/vkubelet/provider.go @@ -3,9 +3,9 @@ package vkubelet import ( "github.com/virtual-kubelet/virtual-kubelet/providers/aws" "github.com/virtual-kubelet/virtual-kubelet/providers/azure" + "github.com/virtual-kubelet/virtual-kubelet/providers/cri" "github.com/virtual-kubelet/virtual-kubelet/providers/hypersh" "github.com/virtual-kubelet/virtual-kubelet/providers/web" - "github.com/virtual-kubelet/virtual-kubelet/providers/cri" "k8s.io/api/core/v1" ) diff --git a/vkubelet/vkubelet.go b/vkubelet/vkubelet.go index 6ed2cff48..daf30f936 100644 --- a/vkubelet/vkubelet.go +++ b/vkubelet/vkubelet.go @@ -13,10 +13,10 @@ import ( "github.com/virtual-kubelet/virtual-kubelet/manager" "github.com/virtual-kubelet/virtual-kubelet/providers/aws" "github.com/virtual-kubelet/virtual-kubelet/providers/azure" + "github.com/virtual-kubelet/virtual-kubelet/providers/cri" "github.com/virtual-kubelet/virtual-kubelet/providers/hypersh" "github.com/virtual-kubelet/virtual-kubelet/providers/mock" "github.com/virtual-kubelet/virtual-kubelet/providers/web" - "github.com/virtual-kubelet/virtual-kubelet/providers/cri" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -150,10 +150,10 @@ func (s *Server) registerNode() error { ObjectMeta: metav1.ObjectMeta{ Name: s.nodeName, Labels: map[string]string{ - "type": "virtual-kubelet", - "kubernetes.io/role": "agent", - "beta.kubernetes.io/os": strings.ToLower(s.provider.OperatingSystem()), - "kubernetes.io/hostname": s.nodeName, + "type": "virtual-kubelet", + "kubernetes.io/role": "agent", + "beta.kubernetes.io/os": strings.ToLower(s.provider.OperatingSystem()), + "kubernetes.io/hostname": s.nodeName, "alpha.service-controller.kubernetes.io/exclude-balancer": "true", }, },