Merge ~ack/maas:1922433-machine-resources-path-snap into maas:master

[Alberto Donato]

LP #1922433 - snap: fix machine-resources path in nginx config

[Björn Tillenius (bjornt)]

+1

review: Approve

diff --git a/src/provisioningserver/rackdservices/http.py b/src/provisioningserver/rackdservices/http.py
index cc35ff6..e888c51 100644
--- a/src/provisioningserver/rackdservices/http.py
+++ b/src/provisioningserver/rackdservices/http.py
@@ -7,6 +7,7 @@
 from collections import defaultdict
 from datetime import timedelta
 import os
+from pathlib import Path
 import sys
 
 import attr
@@ -170,13 +171,17 @@ class RackHTTPService(TimerService):
     def _configure(self, upstream_http):
         """Update the HTTP configuration for the rack."""
         template = load_template("http", "rackd.nginx.conf.template")
+        machine_resources_prefix = snap.SnapPaths.from_environ().snap or Path(
+            "/"
+        )
         try:
             rendered = template.substitute(
                 {
                     "upstream_http": list(sorted(upstream_http)),
                     "resource_root": self._resource_root,
-                    "machine_resources": snap.SnapPaths.from_environ().snap
-                    or "/usr/share/maas",
+                    "machine_resources": str(
+                        machine_resources_prefix / "usr/share/maas"
+                    ),
                 }
             )
         except NameError as error:
diff --git a/src/provisioningserver/rackdservices/tests/test_http.py b/src/provisioningserver/rackdservices/tests/test_http.py
index 95e7e17..4d3069e 100644
--- a/src/provisioningserver/rackdservices/tests/test_http.py
+++ b/src/provisioningserver/rackdservices/tests/test_http.py
@@ -1,9 +1,9 @@
 # Copyright 2018 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Tests for `provisioningserver.rackdservices.http`."""
-
 
+import os
+from pathlib import Path
 import random
 from unittest.mock import ANY, Mock
 
@@ -102,6 +102,29 @@ class TestRackHTTPService(MAASTestCase):
         service.call = (service._tryUpdate, tuple(), {})
         return service
 
+    def test_configure_not_snap(self):
+        tempdir = self.make_dir()
+        nginx_conf = Path(tempdir) / "rackd.nginx.conf"
+        service = self.make_startable_RackHTTPService(tempdir, None, reactor)
+        self.patch(http, "compose_http_config_path").return_value = str(
+            nginx_conf
+        )
+        service._configure(["region1.maas", "region2.maas"])
+        self.assertIn("root /usr/share/maas;", nginx_conf.read_text())
+
+    def test_configure_in_snap(self):
+        self.patch(os, "environ", {"SNAP": "/snap/maas/123"})
+        tempdir = self.make_dir()
+        nginx_conf = Path(tempdir) / "rackd.nginx.conf"
+        service = self.make_startable_RackHTTPService(tempdir, None, reactor)
+        self.patch(http, "compose_http_config_path").return_value = str(
+            nginx_conf
+        )
+        service._configure(["region1.maas", "region2.maas"])
+        self.assertIn(
+            "root /snap/maas/123/usr/share/maas;", nginx_conf.read_text()
+        )
+
     @inlineCallbacks
     def test_getConfiguration_returns_configuration_object(self):
         rpc_service, protocol = yield prepareRegion(self)