Skip to content

Commit 19c2b63

Browse files
authored
Update terms (#925)
master -> main (where meaningful) whitelist -> allowlist exotic -> strange
1 parent c3da6bf commit 19c2b63

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# go-containerregistry
22

3-
[![Travis Build Status](https://travis-ci.org/google/go-containerregistry.svg?branch=master)](https://travis-ci.org/google/go-containerregistry)
3+
[![Travis Build Status](https://travis-ci.org/google/go-containerregistry.svg?branch=main)](https://travis-ci.org/google/go-containerregistry)
44
[![GitHub Actions Build Status](https://github.com/google/go-containerregistry/workflows/Build/badge.svg)](https://github.com/google/go-containerregistry/actions?query=workflow%3ABuild)
55
[![GoDoc](https://godoc.org/github.com/google/go-containerregistry?status.svg)](https://godoc.org/github.com/google/go-containerregistry)
66
[![Go Report Card](https://goreportcard.com/badge/google/go-containerregistry)](https://goreportcard.com/report/google/go-containerregistry)
7-
[![Code Coverage](https://codecov.io/gh/google/go-containerregistry/branch/master/graph/badge.svg)](https://codecov.io/gh/google/go-containerregistry)
7+
[![Code Coverage](https://codecov.io/gh/google/go-containerregistry/branch/main/graph/badge.svg)](https://codecov.io/gh/google/go-containerregistry)
88

99

1010
## Introduction

cmd/crane/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ docker-tag-latest:
5151
stage: latest
5252
only:
5353
refs:
54-
- master
54+
- main
5555
image:
5656
name: gcr.io/go-containerregistry/crane:debug
5757
entrypoint: [""]
File renamed without changes.
File renamed without changes.

pkg/v1/mutate/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ e.g. to appease a registry with strict validation of images (_looking at you, GC
4646

4747
Rebase has [its own README](/cmd/crane/rebase.md).
4848

49-
This is the underlying implementation of [`crane rebase`](https://github.com/google/go-containerregistry/blob/master/cmd/crane/doc/crane_rebase.md).
49+
This is the underlying implementation of [`crane rebase`](https://github.com/google/go-containerregistry/blob/main/cmd/crane/doc/crane_rebase.md).
5050

5151
### `Extract`
5252

5353
Extract will flatten an image filesystem into a single tar stream,
5454
respecting whiteout files.
5555

56-
This is the underlying implementation of [`crane export`](https://github.com/google/go-containerregistry/blob/master/cmd/crane/doc/crane_export.md).
56+
This is the underlying implementation of [`crane export`](https://github.com/google/go-containerregistry/blob/main/cmd/crane/doc/crane_export.md).

pkg/v1/remote/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ which references an application/xml file from an image index.
7676

7777
That could look something like this:
7878

79-
![exotic image index anatomy](/images/index-anatomy-exotic.dot.svg)
79+
![strange image index anatomy](/images/index-anatomy-strange.dot.svg)
8080

8181
Using a recursive index like this might not be possible with all registries,
8282
but this flexibility allows for some interesting applications, e.g. the
@@ -114,4 +114,4 @@ however, it's possible to do _something_ useful with them via [`remote.Get`](htt
114114
which doesn't try to interpret what is returned by the registry.
115115

116116
[`crane.Copy`](https://godoc.org/github.com/google/go-containerregistry/pkg/crane#Copy) takes advantage of this to implement support for copying schema 1 images,
117-
see [here](https://github.com/google/go-containerregistry/blob/master/pkg/internal/legacy/copy.go).
117+
see [here](https://github.com/google/go-containerregistry/blob/main/pkg/internal/legacy/copy.go).

pkg/v1/remote/transport/error.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
// The set of query string keys that we expect to send as part of the registry
2727
// protocol. Anything else is potentially dangerous to leak, as it's probably
2828
// from a redirect. These redirects often included tokens or signed URLs.
29-
var paramWhitelist = map[string]struct{}{
29+
var paramAllowlist = map[string]struct{}{
3030
// Token exchange
3131
"scope": {},
3232
"service": {},
@@ -105,8 +105,8 @@ func redactURL(original *url.URL) *url.URL {
105105
qs := original.Query()
106106
for k, v := range qs {
107107
for i := range v {
108-
if _, ok := paramWhitelist[k]; !ok {
109-
// key is not in the whitelist
108+
if _, ok := paramAllowlist[k]; !ok {
109+
// key is not in the Allowlist
110110
v[i] = "REDACTED"
111111
}
112112
}

0 commit comments

Comments
 (0)