From 463d0894078cce837fb3eb03a51d6d4ea2d890a1 Mon Sep 17 00:00:00 2001 From: Tim White Date: Fri, 29 Mar 2019 10:15:41 +1000 Subject: [PATCH 1/2] Detect private DNS zones in Google and skip them until we get to a public zone --- certbot-dns-google/certbot_dns_google/dns_google.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/certbot-dns-google/certbot_dns_google/dns_google.py b/certbot-dns-google/certbot_dns_google/dns_google.py index 6144acac3..b722a38cf 100644 --- a/certbot-dns-google/certbot_dns_google/dns_google.py +++ b/certbot-dns-google/certbot_dns_google/dns_google.py @@ -274,10 +274,11 @@ class _GoogleClient(object): raise errors.PluginError('Encountered error finding managed zone: {0}' .format(e)) - if zones: - zone_id = zones[0]['id'] - logger.debug('Found id of %s for %s using name %s', zone_id, domain, zone_name) - return zone_id + for zone in zones: + zone_id = zone['id'] + if 'privateVisibilityConfig' not in zone: + logger.debug('Found id of %s for %s using name %s', zone_id, domain, zone_name) + return zone_id raise errors.PluginError('Unable to determine managed zone for {0} using zone names: {1}.' .format(domain, zone_dns_name_guesses)) From 352218510a0bd22385b30d4f6d1d16cc2fd23c87 Mon Sep 17 00:00:00 2001 From: Tim White Date: Fri, 29 Mar 2019 10:20:43 +1000 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1af9ffb3..f76b67654 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). ### Fixed -* +* Fixed Google DNS Challenge issues when private zones exist Despite us having broken lockstep, we are continuing to release new versions of all Certbot components during releases for the time being, however, the only