Skip to content

Convert flags public #1507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
attiasas wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Convert flags public #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2b44a0
Make ConvertFlags func public
attiasas Dec 15, 2025
480d59f
format
attiasas Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/commands/metrics_collector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func TestDetectCISystem(t *testing.T) {
}

// Restore environment after test
defer func() {
defer func() {
for envVar, value := range originalEnv {
if value != "" {
if err := os.Setenv(envVar, value); err != nil {
Expand Down Expand Up @@ -219,7 +219,7 @@ func TestDetectCISystem(t *testing.T) {
{"No CI", "", "", ""},
}

for _, tt := range tests {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
// Clear all CI environment variables
for _, envVar := range ciEnvVars {
Expand Down
6 changes: 3 additions & 3 deletions common/spec/specfiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ type File struct {
TargetPathInArchive string
Include []string `json:"include,omitempty"`
Package string `json:"package,omitempty"`
Version string `json:"version,omitempty"`
Type string `json:"type,omitempty"`
RepoKey string `json:"repoKey,omitempty"`
Version string `json:"version,omitempty"`
Type string `json:"type,omitempty"`
RepoKey string `json:"repoKey,omitempty"`
}

func (f File) GetInclude() []string {
Expand Down
8 changes: 4 additions & 4 deletions plugins/components/conversionlayer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func convertCommands(commands []Command, nameSpaces ...string) ([]cli.Command, e
}

func convertCommand(cmd Command, namespaces ...string) (cli.Command, error) {
convertedFlags, convertedStringFlags, err := convertFlags(cmd)
convertedFlags, convertedStringFlags, err := ConvertFlags(cmd.Name, cmd.Flags)
if err != nil {
return cli.Command{}, err
}
Expand Down Expand Up @@ -309,13 +309,13 @@ func createEnvVarsSummary(cmd Command) string {
return strings.Join(envVarsSummary, "\n")
}

func convertFlags(cmd Command) ([]cli.Flag, map[string]StringFlag, error) {
func ConvertFlags(cmdName string, flags []Flag) ([]cli.Flag, map[string]StringFlag, error) {
var convertedFlags []cli.Flag
convertedStringFlags := map[string]StringFlag{}
for _, flag := range cmd.Flags {
for _, flag := range flags {
converted, convertedString, err := convertByType(flag)
if err != nil {
return convertedFlags, convertedStringFlags, fmt.Errorf("command '%s': %w", cmd.Name, err)
return convertedFlags, convertedStringFlags, fmt.Errorf("command '%s': %w", cmdName, err)
}
if converted != nil {
convertedFlags = append(convertedFlags, converted)
Expand Down
Loading