DevFW-CICD/garm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Enable orgs

Browse source 
Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2025-05-16 22:43:21 +00:00
parent 5dfcfc542e
commit 6a168ba813
22 changed files with 125 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmd/garm-cli/cmd/organization.go
View file

@ -167,6 +167,7 @@ var orgAddCmd = &cobra.Command{
Name: orgName,
WebhookSecret: orgWebhookSecret,
CredentialsName: orgCreds,
ForgeType: params.EndpointType(forgeType),
PoolBalancerType: params.PoolBalancerType(poolBalancerType),
}
response, err := apiCli.Organizations.CreateOrg(newOrgReq, authToken)
@ -306,6 +307,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(&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.")
@ -347,13 +349,17 @@ func formatOrganizations(orgs []params.Organization) {
return
}
t := table.NewWriter()
header := table.Row{"ID", "Name", "Endpoint", "Credentials name", "Pool Balancer Type", "Pool mgr running"}
header := table.Row{"ID", "Name", "Endpoint", "Credentials name", "Pool Balancer Type", "Forge type", "Pool mgr running"}
if long {
header = append(header, "Created At", "Updated At")
}
t.AppendHeader(header)
for _, val := range orgs {
row := table.Row{val.ID, val.Name, val.Endpoint.Name, val.CredentialsName, val.GetBalancerType(), val.PoolManagerStatus.IsRunning}
forgeType := val.Endpoint.EndpointType
if forgeType == "" {
forgeType = params.GithubEndpointType
}
row := table.Row{val.ID, val.Name, val.Endpoint.Name, val.CredentialsName, val.GetBalancerType(), forgeType, val.PoolManagerStatus.IsRunning}
if long {
row = append(row, val.CreatedAt, val.UpdatedAt)
}

4
cmd/garm/main.go
View file

@ -240,10 +240,10 @@ func main() {
cacheWorker := cache.NewWorker(ctx, db)
if err != nil {
log.Fatalf("failed to create credentials worker: %+v", err)
log.Fatalf("failed to create cache worker: %+v", err)
}
if err := cacheWorker.Start(); err != nil {
log.Fatalf("failed to start credentials worker: %+v", err)
log.Fatalf("failed to start cache worker: %+v", err)
}
providers, err := providers.LoadProvidersFromConfig(ctx, *cfg, controllerInfo.ControllerID.String())