Commit8c5e8ff

authored

fix: set owner name and email to "default" (#209)

1 parentb94b7ea commit8c5e8ffCopy full SHA for 8c5e8ff

File tree

2 files changed

+30

-19

lines changed

provider
- workspace.go
- workspace_test.go

2 files changed

+30

-19

lines changed

`‎provider/workspace.go`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,9 @@ func workspaceDataSource() *schema.Resource {`
`35`	`35`	`_=rd.Set("owner",owner)`
`36`	`36`
`37`	`37`	`ownerEmail:=os.Getenv("CODER_WORKSPACE_OWNER_EMAIL")`
	`38`	`+ifownerEmail=="" {`
	`39`	`+ownerEmail="default@example.com"`
	`40`	`+}`
`38`	`41`	`_=rd.Set("owner_email",ownerEmail)`
`39`	`42`
`40`	`43`	`ownerGroupsText:=os.Getenv("CODER_WORKSPACE_OWNER_GROUPS")`
`@@ -48,6 +51,9 @@ func workspaceDataSource() *schema.Resource {`
`48`	`51`	`_=rd.Set("owner_groups",ownerGroups)`
`49`	`52`
`50`	`53`	`ownerName:=os.Getenv("CODER_WORKSPACE_OWNER_NAME")`
	`54`	`+ifownerName=="" {`
	`55`	`+ownerName="default"`
	`56`	`+}`
`51`	`57`	`_=rd.Set("owner_name",ownerName)`
`52`	`58`
`53`	`59`	`ownerID:=os.Getenv("CODER_WORKSPACE_OWNER_ID")`

`‎provider/workspace_test.go`

Lines changed: 24 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"`
`7`	`7`	`"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"`
`8`	`8`	`"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"`
	`9`	`+"github.com/stretchr/testify/assert"`
`9`	`10`	`"github.com/stretchr/testify/require"`
`10`	`11`
`11`	`12`	`"github.com/coder/terraform-provider-coder/provider"`
`@@ -43,20 +44,30 @@ func TestWorkspace(t *testing.T) {`
`43`	`44`	`value:=attribs["transition"]`
`44`	`45`	`require.NotNil(t,value)`
`45`	`46`	`t.Log(value)`
`46`		`-require.Equal(t,"8080",attribs["access_port"])`
`47`		`-require.Equal(t,"owner123",attribs["owner"])`
`48`		`-require.Equal(t,"Mr Owner",attribs["owner_name"])`
`49`		`-require.Equal(t,"owner123@example.com",attribs["owner_email"])`
`50`		`-require.Equal(t,"abc123",attribs["owner_session_token"])`
`51`		`-require.Equal(t,"group1",attribs["owner_groups.0"])`
`52`		`-require.Equal(t,"group2",attribs["owner_groups.1"])`
`53`		`-require.Equal(t,"templateID",attribs["template_id"])`
`54`		`-require.Equal(t,"template123",attribs["template_name"])`
`55`		`-require.Equal(t,"v1.2.3",attribs["template_version"])`
	`47`	`+assert.Equal(t,"https://example.com:8080",attribs["access_url"])`
	`48`	`+assert.Equal(t,"8080",attribs["access_port"])`
	`49`	`+assert.Equal(t,"owner123",attribs["owner"])`
	`50`	`+assert.Equal(t,"Mr Owner",attribs["owner_name"])`
	`51`	`+assert.Equal(t,"owner123@example.com",attribs["owner_email"])`
	`52`	`+assert.Equal(t,"group1",attribs["owner_groups.0"])`
	`53`	`+assert.Equal(t,"group2",attribs["owner_groups.1"])`
	`54`	`+assert.Equal(t,"templateID",attribs["template_id"])`
	`55`	`+assert.Equal(t,"template123",attribs["template_name"])`
	`56`	`+assert.Equal(t,"v1.2.3",attribs["template_version"])`
`56`	`57`	`returnnil`
`57`	`58`	`},`
`58`	`59`	`}},`
`59`	`60`	`})`
	`61`	`+}`
	`62`	`+`
	`63`	`+funcTestWorkspace_UndefinedOwner(t*testing.T) {`
	`64`	`+t.Setenv("CODER_WORKSPACE_OWNER","owner123")`
	`65`	`+t.Setenv("CODER_WORKSPACE_OWNER_SESSION_TOKEN","abc123")`
	`66`	+t.Setenv("CODER_WORKSPACE_OWNER_GROUPS",`["group1", "group2"]`)
	`67`	`+t.Setenv("CODER_WORKSPACE_TEMPLATE_ID","templateID")`
	`68`	`+t.Setenv("CODER_WORKSPACE_TEMPLATE_NAME","template123")`
	`69`	`+t.Setenv("CODER_WORKSPACE_TEMPLATE_VERSION","v1.2.3")`
	`70`	`+`
`60`	`71`	`resource.Test(t, resource.TestCase{`
`61`	`72`	`Providers:map[string]*schema.Provider{`
`62`	`73`	`"coder":provider.New(),`
`@@ -79,15 +90,9 @@ func TestWorkspace(t *testing.T) {`
`79`	`90`	`value:=attribs["transition"]`
`80`	`91`	`require.NotNil(t,value)`
`81`	`92`	`t.Log(value)`
`82`		`-require.Equal(t,"https://example.com:8080",attribs["access_url"])`
`83`		`-require.Equal(t,"owner123",attribs["owner"])`
`84`		`-require.Equal(t,"Mr Owner",attribs["owner_name"])`
`85`		`-require.Equal(t,"owner123@example.com",attribs["owner_email"])`
`86`		`-require.Equal(t,"group1",attribs["owner_groups.0"])`
`87`		`-require.Equal(t,"group2",attribs["owner_groups.1"])`
`88`		`-require.Equal(t,"templateID",attribs["template_id"])`
`89`		`-require.Equal(t,"template123",attribs["template_name"])`
`90`		`-require.Equal(t,"v1.2.3",attribs["template_version"])`
	`93`	`+assert.Equal(t,"owner123",attribs["owner"])`
	`94`	`+assert.Equal(t,"default@example.com",attribs["owner_email"])`
	`95`	`+// Skip other asserts`
`91`	`96`	`returnnil`
`92`	`97`	`},`
`93`	`98`	`}},`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8c5e8ff

File tree

2 files changed

2 files changed

`‎provider/workspace.go`

`‎provider/workspace_test.go`

0 commit comments