Skip to content

Commit 47bec66

Browse files
committed
chore(resources): resources instance add message
1 parent a255e8a commit 47bec66

4 files changed

Lines changed: 5 additions & 9 deletions

File tree

cmd/resources.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ func (d *DryccCmd) ResourcesCreate(appID, plan string, name string, params []str
8585
if err != nil {
8686
return err
8787
}
88-
if len(params) != 0 && len(values) != 0 {
89-
params = nil
90-
}
9188
paramsMap := make(map[string]interface{})
9289
if values != "" {
9390
valueFile, err := os.Stat(values)
@@ -197,6 +194,7 @@ func (d *DryccCmd) ResourceGet(appID, name string) error {
197194
for _, key := range *sortKeys(resource.Options) {
198195
table.Append([]string{"", fmt.Sprintf("%s:", key), fmt.Sprintf("%s", resource.Options[key])})
199196
}
197+
table.Append([]string{"Message:", safeGetString(resource.Message)})
200198
table.Append([]string{"Created:", resource.Created})
201199
table.Append([]string{"Updated:", resource.Updated})
202200
table.Render()
@@ -232,9 +230,6 @@ func (d *DryccCmd) ResourcePut(appID, plan string, name string, params []string,
232230
if err != nil {
233231
return err
234232
}
235-
if len(params) != 0 && len(values) != 0 {
236-
params = nil
237-
}
238233
paramsMap := make(map[string]interface{})
239234
if values != "" {
240235
valueFile, err := os.Stat(values)

cmd/resources_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ Data:
183183
Options:
184184
para122: value1
185185
para13451: value2
186+
Message: <none>
186187
Created: 2020-09-08T00:00:00UTC
187188
Updated: 2020-09-08T00:00:00UTC
188189
`, "output")

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.20
55
require (
66
github.com/containerd/console v1.0.3
77
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
8-
github.com/drycc/controller-sdk-go v0.0.0-20231124064538-8bbfc028ba6d
8+
github.com/drycc/controller-sdk-go v0.0.0-20231220020712-6ad12c929b31
99
github.com/drycc/pkg v0.0.0-20230619083908-711ad2e9f1b8
1010
github.com/olekukonko/tablewriter v0.0.5
1111
github.com/stretchr/testify v1.8.4

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
44
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
55
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
66
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
7-
github.com/drycc/controller-sdk-go v0.0.0-20231124064538-8bbfc028ba6d h1:v4qJ9Wr41nP/Zj42F1hLkzTf7wtjNJOagqnbhkOVPzo=
8-
github.com/drycc/controller-sdk-go v0.0.0-20231124064538-8bbfc028ba6d/go.mod h1:X69v0xts3XpvbcQpVeR+wwQqORPJ8ClXnYvnMoAOUHE=
7+
github.com/drycc/controller-sdk-go v0.0.0-20231220020712-6ad12c929b31 h1:fANNLMxWJUbLPYzpR0zP7TMuqwK6cGKMhVSFasJaYqM=
8+
github.com/drycc/controller-sdk-go v0.0.0-20231220020712-6ad12c929b31/go.mod h1:X69v0xts3XpvbcQpVeR+wwQqORPJ8ClXnYvnMoAOUHE=
99
github.com/drycc/pkg v0.0.0-20230619083908-711ad2e9f1b8 h1:bTPrdjJTYxMK3T6nYk7Qa8nDbvNNxvNOdI/fgVsiuCg=
1010
github.com/drycc/pkg v0.0.0-20230619083908-711ad2e9f1b8/go.mod h1:y/6vsR0kXRg3Vxj2M/UqApU2uL43KfMDMN2SyvwF0Ek=
1111
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=

0 commit comments

Comments
 (0)