This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 01d6ef4e016ae665d94215997190a1ae65ff6ba3 Author: Pasquale Congiusti <[email protected]> AuthorDate: Wed May 26 17:15:49 2021 +0200 feat(e2e): --config integration test --- e2e/common/config/config_test.go | 14 ++++++++++++-- .../{resources-route.groovy => config-file-route.groovy} | 2 +- e2e/common/config/files/configmap-route.groovy | 2 +- e2e/common/config/files/property-file-route.groovy | 2 +- e2e/common/config/files/resources-route.groovy | 5 +---- e2e/common/config/files/secret-route.groovy | 2 +- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go index 8512a46..2cb79ab 100644 --- a/e2e/common/config/config_test.go +++ b/e2e/common/config/config_test.go @@ -65,7 +65,7 @@ func TestRunConfigExamples(t *testing.T) { cmData["my-configmap-key"] = "my-configmap-content" NewPlainTextConfigmap(ns, "my-cm", cmData) - Expect(Kamel("run", "-n", ns, "./files/configmap-route.groovy", "--configmap", "my-cm").Execute()).To(Succeed()) + Expect(Kamel("run", "-n", ns, "./files/configmap-route.groovy", "--config", "configmap:my-cm").Execute()).To(Succeed()) Eventually(IntegrationPodPhase(ns, "configmap-route"), TestTimeoutMedium).Should(Equal(v1.PodRunning)) Eventually(IntegrationCondition(ns, "configmap-route", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue)) Eventually(IntegrationLogs(ns, "configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"])) @@ -80,13 +80,23 @@ func TestRunConfigExamples(t *testing.T) { secData["my-secret-key"] = "very top secret" NewPlainTextSecret(ns, "my-sec", secData) - Expect(Kamel("run", "-n", ns, "./files/secret-route.groovy", "--secret", "my-sec").Execute()).To(Succeed()) + Expect(Kamel("run", "-n", ns, "./files/secret-route.groovy", "--config", "secret:my-sec").Execute()).To(Succeed()) Eventually(IntegrationPodPhase(ns, "secret-route"), TestTimeoutMedium).Should(Equal(v1.PodRunning)) Eventually(IntegrationCondition(ns, "secret-route", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue)) Eventually(IntegrationLogs(ns, "secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"])) Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) }) + // File Configuration + + t.Run("Plain text configuration file", func(t *testing.T) { + Expect(Kamel("run", "-n", ns, "./files/config-file-route.groovy", "--config", "file:./files/resources-data.txt").Execute()).To(Succeed()) + Eventually(IntegrationPodPhase(ns, "config-file-route"), TestTimeoutMedium).Should(Equal(v1.PodRunning)) + Eventually(IntegrationCondition(ns, "config-file-route", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue)) + Eventually(IntegrationLogs(ns, "config-file-route"), TestTimeoutShort).Should(ContainSubstring("the file body")) + Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) + }) + // Resources t.Run("Plain text resource file", func(t *testing.T) { diff --git a/e2e/common/config/files/resources-route.groovy b/e2e/common/config/files/config-file-route.groovy similarity index 93% copy from e2e/common/config/files/resources-route.groovy copy to e2e/common/config/files/config-file-route.groovy index 6f57285..53b347f 100644 --- a/e2e/common/config/files/resources-route.groovy +++ b/e2e/common/config/files/config-file-route.groovy @@ -18,7 +18,7 @@ // // To run this integrations use: -// kamel run --resource resources-data.txt resources-route.groovy --dev +// kamel run --config file:resources-data.txt resources-route.groovy --dev // from('timer:resources') diff --git a/e2e/common/config/files/configmap-route.groovy b/e2e/common/config/files/configmap-route.groovy index 5a61c56..948cb15 100644 --- a/e2e/common/config/files/configmap-route.groovy +++ b/e2e/common/config/files/configmap-route.groovy @@ -20,7 +20,7 @@ // To run this integrations use: // // kubectl create configmap my-cm --from-literal=my-configmap-key="configmap content" -// kamel run --configmap my-cm configmap-route.groovy --dev +// kamel run --config configmap:my-cm configmap-route.groovy --dev // from('timer:configmap') diff --git a/e2e/common/config/files/property-file-route.groovy b/e2e/common/config/files/property-file-route.groovy index 13a09fc..6ce6838 100644 --- a/e2e/common/config/files/property-file-route.groovy +++ b/e2e/common/config/files/property-file-route.groovy @@ -19,7 +19,7 @@ // // To run this integrations use: // -// kamel run --property-file my.properties property-file-route.groovy --dev +// kamel run --property file:my.properties property-file-route.groovy --dev // from('timer:property-file') diff --git a/e2e/common/config/files/resources-route.groovy b/e2e/common/config/files/resources-route.groovy index 6f57285..1085840 100644 --- a/e2e/common/config/files/resources-route.groovy +++ b/e2e/common/config/files/resources-route.groovy @@ -21,8 +21,5 @@ // kamel run --resource resources-data.txt resources-route.groovy --dev // -from('timer:resources') - .routeId('resources') - .setBody() - .simple("resource:classpath:resources-data.txt") +from('file:/etc/camel/resources/?fileName=resources-data.txt&noop=true&idempotent=false') .log('resource file content is: ${body}') diff --git a/e2e/common/config/files/secret-route.groovy b/e2e/common/config/files/secret-route.groovy index 49966ae..7027b84 100644 --- a/e2e/common/config/files/secret-route.groovy +++ b/e2e/common/config/files/secret-route.groovy @@ -20,7 +20,7 @@ // To run this integrations use: // // kubectl create secret generic my-sec --from-literal=my-secret-key="very top secret" -// kamel run --secret my-sec secret-route.groovy --dev +// kamel run --config secret:my-sec secret-route.groovy --dev // from('timer:secret')
