From 8f40926bfaa39ad72e9a30767990844fbfe14216 Mon Sep 17 00:00:00 2001 From: ralekseenkov Date: Thu, 21 Jun 2018 20:57:10 -0700 Subject: [PATCH] make lint-all now passes (fixed all govet and goconst) --- pkg/api/auth.go | 4 ++-- pkg/api/codec/codec.go | 2 +- pkg/api/dependency_resources.go | 2 +- pkg/api/error.go | 2 +- pkg/api/middleware/recovery.go | 2 +- pkg/client/rest/core.go | 14 +++++++------- pkg/client/rest/http/http.go | 2 +- pkg/engine/diff/policy_resolution_diff_test.go | 1 + pkg/engine/resolve/component_instance.go | 2 +- pkg/engine/resolve/policy_resolver_test.go | 1 + pkg/event/hook_api_events.go | 2 +- pkg/plugin/resources.go | 4 ++-- pkg/runtime/info.go | 2 +- pkg/server/background.go | 2 +- pkg/version/version.go | 8 ++++---- 15 files changed, 26 insertions(+), 24 deletions(-) diff --git a/pkg/api/auth.go b/pkg/api/auth.go index 4c5633a7..2eca9afe 100644 --- a/pkg/api/auth.go +++ b/pkg/api/auth.go @@ -50,8 +50,8 @@ func (api *coreAPI) handleLogin(writer http.ResponseWriter, request *http.Reques api.contentType.WriteOne(writer, request, serverErr) } else { api.contentType.WriteOne(writer, request, &AuthSuccess{ - AuthSuccessObject.GetTypeKind(), - api.newToken(user), + TypeKind: AuthSuccessObject.GetTypeKind(), + Token: api.newToken(user), }) } } diff --git a/pkg/api/codec/codec.go b/pkg/api/codec/codec.go index 9df3882a..546dbc50 100644 --- a/pkg/api/codec/codec.go +++ b/pkg/api/codec/codec.go @@ -31,7 +31,7 @@ func NewContentTypeHandler(reg *runtime.Registry) *ContentTypeHandler { codecs[YAML] = yaml.NewCodec(reg) codecs[JSON] = yaml.NewJSONCodec(reg) - return &ContentTypeHandler{codecs} + return &ContentTypeHandler{codecs: codecs} } // GetCodecByContentType returns runtime codec for provided content type that should be used diff --git a/pkg/api/dependency_resources.go b/pkg/api/dependency_resources.go index 41c4a398..9c8b28a6 100644 --- a/pkg/api/dependency_resources.go +++ b/pkg/api/dependency_resources.go @@ -116,7 +116,7 @@ func (api *coreAPI) handleDependencyResourcesGet(writer http.ResponseWriter, req // no error, do nothing (but we have to keep an empty default block) } - api.contentType.WriteOne(writer, request, &dependencyResourcesWrapper{resources}) + api.contentType.WriteOne(writer, request, &dependencyResourcesWrapper{Resources: resources}) } func pluginForComponentInstance(instance *resolve.ComponentInstance, policy *lang.Policy, plugins plugin.Registry) (plugin.CodePlugin, error) { diff --git a/pkg/api/error.go b/pkg/api/error.go index b5d5f0ce..b8ddfeb7 100644 --- a/pkg/api/error.go +++ b/pkg/api/error.go @@ -16,5 +16,5 @@ type ServerError struct { // NewServerError returns instance of the error based on the provided error func NewServerError(error string) *ServerError { - return &ServerError{ServerErrorObject.GetTypeKind(), error} + return &ServerError{TypeKind: ServerErrorObject.GetTypeKind(), Error: error} } diff --git a/pkg/api/middleware/recovery.go b/pkg/api/middleware/recovery.go index 674dcf44..bced8058 100644 --- a/pkg/api/middleware/recovery.go +++ b/pkg/api/middleware/recovery.go @@ -19,7 +19,7 @@ type panicHandler struct { // NewPanicHandler returns HTTP handler for Panics processing func NewPanicHandler(handler http.Handler) http.Handler { contentTypeHandler := codec.NewContentTypeHandler(runtime.NewRegistry().Append(api.ServerErrorObject)) - return &panicHandler{handler, contentTypeHandler} + return &panicHandler{handler: handler, contentType: contentTypeHandler} } func (h *panicHandler) ServeHTTP(writer http.ResponseWriter, request *http.Request) { diff --git a/pkg/client/rest/core.go b/pkg/client/rest/core.go index f1d70afb..2f0e2e97 100644 --- a/pkg/client/rest/core.go +++ b/pkg/client/rest/core.go @@ -13,29 +13,29 @@ type coreClient struct { // New returns new instance of the Core API client http rest implementation func New(cfg *config.Client, httpClient http.Client) client.Core { - return &coreClient{cfg, httpClient} + return &coreClient{cfg: cfg, httpClient: httpClient} } func (client *coreClient) Policy() client.Policy { - return &policyClient{client.cfg, client.httpClient} + return &policyClient{cfg: client.cfg, httpClient: client.httpClient} } func (client *coreClient) Dependency() client.Dependency { - return &dependencyClient{client.cfg, client.httpClient} + return &dependencyClient{cfg: client.cfg, httpClient: client.httpClient} } func (client *coreClient) Revision() client.Revision { - return &revisionClient{client.cfg, client.httpClient} + return &revisionClient{cfg: client.cfg, httpClient: client.httpClient} } func (client *coreClient) State() client.State { - return &stateClient{client.cfg, client.httpClient} + return &stateClient{cfg: client.cfg, httpClient: client.httpClient} } func (client *coreClient) User() client.User { - return &userClient{client.cfg, client.httpClient} + return &userClient{cfg: client.cfg, httpClient: client.httpClient} } func (client *coreClient) Version() client.Version { - return &versionClient{client.cfg, client.httpClient} + return &versionClient{cfg: client.cfg, httpClient: client.httpClient} } diff --git a/pkg/client/rest/http/http.go b/pkg/client/rest/http/http.go index 092bfd27..6471e770 100644 --- a/pkg/client/rest/http/http.go +++ b/pkg/client/rest/http/http.go @@ -35,7 +35,7 @@ func NewClient(cfg *config.Client) Client { } contentTypeHandler := codec.NewContentTypeHandler(runtime.NewRegistry().Append(api.Objects...)) - return &httpClient{contentTypeHandler, client, cfg} + return &httpClient{contentType: contentTypeHandler, http: client, cfg: cfg} } func (client *httpClient) GET(path string, expected *runtime.Info) (runtime.Object, error) { diff --git a/pkg/engine/diff/policy_resolution_diff_test.go b/pkg/engine/diff/policy_resolution_diff_test.go index fde73027..bac10617 100644 --- a/pkg/engine/diff/policy_resolution_diff_test.go +++ b/pkg/engine/diff/policy_resolution_diff_test.go @@ -1,3 +1,4 @@ +// nolint: goconst package diff import ( diff --git a/pkg/engine/resolve/component_instance.go b/pkg/engine/resolve/component_instance.go index e8ea1e81..274e5913 100644 --- a/pkg/engine/resolve/component_instance.go +++ b/pkg/engine/resolve/component_instance.go @@ -98,7 +98,7 @@ type ComponentInstance struct { func newComponentInstance(cik *ComponentInstanceKey) *ComponentInstance { return &ComponentInstance{ TypeKind: ComponentInstanceObject.GetTypeKind(), - Metadata: &ComponentInstanceMetadata{cik}, + Metadata: &ComponentInstanceMetadata{Key: cik}, DependencyKeys: make(map[string]int), CalculatedLabels: lang.NewLabelSet(make(map[string]string)), CalculatedDiscovery: util.NestedParameterMap{}, diff --git a/pkg/engine/resolve/policy_resolver_test.go b/pkg/engine/resolve/policy_resolver_test.go index 305c1b27..01e8f6cd 100644 --- a/pkg/engine/resolve/policy_resolver_test.go +++ b/pkg/engine/resolve/policy_resolver_test.go @@ -1,3 +1,4 @@ +// nolint: goconst package resolve import ( diff --git a/pkg/event/hook_api_events.go b/pkg/event/hook_api_events.go index 131b5215..8bd5295a 100644 --- a/pkg/event/hook_api_events.go +++ b/pkg/event/hook_api_events.go @@ -32,7 +32,7 @@ func (hook *HookAPIEvents) Levels() []logrus.Level { // Fire processes a single log entry func (hook *HookAPIEvents) Fire(e *logrus.Entry) error { - apiEvent := &APIEvent{e.Time, e.Level.String(), e.Message} + apiEvent := &APIEvent{Time: e.Time, LogLevel: e.Level.String(), Message: e.Message} hook.events = append(hook.events, apiEvent) return nil } diff --git a/pkg/plugin/resources.go b/pkg/plugin/resources.go index abcec01d..66f1e5ef 100644 --- a/pkg/plugin/resources.go +++ b/pkg/plugin/resources.go @@ -38,8 +38,8 @@ type ResourceRegistry struct { // NewResourceRegistry creates new ResourceRegistry func NewResourceRegistry() *ResourceRegistry { return &ResourceRegistry{ - make(map[string][]string), - make(map[string]ResourceTypeHandler), + headers: make(map[string][]string), + handlers: make(map[string]ResourceTypeHandler), } } diff --git a/pkg/runtime/info.go b/pkg/runtime/info.go index 80948d6d..af3d31a4 100644 --- a/pkg/runtime/info.go +++ b/pkg/runtime/info.go @@ -19,5 +19,5 @@ func (info *Info) New() Object { // GetTypeKind returns TypeKind instance for the object described by info func (info *Info) GetTypeKind() TypeKind { - return TypeKind{info.Kind} + return TypeKind{Kind: info.Kind} } diff --git a/pkg/server/background.go b/pkg/server/background.go index 4a6ffeb8..ceb1c4b7 100644 --- a/pkg/server/background.go +++ b/pkg/server/background.go @@ -23,7 +23,7 @@ func (j *job) start() { } func (server *Server) runInBackground(name string, infinite bool, f func()) { - p := job{name, server.backgroundErrors, f, infinite} + p := job{name: name, errors: server.backgroundErrors, f: f, infinite: infinite} go p.start() } diff --git a/pkg/version/version.go b/pkg/version/version.go index 06bd2795..3196dfa4 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -11,10 +11,10 @@ var ( // GetBuildInfo returns BuildInfo for aptomi func GetBuildInfo() *BuildInfo { return &BuildInfo{ - BuildInfoObject.GetTypeKind(), - gitVersion, - gitCommit, - buildDate, + TypeKind: BuildInfoObject.GetTypeKind(), + GitVersion: gitVersion, + GitCommit: gitCommit, + BuildDate: buildDate, } }