Skip to content

Take credentials as command argument #102

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.

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 2 commits into from
Apr 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion cli/dashboard/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/arduino/arduino-cli/cli/errorcodes"
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cloud-cli/command/dashboard"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -56,6 +57,12 @@ func initCreateCommand() *cobra.Command {
func runCreateCommand(cmd *cobra.Command, args []string) {
logrus.Infof("Creating dashboard from template %s", createFlags.template)

cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during dashboard create: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

params := &dashboard.CreateParams{
Template: createFlags.template,
Override: createFlags.override,
Expand All @@ -64,7 +71,7 @@ func runCreateCommand(cmd *cobra.Command, args []string) {
params.Name = &createFlags.name
}

dashboard, err := dashboard.Create(params)
dashboard, err := dashboard.Create(params, cred)
if err != nil {
feedback.Errorf("Error during dashboard create: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/dashboard/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/arduino/arduino-cli/cli/errorcodes"
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cloud-cli/command/dashboard"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand All @@ -46,8 +47,14 @@ func initDeleteCommand() *cobra.Command {
func runDeleteCommand(cmd *cobra.Command, args []string) {
logrus.Infof("Deleting dashboard %s", deleteFlags.id)

cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during dashboard delete: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

params := &dashboard.DeleteParams{ID: deleteFlags.id}
err := dashboard.Delete(params)
err = dashboard.Delete(params, cred)
if err != nil {
feedback.Errorf("Error during dashboard delete: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/dashboard/extract.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/arduino/arduino-cli/cli/errorcodes"
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cloud-cli/command/dashboard"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
Expand All @@ -48,11 +49,17 @@ func initExtractCommand() *cobra.Command {
func runExtractCommand(cmd *cobra.Command, args []string) {
logrus.Infof("Extracting template from dashboard %s", extractFlags.id)

cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during dashboard extract: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

params := &dashboard.ExtractParams{
ID: extractFlags.id,
}

template, err := dashboard.Extract(params)
template, err := dashboard.Extract(params, cred)
if err != nil {
feedback.Errorf("Error during template extraction: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/dashboard/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cli/table"
"github.com/arduino/arduino-cloud-cli/command/dashboard"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -53,7 +54,13 @@ func initListCommand() *cobra.Command {
func runListCommand(cmd *cobra.Command, args []string) {
logrus.Info("Listing dashboards")

dash, err := dashboard.List()
cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during dashboard list: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

dash, err := dashboard.List(cred)
if err != nil {
feedback.Errorf("Error during dashboard list: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/device/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/arduino/arduino-cli/cli/errorcodes"
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cloud-cli/command/device"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -51,6 +52,12 @@ func initCreateCommand() *cobra.Command {
func runCreateCommand(cmd *cobra.Command, args []string) {
logrus.Infof("Creating device with name %s", createFlags.name)

cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during device create: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

params := &device.CreateParams{
Name: createFlags.name,
}
Expand All @@ -61,7 +68,7 @@ func runCreateCommand(cmd *cobra.Command, args []string) {
params.FQBN = &createFlags.fqbn
}

dev, err := device.Create(params)
dev, err := device.Create(params, cred)
if err != nil {
feedback.Errorf("Error during device create: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/device/creategeneric.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/arduino/arduino-cli/cli/errorcodes"
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cloud-cli/command/device"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand All @@ -49,12 +50,18 @@ func initCreateGenericCommand() *cobra.Command {
func runCreateGenericCommand(cmd *cobra.Command, args []string) {
logrus.Infof("Creating generic device with name %s", createGenericFlags.name)

cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during device create-generic: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

params := &device.CreateGenericParams{
Name: createGenericFlags.name,
FQBN: createGenericFlags.fqbn,
}

dev, err := device.CreateGeneric(params)
dev, err := device.CreateGeneric(params, cred)
if err != nil {
feedback.Errorf("Error during device create-generic: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/device/createlora.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/arduino/arduino-cli/cli/errorcodes"
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cloud-cli/command/device"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -55,6 +56,12 @@ func initCreateLoraCommand() *cobra.Command {
func runCreateLoraCommand(cmd *cobra.Command, args []string) {
logrus.Infof("Creating LoRa device with name %s", createLoraFlags.name)

cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during device create-lora: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

params := &device.CreateLoraParams{
CreateParams: device.CreateParams{
Name: createLoraFlags.name,
Expand All @@ -68,7 +75,7 @@ func runCreateLoraCommand(cmd *cobra.Command, args []string) {
params.FQBN = &createLoraFlags.fqbn
}

dev, err := device.CreateLora(params)
dev, err := device.CreateLora(params, cred)
if err != nil {
feedback.Errorf("Error during device create-lora: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/device/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/arduino/arduino-cli/cli/errorcodes"
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cloud-cli/command/device"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -54,12 +55,18 @@ func initDeleteCommand() *cobra.Command {
func runDeleteCommand(cmd *cobra.Command, args []string) {
logrus.Infof("Deleting device %s", deleteFlags.id)

cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during device delete: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

params := &device.DeleteParams{Tags: deleteFlags.tags}
if deleteFlags.id != "" {
params.ID = &deleteFlags.id
}

err := device.Delete(params)
err = device.Delete(params, cred)
if err != nil {
feedback.Errorf("Error during device delete: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/device/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cli/table"
"github.com/arduino/arduino-cloud-cli/command/device"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -53,8 +54,14 @@ func initListCommand() *cobra.Command {
func runListCommand(cmd *cobra.Command, args []string) {
logrus.Info("Listing devices")

cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during device list: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

params := &device.ListParams{Tags: listFlags.tags}
devs, err := device.List(params)
devs, err := device.List(params, cred)
if err != nil {
feedback.Errorf("Error during device list: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/device/listfrequency.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cli/table"
"github.com/arduino/arduino-cloud-cli/command/device"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand All @@ -41,7 +42,13 @@ func initListFrequencyPlansCommand() *cobra.Command {
func runListFrequencyPlansCommand(cmd *cobra.Command, args []string) {
logrus.Info("Listing supported frequency plans")

freqs, err := device.ListFrequencyPlans()
cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during device list-frequency-plans: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

freqs, err := device.ListFrequencyPlans(cred)
if err != nil {
feedback.Errorf("Error during device list-frequency-plans: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/device/tag/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/arduino/arduino-cli/cli/errorcodes"
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cloud-cli/command/tag"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -60,7 +61,13 @@ func runCreateTagsCommand(cmd *cobra.Command, args []string) {
Resource: tag.Device,
}

err := tag.CreateTags(params)
cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during device create-tags: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

err = tag.CreateTags(params, cred)
if err != nil {
feedback.Errorf("Error during device create-tags: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/device/tag/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/arduino/arduino-cli/cli/errorcodes"
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cloud-cli/command/tag"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -51,13 +52,19 @@ func InitDeleteTagsCommand() *cobra.Command {
func runDeleteTagsCommand(cmd *cobra.Command, args []string) {
logrus.Infof("Deleting tags with keys %s", deleteTagsFlags.keys)

cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during device delete-tags: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

params := &tag.DeleteTagsParams{
ID: deleteTagsFlags.id,
Keys: deleteTagsFlags.keys,
Resource: tag.Device,
}

err := tag.DeleteTags(params)
err = tag.DeleteTags(params, cred)
if err != nil {
feedback.Errorf("Error during device delete-tags: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/ota/massupload.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cli/table"
"github.com/arduino/arduino-cloud-cli/command/ota"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -74,7 +75,13 @@ func runMassUploadCommand(cmd *cobra.Command, args []string) {
FQBN: massUploadFlags.fqbn,
}

resp, err := ota.MassUpload(params)
cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during device list-frequency-plans: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

resp, err := ota.MassUpload(params, cred)
if err != nil {
feedback.Errorf("Error during ota upload: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/ota/upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/arduino/arduino-cli/cli/errorcodes"
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cloud-cli/command/ota"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -53,12 +54,18 @@ func initUploadCommand() *cobra.Command {
func runUploadCommand(cmd *cobra.Command, args []string) {
logrus.Infof("Uploading binary %s to device %s", uploadFlags.file, uploadFlags.deviceID)

cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during ota upload: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

params := &ota.UploadParams{
DeviceID: uploadFlags.deviceID,
File: uploadFlags.file,
Deferred: uploadFlags.deferred,
}
err := ota.Upload(params)
err = ota.Upload(params, cred)
if err != nil {
feedback.Errorf("Error during ota upload: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
9 changes: 8 additions & 1 deletion cli/thing/bind.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/arduino/arduino-cli/cli/errorcodes"
"github.com/arduino/arduino-cli/cli/feedback"
"github.com/arduino/arduino-cloud-cli/command/thing"
"github.com/arduino/arduino-cloud-cli/internal/config"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand All @@ -49,11 +50,17 @@ func initBindCommand() *cobra.Command {
func runBindCommand(cmd *cobra.Command, args []string) {
logrus.Infof("Binding thing %s to device %s", bindFlags.id, bindFlags.deviceID)

cred, err := config.RetrieveCredentials()
if err != nil {
feedback.Errorf("Error during thing bind: retrieving credentials: %v", err)
os.Exit(errorcodes.ErrGeneric)
}

params := &thing.BindParams{
ID: bindFlags.id,
DeviceID: bindFlags.deviceID,
}
err := thing.Bind(params)
err = thing.Bind(params, cred)
if err != nil {
feedback.Errorf("Error during thing bind: %v", err)
os.Exit(errorcodes.ErrGeneric)
Expand Down
Loading