Merge pull request runatlantis#220 from hootsuite/terraform0.11

Rename Workspace to AtlantisWorkspace to avoid confusion
meringu · Dec 18, 2017 · a9ada64 · a9ada64
2 parents df05f8b + f72b674
commit a9ada64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/server/events/apply_executor.go b/server/events/apply_executor.go
@@ -19,7 +19,7 @@ type ApplyExecutor struct {
 	Terraform         *terraform.DefaultClient
 	RequireApproval   bool
 	Run               *run.Run
-	Workspace         AtlantisWorkspace
+	AtlantisWorkspace AtlantisWorkspace
 	ProjectPreExecute *DefaultProjectPreExecutor
 	Webhooks          webhooks.Sender
 }
@@ -37,7 +37,7 @@ func (a *ApplyExecutor) Execute(ctx *CommandContext) CommandResponse {
 		ctx.Log.Info("confirmed pull request was approved")
 	}
 
-	repoDir, err := a.Workspace.GetWorkspace(ctx.BaseRepo, ctx.Pull, ctx.Command.Workspace)
+	repoDir, err := a.AtlantisWorkspace.GetWorkspace(ctx.BaseRepo, ctx.Pull, ctx.Command.Workspace)
 	if err != nil {
 		return CommandResponse{Failure: "No workspace found. Did you run plan?"}
 	}

diff --git a/server/server.go b/server/server.go
@@ -152,7 +152,7 @@ func NewServer(config Config) (*Server, error) {
 		Terraform:         terraformClient,
 		RequireApproval:   config.RequireApproval,
 		Run:               run,
-		Workspace:         workspace,
+		AtlantisWorkspace: workspace,
 		ProjectPreExecute: projectPreExecute,
 		Webhooks:          webhooksManager,
 	}