dkirillov/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Change errors export from Descriptors to ErrorDescriptors

Browse source
This commit is contained in:
Stephen J Day 2014-12-11 22:04:26 -08:00
parent e14e5d14b1
commit 92dca269f0
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
api/errors/descriptors.go
View file

@ -26,9 +26,9 @@ type ErrorDescriptor struct {
HTTPStatusCodes []int HTTPStatusCodes []int
} }
// Descriptors provides a list of HTTP API Error codes that may be encountered // ErrorDescriptors provides a list of HTTP API Error codes that may be
// when interacting with the registry API. // encountered when interacting with the registry API.
var Descriptors = []ErrorDescriptor{ var ErrorDescriptors = []ErrorDescriptor{
{ {
Code: ErrorCodeUnknown, Code: ErrorCodeUnknown,
Value: "UNKNOWN", Value: "UNKNOWN",
@ -131,10 +131,10 @@ var errorCodeToDescriptors map[ErrorCode]ErrorDescriptor
var idToDescriptors map[string]ErrorDescriptor var idToDescriptors map[string]ErrorDescriptor
func init() { func init() {
errorCodeToDescriptors = make(map[ErrorCode]ErrorDescriptor, len(Descriptors)) errorCodeToDescriptors = make(map[ErrorCode]ErrorDescriptor, len(ErrorDescriptors))
idToDescriptors = make(map[string]ErrorDescriptor, len(Descriptors)) idToDescriptors = make(map[string]ErrorDescriptor, len(ErrorDescriptors))
for _, descriptor := range Descriptors { for _, descriptor := range ErrorDescriptors {
errorCodeToDescriptors[descriptor.Code] = descriptor errorCodeToDescriptors[descriptor.Code] = descriptor
idToDescriptors[descriptor.Value] = descriptor idToDescriptors[descriptor.Value] = descriptor
} }

2
api/errors/errors_test.go
View file

@ -11,7 +11,7 @@ import (
// TestErrorCodes ensures that error code format, mappings and // TestErrorCodes ensures that error code format, mappings and
// marshaling/unmarshaling. round trips are stable. // marshaling/unmarshaling. round trips are stable.
func TestErrorCodes(t *testing.T) { func TestErrorCodes(t *testing.T) {
for _, desc := range Descriptors { for _, desc := range ErrorDescriptors {
if desc.Code.String() != desc.Value { if desc.Code.String() != desc.Value {
t.Fatalf("error code string incorrect: %q != %q", desc.Code.String(), desc.Value) t.Fatalf("error code string incorrect: %q != %q", desc.Code.String(), desc.Value)
} }

2
cmd/registry-api-doctable-gen/main.go
View file

@ -61,7 +61,7 @@ func dumpErrors(wr io.Writer) {
fmt.Fprintln(writer, "\n"+divider) fmt.Fprintln(writer, "\n"+divider)
for _, descriptor := range errors.Descriptors { for _, descriptor := range errors.ErrorDescriptors {
fmt.Fprint(writer, "|") fmt.Fprint(writer, "|")
v := reflect.ValueOf(descriptor) v := reflect.ValueOf(descriptor)