zbuilder 0.2.2__tar.gz → 0.2.4__tar.gz

{zbuilder-0.2.2 → zbuilder-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zbuilder
-Version: 0.2.2
+Version: 0.2.4
 Summary: Create VMs
 Author: Nikos Chasiotis
 Author-email: Nikos Chasiotis <hasiotis@gmail.com>
@@ -29,16 +29,11 @@ Requires-Dist: massedit>=0.71.0
 Requires-Dist: ruamel-yaml>=0.19.1
 Requires-Dist: boto3>=1.43.73
 Requires-Dist: tabulate>=0.10.0
-Requires-Dist: libvirt-python>=11,<12
+Requires-Dist: libvirt-python>=12,<13
 Requires-Dist: pycdlib>=1.14,<2
-Requires-Dist: google-auth-oauthlib>=0.4,<1.5 ; extra == 'gcp'
-Requires-Dist: oauthlib>=3.2.1,<4 ; extra == 'gcp'
-Requires-Dist: google-api-python-client>=2.198.0,<3 ; extra == 'gcp'
-Requires-Dist: google-cloud-dns>=0.37.0,<0.38 ; extra == 'gcp'
 Requires-Dist: proxmoxer>=1.1,<3 ; extra == 'proxmox'
 Requires-Python: >=3.12, <4
 Project-URL: Repository, https://github.com/hasiotis/zbuilder
-Provides-Extra: gcp
 Provides-Extra: proxmox
 Description-Content-Type: text/markdown
 
@@ -47,7 +42,6 @@ Description-Content-Type: text/markdown
 [![PyPi version](https://badge.fury.io/py/zbuilder.svg)](https://pypi.org/project/zbuilder/)
 [![PyPi downloads](https://img.shields.io/pypi/dm/zbuilder.svg)](https://pypistats.org/packages/zbuilder)
 [![Build status](https://github.com/hasiotis/zbuilder/workflows/master/badge.svg)](https://github.com/hasiotis/zbuilder/actions?query=workflow%3A%22master%22)
-[![Documentation Status](https://readthedocs.org/projects/zbuilder/badge/?version=stable)](https://zbuilder.readthedocs.io/en/stable/?badge=stable)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://github.com/hasiotis/zbuilder/blob/master/LICENSE)
 
 ZBuilder is a tool to help you build VMs ready to be transferred to ansible.
@@ -73,11 +67,6 @@ or
 pip3 install --user --upgrade zbuilder
 ```
 
-The `gcp` provider needs the google client libraries, which ship as an extra:
-```
-pipx install --force 'zbuilder[gcp]'
-```
-
 The `proxmox` provider needs `proxmoxer`, which ships as an extra:
 ```
 pipx install --force 'zbuilder[proxmox]'
@@ -87,12 +76,11 @@ pipx install --force 'zbuilder[proxmox]'
 
 | Family | Providers |
 |---|---|
-| VM   | `aws`, `gcp`, `kvm`, `proxmox` |
-| DNS  | `aws`, `bind`, `gcp`, `powerdns` |
+| VM   | `aws`, `kvm`, `proxmox` |
+| DNS  | `aws`, `bind`, `powerdns` |
 | IPAM | `phpipam` |
 
-See the [documentation](https://zbuilder.readthedocs.io/en/stable/) for the
-settings each one accepts, or run `zbuilder providers`.
+Run `zbuilder providers` to see the settings each one accepts.
 
 ## Development
 During development you can:
@@ -106,6 +94,5 @@ prek run --all-files         # lint and format
 
 ## Links
 
-[Documentation](https://zbuilder.readthedocs.io/en/stable/?badge=stable)
-| [Releases](https://pypi.org/project/zbuilder/)
+[Releases](https://pypi.org/project/zbuilder/)
 | [Code](https://github.com/hasiotis/zbuilder)

{zbuilder-0.2.2 → zbuilder-0.2.4}/README.md

@@ -3,7 +3,6 @@
 [![PyPi version](https://badge.fury.io/py/zbuilder.svg)](https://pypi.org/project/zbuilder/)
 [![PyPi downloads](https://img.shields.io/pypi/dm/zbuilder.svg)](https://pypistats.org/packages/zbuilder)
 [![Build status](https://github.com/hasiotis/zbuilder/workflows/master/badge.svg)](https://github.com/hasiotis/zbuilder/actions?query=workflow%3A%22master%22)
-[![Documentation Status](https://readthedocs.org/projects/zbuilder/badge/?version=stable)](https://zbuilder.readthedocs.io/en/stable/?badge=stable)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://github.com/hasiotis/zbuilder/blob/master/LICENSE)
 
 ZBuilder is a tool to help you build VMs ready to be transferred to ansible.
@@ -29,11 +28,6 @@ or
 pip3 install --user --upgrade zbuilder
 ```
 
-The `gcp` provider needs the google client libraries, which ship as an extra:
-```
-pipx install --force 'zbuilder[gcp]'
-```
-
 The `proxmox` provider needs `proxmoxer`, which ships as an extra:
 ```
 pipx install --force 'zbuilder[proxmox]'
@@ -43,12 +37,11 @@ pipx install --force 'zbuilder[proxmox]'
 
 | Family | Providers |
 |---|---|
-| VM   | `aws`, `gcp`, `kvm`, `proxmox` |
-| DNS  | `aws`, `bind`, `gcp`, `powerdns` |
+| VM   | `aws`, `kvm`, `proxmox` |
+| DNS  | `aws`, `bind`, `powerdns` |
 | IPAM | `phpipam` |
 
-See the [documentation](https://zbuilder.readthedocs.io/en/stable/) for the
-settings each one accepts, or run `zbuilder providers`.
+Run `zbuilder providers` to see the settings each one accepts.
 
 ## Development
 During development you can:
@@ -62,6 +55,5 @@ prek run --all-files         # lint and format
 
 ## Links
 
-[Documentation](https://zbuilder.readthedocs.io/en/stable/?badge=stable)
-| [Releases](https://pypi.org/project/zbuilder/)
+[Releases](https://pypi.org/project/zbuilder/)
 | [Code](https://github.com/hasiotis/zbuilder)

{zbuilder-0.2.2 → zbuilder-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "zbuilder"
-version = "0.2.2"
+version = "0.2.4"
 description = "Create VMs"
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]
@@ -32,7 +32,7 @@ dependencies = [
     "ruamel-yaml>=0.19.1",
     "boto3>=1.43.73",
     "tabulate>=0.10.0",
-    "libvirt-python>=11,<12",
+    "libvirt-python>=12,<13",
     "pycdlib>=1.14,<2",
 ]
 
@@ -41,12 +41,6 @@ name = "Nikos Chasiotis"
 email = "hasiotis@gmail.com"
 
 [project.optional-dependencies]
-gcp = [
-    "google-auth-oauthlib>=0.4,<1.5",
-    "oauthlib>=3.2.1,<4",
-    "google-api-python-client>=2.198.0,<3",
-    "google-cloud-dns>=0.37.0,<0.38",
-]
 proxmox = ["proxmoxer>=1.1,<3"]
 
 [project.urls]
@@ -57,14 +51,12 @@ zbuilder = "zbuilder.cli:cli"
 
 [project.entry-points."zbuilder.vm"]
 aws = "zbuilder.vm.aws:vmProvider"
-gcp = "zbuilder.vm.gcp:vmProvider"
 kvm = "zbuilder.vm.kvm:vmProvider"
 proxmox = "zbuilder.vm.proxmox:vmProvider"
 
 [project.entry-points."zbuilder.dns"]
 aws = "zbuilder.dns.aws:dnsProvider"
 bind = "zbuilder.dns.bind:dnsProvider"
-gcp = "zbuilder.dns.gcp:dnsProvider"
 powerdns = "zbuilder.dns.powerdns:dnsProvider"
 
 [project.entry-points."zbuilder.ipam"]
@@ -75,19 +67,20 @@ dev = [
     "pytest>=9.1.1,<10",
     "pytest-md-report>=0.8.0",
 ]
-docs = ["sphinx>=7.2.6,<8"]
 
 [tool.uv]
 default-groups = ["dev"]
 
 [[tool.uv.dependency-metadata]]
 name = "libvirt-python"
-version = "11.10.0"
+version = "12.8.0"
 requires-dist = []
 
 [tool.ruff]
 line-length = 120
 
+[tool.ruff.lint]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 filterwarnings = ["ignore:This process .* is multi-threaded, use of fork.*:DeprecationWarning:multiprocessing.popen_fork"]

{zbuilder-0.2.2 → zbuilder-0.2.4}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "zbuilder"
-version = "0.2.2"
+version = "0.2.4"
 description = "Create VMs"
 authors = [{ name = "Nikos Chasiotis", email = "hasiotis@gmail.com" }]
 license = "GPL-3.0-or-later"
@@ -35,20 +35,11 @@ dependencies = [
     "tabulate>=0.10.0",
     # The kvm provider. libvirt-python compiles against libvirt-dev, which has
     # to be present before `uv sync` - see the dependency-metadata block below.
-    "libvirt-python>=11,<12",
+    "libvirt-python>=12,<13",
     "pycdlib>=1.14,<2",
 ]
 
 [project.optional-dependencies]
-# The gcp providers (vm and dns) pull in the whole google client stack, which
-# is a large dependency tree nobody outside GCP needs. zbuilder/vm/gcp.py and
-# zbuilder/dns/gcp.py import it lazily and say what to install when missing.
-gcp = [
-    "google-auth-oauthlib>=0.4,<1.5",
-    "oauthlib>=3.2.1,<4",
-    "google-api-python-client>=2.198.0,<3",
-    "google-cloud-dns>=0.37.0,<0.38",
-]
 # The proxmox provider talks to PVE through proxmoxer, which nobody outside a
 # proxmox cluster needs. zbuilder/vm/proxmox.py imports it lazily and says what
 # to install when it is missing.
@@ -66,14 +57,12 @@ zbuilder = "zbuilder.cli:cli"
 # distribution can register providers under the same groups.
 [project.entry-points."zbuilder.vm"]
 aws = "zbuilder.vm.aws:vmProvider"
-gcp = "zbuilder.vm.gcp:vmProvider"
 kvm = "zbuilder.vm.kvm:vmProvider"
 proxmox = "zbuilder.vm.proxmox:vmProvider"
 
 [project.entry-points."zbuilder.dns"]
 aws = "zbuilder.dns.aws:dnsProvider"
 bind = "zbuilder.dns.bind:dnsProvider"
-gcp = "zbuilder.dns.gcp:dnsProvider"
 powerdns = "zbuilder.dns.powerdns:dnsProvider"
 
 [project.entry-points."zbuilder.ipam"]
@@ -84,9 +73,6 @@ dev = [
     "pytest>=9.1.1,<10",
     "pytest-md-report>=0.8.0",
 ]
-docs = [
-    "sphinx>=7.2.6,<8",
-]
 
 [tool.uv]
 default-groups = ["dev"]
@@ -98,7 +84,7 @@ default-groups = ["dev"]
 # built the normal way at install time, which does need the libvirt headers.
 [[tool.uv.dependency-metadata]]
 name = "libvirt-python"
-version = "11.10.0"
+version = "12.8.0"
 requires-dist = []
 
 [build-system]
@@ -108,6 +94,8 @@ build-backend = "uv_build"
 [tool.ruff]
 line-length = 120
 
+[tool.ruff.lint]
+
 [tool.pytest.ini_options]
 testpaths = [ "tests" ]
 filterwarnings = [

{zbuilder-0.2.2 → zbuilder-0.2.4}/src/zbuilder/base.py

@@ -14,7 +14,7 @@ class UnsupportedAction(click.ClickException):
     """Raised when a provider does not implement an optional action"""
 
     def __init__(self, provider, action):
-        super().__init__("Provider [{}] does not implement action [{}]".format(provider, action))
+        super().__init__(f"Provider [{provider}] does not implement action [{action}]")
 
 
 class Provider(ABC):

{zbuilder-0.2.2 → zbuilder-0.2.4}/src/zbuilder/cfg.py

@@ -1,9 +1,8 @@
 import os
+from pathlib import Path
 
 import zbuilder.helpers
 
-from pathlib import Path
-
 CONFIG_PATH = "~/.config/zbuilder/zbuilder.yaml"
 CONFIG_EMPTY = """# ZBuilder configuration
 main: {}
@@ -14,8 +13,7 @@ providers: {}
 
 def initConfig(fname):
     Path(fname).parent.mkdir(parents=True, exist_ok=True)
-    Path(fname).touch()
-    Path(fname).open("w").write(CONFIG_EMPTY)
+    Path(fname).write_text(CONFIG_EMPTY)
 
 
 def load(touch=False):

{zbuilder-0.2.2 → zbuilder-0.2.4}/src/zbuilder/cli.py

@@ -1,26 +1,25 @@
-# -*- coding: utf-8 -*-
 import os
+import sys
 import time
+
 import click
-import tabulate
-import dpath.util
 import distutils.dir_util
+import dpath.util
+import tabulate
+from click.shell_completion import get_completion_class
 
-import zbuilder.vm
 import zbuilder.cfg
 import zbuilder.plugins
-
+import zbuilder.vm
 from zbuilder.helpers import (
+    fixKeys,
     getHosts,
     getProviders,
-    runPlaybook,
-    fixKeys,
-    runCmd,
     humanize_time,
+    runCmd,
+    runPlaybook,
 )
-from zbuilder.options import pass_state, common_options
-
-from click.shell_completion import get_completion_class
+from zbuilder.options import common_options, pass_state
 
 
 @click.group()
@@ -42,11 +41,11 @@ def init(state, template):
     tmpl_path = dpath.util.get(cfg, "/main/templates/path")
     TEMPLATE_PATH = os.path.join(os.path.expanduser(tmpl_path), template)
     if os.path.exists(TEMPLATE_PATH):
-        click.echo("Initializing {} based zbuilder environment".format(template))
+        click.echo(f"Initializing {template} based zbuilder environment")
         distutils.dir_util.copy_tree(TEMPLATE_PATH, os.getcwd())
     else:
-        click.echo("Template path dose not exist: [{}]".format(TEMPLATE_PATH))
-        exit(1)
+        click.echo(f"Template path dose not exist: [{TEMPLATE_PATH}]")
+        sys.exit(1)
 
 
 @cli.command()
@@ -57,7 +56,7 @@ def build(state):
     start_time = time.time()
     click.echo("Building VMs")
     vmProviders = getHosts(state)
-    for _, vmProvider in vmProviders.items():
+    for vmProvider in vmProviders.values():
         vmProvider["cloud"].build(vmProvider["hosts"])
     click.echo("Fixing ssh keys VMs")
     fixKeys(state)
@@ -65,7 +64,7 @@ def build(state):
         click.echo("Running bootstrap.yml")
         runPlaybook(state, "bootstrap.yml")
     end_time = time.time()
-    click.echo("Time elapsed: {}".format(humanize_time(end_time - start_time)))
+    click.echo(f"Time elapsed: {humanize_time(end_time - start_time)}")
 
 
 @cli.command()
@@ -75,7 +74,7 @@ def up(state):
     """Boot the VMs"""
     click.echo("Booting VMs")
     vmProviders = getHosts(state)
-    for _, vmProvider in vmProviders.items():
+    for vmProvider in vmProviders.values():
         vmProvider["cloud"].up(vmProvider["hosts"])
 
 
@@ -86,7 +85,7 @@ def halt(state):
     """Halt the VMs"""
     click.echo("Halting VMs")
     vmProviders = getHosts(state)
-    for _, vmProvider in vmProviders.items():
+    for vmProvider in vmProviders.values():
         vmProvider["cloud"].halt(vmProvider["hosts"])
 
 
@@ -97,7 +96,7 @@ def destroy(state):
     """Destroy the VMs"""
     click.echo("Destroying VMs")
     vmProviders = getHosts(state)
-    for _, vmProvider in vmProviders.items():
+    for vmProvider in vmProviders.values():
         zbuilder_env = None
         for h in vmProvider["hosts"]:
             if "ZBUILDER_ENV" in vmProvider["hosts"][h]:
@@ -108,7 +107,7 @@ def destroy(state):
                     zbuilder_env = vmProvider["hosts"][h]["ZBUILDER_ENV"]
                     break
         if zbuilder_env:
-            if click.confirm("  The ZBUILDER_ENV is set to [{}] Do you want to continue?".format(zbuilder_env)):
+            if click.confirm(f"  The ZBUILDER_ENV is set to [{zbuilder_env}] Do you want to continue?"):
                 vmProvider["cloud"].destroy(vmProvider["hosts"])
             else:
                 click.echo("    Aborting!")
@@ -128,7 +127,6 @@ def fixkeys(state):
 @cli.group()
 def dns():
     """DNS management"""
-    pass
 
 
 @dns.command(name="update")
@@ -138,7 +136,7 @@ def dns_update(state):
     """Update DNS records"""
     click.echo("Updating DNS records")
     vmProviders = getHosts(state)
-    for _, vmProvider in vmProviders.items():
+    for vmProvider in vmProviders.values():
         vmProvider["cloud"].dnsupdate(vmProvider["hosts"])
 
 
@@ -149,14 +147,13 @@ def remove(state):
     """Remove DNS records"""
     click.echo("Removing DNS records")
     vmProviders = getHosts(state)
-    for _, vmProvider in vmProviders.items():
+    for vmProvider in vmProviders.values():
         vmProvider["cloud"].dnsremove(vmProvider["hosts"])
 
 
 @cli.group()
 def snapshot():
     """Manage VM snapshots"""
-    pass
 
 
 @snapshot.command()
@@ -166,7 +163,7 @@ def create(state):
     """Create VM snapshots"""
     click.echo("Creating VMs snapshots")
     vmProviders = getHosts(state)
-    for _, vmProvider in vmProviders.items():
+    for vmProvider in vmProviders.values():
         vmProvider["cloud"].snapCreate(vmProvider["hosts"])
 
 
@@ -177,7 +174,7 @@ def restore(state):
     """Restore VM snapshots"""
     click.echo("Restoring VMs snapshots")
     vmProviders = getHosts(state)
-    for _, vmProvider in vmProviders.items():
+    for vmProvider in vmProviders.values():
         vmProvider["cloud"].snapRestore(vmProvider["hosts"])
 
 
@@ -188,7 +185,7 @@ def delete(state):
     """Delete VM snapshots"""
     click.echo("Deleting VMs snapshots")
     vmProviders = getHosts(state)
-    for _, vmProvider in vmProviders.items():
+    for vmProvider in vmProviders.values():
         vmProvider["cloud"].snapDelete(vmProvider["hosts"])
 
 
@@ -207,7 +204,7 @@ def summary(state):
     """Display environment summary"""
     vmProviders = getHosts(state)
     data = []
-    for _, vmProvider in vmProviders.items():
+    for vmProvider in vmProviders.values():
         for h, v in vmProvider["hosts"].items():
             data.append([vmProvider["cloud"].factory, h, vmProvider["cloud"].params(v)])
     click.echo(tabulate.tabulate(data, headers=["Provider", "Host", "Parameters"], tablefmt="psql"))
@@ -227,7 +224,6 @@ def providers(state):
 @cli.group()
 def config():
     """Zbuilder configuration"""
-    pass
 
 
 @config.command()
@@ -255,9 +251,9 @@ def main(state, args):
     sub_path, value = args[1].split("=")
     if "," in value:
         value = value.split(",")
-    cfg_path = "main/{}/{}".format(base_path, sub_path)
+    cfg_path = f"main/{base_path}/{sub_path}"
 
-    click.echo("Setting config /{} to {}".format(cfg_path, value))
+    click.echo(f"Setting config /{cfg_path} to {value}")
     dpath.util.new(cfg, cfg_path, value)
     zbuilder.cfg.save(cfg)
 
@@ -277,9 +273,9 @@ def provider(state, args):
         value = True
     if value in ["False", "false"]:
         value = False
-    cfg_path = "providers/{}/{}".format(base_path, sub_path)
+    cfg_path = f"providers/{base_path}/{sub_path}"
 
-    click.echo("Setting config /{} to {}".format(cfg_path, value))
+    click.echo(f"Setting config /{cfg_path} to {value}")
     dpath.util.new(cfg, cfg_path, value)
     zbuilder.cfg.save(cfg)
 
@@ -298,7 +294,7 @@ def update(state, yes):
         tmpl_path = dpath.util.get(cfg, "/main/templates/path")
         if tmpl_repo and tmpl_path:
             click.echo(" * Updating templates")
-            runCmd("git -C {path} pull || git clone {repo} {path}".format(repo=tmpl_repo, path=tmpl_path))
+            runCmd(f"git -C {tmpl_path} pull || git clone {tmpl_repo} {tmpl_path}")
     except KeyError:
         pass
 
@@ -313,7 +309,7 @@ def plugins(state):
             p = zbuilder.vm.vmProvider(plugin)
             if p.enabled():
                 click.echo(f"  - {plugin:8}: enabled")
-        except Exception:
+        except Exception:  # noqa: BLE001, S110 - a provider that can't even construct just isn't listed
             pass
 
 

{zbuilder-0.2.2 → zbuilder-0.2.4}/src/zbuilder/dns/__init__.py

@@ -1,5 +1,7 @@
 import time
+
 import click
+import dns.exception
 import dns.resolver
 
 import zbuilder.cfg
@@ -8,34 +10,29 @@ import zbuilder.plugins
 
 def waitDNS(hostname, ip):
     synced = False
-    click.echo("  - Waiting for host [{}] DNS to sync".format(hostname))
+    click.echo(f"  - Waiting for host [{hostname}] DNS to sync")
     while not synced:
         try:
             answers = dns.resolver.query(hostname, "A")
             ttl = answers.rrset.ttl
             rip = answers[0].address
             if rip == ip:
-                click.echo("  - Host [{}] is synced with ip [{}]".format(hostname, rip))
+                click.echo(f"  - Host [{hostname}] is synced with ip [{rip}]")
                 synced = True
             else:
-                click.echo(
-                    "  - Host [{}] is not synced with ip [{} != {}], sleeping for [{}]".format(
-                        hostname, ip, rip, ttl + 1
-                    )
-                )
+                click.echo(f"  - Host [{hostname}] is not synced with ip [{ip} != {rip}], sleeping for [{ttl + 1}]")
                 time.sleep(ttl + 1)
         except dns.resolver.NXDOMAIN:
             click.echo("    Sleeping 20s due to NXDOMAIN")
             time.sleep(20)
-        except Exception as e:
-            click.echo(e)
-            exit()
+        except dns.exception.DNSException as e:
+            raise click.ClickException(str(e)) from e
 
 
 def getProvider(zone, cfg):
-    for p, v in cfg.items():
+    for v in cfg.values():
         if "dns" in v and "zones" in v["dns"] and zone == v["dns"]["zones"]:
-            return dnsProvider(cfg[p]["type"], cfg[p])
+            return dnsProvider(v["type"], v)
     return None
 
 
@@ -50,7 +47,7 @@ def dnsUpdate(ips):
             provider.update(host, zone, ip)
             waitList[hostname] = ip
         else:
-            click.echo("No DNS provider found for zone [{}]".format(zone))
+            click.echo(f"No DNS provider found for zone [{zone}]")
 
     for hostname, ip in waitList.items():
         waitDNS(hostname, ip)
@@ -65,7 +62,7 @@ def dnsRemove(hosts):
         if provider:
             provider.remove(host, zone)
         else:
-            click.echo("No DNS provider found for zone [{}]".format(zone))
+            click.echo(f"No DNS provider found for zone [{zone}]")
 
 
 def dnsProvider(factory, cfg=None):

{zbuilder-0.2.2 → zbuilder-0.2.4}/src/zbuilder/dns/aws.py

@@ -1,5 +1,6 @@
-import click
 import boto3
+import click
+from botocore.exceptions import BotoCoreError, ClientError
 
 from zbuilder.base import DNSProvider
 
@@ -21,8 +22,8 @@ class dnsProvider(DNSProvider):
         response = self.route53.list_hosted_zones_by_name(DNSName=zone)
         if response["HostedZones"]:
             zoneID = response["HostedZones"][0]["Id"]
-            fqdn = "{}.{}".format(host, zone)
-            click.echo("  - Update record [{}] with ip [{}]".format(fqdn, ip))
+            fqdn = f"{host}.{zone}"
+            click.echo(f"  - Update record [{fqdn}] with ip [{ip}]")
 
             oldIP = None
             record_set = self.route53.list_resource_record_sets(
@@ -57,14 +58,14 @@ class dnsProvider(DNSProvider):
                         ChangeInfoID = response["ChangeInfo"]["Id"]
                         waiter = self.route53.get_waiter("resource_record_sets_changed")
                         waiter.wait(Id=ChangeInfoID)
-                except Exception as e:
-                    click.echo("    Error: [{}]".format(e))
+                except (BotoCoreError, ClientError) as e:
+                    click.echo(f"    Error: [{e}]")
 
     def remove(self, host, zone):
         response = self.route53.list_hosted_zones_by_name(DNSName=zone)
         if response["HostedZones"]:
             zoneID = response["HostedZones"][0]["Id"]
-            fqdn = "{}.{}".format(host, zone)
+            fqdn = f"{host}.{zone}"
             ip = None
             record_set = self.route53.list_resource_record_sets(
                 HostedZoneId=zoneID,
@@ -76,7 +77,7 @@ class dnsProvider(DNSProvider):
                 ip = rs["ResourceRecords"][0]["Value"]
 
             if ip is not None:
-                click.echo("  - Remove record [{}] with IP [{}]".format(fqdn, ip))
+                click.echo(f"  - Remove record [{fqdn}] with IP [{ip}]")
                 try:
                     response = self.route53.change_resource_record_sets(
                         HostedZoneId=zoneID,
@@ -95,7 +96,7 @@ class dnsProvider(DNSProvider):
                             ],
                         },
                     )
-                except Exception as e:
-                    click.echo("    Error: [{}]".format(e))
+                except (BotoCoreError, ClientError) as e:
+                    click.echo(f"    Error: [{e}]")
             else:
-                click.echo("  - DNS record [{}] does not exist".format(fqdn))
+                click.echo(f"  - DNS record [{fqdn}] does not exist")

{zbuilder-0.2.2 → zbuilder-0.2.4}/src/zbuilder/dns/bind.py

@@ -22,27 +22,27 @@ class dnsProvider(DNSProvider):
             response = dns.query.tcp(update, srv)
             if response.rcode():
                 err = dns.rcode.to_text(response.rcode())
-                click.echo("      Failed to update DNS record [{}] on server [{}]".format(err, srv))
+                click.echo(f"      Failed to update DNS record [{err}] on server [{srv}]")
 
     def update(self, host, zone, ip):
         if ip is None:
             click.echo("  - Skipping due to empty ip")
             return
-        fqdn = "{}.{}".format(host, zone)
-        click.echo("  - Creating/Updating record [{}] with ip [{}]".format(fqdn, ip))
+        fqdn = f"{host}.{zone}"
+        click.echo(f"  - Creating/Updating record [{fqdn}] with ip [{ip}]")
         update = dns.update.Update(zone, keyring=self.keyring)
         update.replace(host, 300, "a", str(ip))
         self._dns_query(update)
 
     def remove(self, host, zone):
-        fqdn = "{}.{}".format(host, zone)
-        click.echo("  - Removing record {}".format(fqdn))
+        fqdn = f"{host}.{zone}"
+        click.echo(f"  - Removing record {fqdn}")
         update = dns.update.Update(zone, keyring=self.keyring)
         update.delete(host)
         self._dns_query(update)
 
     def config(self):
-        return "server: {}, keyname: {}".format(self.server, self.keyname)
+        return f"server: {self.server}, keyname: {self.keyname}"
 
     def status(self):
         return "PASS"