PyPI - zbuilder - Versions diffs - 0.2.1__tar.gz → 0.2.2__tar.gz - Mend

zbuilder 0.2.1tar.gz → 0.2.2tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

{zbuilder-0.2.1 → zbuilder-0.2.2}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zbuilder
-Version: 0.2.1
+Version: 0.2.2
 Summary: Create VMs
 Author: Nikos Chasiotis
 Author-email: Nikos Chasiotis <hasiotis@gmail.com>
@@ -88,7 +88,7 @@ pipx install --force 'zbuilder[proxmox]'
 | Family | Providers |
 |---|---|
 | VM   | `aws`, `gcp`, `kvm`, `proxmox` |
-| DNS  | `ansible`, `aws`, `bind`, `gcp`, `powerdns` |
+| DNS  | `aws`, `bind`, `gcp`, `powerdns` |
 | IPAM | `phpipam` |
 See the [documentation](https://zbuilder.readthedocs.io/en/stable/) for the

{zbuilder-0.2.1 → zbuilder-0.2.2}/README.md RENAMED Viewed

@@ -44,7 +44,7 @@ pipx install --force 'zbuilder[proxmox]'
 | Family | Providers |
 |---|---|
 | VM   | `aws`, `gcp`, `kvm`, `proxmox` |
-| DNS  | `ansible`, `aws`, `bind`, `gcp`, `powerdns` |
+| DNS  | `aws`, `bind`, `gcp`, `powerdns` |
 | IPAM | `phpipam` |
 See the [documentation](https://zbuilder.readthedocs.io/en/stable/) for the

{zbuilder-0.2.1 → zbuilder-0.2.2}/pyproject.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [project]
 name = "zbuilder"
-version = "0.2.1"
+version = "0.2.2"
 description = "Create VMs"
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]
@@ -62,7 +62,6 @@ kvm = "zbuilder.vm.kvm:vmProvider"
 proxmox = "zbuilder.vm.proxmox:vmProvider"
 [project.entry-points."zbuilder.dns"]
-ansible = "zbuilder.dns.ansible:dnsProvider"
 aws = "zbuilder.dns.aws:dnsProvider"
 bind = "zbuilder.dns.bind:dnsProvider"
 gcp = "zbuilder.dns.gcp:dnsProvider"

{zbuilder-0.2.1 → zbuilder-0.2.2}/pyproject.toml.orig RENAMED Viewed

@@ -1,6 +1,6 @@
 [project]
 name = "zbuilder"
-version = "0.2.1"
+version = "0.2.2"
 description = "Create VMs"
 authors = [{ name = "Nikos Chasiotis", email = "hasiotis@gmail.com" }]
 license = "GPL-3.0-or-later"
@@ -71,7 +71,6 @@ kvm = "zbuilder.vm.kvm:vmProvider"
 proxmox = "zbuilder.vm.proxmox:vmProvider"
 [project.entry-points."zbuilder.dns"]
-ansible = "zbuilder.dns.ansible:dnsProvider"
 aws = "zbuilder.dns.aws:dnsProvider"
 bind = "zbuilder.dns.bind:dnsProvider"
 gcp = "zbuilder.dns.gcp:dnsProvider"

{zbuilder-0.2.1 → zbuilder-0.2.2}/src/zbuilder/dns/__init__.py RENAMED Viewed

@@ -42,7 +42,6 @@ def getProvider(zone, cfg):
 def dnsUpdate(ips):
     cfg = zbuilder.cfg.load()
     waitList = {}
-    provider = None
     for hostname, ip in ips.items():
         zone = hostname.partition(".")[2]
         host = hostname.partition(".")[0]
@@ -53,9 +52,8 @@ def dnsUpdate(ips):
         else:
             click.echo("No DNS provider found for zone [{}]".format(zone))
-    if provider and provider.factory != "ansible":
-        for hostname, ip in waitList.items():
-            waitDNS(hostname, ip)
+    for hostname, ip in waitList.items():
+        waitDNS(hostname, ip)
 def dnsRemove(hosts):

{zbuilder-0.2.1 → zbuilder-0.2.2}/src/zbuilder/dns/aws.py RENAMED Viewed

@@ -8,7 +8,7 @@ class dnsProvider(DNSProvider):
     def __init__(self, cfg):
         super().__init__(cfg)
         if cfg:
-            if "aws_access_key_id" and "aws_access_key_id" in cfg:
+            if "aws_access_key_id" in cfg and "aws_secret_access_key" in cfg:
                 self.route53 = boto3.client(
                     "route53",
                     aws_access_key_id=cfg["aws_access_key_id"],

{zbuilder-0.2.1 → zbuilder-0.2.2}/src/zbuilder/vm/aws.py RENAMED Viewed

@@ -9,7 +9,7 @@ class vmProvider(VMProvider):
     def __init__(self, cfg):
         super().__init__(cfg)
         if cfg:
-            if "aws_access_key_id" and "aws_access_key_id" in cfg:
+            if "aws_access_key_id" in cfg and "aws_secret_access_key" in cfg:
                 self.ec2 = boto3.resource(
                     "ec2",
                     aws_access_key_id=cfg["aws_access_key_id"],
@@ -109,7 +109,7 @@ class vmProvider(VMProvider):
         dnsRemove(hosts)
     def config(self):
-        return "aws_access_key_id: {}".format(self.cfg["aws_access_key_id"])
+        return "aws_access_key_id: {}".format(self.cfg.get("aws_access_key_id", "boto3 default credentials"))
     def status(self):
         return "PASS"

zbuilder-0.2.1/src/zbuilder/dns/ansible.py DELETED Viewed

@@ -1,18 +0,0 @@
-import click
-import massedit
-from zbuilder.base import DNSProvider
-class dnsProvider(DNSProvider):
-    def update(self, host, zone, ip):
-        click.echo("  - Updating record [{}.{}] with ip [{}]".format(host, zone, ip))
-        filenames = ["hosts"]
-        regex = "re.sub('({}.{}).*(ansible_ssh_host=)?(.*)', r'\\1 \\2ansible_host={}', line)".format(host, zone, ip)
-        massedit.edit_files(filenames, [regex], dry_run=False)
-    def remove(self, host, zone):
-        click.echo("  - Removing record [{}.{}]".format(host, zone))
-        filenames = ["hosts"]
-        regex = "re.sub('({}.{}).*(ansible_ssh_host=)?(.*)', r'\\1', line)".format(host, zone)
-        massedit.edit_files(filenames, [regex], dry_run=False)