You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2019/12/11 18:37:56 UTC
[camel-k] 06/08: Fix #1120: fix lint
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit f2d296fe4d7b4e5222413751b657b8936553f22a
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Mon Dec 9 15:05:53 2019 +0100
Fix #1120: fix lint
---
pkg/cmd/describe_platform.go | 19 +++++++++++++++----
pkg/platform/defaults.go | 2 +-
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/pkg/cmd/describe_platform.go b/pkg/cmd/describe_platform.go
index bab719f..012638d 100644
--- a/pkg/cmd/describe_platform.go
+++ b/pkg/cmd/describe_platform.go
@@ -109,7 +109,18 @@ func (command *describePlatformCommand) describeIntegrationPlatform(platform v1a
})
}
-func getPlatformBaseImage(spec v1alpha1.IntegrationPlatformSpec) string {return spec.Build.BaseImage}
-func getPlatformCamelVersion(spec v1alpha1.IntegrationPlatformSpec) string {return spec.Build.CamelVersion}
-func getPlatformMavenLocalRepository(spec v1alpha1.IntegrationPlatformSpec) string {return spec.Build.Maven.LocalRepository}
-func getPlatformPublishStrategy(spec v1alpha1.IntegrationPlatformSpec) string {return string(spec.Build.PublishStrategy)}
+func getPlatformBaseImage(spec v1alpha1.IntegrationPlatformSpec) string {
+ return spec.Build.BaseImage
+}
+
+func getPlatformCamelVersion(spec v1alpha1.IntegrationPlatformSpec) string {
+ return spec.Build.CamelVersion
+}
+
+func getPlatformMavenLocalRepository(spec v1alpha1.IntegrationPlatformSpec) string {
+ return spec.Build.Maven.LocalRepository
+}
+
+func getPlatformPublishStrategy(spec v1alpha1.IntegrationPlatformSpec) string {
+ return string(spec.Build.PublishStrategy)
+}
diff --git a/pkg/platform/defaults.go b/pkg/platform/defaults.go
index 1853680..3433eb0 100644
--- a/pkg/platform/defaults.go
+++ b/pkg/platform/defaults.go
@@ -166,7 +166,7 @@ func setPlatformDefaults(ctx context.Context, c client.Client, p *v1alpha1.Integ
return err
}
- p.Status.FullConfig.Build.Maven.Settings.ConfigMapKeyRef = &corev1.ConfigMapKeySelector {
+ p.Status.FullConfig.Build.Maven.Settings.ConfigMapKeyRef = &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: p.Name + "-maven-settings",
},