Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf70ff35

Browse files
committed
feat(provisioner): add support for workspace_owner_rbac_roles
1 parent6a67e2e commitf70ff35

File tree

7 files changed

+515
-337
lines changed

7 files changed

+515
-337
lines changed

‎coderd/provisionerdserver/provisionerdserver.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,15 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
594594
})
595595
}
596596

597+
roles,err:=s.Database.GetAuthorizationUserRoles(dbauthz.AsSystemRestricted(ctx),owner.ID)
598+
iferr!=nil {
599+
returnnil,failJob(fmt.Sprintf("get owner authorization roles: %s",err))
600+
}
601+
ownerRbacRoles:= []*sdkproto.OwnerRbacRoles{}
602+
for_,role:=rangeroles.Roles {
603+
ownerRbacRoles=append(ownerRbacRoles,&sdkproto.OwnerRbacRoles{Name:role,OrgId:s.OrganizationID.String()})
604+
}
605+
597606
protoJob.Type=&proto.AcquiredJob_WorkspaceBuild_{
598607
WorkspaceBuild:&proto.AcquiredJob_WorkspaceBuild{
599608
WorkspaceBuildId:workspaceBuild.ID.String(),
@@ -621,6 +630,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
621630
WorkspaceOwnerSshPrivateKey:ownerSSHPrivateKey,
622631
WorkspaceBuildId:workspaceBuild.ID.String(),
623632
WorkspaceOwnerLoginType:string(owner.LoginType),
633+
WorkspaceOwnerRbacRoles:ownerRbacRoles,
624634
},
625635
LogLevel:input.LogLevel,
626636
},

‎coderd/provisionerdserver/provisionerdserver_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ func TestAcquireJob(t *testing.T) {
376376
WorkspaceOwnerSshPrivateKey:sshKey.PrivateKey,
377377
WorkspaceBuildId:build.ID.String(),
378378
WorkspaceOwnerLoginType:string(user.LoginType),
379+
WorkspaceOwnerRbacRoles: []*sdkproto.OwnerRbacRoles{{Name:"member",OrgId:pd.OrganizationID.String()}},
379380
},
380381
},
381382
})

‎provisioner/terraform/provision.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,11 @@ func provisionEnv(
242242
returnnil,xerrors.Errorf("marshal owner groups: %w",err)
243243
}
244244

245+
ownerRbacRoles,err:=json.Marshal(metadata.GetWorkspaceOwnerRbacRoles())
246+
iferr!=nil {
247+
returnnil,xerrors.Errorf("marshal owner rbac roles: %w",err)
248+
}
249+
245250
env=append(env,
246251
"CODER_AGENT_URL="+metadata.GetCoderUrl(),
247252
"CODER_WORKSPACE_TRANSITION="+strings.ToLower(metadata.GetWorkspaceTransition().String()),
@@ -254,6 +259,7 @@ func provisionEnv(
254259
"CODER_WORKSPACE_OWNER_SSH_PUBLIC_KEY="+metadata.GetWorkspaceOwnerSshPublicKey(),
255260
"CODER_WORKSPACE_OWNER_SSH_PRIVATE_KEY="+metadata.GetWorkspaceOwnerSshPrivateKey(),
256261
"CODER_WORKSPACE_OWNER_LOGIN_TYPE="+metadata.GetWorkspaceOwnerLoginType(),
262+
"CODER_WORKSPACE_OWNER_RBAC_ROLES="+string(ownerRbacRoles),
257263
"CODER_WORKSPACE_ID="+metadata.GetWorkspaceId(),
258264
"CODER_WORKSPACE_OWNER_ID="+metadata.GetWorkspaceOwnerId(),
259265
"CODER_WORKSPACE_OWNER_SESSION_TOKEN="+metadata.GetWorkspaceOwnerSessionToken(),

‎provisioner/terraform/provision_test.go‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,53 @@ func TestProvision(t *testing.T) {
764764
}},
765765
},
766766
},
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_name"
786+
value = data.coder_workspace_owner.me.rbac_roles[0].name
787+
}
788+
item {
789+
key = "rbac_roles_org_id"
790+
value = data.coder_workspace_owner.me.rbac_roles[0].org_id
791+
}
792+
}
793+
`,
794+
},
795+
Request:&proto.PlanRequest{
796+
Metadata:&proto.Metadata{
797+
WorkspaceOwnerRbacRoles: []*proto.OwnerRbacRoles{{Name:"member",OrgId:"00000000-0000-0000-0000-000000000000"}},
798+
},
799+
},
800+
Response:&proto.PlanComplete{
801+
Resources: []*proto.Resource{{
802+
Name:"example",
803+
Type:"null_resource",
804+
Metadata: []*proto.Resource_Metadata{{
805+
Key:"rbac_roles_name",
806+
Value:"member",
807+
}, {
808+
Key:"rbac_roles_org_id",
809+
Value:"00000000-0000-0000-0000-000000000000",
810+
}},
811+
}},
812+
},
813+
},
767814
}
768815

769816
for_,testCase:=rangetestCases {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp