Merge pull request #299 from kubernetes-simulator/reduce-init

Reduce the number of times we Terraform init

cmd/init.go

@@ -3,13 +3,14 @@ package cmd
 import (
 	"bufio"
 	"fmt"
+	"os"
+	"strings"
+
 	"github.com/kubernetes-simulator/simulator/pkg/simulator"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"os"
-	"strings"
 )
 
 func saveBucketConfig(logger *logrus.Logger, bucket string) {
@@ -40,7 +41,7 @@ func newInitCommand() *cobra.Command {
 				fmt.Print("Please choose a globally unique name for an S3 bucket to store the terraform state: ")
 				bucket, err := reader.ReadString('\n')
 				if err != nil {
-					return errors.Wrap(err, "Error reading bucket nbame from stdin")
+					return errors.Wrap(err, "Error reading bucket name from stdin")
 				}
 
 				bucket = strings.TrimSpace(bucket)
@@ -67,7 +68,7 @@ func newInitCommand() *cobra.Command {
 			logger.WithFields(logrus.Fields{
 				"BucketName": bucket,
 			}).Warn("Simulator is already configured to use an S3 bucket")
-			logger.Warn("Please remove the state-bucket from simulator.yaml to create another")
+			logger.Warn("Please remove the state-bucket from simulator.yaml then exit and re-enter the container to create another")
 			return nil
 		},
 	}

pkg/simulator/terraform.go

@@ -2,6 +2,7 @@ package simulator
 
 import (
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/kubernetes-simulator/simulator/pkg/childminder"
@@ -105,10 +106,12 @@ func (s *Simulator) InitIfNeeded() error {
 		return errors.Wrap(err, "Error writing tfvars")
 	}
 
-	s.Logger.Info("Running terraform init")
-	_, err = s.Terraform("init")
-	if err != nil {
-		return errors.Wrap(err, "Error initialising terraform")
+	if _, err := os.Stat("/app/terraform/deployments/AWS/.terraform"); os.IsNotExist(err) {
+		s.Logger.Info("Running terraform init")
+		_, err = s.Terraform("init")
+		if err != nil {
+			return errors.Wrap(err, "Error initialising terraform")
+		}
 	}
 
 	return nil