Add certificatePinning key to https

Author: Aiden Keating

pkg/cmd/clientConfig.go

@@ -141,7 +141,7 @@ kubectl plugin mobile get clientconfig`,
 				if err != nil {
 					return errors.Wrap(err, "Could not append HTTPS configuration for services")
 				}
-				outputJSON.Https = servicePinningHashes
+				outputJSON.Https.CertificatePinning = servicePinningHashes
 			}
 
 			if err := ccc.Out.Render("get"+cmd.Name(), outputType(cmd.Flags()), outputJSON); err != nil {

pkg/cmd/convert.go

@@ -15,15 +15,15 @@
 package cmd
 
 import (
-	"strings"
-	"k8s.io/client-go/pkg/api/v1"
 	"crypto/sha256"
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/base64"
 	"fmt"
 	"github.com/pkg/errors"
+	"k8s.io/client-go/pkg/api/v1"
 	"net/url"
+	"strings"
 )
 
 func isClientConfigKey(key string) bool {

pkg/cmd/types.go

@@ -71,12 +71,12 @@ type SecretConvertor interface {
 
 //ServiceConfigs are collection of configurations for services in a specific namespace
 type ServiceConfigs struct {
-	Version     int                       `json:"version"`
-	ClusterName string                    `json:"clusterName"`
-	Namespace   string                    `json:"namespace"`
-	ClientID    string                    `json:"clientId,omitempty"`
-	Services    []*ServiceConfig          `json:"services"`
-	Https       []*CertificatePinningHash `json:"https,omitempty"`
+	Version     int              `json:"version"`
+	ClusterName string           `json:"clusterName"`
+	Namespace   string           `json:"namespace"`
+	ClientID    string           `json:"clientId,omitempty"`
+	Services    []*ServiceConfig `json:"services"`
+	Https       HttpsConfig      `json:"https,omitempty"`
 }
 
 //ServiceConfig is the configuration for a specific service
@@ -88,6 +88,10 @@ type ServiceConfig struct {
 	Config map[string]interface{} `json:"config"`
 }
 
+type HttpsConfig struct {
+	CertificatePinning []*CertificatePinningHash `json:"certificatePinning,omitempty"`
+}
+
 type CertificatePinningHash struct {
 	Host            string `json:"host"`
 	CertificateHash string `json:"certificateHash"`