abstract platform creation

Author: hooksie1

digestabotctl/cmd/files.go

@@ -1,8 +1,6 @@
 package cmd
 
 import (
-	"fmt"
-	"slices"
 	"time"
 
 	"github.com/chainguard-dev/platform-examples/digestabotctl/digestabot"
@@ -43,8 +41,9 @@ func validateFiles(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if !slices.Contains(platforms.ValidPlatforms, viper.GetString("platform")) {
-		return fmt.Errorf("invalid platform, valid platforms: %s", platforms.ValidPlatforms)
+	_, ok := platforms.ValidPlatforms[platforms.GitPlatform(viper.GetString("platform"))]
+	if !ok {
+		return platforms.ErrInvalidPlatform
 	}
 
 	return nil
@@ -104,36 +103,15 @@ func handlePRForPlatform(platform string, checkout versioncontrol.CheckoutRespon
 		},
 	}
 
-	switch platform {
-	case "github":
-		{
-			gh, err := platforms.NewGitHub(pr)
-			if err != nil {
-				return err
-			}
-
-			if err := platforms.CreatePR(gh); err != nil {
-				return err
-			}
-
-			return nil
-		}
-	case "gitlab":
-		{
-			gl, err := platforms.NewGitLab(pr)
-			if err != nil {
-				return err
-			}
-
-			if err := platforms.CreatePR(gl); err != nil {
-				return err
-			}
-
-			return nil
-		}
-	default:
-		{
-			return platforms.ErrInvalidPlatform
-		}
+	platformFunc := platforms.ValidPlatforms[platforms.GitPlatform(platform)]
+	if platformFunc == nil {
+		return platforms.ErrInvalidPlatform
 	}
+
+	creator, err := platformFunc(pr)
+	if err != nil {
+		return err
+	}
+
+	return creator.CreatePR()
 }

digestabotctl/cmd/flags.go

@@ -3,6 +3,8 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"maps"
+	"slices"
 
 	"github.com/chainguard-dev/platform-examples/digestabotctl/digestabot"
 	"github.com/chainguard-dev/platform-examples/digestabotctl/platforms"
@@ -63,5 +65,5 @@ func prFlags(cmd *cobra.Command) {
 	cmd.PersistentFlags().String("title", "Updating image digests", "PR title")
 	cmd.PersistentFlags().String("token", "", "API token")
 	cmd.PersistentFlags().String("description", "Updating image digests", "PR description")
-	cmd.PersistentFlags().String("platform", "", fmt.Sprintf("Platform to create the PR. Options are %s", platforms.ValidPlatforms))
+	cmd.PersistentFlags().String("platform", "", fmt.Sprintf("Platform to create the PR. Options are %s", slices.Collect(maps.Keys(platforms.ValidPlatforms))))
 }

digestabotctl/platforms/github.go

@@ -45,7 +45,7 @@ func (g GitHub) CreatePR() error {
 	return nil
 }
 
-func NewGitHub(pr PullRequest) (GitHub, error) {
+func NewGitHub(pr PullRequest) (PRCreator, error) {
 	temp := template.Must(template.New("file").Parse(prTemplate))
 	var buf = bytes.Buffer{}
 	if err := temp.Execute(&buf, pr); err != nil {

digestabotctl/platforms/gitlab.go

@@ -45,7 +45,7 @@ func (g GitLab) CreatePR() error {
 	return nil
 }
 
-func NewGitLab(pr PullRequest) (GitLab, error) {
+func NewGitLab(pr PullRequest) (PRCreator, error) {
 	temp := template.Must(template.New("file").Parse(prTemplate))
 	var buf = bytes.Buffer{}
 	if err := temp.Execute(&buf, pr); err != nil {

digestabotctl/platforms/platforms.go

@@ -9,14 +9,26 @@ import (
 	"time"
 )
 
+type GitPlatform string
+
+var (
+	GitHubPlatform GitPlatform = "github"
+	GitLabPlatform GitPlatform = "gitlab"
+)
+
 var successCodes = []int{200, 201, 202, 203, 204}
 
 var (
-	ValidPlatforms     = []string{"github", "gitlab"}
+	//ValidPlatforms     = []string{"github", "gitlab"}
 	ErrBadResponse     = errors.New("request was unsuccessful")
 	ErrInvalidPlatform = errors.New("invalid platform")
 )
 
+var ValidPlatforms = map[GitPlatform]func(PullRequest) (PRCreator, error){
+	GitHubPlatform: NewGitHub,
+	GitLabPlatform: NewGitLab,
+}
+
 var prTemplate = `{{ $tick := "` + "```" + `" -}}
 {{.Description}}