Unverified Commit 47645e9b authored by Cristian Maglie's avatar Cristian Maglie Committed by GitHub

[breaking] Removed `Profile` protoc message in favor of `SketchProfile` (#2507)

parent 96b411fd
...@@ -145,11 +145,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro ...@@ -145,11 +145,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
profile = p profile = p
responseCallback(&rpc.InitResponse{ responseCallback(&rpc.InitResponse{
Message: &rpc.InitResponse_Profile{ Message: &rpc.InitResponse_Profile{
Profile: &rpc.Profile{ Profile: profile.ToRpc(),
Name: req.GetProfile(),
Fqbn: profile.FQBN,
// TODO: Other profile infos may be provided here...
},
}, },
}) })
} }
......
...@@ -4,6 +4,21 @@ Here you can find a list of migration guides to handle breaking changes between ...@@ -4,6 +4,21 @@ Here you can find a list of migration guides to handle breaking changes between
## 0.36.0 ## 0.36.0
### The gRPC `cc.arduino.cli.commands.v1.Profile` message has been removed in favor of `SketchProfile`
The message `Profile` has been replaced with `SketchProfile` in the `InitResponse.profile` field:
```proto
message InitResponse {
oneof message {
Progress init_progress = 1;
google.rpc.Status error = 2;
// Selected profile information
SketchProfile profile = 3;
}
}
```
### The gRPC `cc.arduino.cli.commands.v1.LoadSketchResponse` message has been changed. ### The gRPC `cc.arduino.cli.commands.v1.LoadSketchResponse` message has been changed.
Previously the `LoadSketchResponse` containted all the information about the sketch: Previously the `LoadSketchResponse` containted all the information about the sketch:
......
...@@ -166,7 +166,7 @@ func runCompileCommand(cmd *cobra.Command, args []string) { ...@@ -166,7 +166,7 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
feedback.WarnAboutDeprecatedFiles(sk) feedback.WarnAboutDeprecatedFiles(sk)
var inst *rpc.Instance var inst *rpc.Instance
var profile *rpc.Profile var profile *rpc.SketchProfile
if profileArg.Get() == "" { if profileArg.Get() == "" {
inst, profile = instance.CreateAndInitWithProfile(sk.GetDefaultProfile().GetName(), sketchPath) inst, profile = instance.CreateAndInitWithProfile(sk.GetDefaultProfile().GetName(), sketchPath)
......
...@@ -37,7 +37,7 @@ func CreateAndInit() *rpc.Instance { ...@@ -37,7 +37,7 @@ func CreateAndInit() *rpc.Instance {
// CreateAndInitWithProfile returns a new initialized instance using the given profile of the given sketch. // CreateAndInitWithProfile returns a new initialized instance using the given profile of the given sketch.
// If Create fails the CLI prints an error and exits since to execute further operations a valid Instance is mandatory. // If Create fails the CLI prints an error and exits since to execute further operations a valid Instance is mandatory.
// If Init returns errors they're printed only. // If Init returns errors they're printed only.
func CreateAndInitWithProfile(profileName string, sketchPath *paths.Path) (*rpc.Instance, *rpc.Profile) { func CreateAndInitWithProfile(profileName string, sketchPath *paths.Path) (*rpc.Instance, *rpc.SketchProfile) {
instance, err := create() instance, err := create()
if err != nil { if err != nil {
feedback.Fatal(tr("Error creating instance: %v", err), feedback.ErrGeneric) feedback.Fatal(tr("Error creating instance: %v", err), feedback.ErrGeneric)
...@@ -67,7 +67,7 @@ func Init(instance *rpc.Instance) { ...@@ -67,7 +67,7 @@ func Init(instance *rpc.Instance) {
// InitWithProfile initializes instance by loading libraries and platforms specified in the given profile of the given sketch. // InitWithProfile initializes instance by loading libraries and platforms specified in the given profile of the given sketch.
// In case of loading failures return a list of errors for each platform or library that we failed to load. // In case of loading failures return a list of errors for each platform or library that we failed to load.
// Required Package and library indexes files are automatically downloaded. // Required Package and library indexes files are automatically downloaded.
func InitWithProfile(instance *rpc.Instance, profileName string, sketchPath *paths.Path) *rpc.Profile { func InitWithProfile(instance *rpc.Instance, profileName string, sketchPath *paths.Path) *rpc.SketchProfile {
downloadCallback := feedback.ProgressBar() downloadCallback := feedback.ProgressBar()
taskCallback := feedback.TaskProgress() taskCallback := feedback.TaskProgress()
...@@ -76,7 +76,7 @@ func InitWithProfile(instance *rpc.Instance, profileName string, sketchPath *pat ...@@ -76,7 +76,7 @@ func InitWithProfile(instance *rpc.Instance, profileName string, sketchPath *pat
initReq.SketchPath = sketchPath.String() initReq.SketchPath = sketchPath.String()
initReq.Profile = profileName initReq.Profile = profileName
} }
var profile *rpc.Profile var profile *rpc.SketchProfile
err := commands.Init(initReq, func(res *rpc.InitResponse) { err := commands.Init(initReq, func(res *rpc.InitResponse) {
if st := res.GetError(); st != nil { if st := res.GetError(); st != nil {
feedback.Warning(tr("Error initializing instance: %v", st.GetMessage())) feedback.Warning(tr("Error initializing instance: %v", st.GetMessage()))
......
...@@ -93,7 +93,7 @@ func runMonitorCmd( ...@@ -93,7 +93,7 @@ func runMonitorCmd(
var ( var (
inst *rpc.Instance inst *rpc.Instance
profile *rpc.Profile profile *rpc.SketchProfile
fqbn string fqbn string
defaultPort, defaultProtocol string defaultPort, defaultProtocol string
) )
......
...@@ -100,7 +100,7 @@ func runUploadCommand(args []string, uploadFieldsArgs map[string]string) { ...@@ -100,7 +100,7 @@ func runUploadCommand(args []string, uploadFieldsArgs map[string]string) {
} }
var inst *rpc.Instance var inst *rpc.Instance
var profile *rpc.Profile var profile *rpc.SketchProfile
if profileArg.Get() == "" { if profileArg.Get() == "" {
inst, profile = instance.CreateAndInitWithProfile(sketch.GetDefaultProfile().GetName(), sketchPath) inst, profile = instance.CreateAndInitWithProfile(sketch.GetDefaultProfile().GetName(), sketchPath)
......
...@@ -237,7 +237,7 @@ message InitResponse { ...@@ -237,7 +237,7 @@ message InitResponse {
Progress init_progress = 1; Progress init_progress = 1;
google.rpc.Status error = 2; google.rpc.Status error = 2;
// Selected profile information // Selected profile information
Profile profile = 3; SketchProfile profile = 3;
} }
} }
......
This diff is collapsed.
...@@ -173,13 +173,6 @@ message Board { ...@@ -173,13 +173,6 @@ message Board {
string fqbn = 2; string fqbn = 2;
} }
message Profile {
// Name used to identify the profile within the sketch.
string name = 1;
// FQBN specified in the profile.
string fqbn = 2;
}
message HelpResources { message HelpResources {
// A URL provided by the author of the platform's package, intended to point // A URL provided by the author of the platform's package, intended to point
// to their online help service. // to their online help service.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment