Pass workspace owner email address to provisioner

dwahler · dwahler · commit 235ecc80d849 · 2022-07-18T21:13:21.000Z
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -256,6 +256,9 @@ func (server *provisionerdServer) AcquireJob(ctx context.Context, _ *proto.Empty
 					WorkspaceTransition: transition,
 					WorkspaceName:       workspace.Name,
 					WorkspaceOwner:      owner.Username,
+					// We don't currently know any "name" for a user aside from their username,
+					// but when we do, we should set the WorkspaceOwnerName field here too.
+					WorkspaceOwnerEmail: owner.Email,
 					WorkspaceId:         workspace.ID.String(),
 					WorkspaceOwnerId:    owner.ID.String(),
 				},
diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go
@@ -162,6 +162,8 @@ func provisionEnv(start *proto.Provision_Start) ([]string, error) {
 		"CODER_WORKSPACE_TRANSITION="+strings.ToLower(start.Metadata.WorkspaceTransition.String()),
 		"CODER_WORKSPACE_NAME="+start.Metadata.WorkspaceName,
 		"CODER_WORKSPACE_OWNER="+start.Metadata.WorkspaceOwner,
+		"CODER_WORKSPACE_OWNER_NAME="+start.Metadata.WorkspaceOwnerName,
+		"CODER_WORKSPACE_OWNER_EMAIL="+start.Metadata.WorkspaceOwnerEmail,
 		"CODER_WORKSPACE_ID="+start.Metadata.WorkspaceId,
 		"CODER_WORKSPACE_OWNER_ID="+start.Metadata.WorkspaceOwnerId,
 	)
diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go
diff --git a/provisionersdk/proto/provisioner.proto b/provisionersdk/proto/provisioner.proto
@@ -134,6 +134,8 @@ message Provision {
         string workspace_owner = 4;
         string workspace_id = 5;
         string workspace_owner_id = 6;
+        string workspace_owner_name = 7;
+        string workspace_owner_email = 8;
     }
     message Start {
         string directory = 1;
@@ -150,7 +152,7 @@ message Provision {
         }
     }
     message Complete {
-        bytes state = 1; 
+        bytes state = 1;
         string error = 2;
         repeated Resource resources = 3;
     }

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,8 @@ func provisionEnv(start *proto.Provision_Start) ([]string, error) {`
`162`	`162`	`"CODER_WORKSPACE_TRANSITION="+strings.ToLower(start.Metadata.WorkspaceTransition.String()),`
`163`	`163`	`"CODER_WORKSPACE_NAME="+start.Metadata.WorkspaceName,`
`164`	`164`	`"CODER_WORKSPACE_OWNER="+start.Metadata.WorkspaceOwner,`
	`165`	`+ "CODER_WORKSPACE_OWNER_NAME="+start.Metadata.WorkspaceOwnerName,`
	`166`	`+ "CODER_WORKSPACE_OWNER_EMAIL="+start.Metadata.WorkspaceOwnerEmail,`
`165`	`167`	`"CODER_WORKSPACE_ID="+start.Metadata.WorkspaceId,`
`166`	`168`	`"CODER_WORKSPACE_OWNER_ID="+start.Metadata.WorkspaceOwnerId,`
`167`	`169`	`)`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,8 @@ message Provision {`
`134`	`134`	`string workspace_owner = 4;`
`135`	`135`	`string workspace_id = 5;`
`136`	`136`	`string workspace_owner_id = 6;`
	`137`	`+ string workspace_owner_name = 7;`
	`138`	`+ string workspace_owner_email = 8;`
`137`	`139`	`}`
`138`	`140`	`message Start {`
`139`	`141`	`string directory = 1;`
`@@ -150,7 +152,7 @@ message Provision {`
`150`	`152`	`}`
`151`	`153`	`}`
`152`	`154`	`message Complete {`
`153`		`- bytes state = 1;`
	`155`	`+ bytes state = 1;`
`154`	`156`	`string error = 2;`
`155`	`157`	`repeated Resource resources = 3;`
`156`	`158`	`}`