Fix some test things

kylecarbs · kylecarbs · commit a864d469375b · 2022-12-02T21:26:04.000Z
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -38,10 +38,6 @@ var (
 	lastAcquireMutex sync.RWMutex
 )
 
-type templateVersionImportJob struct {
-	TemplateVersionID uuid.UUID `json:"template_version_id"`
-}
-
 type Server struct {
 	AccessURL      *url.URL
 	ID             uuid.UUID
@@ -593,7 +589,7 @@ func (server *Server) CompleteJob(ctx context.Context, completed *proto.Complete
 
 	switch jobType := completed.Type.(type) {
 	case *proto.CompletedJob_TemplateImport_:
-		var input templateVersionImportJob
+		var input TemplateVersionImportJob
 		err = json.Unmarshal(job.Input, &input)
 		if err != nil {
 			return nil, xerrors.Errorf("unmarshal job data: %w", err)
@@ -1104,6 +1100,10 @@ func auditActionFromTransition(transition database.WorkspaceTransition) database
 	}
 }
 
+type TemplateVersionImportJob struct {
+	TemplateVersionID uuid.UUID `json:"template_version_id"`
+}
+
 // WorkspaceProvisionJob is the payload for the "workspace_provision" job type.
 type WorkspaceProvisionJob struct {
 	WorkspaceBuildID uuid.UUID `json:"workspace_build_id"`
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -904,7 +904,7 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
 		}
 
 		templateVersionID := uuid.New()
-		jobInput, err := json.Marshal(templateVersionImportJob{
+		jobInput, err := json.Marshal(provisionerdserver.TemplateVersionImportJob{
 			TemplateVersionID: templateVersionID,
 		})
 		if err != nil {
diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go
@@ -321,7 +321,7 @@ func TestTemplateVersionParameters(t *testing.T) {
 		user := coderdtest.CreateFirstUser(t, client)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
 			Parse: echo.ParseComplete,
-			ProvisionDryRun: []*proto.Provision_Response{{
+			ProvisionPlan: []*proto.Provision_Response{{
 				Type: &proto.Provision_Response_Complete{
 					Complete: &proto.Provision_Complete{
 						Parameters: []*proto.Parameter{{

Original file line number	Diff line number	Diff line change
`@@ -904,7 +904,7 @@ func (api API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r ht`
`904`	`904`	`}`
`905`	`905`
`906`	`906`	`templateVersionID := uuid.New()`
`907`		`- jobInput, err := json.Marshal(templateVersionImportJob{`
	`907`	`+ jobInput, err := json.Marshal(provisionerdserver.TemplateVersionImportJob{`
`908`	`908`	`TemplateVersionID: templateVersionID,`
`909`	`909`	`})`
`910`	`910`	`if err != nil {`