Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 32

Add integration test of batch-setting with self-service

Browse source
This commit is contained in:
Martin Angers 2024-06-05 15:44:02 -04:00
parent d65f59ed84
commit e6de0dcebd
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
server/datastore/mysql/software_installers.go
View file

@ -469,9 +469,10 @@ INSERT INTO software_installers (
pre_install_query, pre_install_query,
post_install_script_content_id, post_install_script_content_id,
platform, platform,
self_service,
title_id title_id
) VALUES ( ) VALUES (
?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
(SELECT id FROM software_titles WHERE name = ? AND source = ? AND browser = '') (SELECT id FROM software_titles WHERE name = ? AND source = ? AND browser = '')
) )
ON DUPLICATE KEY UPDATE ON DUPLICATE KEY UPDATE
@ -481,7 +482,8 @@ ON DUPLICATE KEY UPDATE
filename = VALUES(filename), filename = VALUES(filename),
version = VALUES(version), version = VALUES(version),
pre_install_query = VALUES(pre_install_query), pre_install_query = VALUES(pre_install_query),
platform = VALUES(platform) platform = VALUES(platform),
self_service = VALUES(self_service)
` `
// use a team id of 0 if no-team // use a team id of 0 if no-team
@ -552,6 +554,7 @@ ON DUPLICATE KEY UPDATE
installer.PreInstallQuery, installer.PreInstallQuery,
postInstallScriptID, postInstallScriptID,
installer.Platform, installer.Platform,
installer.SelfService,
installer.Title, installer.Title,
installer.Source, installer.Source,
} }

10
server/service/integration_enterprise_test.go
View file

@ -9555,7 +9555,7 @@ func (s *integrationEnterpriseTestSuite) TestApplyTeamsSoftwareConfig() {
require.Empty(t, teamResp.Team.Config.Software.Value) require.Empty(t, teamResp.Team.Config.Software.Value)
} }
func (s *integrationMDMTestSuite) TestBatchSetSoftwareInstallers() { func (s *integrationEnterpriseTestSuite) TestBatchSetSoftwareInstallers() {
t := s.T() t := s.T()
// a team name is required (we don't allow installers for "no team") // a team name is required (we don't allow installers for "no team")
@ -9620,6 +9620,14 @@ func (s *integrationMDMTestSuite) TestBatchSetSoftwareInstallers() {
s.DoJSON("GET", "/api/v1/fleet/software/titles", nil, http.StatusOK, &newTitlesResp, "available_for_install", "true", "team_id", strconv.Itoa(int(tm.ID))) s.DoJSON("GET", "/api/v1/fleet/software/titles", nil, http.StatusOK, &newTitlesResp, "available_for_install", "true", "team_id", strconv.Itoa(int(tm.ID)))
require.Equal(t, titlesResp, newTitlesResp) require.Equal(t, titlesResp, newTitlesResp)
// setting self-service to true updates the software title metadata
softwareToInstall[0].SelfService = true
s.Do("POST", "/api/latest/fleet/software/batch", batchSetSoftwareInstallersRequest{Software: softwareToInstall}, http.StatusNoContent, "team_name", tm.Name)
newTitlesResp = listSoftwareTitlesResponse{}
s.DoJSON("GET", "/api/v1/fleet/software/titles", nil, http.StatusOK, &newTitlesResp, "available_for_install", "true", "team_id", strconv.Itoa(int(tm.ID)))
titlesResp.SoftwareTitles[0].SelfService = true
require.Equal(t, titlesResp, newTitlesResp)
// empty payload cleans the software items // empty payload cleans the software items
softwareToInstall = []fleet.SoftwareInstallerPayload{} softwareToInstall = []fleet.SoftwareInstallerPayload{}
s.Do("POST", "/api/latest/fleet/software/batch", batchSetSoftwareInstallersRequest{Software: softwareToInstall}, http.StatusNoContent, "team_name", tm.Name) s.Do("POST", "/api/latest/fleet/software/batch", batchSetSoftwareInstallersRequest{Software: softwareToInstall}, http.StatusNoContent, "team_name", tm.Name)