Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: export with https #2152

Merged
merged 2 commits into from
Sep 20, 2023
Merged

fix: export with https #2152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b00678
fix: export with https
markphelps Sep 20, 2023
b34a77e
Merge branch 'main' into export-https
markphelps Sep 20, 2023
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
6 changes: 5 additions & 1 deletion cmd/flipt/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,11 @@ func (c *exportCommand) run(cmd *cobra.Command, _ []string) error {

// Use client when remote address is configured.
if c.address != "" {
return c.export(cmd.Context(), out, fliptClient(logger, c.address, c.token))
client, err := fliptClient(c.address, c.token)
if err != nil {
return err
}
return c.export(cmd.Context(), out, client)
}

// Otherwise, go direct to the DB using Flipt configuration file.
Expand Down
9 changes: 5 additions & 4 deletions cmd/flipt/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,11 @@ func (c *importCommand) run(cmd *cobra.Command, args []string) error {

// Use client when remote address is configured.
if c.address != "" {
return ext.NewImporter(
fliptClient(logger, c.address, c.token),
opts...,
).Import(cmd.Context(), in)
client, err := fliptClient(c.address, c.token)
if err != nil {
return err
}
return ext.NewImporter(client, opts...).Import(cmd.Context(), in)
}

logger, cfg := buildConfig()
Expand Down
12 changes: 6 additions & 6 deletions cmd/flipt/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,26 +43,26 @@ func fliptServer(logger *zap.Logger, cfg *config.Config) (*server.Server, func()
return server.New(logger, store), func() { _ = db.Close() }, nil
}

func fliptClient(logger *zap.Logger, address, token string) *sdk.Flipt {
func fliptClient(address, token string) (*sdk.Flipt, error) {
addr, err := url.Parse(address)
if err != nil {
logger.Fatal("export address is invalid", zap.Error(err))
return nil, fmt.Errorf("export address is invalid %w", err)
}

var transport sdk.Transport
switch addr.Scheme {
case "http":
case "http", "https":
transport = sdkhttp.NewTransport(address)
case "grpc":
conn, err := grpc.Dial(addr.Host,
grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
logger.Fatal("failed to dial Flipt", zap.Error(err))
return nil, fmt.Errorf("failed to dial Flipt %w", err)
}

transport = sdkgrpc.NewTransport(conn)
default:
logger.Fatal("unexpected protocol", zap.String("address", address))
return nil, fmt.Errorf("unexpected protocol %s", addr.Scheme)
}

var opts []sdk.Option
Expand All @@ -72,5 +72,5 @@ func fliptClient(logger *zap.Logger, address, token string) *sdk.Flipt {
))
}

return sdk.New(transport, opts...).Flipt()
return sdk.New(transport, opts...).Flipt(), nil
}
Loading