Merge 'main' into 'forward-jimmctl-changes' (#1045)

.gitignore

@@ -5,7 +5,7 @@
 /access.log
 /parts/
 /prime/
-/snap/.snapcraft/
+/snap/
 /stage/
 /vendor
 /version/commit.txt

Makefile

@@ -91,7 +91,12 @@ jimm-image:
 jimm-snap:
 	mkdir -p ./snap
 	cp ./snaps/jimm/snapcraft.yaml ./snap/
-	snapcraft 
+	snapcraft
+
+jimmctl-snap:
+	mkdir -p ./snap
+	cp -R ./snaps/jimmctl/* ./snap/
+	snapcraft
 
 push-microk8s: jimm-image
 	docker tag jimm:latest localhost:32000/jimm:latest

local/candid/config.yaml

@@ -26,5 +26,12 @@ identity-providers:
       groups:
        - group1
        - group2
+    joe:
+      name: Joe user (non superuser)
+      email: [email protected]
+      password: joe
+      groups:
+       - group1
+       - group2
   hidden: false
-  require-mfa: false
+  require-mfa: false

snaps/jimmctl/local/jimmctl.wrapper

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+JUJU_DATA=$SNAP_REAL_HOME/.local/share/juju "$SNAP"/bin/jimmctl "$@"

snaps/jimmctl/snapcraft.yaml

@@ -1,16 +1,26 @@
 name: jimmctl
-version: git
 summary: JAAS client
 description: Client for controlling JAAS multi-cloud juju controllers.
+version: git
 grade: stable
 base: core20
 confinement: strict
 
 plugs:
+  # We use personal-files instead of the home interface
+  # as the home interface does not permit access to hidden files/directories.
+  # See: https://askubuntu.com/questions/1238211/how-to-make-snaps-access-hidden-files-and-folders-in-home
+  # And: https://snapcraft.io/docs/personal-files-interface
+  #
+  # The personal-files interface is also a none auto-connect, and must
+  # typically be connected via: snap connect jimmctl:dot-local-share-juju
+  #
+  # In our scenario, we are going to request auto-connect.
   dot-local-share-juju:
     interface: personal-files
     read:
     - $HOME/.local/share/juju
+    - $HOME/.local/share/juju/cookies
 
 apps:
   jimmctl:
@@ -19,7 +29,6 @@ apps:
      - dot-local-share-juju
      - network
 
-
 parts:
   jimmctl:
     plugin: go
@@ -31,9 +40,9 @@ parts:
       set -e
       go install -mod readonly -ldflags '-linkmode=external' github.com/canonical/jimm/cmd/jimmctl
 
-  files:
+  wrapper:
     plugin: dump
-    source: snaps/jimmctl/files/
+    source: snaps/jimmctl/local/
     source-type: local
     organize:
       jimmctl.wrapper: bin/wrappers/jimmctl