Fix ErrNoRows

ammario · ammario · commit eefd63139cfc · 2023-03-28T02:52:01.000Z
diff --git a/coderd/database/dbauthz/querier.go b/coderd/database/dbauthz/querier.go
@@ -1558,7 +1558,7 @@ func (q *querier) InsertWorkspaceAgentStat(ctx context.Context, arg database.Ins
 func (q *querier) InsertWorkspaceAgentMetadata(ctx context.Context, arg database.InsertWorkspaceAgentMetadataParams) error {
 	workspace, err := q.db.GetWorkspaceByAgentID(ctx, arg.WorkspaceAgentID)
 	if err != nil {
-		return err
+		return xerrors.Errorf("find workspace by agent %v: %v", arg.WorkspaceAgentID, err)
 	}
 
 	err = q.authorizeContext(ctx, rbac.ActionUpdate, workspace)
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1276,20 +1276,27 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 		}
 		snapshot.WorkspaceAgents = append(snapshot.WorkspaceAgents, telemetry.ConvertWorkspaceAgent(dbAgent))
 
-		for _, md := range prAgent.Metadata {
-			err := db.InsertWorkspaceAgentMetadata(ctx, database.InsertWorkspaceAgentMetadataParams{
-				WorkspaceAgentID: agentID,
-				DisplayName:      md.DisplayName,
-				Script:           md.Script,
-				Key:              md.Key,
-				Timeout:          md.Timeout,
-				Interval:         md.Interval,
-			})
-			if err != nil {
-				return xerrors.Errorf("insert agent metadata: %w", err)
+		// We don't need to insert metadata if the agent is not for a workspace.
+		// This is probably an agent made during the provisioning process.
+		_, err = db.GetWorkspaceByAgentID(ctx, agentID)
+		if err == nil {
+			for _, md := range prAgent.Metadata {
+				p := database.InsertWorkspaceAgentMetadataParams{
+					WorkspaceAgentID: agentID,
+					DisplayName:      md.DisplayName,
+					Script:           md.Script,
+					Key:              md.Key,
+					Timeout:          md.Timeout,
+					Interval:         md.Interval,
+				}
+				err := db.InsertWorkspaceAgentMetadata(ctx, p)
+				if err != nil {
+					return xerrors.Errorf("insert agent metadata: %w, params: %+v", err, p)
+				}
 			}
+		} else if !errors.Is(err, sql.ErrNoRows) {
+			return xerrors.Errorf("get workspace by agent ID: %w", err)
 		}
-
 		for _, app := range prAgent.Apps {
 			slug := app.Slug
 			if slug == "" {

Original file line number	Diff line number	Diff line change
`@@ -1558,7 +1558,7 @@ func (q *querier) InsertWorkspaceAgentStat(ctx context.Context, arg database.Ins`
`1558`	`1558`	`func (q *querier) InsertWorkspaceAgentMetadata(ctx context.Context, arg database.InsertWorkspaceAgentMetadataParams) error {`
`1559`	`1559`	`workspace, err := q.db.GetWorkspaceByAgentID(ctx, arg.WorkspaceAgentID)`
`1560`	`1560`	`if err != nil {`
`1561`		`- return err`
	`1561`	`+ return xerrors.Errorf("find workspace by agent %v: %v", arg.WorkspaceAgentID, err)`
`1562`	`1562`	`}`
`1563`	`1563`
`1564`	`1564`	`err = q.authorizeContext(ctx, rbac.ActionUpdate, workspace)`