Remove unexpected files in /etc/apt/sources.list.d

https://salsa.debian.org/cloud-team/debian-cloud-images/-/merge_requests/279
made cloud images use a file in that directory instead of
/etc/apt/sources.list for normal system sources.

salt/file/debian/init.sls

@@ -19,12 +19,20 @@ preferences:
   - source: salt://debian/preferences.jinja
   - template: jinja
 
-sources.list:
+apt_update:
+  cmd.run:
+  - name: apt-get update
+
+/etc/apt/sources.list:
   file.managed:
-  - name: /etc/apt/sources.list
   - source: salt://debian/sources.list.jinja
   - template: jinja
-  cmd.run:
-  - name: apt-get update
-  - onchanges:
-    - file: sources.list
+  - onchanges_in:
+    - apt_update
+
+/etc/apt/sources.list.d is clean:
+  file.directory:
+  - name: /etc/apt/sources.list.d
+  - clean: true
+  - onchanges_in:
+    - apt_update

salt/file/google/chrome.sls

@@ -14,18 +14,28 @@
 
 
 include:
+- debian
 - google.repo_key
 
 {% if grains.os_family == 'Debian' and grains.osarch == 'amd64' %}
 chrome:
-  pkgrepo.managed:
-  - name: |
+  file.managed:
+  - name: /etc/apt/sources.list.d/google-chrome.list
+  - contents: |
+      ### THIS FILE IS AUTOMATICALLY CONFIGURED ###
+      # You may comment out this entry, but any other modifications may be lost.
       deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main
-  - file: /etc/apt/sources.list.d/google-chrome.list
   - require:
     - sls: google.repo_key
+  - require_in:
+    - /etc/apt/sources.list.d is clean
+  - onchanges_in:
+    - apt_update
   pkg.installed:
   - name: google-chrome-stable
+  - require:
+    - file: chrome
+    - apt_update
 {% else %}
 error:
   cmd.run:

salt/file/gvisor/init.sls

@@ -23,6 +23,7 @@ error:
 
 
 include:
+- debian
 - grub
 
 
@@ -32,14 +33,18 @@ include:
   - source: https://gvisor.dev/archive.key
   - source_hash: 14f9edb6a623b335f29d26a11e7a458652c252bce0e1f15fcc8bdf02f97283c2e2eb2de89e65cfc6088d90cf5d7410bd9dde9a2821b0beb014e7500356a0c4fc
 gvisor_repo:
-  pkgrepo.managed:
-  - name: |-
+  file.managed:
+  - name: /etc/apt/sources.list.d/gvisor.list
+  - contents: |
       deb [signed-by=/etc/apt/keyrings/gvisor.asc] https://storage.googleapis.com/gvisor/releases release main
-  - file: /etc/apt/sources.list.d/gvisor.list
-  - clean_file: true
   - require:
     - /etc/apt/keyrings/gvisor.asc
+  - require_in:
+    - /etc/apt/sources.list.d is clean
+  - onchanges_in:
+    - apt_update
 runsc:
   pkg.installed:
   - require:
     - gvisor_repo
+    - apt_update