add new command for applying org level settings

Author: dan9186

client/orgs.go

@@ -3,6 +3,7 @@ package client
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
 
 	"github.com/gomicro/concord/report"
@@ -60,8 +61,10 @@ func (c *Client) GetMembers(ctx context.Context, orgName string) ([]*github.User
 }
 
 func (c *Client) InviteMember(ctx context.Context, orgName string, username string) {
-	report.PrintAdd("invite " + username)
-	report.Println()
+	cs := &report.ChangeSet{}
+
+	cs.Add("invite "+username, "invited "+username)
+	cs.PrintPre()
 
 	c.Add(func() error {
 		user, resp, err := c.ghClient.Users.Get(ctx, username)
@@ -88,9 +91,71 @@ func (c *Client) InviteMember(ctx context.Context, orgName string, username stri
 			return err
 		}
 
-		report.PrintSuccess("invited " + username)
-		report.Println()
+		cs.PrintPost()
+
+		return nil
+	})
+}
+
+func (c *Client) SetOrgPrivileges(ctx context.Context, orgName string, edits *github.Organization) error {
+	ghOrg, _, err := c.ghClient.Organizations.Get(ctx, orgName)
+	if err != nil {
+		if _, ok := err.(*github.RateLimitError); ok {
+			return err
+		}
+
+		if errResp, ok := err.(*github.ErrorResponse); ok {
+			if errResp.Response.StatusCode == http.StatusNotFound {
+				return ErrOrgNotFound
+			}
+		}
+
+		return err
+	}
+
+	cs := &report.ChangeSet{}
+
+	if edits.DefaultRepoPermission != nil && *edits.DefaultRepoPermission != *ghOrg.DefaultRepoPermission {
+		cs.Add(
+			fmt.Sprintf("setting base permissions to '%s'", *edits.DefaultRepoPermission),
+			fmt.Sprintf("set base permissions to '%s'", *edits.DefaultRepoPermission),
+		)
+	}
+
+	if edits.MembersCanCreatePrivateRepos != nil && *edits.MembersCanCreatePrivateRepos != *ghOrg.MembersCanCreatePrivateRepos {
+		cs.Add(
+			fmt.Sprintf("setting private repo creation to '%t'", *edits.MembersCanCreatePrivateRepos),
+			fmt.Sprintf("set private repo creation to '%t'", *edits.MembersCanCreatePrivateRepos),
+		)
+	}
+
+	if edits.MembersCanCreatePublicRepos != nil && *edits.MembersCanCreatePublicRepos != *ghOrg.MembersCanCreatePublicRepos {
+		cs.Add(
+			fmt.Sprintf("setting public repo creation to '%t'", *edits.MembersCanCreatePublicRepos),
+			fmt.Sprintf("set public repo creation to '%t'", *edits.MembersCanCreatePublicRepos),
+		)
+	}
+
+	cs.PrintPre()
+
+	c.Add(func() error {
+		_, resp, err := c.ghClient.Organizations.Edit(ctx, orgName, edits)
+		if err != nil {
+			if _, ok := err.(*github.RateLimitError); ok {
+				return err
+			}
+
+			if resp.StatusCode == http.StatusNotFound {
+				return ErrUserNotFound
+			}
+
+			return err
+		}
+
+		cs.PrintPost()
 
 		return nil
 	})
+
+	return nil
 }

cmd/apply.go

@@ -61,6 +61,11 @@ func applyRun(cmd *cobra.Command, args []string) error {
 	report.PrintHeader("Org")
 	report.Println()
 
+	err = orgRun(cmd, args)
+	if err != nil {
+		return handleError(cmd, err)
+	}
+
 	err = membersRun(cmd, args)
 	if err != nil {
 		return handleError(cmd, err)

cmd/apply_org.go

@@ -0,0 +1,126 @@
+package cmd
+
+import (
+	"errors"
+	"io"
+	"os"
+	"strings"
+
+	"github.com/gomicro/concord/client"
+	gh_pb "github.com/gomicro/concord/github/v1"
+	"github.com/gomicro/concord/manifest"
+	"github.com/gomicro/concord/report"
+	"github.com/google/go-github/v56/github"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	applyCmd.AddCommand(NewApplyOrgCmd(os.Stdout))
+}
+
+func NewApplyOrgCmd(out io.Writer) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "org",
+		Short: "Apply specific org level configuration",
+		Long:  `Apply specific org level configuration against github`,
+		RunE:  applyOrgRun,
+	}
+
+	cmd.SetOut(out)
+
+	return cmd
+}
+
+func applyOrgRun(cmd *cobra.Command, args []string) error {
+	file := cmd.Flags().Lookup("file").Value.String()
+	cmd.SetContext(manifest.WithManifest(cmd.Context(), file))
+
+	dry := strings.EqualFold(cmd.Flags().Lookup("dry").Value.String(), "true")
+
+	ctx := cmd.Context()
+
+	org, err := manifest.OrgFromContext(ctx)
+	if err != nil {
+		return handleError(cmd, err)
+	}
+
+	clt, err := client.ClientFromContext(ctx)
+	if err != nil {
+		return handleError(cmd, err)
+	}
+
+	exists, err := clt.OrgExists(ctx, org.Name)
+	if err != nil {
+		return handleError(cmd, err)
+	}
+
+	if !exists {
+		return handleError(cmd, errors.New("organization does not exist"))
+	}
+
+	report.PrintHeader("Org")
+	report.Println()
+
+	err = orgRun(cmd, args)
+	if err != nil {
+		return handleError(cmd, err)
+	}
+
+	if !dry {
+		if !confirm(cmd, "Apply changes? (y/n): ") {
+			return nil
+		}
+
+		err = clt.Apply()
+		if err != nil {
+			return handleError(cmd, err)
+		}
+	}
+
+	return nil
+}
+
+func orgRun(cmd *cobra.Command, args []string) error {
+	ctx := cmd.Context()
+
+	org, err := manifest.OrgFromContext(ctx)
+	if err != nil {
+		return handleError(cmd, err)
+	}
+
+	clt, err := client.ClientFromContext(ctx)
+	if err != nil {
+		return handleError(cmd, err)
+	}
+
+	report.Println()
+	report.PrintHeader("Permissions")
+	report.Println()
+
+	err = clt.SetOrgPrivileges(ctx, org.Name, buildOrgState(org))
+	if err != nil {
+		return handleError(cmd, err)
+	}
+
+	return nil
+}
+
+func buildOrgState(org *gh_pb.Organization) *github.Organization {
+	state := &github.Organization{}
+
+	if org.Permissions != nil {
+		if org.Permissions.BasePermissions != nil {
+			state.DefaultRepoPermission = org.Permissions.BasePermissions
+		}
+
+		if org.Permissions.CreatePrivateRepos != nil {
+			state.MembersCanCreatePrivateRepos = org.Permissions.CreatePrivateRepos
+		}
+
+		if org.Permissions.CreatePublicRepos != nil {
+			state.MembersCanCreatePublicRepos = org.Permissions.CreatePublicRepos
+		}
+	}
+
+	return state
+}