Add remaining data store tests for VPP automation

Author: iansltx

server/datastore/mysql/software_titles_test.go

@@ -1023,12 +1023,22 @@ func testListSoftwareTitlesAvailableForInstallFilter(t *testing.T, ds *Datastore
 		VPPAppTeam: fleet.VPPAppTeam{VPPAppID: fleet.VPPAppID{AdamID: "adam_vpp_app_2", Platform: fleet.MacOSPlatform}},
 	}, nil)
 	require.NoError(t, err)
-	_, err = ds.InsertVPPAppWithTeam(ctx, &fleet.VPPApp{
+	vpp2, err := ds.InsertVPPAppWithTeam(ctx, &fleet.VPPApp{
 		Name: "vpp2", BundleIdentifier: "com.example.vpp2",
 		VPPAppTeam: fleet.VPPAppTeam{VPPAppID: fleet.VPPAppID{AdamID: "adam_vpp_app_2", Platform: fleet.IOSPlatform}},
 	}, nil)
 	require.NoError(t, err)
 
+	// insert a policy referring to one of the VPP apps
+	vpp2Meta, err := ds.GetVPPAppMetadataByTeamAndTitleID(ctx, ptr.Uint(0), vpp2.TitleID)
+	require.NoError(t, err)
+	vppPolicy, err := ds.NewTeamPolicy(ctx, fleet.PolicyNoTeamID, nil, fleet.PolicyPayload{
+		Name:           "VPP Policy",
+		Query:          "SELECT 1;",
+		VPPAppsTeamsID: &vpp2Meta.VPPAppsTeamsID,
+	})
+	require.NoError(t, err)
+
 	host := test.NewHost(t, ds, "host", "", "hostkey", "hostuuid", time.Now())
 	software := []fleet.Software{
 		{Name: "foo", Version: "0.0.1", Source: "chrome_extensions"},
@@ -1065,6 +1075,11 @@ func testListSoftwareTitlesAvailableForInstallFilter(t *testing.T, ds *Datastore
 	names := make([]nameSource, 0, len(titles))
 	for _, title := range titles {
 		names = append(names, nameSource{name: title.Name, source: title.Source})
+		if title.ID == vpp2.TitleID {
+			assert.Len(t, title.AppStoreApp.AutomaticInstallPolicies, 1)
+			assert.Equal(t, title.AppStoreApp.AutomaticInstallPolicies[0].Name, "VPP Policy")
+			assert.Equal(t, title.AppStoreApp.AutomaticInstallPolicies[0].ID, vppPolicy.ID)
+		}
 	}
 	assert.ElementsMatch(t, []nameSource{
 		{name: "bar", source: "deb_packages"},

server/datastore/mysql/vpp_test.go

@@ -919,7 +919,21 @@ func testVPPTokensCRUD(t *testing.T, ds *Datastore) {
 	assert.Equal(t, team.ID, teamTok.Teams[0].ID)
 	assert.Equal(t, team.Name, teamTok.Teams[0].Name)
 
-	// TODO make sure policies are unaffected
+	// make sure renewing a VPP token doesn't affect associated VPP install automations
+	t1app, err := ds.InsertVPPAppWithTeam(ctx, &fleet.VPPApp{
+		Name: "vpp1", BundleIdentifier: "com.app.vpp1",
+		VPPAppTeam: fleet.VPPAppTeam{VPPAppID: fleet.VPPAppID{AdamID: "adam_vpp_app_1", Platform: fleet.MacOSPlatform}},
+	}, &team.ID)
+	require.NoError(t, err)
+	t1meta, err := ds.GetVPPAppMetadataByTeamAndTitleID(ctx, &team.ID, t1app.TitleID)
+	require.NoError(t, err)
+
+	t1Policy, err := ds.NewTeamPolicy(ctx, team.ID, nil, fleet.PolicyPayload{
+		Name:           "p1",
+		Query:          "SELECT 1;",
+		VPPAppsTeamsID: &t1meta.VPPAppsTeamsID,
+	})
+	require.NoError(t, err)
 
 	// Renew flow
 	upTok, err = ds.UpdateVPPToken(ctx, tokID, dataToken6)
@@ -934,6 +948,10 @@ func testVPPTokensCRUD(t *testing.T, ds *Datastore) {
 	assert.Equal(t, team.ID, upTok.Teams[0].ID)
 	assert.Equal(t, team.Name, upTok.Teams[0].Name)
 
+	t1Policy, err = ds.Policy(ctx, t1Policy.ID)
+	require.NoError(t, err)
+	require.Equal(t, t1Policy.VPPAppsTeamsID, &t1meta.VPPAppsTeamsID)
+
 	tok, err = ds.GetVPPToken(ctx, tok.ID)
 	assert.NoError(t, err)
 	assert.Equal(t, tokID, tok.ID)
@@ -1112,16 +1130,16 @@ func testVPPTokensCRUD(t *testing.T, ds *Datastore) {
 	////
 
 	// make sure deleting a VPP token auto-clears associated VPP install automations
-	t1app, err := ds.InsertVPPAppWithTeam(ctx, &fleet.VPPApp{
+	t1app, err = ds.InsertVPPAppWithTeam(ctx, &fleet.VPPApp{
 		Name: "vpp1", BundleIdentifier: "com.app.vpp1",
 		VPPAppTeam: fleet.VPPAppTeam{VPPAppID: fleet.VPPAppID{AdamID: "adam_vpp_app_1", Platform: fleet.MacOSPlatform}},
 	}, &team.ID)
 	require.NoError(t, err)
-	t1meta, err := ds.GetVPPAppMetadataByTeamAndTitleID(ctx, &team.ID, t1app.TitleID)
+	t1meta, err = ds.GetVPPAppMetadataByTeamAndTitleID(ctx, &team.ID, t1app.TitleID)
 	require.NoError(t, err)
 
-	t1Policy, err := ds.NewTeamPolicy(ctx, team.ID, nil, fleet.PolicyPayload{
-		Name:           "p1",
+	t1Policy2, err := ds.NewTeamPolicy(ctx, team.ID, nil, fleet.PolicyPayload{
+		Name:           "t1p2",
 		Query:          "SELECT 1;",
 		VPPAppsTeamsID: &t1meta.VPPAppsTeamsID,
 	})
@@ -1130,9 +1148,9 @@ func testVPPTokensCRUD(t *testing.T, ds *Datastore) {
 	err = ds.DeleteVPPToken(ctx, tokTeam.ID)
 	assert.NoError(t, err)
 
-	t1Policy, err = ds.Policy(ctx, t1Policy.ID)
+	t1Policy2, err = ds.Policy(ctx, t1Policy2.ID)
 	assert.NoError(t, err)
-	assert.Nil(t, t1Policy.VPPAppsTeamsID)
+	assert.Nil(t, t1Policy2.VPPAppsTeamsID)
 
 	tokNil, err = ds.GetVPPTokenByTeamID(ctx, nil)
 	assert.NoError(t, err)