fix: always start a provisioner task, even if there are no changes. (#…

…3158) This allows us to return any previously created outputs in case the provisioner needs to recreate the resource graph
TBD54566975 · Oct 18, 2024 · a398d0a · a398d0a
1 parent b41046e
commit a398d0a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 36 deletions.
diff --git a/backend/protos/xyz/block/ftl/v1beta1/provisioner/plugin.pb.go b/backend/protos/xyz/block/ftl/v1beta1/provisioner/plugin.pb.go
diff --git a/backend/protos/xyz/block/ftl/v1beta1/provisioner/plugin.proto b/backend/protos/xyz/block/ftl/v1beta1/provisioner/plugin.proto
@@ -32,7 +32,6 @@ message ProvisionResponse {
   enum ProvisionResponseStatus {
     UNKNOWN = 0;
     SUBMITTED = 1;
-    NO_CHANGES = 2;
   }
 
   string provisioning_token = 1;

diff --git a/backend/provisioner/deployment.go b/backend/provisioner/deployment.go
@@ -53,10 +53,6 @@ func (t *Task) Start(ctx context.Context) error {
 		t.state = TaskStateFailed
 		return fmt.Errorf("error provisioning resources: %w", err)
 	}
-	if resp.Msg.Status == provisioner.ProvisionResponse_NO_CHANGES {
-		t.state = TaskStateDone
-		t.output = t.desired.Resources()
-	}
 	t.runningToken = resp.Msg.ProvisioningToken
 	return nil
 }

diff --git a/backend/provisioner/inmem_provisioner.go b/backend/provisioner/inmem_provisioner.go
@@ -97,12 +97,6 @@ func (d *InMemProvisioner) Provision(ctx context.Context, req *connect.Request[p
 		}
 	}
 
-	if len(task.steps) == 0 {
-		return connect.NewResponse(&provisioner.ProvisionResponse{
-			Status: provisioner.ProvisionResponse_NO_CHANGES,
-		}), nil
-	}
-
 	token := uuid.New().String()
 	logger.Debugf("started a task with token %s", token)
 	d.running.Store(token, task)

diff --git a/backend/provisioner/noop_provisioner.go b/backend/provisioner/noop_provisioner.go
@@ -25,11 +25,13 @@ func (d *NoopProvisioner) Plan(context.Context, *connect.Request[provisioner.Pla
 
 func (d *NoopProvisioner) Provision(context.Context, *connect.Request[provisioner.ProvisionRequest]) (*connect.Response[provisioner.ProvisionResponse], error) {
 	return connect.NewResponse(&provisioner.ProvisionResponse{
-		Status:            provisioner.ProvisionResponse_NO_CHANGES,
-		ProvisioningToken: "",
+		Status:            provisioner.ProvisionResponse_SUBMITTED,
+		ProvisioningToken: "token",
 	}), nil
 }
 
 func (d *NoopProvisioner) Status(context.Context, *connect.Request[provisioner.StatusRequest]) (*connect.Response[provisioner.StatusResponse], error) {
-	panic("should not be called")
+	return connect.NewResponse(&provisioner.StatusResponse{
+		Status: &provisioner.StatusResponse_Success{},
+	}), nil
 }
diff --git a/cmd/devel-provisioner/main.go b/cmd/devel-provisioner/main.go
@@ -67,10 +67,6 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	if resp.Msg.Status == provisioner.ProvisionResponse_NO_CHANGES {
-		println("no changes")
-		return
-	}
 
 	retry := backoff.Backoff{
 		Min:    100 * time.Millisecond,

diff --git a/cmd/ftl-provisioner-cloudformation/provisioner.go b/cmd/ftl-provisioner-cloudformation/provisioner.go
@@ -58,7 +58,9 @@ func (c *CloudformationProvisioner) Provision(ctx context.Context, req *connect.
 	}
 	if !updated {
 		return connect.NewResponse(&provisioner.ProvisionResponse{
-			Status: provisioner.ProvisionResponse_NO_CHANGES,
+			// even if there are no changes, return the stack id so that any resource outputs can be populated
+			Status:            provisioner.ProvisionResponse_SUBMITTED,
+			ProvisioningToken: *res.StackId,
 		}), nil
 	}
 	_, err = c.client.ExecuteChangeSet(ctx, &cloudformation.ExecuteChangeSetInput{

diff --git a/frontend/console/src/protos/xyz/block/ftl/v1beta1/provisioner/plugin_pb.ts b/frontend/console/src/protos/xyz/block/ftl/v1beta1/provisioner/plugin_pb.ts