Merge ~mfo/maas:lp2007297-3.2 into maas:3.2

[Mauricio Faria de Oliveira]

[3.2] LP:2007297 Set pylxd session to not trust the environment

(cherry picked from commit 58e3a2328dd308056170b3af3921ed1842a08a8f)
Signed-off-by: Mauricio Faria de Oliveira <email address hidden>

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp2007297-3.2 lp:~mfo/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5565/console
COMMIT: cee1a302b38068dbc02a862c9bee5cbc15dadfd7

review: Needs Fixing

[Mauricio Faria de Oliveira (mfo)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp2007297-3.2 lp:~mfo/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5568/console
COMMIT: cee1a302b38068dbc02a862c9bee5cbc15dadfd7

review: Needs Fixing

[Mauricio Faria de Oliveira (mfo)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp2007297-3.2 lp:~mfo/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5569/console
COMMIT: cee1a302b38068dbc02a862c9bee5cbc15dadfd7

review: Needs Fixing

[Mauricio Faria de Oliveira (mfo)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp2007297-3.2 lp:~mfo/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5570/console
COMMIT: cee1a302b38068dbc02a862c9bee5cbc15dadfd7

review: Needs Fixing

[Mauricio Faria de Oliveira (mfo)]

Some unit tests seem to be consistently failing.

Testing a revert in MR [1].

[1] https://code.launchpad.net/~mfo/maas/+git/maas/+merge/466174

[Seyeong Kim (seyeongkim)]

I guess somehow maas region or rack daemon stopped. and timed out. maybe not enough memory? i'm not sure about CI though...

I had a discussion with solutionsQA and they also faced the issue. so I checked this briefly.

[Seyeong Kim (seyeongkim)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp2007297-3.2 lp:~mfo/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5691/console
COMMIT: cee1a302b38068dbc02a862c9bee5cbc15dadfd7

review: Needs Fixing

[Seyeong Kim (seyeongkim)]

when I try to test maas 3.2 in my local I face this issue

TypeError: can only concatenate list (not "tuple") to list

and fix

https://github.com/canonical/maas/commit/215bff0f8d3136db61208f2de5856364c9cea0e4

Unmerged commits

cee1a30... by Adam Collard on 2023-02-15

[3.2] LP:2007297 Set pylxd session to not trust the environment

(cherry picked from commit 58e3a2328dd308056170b3af3921ed1842a08a8f)
Signed-off-by: Mauricio Faria de Oliveira <email address hidden>

diff --git a/src/provisioningserver/drivers/pod/lxd.py b/src/provisioningserver/drivers/pod/lxd.py
index f5ca215..af51304 100644
--- a/src/provisioningserver/drivers/pod/lxd.py
+++ b/src/provisioningserver/drivers/pod/lxd.py
@@ -872,6 +872,8 @@ class LXDPodDriver(PodDriver):
                 cert=cert,
                 verify=False,
             )
+            # Don't inherit proxy environment variables
+            client.api.session.trust_env = False
             if not client.trusted and password:
                 try:
                     client.authenticate(password)
diff --git a/src/provisioningserver/drivers/pod/tests/test_lxd.py b/src/provisioningserver/drivers/pod/tests/test_lxd.py
index 1140f26..e5b5b13 100644
--- a/src/provisioningserver/drivers/pod/tests/test_lxd.py
+++ b/src/provisioningserver/drivers/pod/tests/test_lxd.py
@@ -12,6 +12,7 @@ from unittest.mock import ANY, MagicMock, Mock, PropertyMock, sentinel
 
 from fixtures import EnvironmentVariable, TempDir
 from pylxd.exceptions import ClientConnectionFailed, LXDAPIException, NotFound
+from requests import Session
 from testtools.testcase import ExpectedException
 from twisted.internet.defer import inlineCallbacks
 
@@ -142,6 +143,7 @@ class FakeClient:
         self.trusted = False
         self._fail_auth = False
         self.host_info = self.fake_lxd.host_info
+        self.api = FakeAPINode()
 
     def authenticate(self, password):
         if self._fail_auth:
@@ -155,6 +157,13 @@ class FakeClient:
         raise AttributeError(name)
 
 
+class FakeAPINode:
+    """A fake pylxd.client._APINode"""
+
+    def __init__(self):
+        self.session = Session()
+
+
 class FakeLXD:
     """A fake LXD server."""
 
@@ -463,6 +472,11 @@ class TestLXDPodDriver(MAASTestCase):
             self.assertIsInstance(client.cert, tuple)
             self.assertFalse(client.verify)
 
+    def test_get_client_should_not_trust_environment(self):
+        context = self.make_context()
+        with self.driver._get_client(None, context) as client:
+            self.assertFalse(client.api.session.trust_env)
+
     def test_get_client_no_certificates_no_password(self):
         context = self.make_context(with_cert=False, with_password=False)
         pod_id = factory.make_name("pod_id")
diff --git a/utilities/check-imports b/utilities/check-imports
index 153edb3..e56942c 100755
--- a/utilities/check-imports
+++ b/utilities/check-imports
@@ -436,6 +436,7 @@ checks = [
         RackControllerRule
         | Rule(
             Allow("apiclient.testing.credentials.make_api_credentials"),
+            Allow("requests|requests.**"),
             Allow(StandardLibraries),
             Allow(TestingLibraries),
         ),