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.

Sign up for GitHub

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

feat(operator): adapt TaskDefinition validation webhook to consider python and deno runtime #1534

Merged
merged 8 commits into from
Jun 12, 2023
Merged

feat(operator): adapt TaskDefinition validation webhook to consider python and deno runtime #1534

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b82ab74
Added logic to validation webhook consider new fields for python-runt…
geoffrey1330 Jun 7, 2023
e8dcc61
Added unit test and helper function
geoffrey1330 Jun 7, 2023
b207377
Added unit test and helper function
geoffrey1330 Jun 7, 2023
e0b5dac
fixed failing unit test
geoffrey1330 Jun 7, 2023
caebf75
Added integration test
geoffrey1330 Jun 8, 2023
dd18379
Update test/integration/validate-taskdefinition/00-teststep-install.yaml
RealAnna Jun 12, 2023
e90286c
Merge branch 'keptn:main' into feat/1527/validating_webhook_python-ru…
geoffrey1330 Jun 12, 2023
37c155e
renamed integration test yaml files
geoffrey1330 Jun 12, 2023
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
27 changes: 22 additions & 5 deletions operator/apis/lifecycle/v1alpha3/keptntaskdefinition_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,39 @@ func (r *KeptnTaskDefinition) validateKeptnTaskDefinition() error {
allErrs)
}
func (r *KeptnTaskDefinition) validateFields() *field.Error {

if r.Spec.Function == nil && r.Spec.Container == nil {
count := countSpec(r)
if count == 0 {
return field.Invalid(
field.NewPath("spec"),
r.Spec,
errors.New("Forbidden! Either Function or Container field must be defined").Error(),
errors.New("Forbidden! Either Function, Container, Python, or Deno field must be defined").Error(),
)
}

if r.Spec.Function != nil && r.Spec.Container != nil {
if count > 1 {
return field.Invalid(
field.NewPath("spec"),
r.Spec,
errors.New("Forbidden! Both Function and Container fields cannot be defined simultaneously").Error(),
errors.New("Forbidden! Only one of Function, Container, Python, or Deno field can be defined").Error(),
)
}

return nil
}

func countSpec(r *KeptnTaskDefinition) int {
count := 0
geoffrey1330 marked this conversation as resolved.
Show resolved Hide resolved
if r.Spec.Function != nil {
geoffrey1330 marked this conversation as resolved.
Show resolved Hide resolved
count++
}
if r.Spec.Container != nil {
count++
}
if r.Spec.Python != nil {
count++
}
if r.Spec.Deno != nil {
count++
}
return count
}
210 changes: 205 additions & 5 deletions operator/apis/lifecycle/v1alpha3/keptntaskdefinition_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,31 @@ func TestKeptnTaskDefinition_ValidateFields(t *testing.T) {
Container: &ContainerSpec{},
}

specWithFunctionAndPython := KeptnTaskDefinitionSpec{
Function: &RuntimeSpec{},
Python: &RuntimeSpec{},
}

specWithFunctionAndDeno := KeptnTaskDefinitionSpec{
Function: &RuntimeSpec{},
Deno: &RuntimeSpec{},
}

specWithContainerAndPython := KeptnTaskDefinitionSpec{
Container: &ContainerSpec{},
Python: &RuntimeSpec{},
}

specWithContainerAndDeno := KeptnTaskDefinitionSpec{
Container: &ContainerSpec{},
Deno: &RuntimeSpec{},
}

specWithPythonAndDeno := KeptnTaskDefinitionSpec{
Python: &RuntimeSpec{},
Deno: &RuntimeSpec{},
}

emptySpec := KeptnTaskDefinitionSpec{}

tests := []struct {
Expand All @@ -29,15 +54,15 @@ func TestKeptnTaskDefinition_ValidateFields(t *testing.T) {
oldSpec runtime.Object
}{
{
name: "with-no-function-or-container",
name: "with-no-function-or-container-or-python-or-deno",
spec: emptySpec,
want: apierrors.NewInvalid(
schema.GroupKind{Group: "lifecycle.keptn.sh", Kind: "KeptnTaskDefinition"},
"with-no-function-or-container",
"with-no-function-or-container-or-python-or-deno",
[]*field.Error{field.Invalid(
field.NewPath("spec"),
emptySpec,
errors.New("Forbidden! Either Function or Container field must be defined").Error(),
errors.New("Forbidden! Either Function, Container, Python, or Deno field must be defined").Error(),
)},
),
verb: "create",
Expand All @@ -52,7 +77,7 @@ func TestKeptnTaskDefinition_ValidateFields(t *testing.T) {
[]*field.Error{field.Invalid(
field.NewPath("spec"),
specWithFunctionAndContainer,
errors.New("Forbidden! Both Function and Container fields cannot be defined simultaneously").Error(),
errors.New("Forbidden! Only one of Function, Container, Python, or Deno field can be defined").Error(),
)},
),
},
Expand All @@ -70,6 +95,21 @@ func TestKeptnTaskDefinition_ValidateFields(t *testing.T) {
},
verb: "create",
},
{
name: "with-python-only",
spec: KeptnTaskDefinitionSpec{
Python: &RuntimeSpec{},
},
verb: "create",
},
{
name: "with-deno-only",
spec: KeptnTaskDefinitionSpec{
Deno: &RuntimeSpec{},
},
verb: "create",
},

{
name: "update-with-both-function-and-container",
spec: specWithFunctionAndContainer,
Expand All @@ -79,14 +119,174 @@ func TestKeptnTaskDefinition_ValidateFields(t *testing.T) {
[]*field.Error{field.Invalid(
field.NewPath("spec"),
specWithFunctionAndContainer,
errors.New("Forbidden! Both Function and Container fields cannot be defined simultaneously").Error(),
errors.New("Forbidden! Only one of Function, Container, Python, or Deno field can be defined").Error(),
)},
),
oldSpec: &KeptnTaskDefinition{
Spec: KeptnTaskDefinitionSpec{},
},
verb: "update",
},

{
name: "with-both-function-and-python",
spec: specWithFunctionAndPython,
verb: "create",
want: apierrors.NewInvalid(
schema.GroupKind{Group: "lifecycle.keptn.sh", Kind: "KeptnTaskDefinition"},
"with-both-function-and-python",
[]*field.Error{field.Invalid(
field.NewPath("spec"),
specWithFunctionAndPython,
errors.New("Forbidden! Only one of Function, Container, Python, or Deno field can be defined").Error(),
)},
),
},
{
name: "update-with-both-function-and-python",
spec: specWithFunctionAndPython,
want: apierrors.NewInvalid(
schema.GroupKind{Group: "lifecycle.keptn.sh", Kind: "KeptnTaskDefinition"},
"update-with-both-function-and-python",
[]*field.Error{field.Invalid(
field.NewPath("spec"),
specWithFunctionAndPython,
errors.New("Forbidden! Only one of Function, Container, Python, or Deno field can be defined").Error(),
)},
),
oldSpec: &KeptnTaskDefinition{
Spec: KeptnTaskDefinitionSpec{},
},
verb: "update",
},

{
name: "with-both-function-and-deno",
spec: specWithFunctionAndDeno,
verb: "create",
want: apierrors.NewInvalid(
schema.GroupKind{Group: "lifecycle.keptn.sh", Kind: "KeptnTaskDefinition"},
"with-both-function-and-deno",
[]*field.Error{field.Invalid(
field.NewPath("spec"),
specWithFunctionAndDeno,
errors.New("Forbidden! Only one of Function, Container, Python, or Deno field can be defined").Error(),
)},
),
},
{
name: "update-with-both-function-and-deno",
spec: specWithFunctionAndDeno,
want: apierrors.NewInvalid(
schema.GroupKind{Group: "lifecycle.keptn.sh", Kind: "KeptnTaskDefinition"},
"update-with-both-function-and-deno",
[]*field.Error{field.Invalid(
field.NewPath("spec"),
specWithFunctionAndDeno,
errors.New("Forbidden! Only one of Function, Container, Python, or Deno field can be defined").Error(),
)},
),
oldSpec: &KeptnTaskDefinition{
Spec: KeptnTaskDefinitionSpec{},
},
verb: "update",
},

{
name: "with-both-container-and-python",
spec: specWithContainerAndPython,
verb: "create",
want: apierrors.NewInvalid(
schema.GroupKind{Group: "lifecycle.keptn.sh", Kind: "KeptnTaskDefinition"},
"with-both-container-and-python",
[]*field.Error{field.Invalid(
field.NewPath("spec"),
specWithContainerAndPython,
errors.New("Forbidden! Only one of Function, Container, Python, or Deno field can be defined").Error(),
)},
),
},
{
name: "update-with-both-container-and-python",
spec: specWithContainerAndPython,
want: apierrors.NewInvalid(
schema.GroupKind{Group: "lifecycle.keptn.sh", Kind: "KeptnTaskDefinition"},
"update-with-both-container-and-python",
[]*field.Error{field.Invalid(
field.NewPath("spec"),
specWithContainerAndPython,
errors.New("Forbidden! Only one of Function, Container, Python, or Deno field can be defined").Error(),
)},
),
oldSpec: &KeptnTaskDefinition{
Spec: KeptnTaskDefinitionSpec{},
},
verb: "update",
},

{
name: "with-both-container-and-deno",
spec: specWithContainerAndDeno,
verb: "create",
want: apierrors.NewInvalid(
schema.GroupKind{Group: "lifecycle.keptn.sh", Kind: "KeptnTaskDefinition"},
"with-both-container-and-deno",
[]*field.Error{field.Invalid(
field.NewPath("spec"),
specWithContainerAndDeno,
errors.New("Forbidden! Only one of Function, Container, Python, or Deno field can be defined").Error(),
)},
),
},
{
name: "update-with-both-container-and-deno",
spec: specWithContainerAndDeno,
want: apierrors.NewInvalid(
schema.GroupKind{Group: "lifecycle.keptn.sh", Kind: "KeptnTaskDefinition"},
"update-with-both-container-and-deno",
[]*field.Error{field.Invalid(
field.NewPath("spec"),
specWithContainerAndDeno,
errors.New("Forbidden! Only one of Function, Container, Pdeno or Deno field can be defined").Error(),
geoffrey1330 marked this conversation as resolved.
Show resolved Hide resolved
)},
),
oldSpec: &KeptnTaskDefinition{
Spec: KeptnTaskDefinitionSpec{},
},
verb: "update",
},
{
name: "with-both-python-and-deno",
spec: specWithPythonAndDeno,
verb: "create",
want: apierrors.NewInvalid(
schema.GroupKind{Group: "lifecycle.keptn.sh", Kind: "KeptnTaskDefinition"},
"with-both-python-and-deno",
[]*field.Error{field.Invalid(
field.NewPath("spec"),
specWithPythonAndDeno,
errors.New("Forbidden! Only one of Function, Container, Python, or Deno field can be defined").Error(),
)},
),
},
{
name: "update-with-both-python-and-deno",
spec: specWithPythonAndDeno,
want: apierrors.NewInvalid(
schema.GroupKind{Group: "lifecycle.keptn.sh", Kind: "KeptnTaskDefinition"},
"update-with-both-python-and-deno",
[]*field.Error{field.Invalid(
field.NewPath("spec"),
specWithPythonAndDeno,
errors.New("Forbidden! Only one of Function, Container, Pdeno or Deno field can be defined").Error(),
geoffrey1330 marked this conversation as resolved.
Show resolved Hide resolved
)},
),
oldSpec: &KeptnTaskDefinition{
Spec: KeptnTaskDefinitionSpec{},
},
verb: "update",
},

{
name: "delete",
verb: "delete",
Expand Down