From e1b2de656cddfb106b2e00acc3431b5c4305faf1 Mon Sep 17 00:00:00 2001 From: Phelps Williams Date: Mon, 20 Jul 2020 17:42:47 -0700 Subject: [PATCH 1/5] octodns-compare: Prefix filtering and status code on configuration mismatch --- octodns/cmds/compare.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/octodns/cmds/compare.py b/octodns/cmds/compare.py index 4123643..9bf9f1c 100755 --- a/octodns/cmds/compare.py +++ b/octodns/cmds/compare.py @@ -7,6 +7,7 @@ from __future__ import absolute_import, division, print_function, \ unicode_literals from pprint import pprint +import sys from octodns.cmds.args import ArgumentParser from octodns.manager import Manager @@ -23,13 +24,25 @@ def main(): help='Second source(s) to pull data from') parser.add_argument('--zone', default=None, required=True, help='Zone to compare') - + parser.add_argument('--ignore-prefix', default=None, required=False, + help='Record prefix to ignore from list of changes') args = parser.parse_args() manager = Manager(args.config_file) changes = manager.compare(args.a, args.b, args.zone) + + # Filter changes list based on ignore-prefix argument if present + if args.ignore_prefix: + pattern = args.ignore_prefix + changes = [c for c in changes + if not c.record.fqdn.startswith(pattern)] + pprint(changes) + # Exit with non-zero exit code if changes exist + if len(changes): + sys.exit(1) + if __name__ == '__main__': main() From 58535b3b6976c8e2ec11ab38abb41f784d31e783 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 08:54:31 +0000 Subject: [PATCH 2/5] Bump pycountry from 19.8.18 to 20.7.3 Bumps [pycountry](https://github.com/flyingcircusio/pycountry) from 19.8.18 to 20.7.3. - [Release notes](https://github.com/flyingcircusio/pycountry/releases) - [Changelog](https://github.com/flyingcircusio/pycountry/blob/master/HISTORY.txt) - [Commits](https://github.com/flyingcircusio/pycountry/compare/19.8.18...20.7.3) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index dd1643f..a2ac48a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ natsort==6.2.1 ns1-python==0.16.0 ovh==0.5.0 pycountry-convert==0.7.2 -pycountry==19.8.18 +pycountry==20.7.3 python-dateutil==2.8.1 requests==2.24.0 s3transfer==0.3.3 From 179c89573fb0c7a882d6d5c2eb39ae8b97a9dca7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 14:54:26 +0000 Subject: [PATCH 3/5] Bump google-cloud-core from 1.3.0 to 1.4.1 Bumps [google-cloud-core](https://github.com/googleapis/python-cloud-core) from 1.3.0 to 1.4.1. - [Release notes](https://github.com/googleapis/python-cloud-core/releases) - [Changelog](https://github.com/googleapis/python-cloud-core/blob/master/CHANGELOG.md) - [Commits](https://github.com/googleapis/python-cloud-core/compare/v1.3.0...v1.4.1) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a2ac48a..065eeba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ docutils==0.16 dyn==1.8.1 edgegrid-python==1.1.1 futures==3.2.0; python_version < '3.2' -google-cloud-core==1.3.0 +google-cloud-core==1.4.1 google-cloud-dns==0.32.0 ipaddress==1.0.23; python_version < '3.3' jmespath==0.10.0 From cfa4ac03dd57975aaeeca23f351a11899e536546 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 14:57:57 +0000 Subject: [PATCH 4/5] Bump botocore from 1.17.14 to 1.17.52 Bumps [botocore](https://github.com/boto/botocore) from 1.17.14 to 1.17.52. - [Release notes](https://github.com/boto/botocore/releases) - [Changelog](https://github.com/boto/botocore/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/botocore/compare/1.17.14...1.17.52) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 065eeba..03f1158 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ PyYaml==5.3.1 azure-common==1.1.25 azure-mgmt-dns==3.0.0 boto3==1.14.14 -botocore==1.17.14 +botocore==1.17.52 dnspython==1.16.0 docutils==0.16 dyn==1.8.1 From 229d77eda7d46fb5d50a921204f23028100465bf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 15:04:28 +0000 Subject: [PATCH 5/5] Bump boto3 from 1.14.14 to 1.14.52 Bumps [boto3](https://github.com/boto/boto3) from 1.14.14 to 1.14.52. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.14.14...1.14.52) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 03f1158..24f57ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ PyYaml==5.3.1 azure-common==1.1.25 azure-mgmt-dns==3.0.0 -boto3==1.14.14 +boto3==1.14.52 botocore==1.17.52 dnspython==1.16.0 docutils==0.16