Accept org name from env variable (#20)

* fix test config for sonar

* generalize authentication to github

* upgrade go version in go.mod

* return back sonar config

* accept org name from env vars too

* add run*.sh files to gitignore

Author: amirashad

.gitignore

@@ -11,5 +11,5 @@
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 artifacts/
-run.sh
+run*.sh
 ghctl

.sonarcloud.properties

@@ -1,15 +1,19 @@
 # Path to sources
 sonar.sources=.
-#sonar.exclusions=
+#sonar.exclusions=**/*_test.go
 #sonar.inclusions=
 
 # Path to tests
 #sonar.tests=.
 #sonar.test.exclusions=
-#sonar.test.inclusions=**/**_test.go
+#sonar.test.inclusions=**/*_test.go
 
 # Source encoding
 #sonar.sourceEncoding=UTF-8
 
 # Exclusions for copy-paste detection
-#sonar.cpd.exclusions=
+#sonar.cpd.exclusions=
+
+# Properties specific to Go
+#sonar.go.tests.reportPaths=report.json
+#sonar.go.coverage.reportPaths=coverage.out

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log
 
+## v0.1.8 (2019-11-08)
+
+ - Accept org name from env variable: GITHUB_ORG
+
 ## v0.1.7 (2019-11-01)
 
  - Update go-arg to version 1.2.0

client.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"context"
+
+	"github.com/google/go-github/v28/github"
+	"golang.org/x/oauth2"
+)
+
+func createGithubClient(ctx context.Context) *github.Client {
+	ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: args.Token})
+	tc := oauth2.NewClient(ctx, ts)
+	client := github.NewClient(tc)
+	return client
+}

flag.go

@@ -2,16 +2,17 @@ package main
 
 type Args struct {
 	Token        string `arg:"env:GITHUB_TOKEN,required"`
-	Org          string `arg:"required"`
-	OutputFormat string `arg:"-o" help:"output format: normal, json"`
+	Org          string `arg:"env:GITHUB_ORG,required"`
+	OutputFormat string `arg:"-o" help:"output format: normal, json" default:"normal"`
+	Verbose      bool   `arg:"-v" default:"false"`
 
 	Get    *Get    `arg:"subcommand:get"`
 	Create *Create `arg:"subcommand:create"`
 	Add    *Add    `arg:"subcommand:add"`
 }
 
 func (Args) Version() string {
-	return "v0.1.7"
+	return "v0.1.8"
 }
 
 type Get struct {
@@ -82,7 +83,7 @@ type Files struct {
 	Files         []string `arg:"-f,required"`
 	GitName       string   `arg:"-n,required"`
 	GitEmail      string   `arg:"-e,required"`
-	CommitMessage string   `arg:"-m"`
+	CommitMessage string   `arg:"-m,--gitmessage"`
 }
 type Collaborator struct {
 	Repo       string `arg:"-r,required"`

git.go

@@ -22,7 +22,7 @@ const gitUsername = "some-user"
 func createBranch(org string, repo string, branch string, format string) {
 	auth := &http.BasicAuth{
 		Username: gitUsername, // anything except an empty string
-		Password: githubToken(),
+		Password: args.Token,
 	}
 
 	// Clone the given repository to the memory
@@ -59,7 +59,7 @@ func createBranch(org string, repo string, branch string, format string) {
 func addFiles(org, repo, branch string, files []string, commitmessage, gitName, gitEmail, format string) {
 	auth := &http.BasicAuth{
 		Username: gitUsername, // anything except an empty string
-		Password: githubToken(),
+		Password: args.Token,
 	}
 
 	dir, err := ioutil.TempDir("", repo+"-"+branch)

go.mod

@@ -1,6 +1,6 @@
 module github.com/amirashad/ghctl
 
-go 1.13
+go 1.13.4
 
 require (
 	github.com/alexflint/go-arg v1.2.0

main.go

@@ -7,7 +7,6 @@ import (
 var args Args
 
 func main() {
-	args.OutputFormat = "normal"
 	arg.MustParse(&args)
 	// fmt.Println(args)
 
@@ -53,7 +52,3 @@ func main() {
 			args.Create.Protection.RequiredStatusChecks)
 	}
 }
-
-func githubToken() string {
-	return args.Token
-}

member.go

@@ -8,14 +8,11 @@ import (
 	"sort"
 
 	"github.com/google/go-github/v28/github"
-	"golang.org/x/oauth2"
 )
 
 func getMembers(org string, format string) {
 	ctx := context.Background()
-	ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: githubToken()})
-	tc := oauth2.NewClient(ctx, ts)
-	client := github.NewClient(tc)
+	client := createGithubClient(ctx)
 
 	opt := &github.ListMembersOptions{ListOptions: github.ListOptions{PerPage: 100}}
 	var objsAll []*github.User

protection.go

@@ -5,17 +5,14 @@ import (
 	"fmt"
 
 	"github.com/google/go-github/v28/github"
-	"golang.org/x/oauth2"
 )
 
 func createProtection(org, repoName, protectionPattern string, minApprove int, dismissStalePrApprovals, codeOwner bool,
 	requireBranchesUptodate, includeAdmins bool,
 	canDismiss, canDismissTeams, canPush, canPushTeams []string,
 	requiredStatusChecks []string) {
 	ctx := context.Background()
-	ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: githubToken()})
-	tc := oauth2.NewClient(ctx, ts)
-	client := github.NewClient(tc)
+	client := createGithubClient(ctx)
 
 	preq := &github.ProtectionRequest{
 		RequiredPullRequestReviews: &github.PullRequestReviewsEnforcementRequest{

repo.go

@@ -8,14 +8,11 @@ import (
 	"sort"
 
 	"github.com/google/go-github/v28/github"
-	"golang.org/x/oauth2"
 )
 
 func getRepos(org string, format string) {
 	ctx := context.Background()
-	ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: githubToken()})
-	tc := oauth2.NewClient(ctx, ts)
-	client := github.NewClient(tc)
+	client := createGithubClient(ctx)
 
 	opt := &github.RepositoryListByOrgOptions{ /*Type: "private", */ ListOptions: github.ListOptions{PerPage: 100}}
 	var objsAll []*github.Repository
@@ -53,9 +50,7 @@ func createRepo(org string,
 	noMergeCommit, noSquashMerge, noRebaseMerge *bool,
 	format string) {
 	ctx := context.Background()
-	ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: githubToken()})
-	tc := oauth2.NewClient(ctx, ts)
-	client := github.NewClient(tc)
+	client := createGithubClient(ctx)
 
 	repo := &github.Repository{
 		Name:        name,
@@ -102,9 +97,7 @@ func not(o *bool) *bool {
 func addCollaboratorToRepo(org string,
 	repo, user, permission string) {
 	ctx := context.Background()
-	ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: githubToken()})
-	tc := oauth2.NewClient(ctx, ts)
-	client := github.NewClient(tc)
+	client := createGithubClient(ctx)
 
 	perm := &github.RepositoryAddCollaboratorOptions{
 		Permission: permission,

team.go

@@ -8,14 +8,11 @@ import (
 	"sort"
 
 	"github.com/google/go-github/v28/github"
-	"golang.org/x/oauth2"
 )
 
 func getTeams(org string, format string) {
 	ctx := context.Background()
-	ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: githubToken()})
-	tc := oauth2.NewClient(ctx, ts)
-	client := github.NewClient(tc)
+	client := createGithubClient(ctx)
 
 	opt := &github.ListOptions{PerPage: 100}
 	var objsAll []*github.Team