Merge pull request #52 from Venafi/zone-in-config

make zone optional for revoke and renew
Venafi · Nov 13, 2019 · b586aa2 · b586aa2
2 parents 9c96f7d + f26815b
commit b586aa2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/cmd/vcert/config.go b/cmd/vcert/config.go
@@ -26,7 +26,7 @@ import (
 	"github.com/Venafi/vcert/pkg/endpoint"
 )
 
-func buildConfig(cf *commandFlags) (cfg vcert.Config, err error) {
+func buildConfig(co command, cf *commandFlags) (cfg vcert.Config, err error) {
 	cfg.LogVerbose = cf.verbose
 
 	if cf.config != "" {
@@ -96,9 +96,10 @@ func buildConfig(cf *commandFlags) (cfg vcert.Config, err error) {
 		}
 		cfg.Zone = cf.zone
 	}
-
-	if cfg.Zone == "" && cfg.ConnectorType != endpoint.ConnectorTypeFake && !(cf.pickupID != "" || cf.pickupIDFile != "") {
-		return cfg, fmt.Errorf("Zone cannot be empty. Use -z option")
+	if co == commandEnroll || co == commandPickup {
+		if cfg.Zone == "" && cfg.ConnectorType != endpoint.ConnectorTypeFake && !(cf.pickupID != "" || cf.pickupIDFile != "") {
+			return cfg, fmt.Errorf("Zone cannot be empty. Use -z option")
+		}
 	}
 
 	return cfg, nil

diff --git a/cmd/vcert/main.go b/cmd/vcert/main.go
@@ -117,7 +117,7 @@ func main() {
 		return
 	}
 
-	cfg, err := buildConfig(cf)
+	cfg, err := buildConfig(co, cf)
 	if err != nil {
 		logger.Panicf("Failed to build vcert config: %s", err)
 	}