Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions cmd/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,18 @@ func (c *Config) GetApiURL() string {
return viper.GetString("api-url")
}

func (c *Config) GetApiCA() string {
if viper.GetString("api-ca") != "" {
return viper.GetString("api-ca")
}
if c.Context.ApiCA != nil {
return *c.Context.ApiCA
}

// fallback to the default specified by viper
return viper.GetString("api-ca")
}

func (c *Config) GetProvider() string {
if viper.GetString("provider") != "" {
return viper.GetString("provider")
Expand Down
2 changes: 2 additions & 0 deletions cmd/config/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ type Contexts struct {
type Context struct {
Name string `json:"name"`
ApiURL *string `json:"api-url,omitempty"`
ApiCA *string `json:"api-ca,omitempty"`
Token string `json:"api-token"`
DefaultProject string `json:"default-project"`
Timeout *time.Duration `json:"timeout,omitempty"`
Expand Down Expand Up @@ -133,6 +134,7 @@ func (c *Config) MustDefaultContext() Context {
func defaultCtx() Context {
return Context{
ApiURL: pointer.PointerOrNil(viper.GetString("api-url")),
ApiCA: pointer.PointerOrNil(viper.GetString("api-ca")),
Token: viper.GetString("api-token"),
}
}
Expand Down
6 changes: 6 additions & 0 deletions cmd/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ func newContextCmd(c *config.Config) *cobra.Command {
},
}
contextAddCmd.Flags().String("api-url", "", "sets the api-url for this context")
contextAddCmd.Flags().String("api-ca", "", "sets the path to a PEM file with a CA in addition to the system CAs for this context")
contextAddCmd.Flags().String("api-token", "", "sets the api-token for this context")
contextAddCmd.Flags().String("default-project", "", "sets a default project to act on")
contextAddCmd.Flags().Duration("timeout", 0, "sets a default request timeout")
Expand All @@ -104,6 +105,7 @@ func newContextCmd(c *config.Config) *cobra.Command {
ValidArgsFunction: c.ContextListCompletion,
}
contextUpdateCmd.Flags().String("api-url", "", "sets the api-url for this context")
contextUpdateCmd.Flags().String("api-ca", "", "sets the path to a PEM file with a CA in addition to the system CAs for this context")
contextUpdateCmd.Flags().String("api-token", "", "sets the api-token for this context")
contextUpdateCmd.Flags().String("default-project", "", "sets a default project to act on")
contextUpdateCmd.Flags().Duration("timeout", 0, "sets a default request timeout")
Expand Down Expand Up @@ -169,6 +171,7 @@ func (c *ctx) add(args []string) error {
ctx := &config.Context{
Name: name,
ApiURL: pointer.PointerOrNil(viper.GetString("api-url")),
ApiCA: pointer.PointerOrNil(viper.GetString("api-ca")),
Token: viper.GetString("api-token"),
DefaultProject: viper.GetString("default-project"),
Timeout: pointer.PointerOrNil(viper.GetDuration("timeout")),
Expand Down Expand Up @@ -211,6 +214,9 @@ func (c *ctx) update(args []string) error {
if viper.IsSet("api-url") {
ctx.ApiURL = pointer.PointerOrNil(viper.GetString("api-url"))
}
if viper.IsSet("api-ca") {
ctx.ApiCA = pointer.PointerOrNil(viper.GetString("api-ca"))
}
if viper.IsSet("api-token") {
ctx.Token = viper.GetString("api-token")
}
Expand Down
5 changes: 3 additions & 2 deletions cmd/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ func (l *login) login() error {
newCtx.Name = viper.GetString("context")
}
newCtx.ApiURL = new(l.c.GetApiURL())
newCtx.ApiCA = new(l.c.GetApiCA())
ctxs.Contexts = append(ctxs.Contexts, &newCtx)
ctx = &newCtx
}
Expand Down Expand Up @@ -122,7 +123,7 @@ func (l *login) login() error {
}

if viper.IsSet("admin-role") {
mc, err := newApiClient(l.c.GetApiURL(), token)
mc, err := newApiClient(l.c, token)
if err != nil {
return err
}
Expand All @@ -142,7 +143,7 @@ func (l *login) login() error {
ctx.Token = token

if ctx.DefaultProject == "" {
mc, err := newApiClient(l.c.GetApiURL(), token)
mc, err := newApiClient(l.c, token)
if err != nil {
return err
}
Expand Down
35 changes: 33 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package cmd

import (
"crypto/tls"
"crypto/x509"
"fmt"
"log/slog"
"net/http"
"os"
"strings"

Expand Down Expand Up @@ -72,6 +76,7 @@ func NewRootCmd(c *config.Config) *cobra.Command {
rootCmd.PersistentFlags().Duration("timeout", 0, "request timeout used for api requests")

rootCmd.PersistentFlags().String("api-url", "", "the url to the metal-stack.io api")
rootCmd.PersistentFlags().String("api-ca", "", "the path to a PEM file to trust for the api endpoint in addition to the system CAs")
rootCmd.PersistentFlags().String("api-token", "", "the token used for api requests")

genericcli.Must(viper.BindPFlags(rootCmd.PersistentFlags()))
Expand All @@ -81,6 +86,7 @@ func NewRootCmd(c *config.Config) *cobra.Command {
viper.MustBindEnv("debug")
viper.MustBindEnv("timeout")
viper.MustBindEnv("api-url")
viper.MustBindEnv("api-ca")
viper.MustBindEnv("api-token")

markdownCmd := &cobra.Command{
Expand Down Expand Up @@ -135,7 +141,7 @@ func initConfigWithViperCtx(c *config.Config) error {
return nil
}

mc, err := newApiClient(c.GetApiURL(), c.GetToken())
mc, err := newApiClient(c, c.GetToken())
if err != nil {
return err
}
Expand All @@ -146,7 +152,10 @@ func initConfigWithViperCtx(c *config.Config) error {
return nil
}

func newApiClient(apiURL, token string) (client.Client, error) {
func newApiClient(c *config.Config, token string) (client.Client, error) {
apiURL := c.GetApiURL()
apiCA := c.GetApiCA()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GetToken() can also be called here.


logLevel := slog.LevelInfo
if viper.GetBool("debug") {
logLevel = slog.LevelDebug
Expand All @@ -159,6 +168,28 @@ func newApiClient(apiURL, token string) (client.Client, error) {
Log: slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: logLevel})),
}

if apiCA != "" {
caPEM, err := os.ReadFile(apiCA)

if err != nil {
return nil, fmt.Errorf("failed to read file %q: %w", apiCA, err)
}
pool, err := x509.SystemCertPool()

if err != nil {
return nil, fmt.Errorf("failed to load system certificate: %w", err)
}
if ok := pool.AppendCertsFromPEM(caPEM); !ok {
return nil, fmt.Errorf("failed to append pem certificate: %q", apiCA)
}
tlsConfig := &tls.Config{
RootCAs: pool,
}
transport := http.DefaultTransport.(*http.Transport).Clone()
transport.TLSClientConfig = tlsConfig

dialConfig.Transport = transport
}
return client.New(dialConfig)
}

Expand Down