From aeea1ce1e5dff3acdfe208932327b52c49851b41 Mon Sep 17 00:00:00 2001 From: Noah Dietz Date: Wed, 30 Jun 2021 11:19:13 -0700 Subject: [PATCH] fix(internal): fix googleapis-disco regen (#4354) --- internal/gapicgen/generator/gapics.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/internal/gapicgen/generator/gapics.go b/internal/gapicgen/generator/gapics.go index 48a16e67acc..e57315a91df 100644 --- a/internal/gapicgen/generator/gapics.go +++ b/internal/gapicgen/generator/gapics.go @@ -491,7 +491,11 @@ func (g *GapicGenerator) manifest(confs []*microgenConfig) error { entries[manual.DistributionName] = manual } for _, conf := range confs { - yamlPath := filepath.Join(g.googleapisDir, conf.apiServiceConfigPath) + dir := g.googleapisDir + if conf.googleapisDiscovery { + dir = g.googleapisDiscoDir + } + yamlPath := filepath.Join(dir, conf.apiServiceConfigPath) yamlFile, err := os.Open(yamlPath) if err != nil { return err @@ -535,7 +539,11 @@ func (g *GapicGenerator) copyMicrogenFiles() error { func (g *GapicGenerator) parseAPIShortnames(confs []*microgenConfig, manualEntries []manifestEntry) (map[string]string, error) { shortnames := map[string]string{} for _, conf := range confs { - yamlPath := filepath.Join(g.googleapisDir, conf.apiServiceConfigPath) + dir := g.googleapisDir + if conf.googleapisDiscovery { + dir = g.googleapisDiscoDir + } + yamlPath := filepath.Join(dir, conf.apiServiceConfigPath) yamlFile, err := os.Open(yamlPath) if err != nil { return nil, err