diff options
| -rw-r--r-- | commands/deploy.go | 2 | ||||
| -rw-r--r-- | deploy/deploy.go | 19 | ||||
| -rw-r--r-- | deploy/deployConfig.go | 4 | ||||
| -rw-r--r-- | deploy/google.go | 37 | ||||
| -rw-r--r-- | go.mod | 1 |
5 files changed, 57 insertions, 6 deletions
diff --git a/commands/deploy.go b/commands/deploy.go index d4b04ab78..d74d93709 100644 --- a/commands/deploy.go +++ b/commands/deploy.go @@ -70,7 +70,7 @@ documentation. cc.cmd.Flags().Bool("confirm", false, "ask for confirmation before making changes to the target") cc.cmd.Flags().Bool("dryRun", false, "dry run") cc.cmd.Flags().Bool("force", false, "force upload of all files") - cc.cmd.Flags().Bool("invalidateCDN", true, "invalidate the CDN cache via the cloudFrontDistributionID listed in the deployment target") + cc.cmd.Flags().Bool("invalidateCDN", true, "invalidate the CDN cache listed in the deployment target") cc.cmd.Flags().Int("maxDeletes", 256, "maximum # of files to delete, or -1 to disable") return cc diff --git a/deploy/deploy.go b/deploy/deploy.go index 9092431a5..1d911f29b 100644 --- a/deploy/deploy.go +++ b/deploy/deploy.go @@ -249,11 +249,20 @@ func (d *Deployer) Deploy(ctx context.Context) error { jww.FEEDBACK.Println("Success!") } - if d.invalidateCDN && d.target.CloudFrontDistributionID != "" { - jww.FEEDBACK.Println("Invalidating CloudFront CDN...") - if err := InvalidateCloudFront(ctx, d.target.CloudFrontDistributionID); err != nil { - jww.FEEDBACK.Printf("Failed to invalidate CloudFront CDN: %v\n", err) - return err + if d.invalidateCDN { + if d.target.CloudFrontDistributionID != "" { + jww.FEEDBACK.Println("Invalidating CloudFront CDN...") + if err := InvalidateCloudFront(ctx, d.target.CloudFrontDistributionID); err != nil { + jww.FEEDBACK.Printf("Failed to invalidate CloudFront CDN: %v\n", err) + return err + } + } + if d.target.GoogleCloudCDNOrigin != "" { + jww.FEEDBACK.Println("Invalidating Google Cloud CDN...") + if err := InvalidateGoogleCloudCDN(ctx, d.target.GoogleCloudCDNOrigin); err != nil { + jww.FEEDBACK.Printf("Failed to invalidate Google Cloud CDN: %v\n", err) + return err + } } jww.FEEDBACK.Println("Success!") } diff --git a/deploy/deployConfig.go b/deploy/deployConfig.go index 0ea675b82..3bc51294d 100644 --- a/deploy/deployConfig.go +++ b/deploy/deployConfig.go @@ -37,6 +37,10 @@ type target struct { URL string CloudFrontDistributionID string + + // GoogleCloudCDNOrigin specifies the Google Cloud project and CDN origin to + // invalidate when deploying this target. It is specified as <project>/<origin>. + GoogleCloudCDNOrigin string } // matcher represents configuration to be applied to files whose paths match diff --git a/deploy/google.go b/deploy/google.go new file mode 100644 index 000000000..be3ce52f0 --- /dev/null +++ b/deploy/google.go @@ -0,0 +1,37 @@ +// Copyright 2019 The Hugo Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package deploy + +import ( + "context" + "fmt" + "strings" + + "google.golang.org/api/compute/v1" +) + +// Invalidate all of the content in a Google Cloud CDN distribution. +func InvalidateGoogleCloudCDN(ctx context.Context, origin string) error { + parts := strings.Split(origin, "/") + if len(parts) != 2 { + return fmt.Errorf("origin must be <project>/<origin>") + } + service, err := compute.NewService(ctx) + if err != nil { + return err + } + rule := &compute.CacheInvalidationRule{Path: "/*"} + _, err = service.UrlMaps.InvalidateCache(parts[0], parts[1], rule).Context(ctx).Do() + return err +} @@ -63,6 +63,7 @@ require ( golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 // indirect golang.org/x/text v0.3.2 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect + google.golang.org/api v0.5.0 google.golang.org/appengine v1.6.0 // indirect google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69 // indirect gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect |