fix: Fix the regression caused by local sidekick logic (#62)

Signed-off-by: Ashwin Vasani <ashwin.vasani@granica.ai>

boltrouter/bolt_info.go

@@ -45,10 +45,12 @@ func (br *BoltRouter) SelectBoltEndpoint(reqMethod string) (*url.URL, error) {
 				liveEndpoints = append(liveEndpoints, endpoint)
 			}
 		}
-
-		if len(liveEndpoints) > 0 {
+		if ok && len(liveEndpoints) > 0 {
 			randomIndex := rand.Intn(len(liveEndpoints))
 			selectedEndpoint := liveEndpoints[randomIndex]
+			if br.config.Local {
+				return url.Parse(fmt.Sprintf("http://%s", selectedEndpoint))
+			}
 			return url.Parse(fmt.Sprintf("https://%s", selectedEndpoint))
 		}
 	}
@@ -106,7 +108,16 @@ func (br *BoltRouter) RefreshBoltInfo(ctx context.Context) error {
 func (br *BoltRouter) getBoltInfo(ctx context.Context) (BoltInfo, error) {
 	// If running locally, we can't connect to quicksilver.
 	if br.config.Local {
-		return BoltInfo{}, nil
+		if br.config.BoltEndpointOverride == "" {
+			return BoltInfo{}, nil
+		}
+		endpoints := make(BoltInfo)
+		endpoints["main_write_endpoints"] = []interface{}{br.config.BoltEndpointOverride}
+		endpoints["failover_write_endpoints"] = []interface{}{br.config.BoltEndpointOverride}
+		endpoints["main_read_endpoints"] = []interface{}{br.config.BoltEndpointOverride}
+		endpoints["failover_read_endpoints"] = []interface{}{br.config.BoltEndpointOverride}
+		endpoints["cluster_healthy"] = true
+		return endpoints, nil
 	}
 
 	if br.boltVars.QuicksilverURL.Get() == "" || br.boltVars.Region.Get() == "" {

boltrouter/bolt_request.go

@@ -80,8 +80,11 @@ func (br *BoltRouter) NewBoltRequest(ctx context.Context, logger *zap.Logger, re
 	BoltURL.Path = "/" + BoltURL.Path
 	BoltURL.RawQuery = req.URL.RawQuery
 	req.URL = BoltURL
-	req.URL.Scheme = "https"
-
+	if br.config.Local {
+		req.URL.Scheme = "http"
+	} else {
+		req.URL.Scheme = "https"
+	}
 	if v := headReq.Header.Get("X-Amz-Security-Token"); v != "" {
 		req.Header.Set("X-Amz-Security-Token", v)
 	}

boltrouter/config.go

@@ -5,6 +5,9 @@ type Config struct {
 	// For example, it will not query quicksilver to get endpoints.
 	Local bool `yaml:"Local"`
 
+	// Set the BoltEndpointOverride while running from local mode.
+	BoltEndpointOverride string `yaml:"BoltEndpointOverride"`
+
 	// Enable pass through in Bolt.
 	Passthrough bool `yaml:"Passthrough"`
 
@@ -13,7 +16,8 @@ type Config struct {
 }
 
 var DefaultConfig = Config{
-	Local:       false,
-	Passthrough: false,
-	Failover:    true,
+	Local:                false,
+	Passthrough:          false,
+	Failover:             true,
+	BoltEndpointOverride: "",
 }

cmd/serve.go

@@ -24,6 +24,7 @@ func init() {
 func initServerFlags(cmd *cobra.Command) {
 	cmd.Flags().IntP("port", "p", DEFAULT_PORT, "The port for sidekick to listen on.")
 	cmd.Flags().BoolP("local", "l", false, "Run sidekick in local (non cloud) mode. This is mostly use for testing locally.")
+	cmd.Flags().String("bolt-endpoint-override", "", "Specify the local bolt endpoint with port to override in local mode. e.g: <local-bolt-ip>:9000")
 	cmd.Flags().Bool("passthrough", false, "Set passthrough flag to bolt requests.")
 	cmd.Flags().BoolP("failover", "f", true, "Enables aws request failover if bolt request fails.")
 }
@@ -76,6 +77,9 @@ func getBoltRouterConfig(cmd *cobra.Command) boltrouter.Config {
 	if cmd.Flags().Lookup("local").Changed {
 		boltRouterConfig.Local, _ = cmd.Flags().GetBool("local")
 	}
+	if cmd.Flags().Lookup("bolt-endpoint-override").Changed {
+		boltRouterConfig.BoltEndpointOverride, _ = cmd.Flags().GetString("bolt-endpoint-override")
+	}
 	if cmd.Flags().Lookup("passthrough").Changed {
 		boltRouterConfig.Passthrough, _ = cmd.Flags().GetBool("passthrough")
 	}