[camel-k] branch master updated: Fixed AddDependency in integration_type_support.go to handle default case instead of discarding.

[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


The following commit(s) were added to refs/heads/master by this push:
     new 94c9c47  Fixed AddDependency in integration_type_support.go to handle 
default case instead of discarding.
94c9c47 is described below

commit 94c9c473edfed2a4fb1c2dff487f64563e116c52
Author: Andrea Tarocchi <ataro...@redhat.com>
AuthorDate: Mon Jan 28 23:21:21 2019 +0100

    Fixed AddDependency in integration_type_support.go to handle default case 
instead of discarding.
---
 pkg/apis/camel/v1alpha1/integration_types_support.go   |  6 ++----
 .../camel/v1alpha1/integration_types_support_test.go   | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkg/apis/camel/v1alpha1/integration_types_support.go 
b/pkg/apis/camel/v1alpha1/integration_types_support.go
index 553a49c..07e0e50 100644
--- a/pkg/apis/camel/v1alpha1/integration_types_support.go
+++ b/pkg/apis/camel/v1alpha1/integration_types_support.go
@@ -84,12 +84,10 @@ func (is *IntegrationSpec) AddConfiguration(confType 
string, confValue string) {
 // AddDependency --
 func (is *IntegrationSpec) AddDependency(dependency string) {
        switch {
-       case strings.HasPrefix(dependency, "mvn:"):
-               util.StringSliceUniqueAdd(&is.Dependencies, dependency)
-       case strings.HasPrefix(dependency, "file:"):
-               util.StringSliceUniqueAdd(&is.Dependencies, dependency)
        case strings.HasPrefix(dependency, "camel-"):
                util.StringSliceUniqueAdd(&is.Dependencies, 
"camel:"+strings.TrimPrefix(dependency, "camel-"))
+       default:
+               util.StringSliceUniqueAdd(&is.Dependencies, dependency)
        }
 }
 
diff --git a/pkg/apis/camel/v1alpha1/integration_types_support_test.go 
b/pkg/apis/camel/v1alpha1/integration_types_support_test.go
index ebfbc7e..ab2f8a4 100644
--- a/pkg/apis/camel/v1alpha1/integration_types_support_test.go
+++ b/pkg/apis/camel/v1alpha1/integration_types_support_test.go
@@ -41,3 +41,21 @@ func TestLanguageAlreadySet(t *testing.T) {
        }
        assert.Equal(t, LanguageJavaScript, code.InferLanguage())
 }
+
+func TestAddDependency(t *testing.T) {
+       integration := IntegrationSpec{}
+       integration.AddDependency("camel-ciaone")
+       assert.Equal(t, integration.Dependencies, []string{"camel:ciaone"})
+
+       integration = IntegrationSpec{}
+       integration.AddDependency("runtime:ciaone")
+       assert.Equal(t, integration.Dependencies, []string{"runtime:ciaone"})
+
+       integration = IntegrationSpec{}
+       integration.AddDependency("mvn:ciaone")
+       assert.Equal(t, integration.Dependencies, []string{"mvn:ciaone"})
+
+       integration = IntegrationSpec{}
+       integration.AddDependency("file:ciaone")
+       assert.Equal(t, integration.Dependencies, []string{"file:ciaone"})
+}