Merge branch 'main' into fix/ibc-guides

ignite · Aug 30, 2024 · fd0308b · fd0308b
2 parents 45a8615 + 7ff4b5d
commit fd0308b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/changelog.md b/changelog.md
@@ -38,6 +38,8 @@
 - [#4189](https://github.com/ignite/cli/pull/4189) Deprecate `ignite node` for `ignite connect` app
 - [#4290](https://github.com/ignite/cli/pull/4290) Remove ignite ics logic from ignite cli (this functionality will be in the `consumer` app)
 - [#4295](https://github.com/ignite/cli/pull/4295) Stop scaffolding `pulsar` files
+- [#4322](https://github.com/ignite/cli/pull/4322) Create a message for authenticate buf for generate ts-client
+- [#4319](https://github.com/ignite/cli/pull/4319) Remove fee abstraction module from open api code generation
 - [#4317](https://github.com/ignite/cli/pull/4317) Remove xchisel dependency
 
 ### Fixes

diff --git a/ignite/cmd/generate_typescript_client.go b/ignite/cmd/generate_typescript_client.go
@@ -1,15 +1,18 @@
 package ignitecmd
 
 import (
+	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 
 	"github.com/ignite/cli/v29/ignite/pkg/cliui"
 	"github.com/ignite/cli/v29/ignite/pkg/cliui/icons"
+	"github.com/ignite/cli/v29/ignite/pkg/errors"
 	"github.com/ignite/cli/v29/ignite/services/chain"
 )
 
 const (
 	flagUseCache = "use-cache"
+	msgBufAuth   = "Generate ts-client depends on a 'buf.build' remote plugin, and as of August 1, 2024, Buf will begin limiting remote plugin requests from unauthenticated users on 'buf.build'. If you send more than ten unauthenticated requests per hour using remote plugins, you’ll start to see rate limit errors. Please authenticate before running ts-client command using 'buf registry login' command and follow the instructions. For more info, check https://buf.build/docs/generate/auth-required."
 )
 
 func NewGenerateTSClient() *cobra.Command {
@@ -48,6 +51,13 @@ func generateTSClientHandler(cmd *cobra.Command, _ []string) error {
 	session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
 	defer session.End()
 
+	if err := session.AskConfirm(msgBufAuth); err != nil {
+		if errors.Is(err, promptui.ErrAbort) {
+			return errors.New("buf not auth")
+		}
+		return err
+	}
+
 	c, err := chain.NewWithHomeFlags(
 		cmd,
 		chain.WithOutputer(session),

diff --git a/ignite/pkg/cosmosgen/generate_openapi.go b/ignite/pkg/cosmosgen/generate_openapi.go
@@ -78,6 +78,7 @@ func (g *generator) generateOpenAPISpec(ctx context.Context) error {
 			dir,
 			g.openAPITemplate(),
 			cosmosbuf.ExcludeFiles(
+				"*/osmosis-labs/fee-abstraction/*",
 				"*/module.proto",
 				"*/testutil/*",
 				"*/testdata/*",

diff --git a/integration/cosmosgen/cosmosgen_test.go b/integration/cosmosgen/cosmosgen_test.go
@@ -13,6 +13,8 @@ import (
 )
 
 func TestCosmosGenScaffold(t *testing.T) {
+	t.Skip("skip till we add a buf token into the CI")
+
 	var (
 		env = envtest.New(t)
 		app = env.Scaffold("github.com/test/blog")