Skip to content

Commit

Permalink
Fix unit tests
Browse files Browse the repository at this point in the history
Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
  • Loading branch information
carolynvs committed Aug 9, 2021
1 parent e17b70a commit ad28356
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions pkg/claims/claimstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func TestClaimStore_Installations(t *testing.T) {
defer cp.Teardown()

t.Run("ListInstallations", func(t *testing.T) {
installations, err := cp.ListInstallations("dev")
installations, err := cp.ListInstallations("dev", "", nil)
require.NoError(t, err, "ListInstallations failed")

require.Len(t, installations, 3, "Expected 3 installations")
Expand Down Expand Up @@ -188,14 +188,14 @@ func TestClaimStore_DeleteInstallation(t *testing.T) {
cp := generateClaimData(t)
defer cp.Teardown()

installations, err := cp.ListInstallations("dev")
installations, err := cp.ListInstallations("dev", "", nil)
require.NoError(t, err, "ListInstallations failed")
assert.Len(t, installations, 3, "expected 3 installations")

err = cp.RemoveInstallation("dev", "foo")
require.NoError(t, err, "RemoveInstallation failed")

installations, err = cp.ListInstallations("dev")
installations, err = cp.ListInstallations("dev", "", nil)
require.NoError(t, err, "ListInstallations failed")
assert.Len(t, installations, 2, "expected foo to be deleted")

Expand Down
6 changes: 3 additions & 3 deletions pkg/credentials/credential_store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ func TestCredentialStorage_CRUD(t *testing.T) {

require.NoError(t, cp.InsertCredentialSet(cs))

creds, err := cp.ListCredentialSets("dev")
creds, err := cp.ListCredentialSets("dev", "", nil)
require.NoError(t, err)
require.Len(t, creds, 1, "expected 1 credential set")
require.Equal(t, cs.Name, creds[0].Name, "expected to retrieve secreks credentials")
require.Equal(t, cs.Namespace, creds[0].Namespace, "expected to retrieve secreks credentials")

creds, err = cp.ListCredentialSets("")
creds, err = cp.ListCredentialSets("", "", nil)
require.NoError(t, err)
require.Len(t, creds, 0, "expected no global credential sets")

creds, err = cp.ListCredentialSets("*")
creds, err = cp.ListCredentialSets("*", "", nil)
require.NoError(t, err)
require.Len(t, creds, 1, "expected 1 credential set defined in all namespaces")

Expand Down
2 changes: 1 addition & 1 deletion pkg/credentials/credentialset.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type CredentialSet struct {
// Modified timestamp.
Modified time.Time `json:"modified" yaml:"modified" toml:"modified"`

// Labels applied to the installation.
// Labels applied to the credential set.
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty" toml:"labels,omitempty"`

// Credentials is a list of credential resolution strategies.
Expand Down
10 changes: 5 additions & 5 deletions pkg/parameters/parameter_store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func TestParameterStore_CRUD(t *testing.T) {
paramStore := NewTestParameterProvider(t)
defer paramStore.Teardown()

params, err := paramStore.ListParameterSets("dev")
params, err := paramStore.ListParameterSets("dev", "", nil)
require.NoError(t, err)
require.Empty(t, params, "Find should return no entries")

Expand All @@ -31,16 +31,16 @@ func TestParameterStore_CRUD(t *testing.T) {
err = paramStore.InsertParameterSet(myParamSet)
require.NoError(t, err, "Insert should successfully save")

params, err = paramStore.ListParameterSets("dev")
params, err = paramStore.ListParameterSets("dev", "", nil)
require.NoError(t, err)
require.Len(t, params, 1, "expected 1 parameter set")
require.Equal(t, myParamSet.Name, params[0].Name, "expected to retrieve myparams")

params, err = paramStore.ListParameterSets("")
params, err = paramStore.ListParameterSets("", "", nil)
require.NoError(t, err)
require.Len(t, params, 0, "expected no global parameter sets")

params, err = paramStore.ListParameterSets("*")
params, err = paramStore.ListParameterSets("*", "", nil)
require.NoError(t, err)
require.Len(t, params, 1, "expected 1 parameter set defined in all namespaces")

Expand All @@ -51,7 +51,7 @@ func TestParameterStore_CRUD(t *testing.T) {
err = paramStore.RemoveParameterSet(myParamSet.Namespace, myParamSet.Name)
require.NoError(t, err, "Remove should successfully delete the parameter set")

params, err = paramStore.ListParameterSets("dev")
params, err = paramStore.ListParameterSets("dev", "", nil)
require.NoError(t, err)
require.Empty(t, params, "List should return no entries")

Expand Down
2 changes: 1 addition & 1 deletion pkg/parameters/parameterset.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type ParameterSet struct {
// Modified timestamp of the parameter set.
Modified time.Time `json:"modified" yaml:"modified" toml:"modified"`

// Labels applied to the installation.
// Labels applied to the parameter set.
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty" toml:"labels,omitempty"`

// Parameters is a list of parameter specs.
Expand Down
18 changes: 9 additions & 9 deletions pkg/storage/migrations/manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ func TestManager_NoMigrationEmptyHome(t *testing.T) {
defer mgr.Teardown()
claimStore := claims.NewClaimStore(mgr)

_, err := claimStore.ListInstallations("")
_, err := claimStore.ListInstallations("", "", nil)
require.NoError(t, err, "ListInstallations failed")

credStore := credentials.NewCredentialStore(mgr, nil)
_, err = credStore.ListCredentialSets("")
_, err = credStore.ListCredentialSets("", "", nil)
require.NoError(t, err, "List credentials failed")

paramStore := parameters.NewParameterStore(mgr, nil)
_, err = paramStore.ListParameterSets("")
_, err = paramStore.ListParameterSets("", "", nil)
require.NoError(t, err, "List credentials failed")
}

Expand All @@ -137,7 +137,7 @@ func TestClaimStorage_HaltOnMigrationRequired(t *testing.T) {
require.NoError(t, err, "Save schema failed")

t.Run("list", func(t *testing.T) {
_, err = claimStore.ListInstallations("")
_, err = claimStore.ListInstallations("", "", nil)
require.Error(t, err, "Operation should halt because a migration is required")
assert.Contains(t, err.Error(), "The schema of Porter's data is in an older format than supported by this version of Porter")
})
Expand All @@ -162,7 +162,7 @@ func TestClaimStorage_NoMigrationRequiredForEmptyHome(t *testing.T) {
defer mgr.Teardown()
claimStore := claims.NewClaimStore(mgr)

names, err := claimStore.ListInstallations("")
names, err := claimStore.ListInstallations("", "", nil)
require.NoError(t, err, "ListInstallations failed")
assert.Empty(t, names, "Expected an empty list of installations since porter home is new")
}
Expand All @@ -178,7 +178,7 @@ func TestCredentialStorage_HaltOnMigrationRequired(t *testing.T) {
require.NoError(t, err, "Save schema failed")

t.Run("list", func(t *testing.T) {
_, err = credStore.ListCredentialSets("")
_, err = credStore.ListCredentialSets("", "", nil)
require.Error(t, err, "Operation should halt because a migration is required")
assert.Contains(t, err.Error(), "The schema of Porter's data is in an older format than supported by this version of Porter")
})
Expand All @@ -200,7 +200,7 @@ func TestCredentialStorage_NoMigrationRequiredForEmptyHome(t *testing.T) {
defer mgr.Teardown()
credStore := credentials.NewTestCredentialProviderFor(t, mgr)

names, err := credStore.ListCredentialSets("")
names, err := credStore.ListCredentialSets("", "", nil)
require.NoError(t, err, "List failed")
assert.Empty(t, names, "Expected an empty list of credentials since porter home is new")
}
Expand All @@ -216,7 +216,7 @@ func TestParameterStorage_HaltOnMigrationRequired(t *testing.T) {
require.NoError(t, err, "Save schema failed")

t.Run("list", func(t *testing.T) {
_, err = paramStore.ListParameterSets("")
_, err = paramStore.ListParameterSets("", "", nil)
require.Error(t, err, "Operation should halt because a migration is required")
assert.Contains(t, err.Error(), "The schema of Porter's data is in an older format than supported by this version of Porter")
})
Expand All @@ -238,7 +238,7 @@ func TestParameterStorage_NoMigrationRequiredForEmptyHome(t *testing.T) {
defer mgr.Teardown()
paramStore := parameters.NewTestParameterProviderFor(t, mgr)

names, err := paramStore.ListParameterSets("")
names, err := paramStore.ListParameterSets("", "", nil)
require.NoError(t, err, "List failed")
assert.Empty(t, names, "Expected an empty list of parameters since porter home is new")
}
Expand Down

0 comments on commit ad28356

Please sign in to comment.