Merge pull request nalbury#23 from parinapatel/main

Adds Support for mTLS Certs

Author: nalbury

cmd/root.go

@@ -55,6 +55,13 @@ var rootCmd = &cobra.Command{
 		pql.Auth.Type = viper.GetString("auth-type")
 		pql.Auth.Credentials = config.Secret(viper.GetString("auth-credentials"))
 		pql.Auth.CredentialsFile = viper.GetString("auth-credentials-file")
+		pql.TLSConfig = config.TLSConfig{
+			CAFile: viper.GetString("tls_config.ca_cert_file"),
+			CertFile: viper.GetString("tls_config.cert_file"),
+			KeyFile: viper.GetString("tls_config.key_file"),
+			ServerName: viper.GetString("tls_config.servername"),
+			InsecureSkipVerify: viper.GetBool("tls_config.insecure_skip_verify"),
+		}
 
 		pql.Host = viper.GetString("host")
 		pql.Step = viper.GetString("step")
@@ -72,7 +79,7 @@ var rootCmd = &cobra.Command{
 			pql.Time = t
 		}
 		// Create and set client interface
-		cl, err := promql.CreateClientWithAuth(pql.Host, pql.Auth)
+		cl, err := promql.CreateClientWithAuth(pql.Host, pql.Auth, pql.TLSConfig)
 		if err != nil {
 			errlog.Fatalln(err)
 		}
@@ -160,6 +167,23 @@ func init() {
 	if err := viper.BindPFlag("auth-credentials-file", rootCmd.PersistentFlags().Lookup("auth-credentials-file")); err != nil {
 		errlog.Fatalln(err)
 	}
+	rootCmd.PersistentFlags().String("tls_config.ca_cert_file","","CA cert Path for TLS config")
+	if err := viper.BindPFlag("tls_config.ca_cert_file",rootCmd.PersistentFlags().Lookup("tls_config.ca_cert_file")); err != nil {
+		errlog.Fatalln(err)
+	}
+	rootCmd.PersistentFlags().String("tls_config.cert_file","","client cert Path for TLS config")
+	if err := viper.BindPFlag("tls_config.cert_file",rootCmd.PersistentFlags().Lookup("tls_config.cert_file")); err != nil {
+		errlog.Fatalln(err)
+	}
+	rootCmd.PersistentFlags().String("tls_config.key_file","","client key for TLS config")
+	if err := viper.BindPFlag("tls_config.key_file",rootCmd.PersistentFlags().Lookup("tls_config.key_file")); err != nil {
+		errlog.Fatalln(err)
+	}
+	rootCmd.PersistentFlags().String("tls_config.servername","","server name for TLS config")
+	if err := viper.BindPFlag("tls_config.servername",rootCmd.PersistentFlags().Lookup("tls_config.servername")); err != nil {
+		errlog.Fatalln(err)
+	}
+	rootCmd.PersistentFlags().Bool("tls_config.insecure_skip_verify",false,"disable the TLS verification of server certificates.")
 }
 
 // initConfig reads in config file and ENV variables if set.

pkg/promql/promql.go

@@ -43,22 +43,30 @@ func CreateClient(host string) (v1.API, error) {
 }
 
 // CreateClientWithAuth creates a Client interface witht the provided hostname and auth config
-func CreateClientWithAuth(host string, authCfg config.Authorization) (v1.API, error) {
+func CreateClientWithAuth(host string, authCfg config.Authorization, tlsCfg config.TLSConfig) (v1.API, error) {
 	cfg := api.Config{
 		Address: host,
 	}
+	cmmnConfig := config.HTTPClientConfig{
+		TLSConfig: tlsCfg,
+	}
+	rt, err := config.NewRoundTripperFromConfig(cmmnConfig, "promql", false, false)
+	if err != nil {
+		return nil, err
+	}
 	if authCfg != (config.Authorization{}) {
 		switch {
 		case authCfg.Type == "":
 			return nil, fmt.Errorf("please specify an authentication type, run promql --help for more details")
 		case authCfg.Credentials != "" && authCfg.CredentialsFile != "":
 			return nil, fmt.Errorf("please specify either auth credentials or an auth credential file, not both")
 		case authCfg.Credentials != "":
-			cfg.RoundTripper = config.NewAuthorizationCredentialsRoundTripper(authCfg.Type, config.Secret(authCfg.Credentials), api.DefaultRoundTripper)
+			cfg.RoundTripper = config.NewAuthorizationCredentialsRoundTripper(authCfg.Type, config.Secret(authCfg.Credentials), rt)
 		default:
-			cfg.RoundTripper = config.NewAuthorizationCredentialsFileRoundTripper(authCfg.Type, authCfg.CredentialsFile, api.DefaultRoundTripper)
+			cfg.RoundTripper = config.NewAuthorizationCredentialsFileRoundTripper(authCfg.Type, authCfg.CredentialsFile, rt)
 		}
 	}
+	cfg.RoundTripper = rt
 	a, err := api.NewClient(cfg)
 	if err != nil {
 		return nil, err
@@ -79,6 +87,7 @@ type PromQL struct {
 	NoHeaders       bool
 	Auth            config.Authorization
 	Client          v1.API
+	TLSConfig       config.TLSConfig
 }
 
 // InstantQuery performs an instant query and returns the result