Skip to content

Commit f6d3c86

Browse files
committed
cmd: Replace Labels with LabelOptions
The gitlab library is now using LabelOptions instead of Labels. Signed-off-by: Prarit Bhargava <prarit@redhat.com>
1 parent ea35870 commit f6d3c86

File tree

7 files changed

+11
-12
lines changed

7 files changed

+11
-12
lines changed

cmd/issue_create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ var issueCreateCmd = &cobra.Command{
6767
log.Fatal(err)
6868
}
6969

70-
labels, err := mapLabelsAsLabels(rn, labelTerms)
70+
labels, err := mapLabelsAsLabelOptions(rn, labelTerms)
7171
if err != nil {
7272
log.Fatal(err)
7373
}

cmd/issue_edit.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ var issueEditCmd = &cobra.Command{
101101
if err != nil {
102102
log.Fatal(err)
103103
}
104-
addLabels, err := mapLabelsAsLabels(rn, addLabelTerms)
104+
addLabels, err := mapLabelsAsLabelOptions(rn, addLabelTerms)
105105
if err != nil {
106106
log.Fatal(err)
107107
}
@@ -114,7 +114,7 @@ var issueEditCmd = &cobra.Command{
114114
if err != nil {
115115
log.Fatal(err)
116116
}
117-
rmLabels, err := mapLabelsAsLabels(rn, rmLabelTerms)
117+
rmLabels, err := mapLabelsAsLabelOptions(rn, rmLabelTerms)
118118
if err != nil {
119119
log.Fatal(err)
120120
}

cmd/issue_list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func issueList(args []string) ([]*gitlab.Issue, error) {
7171
}
7272
issueSearch = search
7373

74-
labels, err := mapLabelsAsLabels(rn, issueLabels)
74+
labels, err := mapLabelsAsLabelOptions(rn, issueLabels)
7575
if err != nil {
7676
return nil, err
7777
}

cmd/mr_create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ func runMRCreate(cmd *cobra.Command, args []string) {
218218
if err != nil {
219219
log.Fatal(err)
220220
}
221-
labels, err := mapLabelsAsLabels(targetProjectName, labelTerms)
221+
labels, err := mapLabelsAsLabelOptions(targetProjectName, labelTerms)
222222
if err != nil {
223223
log.Fatal(err)
224224
}

cmd/mr_edit.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ var mrEditCmd = &cobra.Command{
105105
if err != nil {
106106
log.Fatal(err)
107107
}
108-
addLabels, err := mapLabelsAsLabels(rn, addLabelTerms)
108+
addLabels, err := mapLabelsAsLabelOptions(rn, addLabelTerms)
109109
if err != nil {
110110
log.Fatal(err)
111111
}
@@ -118,7 +118,7 @@ var mrEditCmd = &cobra.Command{
118118
if err != nil {
119119
log.Fatal(err)
120120
}
121-
rmLabels, err := mapLabelsAsLabels(rn, rmLabelTerms)
121+
rmLabels, err := mapLabelsAsLabelOptions(rn, rmLabelTerms)
122122
if err != nil {
123123
log.Fatal(err)
124124
}

cmd/mr_list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func mrList(args []string) ([]*gitlab.MergeRequest, error) {
8585
return nil, err
8686
}
8787

88-
labels, err := mapLabelsAsLabels(rn, mrLabels)
88+
labels, err := mapLabelsAsLabelOptions(rn, mrLabels)
8989
if err != nil {
9090
return nil, err
9191
}

cmd/util.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -709,17 +709,16 @@ func mapLabelsAsStrings(rn string, labelTerms []string) ([]string, error) {
709709
return matches, nil
710710
}
711711

712-
// malLabelsAsLabels returns a list of labels as gitlab.Labels
713-
func mapLabelsAsLabels(rn string, labelTerms []string) (gitlab.Labels, error) {
712+
// malLabelsAsLabels returns a list of labels as gitlab.LabelOptions
713+
func mapLabelsAsLabelOptions(rn string, labelTerms []string) (gitlab.LabelOptions, error) {
714714

715715
matches, err := mapLabelsAsStrings(rn, labelTerms)
716716
if err != nil {
717717
return nil, err
718718
}
719719

720-
return gitlab.Labels(matches), nil
720+
return gitlab.LabelOptions(matches), nil
721721
}
722-
723722
// dumpToken dumps information about a specific Personal Access Token
724723
func dumpToken(tokendata *gitlab.PersonalAccessToken) {
725724
fmt.Println("ID: ", tokendata.ID)

0 commit comments

Comments
 (0)