diff --git a/cmd/git-sync/main.go b/cmd/git-sync/main.go index 29d64f2..4ad4499 100644 --- a/cmd/git-sync/main.go +++ b/cmd/git-sync/main.go @@ -21,6 +21,7 @@ package main // import "k8s.io/git-sync/cmd/git-sync" import ( "bytes" "context" + "encoding/json" "flag" "fmt" "io" @@ -33,7 +34,6 @@ import ( "strconv" "strings" "time" - "encoding/json" "github.com/thockin/glogr" "github.com/thockin/logr" @@ -62,7 +62,7 @@ var flMaxSyncFailures = flag.Int("max-sync-failures", envInt("GIT_SYNC_MAX_SYNC_ "the number of consecutive failures allowed before aborting (the first pull must succeed, -1 disables aborting for any number of failures after the initial sync)") var flChmod = flag.Int("change-permissions", envInt("GIT_SYNC_PERMISSIONS", 0), "the file permissions to apply to the checked-out files") - + var flWebhooks = flag.String("webhook", envString("GIT_SYNC_WEBHOOK", ""), "the JSON formatted array of webhooks to be sent when git is synced") var flWebhookTimeout = flag.Int("webhook-timeout", envInt("GIT_SYNC_WEBHOOK_TIMEOUT", 60), @@ -198,7 +198,6 @@ func main() { } } - // From here on, output goes through logging. log.V(0).Infof("starting up: %q", os.Args) diff --git a/cmd/git-sync/webhooks.go b/cmd/git-sync/webhooks.go index da18026..814ed2d 100644 --- a/cmd/git-sync/webhooks.go +++ b/cmd/git-sync/webhooks.go @@ -1,32 +1,32 @@ - package main import ( + "fmt" "net/http" "time" - "fmt" ) + // Create an http client that has our timeout by default var netClient = &http.Client{ - Timeout: time.Duration(time.Second * time.Duration(*flWebhookTimeout) ), + Timeout: time.Duration(time.Second * time.Duration(*flWebhookTimeout)), } // Trigger channel for webhook requests. If anything is received into this channel // it triggers the webhook goroutine to send new requests. var WebhookCallTriggerChannel = make(chan struct{}) -// Webhook collection +// Webhook collection var WebhookArray = []Webhook{} // WebHook structure type Webhook struct { // URL for the http/s request - URL string `json:"url"` + URL string `json:"url"` // Method for the http/s request - Method string `json:"method"` + Method string `json:"method"` // Code to look for when determining if the request was successful. // If this is not specified, request is sent and forgotten about. - Success *int `json:"success"` + Success *int `json:"success"` } // WebhookCall Do webhook call @@ -35,8 +35,8 @@ func WebHookCall(url string, method string, statusCode *int) error { if err != nil { return err } - - // + + // resp, err := netClient.Do(req) if err != nil { return err @@ -55,7 +55,7 @@ func WebHookCall(url string, method string, statusCode *int) error { func ServeWebhooks() { for { // Wait for trigger - <- WebhookCallTriggerChannel + <-WebhookCallTriggerChannel // Calling webhook - one after another for _, v := range WebhookArray { @@ -67,5 +67,5 @@ func ServeWebhooks() { } } } - -} \ No newline at end of file + +}