Skip to content

Commit

Permalink
feat(cli): Force arguments for the rebuild command
Browse files Browse the repository at this point in the history
  • Loading branch information
essobedo committed Aug 19, 2022
1 parent 11ad664 commit 02a6a90
Show file tree
Hide file tree
Showing 3 changed files with 107 additions and 16 deletions.
37 changes: 31 additions & 6 deletions pkg/cmd/rebuild.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,49 @@ import (

v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/kubernetes"
)

func newCmdRebuild(rootCmdOptions *RootCmdOptions) (*cobra.Command, *rebuildCmdOptions) {
options := rebuildCmdOptions{
RootCmdOptions: rootCmdOptions,
}
cmd := cobra.Command{
Use: "rebuild [integration]",
Use: "rebuild [integration1] [integration2] ...",
Short: "Clear the state of integrations to rebuild them",
Long: `Clear the state of one or more integrations causing a rebuild.`,
PreRunE: decode(&options),
RunE: options.rebuild,
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(args); err != nil {
return err
}
if err := options.rebuild(cmd, args); err != nil {
fmt.Fprintln(cmd.ErrOrStderr(), err.Error())
}

return nil
},
}

cmd.Flags().Bool("all", false, "Rebuild all integrations")

return &cmd, &options
}

type rebuildCmdOptions struct {
*RootCmdOptions
RebuildAll bool `mapstructure:"all"`
}

func (o *rebuildCmdOptions) validate(args []string) error {
if o.RebuildAll && len(args) > 0 {
return errors.New("invalid combination: both all flag and named integrations are set")
}
if !o.RebuildAll && len(args) == 0 {
return errors.New("invalid combination: neither all flag nor named integrations are set")
}

return nil
}

func (o *rebuildCmdOptions) rebuild(cmd *cobra.Command, args []string) error {
Expand All @@ -55,11 +79,11 @@ func (o *rebuildCmdOptions) rebuild(cmd *cobra.Command, args []string) error {
}

var integrations []v1.Integration
if len(args) == 0 {
if o.RebuildAll {
if integrations, err = o.listAllIntegrations(c); err != nil {
return err
}
} else {
} else if len(args) > 0 {
if integrations, err = o.getIntegrations(c, args); err != nil {
return err
}
Expand All @@ -84,9 +108,10 @@ func (o *rebuildCmdOptions) listAllIntegrations(c client.Client) ([]v1.Integrati
func (o *rebuildCmdOptions) getIntegrations(c client.Client, names []string) ([]v1.Integration, error) {
ints := make([]v1.Integration, 0, len(names))
for _, n := range names {
it := v1.NewIntegration(o.Namespace, n)
name := kubernetes.SanitizeName(n)
it := v1.NewIntegration(o.Namespace, name)
key := k8sclient.ObjectKey{
Name: n,
Name: name,
Namespace: o.Namespace,
}
if err := c.Get(o.Context, key, &it); err != nil {
Expand Down
66 changes: 66 additions & 0 deletions pkg/cmd/rebuild_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
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 (
"testing"

"github.com/apache/camel-k/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
)

const cmdRebuild = "rebuild"

// nolint: unparam
func initializeRebuildCmdOptions(t *testing.T) (*rebuildCmdOptions, *cobra.Command, RootCmdOptions) {
t.Helper()

options, rootCmd := kamelTestPreAddCommandInit()
rebuildCmdOptions := addTestRebuildCmd(*options, rootCmd)
kamelTestPostAddCommandInit(t, rootCmd)

return rebuildCmdOptions, rootCmd, *options
}

func addTestRebuildCmd(options RootCmdOptions, rootCmd *cobra.Command) *rebuildCmdOptions {
// add a testing version of rebuild Command
rebuildCmd, rebuildOptions := newCmdRebuild(&options)
rebuildCmd.RunE = func(c *cobra.Command, args []string) error {
return nil
}
rebuildCmd.PostRunE = func(c *cobra.Command, args []string) error {
return nil
}
rebuildCmd.Args = test.ArbitraryArgs
rootCmd.AddCommand(rebuildCmd)
return rebuildOptions
}

func TestRebuildNonExistingFlag(t *testing.T) {
_, rootCmd, _ := initializeRebuildCmdOptions(t)
_, err := test.ExecuteCommand(rootCmd, cmdRebuild, "--nonExistingFlag")
assert.NotNil(t, err)
}

func TestRebuildAllFlag(t *testing.T) {
rebuildCmdOptions, rootCmd, _ := initializeRebuildCmdOptions(t)
_, err := test.ExecuteCommand(rootCmd, cmdRebuild, "--all")
assert.Nil(t, err)
assert.Equal(t, true, rebuildCmdOptions.RebuildAll)
}
20 changes: 10 additions & 10 deletions pkg/resources/resources.go

Large diffs are not rendered by default.

0 comments on commit 02a6a90

Please sign in to comment.