[camel-k] 02/03: Add timeout to maven operations #761 (fix findings)

[nferraro]

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 c780221021798005af03797d903cddfefcac2970
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Tue Jun 25 17:24:22 2019 +0200

    Add timeout to maven operations #761 (fix findings)
---
 pkg/controller/integrationplatform/initialize.go | 27 +++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkg/controller/integrationplatform/initialize.go 
b/pkg/controller/integrationplatform/initialize.go
index 64eeb93..2fc150b 100644
--- a/pkg/controller/integrationplatform/initialize.go
+++ b/pkg/controller/integrationplatform/initialize.go
@@ -126,14 +126,35 @@ func (action *initializeAction) Handle(ctx 
context.Context, ip *v1alpha1.Integra
        if target.Spec.Build.LocalRepository == "" {
                target.Spec.Build.LocalRepository = defaults.LocalRepository
        }
+       if target.Spec.Build.PersistentVolumeClaim == "" {
+               target.Spec.Build.PersistentVolumeClaim = target.Name
+       }
+
+       if target.Spec.Build.Timeout.Duration != 0 {
+               d := target.Spec.Build.Timeout.Duration.Truncate(time.Second)
+
+               if target.Spec.Build.Timeout.Duration != d {
+                       action.L.Infof("Build timeout minimum unit is sec 
(configured: %s, truncated: %s)", target.Spec.Build.Timeout.Duration, d)
+               }
+
+               target.Spec.Build.Timeout.Duration = d
+       }
        if target.Spec.Build.Timeout.Duration == 0 {
                target.Spec.Build.Timeout.Duration = 5 * time.Minute
        }
-       if target.Spec.Build.PersistentVolumeClaim == "" {
-               target.Spec.Build.PersistentVolumeClaim = target.Name
+
+       if target.Spec.Build.Maven.Timeout.Duration != 0 {
+               d := 
target.Spec.Build.Maven.Timeout.Duration.Truncate(time.Second)
+
+               if target.Spec.Build.Maven.Timeout.Duration != d {
+                       action.L.Infof("Maven timeout minimum unit is sec 
(configured: %s, truncated: %s)", target.Spec.Build.Maven.Timeout.Duration, d)
+               }
+
+               target.Spec.Build.Maven.Timeout.Duration = d
        }
        if target.Spec.Build.Maven.Timeout.Duration == 0 {
-               target.Spec.Build.Maven.Timeout.Duration = 2 * time.Minute
+               n := target.Spec.Build.Timeout.Duration.Seconds() * 0.75
+               target.Spec.Build.Maven.Timeout.Duration = (time.Duration(n) * 
time.Second).Truncate(time.Second)
        }
 
        action.L.Infof("CamelVersion set to %s", target.Spec.Build.CamelVersion)