Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

default to state 'present' for rpm module #463

Merged
merged 3 commits into from
Nov 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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))
})
}