@@ -30,30 +30,33 @@ const (
3030 defaultProject = "ci-test-project-nightly-beta"
3131)
3232
33- func terraformWorkflow (t * testing.T , dir , name string ) {
34- terraformInit (t , "terraform" , dir )
35- terraformPlan (t , "terraform" , dir , name + ".tfplan" )
36- payload := terraformShow (t , "terraform" , dir , name + ".tfplan" )
33+ func terraformWorkflow (t * testing.T , dir , name , project string ) {
34+ terraformInit (t , "terraform" , dir , project )
35+ terraformPlan (t , "terraform" , dir , project , name + ".tfplan" )
36+ payload := terraformShow (t , "terraform" , dir , project , name + ".tfplan" )
3737 saveFile (t , dir , name + ".tfplan.json" , payload )
3838}
3939
40- func terraformInit (t * testing.T , executable , dir string ) {
41- terraformExec (t , executable , dir , "init" , "-input=false" )
40+ func terraformInit (t * testing.T , executable , dir , project string ) {
41+ terraformExec (t , executable , dir , project , "init" , "-input=false" )
4242}
4343
44- func terraformPlan (t * testing.T , executable , dir , tfplan string ) {
45- terraformExec (t , executable , dir , "plan" , "-input=false" , "-refresh=false" , "-out" , tfplan )
44+ func terraformPlan (t * testing.T , executable , dir , project , tfplan string ) {
45+ terraformExec (t , executable , dir , project , "plan" , "-input=false" , "-refresh=false" , "-out" , tfplan )
4646}
4747
48- func terraformShow (t * testing.T , executable , dir , tfplan string ) []byte {
49- return terraformExec (t , executable , dir , "show" , "--json" , tfplan )
48+ func terraformShow (t * testing.T , executable , dir , project , tfplan string ) []byte {
49+ return terraformExec (t , executable , dir , project , "show" , "--json" , tfplan )
5050}
5151
52- func terraformExec (t * testing.T , executable , dir string , args ... string ) []byte {
52+ func terraformExec (t * testing.T , executable , dir , project string , args ... string ) []byte {
53+ if project == "" {
54+ project = defaultProject
55+ }
5356 cmd := exec .Command (executable , args ... )
5457 cmd .Env = []string {
5558 "HOME=" + filepath .Join (dir , "fakehome" ),
56- "GOOGLE_PROJECT=" + defaultProject ,
59+ "GOOGLE_PROJECT=" + project ,
5760 "GOOGLE_FOLDER=" + "" ,
5861 "GOOGLE_ORG=" + defaultOrganization ,
5962 "GOOGLE_OAUTH_ACCESS_TOKEN=fake-token" , // GOOGLE_OAUTH_ACCESS_TOKEN is required so terraform plan does not require the google authentication cert
0 commit comments