Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

Fix all software titles test

Browse source
This commit is contained in:
Martin Angers 2024-05-29 16:47:23 -04:00
parent 3e2f5e97e5
commit 23f06e38fd
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/datastore/mysql/software_titles.go
View file

@ -213,7 +213,7 @@ LEFT JOIN software_titles_host_counts sthc ON sthc.software_title_id = st.id AND
WHERE %s
-- placeholder for filter based on software installed on hosts + software installers
AND (%s)
GROUP BY st.id, software_package, si.self_service`
GROUP BY st.id, software_package, self_service`
cveJoinType := "LEFT"
if opt.VulnerableOnly {

22
server/service/integration_enterprise_test.go
View file

@ -7666,13 +7666,13 @@ func (s *integrationEnterpriseTestSuite) TestAllSoftwareTitles() {
)
// verify that software installers contain SoftwarePackage field
payload := &fleet.UploadSoftwareInstallerPayload{
payloadRubyTm1 := &fleet.UploadSoftwareInstallerPayload{
InstallScript: "install",
Filename: "ruby.deb",
SelfService: false,
TeamID: &team1.ID,
}
s.uploadSoftwareInstaller(payload, http.StatusOK, "")
s.uploadSoftwareInstaller(payloadRubyTm1, http.StatusOK, "")
payloadEmacs := &fleet.UploadSoftwareInstallerPayload{
InstallScript: "install",
@ -7695,15 +7695,14 @@ func (s *integrationEnterpriseTestSuite) TestAllSoftwareTitles() {
require.Equal(t, "ruby.deb", *resp.SoftwareTitles[0].SoftwarePackage)
// Upload an installer for the same software but different arch to a different team
payload = &fleet.UploadSoftwareInstallerPayload{
payloadRubyTm2 := &fleet.UploadSoftwareInstallerPayload{
InstallScript: "install",
Filename: "ruby_arm64.deb",
TeamID: &team2.ID,
}
s.uploadSoftwareInstaller(payload, http.StatusOK, "")
s.uploadSoftwareInstaller(payloadRubyTm2, http.StatusOK, "")
// We should only see the one we uploaded to team 1
resp = listSoftwareTitlesResponse{}
s.DoJSON(
"GET", "/api/latest/fleet/software/titles",
@ -7718,21 +7717,24 @@ func (s *integrationEnterpriseTestSuite) TestAllSoftwareTitles() {
// software installer not returned with self-service only (not marked as such)
resp = listSoftwareTitlesResponse{}
s.DoJSON("GET", "/api/latest/fleet/software/titles", listSoftwareTitlesRequest{}, http.StatusOK, &resp, "self_service", "1", "query", "ruby")
s.DoJSON("GET", "/api/latest/fleet/software/titles", listSoftwareTitlesRequest{}, http.StatusOK, &resp,
"self_service", "1", "query", "ruby", "team_id", fmt.Sprint(team1.ID))
require.Len(t, resp.SoftwareTitles, 0)
// update it to be self-service, check that it gets returned
mysql.ExecAdhocSQL(t, s.ds, func(tx sqlx.ExtContext) error {
_, err := tx.ExecContext(ctx, "UPDATE software_installers SET self_service = 1 WHERE filename = ?", payload.Filename)
_, err := tx.ExecContext(ctx, "UPDATE software_installers SET self_service = 1 WHERE filename = ?", payloadRubyTm1.Filename)
return err
})
resp = listSoftwareTitlesResponse{}
s.DoJSON("GET", "/api/latest/fleet/software/titles", listSoftwareTitlesRequest{}, http.StatusOK, &resp, "self_service", "1", "query", "ruby")
s.DoJSON("GET", "/api/latest/fleet/software/titles", listSoftwareTitlesRequest{}, http.StatusOK, &resp,
"self_service", "1", "query", "ruby", "team_id", fmt.Sprint(team1.ID))
require.Len(t, resp.SoftwareTitles, 1)
require.NotNil(t, resp.SoftwareTitles[0].SoftwarePackage)
require.Equal(t, "ruby.deb", *resp.SoftwareTitles[0].SoftwarePackage)
require.True(t, *&resp.SoftwareTitles[0].SelfService)
// no team but self-service returns the emacs software (technically impossible via the UI)
resp = listSoftwareTitlesResponse{}
s.DoJSON(
"GET", "/api/latest/fleet/software/titles",
@ -7741,7 +7743,7 @@ func (s *integrationEnterpriseTestSuite) TestAllSoftwareTitles() {
"self_service", "true",
)
require.Len(t, resp.SoftwareTitles, 2)
require.Len(t, resp.SoftwareTitles, 1)
require.NotNil(t, resp.SoftwareTitles[0].SoftwarePackage)
require.Equal(t, "emacs.deb", *resp.SoftwareTitles[0].SoftwarePackage)
require.True(t, *&resp.SoftwareTitles[0].SelfService)
@ -7752,9 +7754,7 @@ func (s *integrationEnterpriseTestSuite) TestAllSoftwareTitles() {
require.NotNil(t, respTitle.SoftwareTitle)
require.Equal(t, "emacs.deb", respTitle.SoftwareTitle.SoftwarePackage.Name)
fmt.Printf("respTitle.SoftwareTitle.SoftwarePackage: %+v\n", respTitle.SoftwareTitle.SoftwarePackage)
require.True(t, respTitle.SoftwareTitle.SoftwarePackage.SelfService)
}
func (s *integrationEnterpriseTestSuite) TestLockUnlockWipeWindowsLinux() {