From 06707316afece5a498e1ce1bc9709d36d15cbcb5 Mon Sep 17 00:00:00 2001 From: Maha Hajja Date: Tue, 4 Feb 2025 13:03:23 -0800 Subject: [PATCH 1/3] add usage parameters --- cmd/conduit/root/connectorplugins/describe.go | 2 +- cmd/conduit/root/connectors/describe.go | 2 +- cmd/conduit/root/pipelines/describe.go | 2 +- cmd/conduit/root/pipelines/init.go | 6 +++++- cmd/conduit/root/processorplugins/describe.go | 2 +- cmd/conduit/root/processors/describe.go | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cmd/conduit/root/connectorplugins/describe.go b/cmd/conduit/root/connectorplugins/describe.go index f11dffd6b..a67436506 100644 --- a/cmd/conduit/root/connectorplugins/describe.go +++ b/cmd/conduit/root/connectorplugins/describe.go @@ -48,7 +48,7 @@ func (c *DescribeCommand) Output(output ecdysis.Output) { c.output = output } -func (c *DescribeCommand) Usage() string { return "describe" } +func (c *DescribeCommand) Usage() string { return "describe " } func (c *DescribeCommand) Docs() ecdysis.Docs { return ecdysis.Docs{ diff --git a/cmd/conduit/root/connectors/describe.go b/cmd/conduit/root/connectors/describe.go index ac56aa062..aa8e0fda6 100644 --- a/cmd/conduit/root/connectors/describe.go +++ b/cmd/conduit/root/connectors/describe.go @@ -48,7 +48,7 @@ func (c *DescribeCommand) Output(output ecdysis.Output) { c.output = output } -func (c *DescribeCommand) Usage() string { return "describe" } +func (c *DescribeCommand) Usage() string { return "describe " } func (c *DescribeCommand) Docs() ecdysis.Docs { return ecdysis.Docs{ diff --git a/cmd/conduit/root/pipelines/describe.go b/cmd/conduit/root/pipelines/describe.go index ecca1e7f1..7069eb2e0 100644 --- a/cmd/conduit/root/pipelines/describe.go +++ b/cmd/conduit/root/pipelines/describe.go @@ -60,7 +60,7 @@ func (c *DescribeCommand) Output(output ecdysis.Output) { func (c *DescribeCommand) Aliases() []string { return []string{"desc"} } -func (c *DescribeCommand) Usage() string { return "describe" } +func (c *DescribeCommand) Usage() string { return "describe " } func (c *DescribeCommand) Args(args []string) error { if len(args) == 0 { diff --git a/cmd/conduit/root/pipelines/init.go b/cmd/conduit/root/pipelines/init.go index 71963ba2b..f22113f13 100644 --- a/cmd/conduit/root/pipelines/init.go +++ b/cmd/conduit/root/pipelines/init.go @@ -70,6 +70,8 @@ func (c *InitCommand) Flags() []ecdysis.Flag { } flags.SetDefault("pipelines.path", filepath.Join(currentPath, "./pipelines")) + flags.SetDefault("source", "generator") + flags.SetDefault("destination", "file") return flags } @@ -85,7 +87,7 @@ func (c *InitCommand) Args(args []string) error { return nil } -func (c *InitCommand) Usage() string { return "init" } +func (c *InitCommand) Usage() string { return "init " } func (c *InitCommand) Docs() ecdysis.Docs { return ecdysis.Docs{ @@ -99,6 +101,8 @@ a simple and runnable generator-to-log pipeline is configured.`, } func (c *InitCommand) getSourceSpec() (connectorSpec, error) { + fmt.Println("src: ", c.flags.Source) + fmt.Println("dest: ", c.flags.Destination) for _, conn := range builtin.DefaultBuiltinConnectors { specs := conn.NewSpecification() if specs.Name == c.flags.Source || specs.Name == "builtin:"+c.flags.Source { diff --git a/cmd/conduit/root/processorplugins/describe.go b/cmd/conduit/root/processorplugins/describe.go index 8dfe638a5..1247386e5 100644 --- a/cmd/conduit/root/processorplugins/describe.go +++ b/cmd/conduit/root/processorplugins/describe.go @@ -48,7 +48,7 @@ func (c *DescribeCommand) Output(output ecdysis.Output) { c.output = output } -func (c *DescribeCommand) Usage() string { return "describe" } +func (c *DescribeCommand) Usage() string { return "describe " } func (c *DescribeCommand) Docs() ecdysis.Docs { return ecdysis.Docs{ diff --git a/cmd/conduit/root/processors/describe.go b/cmd/conduit/root/processors/describe.go index 242a7abc3..e258dafa3 100644 --- a/cmd/conduit/root/processors/describe.go +++ b/cmd/conduit/root/processors/describe.go @@ -48,7 +48,7 @@ func (c *DescribeCommand) Output(output ecdysis.Output) { c.output = output } -func (c *DescribeCommand) Usage() string { return "describe" } +func (c *DescribeCommand) Usage() string { return "describe " } func (c *DescribeCommand) Docs() ecdysis.Docs { return ecdysis.Docs{ From a54536cbab0b58ae8c700380052f2fa4b757e913 Mon Sep 17 00:00:00 2001 From: Maha Hajja Date: Tue, 4 Feb 2025 13:11:26 -0800 Subject: [PATCH 2/3] delete prints --- cmd/conduit/root/pipelines/init.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmd/conduit/root/pipelines/init.go b/cmd/conduit/root/pipelines/init.go index f22113f13..c6be855de 100644 --- a/cmd/conduit/root/pipelines/init.go +++ b/cmd/conduit/root/pipelines/init.go @@ -101,8 +101,6 @@ a simple and runnable generator-to-log pipeline is configured.`, } func (c *InitCommand) getSourceSpec() (connectorSpec, error) { - fmt.Println("src: ", c.flags.Source) - fmt.Println("dest: ", c.flags.Destination) for _, conn := range builtin.DefaultBuiltinConnectors { specs := conn.NewSpecification() if specs.Name == c.flags.Source || specs.Name == "builtin:"+c.flags.Source { From f1635d4c1667dfc65fefd9f283747f6e33b4c45a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Barroso?= Date: Wed, 5 Feb 2025 11:29:42 +0100 Subject: [PATCH 3/3] replace positional arguments placeholders --- cmd/conduit/root/connectorplugins/describe.go | 4 ++-- cmd/conduit/root/connectors/describe.go | 2 +- cmd/conduit/root/pipelines/describe.go | 2 +- cmd/conduit/root/pipelines/init.go | 2 +- cmd/conduit/root/processorplugins/describe.go | 2 +- cmd/conduit/root/processors/describe.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/conduit/root/connectorplugins/describe.go b/cmd/conduit/root/connectorplugins/describe.go index a67436506..cb91f1f03 100644 --- a/cmd/conduit/root/connectorplugins/describe.go +++ b/cmd/conduit/root/connectorplugins/describe.go @@ -48,7 +48,7 @@ func (c *DescribeCommand) Output(output ecdysis.Output) { c.output = output } -func (c *DescribeCommand) Usage() string { return "describe " } +func (c *DescribeCommand) Usage() string { return "describe CONNECTOR_PLUGIN_ID" } func (c *DescribeCommand) Docs() ecdysis.Docs { return ecdysis.Docs{ @@ -80,7 +80,7 @@ func (c *DescribeCommand) ExecuteWithClient(ctx context.Context, client *api.Cli Name: c.args.connectorPluginID, }) if err != nil { - return cerrors.Errorf("failed to list connector plguin: %w", err) + return cerrors.Errorf("failed to list connector plugin: %w", err) } if len(resp.Plugins) == 0 { diff --git a/cmd/conduit/root/connectors/describe.go b/cmd/conduit/root/connectors/describe.go index aa8e0fda6..b2bf55ee0 100644 --- a/cmd/conduit/root/connectors/describe.go +++ b/cmd/conduit/root/connectors/describe.go @@ -48,7 +48,7 @@ func (c *DescribeCommand) Output(output ecdysis.Output) { c.output = output } -func (c *DescribeCommand) Usage() string { return "describe " } +func (c *DescribeCommand) Usage() string { return "describe CONNECTOR_ID" } func (c *DescribeCommand) Docs() ecdysis.Docs { return ecdysis.Docs{ diff --git a/cmd/conduit/root/pipelines/describe.go b/cmd/conduit/root/pipelines/describe.go index 7069eb2e0..5156c4e04 100644 --- a/cmd/conduit/root/pipelines/describe.go +++ b/cmd/conduit/root/pipelines/describe.go @@ -60,7 +60,7 @@ func (c *DescribeCommand) Output(output ecdysis.Output) { func (c *DescribeCommand) Aliases() []string { return []string{"desc"} } -func (c *DescribeCommand) Usage() string { return "describe " } +func (c *DescribeCommand) Usage() string { return "describe PIPELINE_ID" } func (c *DescribeCommand) Args(args []string) error { if len(args) == 0 { diff --git a/cmd/conduit/root/pipelines/init.go b/cmd/conduit/root/pipelines/init.go index c6be855de..d9a332487 100644 --- a/cmd/conduit/root/pipelines/init.go +++ b/cmd/conduit/root/pipelines/init.go @@ -87,7 +87,7 @@ func (c *InitCommand) Args(args []string) error { return nil } -func (c *InitCommand) Usage() string { return "init " } +func (c *InitCommand) Usage() string { return "init PIPELINE_NAME" } func (c *InitCommand) Docs() ecdysis.Docs { return ecdysis.Docs{ diff --git a/cmd/conduit/root/processorplugins/describe.go b/cmd/conduit/root/processorplugins/describe.go index 1247386e5..d91ff493a 100644 --- a/cmd/conduit/root/processorplugins/describe.go +++ b/cmd/conduit/root/processorplugins/describe.go @@ -48,7 +48,7 @@ func (c *DescribeCommand) Output(output ecdysis.Output) { c.output = output } -func (c *DescribeCommand) Usage() string { return "describe " } +func (c *DescribeCommand) Usage() string { return "describe PROCESSOR_PLUGIN_ID" } func (c *DescribeCommand) Docs() ecdysis.Docs { return ecdysis.Docs{ diff --git a/cmd/conduit/root/processors/describe.go b/cmd/conduit/root/processors/describe.go index e258dafa3..e1ba37f93 100644 --- a/cmd/conduit/root/processors/describe.go +++ b/cmd/conduit/root/processors/describe.go @@ -48,7 +48,7 @@ func (c *DescribeCommand) Output(output ecdysis.Output) { c.output = output } -func (c *DescribeCommand) Usage() string { return "describe " } +func (c *DescribeCommand) Usage() string { return "describe PROCESSOR_ID" } func (c *DescribeCommand) Docs() ecdysis.Docs { return ecdysis.Docs{