Rename push flag from --replace to --force

hypnoglow · Feb 28, 2018 · 12ce973 · 12ce973
1 parent 7d44f0a
commit 12ce973
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cmd/helms3/main.go b/cmd/helms3/main.go
@@ -57,7 +57,7 @@ func main() {
 	pushTargetRepository := pushCmd.Arg("repo", "Target repository to push to").
 		Required().
 		String()
-	pushReplace := pushCmd.Flag("replace", "Replace the chart if it already exists").
+	pushForce := pushCmd.Flag("force", "Replace the chart if it already exists. This can cause the repository to lose existing chart; use it with care").
 		Bool()
 
 	reindexCmd := cli.Command(actionReindex, "Reindex the repository.")
@@ -98,7 +98,7 @@ func main() {
 		act = pushAction{
 			chartPath: *pushChartPath,
 			repoName:  *pushTargetRepository,
-			replace:   *pushReplace,
+			force:     *pushForce,
 		}
 
 	case actionReindex:
@@ -125,7 +125,7 @@ func main() {
 	switch err {
 	case nil:
 	case ErrChartExists:
-		log.Fatalf("The chart already exists in the repository and cannot be overwritten without an explicit intent. If you want to replace existing chart, use --replace flag:\n\n\thelm s3 push --replace %s %s\n\n", *pushChartPath, *pushTargetRepository)
+		log.Fatalf("The chart already exists in the repository and cannot be overwritten without an explicit intent. If you want to replace existing chart, use --force flag:\n\n\thelm s3 push --force %s %s\n\n", *pushChartPath, *pushTargetRepository)
 	default:
 		log.Fatal(err)
 	}

diff --git a/cmd/helms3/push.go b/cmd/helms3/push.go
@@ -19,14 +19,14 @@ import (
 
 var (
 	// ErrChartExists signals that chart already exists in the repository
-	// and cannot be pushed without --replace flag.
+	// and cannot be pushed without --force flag.
 	ErrChartExists = errors.New("chart already exists")
 )
 
 type pushAction struct {
 	chartPath string
 	repoName  string
-	replace   bool
+	force     bool
 }
 
 func (act pushAction) Run(ctx context.Context) error {
@@ -81,7 +81,7 @@ func (act pushAction) Run(ctx context.Context) error {
 		return errors.WithMessage(err, "check if chart already exists in the repository")
 	}
 
-	if exists && !act.replace {
+	if exists && !act.force {
 		return ErrChartExists
 	}
 

diff --git a/hack/integration-tests.sh b/hack/integration-tests.sh
@@ -67,9 +67,9 @@ fi
 
 set -e
 
-helm s3 push --replace postgresql-0.8.3.tgz test-repo
+helm s3 push --force postgresql-0.8.3.tgz test-repo
 if [ $? -ne 0 ]; then
-    echo "The same chart must be pushed again using --replace"
+    echo "The same chart must be pushed again using --force"
     exit 1
 fi