fix(internal): fix relative pathing for generator (#4397)

codyoss · web-flow · commit 25e0eaecf9fe · 2021-07-08T20:10:22.000Z
diff --git a/internal/gapicgen/generator/gapics.go b/internal/gapicgen/generator/gapics.go
@@ -302,7 +302,7 @@ func (g *GapicGenerator) microgen(conf *microgenConfig) error {
 		args = append(args, "--go_gapic_opt", fmt.Sprintf("release-level=%s", conf.releaseLevel))
 	}
 	if conf.gRPCServiceConfigPath != "" {
-		args = append(args, "--go_gapic_opt", fmt.Sprintf("grpc-service-config=%s", filepath.Join(conf.inputDirectoryPath, conf.inputDirectoryPath, conf.gRPCServiceConfigPath)))
+		args = append(args, "--go_gapic_opt", fmt.Sprintf("grpc-service-config=%s", filepath.Join(conf.inputDirectoryPath, conf.gRPCServiceConfigPath)))
 	}
 	if !conf.disableMetadata {
 		args = append(args, "--go_gapic_opt", "metadata")

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ func (g GapicGenerator) microgen(conf microgenConfig) error {`
`302`	`302`	`args = append(args, "--go_gapic_opt", fmt.Sprintf("release-level=%s", conf.releaseLevel))`
`303`	`303`	`}`
`304`	`304`	`if conf.gRPCServiceConfigPath != "" {`
`305`		`- args = append(args, "--go_gapic_opt", fmt.Sprintf("grpc-service-config=%s", filepath.Join(conf.inputDirectoryPath, conf.inputDirectoryPath, conf.gRPCServiceConfigPath)))`
	`305`	`+ args = append(args, "--go_gapic_opt", fmt.Sprintf("grpc-service-config=%s", filepath.Join(conf.inputDirectoryPath, conf.gRPCServiceConfigPath)))`
`306`	`306`	`}`
`307`	`307`	`if !conf.disableMetadata {`
`308`	`308`	`args = append(args, "--go_gapic_opt", "metadata")`