Skip to content

Commit

Permalink
[test] Update failing tests in ruleset (#278)
Browse files Browse the repository at this point in the history 
test: clean-up bundle_test.go for failing tests

Signed-off-by: Ben Stickel <[email protected]>
  • Loading branch information
@fin09pcap
fin09pcap committed Jul 3, 2023
1 parent 186f399 commit 31d6f5f
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 104 deletions.
204 changes: 101 additions & 103 deletions pkg/bundle/ruleset/bundle_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,69 +21,61 @@ import (
"testing"

bundlev1 "github.com/elastic/harp/api/gen/go/harp/bundle/v1"
"github.com/golang/protobuf/proto"

"github.com/stretchr/testify/assert"
)

func TestFromBundle(t *testing.T) {
type args struct {
b *bundlev1.Bundle
}
tests := []struct {
name string
args args
bundle *bundlev1.Bundle
want *bundlev1.RuleSet
wantErr bool
}{
{
name: "nil",
args: args{
b: nil,
},
name: "nil",
bundle: &bundlev1.Bundle{},
want: nil,
wantErr: true,
},
{
name: "packages are nil",
args: args{
b: &bundlev1.Bundle{
Labels: map[string]string{
"test": "true",
},
Annotations: map[string]string{
"harp.elastic.co/v1/testing#bundlePurpose": "test",
},
Packages: nil,
name: "empty packages",
bundle: &bundlev1.Bundle{
Labels: map[string]string{
"test": "true",
},
Annotations: map[string]string{
"harp.elastic.co/v1/testing#bundlePurpose": "test",
},
Packages: nil,
},
want: nil,
wantErr: true,
},
{
name: "secrets are nil",
args: args{
b: &bundlev1.Bundle{
Labels: map[string]string{
"test": "true",
},
Annotations: map[string]string{
"harp.elastic.co/v1/testing#bundlePurpose": "test",
},
Packages: []*bundlev1.Package{
{
Labels: map[string]string{
"external": "true",
},
Annotations: map[string]string{
"infosec.elastic.co/v1/SecretPolicy#rotationMethod": "ci",
"infosec.elastic.co/v1/SecretPolicy#rotationPeriod": "90d",
"infosec.elastic.co/v1/SecretPolicy#serviceType": "authentication",
"infosec.elastic.co/v1/SecretPolicy#severity": "high",
"infra.elastic.co/v1/CI#jobName": "rotate-external-api-key",
"harp.elastic.co/v1/package#encryptionKeyAlias": "test",
},
Name: "app/production/testAccount/testService/v1.0.0/internalTestComponent/authentication/api_key",
Secrets: nil,
bundle: &bundlev1.Bundle{
Labels: map[string]string{
"test": "true",
},
Annotations: map[string]string{
"harp.elastic.co/v1/testing#bundlePurpose": "test",
},
Packages: []*bundlev1.Package{
{
Labels: map[string]string{
"external": "true",
},
Annotations: map[string]string{
"infosec.elastic.co/v1/SecretPolicy#rotationMethod": "ci",
"infosec.elastic.co/v1/SecretPolicy#rotationPeriod": "90d",
"infosec.elastic.co/v1/SecretPolicy#serviceType": "authentication",
"infosec.elastic.co/v1/SecretPolicy#severity": "high",
"infra.elastic.co/v1/CI#jobName": "rotate-external-api-key",
"harp.elastic.co/v1/package#encryptionKeyAlias": "test",
},
Name: "app/production/testAccount/testService/v1.0.0/internalTestComponent/authentication/api_key",
Secrets: nil,
},
},
},
Expand All @@ -101,31 +93,29 @@ func TestFromBundle(t *testing.T) {
},
{
name: "secret data is nil",
args: args{
b: &bundlev1.Bundle{
Labels: map[string]string{
"test": "true",
},
Annotations: map[string]string{
"harp.elastic.co/v1/testing#bundlePurpose": "test",
},
Packages: []*bundlev1.Package{
{
Labels: map[string]string{
"external": "true",
},
Annotations: map[string]string{
"infosec.elastic.co/v1/SecretPolicy#rotationMethod": "ci",
"infosec.elastic.co/v1/SecretPolicy#rotationPeriod": "90d",
"infosec.elastic.co/v1/SecretPolicy#serviceType": "authentication",
"infosec.elastic.co/v1/SecretPolicy#severity": "high",
"infra.elastic.co/v1/CI#jobName": "rotate-external-api-key",
"harp.elastic.co/v1/package#encryptionKeyAlias": "test",
},
Name: "app/production/testAccount/testService/v1.0.0/internalTestComponent/authentication/api_key",
Secrets: &bundlev1.SecretChain{
Data: nil,
},
bundle: &bundlev1.Bundle{
Labels: map[string]string{
"test": "true",
},
Annotations: map[string]string{
"harp.elastic.co/v1/testing#bundlePurpose": "test",
},
Packages: []*bundlev1.Package{
{
Labels: map[string]string{
"external": "true",
},
Annotations: map[string]string{
"infosec.elastic.co/v1/SecretPolicy#rotationMethod": "ci",
"infosec.elastic.co/v1/SecretPolicy#rotationPeriod": "90d",
"infosec.elastic.co/v1/SecretPolicy#serviceType": "authentication",
"infosec.elastic.co/v1/SecretPolicy#severity": "high",
"infra.elastic.co/v1/CI#jobName": "rotate-external-api-key",
"harp.elastic.co/v1/package#encryptionKeyAlias": "test",
},
Name: "app/production/testAccount/testService/v1.0.0/internalTestComponent/authentication/api_key",
Secrets: &bundlev1.SecretChain{
Data: nil,
},
},
},
Expand All @@ -144,38 +134,36 @@ func TestFromBundle(t *testing.T) {
},
{
name: "package and secrets define with annotations and labels",
args: args{
b: &bundlev1.Bundle{
Labels: map[string]string{
"test": "true",
},
Annotations: map[string]string{
"harp.elastic.co/v1/testing#bundlePurpose": "test",
},
Packages: []*bundlev1.Package{
{
bundle: &bundlev1.Bundle{
Labels: map[string]string{
"test": "true",
},
Annotations: map[string]string{
"harp.elastic.co/v1/testing#bundlePurpose": "test",
},
Packages: []*bundlev1.Package{
{
Labels: map[string]string{
"external": "true",
},
Annotations: map[string]string{
"harp.elastic.co/v1/package#encryptionKeyAlias": "test",
"infra.elastic.co/v1/CI#jobName": "rotate-external-api-key",
"infosec.elastic.co/v1/SecretPolicy#rotationMethod": "ci",
"infosec.elastic.co/v1/SecretPolicy#rotationPeriod": "90d",
"infosec.elastic.co/v1/SecretPolicy#serviceType": "authentication",
"infosec.elastic.co/v1/SecretPolicy#severity": "high",
},
Name: "app/production/testAccount/testService/v1.0.0/internalTestComponent/authentication/api_key",
Secrets: &bundlev1.SecretChain{
Labels: map[string]string{
"external": "true",
},
Annotations: map[string]string{
"harp.elastic.co/v1/package#encryptionKeyAlias": "test",
"infra.elastic.co/v1/CI#jobName": "rotate-external-api-key",
"infosec.elastic.co/v1/SecretPolicy#rotationMethod": "ci",
"infosec.elastic.co/v1/SecretPolicy#rotationPeriod": "90d",
"infosec.elastic.co/v1/SecretPolicy#serviceType": "authentication",
"infosec.elastic.co/v1/SecretPolicy#severity": "high",
"vendor": "true",
},
Name: "app/production/testAccount/testService/v1.0.0/internalTestComponent/authentication/api_key",
Secrets: &bundlev1.SecretChain{
Labels: map[string]string{
"vendor": "true",
},
Data: []*bundlev1.KV{
{
Key: "API_KEY",
Type: "string",
Value: []byte("3YGVuHwUqYVkjk-c6lQgfVQwFHawPG36TgAm72sPZGE="),
},
Data: []*bundlev1.KV{
{
Key: "API_KEY",
Type: "string",
Value: []byte("3YGVuHwUqYVkjk-c6lQgfVQwFHawPG36TgAm72sPZGE="),
},
},
},
Expand Down Expand Up @@ -213,13 +201,23 @@ func TestFromBundle(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := FromBundle(tt.args.b)
if (err != nil) != tt.wantErr {
t.Errorf("error = %v, wantErr %v", err, tt.wantErr)
}
got, err := FromBundle(tt.bundle)
if tt.wantErr {
assert.Error(t, err)
} else {
assert.NoError(t, err)
assert.Equal(t, tt.want.ApiVersion, got.ApiVersion)
assert.Equal(t, tt.want.Kind, got.Kind)
assert.Equal(t, tt.want.Meta, got.Meta)
assert.Equal(t, len(tt.want.Spec.Rules), len(got.Spec.Rules))

if !proto.Equal(got, tt.want) {
t.Errorf("Ruleset not equal = %v, want %v", got, tt.want)
for idx, expectedRule := range tt.want.Spec.Rules {
gotRule := got.Spec.Rules[idx]
assert.Equal(t, expectedRule.Name, gotRule.Name)
assert.Equal(t, expectedRule.Path, gotRule.Path)
assert.Equal(t, len(expectedRule.Constraints), len(gotRule.Constraints))
assert.ElementsMatch(t, expectedRule.GetConstraints(), gotRule.GetConstraints())
}
}
})
}
Expand Down
1 change: 0 additions & 1 deletion pkg/sdk/value/encryption/transformer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (

"github.com/elastic/harp/pkg/sdk/value"
"github.com/elastic/harp/pkg/sdk/value/encryption"

// Register encryption transformers
_ "github.com/elastic/harp/pkg/sdk/value/encryption/aead"
_ "github.com/elastic/harp/pkg/sdk/value/encryption/age"
Expand Down

0 comments on commit 31d6f5f

Please sign in to comment.