Skip to content
This repository has been archived by the owner on Oct 9, 2023. It is now read-only.

Added validation check to impose limits on stored, free-form strings #180

Merged
merged 13 commits into from
Aug 18, 2021
Merged

Added validation check to impose limits on stored, free-form strings #180

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
505becd
added validation for project name
yindia Apr 13, 2021
a2c6be6
Added validation check for all models
yindia Apr 13, 2021
dc962bd
fix testcase
yindia Apr 13, 2021
70409be
Updated string limit
yindia Apr 30, 2021
4323cd4
Rebase
yindia May 23, 2021
3ecdb0c
update go.sum
yindia May 23, 2021
35e6fa2
set lower limit value for validation
yindia May 27, 2021
e0113ee
Debug log
yindia May 27, 2021
a126614
Debug log
yindia May 27, 2021
74e728b
Merge branch 'master' into fix-336
yindia May 30, 2021
e780eef
Merge branch 'master' of github.com:flyteorg/flyteadmin into fix-336
yindia Aug 3, 2021
49ca1e1
Merge branch 'master' of github.com:flyteorg/flyteadmin into fix-336
yindia Aug 16, 2021
428cbc6
rebase master
yindia Aug 16, 2021
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
5 changes: 3 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ require (
github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac // indirect
github.com/prometheus/client_golang v1.9.0
github.com/prometheus/common v0.19.0 // indirect
github.com/qor/validations v0.0.0-20171228122639-f364bca61b46 // indirect
github.com/sirupsen/logrus v1.8.1
github.com/qor/qor v0.0.0-20200729071734-d587cffbbb93 // indirect
github.com/qor/validations v0.0.0-20171228122639-f364bca61b46
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
Expand Down
8 changes: 4 additions & 4 deletions pkg/repositories/models/execution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (

// Execution primary key
type ExecutionKey struct {
Project string `gorm:"primary_key;column:execution_project"`
Domain string `gorm:"primary_key;column:execution_domain"`
Name string `gorm:"primary_key;column:execution_name"`
Project string `gorm:"primary_key;column:execution_project" valid:"length(3|255)"`
yindia marked this conversation as resolved.
Show resolved Hide resolved
Domain string `gorm:"primary_key;column:execution_domain" valid:"length(3|255)"`
Name string `gorm:"primary_key;column:execution_name" valid:"length(3|255)"`
}

// Database model to encapsulate a (workflow) execution.
Expand All @@ -23,7 +23,7 @@ type Execution struct {
LaunchPlanID uint `gorm:"index"`
WorkflowID uint `gorm:"index"`
TaskID uint `gorm:"index"`
Phase string `valid:"length(3|50)"`
Phase string `valid:"length(3|255)"`
Closure []byte
Spec []byte `gorm:"not null"`
StartedAt *time.Time
Expand Down
6 changes: 3 additions & 3 deletions pkg/repositories/models/launch_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package models

// Launch plan primary key
type LaunchPlanKey struct {
Project string `gorm:"primary_key;index:lp_project_domain_name_idx,lp_project_domain_idx" valid:"length(3|50)"`
Domain string `gorm:"primary_key;index:lp_project_domain_name_idx,lp_project_domain_idx" valid:"length(3|50)"`
Name string `gorm:"primary_key;index:lp_project_domain_name_idx" valid:"length(3|50)"`
Project string `gorm:"primary_key;index:lp_project_domain_name_idx,lp_project_domain_idx" valid:"length(3|255)"`
Domain string `gorm:"primary_key;index:lp_project_domain_name_idx,lp_project_domain_idx" valid:"length(3|255)"`
Name string `gorm:"primary_key;index:lp_project_domain_name_idx" valid:"length(3|255)"`
Version string `gorm:"primary_key" valid:"length(3|50)"`
}

Expand Down
8 changes: 4 additions & 4 deletions pkg/repositories/models/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ package models

// Task primary key
type TaskKey struct {
Project string `gorm:"primary_key;index:task_project_domain_name_idx,task_project_domain_idx" valid:"length(3|50)"`
Domain string `gorm:"primary_key;index:task_project_domain_name_idx,task_project_domain_idx" valid:"length(3|50)"`
Name string `gorm:"primary_key;index:task_project_domain_name_idx" valid:"length(3|50)"`
Version string `gorm:"primary_key" valid:"length(3|50)"`
Project string `gorm:"primary_key;index:task_project_domain_name_idx,task_project_domain_idx" valid:"length(3|255)"`
Domain string `gorm:"primary_key;index:task_project_domain_name_idx,task_project_domain_idx" valid:"length(3|255)"`
Name string `gorm:"primary_key;index:task_project_domain_name_idx" valid:"length(3|255)"`
Version string `gorm:"primary_key" valid:"length(3|255)"`
}

// Database model to encapsulate a task.
Expand Down
2 changes: 1 addition & 1 deletion pkg/repositories/models/task_execution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type TaskExecution struct {
TaskExecutionKey
Phase string `valid:"length(3|50)"`
PhaseVersion uint32
InputURI string `valid:"length(3|50)"`
InputURI string `valid:"length(3|255)"`
Closure []byte
StartedAt *time.Time
// Corresponds to the CreatedAt field in the TaskExecution closure
Expand Down