kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

refactor: just return stuff

Browse source
This commit is contained in:
Kat Inskip 2023-01-27 15:26:01 -08:00
parent 671d858731
commit a1d954f29a
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
iac/ca.go
View file

@ -3,7 +3,6 @@ package iac
import( import(
"github.com/pulumi/pulumi/sdk/v3/go/pulumi" "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
tls "github.com/pulumi/pulumi-tls/sdk/v4/go/tls" tls "github.com/pulumi/pulumi-tls/sdk/v4/go/tls"
"log"
) )
func GenerateTLSCA(ctx *pulumi.Context) (key *tls.PrivateKey, cert *tls.SelfSignedCert, err error) { 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 { if err != nil {
log.Fatal(err) return nil, nil, err
} }
cert, err = tls.NewSelfSignedCert(ctx, "kat-root-ca-pem-cert", &tls.SelfSignedCertArgs{ 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 { if err != nil {
log.Fatal(err) return nil, nil, err
} }
ctx.Export("tls_ca_pem_key", key.PrivateKeyPem) ctx.Export("tls_ca_pem_key", key.PrivateKeyPem)

15
main.go
View file

@ -4,7 +4,6 @@ import (
"github.com/pulumi/pulumi/sdk/v3/go/pulumi" "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
tailscale "github.com/pulumi/pulumi-tailscale/sdk/go/tailscale" tailscale "github.com/pulumi/pulumi-tailscale/sdk/go/tailscale"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"log"
"os" "os"
iac "kittywitch/iac" iac "kittywitch/iac"
) )
@ -15,11 +14,11 @@ func main() {
configFile, err := os.ReadFile("config.yaml") configFile, err := os.ReadFile("config.yaml")
if err != nil { if err != nil {
log.Fatal(err) return
} }
if err := yaml.Unmarshal(configFile, &katConfig); err != nil { if err := yaml.Unmarshal(configFile, &katConfig); err != nil {
log.Fatal(err) return
} }
pulumi.Run(func(ctx *pulumi.Context) error { pulumi.Run(func(ctx *pulumi.Context) error {
@ -32,27 +31,27 @@ func main() {
zones, _, records, err := iac.HandleDNS(ctx, katConfig) zones, _, records, err := iac.HandleDNS(ctx, katConfig)
if err != nil { if err != nil {
log.Fatal(err) return err
} }
records, err = iac.HandleTSRecords(ctx, tailnet, zones, records) records, err = iac.HandleTSRecords(ctx, tailnet, zones, records)
if err != nil { if err != nil {
log.Fatal(err) return err
} }
ca_key, ca_cert, err := iac.GenerateTLSCA(ctx) ca_key, ca_cert, err := iac.GenerateTLSCA(ctx)
if err != nil { if err != nil {
log.Fatal(err) return err
} }
// keys, crs, certs // keys, crs, certs
_, _, _, err = iac.HandleTSHostCerts(ctx, tailnet, ca_key, ca_cert) _, _, _, err = iac.HandleTSHostCerts(ctx, tailnet, ca_key, ca_cert)
if err != nil { if err != nil {
log.Fatal(err) return err
} }
return nil return err
}) })
} }