Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ func fixModelInputSecret(name string, paramsEnabled, policyEnabled bool) *corev1
sec.StringData["parameter-input-parameters"] = `{"param":"one"}`
}
if policyEnabled {
sec.StringData["action-policy.json"] = `{"interface":{"rules":[{"interface":{"path":"cap.interface.dummy","revision":null},"oneOf":[{"implementationConstraints":{"requires":null,"attributes":null,"path":"cap.implementation.dummy"},"inject":{"requiredTypeInstances":[{"id":"policy-ti-id","description":"Sample description"}],"additionalParameters":[{"name":"additional-parameters","value":{"snapshot":true}}],"additionalTypeInstances":[{"name":"additional-ti","id":"additional-ti-id"}]}}]}]},"typeInstance":{"rules":[{"typeRef":{"path":"cap.type.aws.auth.credentials","revision":"0.1.0"},"backend":{"id":"00fd161c-01bd-47a6-9872-47490e11f996","description":"Vault TI"}},{"typeRef":{"path":"cap.type.aws.*","revision":null},"backend":{"id":"31bb8355-10d7-49ce-a739-4554d8a40b63","description":null}},{"typeRef":{"path":"cap.*","revision":null},"backend":{"id":"a36ed738-dfe7-45ec-acd1-8e44e8db893b","description":"Default Capact PostgreSQL backend"}}]}}`
sec.StringData["action-policy.json"] = `{"interface":{"default":null,"rules":[{"interface":{"path":"cap.interface.dummy","revision":null},"oneOf":[{"implementationConstraints":{"requires":null,"attributes":null,"path":"cap.implementation.dummy"},"inject":{"requiredTypeInstances":[{"id":"policy-ti-id","description":"Sample description"}],"additionalParameters":[{"name":"additional-parameters","value":{"snapshot":true}}],"additionalTypeInstances":[{"name":"additional-ti","id":"additional-ti-id"}]}}]}]},"typeInstance":{"rules":[{"typeRef":{"path":"cap.type.aws.auth.credentials","revision":"0.1.0"},"backend":{"id":"00fd161c-01bd-47a6-9872-47490e11f996","description":"Vault TI"}},{"typeRef":{"path":"cap.type.aws.*","revision":null},"backend":{"id":"31bb8355-10d7-49ce-a739-4554d8a40b63","description":null}},{"typeRef":{"path":"cap.*","revision":null},"backend":{"id":"a36ed738-dfe7-45ec-acd1-8e44e8db893b","description":"Default Capact PostgreSQL backend"}}]}}`
}

return sec
Expand Down
26 changes: 24 additions & 2 deletions internal/k8s-engine/graphql/domain/policy/converter.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,19 @@ func (c *Converter) interfaceFromGraphQLInput(in *graphql.InterfacePolicyInput)
})
}

return policy.InterfacePolicy{Rules: rules}, nil
var interfaceDefaults *policy.InterfaceDefault
if in.Default != nil && in.Default.Inject != nil {
interfaceDefaults = &policy.InterfaceDefault{
Inject: &policy.DefaultInject{
RequiredTypeInstances: c.requiredTypeInstancesToInjectFromGraphQLInput(in.Default.Inject.RequiredTypeInstances),
},
}
}

return policy.InterfacePolicy{
Default: interfaceDefaults,
Rules: rules,
}, nil
}

func (c *Converter) typeInstanceFromGraphQLInput(in *graphql.TypeInstancePolicyInput) policy.TypeInstancePolicy {
Expand Down Expand Up @@ -117,8 +129,18 @@ func (c *Converter) interfaceToGraphQL(in policy.InterfacePolicy) *graphql.Inter
})
}

var defaultForInterface *graphql.DefaultForInterface
if in.DefaultRequiredTypeInstancesToInject() != nil {
defaultForInterface = &graphql.DefaultForInterface{
Inject: &graphql.DefaultInjectForInterface{
RequiredTypeInstances: c.requiredTypeInstancesToInjectToGraphQL(in.Default.Inject.RequiredTypeInstances),
},
}
}

return &graphql.InterfacePolicy{
Rules: gqlRules,
Default: defaultForInterface,
Rules: gqlRules,
}
}

Expand Down
32 changes: 32 additions & 0 deletions internal/k8s-engine/graphql/domain/policy/fixtures_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ import (
func fixGQLInput() graphql.PolicyInput {
return graphql.PolicyInput{
Interface: &graphql.InterfacePolicyInput{
Default: &graphql.DefaultForInterfaceInput{
Inject: &graphql.DefaultInjectForInterfaceInput{
RequiredTypeInstances: []*graphql.RequiredTypeInstanceReferenceInput{
{
ID: "28806e5a-3b13-4d58-915b-8357a51c3e95",
Description: ptr.String("Sample description"),
},
},
},
},
Rules: []*graphql.RulesForInterfaceInput{
{
Interface: &graphql.ManifestReferenceInput{
Expand Down Expand Up @@ -110,6 +120,16 @@ func fixGQLInput() graphql.PolicyInput {
func fixGQL() graphql.Policy {
return graphql.Policy{
Interface: &graphql.InterfacePolicy{
Default: &graphql.DefaultForInterface{
Inject: &graphql.DefaultInjectForInterface{
RequiredTypeInstances: []*graphql.RequiredTypeInstanceReference{
{
ID: "28806e5a-3b13-4d58-915b-8357a51c3e95",
Description: ptr.String("Sample description"),
},
},
},
},
Rules: []*graphql.RulesForInterface{
{
Interface: &graphql.ManifestReferenceWithOptionalRevision{
Expand Down Expand Up @@ -210,6 +230,18 @@ func fixGQL() graphql.Policy {
func fixModel() policy.Policy {
return policy.Policy{
Interface: policy.InterfacePolicy{
Default: &policy.InterfaceDefault{
Inject: &policy.DefaultInject{
RequiredTypeInstances: []policy.RequiredTypeInstanceToInject{
{
TypeInstanceReference: policy.TypeInstanceReference{
ID: "28806e5a-3b13-4d58-915b-8357a51c3e95",
Description: ptr.String("Sample description"),
},
},
},
},
},
Rules: policy.InterfaceRulesList{
{
Interface: types.ManifestRefWithOptRevision{
Expand Down
2 changes: 2 additions & 0 deletions pkg/engine/api/graphql/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,6 @@ models:
model: "capact.io/capact/pkg/engine/api/graphql.RequiredTypeInstanceReference"
AdditionalTypeInstanceReference:
model: "capact.io/capact/pkg/engine/api/graphql.AdditionalTypeInstanceReference"
InterfacePolicy:
model: "capact.io/capact/pkg/engine/api/graphql.InterfacePolicy"

18 changes: 18 additions & 0 deletions pkg/engine/api/graphql/examples.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,16 @@ mutation UpdatePolicy {
updatePolicy(
in: {
interface: {
default: {
inject: {
requiredTypeInstances: [
{
id: "28806e5a-3b13-4d58-915b-8357a51c3e95"
description: "My TypeInstance"
}
]
}
}
rules: [
{
interface: {
Expand Down Expand Up @@ -294,6 +304,14 @@ fragment ActionFields on Action {

fragment PolicyFields on Policy {
interface {
default {
inject {
requiredTypeInstances {
id
description
}
}
}
rules {
interface {
path
Expand Down
23 changes: 18 additions & 5 deletions pkg/engine/api/graphql/models_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions pkg/engine/api/graphql/policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ package graphql

// The types had to be moved out from generated models to add `omitempty` tags.

//InterfacePolicy represents Interface Policy.
type InterfacePolicy struct {
Default *DefaultForInterface `json:"default,omitempty"`
Rules []*RulesForInterface `json:"rules"`
}

// PolicyRule represents a single policy rule.
type PolicyRule struct {
ImplementationConstraints *PolicyRuleImplementationConstraints `json:"implementationConstraints,omitempty"`
Expand Down
18 changes: 18 additions & 0 deletions pkg/engine/api/graphql/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,18 @@ input TypeInstanceBackendRuleInput {

# Interface Policy Input
input InterfacePolicyInput {
default: DefaultForInterfaceInput
rules: [RulesForInterfaceInput!]!
}

input DefaultForInterfaceInput {
inject: DefaultInjectForInterfaceInput
}

input DefaultInjectForInterfaceInput{
requiredTypeInstances: [RequiredTypeInstanceReferenceInput!]
}

input RulesForInterfaceInput {
interface: ManifestReferenceInput!
oneOf: [PolicyRuleInput!]!
Expand Down Expand Up @@ -393,9 +402,18 @@ type TypeInstanceBackendRule {

# Interface Policy
type InterfacePolicy {
default: DefaultForInterface
rules: [RulesForInterface!]!
}

type DefaultForInterface {
inject: DefaultInjectForInterface
}

type DefaultInjectForInterface {
requiredTypeInstances: [RequiredTypeInstanceReference!]
}

type RulesForInterface {
interface: ManifestReferenceWithOptionalRevision!
oneOf: [PolicyRule!]!
Expand Down
Loading