Commitada6342

committed

feat(provisioner): add support for workspace_owner_rbac_roles

1 parente37b7fc commitada6342Copy full SHA for ada6342

File tree

+226

-154

lines changed

+226

-154

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -594,6 +594,11 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo`
`594`	`594`	`})`
`595`	`595`	`}`
`596`	`596`
	`597`	`+ownerRbacRoles:= []string{}`
	`598`	`+for_,role:=rangeowner.RBACRoles {`
	`599`	`+ownerRbacRoles=append(ownerRbacRoles,role)`
	`600`	`+}`
	`601`	`+`
`597`	`602`	`protoJob.Type=&proto.AcquiredJob_WorkspaceBuild_{`
`598`	`603`	`WorkspaceBuild:&proto.AcquiredJob_WorkspaceBuild{`
`599`	`604`	`WorkspaceBuildId:workspaceBuild.ID.String(),`
`@@ -621,6 +626,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo`
`621`	`626`	`WorkspaceOwnerSshPrivateKey:ownerSSHPrivateKey,`
`622`	`627`	`WorkspaceBuildId:workspaceBuild.ID.String(),`
`623`	`628`	`WorkspaceOwnerLoginType:string(owner.LoginType),`
	`629`	`+WorkspaceOwnerRbacRoles:ownerRbacRoles,`
`624`	`630`	`},`
`625`	`631`	`LogLevel:input.LogLevel,`
`626`	`632`	`},`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,9 @@ func TestAcquireJob(t *testing.T) {`
`187`	`187`	`ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitShort)`
`188`	`188`	`defercancel()`
`189`	`189`
`190`		`-user:=dbgen.User(t,db, database.User{})`
	`190`	`+user:=dbgen.User(t,db, database.User{`
	`191`	`+RBACRoles: []string{"member"},`
	`192`	`+})`
`191`	`193`	`group1:=dbgen.Group(t,db, database.Group{`
`192`	`194`	`Name:"group1",`
`193`	`195`	`OrganizationID:pd.OrganizationID,`
`@@ -376,6 +378,7 @@ func TestAcquireJob(t *testing.T) {`
`376`	`378`	`WorkspaceOwnerSshPrivateKey:sshKey.PrivateKey,`
`377`	`379`	`WorkspaceBuildId:build.ID.String(),`
`378`	`380`	`WorkspaceOwnerLoginType:string(user.LoginType),`
	`381`	`+WorkspaceOwnerRbacRoles: []string{user.RBACRoles[0]},`
`379`	`382`	`},`
`380`	`383`	`},`
`381`	`384`	`})`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -242,6 +242,11 @@ func provisionEnv(`
`242`	`242`	`returnnil,xerrors.Errorf("marshal owner groups: %w",err)`
`243`	`243`	`}`
`244`	`244`
	`245`	`+ownerRbacRoles,err:=json.Marshal(metadata.GetWorkspaceOwnerRbacRoles())`
	`246`	`+iferr!=nil {`
	`247`	`+returnnil,xerrors.Errorf("marshal owner rbac roles: %w",err)`
	`248`	`+}`
	`249`	`+`
`245`	`250`	`env=append(env,`
`246`	`251`	`"CODER_AGENT_URL="+metadata.GetCoderUrl(),`
`247`	`252`	`"CODER_WORKSPACE_TRANSITION="+strings.ToLower(metadata.GetWorkspaceTransition().String()),`
`@@ -254,6 +259,7 @@ func provisionEnv(`
`254`	`259`	`"CODER_WORKSPACE_OWNER_SSH_PUBLIC_KEY="+metadata.GetWorkspaceOwnerSshPublicKey(),`
`255`	`260`	`"CODER_WORKSPACE_OWNER_SSH_PRIVATE_KEY="+metadata.GetWorkspaceOwnerSshPrivateKey(),`
`256`	`261`	`"CODER_WORKSPACE_OWNER_LOGIN_TYPE="+metadata.GetWorkspaceOwnerLoginType(),`
	`262`	`+"CODER_WORKSPACE_OWNER_RBAC_ROLES="+string(ownerRbacRoles),`
`257`	`263`	`"CODER_WORKSPACE_ID="+metadata.GetWorkspaceId(),`
`258`	`264`	`"CODER_WORKSPACE_OWNER_ID="+metadata.GetWorkspaceOwnerId(),`
`259`	`265`	`"CODER_WORKSPACE_OWNER_SESSION_TOKEN="+metadata.GetWorkspaceOwnerSessionToken(),`

Lines changed: 40 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -764,6 +764,46 @@ func TestProvision(t *testing.T) {`
`764`	`764`	`}},`
`765`	`765`	`},`
`766`	`766`	`},`
	`767`	`+{`
	`768`	`+Name:"workspace-owner-rbac-roles",`
	`769`	`+SkipReason:"field will be added in provider version 2.2.0",`
	`770`	`+Files:map[string]string{`
	`771`	+"main.tf":`terraform {
	`772`	`+required_providers {`
	`773`	`+ coder = {`
	`774`	`+source = "coder/coder"`
	`775`	`+version = "2.2.0"`
	`776`	`+ }`
	`777`	`+}`
	`778`	`+}`
	`779`	`+`
	`780`	`+resource "null_resource" "example" {}`
	`781`	`+data "coder_workspace_owner" "me" {}`
	`782`	`+resource "coder_metadata" "example" {`
	`783`	`+resource_id = null_resource.example.id`
	`784`	`+item {`
	`785`	`+key = "rbac_roles"`
	`786`	`+value = data.coder_workspace_owner.me.rbac_roles[0]`
	`787`	`+}`
	`788`	`+}`
	`789`	+`,
	`790`	`+},`
	`791`	`+Request:&proto.PlanRequest{`
	`792`	`+Metadata:&proto.Metadata{`
	`793`	`+WorkspaceOwnerRbacRoles: []string{"member"},`
	`794`	`+},`
	`795`	`+},`
	`796`	`+Response:&proto.PlanComplete{`
	`797`	`+Resources: []*proto.Resource{{`
	`798`	`+Name:"example",`
	`799`	`+Type:"null_resource",`
	`800`	`+Metadata: []*proto.Resource_Metadata{{`
	`801`	`+Key:"rbac_roles",`
	`802`	`+Value:"member",`
	`803`	`+}},`
	`804`	`+}},`
	`805`	`+},`
	`806`	`+},`
`767`	`807`	`}`
`768`	`808`
`769`	`809`	`for_,testCase:=rangetestCases {`

Comments

(0)