Apply suggestions from code review

Co-authored-by: per1234 <accounts@perglass.com>

Author: umbynos

arduino/errors.go

@@ -698,7 +698,7 @@ func (e *TempDirCreationFailedError) ToRPCStatus() *status.Status {
 	return status.New(codes.Unavailable, e.Error())
 }
 
-// FileCreationFailedError is returned if a temp file could not be created
+// FileCreationFailedError is returned if a file could not be created
 type FileCreationFailedError struct {
 	Message string
 	Cause   error

cli/keys/generate.go

@@ -67,7 +67,7 @@ func runGenerateCommand(command *cobra.Command, args []string) {
 		KeysKeychain:  keysKeychain,
 	})
 	if err != nil {
-		feedback.Errorf(tr("Error during Generate: %v"), err)
+		feedback.Errorf(tr("Error during generate: %v"), err)
 		os.Exit(errorcodes.ErrGeneric)
 	}
 	feedback.PrintResult(result{resp})

commands/keys/generate.go

@@ -194,11 +194,13 @@ func genEcdsaP256() ([]byte, []byte, error) {
 }
 
 // genCFile will take a file as input, the byte slice that represents the key and the type of the key.
-// If will then write the file and report an error if one is found
+// It will then write the file and report an error if one is found
 func genCFile(file *os.File, bytes []byte, t string) (err error) {
 	fileContent := fmt.Sprintf(`/* Autogenerated, do not edit */
 const unsigned char rsa_%s_key[] = {
-	%s
+  // clang-format off
+%s
+  // clang-format on
 };
 const unsigned int ec_%s_key_len = %d;
 `, t, formatCData(bytes), t, len(bytes))
@@ -210,16 +212,17 @@ const unsigned int ec_%s_key_len = %d;
 // taken and adapted from https://git.furworks.de/Zephyr/mcuboot/src/commit/3869e760901a27adff47ccaea803a42f1b0169c0/imgtool/imgtool.go#L313
 func formatCData(data []byte) string {
 	buf := new(bytes.Buffer)
-	indText := strings.Repeat("\t", 1)
+	indText := strings.Repeat(" ", 2)
 	for i, b := range data {
 		if i%8 == 0 {
-			if i > 0 {
-				fmt.Fprintf(buf, "\n%s", indText)
-			}
+			fmt.Fprintf(buf, indText)
 		} else {
 			fmt.Fprintf(buf, " ")
 		}
 		fmt.Fprintf(buf, "0x%02x,", b)
+		if i%8 == 7 {
+			fmt.Fprintf(buf, "\n")
+		}
 	}
 	return buf.String()
 }

test/test_keys.py

@@ -32,7 +32,7 @@ def test_keys_generate(run_command, working_dir):
     # Overwrite security keys
     result = run_command(["keys", "generate", "--key-name", sign_key_name])
     assert result.failed
-    assert f"Error during Generate: Cannot create file: File already exists: {working_dir}" in result.stderr
+    assert f"Error during generate: Cannot create file: File already exists: {working_dir}" in result.stderr
 
     # Create security keys in specified directory
     keychain_name = "keychain"
@@ -64,4 +64,4 @@ def test_keys_generate(run_command, working_dir):
         ["keys", "generate", "--key-name", sign_key_name, "--keys-keychain", keychain_path, "-t", "rsa"]
     )
     assert result.failed
-    assert "Error during Generate: Cannot create file: Unsupported algorithm: rsa" in result.stderr
+    assert "Error during generate: Cannot create file: Unsupported algorithm: rsa" in result.stderr