Fix GitOps script policy test

fleetdm · Oct 2, 2024 · f66ea84 · f66ea84
1 parent 892baa6
commit f66ea84
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 5 deletions.
diff --git a/pkg/spec/gitops_test.go b/pkg/spec/gitops_test.go
@@ -242,7 +242,7 @@ func TestValidGitOpsYaml(t *testing.T) {
 				// Check policies
 				expectedPoliciesCount := 5
 				if test.isTeam {
-					expectedPoliciesCount = 6
+					expectedPoliciesCount = 8
 				}
 				require.Len(t, gitops.Policies, expectedPoliciesCount)
 				assert.Equal(t, "😊 Failing policy", gitops.Policies[0].Name)
@@ -255,6 +255,14 @@ func TestValidGitOpsYaml(t *testing.T) {
 					assert.Equal(t, "Microsoft Teams on macOS installed and up to date", gitops.Policies[5].Name)
 					assert.NotNil(t, gitops.Policies[5].InstallSoftware)
 					assert.Equal(t, "./microsoft-teams.pkg.software.yml", gitops.Policies[5].InstallSoftware.PackagePath)
+
+					assert.Equal(t, "Script run policy", gitops.Policies[6].Name)
+					assert.NotNil(t, gitops.Policies[6].RunScript)
+					assert.Equal(t, "./lib/collect-fleetd-logs.sh", gitops.Policies[6].RunScript.Path)
+
+					assert.Equal(t, "🔥 Failing policy with script", gitops.Policies[7].Name)
+					assert.NotNil(t, gitops.Policies[7].RunScript)
+					assert.Equal(t, "./lib/collect-fleetd-logs.sh", gitops.Policies[7].RunScript.Path)
 				}
 			},
 		)

diff --git a/pkg/spec/testdata/lib/collect-fleetd-logs.sh b/pkg/spec/testdata/lib/collect-fleetd-logs.sh
@@ -0,0 +1 @@
+# collect fleetd logs
diff --git a/pkg/spec/testdata/script-policy.yml b/pkg/spec/testdata/script-policy.yml
@@ -0,0 +1,7 @@
+- name: 🔥 Failing policy with script
+  platform: $LINUX_OS
+  description: This policy should always fail.
+  resolution: There is no resolution for this policy.
+  query: SELECT 1 FROM osquery_info WHERE start_time < 0;
+  run_script:
+    path: ./lib/collect-fleetd-logs.sh
diff --git a/pkg/spec/testdata/team_config.yml b/pkg/spec/testdata/team_config.yml
@@ -31,7 +31,8 @@ policies:
     description: This should run a script on failure
     query: SELECT * from osquery_info;
     run_script:
-      - path: ./lib/collect-fleetd-logs.sh
+      path: ./lib/collect-fleetd-logs.sh
+  - path: ./script-policy.yml
 software:
   packages:
     - path: ./microsoft-teams.pkg.software.yml

diff --git a/pkg/spec/testdata/team_config_no_paths.yml b/pkg/spec/testdata/team_config_no_paths.yml
@@ -120,6 +120,19 @@ policies:
     query: SELECT 1 FROM apps WHERE name = 'Microsoft Teams.app' AND version_compare(bundle_short_version, '24193.1707.3028.4282') >= 0;
     install_software:
       package_path: ./microsoft-teams.pkg.software.yml
+  - name: Script run policy
+    platform: linux
+    description: This should run a script on failure
+    query: SELECT * from osquery_info;
+    run_script:
+      path: ./lib/collect-fleetd-logs.sh
+  - name: 🔥 Failing policy with script
+    platform: linux
+    description: This policy should always fail.
+    resolution: There is no resolution for this policy.
+    query: SELECT 1 FROM osquery_info WHERE start_time < 0;
+    run_script:
+      path: ./lib/collect-fleetd-logs.sh
 software:
   packages:
     - path: ./microsoft-teams.pkg.software.yml

diff --git a/pkg/spec/testdata/top.policies2.yml b/pkg/spec/testdata/top.policies2.yml
@@ -2,6 +2,4 @@
   platform: $LINUX_OS
   description: This policy should always fail.
   resolution: There is no resolution for this policy.
-  query: SELECT 1 FROM osquery_info WHERE start_time < 0;
-  run_script:
-    - path: ./lib/collect-fleetd-logs.sh
+  query: SELECT 1 FROM osquery_info WHERE start_time < 0;