Skip to content
This repository was archived by the owner on Dec 11, 2023. It is now read-only.

Commit 8a07038

Browse files
tzununbekovtzununbekov
authored
Output update and const move out (#135)
1 parent 3c65975 commit 8a07038

13 files changed

Lines changed: 38 additions & 43 deletions

File tree

‎cmd/brokers/brokers.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424

2525
"github.com/spf13/cobra"
2626
"github.com/spf13/viper"
27-
)
2827

29-
const manifestFile = "manifest.yaml"
28+
"github.com/triggermesh/tmctl/pkg/triggermesh"
29+
)
3030

3131
func NewCmd() *cobra.Command {
3232
var broker string
@@ -78,7 +78,7 @@ func List(configDir, currentContext string) ([]string, error) {
7878
return nil, fmt.Errorf("listing files: %w", err)
7979
}
8080
for _, file := range files {
81-
if file.Name() == manifestFile {
81+
if file.Name() == triggermesh.ManifestFile {
8282
if dir.Name() == currentContext {
8383
output = append(output, fmt.Sprintf("*%s", dir.Name()))
8484
continue

‎cmd/cmd.go‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,10 @@ import (
3434
"github.com/triggermesh/tmctl/cmd/stop"
3535
"github.com/triggermesh/tmctl/cmd/version"
3636
"github.com/triggermesh/tmctl/cmd/watch"
37+
"github.com/triggermesh/tmctl/pkg/triggermesh"
3738
)
3839

39-
const (
40-
defaultTriggermeshVersion = "v1.21.1"
41-
defaultBroker = ""
42-
43-
configDir = ".triggermesh/cli"
44-
)
40+
const defaultBroker = ""
4541

4642
func NewRootCommand(ver, commit string) *cobra.Command {
4743
rootCmd := &cobra.Command{
@@ -55,7 +51,7 @@ Find more information at: https://docs.triggermesh.io`,
5551

5652
cobra.OnInitialize(initConfig)
5753

58-
rootCmd.PersistentFlags().String("version", defaultTriggermeshVersion, "TriggerMesh components version.")
54+
rootCmd.PersistentFlags().String("version", triggermesh.DefaultVersion, "TriggerMesh components version.")
5955
rootCmd.PersistentFlags().String("broker", defaultBroker, "Optional broker name.")
6056
// rootCmd.PersistentFlags().MarkHidden("broker")
6157

@@ -90,17 +86,14 @@ Find more information at: https://docs.triggermesh.io`,
9086
func initConfig() {
9187
home, err := os.UserHomeDir()
9288
cobra.CheckErr(err)
93-
configHome := path.Join(home, configDir)
89+
configHome := path.Join(home, triggermesh.ConfigDir)
9490

95-
// Search config in home directory with name ".cobra" (without extension).
96-
viper.SetConfigType("yaml")
97-
viper.SetConfigName("config")
98-
viper.AddConfigPath(configHome)
91+
viper.SetConfigFile(path.Join(configHome, triggermesh.ConfigFile))
9992
if err := viper.ReadInConfig(); err != nil {
10093
if _, ok := err.(viper.ConfigFileNotFoundError); ok {
10194
cobra.CheckErr(os.MkdirAll(configHome, os.ModePerm))
10295
viper.SetDefault("context", defaultBroker)
103-
viper.SetDefault("triggermesh.version", defaultTriggermeshVersion)
96+
viper.SetDefault("triggermesh.version", triggermesh.DefaultVersion)
10497
cobra.CheckErr(viper.SafeWriteConfig())
10598
cobra.CheckErr(viper.ReadInConfig())
10699
} else {

‎cmd/create/broker.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (o *CreateOptions) NewBrokerCmd() *cobra.Command {
4747
func (o *CreateOptions) broker(name string) error {
4848
ctx := context.Background()
4949

50-
o.Manifest.Path = path.Join(o.ConfigBase, name, manifestFile)
50+
o.Manifest.Path = path.Join(o.ConfigBase, name, triggermesh.ManifestFile)
5151
broker, err := tmbroker.New(name, o.Manifest.Path)
5252
if err != nil {
5353
return fmt.Errorf("broker: %w", err)

‎cmd/create/cmd.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ import (
3030
"github.com/triggermesh/tmctl/pkg/triggermesh/crd"
3131
)
3232

33-
const manifestFile = "manifest.yaml"
34-
3533
type CreateOptions struct {
3634
ConfigBase string
3735
Context string
@@ -64,7 +62,7 @@ func (o *CreateOptions) initialize() {
6462
o.ConfigBase = path.Dir(viper.ConfigFileUsed())
6563
o.Context = viper.GetString("context")
6664
o.Version = viper.GetString("triggermesh.version")
67-
o.Manifest = manifest.New(path.Join(o.ConfigBase, o.Context, manifestFile))
65+
o.Manifest = manifest.New(path.Join(o.ConfigBase, o.Context, triggermesh.ManifestFile))
6866
crds, err := crd.Fetch(o.ConfigBase, o.Version)
6967
cobra.CheckErr(err)
7068
o.CRD = crds

‎cmd/create/completion.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"strings"
2222

2323
"github.com/spf13/cobra"
24+
2425
"github.com/triggermesh/tmctl/cmd/brokers"
2526
"github.com/triggermesh/tmctl/pkg/completion"
2627
"github.com/triggermesh/tmctl/pkg/triggermesh/crd"

‎cmd/delete/delete.go‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ import (
3939
"github.com/triggermesh/tmctl/pkg/triggermesh/crd"
4040
)
4141

42-
const manifestFile = "manifest.yaml"
43-
4442
type DeleteOptions struct {
4543
ConfigBase string
4644
Context string
@@ -82,7 +80,7 @@ func (o *DeleteOptions) initialize() {
8280
o.ConfigBase = path.Dir(viper.ConfigFileUsed())
8381
o.Context = viper.GetString("context")
8482
o.Version = viper.GetString("triggermesh.version")
85-
o.Manifest = manifest.New(path.Join(o.ConfigBase, o.Context, manifestFile))
83+
o.Manifest = manifest.New(path.Join(o.ConfigBase, o.Context, triggermesh.ManifestFile))
8684
crds, err := crd.Fetch(o.ConfigBase, o.Version)
8785
cobra.CheckErr(err)
8886
o.CRD = crds
@@ -95,7 +93,7 @@ func (o *DeleteOptions) initialize() {
9593
func (o *DeleteOptions) deleteBroker(broker string) error {
9694
oo := *o
9795
oo.Context = broker
98-
oo.Manifest = manifest.New(path.Join(oo.ConfigBase, broker, manifestFile))
96+
oo.Manifest = manifest.New(path.Join(oo.ConfigBase, broker, triggermesh.ManifestFile))
9997
cobra.CheckErr(oo.Manifest.Read())
10098

10199
if err := oo.deleteComponents([]string{}, true); err != nil {
@@ -153,9 +151,8 @@ func (o *DeleteOptions) deleteEverything(ctx context.Context, object kubernetes.
153151
if err := o.removeExternalServices(ctx, object); err != nil {
154152
log.Printf("WARN: external services are not deleted: %v", err)
155153
}
156-
if err := o.removeContainer(ctx, object.Metadata.Name, client); err != nil {
157-
log.Printf("WARN: unable to remove %q container: %v", object.Metadata.Name, err)
158-
}
154+
// not all components are runnable, but removeContainer should try to stop it anyway
155+
_ = o.removeContainer(ctx, object.Metadata.Name, client)
159156
o.removeObject(object.Metadata.Name)
160157
o.cleanupTriggers(object.Metadata.Name)
161158
o.cleanupSecrets(object.Metadata.Name)

‎cmd/describe/describe.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ import (
3939
)
4040

4141
const (
42-
manifestFile = "manifest.yaml"
43-
4442
successColorCode = "\033[92m"
4543
defaultColorCode = "\033[39m"
4644
offlineColorCode = "\u001b[31m"
@@ -68,7 +66,7 @@ func NewCmd() *cobra.Command {
6866
}
6967
o.ConfigBase = path.Dir(viper.ConfigFileUsed())
7068
o.Version = viper.GetString("triggermesh.version")
71-
o.Manifest = manifest.New(path.Join(o.ConfigBase, broker, manifestFile))
69+
o.Manifest = manifest.New(path.Join(o.ConfigBase, broker, triggermesh.ManifestFile))
7270
cobra.CheckErr(o.Manifest.Read())
7371
crds, err := crd.Fetch(o.ConfigBase, o.Version)
7472
if err != nil {

‎cmd/dump/dump.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ import (
2727

2828
"github.com/triggermesh/tmctl/pkg/kubernetes"
2929
"github.com/triggermesh/tmctl/pkg/manifest"
30+
"github.com/triggermesh/tmctl/pkg/triggermesh"
3031
tmbroker "github.com/triggermesh/tmctl/pkg/triggermesh/components/broker"
3132
)
3233

33-
const manifestFile = "manifest.yaml"
34-
3534
type DumpOptions struct {
3635
Format string
3736
Context string
@@ -50,7 +49,7 @@ func NewCmd() *cobra.Command {
5049
broker = args[0]
5150
}
5251
o.Context = broker
53-
o.Manifest = manifest.New(path.Join(path.Dir(viper.ConfigFileUsed()), broker, manifestFile))
52+
o.Manifest = manifest.New(path.Join(path.Dir(viper.ConfigFileUsed()), broker, triggermesh.ManifestFile))
5453
cobra.CheckErr(o.Manifest.Read())
5554
return o.dump(knativeEventing)
5655
},

‎cmd/sendevent/sendevent.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ import (
3535
)
3636

3737
const (
38-
manifestFile = "manifest.yaml"
39-
4038
defaultEventType = "triggermesh-local-event"
4139
defaultEventSource = "triggermesh-cli"
4240
)
@@ -80,7 +78,7 @@ func (o *SendOptions) initialize() {
8078
o.ConfigDir = path.Dir(viper.ConfigFileUsed())
8179
o.Context = viper.GetString("context")
8280
o.Version = viper.GetString("triggermesh.version")
83-
o.Manifest = manifest.New(path.Join(o.ConfigDir, o.Context, manifestFile))
81+
o.Manifest = manifest.New(path.Join(o.ConfigDir, o.Context, triggermesh.ManifestFile))
8482
crds, err := crd.Fetch(o.ConfigDir, o.Version)
8583
cobra.CheckErr(err)
8684
o.CRD = crds

‎cmd/start/start.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ import (
3333
"github.com/triggermesh/tmctl/pkg/triggermesh/crd"
3434
)
3535

36-
const manifestFile = "manifest.yaml"
37-
3836
type StartOptions struct {
3937
ConfigBase string
4038
Context string
@@ -72,7 +70,7 @@ func (o *StartOptions) initialize() {
7270
o.ConfigBase = path.Dir(viper.ConfigFileUsed())
7371
o.Context = viper.GetString("context")
7472
o.Version = viper.GetString("triggermesh.version")
75-
o.Manifest = manifest.New(path.Join(o.ConfigBase, o.Context, manifestFile))
73+
o.Manifest = manifest.New(path.Join(o.ConfigBase, o.Context, triggermesh.ManifestFile))
7674
crds, err := crd.Fetch(o.ConfigBase, o.Version)
7775
cobra.CheckErr(err)
7876
o.CRD = crds

0 commit comments

Comments
 (0)