Skip to content
This repository was archived by the owner on Mar 24, 2025. It is now read-only.

Change rollback functionality to be a Deploy change #143

Merged
MatiasFrank merged 1 commit into from
Sep 28, 2023
Merged

Change rollback functionality to be a Deploy change #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions cmd/rig/cmd/capsule/rollout/rollback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package rollout
import (
"context"
"errors"
"fmt"

"github.com/bufbuild/connect-go"
"github.com/rigdev/rig-go-api/api/v1/capsule"
Expand All @@ -13,22 +12,22 @@ import (
)

func (c Cmd) rollback(cmd *cobra.Command, args []string) error {
ctx := c.Ctx

rolloutID, err := c.getRollback(ctx)
if err != nil {
return err
}

resp, err := c.Rig.Capsule().Rollback(ctx, connect.NewRequest(&capsule.RollbackRequest{
CapsuleId: capsule_cmd.CapsuleID,
RolloutId: uint64(rolloutID),
}))
if err != nil {
return err
}

fmt.Printf("rollback to %v initiated. New rollout has ID %v\n", rolloutID, resp.Msg.GetRolloutId())
// Add back in once we have rollback implemented as a Deploy change instead
// ctx := c.Ctx

// rolloutID, err := c.getRollback(ctx)
// if err != nil {
// return err
// }

// resp, err := c.Rig.Capsule().Rollback(ctx, connect.NewRequest(&capsule.RollbackRequest{
// CapsuleId: capsule_cmd.CapsuleID,
// RolloutId: uint64(rolloutID),
// }))
// if err != nil {
// return err
// }
// fmt.Printf("rollback to %v initiated. New rollout has ID %v\n", rolloutID, resp.Msg.GetRolloutId())

return nil
}
Expand Down
18 changes: 0 additions & 18 deletions internal/handler/api/capsule/rollback.go
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions proto/rig/api/v1/capsule/rollout.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ message Change {
ConfigFile set_config_file = 6;
string remove_config_file = 7;
HorizontalScale horizontal_scale = 8;
Rollback rollback = 9;
}
}

Expand Down Expand Up @@ -185,3 +186,7 @@ message HorizontalScale {
message CPUTarget {
uint32 average_utilization_percentage = 1;
}

message Rollback {
string rollback_id = 1;
}
12 changes: 0 additions & 12 deletions proto/rig/api/v1/capsule/service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ service Service {
rpc ListEvents(ListEventsRequest) returns (ListEventsResponse) {}
// Get metrics for a capsule
rpc CapsuleMetrics(CapsuleMetricsRequest) returns (CapsuleMetricsResponse) {}

// Rolls the capsule back to a previous rollout
rpc Rollback(RollbackRequest) returns (RollbackResponse) {}
}

message CreateRequest {
Expand Down Expand Up @@ -224,12 +221,3 @@ message CapsuleMetricsRequest {
message CapsuleMetricsResponse {
repeated InstanceMetrics instance_metrics = 1;
}

message RollbackRequest {
string capsule_id = 1;
uint64 rollout_id = 2;
}

message RollbackResponse {
uint64 rollout_id = 1;
}