From af33f162de7e176e44d82a676186fe814a8d4278 Mon Sep 17 00:00:00 2001
From: Clockwork <alex@clockwork.gr>
Date: Thu, 2 Nov 2023 18:42:33 +0200
Subject: [PATCH] fix: Optimise ts-client generation (#3725)

* fix: Optimise ts-client generation

* chore: Update changelog
---
 changelog.md                                    |  1 +
 ignite/pkg/cosmosgen/generate_openapi.go        | 17 +++++++++++++----
 .../programs/swagger-combine/swagger-combine.go |  9 +--------
 ignite/templates/app/files/go.mod.plush         |  2 +-
 .../templates/app/files/proto/buf.gen.sta.yaml  |  1 +
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/changelog.md b/changelog.md
index 3c6ba3b648..e66c21b220 100644
--- a/changelog.md
+++ b/changelog.md
@@ -36,6 +36,7 @@
 - [#3655](https://github.com/ignite/cli/pull/3655) Re-enable TS client generation
 - [#3661](https://github.com/ignite/cli/pull/3661) Change `pkg/cosmosanalysis` to find Cosmos SDK runtime app registered modules
 - [#3716](https://github.com/ignite/cli/pull/3716) Fix invalid plugin hook check
+- [#3725](https://github.com/ignite/cli/pull/3725) Fix flaky TS client generation issues on linux
 
 ## [`v0.27.0`](https://github.com/ignite/cli/releases/tag/v0.27.0)
 
diff --git a/ignite/pkg/cosmosgen/generate_openapi.go b/ignite/pkg/cosmosgen/generate_openapi.go
index f4897d5472..84623e6b68 100644
--- a/ignite/pkg/cosmosgen/generate_openapi.go
+++ b/ignite/pkg/cosmosgen/generate_openapi.go
@@ -12,6 +12,7 @@ import (
 	"github.com/ignite/cli/ignite/pkg/cache"
 	"github.com/ignite/cli/ignite/pkg/cosmosanalysis/module"
 	"github.com/ignite/cli/ignite/pkg/dirchange"
+	"github.com/ignite/cli/ignite/pkg/nodetime"
 	swaggercombine "github.com/ignite/cli/ignite/pkg/nodetime/programs/swagger-combine"
 	"github.com/ignite/cli/ignite/pkg/xos"
 )
@@ -39,7 +40,11 @@ func (g *generator) generateOpenAPISpec() error {
 			},
 		}
 	)
-
+	command, cleanup, err := nodetime.Command(nodetime.CommandSwaggerCombine)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
 	defer func() {
 		for _, dir := range specDirs {
 			os.RemoveAll(dir)
@@ -157,7 +162,7 @@ func (g *generator) generateOpenAPISpec() error {
 	}
 
 	// combine specs into one and save to out.
-	if err := swaggercombine.Combine(g.ctx, conf, out); err != nil {
+	if err := swaggercombine.Combine(g.ctx, conf, command, out); err != nil {
 		return err
 	}
 
@@ -174,6 +179,11 @@ func (g *generator) generateModuleOpenAPISpec(m module.Module, out string) error
 			},
 		}
 	)
+	command, cleanup, err := nodetime.Command(nodetime.CommandSwaggerCombine)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
 
 	defer func() {
 		for _, dir := range specDirs {
@@ -242,7 +252,6 @@ func (g *generator) generateModuleOpenAPISpec(m module.Module, out string) error
 	if err := os.MkdirAll(outDir, 0o766); err != nil {
 		return err
 	}
-
 	// combine specs into one and save to out.
-	return swaggercombine.Combine(g.ctx, conf, out)
+	return swaggercombine.Combine(g.ctx, conf, command, out)
 }
diff --git a/ignite/pkg/nodetime/programs/swagger-combine/swagger-combine.go b/ignite/pkg/nodetime/programs/swagger-combine/swagger-combine.go
index a1ec01ede4..2b0c3da375 100644
--- a/ignite/pkg/nodetime/programs/swagger-combine/swagger-combine.go
+++ b/ignite/pkg/nodetime/programs/swagger-combine/swagger-combine.go
@@ -8,7 +8,6 @@ import (
 	"regexp"
 
 	"github.com/ignite/cli/ignite/pkg/cmdrunner/exec"
-	"github.com/ignite/cli/ignite/pkg/nodetime"
 )
 
 // Config represent swagger-combine config.
@@ -81,13 +80,7 @@ func (c *Config) AddSpec(id, path string, makeUnique bool) error {
 
 // Combine combines openapi specs into one and saves to out path.
 // specs is a spec id-fs path pair.
-func Combine(ctx context.Context, c Config, out string) error {
-	command, cleanup, err := nodetime.Command(nodetime.CommandSwaggerCombine)
-	if err != nil {
-		return err
-	}
-	defer cleanup()
-
+func Combine(ctx context.Context, c Config, command []string, out string) error {
 	f, err := os.CreateTemp("", "*.json")
 	if err != nil {
 		return err
diff --git a/ignite/templates/app/files/go.mod.plush b/ignite/templates/app/files/go.mod.plush
index 578f6def14..6dab72199d 100644
--- a/ignite/templates/app/files/go.mod.plush
+++ b/ignite/templates/app/files/go.mod.plush
@@ -18,7 +18,7 @@ require (
 	github.com/golang/protobuf v1.5.3
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
 	github.com/spf13/cast v1.5.1
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
diff --git a/ignite/templates/app/files/proto/buf.gen.sta.yaml b/ignite/templates/app/files/proto/buf.gen.sta.yaml
index d8cea8b342..4444f5e75c 100644
--- a/ignite/templates/app/files/proto/buf.gen.sta.yaml
+++ b/ignite/templates/app/files/proto/buf.gen.sta.yaml
@@ -10,5 +10,6 @@ plugins:
     opt:
       - logtostderr=true
       - openapi_naming_strategy=simple
+      - ignore_comments=true
       - simple_operation_ids=false
       - json_names_for_fields=false