Commitcca3cb1

authored

feat(provisioner): pass owner git ssh key (coder#13366)

1 parentb7edf5b commitcca3cb1Copy full SHA for cca3cb1

File tree

+235

-136

lines changed

+235

-136

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -467,6 +467,15 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo`
`467`	`467`	`iferr!=nil {`
`468`	`468`	`returnnil,failJob(fmt.Sprintf("get owner: %s",err))`
`469`	`469`	`}`
	`470`	`+varownerSSHPublicKey,ownerSSHPrivateKeystring`
	`471`	`+ifownerSSHKey,err:=s.Database.GetGitSSHKey(ctx,owner.ID);err!=nil {`
	`472`	`+if!xerrors.Is(err,sql.ErrNoRows) {`
	`473`	`+returnnil,failJob(fmt.Sprintf("get owner ssh key: %s",err))`
	`474`	`+}`
	`475`	`+}else {`
	`476`	`+ownerSSHPublicKey=ownerSSHKey.PublicKey`
	`477`	`+ownerSSHPrivateKey=ownerSSHKey.PrivateKey`
	`478`	`+}`
`470`	`479`	`ownerGroups,err:=s.Database.GetGroupsByOrganizationAndUserID(ctx, database.GetGroupsByOrganizationAndUserIDParams{`
`471`	`480`	`UserID:owner.ID,`
`472`	`481`	`OrganizationID:s.OrganizationID,`
`@@ -586,6 +595,8 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo`
`586`	`595`	`TemplateName:template.Name,`
`587`	`596`	`TemplateVersion:templateVersion.Name,`
`588`	`597`	`WorkspaceOwnerSessionToken:sessionToken,`
	`598`	`+WorkspaceOwnerSshPublicKey:ownerSSHPublicKey,`
	`599`	`+WorkspaceOwnerSshPrivateKey:ownerSSHPrivateKey,`
`589`	`600`	`},`
`590`	`601`	`LogLevel:input.LogLevel,`
`591`	`602`	`},`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,9 @@ func TestAcquireJob(t *testing.T) {`
`190`	`190`	`Name:"group1",`
`191`	`191`	`OrganizationID:pd.OrganizationID,`
`192`	`192`	`})`
	`193`	`+sshKey:=dbgen.GitSSHKey(t,db, database.GitSSHKey{`
	`194`	`+UserID:user.ID,`
	`195`	`+})`
`193`	`196`	`err:=db.InsertGroupMember(ctx, database.InsertGroupMemberParams{`
`194`	`197`	`UserID:user.ID,`
`195`	`198`	`GroupID:group1.ID,`
`@@ -360,6 +363,8 @@ func TestAcquireJob(t *testing.T) {`
`360`	`363`	`TemplateName:template.Name,`
`361`	`364`	`TemplateVersion:version.Name,`
`362`	`365`	`WorkspaceOwnerSessionToken:sessionToken,`
	`366`	`+WorkspaceOwnerSshPublicKey:sshKey.PublicKey,`
	`367`	`+WorkspaceOwnerSshPrivateKey:sshKey.PrivateKey,`
`363`	`368`	`},`
`364`	`369`	`},`
`365`	`370`	`})`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,8 @@ func provisionEnv(`
`202`	`202`	`"CODER_WORKSPACE_OWNER_NAME="+metadata.GetWorkspaceOwnerName(),`
`203`	`203`	`"CODER_WORKSPACE_OWNER_OIDC_ACCESS_TOKEN="+metadata.GetWorkspaceOwnerOidcAccessToken(),`
`204`	`204`	`"CODER_WORKSPACE_OWNER_GROUPS="+string(ownerGroups),`
	`205`	`+"CODER_WORKSPACE_OWNER_SSH_PUBLIC_KEY="+metadata.GetWorkspaceOwnerSshPublicKey(),`
	`206`	`+"CODER_WORKSPACE_OWNER_SSH_PRIVATE_KEY="+metadata.GetWorkspaceOwnerSshPrivateKey(),`
`205`	`207`	`"CODER_WORKSPACE_ID="+metadata.GetWorkspaceId(),`
`206`	`208`	`"CODER_WORKSPACE_OWNER_ID="+metadata.GetWorkspaceOwnerId(),`
`207`	`209`	`"CODER_WORKSPACE_OWNER_SESSION_TOKEN="+metadata.GetWorkspaceOwnerSessionToken(),`

Lines changed: 46 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -572,6 +572,52 @@ func TestProvision(t *testing.T) {`
`572`	`572`	`}},`
`573`	`573`	`},`
`574`	`574`	`},`
	`575`	`+{`
	`576`	`+Name:"ssh-key",`
	`577`	`+Files:map[string]string{`
	`578`	+"main.tf":`terraform {
	`579`	`+required_providers {`
	`580`	`+ coder = {`
	`581`	`+source = "coder/coder"`
	`582`	`+ }`
	`583`	`+}`
	`584`	`+}`
	`585`	`+`
	`586`	`+resource "null_resource" "example" {}`
	`587`	`+data "coder_workspace_owner" "me" {}`
	`588`	`+resource "coder_metadata" "example" {`
	`589`	`+resource_id = null_resource.example.id`
	`590`	`+item {`
	`591`	`+key = "pubkey"`
	`592`	`+value = data.coder_workspace_owner.me.ssh_public_key`
	`593`	`+}`
	`594`	`+item {`
	`595`	`+key = "privkey"`
	`596`	`+value = data.coder_workspace_owner.me.ssh_private_key`
	`597`	`+}`
	`598`	`+}`
	`599`	+`,
	`600`	`+},`
	`601`	`+Request:&proto.PlanRequest{`
	`602`	`+Metadata:&proto.Metadata{`
	`603`	`+WorkspaceOwnerSshPublicKey:"fake public key",`
	`604`	`+WorkspaceOwnerSshPrivateKey:"fake private key",`
	`605`	`+},`
	`606`	`+},`
	`607`	`+Response:&proto.PlanComplete{`
	`608`	`+Resources: []*proto.Resource{{`
	`609`	`+Name:"example",`
	`610`	`+Type:"null_resource",`
	`611`	`+Metadata: []*proto.Resource_Metadata{{`
	`612`	`+Key:"pubkey",`
	`613`	`+Value:"fake public key",`
	`614`	`+}, {`
	`615`	`+Key:"privkey",`
	`616`	`+Value:"fake private key",`
	`617`	`+}},`
	`618`	`+}},`
	`619`	`+},`
	`620`	`+},`
`575`	`621`	`}`
`576`	`622`
`577`	`623`	`for_,testCase:=rangetestCases {`

Comments

(0)