Skip to content

Commit 4b334c3

Browse files
raulbraulb
authored
fix(cli): Let handle values as bool (#120)
1 parent bf757a4 commit 4b334c3

16 files changed

+48
-46
lines changed

‎cmd/add_resource.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (ar *AddResource) execute(ctx context.Context, c AddResourceClient, res mer
7272
}
7373

7474
if ar.metadata != "" {
75-
var metadata map[string]string
75+
var metadata map[string]interface{}
7676
err = json.Unmarshal([]byte(ar.metadata), &metadata)
7777
if err != nil {
7878
return nil, err
@@ -100,7 +100,7 @@ func (ar *AddResource) command() *cobra.Command {
100100
Short: "Add a resource to your Meroxa resource catalog",
101101
Long: `Use the add command to add resources to your Meroxa resource catalog.`,
102102
Example: "\n" +
103-
"meroxa add resource store --type postgres -u $DATABASE_URL\n" +
103+
"meroxa add resource store --type postgres -u $DATABASE_URL --metadata '{\"logical_replication\":true}'\n" +
104104
"meroxa add resource datalake --type s3 -u \"s3://$AWS_ACCESS_KEY_ID:$AWS_ACCESS_KEY_SECRET@us-east-1/meroxa-demos\"\n" +
105105
"meroxa add resource warehouse --type redshift -u $REDSHIFT_URL\n" +
106106
"meroxa add resource slack --type url -u $WEBHOOK_URL\n",

‎cmd/create_connector.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ func (cc *CreateConnector) setFlags(cmd *cobra.Command) {
6363
cmd.Flags().MarkHidden("metadata")
6464
}
6565

66-
func (cc *CreateConnector) parseJSONMap(str string) (out map[string]string, err error) {
67-
out = make(map[string]string)
66+
func (cc *CreateConnector) parseJSONMap(str string) (out map[string]interface{}, err error) {
67+
out = make(map[string]interface{})
6868
if str != "" {
6969
err = json.Unmarshal([]byte(str), &out)
7070
}

‎cmd/create_connector_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ func TestCreateConnectorExecution(t *testing.T) {
106106
Name: "connector-name",
107107
ResourceID: 123,
108108
PipelineName: "my-pipeline",
109-
Configuration: map[string]string{
109+
Configuration: map[string]interface{}{
110110
"key": "value",
111111
"input": "foo",
112112
},
113-
Metadata: map[string]string{
113+
Metadata: map[string]interface{}{
114114
"metakey": "metavalue",
115115
"mx:connectorType": "source",
116116
},

‎cmd/create_pipeline.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func CreatePipelineCmd() *cobra.Command {
5555
return err
5656
}
5757
if metadataString != "" {
58-
var metadata map[string]string
58+
var metadata map[string]interface{}
5959
err = json.Unmarshal([]byte(metadataString), &metadata)
6060
if err != nil {
6161
return err

‎cmd/update_pipeline.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func (up *UpdatePipeline) execute(ctx context.Context, c UpdatePipelineClient) (
8585
}
8686

8787
if up.metadata != "" {
88-
metadata := map[string]string{}
88+
metadata := map[string]interface{}{}
8989

9090
err := json.Unmarshal([]byte(up.metadata), &metadata)
9191
if err != nil {

‎cmd/update_pipeline_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func TestUpdatePipelineExecutionWithNewMetadata(t *testing.T) {
186186
p := utils.GeneratePipeline()
187187
var pi meroxa.UpdatePipelineInput
188188

189-
pi.Metadata = map[string]string{"key": "value"}
189+
pi.Metadata = map[string]interface{}{"key": "value"}
190190

191191
client.
192192
EXPECT().

‎cmd/update_resource.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (ur *UpdateResource) execute(ctx context.Context, c UpdateResourceClient) (
8686

8787
// If metadata was provided, update it
8888
if ur.metadata != "" {
89-
var metadata map[string]string
89+
var metadata map[string]interface{}
9090
err := json.Unmarshal([]byte(ur.metadata), &metadata)
9191
if err != nil {
9292
return nil, fmt.Errorf("can't parse metadata: %w", err)

‎cmd/update_resource_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func TestUpdateResourceExecutionWithNewMetadata(t *testing.T) {
129129
metadata: `{"metakey":"metavalue"}`,
130130
}
131131

132-
var metadata map[string]string
132+
var metadata map[string]interface{}
133133

134134
json.Unmarshal([]byte(ur.metadata), &metadata)
135135
nr := meroxa.UpdateResourceInput{

‎docs/cmd/meroxa_add_resource.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ meroxa add resource [NAME] --type TYPE [flags]
1414

1515
```
1616
17-
meroxa add resource store --type postgres -u $DATABASE_URL
17+
meroxa add resource store --type postgres -u $DATABASE_URL --metadata '{"logical_replication":true}'
1818
meroxa add resource datalake --type s3 -u "s3://$AWS_ACCESS_KEY_ID:$AWS_ACCESS_KEY_SECRET@us-east-1/meroxa-demos"
1919
meroxa add resource warehouse --type redshift -u $REDSHIFT_URL
2020
meroxa add resource slack --type url -u $WEBHOOK_URL

‎etc/man/man1/meroxa-add-resource.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Use the add command to add resources to your Meroxa resource catalog.
5858

5959
.nf
6060

61-
meroxa add resource store \-\-type postgres \-u $DATABASE\_URL
61+
meroxa add resource store \-\-type postgres \-u $DATABASE\_URL \-\-metadata '{"logical\_replication":true}'
6262
meroxa add resource datalake \-\-type s3 \-u "s3://$AWS\_ACCESS\_KEY\_ID:$AWS\_ACCESS\_KEY\_SECRET@us\-east\-1/meroxa\-demos"
6363
meroxa add resource warehouse \-\-type redshift \-u $REDSHIFT\_URL
6464
meroxa add resource slack \-\-type url \-u $WEBHOOK\_URL

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/magiconair/properties v1.8.4 // indirect
1313
github.com/mattn/go-colorable v0.1.8 // indirect
1414
github.com/mattn/go-runewidth v0.0.10 // indirect
15-
github.com/meroxa/meroxa-go v0.0.0-20210412135021-30d283ae0dad
15+
github.com/meroxa/meroxa-go v0.0.0-20210413105822-b2f2f2377003
1616
github.com/mitchellh/go-homedir v1.1.0
1717
github.com/mitchellh/mapstructure v1.4.1 // indirect
1818
github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20170819232839-0fbfe93532da

‎go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ github.com/meroxa/meroxa-go v0.0.0-20210408105927-6a0c076e8b0d h1:Os8tHcnls70ZRu
143143
github.com/meroxa/meroxa-go v0.0.0-20210408105927-6a0c076e8b0d/go.mod h1:KtaTXPP6L2fv+omflnuihnc8pj7w44jC13M46Wv7T9Q=
144144
github.com/meroxa/meroxa-go v0.0.0-20210412135021-30d283ae0dad h1:fv+3u+g64Q78nH1UUSDEpVsWgCoipTNIzvv9RMT/lJA=
145145
github.com/meroxa/meroxa-go v0.0.0-20210412135021-30d283ae0dad/go.mod h1:KtaTXPP6L2fv+omflnuihnc8pj7w44jC13M46Wv7T9Q=
146+
github.com/meroxa/meroxa-go v0.0.0-20210413105822-b2f2f2377003 h1:ml5995aW7X6ZmpRSRIQFDDHEIDIHz+RVTlvj4XbJFbE=
147+
github.com/meroxa/meroxa-go v0.0.0-20210413105822-b2f2f2377003/go.mod h1:KtaTXPP6L2fv+omflnuihnc8pj7w44jC13M46Wv7T9Q=
146148
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
147149
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
148150
github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=

‎vendor/github.com/meroxa/meroxa-go/connector.go

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/meroxa/meroxa-go/pipeline.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/meroxa/meroxa-go/resource.go

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ github.com/mattn/go-isatty
4242
# github.com/mattn/go-runewidth v0.0.10
4343
## explicit
4444
github.com/mattn/go-runewidth
45-
# github.com/meroxa/meroxa-go v0.0.0-20210412135021-30d283ae0dad
45+
# github.com/meroxa/meroxa-go v0.0.0-20210413105822-b2f2f2377003
4646
## explicit
4747
github.com/meroxa/meroxa-go
4848
# github.com/mitchellh/go-homedir v1.1.0

0 commit comments

Comments
 (0)