Skip to content

Commit 0cc3040

Browse files
committed
Add group and states flags
1 parent 3a77bb3 commit 0cc3040

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

cmd/updates.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ var (
4646
justSearch bool
4747
thisMU string
4848
cleanup bool
49+
group string
50+
states string
4951
)
5052

5153
func init() {
@@ -55,6 +57,8 @@ func init() {
5557
updateCmd.Flags().BoolVarP(&justSearch, "search", "s", false, "flag that would trigger only looking for updates on the Build Service")
5658
updateCmd.Flags().StringVarP(&thisMU, "maintupdate", "m", "", "flag that consumes the name of an MU, like 'SUSE:Maintenance:Incident:ReleaseRequest'")
5759
updateCmd.Flags().BoolVarP(&cleanup, "cleanup", "k", false, "flag that triggers cleaning up the storage (from old MU channels)")
60+
updateCmd.Flags().StringVarP(&group, "group", "g", "", "flag that applies a filter by group")
61+
updateCmd.Flags().StringVarP(&states, "states", "t", "new,review", "flag that applies a filter by state, multiple states must be separated by a comma (default 'new,review')")
5862
}
5963

6064
func muFindAndSync() {
@@ -73,7 +77,7 @@ func muFindAndSync() {
7377
if cleanup {
7478
// DO CLEANUP - TO BE IMPLEMENTED
7579
log.Println("searching for outdated MU repos...")
76-
updateList, err := client.GetUpdatesAndChannels(true)
80+
updateList, err := client.GetUpdatesAndChannels(group, states, true)
7781
if err != nil {
7882
log.Fatalf("Error searching for outdated MUs repos: %v", err)
7983
}
@@ -85,7 +89,7 @@ func muFindAndSync() {
8589
log.Println("...done!")
8690
} else {
8791
if thisMU == "" {
88-
updateList, err := client.GetUpdatesAndChannels(justSearch)
92+
updateList, err := client.GetUpdatesAndChannels(group, states, justSearch)
8993
if err != nil {
9094
log.Fatalf("Error finding updates and channels: %v", err)
9195
}

maint/client.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ func (c *BuildServiceClient) GetPatchinfo(rr ReleaseRequest) (*Patchinfo, error)
133133
return &patchinfo, err
134134
}
135135

136-
func (c *BuildServiceClient) GetUpdatesAndChannels(justsearch bool) ([]Updates, error) {
137-
rrs, err := c.GetReleaseRequests("qam-manager", "new,review")
136+
func (c *BuildServiceClient) GetUpdatesAndChannels(group, states string, justsearch bool) ([]Updates, error) {
137+
rrs, err := c.GetReleaseRequests(group, states)
138138
if err != nil {
139139
return nil, fmt.Errorf("error while getting response from obs: %v", err)
140140
}
@@ -177,7 +177,12 @@ func (c *BuildServiceClient) RemoveOldChannels(config storage.StorageConfig, upd
177177
case "file":
178178
var muChannelList []string
179179

180-
err := filepath.Walk(filepath.Join(config.Path, "ibs/SUSE:/Maintenance:/"), func(path string, info os.FileInfo, err error) error {
180+
downloadURL, err := url.Parse(c.downloadLink)
181+
if err != nil {
182+
return err
183+
}
184+
185+
err = filepath.Walk(filepath.Join(config.Path, downloadURL.Path[1:]), func(path string, info os.FileInfo, err error) error {
181186
if info.IsDir() {
182187
muChannelList = append(muChannelList, path)
183188
}

0 commit comments

Comments
 (0)