gofmt -s -w .

dgraph-io · May 5, 2021 · 0f860c5 · 0f860c5
1 parent dd2e852
commit 0f860c5
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 78 deletions.
diff --git a/ee/backup/run.go b/ee/backup/run.go
@@ -257,7 +257,7 @@ func runExportBackup() error {
 	glog.Infof("Created temporary map directory: %s\n", mapDir)
 
 	// TODO: Can probably make this procesing concurrent.
-	for gid, _ := range latestManifest.Groups {
+	for gid := range latestManifest.Groups {
 		glog.Infof("Exporting group: %d", gid)
 		req := &pb.RestoreRequest{
 			GroupId:           gid,

diff --git a/graphql/e2e/common/error.go b/graphql/e2e/common/error.go
@@ -95,10 +95,10 @@ func graphQLCompletionOn(t *testing.T) {
 			require.NoError(t, err)
 			require.Equal(t, 5, len(result.QueryCountry))
 			expected.QueryCountry = []*country{
-				&country{Name: "Angola"},
-				&country{Name: "Bangladesh"},
-				&country{Name: "India"},
-				&country{Name: "Mozambique"},
+				{Name: "Angola"},
+				{Name: "Bangladesh"},
+				{Name: "India"},
+				{Name: "Mozambique"},
 				nil,
 			}
 
@@ -269,8 +269,8 @@ func panicCatcher(t *testing.T) {
 	// the http stack.
 
 	tests := map[string]*GraphQLParams{
-		"query": &GraphQLParams{Query: `query { queryCountry { name } }`},
-		"mutation": &GraphQLParams{
+		"query": {Query: `query { queryCountry { name } }`},
+		"mutation": {
 			Query: `mutation {
 						addCountry(input: [{ name: "A Country" }]) { country { id } }
 					}`,

diff --git a/graphql/e2e/common/query.go b/graphql/e2e/common/query.go
@@ -161,10 +161,10 @@ func queryByTypeWithEncoding(t *testing.T, acceptGzip, gzipEncoding bool) {
 		QueryCountry []*country
 	}
 	expected.QueryCountry = []*country{
-		&country{Name: "Angola"},
-		&country{Name: "Bangladesh"},
-		&country{Name: "India"},
-		&country{Name: "Mozambique"},
+		{Name: "Angola"},
+		{Name: "Bangladesh"},
+		{Name: "India"},
+		{Name: "Mozambique"},
 	}
 	err := json.Unmarshal([]byte(gqlResponse.Data), &result)
 	require.NoError(t, err)
@@ -197,10 +197,10 @@ func uidAlias(t *testing.T) {
 		QueryCountry []*countryUID
 	}
 	expected.QueryCountry = []*countryUID{
-		&countryUID{UID: "Angola"},
-		&countryUID{UID: "Bangladesh"},
-		&countryUID{UID: "India"},
-		&countryUID{UID: "Mozambique"},
+		{UID: "Angola"},
+		{UID: "Bangladesh"},
+		{UID: "India"},
+		{UID: "Mozambique"},
 	}
 	err := json.Unmarshal([]byte(gqlResponse.Data), &result)
 	require.NoError(t, err)
@@ -226,10 +226,10 @@ func orderAtRoot(t *testing.T) {
 		QueryCountry []*country
 	}
 	expected.QueryCountry = []*country{
-		&country{Name: "Angola"},
-		&country{Name: "Bangladesh"},
-		&country{Name: "India"},
-		&country{Name: "Mozambique"},
+		{Name: "Angola"},
+		{Name: "Bangladesh"},
+		{Name: "India"},
+		{Name: "Mozambique"},
 	}
 	err := json.Unmarshal([]byte(gqlResponse.Data), &result)
 	require.NoError(t, err)
@@ -255,8 +255,8 @@ func pageAtRoot(t *testing.T) {
 		QueryCountry []*country
 	}
 	expected.QueryCountry = []*country{
-		&country{Name: "India"},
-		&country{Name: "Bangladesh"},
+		{Name: "India"},
+		{Name: "Bangladesh"},
 	}
 	err := json.Unmarshal([]byte(gqlResponse.Data), &result)
 	require.NoError(t, err)
@@ -269,8 +269,8 @@ func pageAtRoot(t *testing.T) {
 func regExp(t *testing.T) {
 	queryCountryByRegExp(t, "/[Aa]ng/",
 		[]*country{
-			&country{Name: "Angola"},
-			&country{Name: "Bangladesh"},
+			{Name: "Angola"},
+			{Name: "Bangladesh"},
 		})
 }
 
@@ -300,7 +300,7 @@ func multipleSearchIndexes(t *testing.T) {
 		}
 
 		expected.QueryPost = []*post{
-			&post{Title: "Introducing GraphQL in Dgraph"},
+			{Title: "Introducing GraphQL in Dgraph"},
 		}
 		err := json.Unmarshal([]byte(gqlResponse.Data), &result)
 		require.NoError(t, err)

diff --git a/graphql/e2e/custom_logic/cmd/main.go b/graphql/e2e/custom_logic/cmd/main.go
@@ -824,7 +824,7 @@ func deleteCommonHeaders(headers http.Header) {
 func carsHandlerWithHeaders(w http.ResponseWriter, r *http.Request) {
 	deleteCommonHeaders(r.Header)
 	if err := compareHeaders(map[string][]string{
-		"Stripe-Api-Key": []string{"some-api-key"},
+		"Stripe-Api-Key": {"some-api-key"},
 	}, r.Header); err != nil {
 		check2(w.Write([]byte(err.Error())))
 		return
@@ -835,7 +835,7 @@ func carsHandlerWithHeaders(w http.ResponseWriter, r *http.Request) {
 func userNameHandlerWithHeaders(w http.ResponseWriter, r *http.Request) {
 	deleteCommonHeaders(r.Header)
 	if err := compareHeaders(map[string][]string{
-		"Github-Api-Token": []string{"some-api-token"},
+		"Github-Api-Token": {"some-api-token"},
 	}, r.Header); err != nil {
 		check2(w.Write([]byte(err.Error())))
 		return
@@ -1037,7 +1037,7 @@ func (_ *query) Countries(ctx context.Context, args struct {
 		Name string
 	}
 }) []countryResolver {
-	return []countryResolver{countryResolver{&country{
+	return []countryResolver{{&country{
 		Code: graphql.ID(args.Filter.Code),
 		Name: args.Filter.Name,
 	}}}
@@ -1142,7 +1142,7 @@ func (r *classResolver) Name() string {
 func (_ *query) Class(ctx context.Context, args struct {
 	Id string
 }) *[]*classResolver {
-	return &[]*classResolver{&classResolver{&class{ID: graphql.ID(args.Id)}}}
+	return &[]*classResolver{{&class{ID: graphql.ID(args.Id)}}}
 }
 
 func (_ *query) UserNames(ctx context.Context, args struct {
@@ -1190,7 +1190,7 @@ func (_ *query) Classes(ctx context.Context, args struct {
 	resolvers := make([]*[]*classResolver, 0, len(*args.Schools))
 	for _, user := range *args.Schools {
 		resolvers = append(resolvers, &[]*classResolver{
-			&classResolver{&class{ID: graphql.ID(user.Id)}}})
+			{&class{ID: graphql.ID(user.Id)}}})
 	}
 	return &resolvers
 }
@@ -1264,10 +1264,10 @@ func gqlCarsWithErrorHandler(w http.ResponseWriter, r *http.Request) {
 			"cars": output,
 		},
 		"errors": []map[string]interface{}{
-			map[string]interface{}{
+			{
 				"message": "error-1 from cars",
 			},
-			map[string]interface{}{
+			{
 				"message": "error-2 from cars",
 			},
 		},

diff --git a/graphql/e2e/custom_logic/custom_logic_test.go b/graphql/e2e/custom_logic/custom_logic_test.go
@@ -200,9 +200,9 @@ func TestCustomQueryShouldForwardHeaders(t *testing.T) {
 	params := &common.GraphQLParams{
 		Query: query,
 		Headers: map[string][]string{
-			"X-App-Token":   []string{"app-token"},
-			"X-User-Id":     []string{"123"},
-			"Random-header": []string{"random"},
+			"X-App-Token":   {"app-token"},
+			"X-User-Id":     {"123"},
+			"Random-header": {"random"},
 		},
 	}
 
@@ -238,9 +238,9 @@ func TestCustomNameForwardHeaders(t *testing.T) {
 	params := &common.GraphQLParams{
 		Query: query,
 		Headers: map[string][]string{
-			"App":           []string{"app-token"},
-			"X-User-Id":     []string{"123"},
-			"Random-header": []string{"random"},
+			"App":           {"app-token"},
+			"X-User-Id":     {"123"},
+			"Random-header": {"random"},
 		},
 	}
 

diff --git a/graphql/resolve/mutation_test.go b/graphql/resolve/mutation_test.go
@@ -345,8 +345,8 @@ func TestMutationQueryRewriting(t *testing.T) {
 	}
 
 	allowedTestTypes := map[string][]string{
-		"UPDATE_MUTATION":     []string{"Update Post "},
-		"ADD_UPDATE_MUTATION": []string{"Add Post ", "Update Post "},
+		"UPDATE_MUTATION":     {"Update Post "},
+		"ADD_UPDATE_MUTATION": {"Add Post ", "Update Post "},
 	}
 
 	b, err := ioutil.ReadFile("mutation_query_test.yaml")
@@ -421,9 +421,9 @@ func TestCustomHTTPMutation(t *testing.T) {
 					Query:     tcase.GQLQuery,
 					Variables: vars,
 					Header: map[string][]string{
-						"bogus":       []string{"header"},
-						"X-App-Token": []string{"val"},
-						"Auth0-Token": []string{"tok"},
+						"bogus":       {"header"},
+						"X-App-Token": {"val"},
+						"Auth0-Token": {"tok"},
 					},
 				})
 			require.NoError(t, err)

diff --git a/graphql/resolve/query_test.go b/graphql/resolve/query_test.go
@@ -151,9 +151,9 @@ func TestCustomHTTPQuery(t *testing.T) {
 					Query:     tcase.GQLQuery,
 					Variables: vars,
 					Header: map[string][]string{
-						"bogus":       []string{"header"},
-						"X-App-Token": []string{"val"},
-						"Auth0-Token": []string{"tok"},
+						"bogus":       {"header"},
+						"X-App-Token": {"val"},
+						"Auth0-Token": {"tok"},
 					},
 				})
 			require.NoError(t, err)

diff --git a/graphql/resolve/resolver_test.go b/graphql/resolve/resolver_test.go
@@ -35,7 +35,7 @@ func TestErrorOnIncorrectValueType(t *testing.T) {
 			Expected: `{ "getAuthor": { "dob": null }}`,
 			Errors: x.GqlErrorList{{
 				Message:   schema.ErrExpectedScalar,
-				Locations: []x.Location{x.Location{Line: 1, Column: 32}},
+				Locations: []x.Location{{Line: 1, Column: 32}},
 				Path:      []interface{}{"getAuthor", "dob"},
 			}}},
 
@@ -45,7 +45,7 @@ func TestErrorOnIncorrectValueType(t *testing.T) {
 			Expected: `{ "getAuthor": { "dob": null }}`,
 			Errors: x.GqlErrorList{{
 				Message:   schema.ErrExpectedScalar,
-				Locations: []x.Location{x.Location{Line: 1, Column: 32}},
+				Locations: []x.Location{{Line: 1, Column: 32}},
 				Path:      []interface{}{"getAuthor", "dob"},
 			}}},
 
@@ -55,7 +55,7 @@ func TestErrorOnIncorrectValueType(t *testing.T) {
 			Expected: `{ "getAuthor": { "country": null }}`,
 			Errors: x.GqlErrorList{{
 				Message:   "Error coercing value 'Rwanda' for field 'country' to type Country.",
-				Locations: []x.Location{x.Location{Line: 1, Column: 32}},
+				Locations: []x.Location{{Line: 1, Column: 32}},
 				Path:      []interface{}{"getAuthor", "country"},
 			}}},
 		{Name: "return error when array is returned instead of object value",
@@ -64,7 +64,7 @@ func TestErrorOnIncorrectValueType(t *testing.T) {
 			Expected: `{ "getAuthor": { "country": null }}`,
 			Errors: x.GqlErrorList{{
 				Message:   schema.ErrExpectedSingleItem,
-				Locations: []x.Location{x.Location{Line: 1, Column: 32}},
+				Locations: []x.Location{{Line: 1, Column: 32}},
 				Path:      []interface{}{"getAuthor", "country"},
 			}}},
 
@@ -74,7 +74,7 @@ func TestErrorOnIncorrectValueType(t *testing.T) {
 			Expected: `{ "getAuthor": null}`,
 			Errors: x.GqlErrorList{{
 				Message:   schema.ErrExpectedList,
-				Locations: []x.Location{x.Location{Line: 1, Column: 32}},
+				Locations: []x.Location{{Line: 1, Column: 32}},
 				Path:      []interface{}{"getAuthor"},
 			}}},
 		{Name: "return error when object is returned instead of array value",
@@ -83,7 +83,7 @@ func TestErrorOnIncorrectValueType(t *testing.T) {
 			Expected: `{ "getAuthor": null}`,
 			Errors: x.GqlErrorList{{
 				Message:   schema.ErrExpectedList,
-				Locations: []x.Location{x.Location{Line: 1, Column: 32}},
+				Locations: []x.Location{{Line: 1, Column: 32}},
 				Path:      []interface{}{"getAuthor"},
 			}}},
 	}
@@ -123,7 +123,7 @@ func TestValueCoercion(t *testing.T) {
 			Response: `{ "getPost": { "postType": [2] }}`,
 			Errors: x.GqlErrorList{{
 				Message:   "Error coercing value '2' for field 'postType' to type PostType.",
-				Locations: []x.Location{x.Location{Line: 1, Column: 34}},
+				Locations: []x.Location{{Line: 1, Column: 34}},
 				Path:      []interface{}{"getPost", "postType", 0},
 			}},
 			Expected: `{ "getPost": { "postType": [null] }}`},
@@ -132,7 +132,7 @@ func TestValueCoercion(t *testing.T) {
 			Response: `{ "getPost": { "postType": [2.134] }}`,
 			Errors: x.GqlErrorList{{
 				Message:   "Error coercing value '2.134' for field 'postType' to type PostType.",
-				Locations: []x.Location{x.Location{Line: 1, Column: 34}},
+				Locations: []x.Location{{Line: 1, Column: 34}},
 				Path:      []interface{}{"getPost", "postType", 0},
 			}},
 			Expected: `{ "getPost": { "postType": [null] }}`},
@@ -141,7 +141,7 @@ func TestValueCoercion(t *testing.T) {
 			Response: `{ "getPost": { "postType": [false] }}`,
 			Errors: x.GqlErrorList{{
 				Message:   "Error coercing value 'false' for field 'postType' to type PostType.",
-				Locations: []x.Location{x.Location{Line: 1, Column: 34}},
+				Locations: []x.Location{{Line: 1, Column: 34}},
 				Path:      []interface{}{"getPost", "postType", 0},
 			}},
 			Expected: `{ "getPost": { "postType": [null] }}`},
@@ -150,7 +150,7 @@ func TestValueCoercion(t *testing.T) {
 			Response: `{ "getPost": { "postType": ["Random"] }}`,
 			Errors: x.GqlErrorList{{
 				Message:   "Error coercing value 'Random' for field 'postType' to type PostType.",
-				Locations: []x.Location{x.Location{Line: 1, Column: 34}},
+				Locations: []x.Location{{Line: 1, Column: 34}},
 				Path:      []interface{}{"getPost", "postType", 0},
 			}},
 			Expected: `{ "getPost": { "postType": [null] }}`},
@@ -213,7 +213,7 @@ func TestValueCoercion(t *testing.T) {
 			Errors: x.GqlErrorList{{
 				Message: "Error coercing value '2147483648' for field 'numLikes' to type" +
 					" Int.",
-				Locations: []x.Location{x.Location{Line: 1, Column: 34}},
+				Locations: []x.Location{{Line: 1, Column: 34}},
 				Path:      []interface{}{"getPost", "numLikes"},
 			}},
 			Expected: `{"getPost": {"numLikes": null}}`,
@@ -224,7 +224,7 @@ func TestValueCoercion(t *testing.T) {
 			Response: `{ "getPost": { "numLikes": 123.23 }}`,
 			Errors: x.GqlErrorList{{
 				Message:   "Error coercing value '123.23' for field 'numLikes' to type Int.",
-				Locations: []x.Location{x.Location{Line: 1, Column: 34}},
+				Locations: []x.Location{{Line: 1, Column: 34}},
 				Path:      []interface{}{"getPost", "numLikes"},
 			}},
 			Expected: `{"getPost": {"numLikes": null}}`,
@@ -235,7 +235,7 @@ func TestValueCoercion(t *testing.T) {
 			Response: `{ "getPost": { "numLikes": "123.23" }}`,
 			Errors: x.GqlErrorList{{
 				Message:   "Error coercing value '123.23' for field 'numLikes' to type Int.",
-				Locations: []x.Location{x.Location{Line: 1, Column: 34}},
+				Locations: []x.Location{{Line: 1, Column: 34}},
 				Path:      []interface{}{"getPost", "numLikes"},
 			}},
 			Expected: `{"getPost": {"numLikes": null}}`,
@@ -265,7 +265,7 @@ func TestValueCoercion(t *testing.T) {
 			Response: `{ "getAuthor": { "dob": "23.123" }}`,
 			Errors: x.GqlErrorList{{
 				Message:   "Error coercing value '23.123' for field 'dob' to type DateTime.",
-				Locations: []x.Location{x.Location{Line: 1, Column: 32}},
+				Locations: []x.Location{{Line: 1, Column: 32}},
 				Path:      []interface{}{"getAuthor", "dob"},
 			}},
 			Expected: `{ "getAuthor": { "dob": null }}`},
@@ -274,7 +274,7 @@ func TestValueCoercion(t *testing.T) {
 			Response: `{ "getAuthor": { "dob": true }}`,
 			Errors: x.GqlErrorList{{
 				Message:   "Error coercing value 'true' for field 'dob' to type DateTime.",
-				Locations: []x.Location{x.Location{Line: 1, Column: 32}},
+				Locations: []x.Location{{Line: 1, Column: 32}},
 				Path:      []interface{}{"getAuthor", "dob"},
 			}},
 			Expected: `{ "getAuthor": { "dob": null }}`},
@@ -283,7 +283,7 @@ func TestValueCoercion(t *testing.T) {
 			Response: `{ "getAuthor": { "dob": "123" }}`,
 			Errors: x.GqlErrorList{{
 				Message:   "Error coercing value '123' for field 'dob' to type DateTime.",
-				Locations: []x.Location{x.Location{Line: 1, Column: 32}},
+				Locations: []x.Location{{Line: 1, Column: 32}},
 				Path:      []interface{}{"getAuthor", "dob"},
 			}},
 			Expected: `{ "getAuthor": { "dob": null}}`},

diff --git a/query/fastjson_test.go b/query/fastjson_test.go
@@ -17,15 +17,15 @@ func subgraphWithSingleResultAndSingleValue(val *pb.TaskValue) *SubGraph {
 		Params:    params{Alias: "query"},
 		SrcUIDs:   &pb.List{Uids: []uint64{1}},
 		DestUIDs:  &pb.List{Uids: []uint64{1}},
-		uidMatrix: []*pb.List{&pb.List{Uids: []uint64{1}}},
+		uidMatrix: []*pb.List{{Uids: []uint64{1}}},
 		Children: []*SubGraph{
-			&SubGraph{
+			{
 				Attr:      "val",
 				SrcUIDs:   &pb.List{Uids: []uint64{1}},
-				uidMatrix: []*pb.List{&pb.List{}},
+				uidMatrix: []*pb.List{{}},
 				valueMatrix: []*pb.ValueList{
 					// UID 1
-					&pb.ValueList{
+					{
 						Values: []*pb.TaskValue{val},
 					},
 				},