Remove --overwrite-existing-key flag in favor of only having one way to force overwriting a key

Now the only way is FORCE_WRITE=true which works properly when run with make (eg `FORCE_WRITE=true make generate`)

Author: ddworken

src/cmd/keybaseca/keybaseca.go

@@ -58,13 +58,8 @@ func main() {
 			Before: beforeAction,
 		},
 		{
-			Name:  "generate",
-			Usage: "Generate a new CA key",
-			Flags: []cli.Flag{
-				cli.BoolFlag{
-					Name: "overwrite-existing-key",
-				},
-			},
+			Name:   "generate",
+			Usage:  "Generate a new CA key",
 			Action: generateAction,
 			Before: beforeAction,
 		},
@@ -134,7 +129,7 @@ func generateAction(c *cli.Context) error {
 		return err
 	}
 	captureControlCToDeleteClientConfig(conf)
-	err = sshutils.Generate(conf, c.Bool("overwrite-existing-key") || os.Getenv("FORCE_WRITE") == "true")
+	err = sshutils.Generate(conf, strings.ToLower(os.Getenv("FORCE_WRITE")) == "true")
 	if err != nil {
 		return fmt.Errorf("Failed to generate a new key: %v", err)
 	}

src/keybaseca/sshutils/generate_test.go

@@ -19,7 +19,7 @@ func TestGenerateNewSSHKey(t *testing.T) {
 	require.NoError(t, err)
 
 	err = GenerateNewSSHKey(filename, false, false)
-	require.Errorf(t, err, "Refusing to overwrite existing key (try with --overwrite-existing-key or FORCE_WRITE=true if you're sure): "+filename)
+	require.Errorf(t, err, "Refusing to overwrite existing key (try with FORCE_WRITE=true if you're sure): "+filename)
 
 	err = GenerateNewSSHKey(filename, true, false)
 	require.NoError(t, err)

src/keybaseca/sshutils/sshutils.go

@@ -28,7 +28,7 @@ func GenerateNewSSHKey(filename string, overwrite bool, printPubKey bool) error
 				return err
 			}
 		} else {
-			return fmt.Errorf("Refusing to overwrite existing key (try with --overwrite-existing-key or FORCE_WRITE=true if you're sure): %s", filename)
+			return fmt.Errorf("Refusing to overwrite existing key (try with FORCE_WRITE=true if you're sure): %s", filename)
 		}
 	}
 

tests/bot-entrypoint.py

@@ -23,7 +23,7 @@ def load_env():
         ". %s\n"
         "bin/keybaseca --wipe-all-configs\n"
         "bin/keybaseca --wipe-logs || true\n"
-        "bin/keybaseca generate --overwrite-existing-key\n"
+        "FORCE_WRITE=true bin/keybaseca generate\n"
         # The output from this backup is tested in test_env_1.py
         "echo yes | bin/keybaseca backup > /shared/cakey.backup\n"
         # The output from this sign operation is tested in test_env_1.py