Skip to content

Commit

Permalink
Cleanup AWS resources in case of warm up error (#315)
Browse files Browse the repository at this point in the history
* Cleanup AWS resources in case of warm up error

* Add test to validate resource cleanup after warmup error

Extend the mock tests with a test case to verify
that 'TerraformDestroy' is called in case of an error
during 'TerraformInitAndApply'.
  • Loading branch information
rollwagen authored Feb 13, 2023
1 parent 5dfc3b4 commit b61e0bc
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 2 additions & 0 deletions v2/pkg/stratus/runner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ func (m *Runner) WarmUp() (map[string]string, error) {
log.Println("Warming up " + m.Technique.ID)
outputs, err := m.TerraformManager.TerraformInitAndApply(m.TerraformDir)
if err != nil {
log.Println("Error during warm up. Cleaning up technique prerequisites with terraform destroy")
_ = m.TerraformManager.TerraformDestroy(m.TerraformDir)
return nil, errors.New("unable to run terraform apply on prerequisite: " + errorMessageFromTerraformError(err))
}

Expand Down
16 changes: 15 additions & 1 deletion v2/pkg/stratus/runner/runner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ func TestRunnerWarmUp(t *testing.T) {
InitialTechniqueState stratus.AttackTechniqueState
TerraformOutputs map[string]string
PersistedOutputs map[string]string
Error error
// results
CheckExpectations func(t *testing.T, terraform *mocks.TerraformManager, state *statemocks.StateManager, outputs map[string]string, err error)
}
Expand Down Expand Up @@ -91,6 +92,18 @@ func TestRunnerWarmUp(t *testing.T) {
assert.Equal(t, "old", outputs["myoutput"])
},
},
{
Name: "Warming up a COLD technique with error",
Technique: &stratus.AttackTechnique{ID: "foo", PrerequisitesTerraformCode: []byte("bar")},
InitialTechniqueState: stratus.AttackTechniqueStatusCold,
Error: errors.New("error during init and apply"),
CheckExpectations: func(t *testing.T, terraform *mocks.TerraformManager, state *statemocks.StateManager, outputs map[string]string, err error) {
terraform.AssertCalled(t, "TerraformInitAndApply", "/root/foo")
terraform.AssertCalled(t, "TerraformDestroy", "/root/foo")
assert.NotNil(t, err)
assert.Len(t, outputs, 0)
},
},
}

for i := range scenario {
Expand All @@ -101,7 +114,8 @@ func TestRunnerWarmUp(t *testing.T) {
state.On("ExtractTechnique").Return(nil)
state.On("GetTechniqueState", mock.Anything).Return(scenario[i].InitialTechniqueState, nil)
state.On("GetTerraformOutputs").Return(scenario[i].PersistedOutputs, nil)
terraform.On("TerraformInitAndApply", mock.Anything).Return(scenario[i].TerraformOutputs, nil)
terraform.On("TerraformInitAndApply", mock.Anything).Return(scenario[i].TerraformOutputs, scenario[i].Error)
terraform.On("TerraformDestroy", mock.Anything).Return(nil)
state.On("WriteTerraformOutputs", mock.Anything).Return(nil)
state.On("SetTechniqueState", mock.Anything).Return(nil)

Expand Down

0 comments on commit b61e0bc

Please sign in to comment.