Fixed bug with user confirmation exiting

aleksanderaleksic · Feb 12, 2021 · cdc17e7 · cdc17e7
1 parent e218e6f
commit cdc17e7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/command/app.go b/command/app.go
@@ -3,7 +3,7 @@ package command
 import "github.com/urfave/cli/v2"
 
 // Version is a version number.
-var version = "0.1.5"
+var version = "0.1.6"
 
 func GetApp() *cli.App {
 	var applyCommand = ApplyCommand{}

diff --git a/common/user_confirmation.go b/common/user_confirmation.go
@@ -7,7 +7,7 @@ import (
 )
 
 func AskUserToConfirm() bool {
-	fmt.Print("insert y if you would like to continue: \n")
+	fmt.Print("insert y or yes if you would like to continue: \n")
 	input := bufio.NewScanner(os.Stdin)
 	input.Scan()
 	return input.Text() == "y" || input.Text() == "yes"

diff --git a/migration/migration_reverter.go b/migration/migration_reverter.go
@@ -82,7 +82,7 @@ func (r Reverter) revert(migration history.AppliedStorageHistoryObject) error {
 		fmt.Printf("\t- key: %s, version: %s\n", obj.Key, obj.ToVersionId)
 	}
 	fmt.Printf("Are you sure you would like to continue?\n")
-	if common.AskUserToConfirm() {
+	if !common.AskUserToConfirm() {
 		fmt.Printf("Cancelled by user, will not delete objects.\n")
 		os.Exit(0)
 	}

diff --git a/state/s3_state.go b/state/s3_state.go
@@ -70,7 +70,7 @@ func (s S3State) ListAllObjects() ([]*s3.ObjectVersion, error) {
 
 	err := s.S3.ListObjectVersionsPages(&s3.ListObjectVersionsInput{
 		Bucket: aws.String(s.State.Bucket),
-		Prefix: aws.String(*s.State.Prefix),
+		Prefix: s.State.Prefix,
 	}, func(output *s3.ListObjectVersionsOutput, b bool) bool {
 		versions = append(versions, output.Versions...)
 		return output.NextKeyMarker != nil //Continue until no more pages