fix: removes-redundant (#3095)

Sungyoun-Kim · web-flow · commit 9e9ff112acac · 2025-04-16T12:08:49.000-06:00
diff --git a/google-api-go-generator/gen.go b/google-api-go-generator/gen.go
@@ -902,7 +902,7 @@ func (a *API) GenerateCode() ([]byte, error) {
 	for _, res := range a.doc.Resources { // add top level resources.
 		pn("s.%s = New%s(s)", resourceGoField(res, nil), resourceGoType(res))
 	}
-	pn("if err != nil { return nil, err }")
+
 	pn(`if endpoint != "" { s.BasePath = endpoint }`)
 	pn("return s, nil")
 	pn("}\n")
diff --git a/google-api-go-generator/testdata/any.want b/google-api-go-generator/testdata/any.want
@@ -119,9 +119,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
 	s.Projects = NewProjectsService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/arrayofarray-1.want b/google-api-go-generator/testdata/arrayofarray-1.want
@@ -103,9 +103,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 		return nil, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/arrayofenum.want b/google-api-go-generator/testdata/arrayofenum.want
@@ -103,9 +103,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 		return nil, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/arrayofmapofobjects.want b/google-api-go-generator/testdata/arrayofmapofobjects.want
@@ -103,9 +103,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 		return nil, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/arrayofmapofstrings.want b/google-api-go-generator/testdata/arrayofmapofstrings.want
@@ -103,9 +103,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 		return nil, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/blogger-3.want b/google-api-go-generator/testdata/blogger-3.want
@@ -135,9 +135,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 	s.PostUserInfos = NewPostUserInfosService(s)
 	s.Posts = NewPostsService(s)
 	s.Users = NewUsersService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/floats.want b/google-api-go-generator/testdata/floats.want
@@ -107,9 +107,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 		return nil, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/getwithoutbody.want b/google-api-go-generator/testdata/getwithoutbody.want
@@ -104,9 +104,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
 	s.MetricDescriptors = NewMetricDescriptorsService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/http-body.want b/google-api-go-generator/testdata/http-body.want
@@ -119,9 +119,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
 	s.Projects = NewProjectsService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/json-body.want b/google-api-go-generator/testdata/json-body.want
@@ -119,9 +119,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
 	s.Projects = NewProjectsService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/mapofany.want b/google-api-go-generator/testdata/mapofany.want
@@ -103,9 +103,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 		return nil, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/mapofarrayofobjects.want b/google-api-go-generator/testdata/mapofarrayofobjects.want
@@ -104,9 +104,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
 	s.Atlas = NewAtlasService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/mapofint64strings.want b/google-api-go-generator/testdata/mapofint64strings.want
@@ -103,9 +103,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 		return nil, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/mapofobjects.want b/google-api-go-generator/testdata/mapofobjects.want
@@ -103,9 +103,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 		return nil, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/mapofstrings-1.want b/google-api-go-generator/testdata/mapofstrings-1.want
@@ -104,9 +104,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
 	s.Atlas = NewAtlasService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/mapprotostruct.want b/google-api-go-generator/testdata/mapprotostruct.want
@@ -104,9 +104,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
 	s.Atlas = NewAtlasService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/mediaupload.want b/google-api-go-generator/testdata/mediaupload.want
@@ -151,9 +151,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
 	s.Captions = NewCaptionsService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/param-rename.want b/google-api-go-generator/testdata/param-rename.want
@@ -105,9 +105,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
 	s.Events = NewEventsService(s)
 	s.Reports = NewReportsService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/quotednum.want b/google-api-go-generator/testdata/quotednum.want
@@ -118,9 +118,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 		return nil, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/repeated.want b/google-api-go-generator/testdata/repeated.want
@@ -104,9 +104,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
 	s.Accounts = NewAccountsService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/required-query.want b/google-api-go-generator/testdata/required-query.want
@@ -104,9 +104,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
 	s.Techs = NewTechsService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/resource-named-service.want b/google-api-go-generator/testdata/resource-named-service.want
@@ -119,9 +119,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*APIService,
 	}
 	s := &APIService{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
 	s.Apps = NewAppsService(s)
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/unfortunatedefaults.want b/google-api-go-generator/testdata/unfortunatedefaults.want
@@ -103,9 +103,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 		return nil, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/variants.want b/google-api-go-generator/testdata/variants.want
@@ -103,9 +103,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 		return nil, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}
diff --git a/google-api-go-generator/testdata/wrapnewlines.want b/google-api-go-generator/testdata/wrapnewlines.want
@@ -103,9 +103,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
 		return nil, err
 	}
 	s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}
-	if err != nil {
-		return nil, err
-	}
 	if endpoint != "" {
 		s.BasePath = endpoint
 	}

Original file line number	Diff line number	Diff line change
`@@ -902,7 +902,7 @@ func (a *API) GenerateCode() ([]byte, error) {`
`902`	`902`	`for _, res := range a.doc.Resources { // add top level resources.`
`903`	`903`	`pn("s.%s = New%s(s)", resourceGoField(res, nil), resourceGoType(res))`
`904`	`904`	`}`
`905`		`- pn("if err != nil { return nil, err }")`
	`905`	`+`
`906`	`906`	pn(`if endpoint != "" { s.BasePath = endpoint }`)
`907`	`907`	`pn("return s, nil")`
`908`	`908`	`pn("}\n")`
Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err`
`119`	`119`	`}`
`120`	`120`	`s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}`
`121`	`121`	`s.Projects = NewProjectsService(s)`
`122`		`- if err != nil {`
`123`		`- return nil, err`
`124`		`- }`
`125`	`122`	`if endpoint != "" {`
`126`	`123`	`s.BasePath = endpoint`
`127`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err`
`103`	`103`	`return nil, err`
`104`	`104`	`}`
`105`	`105`	`s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}`
`106`		`- if err != nil {`
`107`		`- return nil, err`
`108`		`- }`
`109`	`106`	`if endpoint != "" {`
`110`	`107`	`s.BasePath = endpoint`
`111`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,9 +107,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err`
`107`	`107`	`return nil, err`
`108`	`108`	`}`
`109`	`109`	`s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}`
`110`		`- if err != nil {`
`111`		`- return nil, err`
`112`		`- }`
`113`	`110`	`if endpoint != "" {`
`114`	`111`	`s.BasePath = endpoint`
`115`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,6 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err`
`104`	`104`	`}`
`105`	`105`	`s := &Service{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}`
`106`	`106`	`s.MetricDescriptors = NewMetricDescriptorsService(s)`
`107`		`- if err != nil {`
`108`		`- return nil, err`
`109`		`- }`
`110`	`107`	`if endpoint != "" {`
`111`	`108`	`s.BasePath = endpoint`
`112`	`109`	`}`