Create Repo / Org make --forge-type optional

* This makes gitea garm usage unnessary complex

Author: ChristopherHX

cmd/garm-cli/cmd/common.go

@@ -0,0 +1,27 @@
+package cmd
+
+import (
+	"github.com/cloudbase/garm/client/credentials"
+	"github.com/cloudbase/garm/params"
+)
+
+func queryForgeType(credentialName string) error {
+	if forgeType == "" {
+		// TODO do this on server?, where we can query by Name
+		list, err := apiCli.Credentials.ListGiteaCredentials(&credentials.ListGiteaCredentialsParams{}, authToken)
+		if err != nil {
+			return err
+		}
+		for _, cred := range list.Payload {
+			if cred.Name == credentialName {
+				forgeType = string(params.GiteaEndpointType)
+				break
+			}
+		}
+		// TODO should we validate that an GitHub endpoint exists?
+		if forgeType == "" {
+			forgeType = string(params.GithubEndpointType)
+		}
+	}
+	return nil
+}

cmd/garm-cli/cmd/organization.go

@@ -163,6 +163,10 @@ var orgAddCmd = &cobra.Command{
 			orgWebhookSecret = secret
 		}
 
+		if err := queryForgeType(orgCreds); err != nil {
+			return fmt.Errorf("failed to query forge type: %w", err)
+		}
+
 		newOrgReq := apiClientOrgs.NewCreateOrgParams()
 		newOrgReq.Body = params.CreateOrgParams{
 			Name:             orgName,
@@ -308,7 +312,7 @@ func init() {
 	orgAddCmd.Flags().StringVar(&orgName, "name", "", "The name of the organization")
 	orgAddCmd.Flags().StringVar(&poolBalancerType, "pool-balancer-type", string(params.PoolBalancerTypeRoundRobin), "The balancing strategy to use when creating runners in pools matching requested labels.")
 	orgAddCmd.Flags().StringVar(&orgWebhookSecret, "webhook-secret", "", "The webhook secret for this organization")
-	orgAddCmd.Flags().StringVar(&forgeType, "forge-type", string(params.GithubEndpointType), "The forge type of the organization. Supported values: github, gitea.")
+	orgAddCmd.Flags().StringVar(&forgeType, "forge-type", "", "The forge type of the organization. Supported values: github, gitea.")
 	orgAddCmd.Flags().StringVar(&orgCreds, "credentials", "", "Credentials name. See credentials list.")
 	orgAddCmd.Flags().BoolVar(&orgRandomWebhookSecret, "random-webhook-secret", false, "Generate a random webhook secret for this organization.")
 	orgAddCmd.Flags().BoolVar(&installOrgWebhook, "install-webhook", false, "Install the webhook as part of the add operation.")

cmd/garm-cli/cmd/repository.go

@@ -165,6 +165,10 @@ var repoAddCmd = &cobra.Command{
 			repoWebhookSecret = secret
 		}
 
+		if err := queryForgeType(repoCreds); err != nil {
+			return fmt.Errorf("failed to query forge type: %w", err)
+		}
+
 		newRepoReq := apiClientRepos.NewCreateRepoParams()
 		newRepoReq.Body = params.CreateRepoParams{
 			Owner:            repoOwner,
@@ -312,7 +316,7 @@ func init() {
 	repoAddCmd.Flags().StringVar(&repoOwner, "owner", "", "The owner of this repository")
 	repoAddCmd.Flags().StringVar(&poolBalancerType, "pool-balancer-type", string(params.PoolBalancerTypeRoundRobin), "The balancing strategy to use when creating runners in pools matching requested labels.")
 	repoAddCmd.Flags().StringVar(&repoName, "name", "", "The name of the repository")
-	repoAddCmd.Flags().StringVar(&forgeType, "forge-type", string(params.GithubEndpointType), "The forge type of the repository. Supported values: github, gitea.")
+	repoAddCmd.Flags().StringVar(&forgeType, "forge-type", "", "The forge type of the repository. Supported values: github, gitea.")
 	repoAddCmd.Flags().StringVar(&repoWebhookSecret, "webhook-secret", "", "The webhook secret for this repository")
 	repoAddCmd.Flags().StringVar(&repoCreds, "credentials", "", "Credentials name. See credentials list.")
 	repoAddCmd.Flags().BoolVar(&randomWebhookSecret, "random-webhook-secret", false, "Generate a random webhook secret for this repository.")

doc/gitea.md

@@ -295,8 +295,7 @@ garm-cli repo add \
     --name testrepo \
     --owner testorg \
     --random-webhook-secret \
-    --install-webhook \
-    --forge-type gitea
+    --install-webhook
 ```
 
 Make a note of the repo UUID. You will need it when adding a pool.