handle sql.ErrNoRows

johnstcn · johnstcn · commit ecb22e8d5d8b · 2024-05-29T11:26:45.000+01:00
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -468,7 +468,11 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
 			return nil, failJob(fmt.Sprintf("get owner: %s", err))
 		}
 		var ownerSSHPublicKey, ownerSSHPrivateKey string
-		if ownerSSHKey, err := s.Database.GetGitSSHKey(ctx, owner.ID); err == nil {
+		if ownerSSHKey, err := s.Database.GetGitSSHKey(ctx, owner.ID); err != nil {
+			if !xerrors.Is(err, sql.ErrNoRows) {
+				return nil, failJob(fmt.Sprintf("get owner ssh key: %s", err))
+			}
+		} else {
 			ownerSSHPublicKey = ownerSSHKey.PublicKey
 			ownerSSHPrivateKey = ownerSSHKey.PrivateKey
 		}
diff --git a/coderd/provisionerdserver/provisionerdserver_test.go b/coderd/provisionerdserver/provisionerdserver_test.go
@@ -190,6 +190,9 @@ func TestAcquireJob(t *testing.T) {
 				Name:           "group1",
 				OrganizationID: pd.OrganizationID,
 			})
+			sshKey := dbgen.GitSSHKey(t, db, database.GitSSHKey{
+				UserID: user.ID,
+			})
 			err := db.InsertGroupMember(ctx, database.InsertGroupMemberParams{
 				UserID:  user.ID,
 				GroupID: group1.ID,
@@ -360,6 +363,8 @@ func TestAcquireJob(t *testing.T) {
 						TemplateName:                  template.Name,
 						TemplateVersion:               version.Name,
 						WorkspaceOwnerSessionToken:    sessionToken,
+						WorkspaceOwnerSshPublicKey:    sshKey.PublicKey,
+						WorkspaceOwnerSshPrivateKey:   sshKey.PrivateKey,
 					},
 				},
 			})

Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,11 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo`
`468`	`468`	`return nil, failJob(fmt.Sprintf("get owner: %s", err))`
`469`	`469`	`}`
`470`	`470`	`var ownerSSHPublicKey, ownerSSHPrivateKey string`
`471`		`- if ownerSSHKey, err := s.Database.GetGitSSHKey(ctx, owner.ID); err == nil {`
	`471`	`+ if ownerSSHKey, err := s.Database.GetGitSSHKey(ctx, owner.ID); err != nil {`
	`472`	`+ if !xerrors.Is(err, sql.ErrNoRows) {`
	`473`	`+ return nil, failJob(fmt.Sprintf("get owner ssh key: %s", err))`
	`474`	`+ }`
	`475`	`+ } else {`
`472`	`476`	`ownerSSHPublicKey = ownerSSHKey.PublicKey`
`473`	`477`	`ownerSSHPrivateKey = ownerSSHKey.PrivateKey`
`474`	`478`	`}`