Fix fetch dry run template version from job id

Emyrk · Emyrk · commit 4967fe69e3ac · 2023-02-01T11:15:48.000-06:00
We need to find a better solution imo
diff --git a/coderd/authzquery/job.go b/coderd/authzquery/job.go
@@ -2,6 +2,7 @@ package authzquery
 
 import (
 	"context"
+	"encoding/json"
 
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
@@ -51,7 +52,8 @@ func (q *AuthzQuerier) UpdateProvisionerJobWithCancelByID(ctx context.Context, a
 			return err
 		}
 	case database.ProvisionerJobTypeTemplateVersionDryRun, database.ProvisionerJobTypeTemplateVersionImport:
-		templateVersion, err := q.database.GetTemplateVersionByJobID(ctx, arg.ID)
+		// Authorized call to get template version.
+		templateVersion, err := authorizedTemplateVersionFromJob(ctx, q, job)
 		if err != nil {
 			return err
 		}
@@ -91,9 +93,9 @@ func (q *AuthzQuerier) GetProvisionerJobByID(ctx context.Context, id uuid.UUID)
 		if err != nil {
 			return database.ProvisionerJob{}, err
 		}
-	case database.ProvisionerJobTypeTemplateVersionImport, database.ProvisionerJobTypeTemplateVersionDryRun:
+	case database.ProvisionerJobTypeTemplateVersionDryRun, database.ProvisionerJobTypeTemplateVersionImport:
 		// Authorized call to get template version.
-		_, err := q.GetTemplateVersionByJobID(ctx, id)
+		_, err := authorizedTemplateVersionFromJob(ctx, q, job)
 		if err != nil {
 			return database.ProvisionerJob{}, err
 		}
@@ -103,3 +105,33 @@ func (q *AuthzQuerier) GetProvisionerJobByID(ctx context.Context, id uuid.UUID)
 
 	return job, nil
 }
+
+func authorizedTemplateVersionFromJob(ctx context.Context, q *AuthzQuerier, job database.ProvisionerJob) (database.TemplateVersion, error) {
+	switch job.Type {
+	case database.ProvisionerJobTypeTemplateVersionDryRun:
+		// TODO: This is really unfortunate that we need to inspect the json
+		// payload. We should fix this.
+		tmp := struct {
+			TemplateVersionID uuid.UUID `json:"template_version_id"`
+		}{}
+		err := json.Unmarshal(job.Input, &tmp)
+		if err != nil {
+			return database.TemplateVersion{}, xerrors.Errorf("dry-run unmarshal: %w", err)
+		}
+		// Authorized call to get template version.
+		tv, err := q.GetTemplateVersionByID(ctx, tmp.TemplateVersionID)
+		if err != nil {
+			return database.TemplateVersion{}, err
+		}
+		return tv, nil
+	case database.ProvisionerJobTypeTemplateVersionImport:
+		// Authorized call to get template version.
+		tv, err := q.GetTemplateVersionByJobID(ctx, job.ID)
+		if err != nil {
+			return database.TemplateVersion{}, err
+		}
+		return tv, nil
+	default:
+		return database.TemplateVersion{}, xerrors.Errorf("unknown job type: %q", job.Type)
+	}
+}
diff --git a/coderd/authzquery/workspace.go b/coderd/authzquery/workspace.go
@@ -258,13 +258,13 @@ func (q *AuthzQuerier) GetWorkspaceResourceMetadataByResourceIDs(ctx context.Con
 func (q *AuthzQuerier) GetWorkspaceResourcesByJobID(ctx context.Context, jobID uuid.UUID) ([]database.WorkspaceResource, error) {
 	build, err := q.database.GetWorkspaceBuildByJobID(ctx, jobID)
 	if err != nil {
-		return nil, nil
+		return nil, err
 	}
 
 	// If the workspace can be read, then the resource can be read.
 	_, err = authorizedFetch(q.authorizer, q.database.GetWorkspaceByID)(ctx, build.WorkspaceID)
 	if err != nil {
-		return nil, nil
+		return nil, err
 	}
 	return q.database.GetWorkspaceResourcesByJobID(ctx, jobID)
 }

Original file line number	Diff line number	Diff line change
`@@ -258,13 +258,13 @@ func (q *AuthzQuerier) GetWorkspaceResourceMetadataByResourceIDs(ctx context.Con`
`258`	`258`	`func (q *AuthzQuerier) GetWorkspaceResourcesByJobID(ctx context.Context, jobID uuid.UUID) ([]database.WorkspaceResource, error) {`
`259`	`259`	`build, err := q.database.GetWorkspaceBuildByJobID(ctx, jobID)`
`260`	`260`	`if err != nil {`
`261`		`- return nil, nil`
	`261`	`+ return nil, err`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`// If the workspace can be read, then the resource can be read.`
`265`	`265`	`_, err = authorizedFetch(q.authorizer, q.database.GetWorkspaceByID)(ctx, build.WorkspaceID)`
`266`	`266`	`if err != nil {`
`267`		`- return nil, nil`
	`267`	`+ return nil, err`
`268`	`268`	`}`
`269`	`269`	`return q.database.GetWorkspaceResourcesByJobID(ctx, jobID)`
`270`	`270`	`}`