Get the tests passing again

The latter doesn't support variable substitution

WORKSPACE

@@ -41,13 +41,9 @@ git_repository(
     name = "rules_python",
     remote = "https://github.com/bazelbuild/rules_python.git",
     # tag = "0.4.0",
-    commit = "5f51a4451b478c5fed491614756d16745682fd7c",
+    commit = "693a1587baf055979493565933f8f40225c00c6d",
 )
 
-load("@rules_python//python:repositories.bzl", "py_repositories")
-
-py_repositories()
-
 register_toolchains("//tools/python:python3_toolchain")
 
 # pip package pinnings need to be initialized.
@@ -66,14 +62,14 @@ load("@arrdem_source_pypi//:requirements.bzl", "install_deps")
 # Call it to define repos for your requirements.
 install_deps()
 
-git_repository(
+# git_repository(
-   name = "rules_zapp",
-   remote = "https://git.arrdem.com/arrdem/rules_zapp.git",
-   commit = "961be891e5cff539e14f2050d5cd9e82845ce0f2",
-   # tag = "0.1.2",
-)
-
-# local_repository(
 #    name = "rules_zapp",
-#     path = "/home/arrdem/Documents/hobby/programming/rules_zapp",
+#    remote = "https://git.arrdem.com/arrdem/rules_zapp.git",
+#    commit = "961be891e5cff539e14f2050d5cd9e82845ce0f2",
+#    # tag = "0.1.2",
 # )
+
+local_repository(
+    name = "rules_zapp",
+    path = "/home/arrdem/Documents/hobby/programming/rules_zapp",
+)

projects/gandi/BUILD.bazel

@@ -4,7 +4,7 @@ py_library(
     name = "gandi",
     srcs = glob(["src/gandi/client.py"]),
     imports = [
-        "src",
+        "src/python",
     ],
     deps = [
         py_requirement("requests"),

projects/public_dns/config.yml

@@ -1,12 +1,13 @@
 ---
 gandi:
-  key: "op://TireFire Heavy Industries/Gandi API key/credential"
+  key: "Z2eUpJ6X2eBKYkgPVyedyoas"
 
 meraki:
-  key: "op://TireFire Heavy Industries/Meraki API/credential"
+  key: "606ad50af474d47465b18425f039b15c5bf8afec"
-  organization: "op://TireFire Heavy Industries/Meraki API/organization"
+  organization: "875638"
-  network: "op://TireFire Heavy Industries/Meraki API/network"
+  #organization: "arrdem"
-  router_serial: "op://TireFire Heavy Industries/Meraki API/router_serial"
+  network: "L_634444597505822900"
+  router_serial: "Q2PN-WV3P-ZEGK"
 
 tasks:
   # My zones

projects/public_dns/src/resources/zonefiles/tirefireind.us.j2

@@ -22,8 +22,6 @@ relay       {{ ttl }} IN A {{ link }}
 pxe         {{ ttl }} IN A {{ link }}
 vpn         {{ ttl }} IN A {{ link }}
 hass        {{ ttl }} IN A {{ link }}
-k8s         {{ ttl }} IN A {{ link }}
-git         {{ ttl }} IN A {{ link }}
 {% endfor %}
 
 # Secrets service

projects/public_dns/update.sh

@@ -2,8 +2,6 @@
 
 cd "$(dirname $(realpath "$0"))"
 
-op inject --in-file ./config.yml.in --out-file ./config.yml
+exec bazel run :updater -- \
-
-exec bazel run //projects/public_dns:updater -- \
     --config $(realpath ./config.yml) \
     --templates $(realpath src/resources/zonefiles)

tools/python/pythonshim

@@ -4,7 +4,7 @@
 # But ... that's exactly what we want to do.
 # So this script exists to find a 'compliant' Python install and use that.
 
-PYTHONREV="3.12"
+PYTHONREV="3.11"
 CMD="python${PYTHONREV}"
 
 if [ -x "$(command -v "$CMD")" ]; then

tools/python/requirements.in

@@ -55,4 +55,3 @@ yamllint
 yaspin
 pytimeparse
 git+https://github.com/arrdem/jaraco.text.git@0dd8d0b25a93c3fad896f3a92d11caff61ff273d#egg=jaraco.text
-onepasswordconnectsdk