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
3 changes: 3 additions & 0 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ archives:
- format: zip
name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"

artifacts:
- type: binary

checksum:
name_template: "checksums.txt"

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/cxpsemea/cx1e2e
go 1.23.0

require (
github.com/cxpsemea/Cx1ClientGo v0.1.12
github.com/cxpsemea/Cx1ClientGo v0.1.13
github.com/sirupsen/logrus v1.9.3
github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
gopkg.in/yaml.v2 v2.4.0
Expand All @@ -16,4 +16,4 @@ require (
golang.org/x/sys v0.32.0 // indirect
)

//replace github.com/cxpsemea/Cx1ClientGo v0.1.1-0.20250509073729-30f659e25f61 => c:/work/code/cx1clientgo
//replace github.com/cxpsemea/Cx1ClientGo v0.1.12 => c:/work/code/cx1clientgo
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/cxpsemea/Cx1ClientGo v0.1.12 h1:UHMdeef5BJUydr9yiP7wmG2ypzp1xdUcPDXGOac196o=
github.com/cxpsemea/Cx1ClientGo v0.1.12/go.mod h1:+kKg7wSFY2OfbdsgSVSUdIv5vhnxWTY9sDlWYWkb2cA=
github.com/cxpsemea/Cx1ClientGo v0.1.13 h1:MPXW8fgQZ0d6H4jfXDR9K7RjPPJ5PCoblJrH25BW144=
github.com/cxpsemea/Cx1ClientGo v0.1.13/go.mod h1:+kKg7wSFY2OfbdsgSVSUdIv5vhnxWTY9sDlWYWkb2cA=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down
21 changes: 14 additions & 7 deletions pkg/types/projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func (t *ProjectCRUD) RunRead(cx1client *Cx1ClientGo.Cx1Client, logger *ThreadLo

t.Project = &test_Project

if len(t.Applications) > 0 {
if len(t.Applications) > 0 && t.IsType(OP_READ) { // we only want to validate on read (read op can be called from update, which could be adding apps)
for _, appName := range t.Applications {
match := false
app, err := cx1client.GetApplicationByName(appName)
Expand Down Expand Up @@ -136,14 +136,21 @@ func (t *ProjectCRUD) RunUpdate(cx1client *Cx1ClientGo.Cx1Client, logger *Thread
}

if len(t.Applications) > 0 {
changed := false
for _, appName := range t.Applications {
app, err := cx1client.GetApplicationByName(appName)
if err != nil {
return err
}
app.AssignProject(t.Project)

err = cx1client.UpdateApplication(&app)
if !t.Project.IsInApplication(&app) {
t.Project.AssignApplication(&app)
changed = true
}

}
if changed {
err := cx1client.UpdateProject(t.Project)
if err != nil {
return err
}
Expand Down Expand Up @@ -179,25 +186,25 @@ func (t *ProjectCRUD) RunUpdate(cx1client *Cx1ClientGo.Cx1Client, logger *Thread
if len(t.Groups) > 0 || len(t.Project.Groups) > 0 {
group_ids := []string{}

diffGroups := false
changed := false
for _, g := range t.Groups {
group, err := cx1client.GetGroupByName(g)
if err != nil {
return err
}
group_ids = append(group_ids, group.GroupID)
if !slices.Contains(t.Project.Groups, group.GroupID) {
diffGroups = true
changed = true
}
}

for _, g := range t.Project.Groups {
if !slices.Contains(group_ids, g) {
diffGroups = true
changed = true
}
}

if diffGroups {
if changed {
t.Project.Groups = group_ids
if err := cx1client.UpdateProject(t.Project); err != nil {
return err
Expand Down
Loading