From 23d0ba88be51d1816ee49940df9b9ea039be1840 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Thu, 12 Dec 2019 14:27:37 +0100
Subject: [PATCH] cmd/devp2p: address code review issues

---
 cmd/devp2p/dns_route53.go | 15 +++++++--------
 cmd/devp2p/dnscmd.go      |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/cmd/devp2p/dns_route53.go b/cmd/devp2p/dns_route53.go
index 99568be19e..1e9b39b0ea 100644
--- a/cmd/devp2p/dns_route53.go
+++ b/cmd/devp2p/dns_route53.go
@@ -34,13 +34,13 @@ import (
 var (
 	route53AccessKeyFlag = cli.StringFlag{
 		Name:   "access-key-id",
-		Usage:  "Route53 Access Key ID",
-		EnvVar: "ROUTE53_ACCESS_KEY_ID",
+		Usage:  "AWS Access Key ID",
+		EnvVar: "AWS_ACCESS_KEY_ID",
 	}
 	route53AccessSecretFlag = cli.StringFlag{
 		Name:   "access-key-secret",
-		Usage:  "Route53 Access Key Secret",
-		EnvVar: "ROUTE53_ACCESS_KEY_SECRET",
+		Usage:  "AWS Access Key Secret",
+		EnvVar: "AWS_SECRET_ACCESS_KEY",
 	}
 	route53ZoneIDFlag = cli.StringFlag{
 		Name:  "zone-id",
@@ -53,8 +53,8 @@ type route53Client struct {
 	zoneID string
 }
 
-// newRoute53 sets up a Route53 API client from command line flags.
-func newRoute53(ctx *cli.Context) *route53Client {
+// newRoute53Client sets up a Route53 API client from command line flags.
+func newRoute53Client(ctx *cli.Context) *route53Client {
 	akey := ctx.String(route53AccessKeyFlag.Name)
 	asec := ctx.String(route53AccessSecretFlag.Name)
 	if akey == "" || asec == "" {
@@ -64,7 +64,6 @@ func newRoute53(ctx *cli.Context) *route53Client {
 	session, err := session.NewSession(config)
 	if err != nil {
 		exit(fmt.Errorf("can't create AWS session: %v", err))
-		exit(err)
 	}
 	return &route53Client{
 		api:    route53.New(session),
@@ -85,7 +84,7 @@ func (c *route53Client) deploy(name string, t *dnsdisc.Tree) error {
 		return err
 	}
 	if len(changes) == 0 {
-		log.Info(fmt.Sprintf("No DNS changes needed"))
+		log.Info("No DNS changes needed")
 		return nil
 	}
 
diff --git a/cmd/devp2p/dnscmd.go b/cmd/devp2p/dnscmd.go
index ac51076dc1..cd285a8094 100644
--- a/cmd/devp2p/dnscmd.go
+++ b/cmd/devp2p/dnscmd.go
@@ -211,7 +211,7 @@ func dnsToRoute53(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	client := newRoute53(ctx)
+	client := newRoute53Client(ctx)
 	return client.deploy(domain, t)
 }