add handler package

Signed-off-by: Cheikh Seck <[email protected]> add signature Signed-off-by: Cheikh Seck <[email protected]> Revert "add signature" This reverts commit ed54c2f. refactor main.go to use handler package. Signed-off-by: Cheikh Seck <[email protected]> export ClosedConstant from handler package. Signed-off-by: Cheikh Seck <[email protected]>
alexellis · Oct 29, 2018 · 9aadd63 · 9aadd63
1 parent 698b186
commit 9aadd63
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 29 deletions.
diff --git a/commentHandler.go → handler/commentHandler.go b/commentHandler.go → handler/commentHandler.go
@@ -1,7 +1,7 @@
 // Copyright (c) Derek Author(s) 2017. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-package main
+package handler
 
 import (
 	"bytes"
@@ -20,7 +20,7 @@ import (
 
 const (
 	openConstant            string = "open"
-	closedConstant          string = "closed"
+	ClosedConstant          string = "closed"
 	closeConstant           string = "close"
 	reopenConstant          string = "reopen"
 	lockConstant            string = "Lock"
@@ -56,7 +56,7 @@ func makeClient(installation int, config config.Config) (*github.Client, context
 	return client, ctx
 }
 
-func handleComment(req types.IssueCommentOuter, config config.Config) {
+func HandleComment(req types.IssueCommentOuter, config config.Config) {
 
 	var feedback string
 	var err error
@@ -361,8 +361,8 @@ func validAction(running bool, requestedAction string, start string, stop string
 
 func checkTransition(requestedAction string, currentState string) (string, bool) {
 
-	if requestedAction == closeConstant && currentState != closedConstant {
-		return closedConstant, true
+	if requestedAction == closeConstant && currentState != ClosedConstant {
+		return ClosedConstant, true
 	} else if requestedAction == reopenConstant && currentState != openConstant {
 		return openConstant, true
 	}

diff --git a/commentHandler_test.go → handler/commentHandler_test.go b/commentHandler_test.go → handler/commentHandler_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) Derek Author(s) 2017. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-package main
+package handler
 
 import (
 	"os"
@@ -240,7 +240,7 @@ func Test_assessState(t *testing.T) {
 		{
 			title:            "Currently Closed and trying to close",
 			requestedAction:  closeConstant,
-			currentState:     closedConstant,
+			currentState:     ClosedConstant,
 			expectedNewState: "",
 			expectedBool:     false,
 		},
@@ -254,15 +254,15 @@ func Test_assessState(t *testing.T) {
 		{
 			title:            "Currently Closed and trying to open",
 			requestedAction:  reopenConstant,
-			currentState:     closedConstant,
+			currentState:     ClosedConstant,
 			expectedNewState: openConstant,
 			expectedBool:     true,
 		},
 		{
 			title:            "Currently Open and trying to close",
 			requestedAction:  closeConstant,
 			currentState:     openConstant,
-			expectedNewState: closedConstant,
+			expectedNewState: ClosedConstant,
 			expectedBool:     true,
 		},
 	}

diff --git a/permissionsHandler.go → handler/permissionsHandler.go b/permissionsHandler.go → handler/permissionsHandler.go
@@ -1,7 +1,7 @@
 // Copyright (c) Derek Author(s) 2017. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-package main
+package handler
 
 import (
 	"fmt"
@@ -18,7 +18,7 @@ import (
 
 const configFile = ".DEREK.yml"
 
-func enabledFeature(attemptedFeature string, config *types.DerekRepoConfig) bool {
+func EnabledFeature(attemptedFeature string, config *types.DerekRepoConfig) bool {
 
 	featureEnabled := false
 
@@ -31,11 +31,11 @@ func enabledFeature(attemptedFeature string, config *types.DerekRepoConfig) bool
 	return featureEnabled
 }
 
-func permittedUserFeature(attemptedFeature string, config *types.DerekRepoConfig, user string) bool {
+func PermittedUserFeature(attemptedFeature string, config *types.DerekRepoConfig, user string) bool {
 
 	permitted := false
 
-	if enabledFeature(attemptedFeature, config) {
+	if EnabledFeature(attemptedFeature, config) {
 		for _, maintainer := range config.Maintainers {
 			if strings.EqualFold(user, maintainer) {
 				permitted = true
@@ -80,7 +80,7 @@ func validateRedirectURL(url string) error {
 	return fmt.Errorf("the redirect URL doesn't seem to be GitHub based")
 }
 
-func getRepoConfig(owner string, repository string) (*types.DerekRepoConfig, error) {
+func GetRepoConfig(owner string, repository string) (*types.DerekRepoConfig, error) {
 	var config types.DerekRepoConfig
 
 	client := http.Client{

diff --git a/permissionsHandler_test.go → handler/permissionsHandler_test.go b/permissionsHandler_test.go → handler/permissionsHandler_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) Derek Author(s) 2017. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-package main
+package handler
 
 import (
 	"testing"
@@ -80,7 +80,7 @@ func Test_curatorequalsmaintainer(t *testing.T) {
 	}
 }
 
-func Test_enabledFeature(t *testing.T) {
+func Test_EnabledFeature(t *testing.T) {
 
 	var enableFeatureOpts = []struct {
 		title            string
@@ -136,7 +136,7 @@ func Test_enabledFeature(t *testing.T) {
 
 			inputConfig := &types.DerekRepoConfig{Features: test.configFeatures}
 
-			featureEnabled := enabledFeature(test.attemptedFeature, inputConfig)
+			featureEnabled := EnabledFeature(test.attemptedFeature, inputConfig)
 
 			if featureEnabled != test.expectedVal {
 				t.Errorf("Enabled feature - wanted: %t, found %t", test.expectedVal, featureEnabled)
@@ -145,7 +145,7 @@ func Test_enabledFeature(t *testing.T) {
 	}
 }
 
-func Test_permittedUserFeature(t *testing.T) {
+func Test_PermittedUserFeature(t *testing.T) {
 
 	var permittedUserFeatureOpts = []struct {
 		title            string
@@ -221,7 +221,7 @@ func Test_permittedUserFeature(t *testing.T) {
 
 			inputConfig := &test.config
 
-			permittedFeature := permittedUserFeature(test.attemptedFeature, inputConfig, test.user)
+			permittedFeature := PermittedUserFeature(test.attemptedFeature, inputConfig, test.user)
 
 			if permittedFeature != test.expectedVal {
 				t.Errorf("Permitted user feature - wanted: %t, found %t", test.expectedVal, permittedFeature)

diff --git a/pullRequestHandler.go → handler/pullRequestHandler.go b/pullRequestHandler.go → handler/pullRequestHandler.go
@@ -1,7 +1,7 @@
 // Copyright (c) Derek Author(s) 2017. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-package main
+package handler
 
 import (
 	"context"
@@ -18,7 +18,7 @@ import (
 	"github.com/google/go-github/github"
 )
 
-func handlePullRequest(req types.PullRequestOuter, contributingURL string, config config.Config) {
+func HandlePullRequest(req types.PullRequestOuter, contributingURL string, config config.Config) {
 	ctx := context.Background()
 
 	token := os.Getenv("personal_access_token")

diff --git a/pullRequestHandler_test.go → handler/pullRequestHandler_test.go b/pullRequestHandler_test.go → handler/pullRequestHandler_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) Derek Author(s) 2017. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-package main
+package handler
 
 import (
 	"testing"

diff --git a/main.go b/main.go
@@ -12,6 +12,9 @@ import (
 
 	"github.com/alexellis/derek/auth"
 	"github.com/alexellis/derek/config"
+
+	"github.com/alexellis/derek/handler"
+
 	"github.com/alexellis/derek/types"
 	"github.com/alexellis/hmac"
 )
@@ -72,14 +75,14 @@ func handleEvent(eventType string, bytesIn []byte, config config.Config) error {
 			return fmt.Errorf("No customer found for: %s/%s", req.Repository.Owner.Login, req.Repository.Name)
 		}
 
-		derekConfig, err := getRepoConfig(req.Repository.Owner.Login, req.Repository.Name)
+		derekConfig, err := handler.GetRepoConfig(req.Repository.Owner.Login, req.Repository.Name)
 		if err != nil {
 			return fmt.Errorf("Unable to access maintainers file at: %s/%s", req.Repository.Owner.Login, req.Repository.Name)
 		}
-		if req.Action != closedConstant {
-			if enabledFeature(dcoCheck, derekConfig) {
+		if req.Action != handler.ClosedConstant {
+			if handler.EnabledFeature(dcoCheck, derekConfig) {
 				contributingURL := getContributingURL(derekConfig.ContributingURL, req.Repository.Owner.Login, req.Repository.Name)
-				handlePullRequest(req, contributingURL, config)
+				handler.HandlePullRequest(req, contributingURL, config)
 			}
 		}
 		break
@@ -97,14 +100,14 @@ func handleEvent(eventType string, bytesIn []byte, config config.Config) error {
 			return fmt.Errorf("No customer found for: %s/%s", req.Repository.Owner.Login, req.Repository.Name)
 		}
 
-		derekConfig, err := getRepoConfig(req.Repository.Owner.Login, req.Repository.Name)
+		derekConfig, err := handler.GetRepoConfig(req.Repository.Owner.Login, req.Repository.Name)
 		if err != nil {
 			return fmt.Errorf("Unable to access maintainers file at: %s/%s", req.Repository.Owner.Login, req.Repository.Name)
 		}
 
 		if req.Action != deleted {
-			if permittedUserFeature(comments, derekConfig, req.Comment.User.Login) {
-				handleComment(req, config)
+			if handler.PermittedUserFeature(comments, derekConfig, req.Comment.User.Login) {
+				handler.HandleComment(req, config)
 			}
 		}
 		break