Skip to content

Commit

Permalink
Merge pull request #463 from asteris-llc/fix/446-rpm-default
Browse files Browse the repository at this point in the history
default to state 'present' for rpm module
  • Loading branch information
rebeccaskinner authored Nov 2, 2016
2 parents ae78477 + b650a6a commit c982126
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
6 changes: 5 additions & 1 deletion resource/package/rpm/preparer.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,15 @@ type Preparer struct {

// State of the package. Present means the package will be installed if
// missing; Absent means the package will be uninstalled if present.
State State `hcl:"state" valid_values:"present,absent" default:"present"`
State State `hcl:"state" valid_values:"present,absent"`
}

// Prepare a new packge
func (p *Preparer) Prepare(render resource.Renderer) (resource.Task, error) {
if p.State == "" {
p.State = "present"
}

return &Package{
Name: p.Name,
State: p.State,
Expand Down
32 changes: 32 additions & 0 deletions resource/package/rpm/preparer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ package rpm_test
import (
"testing"

"github.com/asteris-llc/converge/helpers/fakerenderer"
"github.com/asteris-llc/converge/resource"
"github.com/asteris-llc/converge/resource/package/rpm"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

// TestPreparerInterfaces ensures that the correct interfaces are implemented by
Expand All @@ -28,3 +30,33 @@ func TestPreparerInterfaces(t *testing.T) {
t.Parallel()
assert.Implements(t, (*resource.Resource)(nil), new(rpm.Preparer))
}

// TestPreparerCreatesPackage tests rpm.Package creation from the preparerer
// ensuring that the state field is respected.
func TestPreparerCreatesPackage(t *testing.T) {
t.Parallel()
t.Run("when-state-present", func(t *testing.T) {
p := &rpm.Preparer{Name: "test1", State: "present"}
task, err := p.Prepare(fakerenderer.New())
require.NoError(t, err)
asRPM, ok := task.(*rpm.Package)
require.True(t, ok)
assert.Equal(t, "present", string(asRPM.State))
})
t.Run("when-state-absent", func(t *testing.T) {
p := &rpm.Preparer{Name: "test1", State: "absent"}
task, err := p.Prepare(fakerenderer.New())
require.NoError(t, err)
asRPM, ok := task.(*rpm.Package)
require.True(t, ok)
assert.Equal(t, "absent", string(asRPM.State))
})
t.Run("when-state-missing", func(t *testing.T) {
p := &rpm.Preparer{Name: "test1"}
task, err := p.Prepare(fakerenderer.New())
require.NoError(t, err)
asRPM, ok := task.(*rpm.Package)
require.True(t, ok)
assert.Equal(t, "present", string(asRPM.State))
})
}

0 comments on commit c982126

Please sign in to comment.