#210 fix

Signed-off-by: 6za <53096417+6za@users.noreply.github.com>
konstructio · Aug 10, 2022 · 066f73c · 066f73c
1 parent 7185873
commit 066f73c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 25 deletions.
diff --git a/cmd/createGithub.go b/cmd/createGithub.go
@@ -70,20 +70,20 @@ var createGithubCmd = &cobra.Command{
 			return err
 		}
 
+		directory := fmt.Sprintf("%s/gitops/terraform/base", config.K1FolderPath)
+		informUser("Creating K8S Cluster")
+		terraform.ApplyBaseTerraform(dryRun, directory)
+
 		informUser("populating gitops/metaphor repos")
 		err = githubPopulateCmd.RunE(cmd, args)
 		if err != nil {
 			return err
 		}
 
-		directory := fmt.Sprintf("%s/gitops/terraform/base", config.K1FolderPath)
-		informUser("Creating K8S Cluster")
-		terraform.ApplyBaseTerraform(dryRun, directory)
-
 		//progressPrinter.IncrementTracker("step-terraform", 1)
 
-		//informUser("Attempt to recycle certs")
-		//restoreSSLCmd.Run(cmd, args)
+		informUser("Attempt to recycle certs")
+		restoreSSLCmd.Run(cmd, args)
 
 		/*
 

diff --git a/cmd/githubAdd.go b/cmd/githubAdd.go
@@ -8,6 +8,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/kubefirst/kubefirst/configs"
+	"github.com/kubefirst/kubefirst/internal/gitClient"
 	"github.com/kubefirst/kubefirst/internal/githubWrapper"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -20,6 +22,14 @@ var githubAddCmd = &cobra.Command{
 	Long:  `TBD`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		fmt.Println("githubAddCmd called")
+		config := configs.ReadConfig()
+		owner, err := cmd.Flags().GetString("github-owner")
+		if err != nil {
+			return err
+		}
+		viper.Set("github.owner", owner)
+		viper.WriteConfig()
+
 		org, err := cmd.Flags().GetString("github-org")
 		if err != nil {
 			return err
@@ -52,6 +62,15 @@ var githubAddCmd = &cobra.Command{
 				return err
 			}
 		}
+
+		_, err = gitClient.CloneRepoAndDetokenize(config.GitopsTemplateURL, "gitops", "main")
+		if err != nil {
+			return err
+		}
+		_, err = gitClient.CloneRepoAndDetokenize(config.MetaphorTemplateURL, "metaphor", "main")
+		if err != nil {
+			return err
+		}
 		viper.Set("github.enabled", true)
 		viper.Set("github.repo.added", true)
 		viper.WriteConfig()

diff --git a/cmd/githubPopulate.go b/cmd/githubPopulate.go
@@ -27,10 +27,6 @@ to quickly create a Cobra application.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		fmt.Println("githubPopulate called")
 		config := configs.ReadConfig()
-		owner, err := cmd.Flags().GetString("github-owner")
-		if err != nil {
-			return err
-		}
 
 		githubHost, err := cmd.Flags().GetString("github-host")
 		if err != nil {
@@ -40,8 +36,6 @@ to quickly create a Cobra application.`,
 		if err != nil {
 			return err
 		}
-		viper.Set("github.owner", owner)
-		viper.WriteConfig()
 
 		log.Println("dry-run:", dryrun)
 
@@ -54,19 +48,13 @@ to quickly create a Cobra application.`,
 			return nil
 		}
 
+		owner := viper.GetString("github.owner")
 		//sourceFolder := fmt.Sprintf("%s/sample", config.K1FolderPath)
-		sourceFolder, err := gitClient.CloneRepoAndDetokenize(config.GitopsTemplateURL, "gitops", "main")
-		if err != nil {
-			return err
-		}
-		fmt.Println("githubPopulate:", sourceFolder)
-		gitClient.PopulateRepoWithToken(owner, "gitops", sourceFolder, githubHost)
-		sourceFolder, err = gitClient.CloneRepoAndDetokenize(config.MetaphorTemplateURL, "metaphor", "main")
-		if err != nil {
-			return err
-		}
-		fmt.Println("githubPopulate:", sourceFolder)
-		gitClient.PopulateRepoWithToken(owner, "metaphor", sourceFolder, githubHost)
+		fmt.Println("githubPopulate: gitops")
+		gitClient.PopulateRepoWithToken(owner, "gitops", fmt.Sprintf("%s/%s", config.K1FolderPath, "gitops"), githubHost)
+
+		fmt.Println("githubPopulate: metaphor")
+		gitClient.PopulateRepoWithToken(owner, "metaphor", fmt.Sprintf("%s/%s", config.K1FolderPath, "metaphor"), githubHost)
 		viper.Set("github.metaphor-pushed", true)
 
 		viper.Set("github.repo.populated", true)

diff --git a/pkg/helpers.go b/pkg/helpers.go
@@ -71,7 +71,7 @@ func DetokenizeDirectory(path string, fi os.FileInfo, err error) error {
 		if gitlabConfigured {
 			newContents = strings.Replace(string(read), "ssh://soft-serve.soft-serve.svc.cluster.local:22/gitops", fmt.Sprintf("https://gitlab.%s/kubefirst/gitops.git", viper.GetString("aws.hostedzonename")), -1)
 		} else if githubConfigured {
-			newContents = strings.Replace(string(read), "https://gitlab.<AWS_HOSTED_ZONE_NAME>/kubefirst/gitops.git", "git@github.com:"+githubRepoOwner+"/"+"gitops.git", -1)
+			newContents = strings.Replace(string(read), "https://gitlab.<AWS_HOSTED_ZONE_NAME>/kubefirst/gitops", "git@github.com:"+githubRepoOwner+"/"+"gitops", -1)
 		} else {
 			newContents = strings.Replace(string(read), "https://gitlab.<AWS_HOSTED_ZONE_NAME>/kubefirst/gitops.git", "ssh://soft-serve.soft-serve.svc.cluster.local:22/gitops", -1)
 		}