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 931b7612cea9b60632b7c8ea1cd417f081b2b11f Author: nicolaferraro <[email protected]> AuthorDate: Thu Sep 17 10:27:07 2020 +0200 Fix #1574: fix naming convention for property-defined sources --- deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml | 4 ++++ deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml | 4 ++++ deploy/resources.go | 8 ++++---- pkg/trait/knative_service_test.go | 2 +- pkg/trait/trait_types.go | 6 +++--- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml b/deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml index c4cd500..4604b99 100644 --- a/deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml +++ b/deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml @@ -64,6 +64,10 @@ spec: dependencies: - groupId: org.apache.camel.k artifactId: camel-k-runtime-tracing + master: + dependencies: + - groupId: org.apache.camel.k + artifactId: camel-k-runtime-master artifacts: camel-zipfile: groupId: org.apache.camel diff --git a/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml b/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml index c180043..6a4b50a 100644 --- a/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml +++ b/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml @@ -64,6 +64,10 @@ spec: dependencies: - groupId: org.apache.camel.quarkus artifactId: camel-quarkus-opentracing + master: + dependencies: + - groupId: org.apache.camel.quarkus + artifactId: camel-quarkus-master artifacts: camel-quarkus-aws2-ses: groupId: org.apache.camel.quarkus diff --git a/deploy/resources.go b/deploy/resources.go index d326415..71d31a1 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -91,16 +91,16 @@ var assets = func() http.FileSystem { "/camel-catalog-1.5.1-SNAPSHOT-main.yaml": &vfsgen۰CompressedFileInfo{ name: "camel-catalog-1.5.1-SNAPSHOT-main.yaml", modTime: time.Time{}, - uncompressedSize: 91408, + uncompressedSize: 91527, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\xbd\x5b\x77\xdb\x38\xb2\x2f\xfe\x9e\x4f\xc1\x35\x79\xd9\x7b\xfd\x47\x35\xdd\xce\xcc\xf4\xde\xfd\x7f\xb2\xe5\x38\xb1\x63\x3b\xee\xd0\x93\x64\xe6\xa5\x17\x44\x42\x12\x2c\x92\xa0\x01\x48\x96\xfd\xe9\xcf\xc2\x85\x57\x41\x90\x48\x18\x3e\xeb\xf8\xc1\xa4\x88\xaa\x5f\xb1\x08\x12\x97\x42\xa1\xea\x7d\x34\x79\xbd\xbf\x77\xef\xa3\x6b\x92\xe0\x82\xe3\x34\x12\x34\x12\x4b\x1c\x9d\x96\x28\x59\xe2\x28\xa6\x73\xf1\x84\x18\x8e\x2e\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\xbd\x5b\x77\xdb\x38\xb2\x2f\xfe\x9e\x4f\xc1\x35\x79\xd9\x7b\xfd\x47\x98\x6e\x67\x66\x7a\xef\xfe\x3f\xd9\x72\x9c\xd8\xb1\x1d\x77\xe8\x49\x32\xf3\xd2\x0b\x22\x21\x09\x16\x49\xd0\x00\x24\xcb\xfe\xf4\x67\xe1\xc2\xab\x20\x48\x64\x19\x3e\xeb\xf8\xc1\xa4\x88\xaa\x5f\xb1\x08\x12\x97\x42\xa1\xea\x7d\x34\x79\xbd\xbf\x77\xef\xa3\x6b\x9a\x90\x42\x90\x34\x92\x2c\x92\x4b\x12\x9d\x96\x38\x59\x92\x28\x66\x73\xf9\x84\x39\x89\x2e\x [...] }, "/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml": &vfsgen۰CompressedFileInfo{ name: "camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml", modTime: time.Time{}, - uncompressedSize: 87866, + uncompressedSize: 87989, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5d\x57\xdc\x38\xd2\xff\x7d\x3e\x85\xcf\xe4\xe6\x79\xce\x7f\xad\x9d\x21\xbb\x3b\x7b\xe6\x7f\x05\x4d\x48\x20\x40\x48\xcc\x26\xd9\xbd\x99\xa3\xb6\xd5\xdd\xa2\x6d\xcb\x48\xea\x06\xf2\xe9\x9f\xa3\x17\xbf\xb6\x29\xbf\x20\xb1\x5c\x60\xbb\x55\xfa\x95\x55\x92\xa5\x52\xa9\x54\x7a\x1b\x84\xee\xfe\xde\xbc\x0d\x2e\x69\x4c\x72\x41\x92\x40\xb2\x40\x6e\x48\x70\x5c\xe0\x78\x43\x82\x88\xad\xe4\x03\xe6\x24\x38\x63\xbb\x3c\xc1\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5d\x57\xdc\x38\xd2\xff\x7d\x3e\x85\xcf\xe4\xe6\x79\xce\x7f\xad\x9d\x21\xbb\x3b\x7b\xe6\x7f\x05\x4d\x48\x20\x40\x48\xcc\x26\xd9\xbd\x99\xa3\xb6\xd5\xdd\xa2\x6d\xcb\x48\xea\x06\xf2\xe9\x9f\xa3\x17\xbf\xb6\x29\xbf\x20\xb1\x5c\x60\xbb\x55\xfa\x95\x55\x92\xa5\x52\xa9\x54\x7a\x1b\x84\xee\xfe\xde\xbc\x0d\x2e\x69\x4c\x72\x41\x92\x40\xb2\x40\x6e\x48\x70\x5c\xe0\x78\x43\x82\x88\xad\xe4\x03\xe6\x24\x38\x63\xbb\x3c\xc1\x [...] }, "/cr-example.yaml": &vfsgen۰CompressedFileInfo{ name: "cr-example.yaml", diff --git a/pkg/trait/knative_service_test.go b/pkg/trait/knative_service_test.go index 731eec9..5b73d4e 100644 --- a/pkg/trait/knative_service_test.go +++ b/pkg/trait/knative_service_test.go @@ -174,7 +174,7 @@ func TestKnativeService(t *testing.T) { assert.Equal(t, "file:/etc/camel/sources/i-source-000/routes.js", environment.ApplicationProperties["camel.k.sources[0].location"]) assert.Equal(t, "js", environment.ApplicationProperties["camel.k.sources[0].language"]) - assert.Equal(t, "true", environment.ApplicationProperties["camel.k.sources[0].compression"]) + assert.Equal(t, "true", environment.ApplicationProperties["camel.k.sources[0].compressed"]) test.EnvVarHasValue(t, spec.Containers[0].Env, "CAMEL_K_CONF", "/etc/camel/conf/application.properties") test.EnvVarHasValue(t, spec.Containers[0].Env, "CAMEL_K_CONF_D", "/etc/camel/conf.d") } diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go index 3d38531..8343fb9 100644 --- a/pkg/trait/trait_types.go +++ b/pkg/trait/trait_types.go @@ -508,7 +508,7 @@ func (e *Environment) AddSourcesProperties() { e.ApplicationProperties[fmt.Sprintf("camel.k.sources[%d].loader", i)] = string(s.Loader) } if s.Compression { - e.ApplicationProperties[fmt.Sprintf("camel.k.sources[%d].compression", i)] = "true" + e.ApplicationProperties[fmt.Sprintf("camel.k.sources[%d].compressed", i)] = "true" } interceptors := make([]string, 0, len(s.Interceptors)) @@ -518,8 +518,8 @@ func (e *Environment) AddSourcesProperties() { if e.Interceptors != nil { interceptors = append(interceptors, e.Interceptors...) } - if len(interceptors) > 0 { - e.ApplicationProperties[fmt.Sprintf("camel.k.sources[%d].interceptors", i)] = strings.Join(interceptors, ",") + for intID, interceptor := range interceptors { + e.ApplicationProperties[fmt.Sprintf("camel.k.sources[%d].interceptors[%d]", i, intID)] = interceptor } } }
