daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3020 from kd7lxl/updatefrequency 

Fix typo cloudfront updatefrenquency
master
Derek McGowan 2020-02-22 16:54:03 -08:00 committed by GitHub
parent f593b8d975 0f5e2753a6
commit bfa6b923e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/configuration.md
View File

@ -198,7 +198,7 @@ middleware:
duration: 3000s duration: 3000s
ipfilteredby: awsregion ipfilteredby: awsregion
awsregion: us-east-1, use-east-2 awsregion: us-east-1, use-east-2
updatefrenquency: 12h updatefrequency: 12h
iprangesurl: https://ip-ranges.amazonaws.com/ip-ranges.json iprangesurl: https://ip-ranges.amazonaws.com/ip-ranges.json
storage: storage:
- name: redirect - name: redirect
@ -685,7 +685,7 @@ middleware:
duration: 3000s duration: 3000s
ipfilteredby: awsregion ipfilteredby: awsregion
awsregion: us-east-1, use-east-2 awsregion: us-east-1, use-east-2
updatefrenquency: 12h updatefrequency: 12h
iprangesurl: https://ip-ranges.amazonaws.com/ip-ranges.json iprangesurl: https://ip-ranges.amazonaws.com/ip-ranges.json
``` ```
@ -708,7 +708,7 @@ interpretation of the options.
| `duration` | no | An integer and unit for the duration of the Cloudfront session. Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, or `h`. For example, `3000s` is valid, but `3000 s` is not. If you do not specify a `duration` or you specify an integer without a time unit, the duration defaults to `20m` (20 minutes). | | `duration` | no | An integer and unit for the duration of the Cloudfront session. Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, or `h`. For example, `3000s` is valid, but `3000 s` is not. If you do not specify a `duration` or you specify an integer without a time unit, the duration defaults to `20m` (20 minutes). |
| `ipfilteredby` | no | A string with the following value `none`, `aws` or `awsregion`. | | `ipfilteredby` | no | A string with the following value `none`, `aws` or `awsregion`. |
| `awsregion` | no | A comma separated string of AWS regions, only available when `ipfilteredby` is `awsregion`. For example, `us-east-1, us-west-2` | | `awsregion` | no | A comma separated string of AWS regions, only available when `ipfilteredby` is `awsregion`. For example, `us-east-1, us-west-2` |
| `updatefrenquency` | no | The frequency to update AWS IP regions, default: `12h` | | `updatefrequency` | no | The frequency to update AWS IP regions, default: `12h` |
| `iprangesurl` | no | The URL contains the AWS IP ranges information, default: `https://ip-ranges.amazonaws.com/ip-ranges.json` | | `iprangesurl` | no | The URL contains the AWS IP ranges information, default: `https://ip-ranges.amazonaws.com/ip-ranges.json` |

11
registry/storage/driver/middleware/cloudfront/middleware.go
View File

@ -111,16 +111,21 @@ func newCloudFrontStorageMiddleware(storageDriver storagedriver.StorageDriver, o
} }
} }
// parse updatefrenquency // parse updatefrequency
updateFrequency := defaultUpdateFrequency updateFrequency := defaultUpdateFrequency
if u, ok := options["updatefrenquency"]; ok { // #2447 introduced a typo. Support it for backward compatibility.
if _, ok := options["updatefrenquency"]; ok {
options["updatefrequency"] = options["updatefrenquency"]
dcontext.GetLogger(context.Background()).Warn("cloudfront updatefrenquency is deprecated. Please use updatefrequency")
}
if u, ok := options["updatefrequency"]; ok {
switch u := u.(type) { switch u := u.(type) {
case time.Duration: case time.Duration:
updateFrequency = u updateFrequency = u
case string: case string:
updateFreq, err := time.ParseDuration(u) updateFreq, err := time.ParseDuration(u)
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid updatefrenquency: %s", err) return nil, fmt.Errorf("invalid updatefrequency: %s", err)
} }
duration = updateFreq duration = updateFreq
} }