@@ -40,12 +40,13 @@ const (
4040)
4141
4242var (
43- apiToGenerate = flag .String ("api" , "*" , "The API ID to generate, like 'tasks:v1'. A value of '*' means all." )
44- useCache = flag .Bool ("cache" , true , "Use cache of discovered Google API discovery documents." )
45- genDir = flag .String ("gendir" , defaultGenDir (), "Directory to use to write out generated Go files" )
46- build = flag .Bool ("build" , false , "Compile generated packages." )
47- install = flag .Bool ("install" , false , "Install generated packages." )
48- apisURL = flag .String ("discoveryurl" , googleDiscoveryURL , "URL to root discovery document" )
43+ apiToGenerate = flag .String ("api" , "*" , "The API ID to generate, like 'tasks:v1'. A value of '*' means all." )
44+ useCache = flag .Bool ("cache" , true , "Use cache of discovered Google API discovery documents." )
45+ genDir = flag .String ("gendir" , defaultGenDir (), "Directory to use to write out generated Go files" )
46+ build = flag .Bool ("build" , false , "Compile generated packages." )
47+ install = flag .Bool ("install" , false , "Install generated packages." )
48+ apisURL = flag .String ("discoveryurl" , googleDiscoveryURL , "URL to root discovery document" )
49+ remoteCacheDir = flag .String ("remote_cache_dir" , os .Getenv ("REMOTE_CACHE_DIR" ), "Directory of remote cache index and schemas." )
4950
5051 publicOnly = flag .Bool ("publiconly" , true , "Only build public, released APIs. Only applicable for Google employees." )
5152
@@ -159,7 +160,7 @@ func main() {
159160 var (
160161 apiIds = []string {}
161162 matches = []* API {}
162- errors = []error {}
163+ errs = []error {}
163164 )
164165 for _ , api := range getAPIs () {
165166 apiIds = append (apiIds , api .ID )
@@ -172,8 +173,8 @@ func main() {
172173 if err == errOldRevision {
173174 log .Printf ("Old revision found for %s, skipping generation" , api .ID )
174175 continue
175- } else if err != nil && err != errNoDoc {
176- errors = append (errors , & generateError {api , err })
176+ } else if err != nil && ! errors . Is ( err , errNoDoc ) {
177+ errs = append (errs , & generateError {api , err })
177178 continue
178179 }
179180 if * build && err == nil {
@@ -186,7 +187,7 @@ func main() {
186187 args = append (args , api .Target ())
187188 out , err := exec .Command ("go" , args ... ).CombinedOutput ()
188189 if err != nil {
189- errors = append (errors , & compileError {api , string (out )})
190+ errs = append (errs , & compileError {api , string (out )})
190191 }
191192 }
192193 }
@@ -195,9 +196,9 @@ func main() {
195196 log .Fatalf ("No APIs matched %q; options are %v" , * apiToGenerate , apiIds )
196197 }
197198
198- if len (errors ) > 0 {
199- log .Printf ("%d API(s) failed to generate or compile:" , len (errors ))
200- for _ , ce := range errors {
199+ if len (errs ) > 0 {
200+ log .Printf ("%d API(s) failed to generate or compile:" , len (errs ))
201+ for _ , ce := range errs {
201202 log .Println (ce .Error ())
202203 }
203204 os .Exit (1 )
@@ -241,6 +242,14 @@ func getAPIs() []*API {
241242 log .Fatal (err )
242243 }
243244 source = apiListFile
245+ } else if * remoteCacheDir != "" {
246+ var err error
247+ name := filepath .Join (* remoteCacheDir , "index.json" )
248+ bytes , err = os .ReadFile (name )
249+ if err != nil {
250+ log .Fatal (err )
251+ }
252+ source = name
244253 } else {
245254 bytes = slurpURL (* apisURL )
246255 if * publicOnly {
@@ -590,34 +599,52 @@ func (a *API) needsDataWrapper() bool {
590599 return false
591600}
592601
593- func (a * API ) jsonBytes () []byte {
602+ func (a * API ) jsonBytes () ( []byte , error ) {
594603 if a .forceJSON == nil {
595604 var slurp []byte
596605 var err error
597606 if * useCache {
598607 slurp , err = os .ReadFile (a .JSONFile ())
599608 if err != nil {
600- log .Fatal (err )
609+ return nil , err
610+ }
611+ } else if * remoteCacheDir != "" {
612+ filename := fmt .Sprintf ("%s.%s.json" , a .Name , a .Version )
613+ b , err := os .ReadFile (filepath .Join (* remoteCacheDir , filename ))
614+ if err != nil {
615+ return nil , fmt .Errorf ("%s: %w" , err , errNoDoc )
616+ }
617+
618+ // Make sure that keys are sorted by re-marshalling.
619+ d := make (map [string ]any )
620+ json .Unmarshal (b , & d )
621+ if err != nil {
622+ return nil , err
623+ }
624+
625+ slurp , err = json .MarshalIndent (d , "" , " " )
626+ if err != nil {
627+ return nil , err
601628 }
602629 } else {
603630 slurp = slurpURL (a .DiscoveryURL ())
604631 if slurp != nil {
605632 // Make sure that keys are sorted by re-marshalling.
606- d := make (map [string ]interface {} )
633+ d := make (map [string ]any )
607634 json .Unmarshal (slurp , & d )
608635 if err != nil {
609- log . Fatal ( err )
636+ return nil , err
610637 }
611638 var err error
612639 slurp , err = json .MarshalIndent (d , "" , " " )
613640 if err != nil {
614- log . Fatal ( err )
641+ return nil , err
615642 }
616643 }
617644 }
618645 a .forceJSON = slurp
619646 }
620- return a .forceJSON
647+ return a .forceJSON , nil
621648}
622649
623650func (a * API ) JSONFile () string {
@@ -629,7 +656,10 @@ func (a *API) JSONFile() string {
629656// if the API spec file being pulled in is older than the local cache.
630657func (a * API ) WriteGeneratedCode () error {
631658 genfilename := * output
632- jsonBytes := a .jsonBytes ()
659+ jsonBytes , err := a .jsonBytes ()
660+ if err != nil {
661+ return err
662+ }
633663 // Skip generation if we don't have the discovery doc.
634664 if jsonBytes == nil {
635665 // No message here, because slurpURL printed one.
@@ -729,8 +759,10 @@ var docsLink string
729759func (a * API ) GenerateCode () ([]byte , error ) {
730760 pkg := a .Package ()
731761
732- jsonBytes := a .jsonBytes ()
733- var err error
762+ jsonBytes , err := a .jsonBytes ()
763+ if err != nil {
764+ return nil , err
765+ }
734766 if a .doc == nil {
735767 a .doc , err = disco .NewDocument (jsonBytes )
736768 if err != nil {
0 commit comments