Commitbf04eea

authored

feat: use validation error while parsingcoder_parameter (#86)

* fix: use validation error while parsing coder_parameter* fix: Test coder_parameter example

1 parente10b5f4 commitbf04eeaCopy full SHA for bf04eea

File tree

+51

-6

lines changed

+51

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ resource "coder_app" "code-server" {`
`14`	`14`	`agent_id=coder_agent.dev.id`
`15`	`15`	`slug="code-server"`
`16`	`16`	`display_name="VS Code"`
`17`		`-icon=data.coder_workspace.me.access_url+"/icon/code.svg"`
	`17`	`+icon="${data.coder_workspace.me.access_url}/icon/code.svg"`
`18`	`18`	`url="http://localhost:13337"`
`19`	`19`	`share="owner"`
`20`	`20`	`subdomain=false`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,16 +28,19 @@ data "coder_parameter" "is_public_instance" {`
`28`	`28`	`name="Is public instance?"`
`29`	`29`	`icon="/icon/docker.svg"`
`30`	`30`	`type="bool"`
	`31`	`+default=false`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`data"coder_parameter""cores" {`
`34`	`35`	`name="CPU Cores"`
`35`	`36`	`icon="/icon/"`
	`37`	`+default=3`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`data"coder_parameter""disk_size" {`
`39`	`41`	`name="Disk Size"`
`40`	`42`	`type="number"`
	`43`	`+default="9"`
`41`	`44`	`validation {`
`42`	`45`	`# This can apply to number and string types.`
`43`	`46`	`min=0`

Lines changed: 33 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,33 @@`
	`1`	`+package provider_test`
	`2`	`+`
	`3`	`+import (`
	`4`	`+"os"`
	`5`	`+"testing"`
	`6`	`+`
	`7`	`+"github.com/coder/terraform-provider-coder/provider"`
	`8`	`+"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"`
	`9`	`+"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"`
	`10`	`+"github.com/stretchr/testify/require"`
	`11`	`+)`
	`12`	`+`
	`13`	`+funcTestExamples(t*testing.T) {`
	`14`	`+t.Parallel()`
	`15`	`+`
	`16`	`+t.Run("coder_parameter",func(t*testing.T) {`
	`17`	`+resource.Test(t, resource.TestCase{`
	`18`	`+Providers:map[string]*schema.Provider{`
	`19`	`+"coder":provider.New(),`
	`20`	`+},`
	`21`	`+IsUnitTest:true,`
	`22`	`+Steps: []resource.TestStep{{`
	`23`	`+Config:mustReadFile(t,"../examples/resources/coder_parameter/resource.tf"),`
	`24`	`+}},`
	`25`	`+})`
	`26`	`+})`
	`27`	`+}`
	`28`	`+`
	`29`	`+funcmustReadFile(t*testing.T,pathstring)string {`
	`30`	`+content,err:=os.ReadFile(path)`
	`31`	`+require.NoError(t,err)`
	`32`	`+returnstring(content)`
	`33`	`+}`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -300,13 +300,13 @@ func (v *Validation) Valid(typ, value string) error {`
`300`	`300`	`iferr!=nil {`
`301`	`301`	`returnfmt.Errorf("compile regex %q: %s",regex,err)`
`302`	`302`	`}`
`303`		`-matched:=regex.MatchString(value)`
`304`		`-if!matched {`
`305`		`-returnfmt.Errorf("value %q does not match %q",value,regex)`
`306`		`-}`
`307`	`303`	`ifv.Error=="" {`
`308`	`304`	`returnfmt.Errorf("an error must be specified with a regex validation")`
`309`	`305`	`}`
	`306`	`+matched:=regex.MatchString(value)`
	`307`	`+if!matched {`
	`308`	`+returnfmt.Errorf("%s (value %q does not match %q)",v.Error,value,regex)`
	`309`	`+}`
`310`	`310`	`case"number":`
`311`	`311`	`num,err:=strconv.Atoi(value)`
`312`	`312`	`iferr!=nil {`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,8 @@ func TestValueValidatesType(t *testing.T) {`
`267`	`267`	`Name,`
`268`	`268`	`Type,`
`269`	`269`	`Value,`
`270`		`-Regexstring`
	`270`	`+Regex,`
	`271`	`+RegexErrorstring`
`271`	`272`	`Min,`
`272`	`273`	`Maxint`
`273`	`274`	`Error*regexp.Regexp`
`@@ -312,6 +313,13 @@ func TestValueValidatesType(t *testing.T) {`
`312`	`313`	`Type:"bool",`
`313`	`314`	`Value:"cat",`
`314`	`315`	`Error:regexp.MustCompile("boolean value can be either"),`
	`316`	`+}, {`
	`317`	`+Name:"BadStringWithRegex",`
	`318`	`+Type:"string",`
	`319`	`+Regex:"banana",`
	`320`	`+RegexError:"bad fruit",`
	`321`	`+Value:"apple",`
	`322`	+Error:regexp.MustCompile(`bad fruit`),
`315`	`323`	`}} {`
`316`	`324`	`tc:=tc`
`317`	`325`	`t.Run(tc.Name,func(t*testing.T) {`
`@@ -320,6 +328,7 @@ func TestValueValidatesType(t *testing.T) {`
`320`	`328`	`Min:tc.Min,`
`321`	`329`	`Max:tc.Max,`
`322`	`330`	`Regex:tc.Regex,`
	`331`	`+Error:tc.RegexError,`
`323`	`332`	`}`
`324`	`333`	`err:=v.Valid(tc.Type,tc.Value)`
`325`	`334`	`iftc.Error!=nil {`

Comments

(0)