squakez commented on code in PR #3623:
URL: https://github.com/apache/camel-k/pull/3623#discussion_r966705162
##########
e2e/global/common/kamelet_test.go:
##########
@@ -41,18 +41,40 @@ func TestKameletClasspathLoading(t *testing.T) {
Eventually(Kamelet(kameletName, ns)).Should(BeNil())
- Expect(KamelRunWithID(operatorID, ns,
"files/TimerKameletIntegration.java", "-t", "kamelets.enabled=false",
- "--resource",
"file:files/timer-source.kamelet.yaml@/kamelets/timer-source.kamelet.yaml",
- "-p camel.component.kamelet.location=file:/kamelets",
- "-d", "camel:yaml-dsl",
- // kamelet dependencies
- "-d", "camel:timer").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns,
"timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- Eventually(IntegrationLogs(ns,
"timer-kamelet-integration")).Should(ContainSubstring("important message"))
-
- // Cleanup
- Expect(Kamel("delete", "--all", "-n",
ns).Execute()).Should(BeNil())
+ // Basic
+ t.Run("test basic case", func(t *testing.T) {
+
+ Expect(KamelRunWithID(operatorID, ns,
"files/TimerKameletIntegration.java", "-t", "kamelets.enabled=false",
+ "--resource",
"file:files/timer-source.kamelet.yaml@/kamelets/timer-source.kamelet.yaml",
+ "-p
camel.component.kamelet.location=file:/kamelets",
+ "-d", "camel:yaml-dsl",
+ // kamelet dependencies
+ "-d", "camel:timer").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns,
"timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ Eventually(IntegrationLogs(ns,
"timer-kamelet-integration")).Should(ContainSubstring("important message"))
+
+ // Cleanup
+ Expect(Kamel("delete", "--all", "-n",
ns).Execute()).Should(BeNil())
+ })
+
+ // Custom repo
+ t.Run("test custom Kamelet repository", func(t *testing.T) {
+
+ // Add the custom repository
+ Expect(Kamel("kamelet", "add-repo",
"github:essobedo/camel-k-test/kamelets", "-n", ns, "-x",
operatorID).Execute()).To(Succeed())
+
+ Expect(KamelRunWithID(operatorID, ns,
"files/TimerCustomKameletIntegration.java",
+ "-d", "camel:yaml-dsl",
Review Comment:
I think both dependencies should not be explicitly declared but included by
the operator when running. I guess the old test had that for some reason, but
we should try to remove this declaration now.
##########
pkg/cmd/kamelet_add_repo.go:
##########
@@ -0,0 +1,111 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+ "errors"
+ "fmt"
+ "regexp"
+
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ "github.com/spf13/cobra"
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ "sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+// kameletRepositoryURIRegexp is the regular expression used to validate the
URI of a Kamelet repository.
+var kameletRepositoryURIRegexp =
regexp.MustCompile(`^github:[^/]+/[^/]+((/[^/]+)*)?$`)
+
+func newKameletAddRepoCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command,
*kameletAddRepoCommandOptions) {
+ options := kameletAddRepoCommandOptions{
+ RootCmdOptions: rootCmdOptions,
+ }
+
+ cmd := cobra.Command{
+ Use: "add-repo
github:owner/repo[/path_to_kamelets_folder][@version] ...",
+ Short: "Add a Kamelet repository",
+ Long: `Add a Kamelet repository.`,
+ PreRunE: decode(&options),
+ RunE: func(cmd *cobra.Command, args []string) error {
+ if err := options.validate(args); err != nil {
+ return err
+ }
+ return options.run(cmd, args)
+ },
+ }
+
+ cmd.Flags().StringP("operator-id", "x", "camel-k", "Id of the Operator
to update.")
+
+ return &cmd, &options
+}
+
+type kameletAddRepoCommandOptions struct {
+ *RootCmdOptions
+ OperatorID string `mapstructure:"operator-id" yaml:",omitempty"`
+}
+
+func (o *kameletAddRepoCommandOptions) validate(args []string) error {
+ if len(args) == 0 {
+ return errors.New("at least one Kamelet repository is expected")
+ }
+ if o.OperatorID == "" {
+ return fmt.Errorf("cannot use empty operator id")
+ }
+ return nil
+}
+
+func (o *kameletAddRepoCommandOptions) run(cmd *cobra.Command, args []string)
error {
+ c, err := o.GetCmdClient()
+ if err != nil {
+ return err
+ }
+ key := client.ObjectKey{
+ Namespace: o.Namespace,
+ Name: o.OperatorID,
+ }
+ platform := v1.IntegrationPlatform{}
+ if err := c.Get(o.Context, key, &platform); err != nil {
+ if k8serrors.IsNotFound(err) {
+ // IntegrationPlatform may be in the operator
namespace, but we currently don't have a way to determine it: we just warn
+ fmt.Fprintf(cmd.ErrOrStderr(), "Warning:
IntegrationPlatform %q not found in namespace %q\n", key.Name, key.Namespace)
+ return nil
+ }
+ return err
+ }
+ for _, uri := range args {
+ if err := checkURI(uri, platform.Spec.Kamelet.Repositories);
err != nil {
+ return err
+ }
+ platform.Spec.Kamelet.Repositories =
append(platform.Spec.Kamelet.Repositories,
v1.IntegrationPlatformKameletRepositorySpec{
+ URI: uri,
+ })
+ }
+ return c.Update(o.Context, &platform)
+}
+
+func checkURI(uri string, repositories
[]v1.IntegrationPlatformKameletRepositorySpec) error {
Review Comment:
Some unit test to validate all the URIs we expect (and to fail when some is
malformed) would be nice to have.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
