Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions internal/cmd/epic/create/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ func create(cmd *cobra.Command, _ []string) {
if projectType != jira.ProjectTypeNextGen {
cr.Name = params.name
}
cr.ForProjectType(projectType)
if configuredCustomFields, err := cmdcommon.GetConfiguredCustomFields(); err == nil {
cmdcommon.ValidateCustomFields(cr.CustomFields, configuredCustomFields)
cr.WithCustomFields(configuredCustomFields)
}

resp, err := client.CreateV2(&cr)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions internal/cmd/issue/create/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ func create(cmd *cobra.Command, _ []string) {
}
cr.ForProjectType(projectType)
if configuredCustomFields, err := cmdcommon.GetConfiguredCustomFields(); err == nil {
cmdcommon.ValidateCustomFields(cr.CustomFields, configuredCustomFields)
cr.WithCustomFields(configuredCustomFields)
}

Expand Down
1 change: 1 addition & 0 deletions internal/cmd/issue/edit/edit.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ func edit(cmd *cobra.Command, args []string) {
CustomFields: params.customFields,
}
if configuredCustomFields, err := cmdcommon.GetConfiguredCustomFields(); err == nil {
cmdcommon.ValidateCustomFields(edr.CustomFields, configuredCustomFields)
edr.WithCustomFields(configuredCustomFields)
}

Expand Down
33 changes: 33 additions & 0 deletions internal/cmdcommon/create.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package cmdcommon

import (
"strings"

"github.com/AlecAivazis/survey/v2"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/ankitpokhrel/jira-cli/internal/cmdutil"
"github.com/ankitpokhrel/jira-cli/pkg/jira"
)

Expand Down Expand Up @@ -124,3 +127,33 @@ func GetConfiguredCustomFields() ([]jira.IssueTypeField, error) {

return configuredFields, nil
}

// ValidateCustomFields validates custom fields.
// TODO: Fail with error instead of warning in future release.
func ValidateCustomFields(fields map[string]string, configuredFields []jira.IssueTypeField) {
if len(fields) == 0 {
return
}

fieldsMap := make(map[string]string)
for _, configured := range configuredFields {
identifier := strings.ReplaceAll(strings.ToLower(strings.TrimSpace(configured.Name)), " ", "-")
fieldsMap[identifier] = configured.Name
}

invalidCustomFields := make([]string, 0, len(fields))
for key := range fields {
if _, ok := fieldsMap[key]; !ok {
invalidCustomFields = append(invalidCustomFields, key)
}
}

if len(invalidCustomFields) > 0 {
cmdutil.Warn(`
Some custom fields are not configured and will be ignored. This will fail with error in the future release.
Please make sure that the passed custom fields are valid and configured accordingly in the config file.
Invalid custom fields used in the command: %s`,
strings.Join(invalidCustomFields, ", "),
)
}
}