Resolveの戻り値を追加

harakeishi · Feb 1, 2022 · eb4acf8 · eb4acf8
1 parent 016e22a
commit eb4acf8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -19,7 +19,7 @@ var rootCmd = &cobra.Command{
 			fmt.Println(err)
 			os.Exit(1)
 		}
-		if err := whris.Resolve(domain, v); err != nil {
+		if _, err := whris.Resolve(domain, v); err != nil {
 			fmt.Println(err)
 			os.Exit(1)
 		}

diff --git a/whris/whris.go b/whris/whris.go
@@ -23,31 +23,31 @@ type Summary struct {
 	ParseResult         []NetworkAdmin
 }
 
-func Resolve(domain string, verbose bool) error {
+func Resolve(domain string, verbose bool) (Summary, error) {
 	var summary Summary
 	summary.WhoisResponseServer = "whois.apnic.net"
 	summary.TargetDomain = domain
 	addr, err := net.ResolveIPAddr("ip", domain)
 	if err != nil {
-		return err
+		return Summary{}, err
 	}
 	summary.TargetIp = addr.String()
 	summary.WhoisResponse, err = whois.Whois(summary.TargetIp, "whois.iana.org")
 	if err != nil {
-		return err
+		return Summary{}, err
 	}
 	summary.SetWhoisResponseServerFromWhoisResponse()
 	summary.ParseWhoisResponse()
 	if !summary.ParseCheck() {
 		summary.ParseResult = summary.ParseResult[1:]
 		summary.WhoisResponse, err = whois.Whois(summary.TargetIp, summary.WhoisResponseServer)
 		if err != nil {
-			return err
+			return Summary{}, err
 		}
 		summary.ParseWhoisResponse()
 	}
 	summary.EchoResult(verbose)
-	return nil
+	return summary, nil
 }
 
 func (s *Summary) ParseWhoisResponse() error {