This repository has been archived by the owner on Mar 9, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 44
allow multiple API/Gateway addresses #11
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
package config | ||
|
||
import ( | ||
"encoding/json" | ||
) | ||
|
||
// Strings is a helper type that (un)marshals a single string to/from a single | ||
// JSON string and a slice of strings to/from a JSON array of strings. | ||
type Strings []string | ||
|
||
// UnmarshalJSON conforms to the json.Unmarshaler interface. | ||
func (o *Strings) UnmarshalJSON(data []byte) error { | ||
if data[0] == '[' { | ||
return json.Unmarshal(data, (*[]string)(o)) | ||
} | ||
var value string | ||
if err := json.Unmarshal(data, &value); err != nil { | ||
return err | ||
} | ||
*o = []string{value} | ||
return nil | ||
} | ||
|
||
// MarshalJSON conforms to the json.Marshaler interface. | ||
func (o Strings) MarshalJSON() ([]byte, error) { | ||
switch len(o) { | ||
case 0: | ||
return json.Marshal(nil) | ||
case 1: | ||
return json.Marshal(o[0]) | ||
default: | ||
return json.Marshal([]string(o)) | ||
} | ||
} | ||
|
||
var _ json.Unmarshaler = (*Strings)(nil) | ||
var _ json.Marshaler = (*Strings)(nil) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be returning an empty array? Or will the marshaller just omit the entry if it's nil?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
json.Marshal(nil)
will get the value[]byte("null")
, so i think it makes sense.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Exactly. Basically, I'd like to use
null
for the case where no API addresses are specified.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@overbool want to file a PR against go-ipfs that uses this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Stebalien Did you mean this ipfs/kubo#5401?