From a1d954f29aa5ba4d4f06d062bb829f2a28cf85a1 Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Fri, 27 Jan 2023 15:26:01 -0800
Subject: [PATCH] refactor: just return stuff

---
 iac/ca.go |  5 ++---
 main.go   | 15 +++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/iac/ca.go b/iac/ca.go
index d12125e0..0e65ba5b 100644
--- a/iac/ca.go
+++ b/iac/ca.go
@@ -3,7 +3,6 @@ package iac
 import(
   "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
   tls "github.com/pulumi/pulumi-tls/sdk/v4/go/tls"
-  "log"
 )
 
 func GenerateTLSCA(ctx *pulumi.Context) (key *tls.PrivateKey, cert *tls.SelfSignedCert, err error) {
@@ -13,7 +12,7 @@ func GenerateTLSCA(ctx *pulumi.Context) (key *tls.PrivateKey, cert *tls.SelfSign
     })
 
     if err != nil {
-      log.Fatal(err)
+      return nil, nil, err
     }
 
     cert, err = tls.NewSelfSignedCert(ctx, "kat-root-ca-pem-cert", &tls.SelfSignedCertArgs{
@@ -30,7 +29,7 @@ func GenerateTLSCA(ctx *pulumi.Context) (key *tls.PrivateKey, cert *tls.SelfSign
     })
 
     if err != nil {
-      log.Fatal(err)
+      return nil, nil, err
     }
 
     ctx.Export("tls_ca_pem_key", key.PrivateKeyPem)
diff --git a/main.go b/main.go
index f82161a4..ef5eaf26 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,6 @@ import (
   "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
   tailscale "github.com/pulumi/pulumi-tailscale/sdk/go/tailscale"
   "gopkg.in/yaml.v3"
-  "log"
   "os"
   iac "kittywitch/iac"
 )
@@ -15,11 +14,11 @@ func main() {
   configFile, err := os.ReadFile("config.yaml")
 
   if err != nil {
-    log.Fatal(err)
+    return
   }
 
   if err := yaml.Unmarshal(configFile, &katConfig); err != nil {
-    log.Fatal(err)
+    return
   }
 
   pulumi.Run(func(ctx *pulumi.Context) error {
@@ -32,27 +31,27 @@ func main() {
     zones, _, records, err := iac.HandleDNS(ctx, katConfig)
 
     if err != nil {
-      log.Fatal(err)
+      return err
     }
 
     records, err = iac.HandleTSRecords(ctx, tailnet, zones, records)
 
     if err != nil {
-      log.Fatal(err)
+      return err
     }
 
     ca_key, ca_cert, err := iac.GenerateTLSCA(ctx)
 
     if err != nil {
-      log.Fatal(err)
+      return err
     }
 
     // keys, crs, certs
     _, _, _, err = iac.HandleTSHostCerts(ctx, tailnet, ca_key, ca_cert)
 
     if err != nil {
-      log.Fatal(err)
+      return err
     }
-    return nil
+    return err
   })
 }