github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

deploy: Do not call CDN service invalidation when executing a dry run deployment

Browse source 
Currently, if cache invalidation is enabled when running `hugo deploy --dryRun` with , the deployer does not take the dry run flag into consideration and triggers CloudFront/GoogleCloudCDN cache invalidation if any of those services are configured.

This change will instead print a feedback message if a dry run is in effect and quiet mode is not enabled.

Fixes #7884
This commit is contained in:
José Moreira 2020-10-27 20:41:15 +01:00 committed by Bjørn Erik Pedersen
parent d48a98c477
commit 56a343507c
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
deploy/deploy.go
View file

@ -262,19 +262,31 @@ func (d *Deployer) Deploy(ctx context.Context) error {
if d.invalidateCDN { if d.invalidateCDN {
if d.target.CloudFrontDistributionID != "" { if d.target.CloudFrontDistributionID != "" {
if d.dryRun {
if !d.quiet {
jww.FEEDBACK.Printf("[DRY RUN] Would invalidate CloudFront CDN with ID %s\n", d.target.CloudFrontDistributionID)
}
} else {
jww.FEEDBACK.Println("Invalidating CloudFront CDN...") jww.FEEDBACK.Println("Invalidating CloudFront CDN...")
if err := InvalidateCloudFront(ctx, d.target.CloudFrontDistributionID); err != nil { if err := InvalidateCloudFront(ctx, d.target.CloudFrontDistributionID); err != nil {
jww.FEEDBACK.Printf("Failed to invalidate CloudFront CDN: %v\n", err) jww.FEEDBACK.Printf("Failed to invalidate CloudFront CDN: %v\n", err)
return err return err
} }
} }
}
if d.target.GoogleCloudCDNOrigin != "" { if d.target.GoogleCloudCDNOrigin != "" {
if d.dryRun {
if !d.quiet {
jww.FEEDBACK.Printf("[DRY RUN] Would invalidate Google Cloud CDN with origin %s\n", d.target.GoogleCloudCDNOrigin)
}
} else {
jww.FEEDBACK.Println("Invalidating Google Cloud CDN...") jww.FEEDBACK.Println("Invalidating Google Cloud CDN...")
if err := InvalidateGoogleCloudCDN(ctx, d.target.GoogleCloudCDNOrigin); err != nil { if err := InvalidateGoogleCloudCDN(ctx, d.target.GoogleCloudCDNOrigin); err != nil {
jww.FEEDBACK.Printf("Failed to invalidate Google Cloud CDN: %v\n", err) jww.FEEDBACK.Printf("Failed to invalidate Google Cloud CDN: %v\n", err)
return err return err
} }
} }
}
jww.FEEDBACK.Println("Success!") jww.FEEDBACK.Println("Success!")
} }
return nil return nil