Add resource detection on project import

coder · kylecarbs · Feb 8, 2022 · Feb 6, 2022 · Feb 7, 2022 · Feb 7, 2022
commit d15f0b3c4545c948514769ffdb08629f3edab2fc
diff --git a/coderd/projectversion_test.go b/coderd/projectversion_test.go
@@ -120,6 +120,7 @@ func TestProjectVersionParametersByOrganizationAndName(t *testing.T) {
 					},
 				},
 			}},
+			Provision: echo.ProvisionComplete,
 		})
 		coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)
 		params, err := client.ProjectVersionParameters(context.Background(), user.Organization, project.Name, version.Name)

diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go
@@ -65,9 +65,8 @@ func (t *terraform) Provision(request *proto.Provision_Request, stream proto.DRP
 
 	if request.DryRun {
 		return t.runTerraformPlan(ctx, terraform, request, stream)
-	} else {
-		return t.runTerraformApply(ctx, terraform, request, stream, statefilePath)
 	}
+	return t.runTerraformApply(ctx, terraform, request, stream, statefilePath)
 }
 
 func (t *terraform) runTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, request *proto.Provision_Request, stream proto.DRPCProvisioner_ProvisionStream) error {
@@ -150,6 +149,7 @@ func (t *terraform) runTerraformPlan(ctx context.Context, terraform *tfexec.Terr
 	if err != nil {
 		return xerrors.Errorf("apply terraform: %w", err)
 	}
+	_ = reader.Close()
 	t.logger.Debug(ctx, "ran plan")
 	<-closeChan
 

diff --git a/provisioner/terraform/provision_test.go b/provisioner/terraform/provision_test.go
@@ -149,6 +149,7 @@ func TestProvision(t *testing.T) {
 			for {
 				msg, err := response.Recv()
 				if msg != nil && msg.GetLog() != nil {
+					t.Logf("log: [%s] %s", msg.GetLog().Level, msg.GetLog().Output)
 					continue
 				}
 				if testCase.Error {

@@ -60,7 +60,8 @@ message CompletedJob {
     }
     message ProjectImport {
         repeated provisioner.ParameterSchema parameter_schemas = 1;
-        repeated TransitionedResource resources = 2;
+        repeated provisioner.Resource start_resources = 2;
+        repeated provisioner.Resource stop_resources = 3;
     }
     string job_id = 1;
     oneof type {
-Original file line number
+Diff line change
@@ Expand Up @@
     					},
     				},
     			}},
+    			Provision: echo.ProvisionComplete,
     		})
     		coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)
     		params, err := client.ProjectVersionParameters(context.Background(), user.Organization, project.Name, version.Name)
@@ Expand Down @@