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

Merge pull request #580 from gierschv/spec 

doc/spec: coherence between requests and parameters + typo
master
Stephen Day 2015-06-02 13:57:56 -07:00
parent cd7d977fe6 7b3f571555
commit 4e1280405a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/spec/api.md
View File

@ -992,7 +992,7 @@ The following parameters should be specified on the request:
|`Host`|header|Standard HTTP Host Header. Should be set to the registry host.| |`Host`|header|Standard HTTP Host Header. Should be set to the registry host.|
|`Authorization`|header|An RFC7235 compliant authorization header.| |`Authorization`|header|An RFC7235 compliant authorization header.|
|`name`|path|Name of the target repository.| |`name`|path|Name of the target repository.|
|`tag`|path|Tag of the target manifiest.| |`reference`|path|Tag or digest of the target manifest.|
@ -1160,7 +1160,7 @@ The following parameters should be specified on the request:
|`Host`|header|Standard HTTP Host Header. Should be set to the registry host.| |`Host`|header|Standard HTTP Host Header. Should be set to the registry host.|
|`Authorization`|header|An RFC7235 compliant authorization header.| |`Authorization`|header|An RFC7235 compliant authorization header.|
|`name`|path|Name of the target repository.| |`name`|path|Name of the target repository.|
|`tag`|path|Tag of the target manifiest.| |`reference`|path|Tag or digest of the target manifest.|
@ -1344,7 +1344,7 @@ The following parameters should be specified on the request:
|`Host`|header|Standard HTTP Host Header. Should be set to the registry host.| |`Host`|header|Standard HTTP Host Header. Should be set to the registry host.|
|`Authorization`|header|An RFC7235 compliant authorization header.| |`Authorization`|header|An RFC7235 compliant authorization header.|
|`name`|path|Name of the target repository.| |`name`|path|Name of the target repository.|
|`tag`|path|Tag of the target manifiest.| |`reference`|path|Tag or digest of the target manifest.|

12
registry/api/v2/descriptors.go
View File

@ -16,12 +16,12 @@ var (
Description: `Name of the target repository.`, Description: `Name of the target repository.`,
} }
tagParameterDescriptor = ParameterDescriptor{ referenceParameterDescriptor = ParameterDescriptor{
Name: "tag", Name: "reference",
Type: "string", Type: "string",
Format: TagNameRegexp.String(), Format: TagNameRegexp.String(),
Required: true, Required: true,
Description: `Tag of the target manifiest.`, Description: `Tag or digest of the target manifest.`,
} }
uuidParameterDescriptor = ParameterDescriptor{ uuidParameterDescriptor = ParameterDescriptor{
@ -476,7 +476,7 @@ var routeDescriptors = []RouteDescriptor{
}, },
PathParameters: []ParameterDescriptor{ PathParameters: []ParameterDescriptor{
nameParameterDescriptor, nameParameterDescriptor,
tagParameterDescriptor, referenceParameterDescriptor,
}, },
Successes: []ResponseDescriptor{ Successes: []ResponseDescriptor{
{ {
@ -542,7 +542,7 @@ var routeDescriptors = []RouteDescriptor{
}, },
PathParameters: []ParameterDescriptor{ PathParameters: []ParameterDescriptor{
nameParameterDescriptor, nameParameterDescriptor,
tagParameterDescriptor, referenceParameterDescriptor,
}, },
Body: BodyDescriptor{ Body: BodyDescriptor{
ContentType: "application/json; charset=utf-8", ContentType: "application/json; charset=utf-8",
@ -648,7 +648,7 @@ var routeDescriptors = []RouteDescriptor{
}, },
PathParameters: []ParameterDescriptor{ PathParameters: []ParameterDescriptor{
nameParameterDescriptor, nameParameterDescriptor,
tagParameterDescriptor, referenceParameterDescriptor,
}, },
Successes: []ResponseDescriptor{ Successes: []ResponseDescriptor{
{ {