Skip to content
Merged
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
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
GOBIN: ${{ github.workspace }}/go/bin
defaults:
run:
working-directory: ${{ env.GOPATH }}/src/github.com/rotationalio/confire
working-directory: ${{ env.GOPATH }}/src/go.rtnl.ai/confire
steps:
- name: Set up Go
uses: actions/setup-go@v3
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Checkout Code
uses: actions/checkout@v3
with:
path: ${{ env.GOPATH }}/src/github.com/rotationalio/confire
path: ${{ env.GOPATH }}/src/go.rtnl.ai/confire

- name: Install Staticcheck
run: go install honnef.co/go/tools/cmd/staticcheck@2023.1.3
Expand All @@ -47,7 +47,7 @@ jobs:
GOBIN: ${{ github.workspace }}/go/bin
defaults:
run:
working-directory: ${{ env.GOPATH }}/src/github.com/rotationalio/confire
working-directory: ${{ env.GOPATH }}/src/go.rtnl.ai/confire
steps:
- name: Set up Go
uses: actions/setup-go@v3
Expand All @@ -65,7 +65,7 @@ jobs:
- name: Checkout Code
uses: actions/checkout@v3
with:
path: ${{ env.GOPATH }}/src/github.com/rotationalio/confire
path: ${{ env.GOPATH }}/src/go.rtnl.ai/confire

- name: Install Dependencies
run: |
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Confire

[![Go Reference](https://pkg.go.dev/badge/github.com/rotationalio/confire.svg)](https://pkg.go.dev/github.com/rotationalio/confire)
[![Go Reference](https://pkg.go.dev/badge/go.rtnl.ai/confire.svg)](https://pkg.go.dev/go.rtnl.ai/confire)
[![Tests](https://github.com/rotationalio/confire/actions/workflows/test.yaml/badge.svg)](https://github.com/rotationalio/confire/actions/workflows/test.yaml)
[![Go Report Card](https://goreportcard.com/badge/github.com/rotationalio/confire)](https://goreportcard.com/report/github.com/rotationalio/confire)
[![Go Report Card](https://goreportcard.com/badge/go.rtnl.ai/confire)](https://goreportcard.com/report/go.rtnl.ai/confire)

**Configuration management for services and distributed systems**

## Install

```
$ go get github.com/rotationalio/confire
$ go get go.rtnl.ai/confire
```

## Usage
Expand All @@ -26,7 +26,7 @@ import (
"log"
"time"

"github.com/rotationalio/confire"
"go.rtnl.ai/confire"
)

type Config struct {
Expand Down Expand Up @@ -120,8 +120,8 @@ Currently confire supports parsing these struct field types:
- maps (keys and values of any supported type)
- [encoding.TextUnmarshaler](https://golang.org/pkg/encoding/#TextUnmarshaler)
- [encoding.BinaryUnmarshaler](https://golang.org/pkg/encoding/#BinaryUnmarshaler)
- [parse.Decoder](https://pkg.go.dev/github.com/rotationalio/confire/parse#Decoder)
- [parse.Setter](https://pkg.go.dev/github.com/rotationalio/confire/parse#Setter)
- [parse.Decoder](https://pkg.go.dev/go.rtnl.ai/confire/parse#Decoder)
- [parse.Setter](https://pkg.go.dev/go.rtnl.ai/confire/parse#Setter)

Note that `time.Time` is also supported because it implements `encoding.TextUnmarshaler`.

Expand All @@ -134,7 +134,7 @@ import (
"fmt"
"log"

"github.com/rotationalio/confire/defaults"
"go.rtnl.ai/confire/defaults"
)

type Config struct {
Expand Down Expand Up @@ -170,7 +170,7 @@ Coming soon!
Confire automatically looks for an environment variable to set on your configuration struct based on the name of the struct variable. Consider the following go code:

```go
import "github.com/rotationalio/confire/env"
import "go.rtnl.ai/confire/env"

type Config struct {
Enabled bool
Expand Down
6 changes: 3 additions & 3 deletions confire.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package confire

import (
"github.com/rotationalio/confire/defaults"
"github.com/rotationalio/confire/env"
"github.com/rotationalio/confire/validate"
"go.rtnl.ai/confire/defaults"
"go.rtnl.ai/confire/env"
"go.rtnl.ai/confire/validate"
)

// Process is the main entry point to configuring and validating a struct from defaults
Expand Down
6 changes: 3 additions & 3 deletions defaults/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ package defaults
import (
"reflect"

"github.com/rotationalio/confire/errors"
"github.com/rotationalio/confire/parse"
"github.com/rotationalio/confire/structs"
"go.rtnl.ai/confire/errors"
"go.rtnl.ai/confire/parse"
"go.rtnl.ai/confire/structs"
)

const tagDefault = "default"
Expand Down
4 changes: 2 additions & 2 deletions defaults/defaults_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"
"time"

"github.com/rotationalio/confire/assert"
"github.com/rotationalio/confire/defaults"
"go.rtnl.ai/confire/assert"
"go.rtnl.ai/confire/defaults"
)

type Specification struct {
Expand Down
6 changes: 3 additions & 3 deletions env/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (

goerrs "errors"

"github.com/rotationalio/confire/errors"
"github.com/rotationalio/confire/parse"
"github.com/rotationalio/confire/structs"
"go.rtnl.ai/confire/errors"
"go.rtnl.ai/confire/parse"
"go.rtnl.ai/confire/structs"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions env/env_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"
"time"

"github.com/rotationalio/confire/assert"
. "github.com/rotationalio/confire/env"
"go.rtnl.ai/confire/assert"
. "go.rtnl.ai/confire/env"
)

const testPrefix = "confire"
Expand Down
2 changes: 1 addition & 1 deletion errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package confire
import (
"errors"

confireErrors "github.com/rotationalio/confire/errors"
confireErrors "go.rtnl.ai/confire/errors"
)

// Extract a parse error from an error if it is one.
Expand Down
4 changes: 2 additions & 2 deletions errors/errors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"testing"

"github.com/rotationalio/confire/assert"
. "github.com/rotationalio/confire/errors"
"go.rtnl.ai/confire/assert"
. "go.rtnl.ai/confire/errors"
)

func TestParseError(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions errors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package confire_test
import (
"testing"

"github.com/rotationalio/confire"
"github.com/rotationalio/confire/assert"
"github.com/rotationalio/confire/errors"
"go.rtnl.ai/confire"
"go.rtnl.ai/confire/assert"
"go.rtnl.ai/confire/errors"
)

func TestParserError(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/rotationalio/confire
module go.rtnl.ai/confire

go 1.20
2 changes: 1 addition & 1 deletion merge/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"fmt"
"reflect"

"github.com/rotationalio/confire/structs"
"go.rtnl.ai/confire/structs"
)

// Merge updates the destination struct in-place with non-zero values from the source.
Expand Down
6 changes: 3 additions & 3 deletions merge/merge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/rotationalio/confire/assert"
"github.com/rotationalio/confire/errors"
"github.com/rotationalio/confire/merge"
"go.rtnl.ai/confire/assert"
"go.rtnl.ai/confire/errors"
"go.rtnl.ai/confire/merge"
)

func TestMerge(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion parse/iface.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding"
"reflect"

"github.com/rotationalio/confire/structs"
"go.rtnl.ai/confire/structs"
)

// Decoder has the same semantics as Setter, but takes higher precedence.
Expand Down
6 changes: 3 additions & 3 deletions parse/iface_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"encoding"
"testing"

"github.com/rotationalio/confire/assert"
. "github.com/rotationalio/confire/parse"
"github.com/rotationalio/confire/structs"
"go.rtnl.ai/confire/assert"
. "go.rtnl.ai/confire/parse"
"go.rtnl.ai/confire/structs"
)

type Does struct{}
Expand Down
4 changes: 2 additions & 2 deletions parse/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strings"
"time"

"github.com/rotationalio/confire/errors"
"github.com/rotationalio/confire/structs"
"go.rtnl.ai/confire/errors"
"go.rtnl.ai/confire/structs"
)

func Parse(value string, field reflect.Value) error {
Expand Down
6 changes: 3 additions & 3 deletions parse/parse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"testing"
"time"

"github.com/rotationalio/confire/assert"
"github.com/rotationalio/confire/parse"
"github.com/rotationalio/confire/structs"
"go.rtnl.ai/confire/assert"
"go.rtnl.ai/confire/parse"
"go.rtnl.ai/confire/structs"
)

func TestParse(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion structs/field.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"reflect"

"github.com/rotationalio/confire/errors"
"go.rtnl.ai/confire/errors"
)

func getFields(v reflect.Value) (fields []*Field) {
Expand Down
4 changes: 2 additions & 2 deletions structs/field_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"
"time"

"github.com/rotationalio/confire/assert"
"github.com/rotationalio/confire/structs"
"go.rtnl.ai/confire/assert"
"go.rtnl.ai/confire/structs"
)

func TestFieldMethods(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions structs/iface_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"
"time"

"github.com/rotationalio/confire/assert"
"github.com/rotationalio/confire/structs"
"go.rtnl.ai/confire/assert"
"go.rtnl.ai/confire/structs"
)

func TestTimeIsZero(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion structs/structs.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"fmt"
"reflect"

"github.com/rotationalio/confire/errors"
"go.rtnl.ai/confire/errors"
)

// Struct encapsulates a struct type to provide reflection around the struct.
Expand Down
6 changes: 3 additions & 3 deletions structs/structs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/rotationalio/confire/assert"
"github.com/rotationalio/confire/errors"
"github.com/rotationalio/confire/structs"
"go.rtnl.ai/confire/assert"
"go.rtnl.ai/confire/errors"
"go.rtnl.ai/confire/structs"
)

func TestNewIsPointer(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions usage/usage.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"
"text/tabwriter"

"github.com/rotationalio/confire/env"
"github.com/rotationalio/confire/parse"
"go.rtnl.ai/confire/env"
"go.rtnl.ai/confire/parse"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions usage/usage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"text/tabwriter"
"time"

"github.com/rotationalio/confire/assert"
"github.com/rotationalio/confire/usage"
"go.rtnl.ai/confire/assert"
"go.rtnl.ai/confire/usage"
)

func TestUsageDefault(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions validate/required.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package validate

import (
"github.com/rotationalio/confire/errors"
"github.com/rotationalio/confire/structs"
"go.rtnl.ai/confire/errors"
"go.rtnl.ai/confire/structs"
)

// Required returns a validation error if the specified field is zero valued.
Expand Down
4 changes: 2 additions & 2 deletions validate/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strconv"
"strings"

"github.com/rotationalio/confire/errors"
"github.com/rotationalio/confire/structs"
"go.rtnl.ai/confire/errors"
"go.rtnl.ai/confire/structs"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions validate/validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"testing"
"time"

"github.com/rotationalio/confire/assert"
confireErrors "github.com/rotationalio/confire/errors"
"github.com/rotationalio/confire/validate"
"go.rtnl.ai/confire/assert"
confireErrors "go.rtnl.ai/confire/errors"
"go.rtnl.ai/confire/validate"
)

func TestValidator(t *testing.T) {
Expand Down
Loading