diff --git a/cmd/garm-cli/cmd/credentials.go b/cmd/garm-cli/cmd/credentials.go index ec73c95f..d8011ea9 100644 --- a/cmd/garm-cli/cmd/credentials.go +++ b/cmd/garm-cli/cmd/credentials.go @@ -34,7 +34,7 @@ config file. Currently, github personal tokens are configured statically in the config file of the garm service. This command lists the names of those credentials, -which in turn can be used to define pools of runners withing repositories.`, +which in turn can be used to define pools of runners within repositories.`, Run: nil, } @@ -44,7 +44,7 @@ func init() { Use: "list", Aliases: []string{"ls"}, Short: "List configured github credentials", - Long: `List the names of the github personal access tokens availabe to the garm.`, + Long: `List the names of the github personal access tokens available to the garm.`, SilenceUsage: true, RunE: func(cmd *cobra.Command, args []string) error { if needsInit { diff --git a/cmd/garm-cli/cmd/pool.go b/cmd/garm-cli/cmd/pool.go index 4820cabd..655da267 100644 --- a/cmd/garm-cli/cmd/pool.go +++ b/cmd/garm-cli/cmd/pool.go @@ -381,8 +381,8 @@ explicitly remove them using the runner delete command. func init() { poolListCmd.Flags().StringVarP(&poolRepository, "repo", "r", "", "List all pools within this repository.") - poolListCmd.Flags().StringVarP(&poolOrganization, "org", "o", "", "List all pools withing this organization.") - poolListCmd.Flags().StringVarP(&poolEnterprise, "enterprise", "e", "", "List all pools withing this enterprise.") + poolListCmd.Flags().StringVarP(&poolOrganization, "org", "o", "", "List all pools within this organization.") + poolListCmd.Flags().StringVarP(&poolEnterprise, "enterprise", "e", "", "List all pools within this enterprise.") poolListCmd.Flags().BoolVarP(&poolAll, "all", "a", false, "List all pools, regardless of org or repo.") poolListCmd.MarkFlagsMutuallyExclusive("repo", "org", "all", "enterprise") @@ -421,8 +421,8 @@ func init() { poolAddCmd.MarkFlagRequired("tags") //nolint poolAddCmd.Flags().StringVarP(&poolRepository, "repo", "r", "", "Add the new pool within this repository.") - poolAddCmd.Flags().StringVarP(&poolOrganization, "org", "o", "", "Add the new pool withing this organization.") - poolAddCmd.Flags().StringVarP(&poolEnterprise, "enterprise", "e", "", "Add the new pool withing this enterprise.") + poolAddCmd.Flags().StringVarP(&poolOrganization, "org", "o", "", "Add the new pool within this organization.") + poolAddCmd.Flags().StringVarP(&poolEnterprise, "enterprise", "e", "", "Add the new pool within this enterprise.") poolAddCmd.MarkFlagsMutuallyExclusive("repo", "org", "enterprise") poolAddCmd.MarkFlagsMutuallyExclusive("extra-specs-file", "extra-specs") diff --git a/cmd/garm-cli/cmd/repository.go b/cmd/garm-cli/cmd/repository.go index 077416e4..ecf99d02 100644 --- a/cmd/garm-cli/cmd/repository.go +++ b/cmd/garm-cli/cmd/repository.go @@ -200,7 +200,7 @@ var repoListCmd = &cobra.Command{ Use: "list", Aliases: []string{"ls"}, Short: "List repositories", - Long: `List all configured respositories that are currently managed.`, + Long: `List all configured repositories that are currently managed.`, SilenceUsage: true, RunE: func(cmd *cobra.Command, args []string) error { if needsInit { diff --git a/cmd/garm-cli/cmd/runner.go b/cmd/garm-cli/cmd/runner.go index 5b7d07c5..f9cf010d 100644 --- a/cmd/garm-cli/cmd/runner.go +++ b/cmd/garm-cli/cmd/runner.go @@ -199,8 +199,8 @@ to either cancel the workflow or wait for it to finish. func init() { runnerListCmd.Flags().StringVarP(&runnerRepository, "repo", "r", "", "List all runners from all pools within this repository.") - runnerListCmd.Flags().StringVarP(&runnerOrganization, "org", "o", "", "List all runners from all pools withing this organization.") - runnerListCmd.Flags().StringVarP(&runnerEnterprise, "enterprise", "e", "", "List all runners from all pools withing this enterprise.") + runnerListCmd.Flags().StringVarP(&runnerOrganization, "org", "o", "", "List all runners from all pools within this organization.") + runnerListCmd.Flags().StringVarP(&runnerEnterprise, "enterprise", "e", "", "List all runners from all pools within this enterprise.") runnerListCmd.Flags().BoolVarP(&runnerAll, "all", "a", false, "List all runners, regardless of org or repo.") runnerListCmd.MarkFlagsMutuallyExclusive("repo", "org", "enterprise", "all") diff --git a/runner/common/pool.go b/runner/common/pool.go index 47655414..92696291 100644 --- a/runner/common/pool.go +++ b/runner/common/pool.go @@ -61,7 +61,7 @@ type PoolManager interface { ForceDeleteRunner(runner params.Instance) error // DeleteRunner will attempt to remove a runner from the pool. If forceRemove is true, any error - // received from the provider will be ignored and we will procede to remove the runner from the database. + // received from the provider will be ignored and we will proceed to remove the runner from the database. // An error received while attempting to remove from GitHub (other than 404) will still stop the deletion // process. This can happen if the runner is already processing a job. At which point, you can simply cancel // the job in github. Doing so will prompt GARM to reap the runner automatically. diff --git a/runner/pool/pool.go b/runner/pool/pool.go index 8e69ff03..8643447f 100644 --- a/runner/pool/pool.go +++ b/runner/pool/pool.go @@ -645,7 +645,7 @@ func (r *basePoolManager) cleanupOrphanedGithubRunners(runners []*github.Runner) // Removed in the meantime? if resp != nil && resp.StatusCode == http.StatusNotFound { slog.DebugContext( - r.ctx, "runner dissapeared from github", + r.ctx, "runner disappeared from github", "runner_name", dbInstance.Name) } else { return errors.Wrap(err, "removing runner from github")