fix: add more logs

fix: load endless and block main with ctx.Done()
feat: update logs
2024-05-30 12:29:17 +02:00 · 2024-05-30 07:03:37 +02:00 · 2024-05-25 06:47:21 +02:00 · 2024-05-25 06:31:37 +02:00 · 2024-05-24 22:25:36 +02:00 · 2024-05-24 22:07:55 +02:00
3 changed files with 253 additions and 13 deletions
--- a/internal/gitea.go
+++ b/internal/gitea.go
@ -0,0 +1,184 @@
+package internal
+
+import "time"
+
+type WebhookPayload struct {
+	Ref        string `json:"ref"`
+	Before     string `json:"before"`
+	After      string `json:"after"`
+	CompareURL string `json:"compare_url"`
+	Commits    []struct {
+		ID      string `json:"id"`
+		Message string `json:"message"`
+		URL     string `json:"url"`
+		Author  struct {
+			Name     string `json:"name"`
+			Email    string `json:"email"`
+			Username string `json:"username"`
+		} `json:"author"`
+		Committer struct {
+			Name     string `json:"name"`
+			Email    string `json:"email"`
+			Username string `json:"username"`
+		} `json:"committer"`
+		Verification any      `json:"verification"`
+		Timestamp    string   `json:"timestamp"`
+		Added        []any    `json:"added"`
+		Removed      []any    `json:"removed"`
+		Modified     []string `json:"modified"`
+	} `json:"commits"`
+	TotalCommits int `json:"total_commits"`
+	HeadCommit   struct {
+		ID      string `json:"id"`
+		Message string `json:"message"`
+		URL     string `json:"url"`
+		Author  struct {
+			Name     string `json:"name"`
+			Email    string `json:"email"`
+			Username string `json:"username"`
+		} `json:"author"`
+		Committer struct {
+			Name     string `json:"name"`
+			Email    string `json:"email"`
+			Username string `json:"username"`
+		} `json:"committer"`
+		Verification any      `json:"verification"`
+		Timestamp    string   `json:"timestamp"`
+		Added        []any    `json:"added"`
+		Removed      []any    `json:"removed"`
+		Modified     []string `json:"modified"`
+	} `json:"head_commit"`
+	Repository struct {
+		ID    int `json:"id"`
+		Owner struct {
+			ID                int       `json:"id"`
+			Login             string    `json:"login"`
+			LoginName         string    `json:"login_name"`
+			FullName          string    `json:"full_name"`
+			Email             string    `json:"email"`
+			AvatarURL         string    `json:"avatar_url"`
+			Language          string    `json:"language"`
+			IsAdmin           bool      `json:"is_admin"`
+			LastLogin         time.Time `json:"last_login"`
+			Created           time.Time `json:"created"`
+			Restricted        bool      `json:"restricted"`
+			Active            bool      `json:"active"`
+			ProhibitLogin     bool      `json:"prohibit_login"`
+			Location          string    `json:"location"`
+			Website           string    `json:"website"`
+			Description       string    `json:"description"`
+			Visibility        string    `json:"visibility"`
+			FollowersCount    int       `json:"followers_count"`
+			FollowingCount    int       `json:"following_count"`
+			StarredReposCount int       `json:"starred_repos_count"`
+			Username          string    `json:"username"`
+		} `json:"owner"`
+		Name            string    `json:"name"`
+		FullName        string    `json:"full_name"`
+		Description     string    `json:"description"`
+		Empty           bool      `json:"empty"`
+		Private         bool      `json:"private"`
+		Fork            bool      `json:"fork"`
+		Template        bool      `json:"template"`
+		Parent          any       `json:"parent"`
+		Mirror          bool      `json:"mirror"`
+		Size            int       `json:"size"`
+		Language        string    `json:"language"`
+		LanguagesURL    string    `json:"languages_url"`
+		HTMLURL         string    `json:"html_url"`
+		URL             string    `json:"url"`
+		Link            string    `json:"link"`
+		SSHURL          string    `json:"ssh_url"`
+		CloneURL        string    `json:"clone_url"`
+		OriginalURL     string    `json:"original_url"`
+		Website         string    `json:"website"`
+		StarsCount      int       `json:"stars_count"`
+		ForksCount      int       `json:"forks_count"`
+		WatchersCount   int       `json:"watchers_count"`
+		OpenIssuesCount int       `json:"open_issues_count"`
+		OpenPrCounter   int       `json:"open_pr_counter"`
+		ReleaseCounter  int       `json:"release_counter"`
+		DefaultBranch   string    `json:"default_branch"`
+		Archived        bool      `json:"archived"`
+		CreatedAt       time.Time `json:"created_at"`
+		UpdatedAt       time.Time `json:"updated_at"`
+		ArchivedAt      time.Time `json:"archived_at"`
+		Permissions     struct {
+			Admin bool `json:"admin"`
+			Push  bool `json:"push"`
+			Pull  bool `json:"pull"`
+		} `json:"permissions"`
+		HasIssues       bool `json:"has_issues"`
+		InternalTracker struct {
+			EnableTimeTracker                bool `json:"enable_time_tracker"`
+			AllowOnlyContributorsToTrackTime bool `json:"allow_only_contributors_to_track_time"`
+			EnableIssueDependencies          bool `json:"enable_issue_dependencies"`
+		} `json:"internal_tracker"`
+		HasWiki                       bool      `json:"has_wiki"`
+		HasPullRequests               bool      `json:"has_pull_requests"`
+		HasProjects                   bool      `json:"has_projects"`
+		HasReleases                   bool      `json:"has_releases"`
+		HasPackages                   bool      `json:"has_packages"`
+		HasActions                    bool      `json:"has_actions"`
+		IgnoreWhitespaceConflicts     bool      `json:"ignore_whitespace_conflicts"`
+		AllowMergeCommits             bool      `json:"allow_merge_commits"`
+		AllowRebase                   bool      `json:"allow_rebase"`
+		AllowRebaseExplicit           bool      `json:"allow_rebase_explicit"`
+		AllowSquashMerge              bool      `json:"allow_squash_merge"`
+		AllowRebaseUpdate             bool      `json:"allow_rebase_update"`
+		DefaultDeleteBranchAfterMerge bool      `json:"default_delete_branch_after_merge"`
+		DefaultMergeStyle             string    `json:"default_merge_style"`
+		DefaultAllowMaintainerEdit    bool      `json:"default_allow_maintainer_edit"`
+		AvatarURL                     string    `json:"avatar_url"`
+		Internal                      bool      `json:"internal"`
+		MirrorInterval                string    `json:"mirror_interval"`
+		MirrorUpdated                 time.Time `json:"mirror_updated"`
+		RepoTransfer                  any       `json:"repo_transfer"`
+	} `json:"repository"`
+	Pusher struct {
+		ID                int       `json:"id"`
+		Login             string    `json:"login"`
+		LoginName         string    `json:"login_name"`
+		FullName          string    `json:"full_name"`
+		Email             string    `json:"email"`
+		AvatarURL         string    `json:"avatar_url"`
+		Language          string    `json:"language"`
+		IsAdmin           bool      `json:"is_admin"`
+		LastLogin         time.Time `json:"last_login"`
+		Created           time.Time `json:"created"`
+		Restricted        bool      `json:"restricted"`
+		Active            bool      `json:"active"`
+		ProhibitLogin     bool      `json:"prohibit_login"`
+		Location          string    `json:"location"`
+		Website           string    `json:"website"`
+		Description       string    `json:"description"`
+		Visibility        string    `json:"visibility"`
+		FollowersCount    int       `json:"followers_count"`
+		FollowingCount    int       `json:"following_count"`
+		StarredReposCount int       `json:"starred_repos_count"`
+		Username          string    `json:"username"`
+	} `json:"pusher"`
+	Sender struct {
+		ID                int       `json:"id"`
+		Login             string    `json:"login"`
+		LoginName         string    `json:"login_name"`
+		FullName          string    `json:"full_name"`
+		Email             string    `json:"email"`
+		AvatarURL         string    `json:"avatar_url"`
+		Language          string    `json:"language"`
+		IsAdmin           bool      `json:"is_admin"`
+		LastLogin         time.Time `json:"last_login"`
+		Created           time.Time `json:"created"`
+		Restricted        bool      `json:"restricted"`
+		Active            bool      `json:"active"`
+		ProhibitLogin     bool      `json:"prohibit_login"`
+		Location          string    `json:"location"`
+		Website           string    `json:"website"`
+		Description       string    `json:"description"`
+		Visibility        string    `json:"visibility"`
+		FollowersCount    int       `json:"followers_count"`
+		FollowingCount    int       `json:"following_count"`
+		StarredReposCount int       `json:"starred_repos_count"`
+		Username          string    `json:"username"`
+	} `json:"sender"`
+}
--- a/kit/config/config.go
+++ b/kit/config/config.go
@ -9,11 +9,12 @@ import (
 type Config struct {
 	Secret   string                    `yaml:"secret"`
 	Port     int                       `yaml:"port"`
-	Scripts map[string]ConfigScript `yaml:"scripts"`
+	Projects map[string][]ConfigScript `yaml:"projects"`
 }
 type ConfigScript struct {
-	BinaryPath string `yaml:"binary"`
-	ScriptPath string `yaml:"script"`
+	Environment string   `yaml:"environment"`
+	Command     string   `yaml:"command"`
+	Arguments   []string `yaml:"args"`
 }

 func LoadConfig(path string) (*Config, error) {
--- a/main.go
+++ b/main.go
@ -1,6 +1,7 @@
 package main

 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@ -8,13 +9,21 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
+	"os/signal"
 	"path"
 	"runtime"
+	"strings"
+	"syscall"

+	"gitea.urkob.com/urko/gitea-webhook-listener/internal"
 	"gitea.urkob.com/urko/gitea-webhook-listener/kit/config"
 )

 func main() {
+	var err error
+	ctx, cancel := context.WithCancel(signalContext(context.Background()))
+	defer cancel()
+
 	cfgFile := os.Getenv("CONFIG_FILE")
 	if cfgFile == "" {
 		// Get root path
@ -25,11 +34,21 @@ func main() {
 	if err != nil {
 		log.Fatalf("Error loading config: %v", err)
 	}
-	http.HandleFunc("/", handlePayload(cfg.Secret, cfg.Scripts))
-	http.ListenAndServe(fmt.Sprintf(":%d", cfg.Port), nil)
+	http.HandleFunc("/", handlePayload(cfg.Secret, cfg.Projects))
+
+	go func() {
+		err = http.ListenAndServe(fmt.Sprintf(":%d", cfg.Port), nil)
+	}()
+	log.Printf("server is up on %d\n", cfg.Port)
+
+	<-ctx.Done()
+	if err != nil {
+		log.Println("some error happened", err)
+	}
+	log.Println("server shutdown")
 }

-func handlePayload(secret string, scripts map[string]config.ConfigScript) func(w http.ResponseWriter, r *http.Request) {
+func handlePayload(secret string, projects map[string][]config.ConfigScript) func(w http.ResponseWriter, r *http.Request) {
 	return (func(w http.ResponseWriter, r *http.Request) {
 		// Read the request body
 		body, err := io.ReadAll(r.Body)
@ -51,33 +70,69 @@ func handlePayload(secret string, scripts map[string]config.ConfigScript) func(w
 		}

 		project := r.URL.Query().Get("project")
-		scr, found := scripts[project]
+		proj, found := projects[project]
 		if !found {
 			http.Error(w, "not found", http.StatusNotFound)
+			log.Printf("project %s not found\n", project)
 			return
 		}
-		var payload interface{}
+		var payload internal.WebhookPayload
 		if err = json.Unmarshal(body, &payload); err != nil {
 			http.Error(w, "Failed to parse JSON payload", http.StatusBadRequest)
 			return
 		}
+		branchName := strings.Split(payload.Ref, "/")[len(strings.Split(payload.Ref, "/"))-1]
+		log.Println("branchName", branchName)
+		found = false
+		var scr config.ConfigScript
+		for i := range proj {
+			if proj[i].Environment == branchName {
+				found = true
+				scr = proj[i]
+				break
+			}
+
+		}
+		if !found {
+			http.Error(w, "not found", http.StatusNotFound)
+			log.Printf("project %s with branch %s not found\n", project, branchName)
+			return
+		}

 		go func() {
-			if err := execute(scr.BinaryPath, scr.ScriptPath); err != nil {
+			if err := execute(scr.Command, scr.Arguments...); err != nil {
 				log.Println(err)
 			}
+			log.Println("script was deployed successful")
 		}()
 	})
 }

-func execute(binaryPath, scriptPath string) error {
-	cmd := exec.Command(binaryPath, scriptPath)
+func execute(command string, args ...string) error {
+	cmd := exec.Command(command, args...)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr

 	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("cmd.Run %w", err)
 	}
+	log.Println()

 	return nil
 }
+
+func signalContext(ctx context.Context) context.Context {
+	ctx, cancel := context.WithCancel(ctx)
+
+	sigs := make(chan os.Signal, 1)
+	signal.Notify(sigs, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
+
+	go func() {
+		<-sigs
+		signal.Stop(sigs)
+		close(sigs)
+		cancel()
+	}()
+
+	return ctx
+}
Author	SHA1	Message	Date
Urko.	99236b5fb5	fix: add more logs	2024-05-30 12:29:17 +02:00
Urko.	d22a6816c4	fix: load endless and block main with ctx.Done()	2024-05-30 07:03:37 +02:00
Urko.	f6e4e64e81	feat: update logs	2024-05-25 06:47:21 +02:00
Urko.	eaf0b1ff69	fix: change args by slice	2024-05-25 06:31:37 +02:00
Urko.	9c735ccf64	fix: allow just binary execution	2024-05-24 22:25:36 +02:00
Urko.	adf47e4810	fix: allow multiple enviornments	2024-05-24 22:07:55 +02:00
Urko.	3d2cd78b07	feat: allow projects with branches/envs	2024-05-24 21:32:05 +02:00