You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2022/01/19 08:40:38 UTC
[camel-k] 12/32: chore: Fix lints
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch release-1.7.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1da8db96c19f7050c7883b9dbf666be1a371baa6
Author: Antonin Stefanutti <an...@stefanutti.fr>
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 1373818..80ff394 100644
--- a/pkg/platform/defaults.go
+++ b/pkg/platform/defaults.go
@@ -83,7 +83,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
}
@@ -151,7 +151,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 97e443c..98f4990 100644
--- a/pkg/trait/openapi.go
+++ b/pkg/trait/openapi.go
@@ -213,15 +213,15 @@ func (t *openAPITrait) createNewOpenAPIConfigMap(e *Environment, resource v1.Res
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)