Enable option to add generic cloud provider

Author: FabianKramm

cmd/init.go

@@ -352,29 +352,74 @@ func (cmd *InitCmd) configureTiller() {
 	}
 }
 
-func (cmd *InitCmd) useDevSpaceCloud() bool {
-	useDevSpaceCloud := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-		Question:               "Do you want to use the devspace cloud? (free ready-to-use kubernetes) (yes | no)",
-		DefaultValue:           "yes",
-		ValidationRegexPattern: "^(yes)|(no)$",
-	}) == "yes"
+func (cmd *InitCmd) useCloudProvider() bool {
+	providerConfig, err := cloud.ParseCloudConfig()
+	if err != nil {
+		log.Fatalf("Error loading cloud config: %v", err)
+	}
+
+	if len(providerConfig) > 1 {
+		cloudProvider := "("
+
+		for name, _ := range providerConfig {
+			if len(cloudProvider) > 1 {
+				", "
+			}
+
+			cloudProvider += name
+		}
+
+		cloudProvider += ")"
+		cloudProviderSelected := ""
+
+		for _, ok := providerConfig[cloudProviderSelected]; ok == false && cloudProviderSelected != "no"; {
+			cloudProviderSelected := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+				Question:     "Do you want to use a cloud provider? (no to skip) " + cloudProvider,
+				DefaultValue: cloud.DevSpaceCloudProviderName,
+			})
+		}
+
+		if cloudProviderSelected != "no" {
+			addToContext := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+				Question:               "Do you want to add the cloud provider to the $HOME/.kube/config file? (yes | no)",
+				DefaultValue:           "yes",
+				ValidationRegexPattern: "^(yes)|(no)$",
+			}) == "yes"
 
-	if useDevSpaceCloud {
-		addToContext := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-			Question:               "Do you want to add the devspace-cloud to the $HOME/.kube/config file? (yes | no)",
+			cmd.config.Cluster.CloudProvider = &cloudProviderSelected
+			cmd.config.Cluster.UseKubeConfig = &addToContext
+
+			err := cloud.Update(providerConfig, cmd.config, true)
+			if err != nil {
+				log.Fatalf("Couldn't authenticate to devspace cloud: %v", err)
+			}
+
+			return true
+		}
+	} else {
+		useDevSpaceCloud := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+			Question:               "Do you want to use the devspace cloud? (free ready-to-use kubernetes) (yes | no)",
 			DefaultValue:           "yes",
 			ValidationRegexPattern: "^(yes)|(no)$",
 		}) == "yes"
 
-		cmd.config.Cluster.DevSpaceCloud = &useDevSpaceCloud
-		cmd.config.Cluster.UseKubeConfig = &addToContext
+		if useDevSpaceCloud {
+			addToContext := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+				Question:               "Do you want to add the devspace-cloud to the $HOME/.kube/config file? (yes | no)",
+				DefaultValue:           "yes",
+				ValidationRegexPattern: "^(yes)|(no)$",
+			}) == "yes"
 
-		err := cloud.Update(cmd.config, true)
-		if err != nil {
-			log.Fatalf("Couldn't authenticate to devspace cloud: %v", err)
-		}
+			cmd.config.Cluster.CloudProvider = &cloud.DevSpaceCloudProviderName
+			cmd.config.Cluster.UseKubeConfig = &addToContext
+
+			err := cloud.Update(providerConfig, cmd.config, true)
+			if err != nil {
+				log.Fatalf("Couldn't authenticate to devspace cloud: %v", err)
+			}
 
-		return true
+			return true
+		}
 	}
 
 	return false

pkg/devspace/clients/kubectl/client.go

@@ -52,8 +52,13 @@ func GetClientConfig() (*rest.Config, error) {
 	}
 
 	// Update devspace cloud cluster config
-	if config.Cluster.DevSpaceCloud != nil && *config.Cluster.DevSpaceCloud {
-		err := cloud.Update(config, false)
+	if config.Cluster.CloudProvider != nil && *config.Cluster.CloudProvider != "" {
+		providerConfig, err := cloud.ParseCloudConfig()
+		if err != nil {
+			log.Fatalf("Couldn't load cloud provider config: %v", err)
+		}
+
+		err = cloud.Update(providerConfig, config, false)
 		if err != nil {
 			log.Warnf("Couldn't update devspace cloud cluster information: %v", err)
 		}

pkg/devspace/cloud/config.go

@@ -0,0 +1,103 @@
+package cloud
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+
+	homedir "github.com/mitchellh/go-homedir"
+	yaml "gopkg.in/yaml.v2"
+)
+
+// DevSpaceCloudConfigPath holds the path to the cloud config file
+const DevSpaceCloudConfigPath = ".devspace/clouds.yaml"
+
+// DevSpaceKubeContextName is the name for the kube config context
+const DevSpaceKubeContextName = "devspace"
+
+// ProviderConfig holds all the different providers and their configuration
+type ProviderConfig map[string]*Provider
+
+// Provider describes the struct to hold the cloud configuration
+type Provider struct {
+	Name        string `yaml:"name,omitempty"`
+	KubeContext string `yaml:"kubecontext,omitempty"`
+	Login       string `yaml:"login,omitempty"`
+	GetConfig   string `yaml:"getConfig,omitempty"`
+	Token       string `yaml:"token,omitempty"`
+}
+
+// DevSpaceCloudProviderName is the name of the default devspace-cloud provider
+const DevSpaceCloudProviderName = "devspace-cloud"
+
+// DevSpaceCloudProviderConfig holds the information for the devspace-cloud
+var DevSpaceCloudProviderConfig = &Provider{
+	Login:       "https://cloud.devspace.covexo.com/login",
+	GetConfig:   "https://cloud.devspace.covexo.com/clusterConfig",
+	KubeContext: DevSpaceKubeContextName,
+}
+
+// ParseCloudConfig parses the cloud configuration and returns a map containing the configurations
+func ParseCloudConfig() (ProviderConfig, error) {
+	homedir, err := homedir.Dir()
+	if err != nil {
+		return nil, err
+	}
+
+	data, err := ioutil.ReadFile(filepath.Join(homedir, DevSpaceCloudConfigPath))
+	if os.IsNotExist(err) {
+		return ProviderConfig{
+			DevSpaceCloudProviderName: DevSpaceCloudProviderConfig,
+		}, nil
+	}
+
+	cloudConfig := make(ProviderConfig)
+	err = yaml.Unmarshal(data, cloudConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	if _, ok := cloudConfig[DevSpaceCloudProviderName]; ok {
+		cloudConfig[DevSpaceCloudProviderName].GetConfig = DevSpaceCloudProviderConfig.GetConfig
+		cloudConfig[DevSpaceCloudProviderName].Login = DevSpaceCloudProviderConfig.Login
+	} else {
+		cloudConfig[DevSpaceCloudProviderName] = DevSpaceCloudProviderConfig
+	}
+
+	for configName, config := range cloudConfig {
+		config.Name = configName
+	}
+
+	return cloudConfig, nil
+}
+
+// SaveCloudConfig saves the provider configuration to file
+func SaveCloudConfig(config ProviderConfig) error {
+	homedir, err := homedir.Dir()
+	if err != nil {
+		return err
+	}
+
+	cfgPath := filepath.Join(homedir, DevSpaceCloudConfigPath)
+
+	for name, provider := range config {
+		provider.Name = ""
+
+		if name == DevSpaceCloudProviderName {
+			provider.Login = ""
+			provider.GetConfig = ""
+		}
+	}
+
+	out, err := yaml.Marshal(config)
+	if err != nil {
+		return err
+	}
+
+	err = os.MkdirAll(filepath.Dir(cfgPath), 0755)
+	if err != nil {
+		return err
+	}
+
+	return ioutil.WriteFile(cfgPath, out, 0600)
+}