From b9cefa0d092e1e07d2d887b6dc1173c374b47eb0 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <t+github@chainguard.dev>
Date: Fri, 24 Feb 2023 17:30:43 -0500
Subject: [PATCH] Remove wireless-networks rule, rename collection to collect

---
 Makefile                                      |  8 ++------
 incident_response/wireless_networks_macos.sql | 12 ------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 incident_response/wireless_networks_macos.sql

diff --git a/Makefile b/Makefile
index 105d7bf..29b3e8e 100644
--- a/Makefile
+++ b/Makefile
@@ -19,11 +19,7 @@ out/odk-incident-response.conf: out/osqtool-$(ARCH)  $(wildcard incident_respons
 	./out/osqtool-$(ARCH) --verify pack incident_response/ > out/.odk-incident_response.conf
 	mv out/.odk-incident_response.conf out/odk-incident_response.conf
 
-# An alternative rules file for configurations where the "wireless_networks" table is forbidden for querying
-out/odk-incident-response-without-wireless-networks.conf: out/osqtool-$(ARCH)
-	./out/osqtool-$(ARCH) --max-total-daily-duration=90m --verify --exclude wireless_networks_macos pack incident_response/ > out/odk-incident-response-without-wireless-networks.conf
-
-packs: out/odk-detection.conf out/odk-policy.conf out/odk-incident-response.conf out/odk-incident-response-no-wifi.conf
+packs: out/odk-detection.conf out/odk-policy.conf out/odk-incident-response.conf
 
 out/odk-packs.zip: packs
 	cd out && zip odk-packs.zip *.conf
@@ -36,7 +32,7 @@ reformat:
 reformat-updates:
 	git status -s | awk '{ print $$2 }' | grep ".sql" | perl -ne 'chomp; system("cp $$_ /tmp/fix.sql && npx sql-formatter -l sqlite /tmp/fix.sql > $$_");'
 
-.PHONY: collection
+.PHONY: collect
 collection: ./out/osqtool-$(ARCH)
 	mkdir -p $(COLLECT_DIR)
 	@echo "Saving output to: $(COLLECT_DIR)"
diff --git a/incident_response/wireless_networks_macos.sql b/incident_response/wireless_networks_macos.sql
deleted file mode 100644
index c9db2c0..0000000
--- a/incident_response/wireless_networks_macos.sql
+++ /dev/null
@@ -1,12 +0,0 @@
--- Retrieves all the remembered wireless network that the target machine has connected to.
-SELECT
-  ssid,
-  network_name,
-  security_type,
-  last_connected,
-  captive_portal,
-  possibly_hidden,
-  roaming,
-  roaming_profile
-FROM
-  wifi_networks;