Commit21bd3ee

authored

chore: validate fields as per coderd (#85)

1 parent7645de8 commit21bd3eeCopy full SHA for 21bd3ee

File tree

+27

-2

lines changed

+27

-2

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,13 +77,18 @@ func (r *GroupResource) Schema(ctx context.Context, req resource.SchemaRequest,`
`77`	`77`	`"name": schema.StringAttribute{`
`78`	`78`	`MarkdownDescription:"The unique name of the group.",`
`79`	`79`	`Required:true,`
	`80`	`+Validators: []validator.String{`
	`81`	`+stringvalidator.LengthBetween(1,36),`
	`82`	`+stringvalidator.RegexMatches(nameValidRegex,"Group names must be alpahnumeric with hyphens."),`
	`83`	`+},`
`80`	`84`	`},`
`81`	`85`	`"display_name": schema.StringAttribute{`
`82`	`86`	`MarkdownDescription:"The display name of the group. Defaults to the group name.",`
`83`	`87`	`Computed:true,`
`84`	`88`	`Optional:true,`
`85`	`89`	`Validators: []validator.String{`
`86`		`-stringvalidator.LengthAtLeast(1),`
	`90`	`+stringvalidator.LengthBetween(1,64),`
	`91`	`+stringvalidator.RegexMatches(displayNameRegex,"Group display names must be alphanumeric with spaces"),`
`87`	`92`	`},`
`88`	`93`	`Default:stringdefault.StaticString(""),`
`89`	`94`	`},`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -248,12 +248,17 @@ func (r *TemplateResource) Schema(ctx context.Context, req resource.SchemaReques`
`248`	`248`	`Required:true,`
`249`	`249`	`Validators: []validator.String{`
`250`	`250`	`stringvalidator.LengthBetween(1,32),`
	`251`	`+stringvalidator.RegexMatches(nameValidRegex,"Template names must be alphanumeric with hyphens."),`
`251`	`252`	`},`
`252`	`253`	`},`
`253`	`254`	`"display_name": schema.StringAttribute{`
`254`	`255`	`MarkdownDescription:"The display name of the template. Defaults to the template name.",`
`255`	`256`	`Optional:true,`
`256`	`257`	`Computed:true,`
	`258`	`+Validators: []validator.String{`
	`259`	`+stringvalidator.LengthBetween(1,64),`
	`260`	`+stringvalidator.RegexMatches(displayNameRegex,"Template display names must be alphanumeric with spaces."),`
	`261`	`+},`
`257`	`262`	`},`
`258`	`263`	`"description": schema.StringAttribute{`
`259`	`264`	`MarkdownDescription:"A description of the template.",`
`@@ -394,7 +399,8 @@ func (r *TemplateResource) Schema(ctx context.Context, req resource.SchemaReques`
`394`	`399`	`Optional:true,`
`395`	`400`	`Computed:true,`
`396`	`401`	`Validators: []validator.String{`
`397`		`-stringvalidator.LengthAtLeast(1),`
	`402`	`+stringvalidator.LengthBetween(1,64),`
	`403`	`+stringvalidator.RegexMatches(templateVersionNameRegex,"Template version names must be alphanumeric with underscores and dots."),`
`398`	`404`	`},`
`399`	`405`	`},`
`400`	`406`	`"message": schema.StringAttribute{`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,18 @@ func (r *UserResource) Schema(ctx context.Context, req resource.SchemaRequest, r`
`71`	`71`	`"username": schema.StringAttribute{`
`72`	`72`	`MarkdownDescription:"Username of the user.",`
`73`	`73`	`Required:true,`
	`74`	`+Validators: []validator.String{`
	`75`	`+stringvalidator.LengthBetween(1,32),`
	`76`	`+stringvalidator.RegexMatches(nameValidRegex,"Username must be alphanumeric with hyphens."),`
	`77`	`+},`
`74`	`78`	`},`
`75`	`79`	`"name": schema.StringAttribute{`
`76`	`80`	`MarkdownDescription:"Display name of the user. Defaults to username.",`
`77`	`81`	`Computed:true,`
`78`	`82`	`Optional:true,`
	`83`	`+Validators: []validator.String{`
	`84`	`+stringvalidator.LengthBetween(1,128),`
	`85`	`+},`
`79`	`86`	`},`
`80`	`87`	`"email": schema.StringAttribute{`
`81`	`88`	`MarkdownDescription:"Email address of the user.",`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,17 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`	`"os"`
`8`	`8`	`"path/filepath"`
	`9`	`+"regexp"`
`9`	`10`
`10`	`11`	`"github.com/google/uuid"`
`11`	`12`	`)`
`12`	`13`
	`14`	`+var (`
	`15`	`+nameValidRegex=regexp.MustCompile("^[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*$")`
	`16`	+templateVersionNameRegex=regexp.MustCompile(`^[a-zA-Z0-9]+(?:[_.-]{1}[a-zA-Z0-9]+)*$`)
	`17`	+displayNameRegex=regexp.MustCompile(`^[^\s](.*[^\s])?$`)
	`18`	`+)`
	`19`	`+`
`13`	`20`	`funcPtrTo[Tany](vT)*T {`
`14`	`21`	`return&v`
`15`	`22`	`}`

Comments

(0)