Merge ~rmescandon/snappy-hwe-snaps/+git/wifi-connect:bind-control-interface-in-snap-common into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-connect:master

[Roberto Mier Escandon]

Mounting wifi-ap control interface directly in SNAP_COMMON path instead of SNAP_COMMON/sockets. This avoids us to create that folder once the snap is installed.

[Sheila Miguez (codersquid)]

Looks good

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:867305b7654e369060cd9706feeabdbac6c51e18
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1648/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2118
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1556/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2486
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1671/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1648/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

[Kyle Nitzsche (knitzsche)]

lgtm

review: Approve

diff --git a/README.md b/README.md
index 0707ffa..d100e2f 100644
--- a/README.md
+++ b/README.md
@@ -31,15 +31,6 @@ snap install --edge|beta wifi-connect
 
 Use beta channel if it contains version 0.9, else edge.
 
-## Create content sharing directory for wifi-ap:control interface
-
-```bash
-sudo mkdir /var/snap/wifi-connect/common/sockets
-```
-
-Note: Currently content share interface requires a reboot after connection, as described below.
-
-(TODO: Later we'll use an interface hook script to automatically create that directory)
 
 ## Connect interfaces
 
@@ -51,6 +42,7 @@ snap connect wifi-connect:network-manager network-manager:service
 ```
 
 Note: wifi-ap and network-manager interfaces auto-connect.
+Note: Currently content share interface requires a reboot after connection, as described below.
 
 # Set NetWorkManager to control all networking
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 80554f1..b5f8aad 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -25,7 +25,7 @@ plugs:
   control:
     interface: content
     content: socket-directory
-    target: $SNAP_COMMON/sockets
+    target: $SNAP_COMMON
     default-provider: wifi-ap
 
 parts:
diff --git a/spread_tests/lib/utilities.sh b/spread_tests/lib/utilities.sh
index 0beb932..6a17233 100755
--- a/spread_tests/lib/utilities.sh
+++ b/spread_tests/lib/utilities.sh
@@ -74,9 +74,6 @@ install_snap_under_test() {
 		# Install prebuilt snap
 		snap install --dangerous ${PROJECT_PATH}/${SNAP_NAME}_*_${SNAP_ARCH}.snap
 
-		# Create content sharing directory if needed
-		[ -e /var/snap/wifi-connect/common/sockets ] || mkdir -p /var/snap/wifi-connect/common/sockets
-
 		connect_interfaces
 
 		# set NetworkManager to control all networking
diff --git a/wifiap/restclient.go b/wifiap/restclient.go
index 39e3b35..1a6d8c4 100644
--- a/wifiap/restclient.go
+++ b/wifiap/restclient.go
@@ -30,7 +30,7 @@ const (
 	configurationURI = "/configuration"
 )
 
-var socketPath = os.Getenv("SNAP_COMMON") + "/sockets/control"
+var socketPath = os.Getenv("SNAP_COMMON") + "/control"
 
 // TransportClient operations executed by any client requesting server.
 type TransportClient interface {