NixOS · Apr 2, 2020 · Apr 2, 2020
Showing with 2 additions and 59 deletions.

+0 −23 doc/manual/nixops.xml

+1 −1 nix/eval-machine-info.nix

+1 −15 nixops/deployment.py

+0 −3 setup.cfg

+0 −10 tests/functional/single_machine_azure_base.nix

+0 −7 tests/functional/single_machine_test.py
diff --git a/doc/manual/nixops.xml b/doc/manual/nixops.xml
@@ -262,29 +262,6 @@ cloud.</para>
 
   </varlistentry>
 
-  <varlistentry><term><envar>AZURE_SUBSCRIPTION_ID</envar></term>
-    <term><envar>AZURE_AUTHORITY_URL</envar></term>
-    <term><envar>AZURE_USER</envar></term>
-    <term><envar>AZURE_SERVICE_PRINCIPAL</envar></term>
-    <term><envar>AZURE_PASSWORD</envar></term>
-
-    <listitem><para>Azure subscription ID, authority URL, user,
-    service principal and password.
-    Used if not set in an Azure machine deployment configuration via
-    <varname>deployment.azure.subscriptionId</varname>,
-    <varname>deployment.azure.authority</varname>,
-    <varname>deployment.azure.user</varname>,
-    <varname>deployment.azure.servicePrincipal</varname>
-    and <varname>deployment.azure.password</varname>,
-    and if not set in an Azure resource specification via
-    <varname>resources.$TYPE.$NAME.subscriptionId</varname>,
-    <varname>resources.$TYPE.$NAME.authority</varname>,
-    <varname>resources.$TYPE.$NAME.user</varname>,
-    <varname>resources.$TYPE.$NAME.servicePrincipal</varname>
-    and <varname>resources.$TYPE.$NAME.password</varname>.
-    </para></listitem>
-  </varlistentry>
-
 </variablelist>
 
 

diff --git a/nix/eval-machine-info.nix b/nix/eval-machine-info.nix
@@ -141,7 +141,7 @@ rec {
 
       resource_used = res_set: resource:
           resource_referenced
-              ((flatten_resources res_set) ++ (attrValues azure_machines))
+              (flatten_resources res_set)
               (value: value == resource )
               true;
 

diff --git a/nixops/deployment.py b/nixops/deployment.py
@@ -500,13 +500,6 @@ def evaluate(self) -> None:
         for x in tree.findall("attrs/attr[@name='machines']/attrs/attr"):
             name = x.get("name")
             cfg = config["machines"][name]
-            if cfg["targetEnv"] == "azure":
-                self.logger.warn(
-                    "skipping Azure machine {}: the azure backend is now broken on nixops".format(
-                        name
-                    )
-                )
-                continue
             defn = _create_definition(x, cfg, cfg["targetEnv"])
             self.definitions[name] = defn
 
@@ -515,13 +508,6 @@ def evaluate(self) -> None:
             res_type = x.get("name")
             for y in x.findall("attrs/attr"):
                 name = y.get("name")
-                if "azure" in res_type:
-                    self.logger.warn(
-                        "skipping Azure resource {} of type {}: the azure backend is now broken on nixops".format(
-                            name, res_type
-                        )
-                    )
-                    continue
                 defn = _create_definition(
                     y, config["resources"][res_type][name], res_type
                 )
@@ -1720,7 +1706,7 @@ def _create_state(depl: Deployment, type: str, name: str, id: int) -> Any:
 # Automatically load all resource types.
 def _load_modules_from(dir: str) -> None:
     for module in os.listdir(os.path.dirname(__file__) + "/" + dir):
-        if module[-3:] != ".py" or module == "__init__.py" or "azure" in module:
+        if module[-3:] != ".py" or module == "__init__.py":
             continue
         importlib.import_module("nixops." + dir + "." + module[:-3])
 

diff --git a/setup.cfg b/setup.cfg
@@ -4,9 +4,6 @@ no_implicit_optional = True
 strict_optional = True
 check_untyped_defs = True
 
-[mypy-azure.*]
-ignore_missing_imports = True
-
 [mypy-boto.*]
 ignore_missing_imports = True
 

diff --git a/tests/functional/single_machine_azure_base.nix b/tests/functional/single_machine_azure_base.nix
diff --git a/tests/functional/single_machine_test.py b/tests/functional/single_machine_test.py
@@ -31,13 +31,6 @@ def test_gce(self):
         ]
         self.run_check()
 
-    @attr("azure")
-    def test_azure(self):
-        self.depl.nix_exprs = self.depl.nix_exprs + [
-            ("{0}/single_machine_azure_base.nix".format(parent_dir))
-        ]
-        self.run_check()
-
     @attr("libvirtd")
     def test_libvirtd(self):
         self.depl.nix_exprs = self.depl.nix_exprs + [