-
Notifications
You must be signed in to change notification settings - Fork 350
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(cmd/bind): show expected kameletbinding
Closes #2565
- Loading branch information
1 parent
946ef3b
commit 24cd46b
Showing
6 changed files
with
159 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| 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 cmdBind = "bind" | ||
|
|
||
| func initializeBindCmdOptions(t *testing.T) (*bindCmdOptions, *cobra.Command, RootCmdOptions) { | ||
| options, rootCmd := kamelTestPreAddCommandInit() | ||
| bindCmdOptions := addTestBindCmd(*options, rootCmd) | ||
| kamelTestPostAddCommandInit(t, rootCmd) | ||
|
|
||
| return bindCmdOptions, rootCmd, *options | ||
| } | ||
|
|
||
| func addTestBindCmd(options RootCmdOptions, rootCmd *cobra.Command) *bindCmdOptions { | ||
| //add a testing version of bind Command | ||
| bindCmd, bindOptions := newCmdBind(&options) | ||
| bindCmd.PersistentPreRunE = func(c *cobra.Command, args []string) error { | ||
| return nil | ||
| } | ||
| bindCmd.Args = test.ArbitraryArgs | ||
| rootCmd.AddCommand(bindCmd) | ||
| return bindOptions | ||
| } | ||
|
|
||
| func TestBindOutputJSON(t *testing.T) { | ||
| buildCmdOptions, bindCmd, _ := initializeBindCmdOptions(t) | ||
| output, err := test.ExecuteCommand(bindCmd, cmdBind, "my:src", "my:dst", "-o", "json") | ||
| assert.Equal(t, "json", buildCmdOptions.OutputFormat) | ||
|
|
||
| assert.Nil(t, err) | ||
| assert.Equal(t, `{"kind":"KameletBinding","apiVersion":"camel.apache.org/v1alpha1","metadata":{"name":"my-to-my","creationTimestamp":null},"spec":{"source":{"uri":"my:src"},"sink":{"uri":"my:dst"}},"status":{}}`, output) | ||
| } | ||
|
|
||
| func TestBindOutputYAML(t *testing.T) { | ||
| buildCmdOptions, bindCmd, _ := initializeBindCmdOptions(t) | ||
| output, err := test.ExecuteCommand(bindCmd, cmdBind, "my:src", "my:dst", "-o", "yaml") | ||
| assert.Equal(t, "yaml", buildCmdOptions.OutputFormat) | ||
|
|
||
| assert.Nil(t, err) | ||
| assert.Equal(t, `apiVersion: camel.apache.org/v1alpha1 | ||
| kind: KameletBinding | ||
| metadata: | ||
| creationTimestamp: null | ||
| name: my-to-my | ||
| spec: | ||
| sink: | ||
| uri: my:dst | ||
| source: | ||
| uri: my:src | ||
| status: {} | ||
| `, output) | ||
| } | ||
|
|
||
| func TestBindOutputUnknownFormat(t *testing.T) { | ||
| buildCmdOptions, bindCmd, _ := initializeBindCmdOptions(t) | ||
| output, _ := test.ExecuteCommand(bindCmd, cmdBind, "my:src", "my:dst", "-o", "fail") | ||
| assert.Equal(t, "fail", buildCmdOptions.OutputFormat) | ||
|
|
||
| assert.Equal(t, "invalid output format option 'fail', should be one of: yaml|json\n", output) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| 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 kubernetes | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io" | ||
|
|
||
| "k8s.io/apimachinery/pkg/runtime" | ||
| ) | ||
|
|
||
| // CLIPrinter is delegated to print the runtime object | ||
| type CLIPrinter struct { | ||
| // It accepts either yaml or json format | ||
| Format string | ||
| } | ||
|
|
||
| // PrintObj prints the obj in json|yaml format according to the type of the obj. | ||
| func (p *CLIPrinter) PrintObj(obj runtime.Object, output io.Writer) error { | ||
| var data []byte | ||
| var err error | ||
| switch p.Format { | ||
| case "yaml": | ||
| data, err = ToYAML(obj) | ||
| case "json": | ||
| data, err = ToJSON(obj) | ||
| default: | ||
| err = fmt.Errorf("invalid output format option '%s', should be one of: yaml|json", p.Format) | ||
| } | ||
| if err != nil { | ||
| return err | ||
| } | ||
| fmt.Fprintf(output, string(data)) | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters