Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo #889

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integration/dynamodb/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ aws dynamodb put-item --table-name confd --region eu-west-1 \
--item '{ "key": { "S": "/prefix/upstream/app2" }, "value": {"S": "10.0.1.11:8080"}}' \
--endpoint-url http://localhost:8000

# Run confd, expect it to work
# Run confd, expecting it to work
confd --onetime --log-level debug --confdir ./integration/confdir --interval 5 --backend dynamodb --table confd
if [ $? -ne 0 ]
then
Expand Down
2 changes: 1 addition & 1 deletion integration/ssm/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ aws ssm put-parameter --name "/prefix/database/username" --type "String" --value
aws ssm put-parameter --name "/prefix/upstream/app1" --type "String" --value "10.0.1.10:8080" --endpoint-url $SSM_ENDPOINT_URL
aws ssm put-parameter --name "/prefix/upstream/app2" --type "String" --value "10.0.1.11:8080" --endpoint-url $SSM_ENDPOINT_URL

# Run confd, expect it to work
# Run confd, expecting it to work
confd --onetime --log-level debug --confdir ./integration/confdir --interval 5 --backend ssm --table confd
if [ $? -ne 0 ]
then
Expand Down
4 changes: 2 additions & 2 deletions log/log.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Package log provides support for logging to stdout and stderr.
Package log provides support for logging into stdout and stderr.

Log entries will be logged in the following format:

Expand All @@ -26,7 +26,7 @@ func (c *ConfdFormatter) Format(entry *log.Entry) ([]byte, error) {
}

// tag represents the application name generating the log message. The tag
// string will appear in all log entires.
// string will appear in all log entries.
var tag string

func init() {
Expand Down
2 changes: 1 addition & 1 deletion resource/template/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func (t *TemplateResource) createStageFile() error {
}
defer temp.Close()

// Set the owner, group, and mode on the stage file now to make it easier to
// Set the owner, group, and mode on the staged file now to make it easier to
// compare against the destination configuration file later.
os.Chmod(temp.Name(), t.FileMode)
os.Chown(temp.Name(), t.Uid, t.Gid)
Expand Down
2 changes: 1 addition & 1 deletion resource/template/template_funcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func Reverse(values interface{}) interface{} {
}

// Getenv retrieves the value of the environment variable named by the key.
// It returns the value, which will the default value if the variable is not present.
// It returns the value, which will be the default value if the variable is not present.
// If no default value was given - returns "".
func Getenv(key string, v ...string) string {
defaultValue := ""
Expand Down
2 changes: 1 addition & 1 deletion util/filestat_posix.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"syscall"
)

// filestat return a FileInfo describing the named file.
// filestat returns a FileInfo describing the named file.
func FileStat(name string) (fi FileInfo, err error) {
if IsFileExist(name) {
f, err := os.Open(name)
Expand Down
2 changes: 1 addition & 1 deletion util/filestat_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
)

// filestat return a FileInfo describing the named file.
// filestat returns a FileInfo describing the named file.
func FileStat(name string) (fi FileInfo, err error) {
if IsFileExist(name) {
f, err := os.Open(name)
Expand Down
2 changes: 1 addition & 1 deletion util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func IsFileExist(fpath string) bool {
// IsConfigChanged reports whether src and dest config files are equal.
// Two config files are equal when they have the same file contents and
// Unix permissions. The owner, group, and mode must match.
// It return false in other cases.
// It returns false in other cases.
func IsConfigChanged(src, dest string) (bool, error) {
if !IsFileExist(dest) {
return true, nil
Expand Down
2 changes: 1 addition & 1 deletion util/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

// createRecursiveDirs is a helper function which creates temporary directorie
// has sub directories, and files with different extionname which will be used
// fo function findrecursiveFindFiles's test case.The result looks like:
// for function findrecursiveFindFiles's test case.The result looks like:
// ├── root.other1
// ├── root.toml
// ├── subDir1
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/armon/go-metrics/inmem.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/armon/go-metrics/inmem_endpoint.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/armon/go-metrics/metrics.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/github.com/armon/go-metrics/sink.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/armon/go-metrics/statsite.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.