aherman
/
terraform
mirror of https://github.com/hashicorp/terraform
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19022 from hashicorp/f-auto-apply

Browse Source 
backend/remote: properly handle workspaces that auto apply changes
pull/19035/head
Sander van Harmelen 8 years ago committed by GitHub
parent c03a89c788 194863db4e
commit 53a8aaaf85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 166 additions and 40 deletions
Show Stats Download Patch File Download Diff File

51
backend/remote/backend_apply.go
Unescape View File

@ -90,14 +90,14 @@ func (b *Remote) opApply(stopCtx, cancelCtx context.Context, op *backend.Operati
}
// Return if the run cannot be confirmed.
if !r.Actions.IsConfirmable {
if !w.AutoApply && !r.Actions.IsConfirmable {
return r, nil
}
// Since we already checked the permissions before creating the run
// this should never happen. But it doesn't hurt to keep this in as
// a safeguard for any unexpected situations.
if !r.Permissions.CanApply {
if !w.AutoApply && !r.Permissions.CanApply {
// Make sure we discard the run if possible.
if r.Actions.IsDiscardable {
err = b.client.Runs.Discard(stopCtx, r.ID, tfe.RunDiscardOptions{})
@ -112,37 +112,42 @@ func (b *Remote) opApply(stopCtx, cancelCtx context.Context, op *backend.Operati
fmt.Sprintf(applyErrNoApplyRights, b.hostname, b.organization, op.Workspace)))
}
hasUI := op.UIIn != nil && op.UIOut != nil
mustConfirm := hasUI &&
mustConfirm := (op.UIIn != nil && op.UIOut != nil) &&
((op.Destroy && (!op.DestroyForce && !op.AutoApprove)) || (!op.Destroy && !op.AutoApprove))
if mustConfirm {
opts := &terraform.InputOpts{Id: "approve"}
if op.Destroy {
opts.Query = "\nDo you really want to destroy all resources in workspace \"" + op.Workspace + "\"?"
opts.Description = "Terraform will destroy all your managed infrastructure, as shown above.\n" +
"There is no undo. Only 'yes' will be accepted to confirm."
} else {
opts.Query = "\nDo you want to perform these actions in workspace \"" + op.Workspace + "\"?"
opts.Description = "Terraform will perform the actions described above.\n" +
"Only 'yes' will be accepted to approve."
if !w.AutoApply {
if mustConfirm {
opts := &terraform.InputOpts{Id: "approve"}
if op.Destroy {
opts.Query = "\nDo you really want to destroy all resources in workspace \"" + op.Workspace + "\"?"
opts.Description = "Terraform will destroy all your managed infrastructure, as shown above.\n" +
"There is no undo. Only 'yes' will be accepted to confirm."
} else {
opts.Query = "\nDo you want to perform these actions in workspace \"" + op.Workspace + "\"?"
opts.Description = "Terraform will perform the actions described above.\n" +
"Only 'yes' will be accepted to approve."
}
if err = b.confirm(stopCtx, op, opts, r, "yes"); err != nil {
return r, err
}
}
if err = b.confirm(stopCtx, op, opts, r, "yes"); err != nil {
return r, err
err = b.client.Runs.Apply(stopCtx, r.ID, tfe.RunApplyOptions{})
if err != nil {
return r, generalError("error approving the apply command", err)
}
} else {
}
// If we don't need to ask for confirmation, insert a blank
// line to separate the ouputs.
if w.AutoApply || !mustConfirm {
if b.CLI != nil {
// Insert a blank line to separate the ouputs.
b.CLI.Output("")
}
}
err = b.client.Runs.Apply(stopCtx, r.ID, tfe.RunApplyOptions{})
if err != nil {
return r, generalError("error approving the apply command", err)
}
logs, err := b.client.Applies.Logs(stopCtx, r.Apply.ID)
if err != nil {
return r, generalError("error retrieving logs", err)

130
backend/remote/backend_apply_test.go
Unescape View File

@ -66,6 +66,61 @@ func TestRemote_applyBasic(t *testing.T) {
}
}
func TestRemote_applyWithAutoApply(t *testing.T) {
b := testBackendNoDefault(t)
// Create a named workspace that auto applies.
_, err := b.client.Workspaces.Create(
context.Background(),
b.organization,
tfe.WorkspaceCreateOptions{
AutoApply: tfe.Bool(true),
Name: tfe.String(b.prefix + "prod"),
},
)
if err != nil {
t.Fatalf("error creating named workspace: %v", err)
}
mod, modCleanup := module.TestTree(t, "./test-fixtures/apply")
defer modCleanup()
input := testInput(t, map[string]string{
"approve": "yes",
})
op := testOperationApply()
op.Module = mod
op.UIIn = input
op.UIOut = b.CLI
op.Workspace = "prod"
run, err := b.Operation(context.Background(), op)
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
if run.Err != nil {
t.Fatalf("error running operation: %v", run.Err)
}
if run.PlanEmpty {
t.Fatalf("expected a non-empty plan")
}
if len(input.answers) != 1 {
t.Fatalf("expected an unused answer, got: %v", input.answers)
}
output := b.CLI.(*cli.MockUi).OutputWriter.String()
if !strings.Contains(output, "1 to add, 0 to change, 0 to destroy") {
t.Fatalf("missing plan summery in output: %s", output)
}
if !strings.Contains(output, "1 added, 0 changed, 0 destroyed") {
t.Fatalf("missing apply summery in output: %s", output)
}
}
func TestRemote_applyWithoutPermissions(t *testing.T) {
b := testBackendNoDefault(t)
@ -93,8 +148,8 @@ func TestRemote_applyWithoutPermissions(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected an apply error, got: %v", run.Err)
}
@ -130,8 +185,8 @@ func TestRemote_applyWithVCS(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected an apply error, got: %v", run.Err)
}
@ -158,8 +213,8 @@ func TestRemote_applyWithParallelism(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected an apply error, got: %v", run.Err)
}
@ -183,8 +238,8 @@ func TestRemote_applyWithPlan(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected an apply error, got: %v", run.Err)
}
@ -211,8 +266,8 @@ func TestRemote_applyWithoutRefresh(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected an apply error, got: %v", run.Err)
}
@ -236,8 +291,8 @@ func TestRemote_applyWithTarget(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected an apply error, got: %v", run.Err)
}
@ -264,8 +319,8 @@ func TestRemote_applyWithVariables(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected an apply error, got: %v", run.Err)
}
@ -285,8 +340,8 @@ func TestRemote_applyNoConfig(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected an apply error, got: %v", run.Err)
}
@ -690,6 +745,65 @@ func TestRemote_applyPolicySoftFail(t *testing.T) {
}
}
func TestRemote_applyPolicySoftFailAutoApply(t *testing.T) {
b := testBackendDefault(t)
// Create a named workspace that auto applies.
_, err := b.client.Workspaces.Create(
context.Background(),
b.organization,
tfe.WorkspaceCreateOptions{
AutoApply: tfe.Bool(true),
Name: tfe.String(b.prefix + "prod"),
},
)
if err != nil {
t.Fatalf("error creating named workspace: %v", err)
}
mod, modCleanup := module.TestTree(t, "./test-fixtures/apply-policy-soft-failed")
defer modCleanup()
input := testInput(t, map[string]string{
"override": "override",
"approve": "yes",
})
op := testOperationApply()
op.Module = mod
op.UIIn = input
op.UIOut = b.CLI
op.Workspace = "prod"
run, err := b.Operation(context.Background(), op)
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
if run.Err != nil {
t.Fatalf("error running operation: %v", run.Err)
}
if run.PlanEmpty {
t.Fatalf("expected a non-empty plan")
}
if len(input.answers) != 1 {
t.Fatalf("expected an unused answer, got: %v", input.answers)
}
output := b.CLI.(*cli.MockUi).OutputWriter.String()
if !strings.Contains(output, "1 to add, 0 to change, 0 to destroy") {
t.Fatalf("missing plan summery in output: %s", output)
}
if !strings.Contains(output, "Sentinel Result: false") {
t.Fatalf("missing policy check result in output: %s", output)
}
if !strings.Contains(output, "1 added, 0 changed, 0 destroyed") {
t.Fatalf("missing apply summery in output: %s", output)
}
}
func TestRemote_applyPolicySoftFailAutoApprove(t *testing.T) {
b := testBackendDefault(t)

7
backend/remote/backend_mock.go
Unescape View File

@ -82,6 +82,10 @@ func (m *mockApplies) create(cvID, workspaceID string) (*tfe.Apply, error) {
return nil, tfe.ErrResourceNotFound
}
if w.AutoApply {
a.Status = tfe.ApplyRunning
}
m.logs[url] = filepath.Join(
m.client.ConfigurationVersions.uploadPaths[cvID],
w.WorkingDirectory,
@ -866,6 +870,9 @@ func (m *mockWorkspaces) Create(ctx context.Context, organization string, option
CanUpdate: true,
},
}
if options.AutoApply != nil {
w.AutoApply = *options.AutoApply
}
if options.VCSRepo != nil {
w.VCSRepo = &tfe.VCSRepo{}
}

18
backend/remote/backend_plan_test.go
Unescape View File

@ -81,8 +81,8 @@ func TestRemote_planWithoutPermissions(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected a plan error, got: %v", run.Err)
}
@ -106,8 +106,8 @@ func TestRemote_planWithModuleDepth(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected a plan error, got: %v", run.Err)
}
@ -131,8 +131,8 @@ func TestRemote_planWithParallelism(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected a plan error, got: %v", run.Err)
}
@ -156,8 +156,8 @@ func TestRemote_planWithPlan(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected a plan error, got: %v", run.Err)
}
@ -184,8 +184,8 @@ func TestRemote_planWithPath(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected a plan error, got: %v", run.Err)
}
@ -212,8 +212,8 @@ func TestRemote_planWithoutRefresh(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected a plan error, got: %v", run.Err)
}
@ -237,8 +237,8 @@ func TestRemote_planWithTarget(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected a plan error, got: %v", run.Err)
}
@ -265,8 +265,8 @@ func TestRemote_planWithVariables(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected an plan error, got: %v", run.Err)
}
@ -286,8 +286,8 @@ func TestRemote_planNoConfig(t *testing.T) {
if err != nil {
t.Fatalf("error starting operation: %v", err)
}
<-run.Done()
<-run.Done()
if run.Err == nil {
t.Fatalf("expected a plan error, got: %v", run.Err)
}

Write Preview
Loading…
Cancel
Save