split lakectl cmds - part 2 #6272

nopcoder · 2023-07-27T18:29:11Z

part2 - end result will be based on #6254

github-actions · 2023-07-27T18:29:25Z

No linked issues found. Please add the corresponding issues in the pull request description.
Use GitHub automation to close the issue when a PR is merged

N-o-Z

Partial review

N-o-Z · 2023-07-30T13:14:55Z

cmd/lakectl/cmd/tag.go

@@ -146,15 +147,15 @@ var tagShowCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		client := getClient()
 		u := MustParseRefURI("tag", args[0])
-		Fmt("Tag ref: %s\n", u.String())
+		fmt.Printf("Tag ref: %s\n", u.String())


Suggested change

fmt.Printf("Tag ref: %s\n", u.String())

fmt.Printf("Tag ref: %s\n", u)

N-o-Z · 2023-07-30T13:15:07Z

cmd/lakectl/cmd/tag.go

@@ -130,7 +131,7 @@ var tagDeleteCmd = &cobra.Command{
 		}
 		client := getClient()
 		u := MustParseRefURI("tag", args[0])
-		Fmt("Tag ref: %s\n", u.String())
+		fmt.Printf("Tag ref: %s\n", u.String())


Suggested change

fmt.Printf("Tag ref: %s\n", u.String())

fmt.Printf("Tag ref: %s\n", u)

N-o-Z · 2023-07-30T13:18:48Z

cmd/lakectl/cmd/ingest.go

@@ -83,7 +84,7 @@ var ingestCmd = &cobra.Command{
 			}
 			err = walker.Walk(ctx, block.WalkOptions{}, func(e block.ObjectStoreEntry) error {
 				if dryRun {
-					Fmt("%s\n", e)
+					fmt.Printf("%s\n", e)


Suggested change

fmt.Printf("%s\n", e)

fmt.Println("%s", e)

can't use %s with Println - I've just passed e

N-o-Z · 2023-07-30T13:20:08Z

cmd/lakectl/cmd/diff.go

@@ -54,15 +54,15 @@ var diffCmd = &cobra.Command{
 		if len(args) == diffCmdMinArgs {
 			// got one arg ref: uncommitted changes diff
 			branchURI := MustParseRefURI("ref", args[0])
-			Fmt("Ref: %s\n", branchURI.String())
+			fmt.Printf("Ref: %s\n", branchURI)


Suggested change

fmt.Printf("Ref: %s\n", branchURI)

fmt.Println("Ref: %s", branchURI)

kept Printf to use %s - we can drop the formatting and switch to use Println, but it is pretty equal.

N-o-Z · 2023-07-30T13:21:59Z

cmd/lakectl/cmd/commit.go

@@ -55,7 +56,7 @@ var commitCmd = &cobra.Command{
 		}

 		branchURI := MustParseRefURI("branch", args[0])
-		Fmt("Branch: %s\n", branchURI.String())
+		fmt.Printf("Branch: %s\n", branchURI)


Suggested change

fmt.Printf("Branch: %s\n", branchURI)

fmt.Println("Branch: %s", branchURI)

N-o-Z · 2023-07-30T13:27:28Z

cmd/lakectl/cmd/branch.go

@@ -116,7 +116,7 @@ var branchRevertCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		u := MustParseBranchURI("branch", args[0])
-		Fmt("Branch: %s\n", u.String())
+		fmt.Printf("Branch: %s\n", u.String())


Suggested change

fmt.Printf("Branch: %s\n", u.String())

fmt.Println("Branch: %s\n", u)

kept the format and dropped the call to String()

N-o-Z · 2023-07-30T13:27:40Z

cmd/lakectl/cmd/branch.go

@@ -135,7 +135,7 @@ var branchRevertCmd = &cobra.Command{
 				Ref:          commitRef,
 			})
 			DieOnErrorOrUnexpectedStatusCode(resp, err, http.StatusNoContent)
-			Fmt("commit %s successfully reverted\n", commitRef)
+			fmt.Printf("commit %s successfully reverted\n", commitRef)


Suggested change

fmt.Printf("commit %s successfully reverted\n", commitRef)

fmt.Println("commit %s successfully reverted", commitRef)

kept the original

N-o-Z · 2023-07-30T13:28:06Z

cmd/lakectl/cmd/branch.go

@@ -154,7 +154,7 @@ var branchResetCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		clt := getClient()
 		u := MustParseBranchURI("branch", args[0])
-		Fmt("Branch: %s\n", u.String())
+		fmt.Printf("Branch: %s\n", u.String())


Suggested change

fmt.Printf("Branch: %s\n", u.String())

fmt.Println("Branch: %s", u)

kept the original format and dropped the call to String()

N-o-Z · 2023-07-30T13:28:41Z

cmd/lakectl/cmd/branch.go

@@ -205,14 +205,14 @@ var branchShowCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		client := getClient()
 		u := MustParseBranchURI("branch", args[0])
-		Fmt("Branch: %s\n", u.String())
+		fmt.Printf("Branch: %s\n", u.String())


Suggested change

fmt.Printf("Branch: %s\n", u.String())

fmt.Println("Branch: %s", u)

kept Printf and dropped the call to String()

N-o-Z · 2023-07-30T13:28:53Z

cmd/lakectl/cmd/branch.go

 		resp, err := client.GetBranchWithResponse(cmd.Context(), u.Repository, u.Ref)
 		DieOnErrorOrUnexpectedStatusCode(resp, err, http.StatusOK)
 		if resp.JSON200 == nil {
 			Die("Bad response from server", 1)
 		}
 		branch := resp.JSON200
-		Fmt("Commit ID: %s\n", branch.CommitId)
+		fmt.Printf("Commit ID: %s\n", branch.CommitId)


Suggested change

fmt.Printf("Commit ID: %s\n", branch.CommitId)

fmt.Println("Commit ID: %s", branch.CommitId)

kept the original

nopcoder · 2023-07-30T20:32:31Z

@N-o-Z addressed all the comments some of them are part of the next PR.

This PR kept all auth* changes
Create part2b (split lakectl cmds - part 2b #6285) with all the rest of the had in this PR.
Part3 rebased on part2b

N-o-Z

@nopcoder Thanks!
One comment regarding file naming

N-o-Z · 2023-08-01T08:43:20Z

cmd/lakectl/cmd/auth_groups_list_members.go

Can you rename to auth_groups_members_list, this way it will sit lexicographically with the members sub command in the file tree

N-o-Z · 2023-08-01T08:43:46Z

cmd/lakectl/cmd/auth_groups_remove_member.go

Can you rename to auth_groups_members_remove, this way it will sit lexicographically with the members sub command in the file tree

* lakectl cmd split part 2b * split lakectl cmds - part 3 (#6277) * lakectl cmd part 2 * lakectl cmd split part 3 * update cli docs * use Println instead of Printf when possible

nopcoder requested a review from N-o-Z July 27, 2023 18:29

nopcoder added exclude-changelog PR description should not be included in next release changelog minor-change Used for PRs that don't require issue attached labels Jul 27, 2023

nopcoder force-pushed the chore/ctl-org-part1 branch from 7aa1973 to 1cf2d43 Compare July 27, 2023 18:30

nopcoder force-pushed the chore/ctl-org-part2 branch from 6683505 to 4d2f8de Compare July 27, 2023 18:31

nopcoder self-assigned this Jul 28, 2023

nopcoder force-pushed the chore/ctl-org-part1 branch from 1cf2d43 to 775c3e9 Compare July 30, 2023 08:48

nopcoder force-pushed the chore/ctl-org-part2 branch 4 times, most recently from 8015318 to 36207c6 Compare July 30, 2023 11:00

N-o-Z requested changes Jul 30, 2023

View reviewed changes

lakectl cmd split 2a

0bc68a6

nopcoder force-pushed the chore/ctl-org-part2 branch from 36207c6 to 0bc68a6 Compare July 30, 2023 20:07

nopcoder requested a review from N-o-Z July 30, 2023 20:27

N-o-Z requested changes Aug 1, 2023

View reviewed changes

nopcoder added 2 commits August 1, 2023 16:28

split lakectl cmds - part 2b (#6285)

18eeed3

* lakectl cmd split part 2b * split lakectl cmds - part 3 (#6277) * lakectl cmd part 2 * lakectl cmd split part 3 * update cli docs * use Println instead of Printf when possible

rename cmd and filename to match usage

3a8e453

nopcoder merged commit 74a53d8 into chore/ctl-org-part1 Aug 1, 2023
14 checks passed

nopcoder deleted the chore/ctl-org-part2 branch August 1, 2023 13:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

split lakectl cmds - part 2 #6272

split lakectl cmds - part 2 #6272

nopcoder commented Jul 27, 2023

github-actions bot commented Jul 27, 2023

N-o-Z left a comment

N-o-Z Jul 30, 2023

N-o-Z Jul 30, 2023

N-o-Z Jul 30, 2023

nopcoder Jul 30, 2023

N-o-Z Jul 30, 2023

nopcoder Jul 30, 2023

N-o-Z Jul 30, 2023

N-o-Z Jul 30, 2023

nopcoder Jul 30, 2023

N-o-Z Jul 30, 2023

nopcoder Jul 30, 2023

N-o-Z Jul 30, 2023

nopcoder Jul 30, 2023

N-o-Z Jul 30, 2023

nopcoder Jul 30, 2023

N-o-Z Jul 30, 2023

nopcoder Jul 30, 2023

nopcoder commented Jul 30, 2023

N-o-Z left a comment

N-o-Z Aug 1, 2023

N-o-Z Aug 1, 2023

	fmt.Printf("Tag ref: %s\n", u.String())
	fmt.Printf("Tag ref: %s\n", u)

	fmt.Printf("Ref: %s\n", branchURI)
	fmt.Println("Ref: %s", branchURI)

	fmt.Printf("Branch: %s\n", branchURI)
	fmt.Println("Branch: %s", branchURI)

	fmt.Printf("Branch: %s\n", u.String())
	fmt.Println("Branch: %s\n", u)

	fmt.Printf("commit %s successfully reverted\n", commitRef)
	fmt.Println("commit %s successfully reverted", commitRef)

	fmt.Printf("Branch: %s\n", u.String())
	fmt.Println("Branch: %s", u)

	fmt.Printf("Commit ID: %s\n", branch.CommitId)
	fmt.Println("Commit ID: %s", branch.CommitId)

split lakectl cmds - part 2 #6272

split lakectl cmds - part 2 #6272

Conversation

nopcoder commented Jul 27, 2023

github-actions bot commented Jul 27, 2023

N-o-Z left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nopcoder commented Jul 30, 2023

N-o-Z left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment