695b include user in git commit #735

tamarakaufler · 2017-09-07T10:11:18Z

No description provided.

git/operations.go

-func commit(ctx context.Context, workingDir, commitMessage string) error {
+func commit(ctx context.Context, workingDir string, commitAction *CommitAction) error {
+	commitAuthor := commitAction.Author
+	// The user in the update.Cause.User must be a valid github user, otherwise the commit fails


git/operations.go

+	// then this is just about ok. Otherwise there could be config file with stored users to ignore etc.
+	// Currently the committer is hardcoded to flux-bot for user requested actions.
+	// TODO (potentially): allow the users to set the committer, ie have an additional
+	// update.Cause.Committer field.


git/operations.go

+	// Currently the committer is hardcoded to flux-bot for user requested actions.
+	// TODO (potentially): allow the users to set the committer, ie have an additional
+	// update.Cause.Committer field.
+	if commitAuthor != "" && commitAuthor != "test@test" {


git/operations.go

+			return errors.Wrap(err, "git commit config")
+		}
+		if err := execGitCmd(ctx,
+			workingDir, nil, nil,


daemon/daemon.go

@@ -96,7 +97,7 @@ func (d *Daemon) ListServices(namespace string) ([]flux.ServiceStatus, error) {
 	return res, nil
 }

-// List the images available for set of services
+// ListImages - List the images available for set of services


squaremo

Looks pretty good. I've suggested some tidies. I'm going to try it out now :)

cmd/fluxctl/args.go

 	cmd.Flags().StringVarP(&opts.Message, "message", "m", "", "attach a message to the update")
-	cmd.Flags().StringVar(&opts.User, "user", username, "override the user reported as initating the update")
+	cmd.Flags().StringVar(&opts.User, "user", username, "override the user reported as initiating the update")


cmd/fluxctl/args.go

+	authorInfo := getUserGitconfig()
+	userName := authorInfo["user.name"]
+
+	switch userName {


cmd/fluxctl/args.go

+		userGitconfig["user.email"] = ""
+		return userGitconfig
+	}
+	res := out.String()


cmd/fluxctl/args.go

+func userGitconfigMap(s string) map[string]string {
+	c := make(map[string]string)
+	lines := splitList(s)
+	if len(lines) == 0 {


cmd/fluxctl/args.go

+		}
+		userGitconfig["user.name"] = username
+		userGitconfig["user.email"] = ""
+		return userGitconfig


cmd/fluxd/main.go

+		gitPath      = fs.String("git-path", "", "path within git repo to locate Kubernetes manifests (relative path)")
+		gitUser      = fs.String("git-user", "Weave Flux", "username to use as git committer")
+		gitEmail     = fs.String("git-email", "support@weave.works", "email to use as git committer")
+		gitSetAuthor = fs.Bool("git-set-author", false, "boolean to set a git author different to git committer")


daemon/daemon.go

@@ -511,3 +525,10 @@ func policyEventTypes(u policy.Update) []string {
 	sort.Strings(result)
 	return result
 }
+
+func getCommitAuthor(setAuthor bool, author string) string {


squaremo · 2017-09-12T14:49:41Z

cmd/fluxctl/args.go

+	userName := authorInfo["user.name"]
+	userEmail := authorInfo["user.email"]
+
+	switch userName {


cmd/fluxctl/args_test.go

+
+	userGitconfigInfo := userGitconfigMap(d)
+	if len(userGitconfigInfo) != 6 {
+		t.Fatal("expected no content")


cmd/fluxd/main.go

+		gitPath      = fs.String("git-path", "", "path within git repo to locate Kubernetes manifests (relative path)")
+		gitUser      = fs.String("git-user", "Weave Flux", "username to use as git committer")
+		gitEmail     = fs.String("git-email", "support@weave.works", "email to use as git committer")
+		gitSetAuthor = fs.Bool("git-set-author", false, "If set, the author of git commits will reflect the user who initiated the commit and will differ from the git committer.")


squaremo

Good to go 🏅
Thanks for sticking at it!

squaremo · 2017-09-13T15:17:06Z

(Please rebase -i or squash before/while merging)

Refactored with fluxd set-author-flag

…n-git-commit

squaremo reviewed Sep 7, 2017

View reviewed changes

squaremo suggested changes Sep 7, 2017

View reviewed changes

squaremo reviewed Sep 12, 2017

View reviewed changes

squaremo reviewed Sep 13, 2017

View reviewed changes

cmd/fluxctl/args.go Outdated

userName := authorInfo["user.name"]

userEmail := authorInfo["user.email"]

switch userName {

This comment was marked as abuse.

Sign in to view

squaremo reviewed Sep 13, 2017

View reviewed changes

cmd/fluxctl/args_test.go Outdated

userGitconfigInfo := userGitconfigMap(d)

if len(userGitconfigInfo) != 6 {

t.Fatal("expected no content")

This comment was marked as abuse.

Sign in to view

squaremo reviewed Sep 13, 2017

View reviewed changes

squaremo approved these changes Sep 13, 2017

View reviewed changes

Changes commit author to user for user-requested actions

366fd04

Refactored with fluxd set-author-flag

tamarakaufler force-pushed the 695b-include-user-in-git-commit branch from 54b81f2 to 366fd04 Compare September 13, 2017 15:55

Merge remote-tracking branch 'origin/master' into 695b-include-user-i…

9f73679

…n-git-commit

tamarakaufler merged commit 953c51c into master Sep 14, 2017

tamarakaufler deleted the 695b-include-user-in-git-commit branch September 14, 2017 07:08

squaremo mentioned this pull request Sep 22, 2017

Include user in git commit info #695

Closed

695b include user in git commit #735

695b include user in git commit #735

Conversation

tamarakaufler commented Sep 7, 2017

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

squaremo left a comment

Choose a reason for hiding this comment

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

squaremo commented Sep 12, 2017

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

squaremo left a comment

Choose a reason for hiding this comment

squaremo commented Sep 13, 2017