This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 9d35c0525730001b82ede7c1dcb0fd5bf81cc8c4 Author: Antonin Stefanutti <[email protected]> AuthorDate: Fri Jan 7 19:00:59 2022 +0100 chore: Fix lints --- pkg/platform/defaults.go | 4 ++-- pkg/trait/openapi.go | 14 +++++++------- pkg/util/maven/maven_proxies.go | 2 +- pkg/util/maven/maven_repositories.go | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkg/platform/defaults.go b/pkg/platform/defaults.go index 8355b32..29c5dd0 100644 --- a/pkg/platform/defaults.go +++ b/pkg/platform/defaults.go @@ -84,7 +84,7 @@ func ConfigureDefaults(ctx context.Context, c client.Client, p *v1.IntegrationPl } } - err := setPlatformDefaults(ctx, c, p, verbose) + err := setPlatformDefaults(p, verbose) if err != nil { return err } @@ -152,7 +152,7 @@ func configureRegistry(ctx context.Context, c client.Client, p *v1.IntegrationPl return nil } -func setPlatformDefaults(ctx context.Context, c client.Client, p *v1.IntegrationPlatform, verbose bool) error { +func setPlatformDefaults(p *v1.IntegrationPlatform, verbose bool) error { if p.Status.Build.RuntimeVersion == "" { p.Status.Build.RuntimeVersion = defaults.DefaultRuntimeVersion } diff --git a/pkg/trait/openapi.go b/pkg/trait/openapi.go index 5cc3d4f..22d2eb5 100644 --- a/pkg/trait/openapi.go +++ b/pkg/trait/openapi.go @@ -262,15 +262,15 @@ func (t *openAPITrait) createNewOpenAPIConfigMap(e *Environment, resource v1.Dat mc.UserSettings = []byte(settings) } - if settings, err := maven.NewSettings(maven.DefaultRepositories, maven.ProxyFromEnvironment); err != nil { + settings, err := maven.NewSettings(maven.DefaultRepositories, maven.ProxyFromEnvironment) + if err != nil { + return err + } + data, err := settings.MarshalBytes() + if err != nil { return err - } else { - data, err := settings.MarshalBytes() - if err != nil { - return err - } - mc.GlobalSettings = data } + mc.GlobalSettings = data if e.Platform.Status.Build.Maven.CASecret != nil { certData, err := kubernetes.GetSecretRefData(e.Ctx, e.Client, e.Platform.Namespace, e.Platform.Status.Build.Maven.CASecret) diff --git a/pkg/util/maven/maven_proxies.go b/pkg/util/maven/maven_proxies.go index 91e0790..e767800 100644 --- a/pkg/util/maven/maven_proxies.go +++ b/pkg/util/maven/maven_proxies.go @@ -27,7 +27,7 @@ var ProxyFromEnvironment = proxyFromEnvironment{} type proxyFromEnvironment struct{} -func (_ proxyFromEnvironment) apply(settings *Settings) error { +func (proxyFromEnvironment) apply(settings *Settings) error { if httpProxy := os.Getenv("HTTP_PROXY"); httpProxy != "" { proxy, err := parseProxyFromEnvVar(httpProxy) if err != nil { diff --git a/pkg/util/maven/maven_repositories.go b/pkg/util/maven/maven_repositories.go index 2576cbb..e35d686 100644 --- a/pkg/util/maven/maven_repositories.go +++ b/pkg/util/maven/maven_repositories.go @@ -27,6 +27,7 @@ var DefaultRepositories = &defaultRepositories{} type defaultRepositories struct{} +// nolint: unparam func (o defaultRepositories) apply(settings *Settings) error { for _, repository := range defaultMavenRepositories() { upsertRepository(repository, &settings.Profiles[0].Repositories)
