Skip to content

feat: Add categories to fleet-plan diff output #36

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
kc9wwh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Add categories to fleet-plan diff output #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 17 additions & 14 deletions internal/api/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,26 +150,29 @@ type TeamSoftware struct {
}

type TeamSoftwarePackage struct {
URL string `json:"url"`
HashSHA256 string `json:"hash_sha256"`
SelfService bool `json:"self_service"`
ReferencedYAMLPath string `json:"referenced_yaml_path"`
URL string `json:"url"`
HashSHA256 string `json:"hash_sha256"`
SelfService bool `json:"self_service"`
Categories []string `json:"categories"`
ReferencedYAMLPath string `json:"referenced_yaml_path"`
}

type TeamFleetApp struct {
Slug string `json:"slug"`
SelfService bool `json:"self_service"`
TitleID uint `json:"-"` // software title ID, for fetching detail
TeamID uint `json:"-"`
InstallScript string `json:"-"` // populated from title detail endpoint
UninstallScript string `json:"-"`
PreInstallQuery string `json:"-"`
PostInstallScript string `json:"-"`
Slug string `json:"slug"`
SelfService bool `json:"self_service"`
Categories []string `json:"categories"`
TitleID uint `json:"-"` // software title ID, for fetching detail
TeamID uint `json:"-"`
InstallScript string `json:"-"` // populated from title detail endpoint
UninstallScript string `json:"-"`
PreInstallQuery string `json:"-"`
PostInstallScript string `json:"-"`
}

type TeamAppStoreApp struct {
AppStoreID string `json:"app_store_id"`
SelfService bool `json:"self_service"`
AppStoreID string `json:"app_store_id"`
SelfService bool `json:"self_service"`
Categories []string `json:"categories"`
}

// FleetMaintainedApp is an entry from Fleet's maintained-app catalog.
Expand Down
115 changes: 96 additions & 19 deletions internal/diff/differ.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,11 @@ type ResourceChange struct {

// FieldDiff shows old vs new value for a single field.
type FieldDiff struct {
Old string
New string
Old string
New string
OldSlice []string // non-nil for slice-typed fields (used by JSON renderer)
NewSlice []string // non-nil for slice-typed fields (used by JSON renderer)
IsSlice bool // true when OldSlice/NewSlice should be used for JSON output
}

// LabelValidation reports label cross-reference status.
Expand Down Expand Up @@ -697,6 +700,40 @@ func diffQueries(current []api.Query, proposed []parser.ParsedQuery) ResourceDif
return diff
}

// categoriesEqual compares two category slices as sets (order-independent).
func categoriesEqual(a, b []string) bool {
if len(a) != len(b) {
return false
}
set := make(map[string]struct{}, len(a))
for _, v := range a {
set[v] = struct{}{}
}
for _, v := range b {
if _, ok := set[v]; !ok {
return false
}
}
return true
}

// sortedCategories returns a sorted copy of the slice.
func sortedCategories(cats []string) []string {
cp := make([]string, len(cats))
copy(cp, cats)
sort.Strings(cp)
return cp
}

// formatCategories returns a sorted display string like "[Browsers, Communication]".
func formatCategories(cats []string) string {
if len(cats) == 0 {
return "[]"
}
sorted := sortedCategories(cats)
return "[" + strings.Join(sorted, ", ") + "]"
}

func diffSoftware(current api.TeamSoftware, proposed parser.ParsedSoftware) ResourceDiff {
var rd ResourceDiff

Expand Down Expand Up @@ -736,6 +773,12 @@ func diffSoftware(current api.TeamSoftware, proposed parser.ParsedSoftware) Reso
if p.HashSHA256 != "" {
fields["hash_sha256"] = FieldDiff{New: p.HashSHA256}
}
if len(p.Categories) > 0 {
fields["categories"] = FieldDiff{
New: formatCategories(p.Categories), IsSlice: true,
NewSlice: sortedCategories(p.Categories),
}
}
rd.Added = append(rd.Added, ResourceChange{Name: parser.NormalizeSoftwarePath(key), Fields: fields})
continue
}
Expand All @@ -749,6 +792,12 @@ func diffSoftware(current api.TeamSoftware, proposed parser.ParsedSoftware) Reso
if cur.SelfService != p.SelfService {
fields["self_service"] = FieldDiff{Old: fmt.Sprint(cur.SelfService), New: fmt.Sprint(p.SelfService)}
}
if !categoriesEqual(cur.Categories, p.Categories) {
fields["categories"] = FieldDiff{
Old: formatCategories(cur.Categories), New: formatCategories(p.Categories),
IsSlice: true, OldSlice: sortedCategories(cur.Categories), NewSlice: sortedCategories(p.Categories),
}
}
if len(fields) > 0 {
rd.Modified = append(rd.Modified, ResourceChange{
Name: parser.NormalizeSoftwarePath(key),
Expand Down Expand Up @@ -781,12 +830,19 @@ func diffSoftware(current api.TeamSoftware, proposed parser.ParsedSoftware) Reso
for slug, a := range proposedFleet {
cur, exists := currentFleet[slug]
if !exists {
addedFields := map[string]FieldDiff{
"slug": {New: a.Slug},
"self_service": {New: fmt.Sprint(a.SelfService)},
}
if len(a.Categories) > 0 {
addedFields["categories"] = FieldDiff{
New: formatCategories(a.Categories), IsSlice: true,
NewSlice: sortedCategories(a.Categories),
}
}
rd.Added = append(rd.Added, ResourceChange{
Name: "fleet app " + slug,
Fields: map[string]FieldDiff{
"slug": {New: a.Slug},
"self_service": {New: fmt.Sprint(a.SelfService)},
},
Name: "fleet app " + slug,
Fields: addedFields,
})
continue
}
Expand All @@ -797,6 +853,12 @@ func diffSoftware(current api.TeamSoftware, proposed parser.ParsedSoftware) Reso
New: fmt.Sprint(a.SelfService),
}
}
if !categoriesEqual(cur.Categories, a.Categories) {
fields["categories"] = FieldDiff{
Old: formatCategories(cur.Categories), New: formatCategories(a.Categories),
IsSlice: true, OldSlice: sortedCategories(cur.Categories), NewSlice: sortedCategories(a.Categories),
}
}
for _, sc := range []struct {
name string
curVal string
Expand Down Expand Up @@ -846,24 +908,39 @@ func diffSoftware(current api.TeamSoftware, proposed parser.ParsedSoftware) Reso
for id, a := range proposedApps {
cur, exists := currentApps[id]
if !exists {
addedFields := map[string]FieldDiff{
"app_store_id": {New: a.AppStoreID},
"self_service": {New: fmt.Sprint(a.SelfService)},
}
if len(a.Categories) > 0 {
addedFields["categories"] = FieldDiff{
New: formatCategories(a.Categories), IsSlice: true,
NewSlice: sortedCategories(a.Categories),
}
}
rd.Added = append(rd.Added, ResourceChange{
Name: "app store app " + id,
Fields: map[string]FieldDiff{
"app_store_id": {New: a.AppStoreID},
"self_service": {New: fmt.Sprint(a.SelfService)},
},
Name: "app store app " + id,
Fields: addedFields,
})
continue
}
fields := make(map[string]FieldDiff)
if cur.SelfService != a.SelfService {
fields["self_service"] = FieldDiff{
Old: fmt.Sprint(cur.SelfService),
New: fmt.Sprint(a.SelfService),
}
}
if !categoriesEqual(cur.Categories, a.Categories) {
fields["categories"] = FieldDiff{
Old: formatCategories(cur.Categories), New: formatCategories(a.Categories),
IsSlice: true, OldSlice: sortedCategories(cur.Categories), NewSlice: sortedCategories(a.Categories),
}
}
if len(fields) > 0 {
rd.Modified = append(rd.Modified, ResourceChange{
Name: "app store app " + id,
Fields: map[string]FieldDiff{
"self_service": {
Old: fmt.Sprint(cur.SelfService),
New: fmt.Sprint(a.SelfService),
},
},
Name: "app store app " + id,
Fields: fields,
})
}
}
Expand Down
Loading
Loading