mirror of
https://gitea.com/gitea/tea.git
synced 2026-02-22 06:13:32 +01:00
Code Cleanup (#869)
- switch to golangci-lint for linting - switch to gofmpt for formatting - fix lint and fmt issues that came up from switch to new tools - upgrade go-sdk to 0.23.2 - support pagination for listing tracked times - remove `FixPullHeadSha` workaround (upstream fix has been merged for 5+ years at this point) - standardize on US spelling (previously a mix of US&UK spelling) - remove some unused code - reduce some duplication in parsing state and issue type - reduce some duplication in reading input for secrets and variables - reduce some duplication with PR Review code - report error for when yaml parsing fails - various other misc cleanup Reviewed-on: https://gitea.com/gitea/tea/pulls/869 Co-authored-by: techknowlogick <techknowlogick@gitea.com> Co-committed-by: techknowlogick <techknowlogick@gitea.com>
This commit is contained in:
committed by
techknowlogick
parent
ae740a66e8
commit
20da414145
@@ -6,17 +6,13 @@ package secrets
|
||||
import (
|
||||
stdctx "context"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
"code.gitea.io/tea/cmd/flags"
|
||||
"code.gitea.io/tea/modules/context"
|
||||
"code.gitea.io/tea/modules/utils"
|
||||
|
||||
"code.gitea.io/sdk/gitea"
|
||||
"github.com/urfave/cli/v3"
|
||||
"golang.org/x/term"
|
||||
)
|
||||
|
||||
// CmdSecretsCreate represents a sub command to create action secrets
|
||||
@@ -48,42 +44,19 @@ func runSecretsCreate(ctx stdctx.Context, cmd *cli.Command) error {
|
||||
client := c.Login.Client()
|
||||
|
||||
secretName := cmd.Args().First()
|
||||
var secretValue string
|
||||
|
||||
// Determine how to get the secret value
|
||||
if cmd.String("file") != "" {
|
||||
// Read from file
|
||||
content, err := os.ReadFile(cmd.String("file"))
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read file: %w", err)
|
||||
}
|
||||
secretValue = strings.TrimSpace(string(content))
|
||||
} else if cmd.Bool("stdin") {
|
||||
// Read from stdin
|
||||
content, err := io.ReadAll(os.Stdin)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read from stdin: %w", err)
|
||||
}
|
||||
secretValue = strings.TrimSpace(string(content))
|
||||
} else if cmd.Args().Len() >= 2 {
|
||||
// Use provided argument
|
||||
secretValue = cmd.Args().Get(1)
|
||||
} else {
|
||||
// Interactive prompt (hidden input)
|
||||
fmt.Printf("Enter secret value for '%s': ", secretName)
|
||||
byteValue, err := term.ReadPassword(int(syscall.Stdin))
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read secret value: %w", err)
|
||||
}
|
||||
fmt.Println() // Add newline after hidden input
|
||||
secretValue = string(byteValue)
|
||||
// Read secret value using the utility
|
||||
secretValue, err := utils.ReadValue(cmd, utils.ReadValueOptions{
|
||||
ResourceName: "secret",
|
||||
PromptMsg: fmt.Sprintf("Enter secret value for '%s'", secretName),
|
||||
Hidden: true,
|
||||
AllowEmpty: false,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if secretValue == "" {
|
||||
return fmt.Errorf("secret value cannot be empty")
|
||||
}
|
||||
|
||||
_, err := client.CreateRepoActionSecret(c.Owner, c.Repo, gitea.CreateSecretOption{
|
||||
_, err = client.CreateRepoActionSecret(c.Owner, c.Repo, gitea.CreateSecretOption{
|
||||
Name: secretName,
|
||||
Data: secretValue,
|
||||
})
|
||||
|
||||
@@ -45,7 +45,7 @@ func runSecretsDelete(ctx stdctx.Context, cmd *cli.Command) error {
|
||||
var response string
|
||||
fmt.Scanln(&response)
|
||||
if response != "y" && response != "Y" && response != "yes" {
|
||||
fmt.Println("Deletion cancelled.")
|
||||
fmt.Println("Deletion canceled.")
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ func runVariablesDelete(ctx stdctx.Context, cmd *cli.Command) error {
|
||||
var response string
|
||||
fmt.Scanln(&response)
|
||||
if response != "y" && response != "Y" && response != "yes" {
|
||||
fmt.Println("Deletion cancelled.")
|
||||
fmt.Println("Deletion canceled.")
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,13 +6,11 @@ package variables
|
||||
import (
|
||||
stdctx "context"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"code.gitea.io/tea/cmd/flags"
|
||||
"code.gitea.io/tea/modules/context"
|
||||
"code.gitea.io/tea/modules/utils"
|
||||
|
||||
"github.com/urfave/cli/v3"
|
||||
)
|
||||
@@ -46,39 +44,26 @@ func runVariablesSet(ctx stdctx.Context, cmd *cli.Command) error {
|
||||
client := c.Login.Client()
|
||||
|
||||
variableName := cmd.Args().First()
|
||||
var variableValue string
|
||||
|
||||
// Determine how to get the variable value
|
||||
if cmd.String("file") != "" {
|
||||
// Read from file
|
||||
content, err := os.ReadFile(cmd.String("file"))
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read file: %w", err)
|
||||
}
|
||||
variableValue = strings.TrimSpace(string(content))
|
||||
} else if cmd.Bool("stdin") {
|
||||
// Read from stdin
|
||||
content, err := io.ReadAll(os.Stdin)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read from stdin: %w", err)
|
||||
}
|
||||
variableValue = strings.TrimSpace(string(content))
|
||||
} else if cmd.Args().Len() >= 2 {
|
||||
// Use provided argument
|
||||
variableValue = cmd.Args().Get(1)
|
||||
} else {
|
||||
// Interactive prompt
|
||||
fmt.Printf("Enter variable value for '%s': ", variableName)
|
||||
var input string
|
||||
fmt.Scanln(&input)
|
||||
variableValue = input
|
||||
if err := validateVariableName(variableName); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if variableValue == "" {
|
||||
return fmt.Errorf("variable value cannot be empty")
|
||||
// Read variable value using the utility
|
||||
variableValue, err := utils.ReadValue(cmd, utils.ReadValueOptions{
|
||||
ResourceName: "variable",
|
||||
PromptMsg: fmt.Sprintf("Enter variable value for '%s'", variableName),
|
||||
Hidden: false,
|
||||
AllowEmpty: false,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err := client.CreateRepoActionVariable(c.Owner, c.Repo, variableName, variableValue)
|
||||
if err := validateVariableValue(variableValue); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = client.CreateRepoActionVariable(c.Owner, c.Repo, variableName, variableValue)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user