CSS-8226 Vault k8s relation

.air.toml

@@ -4,15 +4,15 @@ tmp_dir = "tmp"
 
 [build]
   args_bin = []
-  bin = "./tmp/jimm"
+  bin = "env $(cat /vault/vault.env | xargs) ./tmp/jimm"
   cmd = "go build -gcflags='all=-N -l' -buildvcs=false -o ./tmp/jimm ./cmd/jimmsrv"
   delay = 1000
   exclude_dir = [".vscode", "assets", "tmp", "vendor", "testdata"]
   exclude_file = []
   exclude_regex = ["_test.go"]
   exclude_unchanged = false
   follow_symlink = false
-  full_bin = "dlv exec --accept-multiclient --log --headless --continue --listen :2345 --api-version 2 ./tmp/jimm"
+  full_bin = "env $(cat /vault/vault.env | xargs) dlv exec --accept-multiclient --log --headless --continue --listen :2345 --api-version 2 ./tmp/jimm"
   include_dir = []
   include_ext = ["go", "tpl", "tmpl", "html"]
   kill_delay = "0s"

.github/workflows/ci.yaml

@@ -40,6 +40,7 @@ jobs:
         run: |
           touch ./local/vault/approle.json
           touch ./local/vault/roleid.txt
+          touch ./local/vault/vault.env
       - name: Create test certs
         run: make certs
       - name: Start test environment
@@ -69,6 +70,7 @@ jobs:
         run: |
           touch ./local/vault/approle.json
           touch ./local/vault/roleid.txt
+          touch ./local/vault/vault.env
       - run: go version
       - run: go mod vendor
       - run: docker compose --profile dev up -d --wait --timestamps

Makefile

@@ -33,14 +33,14 @@ certs:
 	@cd local/traefik/certs; ./certs.sh; cd -
 
 test-env: sysdeps certs
-	@touch ./local/vault/approle.json && touch ./local/vault/roleid.txt
+	@touch ./local/vault/approle.json && touch ./local/vault/roleid.txt && touch ./local/vault/vault.env
 	@docker compose up --force-recreate -d --wait
 
 test-env-cleanup:
 	@docker compose down -v --remove-orphans
 
 dev-env-setup: sysdeps certs
-	@touch ./local/vault/approle.json && touch ./local/vault/roleid.txt
+	@touch ./local/vault/approle.json && touch ./local/vault/roleid.txt && touch ./local/vault/vault.env
 	@make version/commit.txt && make version/version.txt
 	@go mod vendor
 

charms/jimm-k8s/charmcraft.yaml

@@ -5,17 +5,18 @@ parts:
   charm:
     charm-python-packages: [setuptools]
     charm-binary-python-packages:
-    - cryptography
-    - jsonschema
-    - PyYAML
-    - attrs
-    - importlib-resources
-    - urllib3
-    - zipp
+      - cryptography
+      - jsonschema
+      - PyYAML
+      - attrs
+      - importlib-resources
+      - urllib3
+      - zipp
+      - pydantic-core
 bases:
   # This run-on is not as strict as the machine charm
   # as the jimm-server runs in a container.
-  # So the only restriction for build-on vs run-on is 
+  # So the only restriction for build-on vs run-on is
   # the charm code.
   - build-on:
       - name: "ubuntu"

charms/jimm-k8s/config.yaml

@@ -57,12 +57,6 @@ options:
   dns-name:
     type: string
     description: DNS hostname that JIMM is being served from.
-  vault-access-address:
-    type: string
-    description: |
-      The source address for the connection to Vault. 
-      This should be a single IP with no CIDR.
-      E.g. 10.1.2.123
   jwt-expiry:
     type: string
     description: |
@@ -92,7 +86,7 @@ options:
     default: 86400
     description: |
       The max age for the session cookies in seconds, on subsequent logins, the session instance
-      extended by this amount. 
+      extended by this amount.
   final-redirect-url:
     type: string
     default: ""