Merge pull request #18 from navi-infra/ch10247

ch10247 | Deepak | adding cli option to run plan
2020-05-06 18:58:06 +05:30
parent a375eee7b0 dcc3608a39
commit da7849e821
7 changed files with 100 additions and 53 deletions
--- a/README.md
+++ b/README.md
@@ -14,6 +14,9 @@ or

 `infra-provisioner -m sample_infra_manifest.json -t database`

+##### Run plan for resources
+`infra-provisioner --manifest sample_infra_manifest.json --plan database`
+
 ##### Provision resource
 `infra-provisioner --manifest sample_infra_manifest.json database`

--- a/bindata.go
+++ b/bindata.go
@@ -84,15 +84,19 @@ func (fi bindataFileInfo) Sys() interface{} {
 }

 var _bindataTemplatesAwsrolestfDeploysh = []byte(
-	"\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x8e\xc1\x4e\xc3\x30\x0c\x86\xef\x79\x0a\xa3\xed\x9a\xee\x19\xa6\xd1" +
-	"\x1b\x4c\x68\x05\x71\xf6\x82\xc3\xa2\x25\x4e\x94\xb8\x6b\xab\x2e\xef\x8e\x86\x60\x9a\xd0\x24\x8e\xb6\xbf\xdf\xdf" +
-	"\xbf\x78\x58\xed\x1d\xaf\xca\x41\xa9\x05\xd0\xe8\x04\x86\x03\x31\x20\x4f\x60\x62\x08\xc8\x1f\x60\xd1\xf9\xa2\x0a" +
-	"\x09\x68\x52\x4a\x28\x67\xb4\x31\x07\x70\xec\xe4\x66\x1c\x62\x3e\x96\x84\x86\xa0\x90\x27\x23\x30\xcf\xd0\xb4\xa3" +
-	"\x64\xdc\x51\x89\x7d\x36\x54\x9a\xf7\x2b\x53\x2b\x9c\xcf\x70\x2f\xcd\x34\xfc\x17\xbd\xb1\x62\x4a\x7e\x02\x8d\xbd" +
-	"\x44\x8d\x29\xe5\x78\x22\xa5\x8e\xfd\x9e\x8c\x78\x30\x91\xad\xfb\x84\xbe\x90\x36\x91\x85\x46\x81\xe5\xbc\x79\x7a" +
-	"\xeb\x5e\xdb\x5d\xbd\x52\x3f\x2f\xec\xb7\xf5\x91\x92\x8f\x53\x20\x96\x66\x8b\xe1\x22\xd3\x77\xd6\x5d\x6f\xad\x1b" +
-	"\x7f\x8f\x7f\x9a\xb6\x7c\x72\x39\xf2\x05\x86\x5a\x9b\x09\x83\x07\xcd\xb0\x9c\xb7\xeb\xe7\xb6\x7b\x59\x6f\xda\xfa" +
-	"\x15\x00\x00\xff\xff\xb4\x7f\x25\x14\x76\x01\x00\x00")
+	"\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x51\x4d\xaf\xda\x30\x10\xbc\xfb\x57\x6c\x43\xae\x0e\xea\xb5\x55\x0e" +
+	"\x88\xe6\xd6\xa2\x0a\x5a\xf5\x50\x55\xc8\x38\xeb\x62\xe1\xac\x23\xdb\x81\x44\xc1\xff\xfd\x29\x48\x8f\x67\x3e\xf4" +
+	"\xde\xd1\x33\xb3\x3b\x3b\x9e\xd9\xa7\xf9\x4e\xd3\xdc\xef\x19\x9b\x01\xf6\x3a\xc0\x69\x8f\x04\x82\x06\x90\xb6\x69" +
+	"\x04\xd5\xa0\x84\x36\x9e\x79\x0c\xc0\x91\x31\x51\xd7\x3a\x68\x4b\xc2\x6c\x03\x3a\x27\x94\x75\xcd\xd6\xb6\x13\xe4" +
+	"\xcb\x2c\x4b\xf9\x43\xb7\xc3\x94\x62\x6f\x03\x42\x4e\x68\x99\x8f\x9f\xbf\x70\xd1\xb6\x66\x88\x4c\x2b\xf8\x0b\xf9" +
+	"\xbd\x04\xca\x12\xb2\x8b\x22\x83\x7f\x5f\xc3\x1e\x89\x01\x00\x24\x2e\x57\x83\x7c\x7c\x44\x23\x70\xd1\x05\x3b\x79" +
+	"\x38\x7b\xc4\x8c\xa1\xf1\x78\xbf\xe1\xf6\xce\x9b\x35\x29\x15\x81\xf3\xda\x0d\xdc\x75\x94\x31\xa5\x93\x38\xa0\x49" +
+	"\x87\xe4\x79\xb2\xee\xe0\x5b\x21\x11\x3c\x1a\x94\x01\xc6\x11\x8a\xaa\x0f\x4e\xac\xd1\xdb\xce\x49\xf4\xc5\x9f\xab" +
+	"\x26\x46\x38\x9f\xe1\xd9\x34\xe1\xe9\xa3\xd1\xc4\xf5\xf1\xef\xf2\xf7\xca\x62\x6c\x0a\x27\x83\x01\x69\x49\xe9\xff" +
+	"\xd0\x79\xe4\xd2\x52\xc0\x3e\x40\x3e\x2e\xbf\xff\xde\xfc\xaa\xd6\xf1\xaa\xba\x94\x00\x5c\x5d\x2e\xfa\x86\xad\xb1" +
+	"\x43\x83\x14\x8a\x95\x68\xa6\x43\xf8\x13\x78\xd3\x29\xa5\xfb\x57\xf2\x2e\x45\x45\x47\xed\x2c\x4d\x62\x88\xb1\x18" +
+	"\x44\x63\x80\x13\xe4\xe3\x6a\xf1\xa3\xda\xfc\x5c\x2c\xab\x78\x13\x20\xad\xe2\x25\x00\x00\xff\xff\x2d\x97\xc7\xbf" +
+	"\xb6\x02\x00\x00")

 func bindataTemplatesAwsrolestfDeployshBytes() ([]byte, error) {
 	return bindataRead(
@@ -111,10 +115,10 @@ func bindataTemplatesAwsrolestfDeploysh() (*asset, error) {

 	info := bindataFileInfo{
 		name: "templates/aws-roles-tf/deploy.sh",
-		size: 374,
+		size: 694,
 		md5checksum: "",
 		mode: os.FileMode(420),
-		modTime: time.Unix(1583930362, 0),
+		modTime: time.Unix(1588771288, 0),
 	}

 	a := &asset{bytes: bytes, info: info}
@@ -157,7 +161,7 @@ func bindataTemplatesAwsrolestfMaintf() (*asset, error) {
 		size: 735,
 		md5checksum: "",
 		mode: os.FileMode(420),
-		modTime: time.Unix(1583087747, 0),
+		modTime: time.Unix(1583150135, 0),
 	}

 	a := &asset{bytes: bytes, info: info}
@@ -166,12 +170,14 @@ func bindataTemplatesAwsrolestfMaintf() (*asset, error) {
 }

 var _bindataTemplatesAwss3buckettfDeploysh = []byte(
-	"\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\xcd\x31\x0e\x82\x40\x10\x85\xe1\x7e\x4f\xf1\x0c\x35\x70\x0a\x2f\x60" +
-	"\x63\x3d\xae\x43\xd8\x08\x3b\x9b\x99\x41\x20\xc0\xdd\xed\x0c\x85\x89\xe5\x4b\xde\x97\xbf\xba\xb4\x8f\x94\x5b\xeb" +
-	"\x43\xa8\xc0\x4b\x72\xcc\x3d\x67\x50\x5e\x11\x65\x1c\x29\x3f\xd1\x51\x1a\x2c\x18\x3b\x6a\x0e\xc1\x59\x95\x3a\xd1" +
-	"\x11\x29\x27\x3f\xcd\x59\xf4\x65\x85\x22\xc3\x78\xe0\xe8\xd8\x36\x34\xd7\xc5\x95\x6e\x6c\x32\x69\x64\x6b\xee\xdf" +
-	"\xcf\x71\x60\xdf\xf1\x4b\x67\x9e\xff\xd1\x53\x95\x4a\x19\x56\xd4\x34\xb9\xd4\x54\x8a\xca\x9b\x3f\x01\x00\x00\xff" +
-	"\xff\x2a\xc1\x14\x78\xd3\x00\x00\x00")
+	"\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x8f\xb1\x4e\xf3\x40\x10\x84\xfb\x7d\x8a\xf9\x2f\x6e\x9d\xe8\x6f\x41" +
+	"\x2e\x79\x01\x1a\x0a\x84\xa2\xe5\xbc\x96\x57\xd8\x77\xd6\xdd\x06\x27\x72\xfc\xee\xc8\x14\x89\x85\x91\x28\xf7\xd3" +
+	"\x8c\xbe\x9d\xdd\xbf\xc3\xbb\x86\x43\x6e\x89\x76\x90\xb3\x1a\xc6\x56\x02\x38\x5c\xe0\x63\xdf\x73\xa8\xd1\xb0\x76" +
+	"\x99\xb2\x18\x4a\x21\xe2\xba\x56\xd3\x18\xb8\x3b\x9a\xa4\xc4\x4d\x4c\xfd\x31\x0e\x0b\xca\x95\x73\x74\x87\xec\x17" +
+	"\x58\x15\xd3\xff\x87\x92\x87\xa1\xbb\xcc\x44\xda\xe0\x15\xc5\xcf\x0c\xaa\x0a\xee\x3b\xe2\xf0\xf6\x68\xad\x04\x02" +
+	"\x80\x95\xea\x26\x28\xa6\x2d\x9d\x51\xf2\xc9\xe2\x22\x49\xf1\x53\x1c\x35\x4a\xf7\x3f\xa0\x41\x6d\x75\x8e\x31\x7d" +
+	"\xe4\x81\xbd\x20\x4b\x27\xde\x30\x4d\xd8\x3f\x9d\x2d\xf1\xb3\xe4\x78\x4a\x5e\xf2\xfe\xe5\x96\x99\x67\x5c\xaf\xf8" +
+	"\xad\x1d\x64\xfc\xab\xba\xb2\x6e\x37\x17\xdb\x21\x5f\x01\x00\x00\xff\xff\xaa\x7e\x34\xfa\x8d\x01\x00\x00")

 func bindataTemplatesAwss3buckettfDeployshBytes() ([]byte, error) {
 	return bindataRead(
@@ -190,10 +196,10 @@ func bindataTemplatesAwss3buckettfDeploysh() (*asset, error) {

 	info := bindataFileInfo{
 		name: "templates/aws-s3-bucket-tf/deploy.sh",
-		size: 211,
+		size: 397,
 		md5checksum: "",
 		mode: os.FileMode(420),
-		modTime: time.Unix(1586425258, 0),
+		modTime: time.Unix(1588771288, 0),
 	}

 	a := &asset{bytes: bytes, info: info}
@@ -236,7 +242,7 @@ func bindataTemplatesAwss3buckettfMaintf() (*asset, error) {
 		size: 660,
 		md5checksum: "",
 		mode: os.FileMode(420),
-		modTime: time.Unix(1586425258, 0),
+		modTime: time.Unix(1587036332, 0),
 	}

 	a := &asset{bytes: bytes, info: info}
@@ -245,13 +251,16 @@ func bindataTemplatesAwss3buckettfMaintf() (*asset, error) {
 }

 var _bindataTemplatesRdstfDeploysh = []byte(
-	"\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x8e\x31\x4e\xc4\x40\x0c\x45\x7b\x4e\x61\x44\x9d\xd9\x13\x50\x72\x01" +
-	"\x1a\xca\x91\x33\xf3\x59\x46\x24\xf6\xc8\x76\x12\xd0\xee\xde\x9d\x06\x41\x84\x90\x40\x82\xce\x96\xfd\xde\xff\x37" +
-	"\xd7\x87\xb1\xc9\xc1\x9f\xae\x02\x66\xfc\xa8\x36\x53\x93\x16\xbb\x75\x53\x7b\xf6\xce\x05\xe4\x98\x50\x82\x4e\x27" +
-	"\x4a\x77\x2f\x61\x7c\x0f\xd7\xc5\x0a\x3c\x3d\x7c\xfc\x5c\x2e\x74\x3e\xd3\x77\xb4\x60\xfb\x09\xdd\xa5\x72\xef\xd3" +
-	"\x2b\x0d\xc1\x76\x44\xdc\xce\x5a\x97\x09\xc9\xaa\xa7\xca\xc1\x89\x37\xcf\xbe\x8c\x82\xc8\xad\x7a\x2a\x3a\xcf\x2c" +
-	"\x35\x77\x6b\x2b\x07\xde\x4f\x4e\x03\x2f\xa1\x03\xf7\x6e\xba\xe2\x37\xf2\xcf\x31\x37\xf1\x60\x29\xf8\x17\x49\xc6" +
-	"\x0a\xf9\x43\xa1\xae\x1e\x47\x83\xe7\x3a\x7e\x71\xbc\x05\x00\x00\xff\xff\xb6\x6e\x64\x21\xc1\x01\x00\x00")
+	"\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x91\xb1\x4e\xc3\x30\x10\x86\x77\x3f\xc5\x11\xb2\xd6\x15\x2b\x28\x23" +
+	"\x2f\xc0\xc2\x80\x90\x75\xb5\x2f\xad\x45\x62\x5b\xbe\x4b\x02\x4a\xf3\xee\x28\x08\x35\x11\x45\x54\x0c\xdd\xec\xcf" +
+	"\xff\xf9\xf3\x2f\xdf\xde\x6c\x77\x3e\x6c\xf9\xa0\x14\x3a\xe7\xc5\xc7\x80\x8d\x11\xca\x19\xeb\x98\x5b\x13\xd3\x8c" +
+	"\xb8\x2a\x0a\xb5\x40\xb4\x33\xac\xca\xf1\xee\x7e\x83\x29\x35\x1f\x93\x52\xbe\x86\x17\x28\x7f\x66\xa0\xaa\xa0\xf8" +
+	"\x8a\x14\xf0\xfa\x20\x07\x0a\x0a\x00\x60\xa5\x3a\x09\xca\xf1\x9c\x4e\xb0\xc1\x4e\xe2\x2c\xc9\xb1\xa7\x42\xd5\x5e" +
+	"\x2d\xef\x00\x1f\xbc\xac\xb6\x43\xcc\x6f\x9c\xd0\x12\x30\x35\x64\x05\xc6\x11\xf4\xe3\xbb\x64\x7c\x22\x8e\x5d\xb6" +
+	"\xc4\xfa\xf9\x94\x99\x26\x38\x1e\xe1\xb7\xe9\x40\xc3\xa5\xd1\x95\xf5\xbc\xf3\x46\x30\xef\x49\xaa\x36\xba\xae\x21" +
+	"\x9d\x1d\x6b\x87\x82\x1a\x07\x36\xdc\xed\x02\x89\xf1\x8e\xb5\x8d\x6d\x8b\xc1\x99\x94\x7d\x8f\x42\xdf\x47\x0c\xe5" +
+	"\x5f\x1f\xf1\x5f\xf1\xb2\x34\x3e\xb0\x60\xb0\x74\x75\x81\xa1\x9e\xc2\x95\x8a\xa4\xc8\xb2\xcf\xc4\xc6\xed\x2e\xdc" +
+	"\xff\x19\x00\x00\xff\xff\x78\x3a\x19\xa0\xda\x02\x00\x00")

 func bindataTemplatesRdstfDeployshBytes() ([]byte, error) {
 	return bindataRead(
@@ -270,10 +279,10 @@ func bindataTemplatesRdstfDeploysh() (*asset, error) {

 	info := bindataFileInfo{
 		name: "templates/rds-tf/deploy.sh",
-		size: 449,
+		size: 730,
 		md5checksum: "",
 		mode: os.FileMode(420),
-		modTime: time.Unix(1586425258, 0),
+		modTime: time.Unix(1588771288, 0),
 	}

 	a := &asset{bytes: bytes, info: info}
@@ -329,7 +338,7 @@ func bindataTemplatesRdstfMaintf() (*asset, error) {
 		size: 2617,
 		md5checksum: "",
 		mode: os.FileMode(420),
-		modTime: time.Unix(1588762350, 0),
+		modTime: time.Unix(1588771288, 0),
 	}

 	a := &asset{bytes: bytes, info: info}
--- a/main.go
+++ b/main.go
@@ -70,6 +70,11 @@ func main() {
 				Usage:   "Provisions just the template for given resource",
 				Aliases: []string{"t"},
 			},
+			&cli.BoolFlag{
+				Name:    "plan",
+				Usage:   "Run plan for the given resources",
+				Aliases: []string{"p"},
+			},
 		},

 		Commands: []*cli.Command{
@@ -82,7 +87,7 @@ func main() {
 						log.Fatalf("\nErr: %v", err)
 						return err
 					}
-					err = provisionResource("rds", "rds-tf", manifest, c.Bool("template-only"))
+					err = provisionResource("rds", "rds-tf", manifest, c.Bool("template-only"), c.Bool("plan"))
 					if err != nil {
 						log.Fatalf("\nErr: %v", err)
 						return err
@@ -99,7 +104,7 @@ func main() {
 						log.Fatalf("\nErr: %v", err)
 						return err
 					}
-					err = provisionResource("roles", "aws-roles-tf", manifest, c.Bool("template-only"))
+					err = provisionResource("roles", "aws-roles-tf", manifest, c.Bool("template-only"), c.Bool("plan"))
 					if err != nil {
 						log.Fatalf("\nErr: %v", err)
 						return err
@@ -116,7 +121,7 @@ func main() {
 						log.Fatalf("\nErr: %v", err)
 						return err
 					}
-					err = provisionResource("s3", "aws-s3-bucket-tf", manifest, c.Bool("template-only"))
+					err = provisionResource("s3", "aws-s3-bucket-tf", manifest, c.Bool("template-only"), c.Bool("plan"))
 					if err != nil {
 						log.Fatalf("\nErr: %v", err)
 						return err
--- a/resource.go
+++ b/resource.go
@@ -1,18 +1,19 @@
 package main

 import (
-	"strings"
-	"github.com/Masterminds/sprig/v3"
-	"text/template"
+	"log"
 	"os"
 	"os/exec"
-	"log"
+	"strings"
+	"text/template"
+
+	"github.com/Masterminds/sprig/v3"
 )

 const TEMPLATES_DIR = "templates"
 const INIT_SCRIPT = "./deploy.sh"

-func provisionResource(resourceName, resourceDir string, manifest *Manifest, templateOnly bool) error {
+func provisionResource(resourceName, resourceDir string, manifest *Manifest, templateOnly, plan bool) error {
 	err := templateResourceTf(resourceName, resourceDir, manifest)
 	if err != nil {
 		log.Fatalf("\nErr: %v", err)
@@ -20,8 +21,8 @@ func provisionResource(resourceName, resourceDir string, manifest *Manifest, tem
 	}

 	if !templateOnly {
-		err = executeResourceTf(resourceDir)
-		if(err != nil) {
+		err = executeResourceTf(resourceDir, plan)
+		if err != nil {
 			log.Fatalf("\nErr: %v", err)
 			return err
 		}
@@ -30,7 +31,6 @@ func provisionResource(resourceName, resourceDir string, manifest *Manifest, tem
 	return nil
 }

-
 func templateResourceTf(templateName, resourceDir string, manifest *Manifest) error {
 	log.Printf("Creating templates for %s in %s", templateName, resourceDir)

@@ -60,13 +60,18 @@ func templateResourceTf(templateName, resourceDir string, manifest *Manifest) er
 	return nil
 }

-func executeResourceTf(resourceDir string) error {
-	log.Printf("Running terraform for %s", resourceDir)
-	cmd := exec.Command(INIT_SCRIPT)
+func executeResourceTf(resourceDir string, plan bool) error {
+	var cmd *exec.Cmd
+	if plan {
+		cmd = exec.Command(INIT_SCRIPT, "plan")
+	} else {
+		log.Printf("Running terraform for %s", resourceDir)
+		cmd = exec.Command(INIT_SCRIPT)
+	}
 	cmd.Dir = resourceDir
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-	err :=  cmd.Run()
+	err := cmd.Run()
 	if err != nil {
 		log.Fatalf("\nErr: %v", err)
 		return err
--- a/templates/aws-roles-tf/deploy.sh
+++ b/templates/aws-roles-tf/deploy.sh
@@ -3,9 +3,19 @@
 # exit when any command fails
 set -e

+additional_terraform_options=""
+additional_kube_options=""
+
+terraform_action=${1:-apply}
+if [ $terraform_action == "apply" ];then
+    additional_options="${additional_options} -auto-approve"
+else
+    additional_kube_options="${additional_kube_options} --dry-run"
+fi
+
 terraform init
 terraform workspace select {{ .ExtraResources.Workspace }} || terraform workspace new {{ .ExtraResources.Workspace }}
-terraform apply -auto-approve
+terraform $terraform_action $additional_terraform_options

 kubectl config use-context ${CLUSTER}
-kubectl apply -f {{ .Deployment.Name }}-{{ .Deployment.NameSuffix }}-{{ .ExtraResources.Environment }}.yaml -n ${NAMESPACE}
+kubectl apply -f {{ .Deployment.Name }}-{{ .Deployment.NameSuffix }}-{{ .ExtraResources.Environment }}.yaml -n ${NAMESPACE} $additional_kube_options
--- a/templates/aws-s3-bucket-tf/deploy.sh
+++ b/templates/aws-s3-bucket-tf/deploy.sh
@@ -3,6 +3,13 @@
 # exit when any command fails
 set -e

+additional_terraform_options=""
+terraform_action=${1:-apply}
+
+if [ $terraform_action == "apply" ];then
+    additional_options="${additional_options} -auto-approve"
+fi
+
 terraform init
 terraform workspace select {{ .ExtraResources.Workspace }} || terraform workspace new {{ .ExtraResources.Workspace }}
-terraform apply -auto-approve
+terraform $terraform_action $additional_options
--- a/templates/rds-tf/deploy.sh
+++ b/templates/rds-tf/deploy.sh
@@ -1,7 +1,15 @@
 #!/bin/sh
+
+additional_terraform_options=""
+terraform_action=${1:-apply}
+
+if [ $terraform_action == "apply" ];then
+    additional_options="${additional_options} -auto-approve"
+fi
+
 terraform init
 terraform workspace select {{ .ExtraResources.Workspace }} || terraform workspace new {{ .ExtraResources.Workspace }}
-terraform apply -target=module.rds.data.aws_subnet_ids.command_private_subnets -auto-approve
-terraform apply -target=module.rds.module.rds_instance -auto-approve
-terraform apply -target=module.rds.module.rds_instance_events -auto-approve
-terraform apply -target=module.rds.module.postgres_db -auto-approve
+terraform $terraform_action -target=module.rds.data.aws_subnet_ids.command_private_subnets $additional_terraform_options
+terraform $terraform_action -target=module.rds.module.rds_instance $additional_terraform_options
+terraform $terraform_action -target=module.rds.module.rds_instance_events $additional_terraform_options
+terraform $terraform_action -target=module.rds.module.postgres_db $additional_terraform_options