You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2020/02/05 08:17:19 UTC
[camel-k] branch master updated (8c5cb7f -> c7bcde6)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 8c5cb7f Merge pull request #1250 from apupier/1249-fixLink
new 6b7caf5 add 'logs' alias on 'log' cmd
new c0dd004 fix indentation
new c7bcde6 gofmt fix
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
go.mod | 1 +
go.sum | 6 ++++++
pkg/cmd/log.go | 1 +
pkg/cmd/log_test.go | 22 ++++++++++++++++++++++
4 files changed, 30 insertions(+)
create mode 100644 pkg/cmd/log_test.go
[camel-k] 02/03: fix indentation
Posted by nf...@apache.org.
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 c0dd0045de9a7ce7b679df230cd8aa7de10b951c
Author: Ioannis Polyzos <i....@gmail.com>
AuthorDate: Tue Feb 4 23:09:45 2020 +0000
fix indentation
---
pkg/cmd/log.go | 2 +-
pkg/cmd/log_test.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/cmd/log.go b/pkg/cmd/log.go
index f92ed98..e70931a 100644
--- a/pkg/cmd/log.go
+++ b/pkg/cmd/log.go
@@ -91,4 +91,4 @@ func (o *logCmdOptions) run(cmd *cobra.Command, args []string) error {
<-o.Context.Done()
return nil
-}
+}
\ No newline at end of file
diff --git a/pkg/cmd/log_test.go b/pkg/cmd/log_test.go
index c897839..2c7772d 100644
--- a/pkg/cmd/log_test.go
+++ b/pkg/cmd/log_test.go
@@ -18,4 +18,4 @@ func TestLogsAlias(t *testing.T) {
if err != nil && err.Error() != "log expects an integration name argument" {
t.Fatalf("Expected error result for invalid alias `logs`")
}
-}
+}
\ No newline at end of file
[camel-k] 01/03: add 'logs' alias on 'log' cmd
Posted by nf...@apache.org.
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 6b7caf55b8487c6afb2eb96dc4b08b3a80dd3bad
Author: Ioannis Polyzos <i....@gmail.com>
AuthorDate: Tue Feb 4 22:44:50 2020 +0000
add 'logs' alias on 'log' cmd
---
pkg/cmd/log.go | 1 +
pkg/cmd/log_test.go | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/pkg/cmd/log.go b/pkg/cmd/log.go
index 8378c37..f92ed98 100644
--- a/pkg/cmd/log.go
+++ b/pkg/cmd/log.go
@@ -36,6 +36,7 @@ func newCmdLog(rootCmdOptions *RootCmdOptions) (*cobra.Command, *logCmdOptions)
Use: "log integration",
Short: "Print the logs of an integration",
Long: `Print the logs of an integration.`,
+ Aliases: []string{"logs"},
Args: options.validate,
PreRunE: decode(&options),
RunE: options.run,
diff --git a/pkg/cmd/log_test.go b/pkg/cmd/log_test.go
new file mode 100644
index 0000000..c897839
--- /dev/null
+++ b/pkg/cmd/log_test.go
@@ -0,0 +1,21 @@
+package cmd
+
+import (
+ "github.com/apache/camel-k/pkg/util/test"
+ "testing"
+)
+
+func TestLogsAlias(t *testing.T) {
+ options, rootCommand := kamelTestPreAddCommandInit()
+ logCommand, _ := newCmdLog(options)
+ rootCommand.AddCommand(logCommand)
+
+ kamelTestPostAddCommandInit(t, rootCommand)
+
+ _, err := test.ExecuteCommand(rootCommand, "logs")
+
+ //in case of error we expect this to be the log default message
+ if err != nil && err.Error() != "log expects an integration name argument" {
+ t.Fatalf("Expected error result for invalid alias `logs`")
+ }
+}
[camel-k] 03/03: gofmt fix
Posted by nf...@apache.org.
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 c7bcde6210059e2227d8cec072ae0e5eae2dff5b
Author: Ioannis Polyzos <i....@gmail.com>
AuthorDate: Tue Feb 4 23:22:44 2020 +0000
gofmt fix
---
go.mod | 1 +
go.sum | 6 ++++++
pkg/cmd/log.go | 2 +-
pkg/cmd/log_test.go | 5 +++--
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/go.mod b/go.mod
index b4ce0fc..5983baa 100644
--- a/go.mod
+++ b/go.mod
@@ -34,6 +34,7 @@ require (
github.com/stoewer/go-strcase v1.0.2
github.com/stretchr/testify v1.4.0
go.uber.org/multierr v1.1.0
+ golang.org/x/tools v0.0.0-20200204230316-67a4523381ef // indirect
gopkg.in/inf.v0 v0.9.1
gopkg.in/yaml.v2 v2.2.4
k8s.io/api v0.0.0
diff --git a/go.sum b/go.sum
index 29420ed..bba5481 100644
--- a/go.sum
+++ b/go.sum
@@ -767,6 +767,7 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 h1:ydJNl0ENAG67pFbB+9tfhiL2pYqLhfoaZFw/cjLhY4A=
golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 h1:ZC1Xn5A1nlpSmQCIva4bZ3ob3lmhYIefc+GU+DLg1Ow=
golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -781,6 +782,7 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -894,8 +896,12 @@ golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgw
golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
golang.org/x/tools v0.0.0-20191018212557-ed542cd5b28a h1:UuQ+70Pi/ZdWHuP4v457pkXeOynTdgd/4enxeIO/98k=
golang.org/x/tools v0.0.0-20191018212557-ed542cd5b28a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200204230316-67a4523381ef h1:mdhEDFpO1Tfj7PXIflIuP1tbXt4rJgHIvbzdh62SARw=
+golang.org/x/tools v0.0.0-20200204230316-67a4523381ef/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gomodules.xyz/jsonpatch/v2 v2.0.1 h1:xyiBuvkD2g5n7cYzx6u2sxQvsAy4QJsZFCzGVdzOXZ0=
gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
diff --git a/pkg/cmd/log.go b/pkg/cmd/log.go
index e70931a..f92ed98 100644
--- a/pkg/cmd/log.go
+++ b/pkg/cmd/log.go
@@ -91,4 +91,4 @@ func (o *logCmdOptions) run(cmd *cobra.Command, args []string) error {
<-o.Context.Done()
return nil
-}
\ No newline at end of file
+}
diff --git a/pkg/cmd/log_test.go b/pkg/cmd/log_test.go
index 2c7772d..e41201f 100644
--- a/pkg/cmd/log_test.go
+++ b/pkg/cmd/log_test.go
@@ -1,8 +1,9 @@
package cmd
import (
- "github.com/apache/camel-k/pkg/util/test"
"testing"
+
+ "github.com/apache/camel-k/pkg/util/test"
)
func TestLogsAlias(t *testing.T) {
@@ -18,4 +19,4 @@ func TestLogsAlias(t *testing.T) {
if err != nil && err.Error() != "log expects an integration name argument" {
t.Fatalf("Expected error result for invalid alias `logs`")
}
-}
\ No newline at end of file
+}