8000 Add Delete command to gRPC by MatteoPologruto · Pull Request #2212 · arduino/arduino-cli · GitHub
[go: up one dir, main page]
Skip to content

Add Delete command to gRPC #2212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 27, 2023
Merged

Add Delete command to gRPC #2212

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a04d89
Add DeleteRequest and DeleteResponse to gRPC
MatteoPologruto Jun 7, 2023
85956f0
Add Delete command to settings
MatteoPologruto Jun 7, 2023
2ef668c
Add TestDelete to settings_test.go
MatteoPologruto Jun 12, 2023
933554a
Remove temporary directory when TestWrite ends
MatteoPologruto Jun 13, 2023
9ae9461
Refactor `config delete` command using gRPC function call
MatteoPologruto Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jum 8000 p to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Refactor config delete command using gRPC function call
10000
  • Loading branch information
@MatteoPologruto
MatteoPologruto committed Jun 27, 2023
commit 9ae946190358d57380f184311cfe16f9bf39f796
31 changes: 9 additions & 22 deletions internal/cli/config/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ package config

import (
"os"
"strings"

"github.com/arduino/arduino-cli/commands/daemon"
"github.com/arduino/arduino-cli/configuration"
"github.com/arduino/arduino-cli/internal/cli/feedback"
"github.com/arduino/arduino-cli/rpc/cc/arduino/cli/settings/v1"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)

func initDeleteCommand() *cobra.Command {
Expand All @@ -47,26 +47,13 @@ func runDeleteCommand(cmd *cobra.Command, args []string) {
logrus.Info("Executing `arduino-cli config delete`")
toDelete := args[0]

keys := []string{}
exists := false
for _, v := range configuration.Settings.AllKeys() {
if !strings.HasPrefix(v, toDelete) {
keys = append(keys, v)
continue
}
exists = true
svc := daemon.SettingsService{}
_, err := svc.Delete(cmd.Context(), &settings.DeleteRequest{Key: toDelete})
if err != nil {
feedback.Fatal(tr("Cannot delete the key %[1]s: %[2]v", toDelete, err), feedback.ErrGeneric)
}

if !exists {
feedback.Fatal(tr("Settings key doesn't exist"), feedback.ErrGeneric)
}

updatedSettings := viper.New()
for _, k := range keys {
updatedSettings.Set(k, configuration.Settings.Get(k))
}

if err := updatedSettings.WriteConfigAs(configuration.Settings.ConfigFileUsed()); err != nil {
feedback.Fatal(tr("Can't write config file: %v", err), feedback.ErrGeneric)
_, err = svc.Write(cmd.Context(), &settings.WriteRequest{FilePath: configuration.Settings.ConfigFileUsed()})
if err != nil {
feedback.Fatal(tr("Cannot write the file %[1]s: %[2]v", configuration.Settings.ConfigFileUsed(), err), feedback.ErrGeneric)
}
}
2 changes: 1 addition & 1 deletion internal/integrationtest/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ func TestAddRemoveSetDeleteOnUnexistingKey(t *testing.T) {

_, stderr, err = cli.Run("config", "delete", "some.key", "--config-file", "arduino-cli.yaml")
require.Error(t, err)
require.Contains(t, string(stderr), "Settings key doesn't exist")
require.Contains(t, string(stderr), "Cannot delete the key some.key: key not found in settings\n")
}

func TestAddSingleArgument(t *testing.T) {
Expand Down
0