Skip to content

feat: use same port for grpc-web and api server#14652

Merged
julienrbrt merged 22 commits into
mainfrom
julien/grpc-web
Jan 20, 2023
Merged

feat: use same port for grpc-web and api server#14652
julienrbrt merged 22 commits into
mainfrom
julien/grpc-web

Conversation

@julienrbrt

Copy link
Copy Markdown
Contributor

Description

Closes: #8254


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

@julienrbrt julienrbrt marked this pull request as ready for review January 17, 2023 20:36
@julienrbrt julienrbrt requested a review from a team January 17, 2023 20:36
@ghost ghost requested review from a team, atheeshp and facundomedica and removed request for a team January 17, 2023 20:37

@tac0turtle tac0turtle left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left one comment on core but otherwise looks good

Comment thread server/api/server.go
if cfg.API.EnableUnsafeCORS {
options = append(options,
grpcweb.WithOriginFunc(func(origin string) bool {
return true

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want this to be hardcoded?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have kept the same behavior as before. The API constructor will look a bit weird if we add grpcweb options.

@github-actions github-actions Bot added C:CLI C:Keys Keybase, KMS and HSMs labels Jan 17, 2023

// support old flags name for backwards compatibility
cmd.PersistentFlags().SetNormalizeFunc(func(f *pflag.FlagSet, name string) pflag.NormalizedName {
cmd.Flags().SetNormalizeFunc(func(f *pflag.FlagSet, name string) pflag.NormalizedName {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated but see #14655 (comment)

Comment thread client/keys/add.go

// support old flags name for backwards compatibility
cmd.PersistentFlags().SetNormalizeFunc(func(f *pflag.FlagSet, name string) pflag.NormalizedName {
f.SetNormalizeFunc(func(f *pflag.FlagSet, name string) pflag.NormalizedName {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated but see #14655 (comment)

@likhita-809 likhita-809 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only few nits, otherwise lgtm

Comment thread UPGRADING.md Outdated
Comment thread server/config/toml.go Outdated
Comment thread tools/confix/data/v0.48-app.toml Outdated

@alexanderbez alexanderbez left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

Comment thread UPGRADING.md Outdated
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

@likhita-809 likhita-809 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK

@alexanderbez alexanderbez left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C:CLI C:Keys Keybase, KMS and HSMs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Should grpc-web be served on the HTTP port or on a separate port?

4 participants