Skip to content

Commit d15f0b3

Browse files
committed
Add resource detection on project import
1 parent 391640b commit d15f0b3

File tree

8 files changed

+221
-95
lines changed

8 files changed

+221
-95
lines changed

coderd/projectversion_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ func TestProjectVersionParametersByOrganizationAndName(t *testing.T) {
120120
},
121121
},
122122
}},
123+
Provision: echo.ProvisionComplete,
123124
})
124125
coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)
125126
params, err := client.ProjectVersionParameters(context.Background(), user.Organization, project.Name, version.Name)

provisioner/terraform/provision.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@ func (t *terraform) Provision(request *proto.Provision_Request, stream proto.DRP
6565

6666
if request.DryRun {
6767
return t.runTerraformPlan(ctx, terraform, request, stream)
68-
} else {
69-
return t.runTerraformApply(ctx, terraform, request, stream, statefilePath)
7068
}
69+
return t.runTerraformApply(ctx, terraform, request, stream, statefilePath)
7170
}
7271

7372
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
150149
if err != nil {
151150
return xerrors.Errorf("apply terraform: %w", err)
152151
}
152+
_ = reader.Close()
153153
t.logger.Debug(ctx, "ran plan")
154154
<-closeChan
155155

provisioner/terraform/provision_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ func TestProvision(t *testing.T) {
149149
for {
150150
msg, err := response.Recv()
151151
if msg != nil && msg.GetLog() != nil {
152+
t.Logf("log: [%s] %s", msg.GetLog().Level, msg.GetLog().Output)
152153
continue
153154
}
154155
if testCase.Error {

provisionerd/proto/provisionerd.pb.go

Lines changed: 81 additions & 69 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provisionerd/proto/provisionerd.proto

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ message CompletedJob {
6060
}
6161
message ProjectImport {
6262
repeated provisioner.ParameterSchema parameter_schemas = 1;
63-
repeated TransitionedResource resources = 2;
63+
repeated provisioner.Resource start_resources = 2;
64+
repeated provisioner.Resource stop_resources = 3;
6465
}
6566
string job_id = 1;
6667
oneof type {

0 commit comments

Comments
 (0)