Added upload properties to gRPC Upload, UploadWithProgrammer, and BurnBootloader

Author: cmaglie

commands/service_upload.go

@@ -205,6 +205,7 @@ func (s *arduinoCoreServerImpl) Upload(req *rpc.UploadRequest, stream rpc.Arduin
 		errStream,
 		req.GetDryRun(),
 		req.GetUserFields(),
+		req.GetUploadProperties(),
 	)
 	if err != nil {
 		return err
@@ -246,17 +247,18 @@ func (s *arduinoCoreServerImpl) UploadUsingProgrammer(req *rpc.UploadUsingProgra
 		return &cmderrors.MissingProgrammerError{}
 	}
 	return s.Upload(&rpc.UploadRequest{
-		Instance:   req.GetInstance(),
-		SketchPath: req.GetSketchPath(),
-		ImportFile: req.GetImportFile(),
-		ImportDir:  req.GetImportDir(),
-		Fqbn:       req.GetFqbn(),
-		Port:       req.GetPort(),
-		Programmer: req.GetProgrammer(),
-		Verbose:    req.GetVerbose(),
-		Verify:     req.GetVerify(),
-		UserFields: req.GetUserFields(),
-		DryRun:     req.GetDryRun(),
+		Instance:         req.GetInstance(),
+		SketchPath:       req.GetSketchPath(),
+		ImportFile:       req.GetImportFile(),
+		ImportDir:        req.GetImportDir(),
+		Fqbn:             req.GetFqbn(),
+		Port:             req.GetPort(),
+		Programmer:       req.GetProgrammer(),
+		Verbose:          req.GetVerbose(),
+		Verify:           req.GetVerify(),
+		UserFields:       req.GetUserFields(),
+		DryRun:           req.GetDryRun(),
+		UploadProperties: req.GetUploadProperties(),
 	}, streamAdapter)
 }
 
@@ -267,6 +269,7 @@ func runProgramAction(ctx context.Context, pme *packagemanager.Explorer,
 	verbose, verify, burnBootloader bool,
 	outStream, errStream io.Writer,
 	dryRun bool, userFields map[string]string,
+	requestUploadProperties []string,
 ) (*rpc.Port, error) {
 	port := rpc.DiscoveryPortFromRPCPort(userPort)
 	if port == nil || (port.Address == "" && port.Protocol == "") {
@@ -378,6 +381,13 @@ func runProgramAction(ctx context.Context, pme *packagemanager.Explorer,
 		uploadProperties.Merge(programmer.Properties)
 	}
 
+	// Add user provided custom upload properties
+	if p, err := properties.LoadFromSlice(requestUploadProperties); err == nil {
+		uploadProperties.Merge(p)
+	} else {
+		return nil, fmt.Errorf("invalid build properties: %w", err)
+	}
+
 	// Certain tools require the user to provide custom fields at run time,
 	// if they've been provided set them
 	// For more info:

commands/service_upload_burnbootloader.go

@@ -88,6 +88,7 @@ func (s *arduinoCoreServerImpl) BurnBootloader(req *rpc.BurnBootloaderRequest, s
 		errStream,
 		req.GetDryRun(),
 		map[string]string{}, // User fields
+		req.GetUploadProperties(),
 	); err != nil {
 		return err
 	}

commands/service_upload_test.go

@@ -202,6 +202,7 @@ func TestUploadPropertiesComposition(t *testing.T) {
 			errStream,
 			false,
 			map[string]string{},
+			nil,
 		)
 		verboseVerifyOutput := "verbose verify"
 		if !verboseVerify {