Formated files with --simplify flag

ernoaapa · Feb 8, 2018 · ae8186c · ae8186c
1 parent f73a7d0
commit ae8186c
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 19 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+  "go.formatTool": "gofmt",
+  "go.formatFlags": [
+    "-s"
+  ]
+}
diff --git a/cmd/eli/runCommand.go b/cmd/eli/runCommand.go
@@ -125,7 +125,7 @@ var runCommand = cli.Command{
 			Spec: &pods.PodSpec{
 				HostNetwork: true,
 				Containers: []*containers.Container{
-					&containers.Container{
+					{
 						Name:       name,
 						Image:      image,
 						Tty:        tty,

diff --git a/cmd/eli/upCommand.go b/cmd/eli/upCommand.go
@@ -166,7 +166,7 @@ var upCommand = cli.Command{
 			Spec: &pods.PodSpec{
 				HostNetwork: true,
 				Containers: []*containers.Container{
-					&containers.Container{
+					{
 						Name:       name,
 						Image:      image,
 						Tty:        tty,

diff --git a/pkg/api/server_test.go b/pkg/api/server_test.go
@@ -8,10 +8,10 @@ import (
 
 func TestGetMetadataValue(t *testing.T) {
 	md := map[string][]string{
-		"foo": []string{
+		"foo": {
 			"bar",
 		},
-		"crazy": []string{
+		"crazy": {
 			"first",
 			"second",
 		},

diff --git a/pkg/api/services/pods/v1/defaults_test.go b/pkg/api/services/pods/v1/defaults_test.go
@@ -10,22 +10,22 @@ import (
 
 func TestDefaults(t *testing.T) {
 	pods := []*Pod{
-		&Pod{
+		{
 			Metadata: &core.ResourceMetadata{
 				Name: "foobar",
 			},
 			Spec: &PodSpec{
 				Containers: []*containers.Container{},
 			},
 		},
-		&Pod{
+		{
 			Metadata: &core.ResourceMetadata{
 				Name:      "foobar",
 				Namespace: "my-namespace",
 			},
 			Spec: &PodSpec{
 				Containers: []*containers.Container{
-					&containers.Container{
+					{
 						Name:  "foo",
 						Image: "docker.io/library/hello-world:latest",
 					},

diff --git a/pkg/model/pod_test.go b/pkg/model/pod_test.go
@@ -48,7 +48,7 @@ func TestValidationRequiresMetadata(t *testing.T) {
 	assert.Error(t, getValidator().Struct(Pod{
 		Spec: PodSpec{
 			Containers: []Container{
-				Container{
+				{
 					Name:  "foo",
 					Image: "docker.io/eaapa/hello-world:latest",
 				},
@@ -62,7 +62,7 @@ func TestValidationNameMetadata(t *testing.T) {
 		Metadata: Metadata{},
 		Spec: PodSpec{
 			Containers: []Container{
-				Container{
+				{
 					Name:  "foo",
 					Image: "docker.io/eaapa/hello-world:latest",
 				},
@@ -76,7 +76,7 @@ func TestValidationNameMetadata(t *testing.T) {
 		},
 		Spec: PodSpec{
 			Containers: []Container{
-				Container{
+				{
 					Name:  "foo",
 					Image: "docker.io/eaapa/hello-world:latest",
 				},
@@ -93,7 +93,7 @@ func TestValidationNamespaceMetadata(t *testing.T) {
 		},
 		Spec: PodSpec{
 			Containers: []Container{
-				Container{
+				{
 					Name:  "foo",
 					Image: "docker.io/eaapa/hello-world:latest",
 				},

diff --git a/pkg/model/validation_test.go b/pkg/model/validation_test.go
@@ -8,13 +8,13 @@ import (
 
 func TestValidationIsValid(t *testing.T) {
 	err := Validate([]Pod{
-		Pod{
+		{
 			Metadata: Metadata{
 				Name: "foo",
 			},
 			Spec: PodSpec{
 				Containers: []Container{
-					Container{
+					{
 						Name:  "foo-1",
 						Image: "docker.io/library/foobar",
 						Args: []string{

diff --git a/pkg/printers/interface_test.go b/pkg/printers/interface_test.go
@@ -20,8 +20,8 @@ var examplePod = &pods.Pod{
 	},
 	Spec: &pods.PodSpec{
 		Containers: []*containers.Container{
-			&containers.Container{},
-			&containers.Container{},
+			{},
+			{},
 		},
 	},
 }
@@ -78,7 +78,7 @@ func testPrintDevice(t *testing.T, printer ResourcePrinter) {
 	var buffer bytes.Buffer
 
 	data := &device.Info{
-		Labels:     []*device.Label{&device.Label{Key: "foo", Value: "bar"}},
+		Labels:     []*device.Label{{Key: "foo", Value: "bar"}},
 		Hostname:   "foo-bar",
 		Addresses:  []string{"1.2.3.4"},
 		GrpcPort:   5000,
@@ -118,8 +118,8 @@ func testPrintPod(t *testing.T, printer ResourcePrinter) {
 		},
 		Spec: &pods.PodSpec{
 			Containers: []*containers.Container{
-				&containers.Container{},
-				&containers.Container{},
+				{},
+				{},
 			},
 		},
 		Status: &pods.PodStatus{
@@ -139,7 +139,7 @@ func testPrintConfig(t *testing.T, printer ResourcePrinter) {
 
 	data := &config.Config{
 		Endpoints: []config.Endpoint{
-			config.Endpoint{Name: "localhost", URL: "localhost:5000"},
+			{Name: "localhost", URL: "localhost:5000"},
 		},
 		Namespace: "default",
 	}