14 Commits
v3.8.4 ... v4

Author SHA1 Message Date
kukasaurs
a3fa32db52 add parsing for time (#121)
Some checks failed
coverage / build (push) Failing after 1m26s
test / test (push) Successful in 3m28s
sync / sync (push) Has started running
2025-09-04 13:59:22 +03:00
8edfb0b5bf fixup workflows
All checks were successful
sync / sync (push) Successful in 22s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-05-04 16:54:15 +03:00
27226ee82c improve sync
Some checks failed
coverage / build (push) Failing after 6m9s
test / test (push) Successful in 13m28s
sync / sync (push) Has been cancelled
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-04-27 21:30:44 +03:00
cec4451e47 move to micro v4
All checks were successful
test / test (push) Successful in 2m41s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-03-07 12:41:35 +03:00
bd465fdb70 update go.mod
All checks were successful
test / test (push) Successful in 12m38s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-12-12 10:22:57 +03:00
13d12d8712 Merge pull request 'Update workflows' (#100) from atolstikhin/micro-config-env:v3 into v3
Some checks failed
test / test (push) Has been cancelled
Reviewed-on: #100
2024-12-12 10:21:46 +03:00
Aleksandr Tolstikhin
ee34faafee Update workflows
Some checks failed
automerge / automerge (pull_request) Has been skipped
dependabot-automerge / automerge (pull_request) Has been skipped
autoapprove / autoapprove (pull_request) Successful in 8s
lint / lint (pull_request) Successful in 42s
test / test (pull_request) Has been cancelled
2024-12-12 08:30:28 +07:00
d4707d7b1d update deps
Some checks failed
build / test (push) Failing after 1m36s
codeql / analyze (go) (push) Failing after 2m9s
build / lint (push) Successful in 9m46s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-03-06 17:26:17 +03:00
b7d4e2e11e fixup conditions
Some checks failed
build / test (push) Has been cancelled
build / lint (push) Has been cancelled
codeql / analyze (go) (push) Has been cancelled
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-01-15 01:58:06 +03:00
d2c852851e Merge pull request 'allow to override Struct on Load' (#96) from fix into v3
Reviewed-on: #96
2023-03-15 00:08:44 +03:00
087cc4e2ff Merge branch 'v3' into fix 2023-03-15 00:07:21 +03:00
39ae0fa6d3 allow to override Struct on Load
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-03-15 00:06:55 +03:00
ee51d15152 Merge pull request 'config: proper handle AllowFail option' (#94) from config-fix into v3
Reviewed-on: #94
2023-03-14 14:04:37 +03:00
8f36e9db79 config: proper handle AllowFail option
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-03-14 13:58:03 +03:00
22 changed files with 779 additions and 341 deletions

View File

@@ -1,6 +1,6 @@
---
name: Bug report
about: For reporting bugs in go-micro
about: For reporting bugs in micro
title: "[BUG]"
labels: ''
assignees: ''
@@ -16,9 +16,3 @@ assignees: ''
**How to reproduce the bug:**
If possible, please include a minimal code snippet here.
**Environment:**
Go Version: please paste `go version` output here
```
please paste `go env` output here
```

View File

@@ -1,6 +1,6 @@
---
name: Feature request / Enhancement
about: If you have a need not served by go-micro
about: If you have a need not served by micro
title: "[FEATURE]"
labels: ''
assignees: ''
@@ -14,4 +14,4 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
A clear and concise description of what you want to happen.
**Additional context**
Add any other context or screenshots about the feature request here.
Add any other context or screenshots about the feature request here.

View File

@@ -1,14 +1,8 @@
---
name: Question
about: Ask a question about go-micro
about: Ask a question about micro
title: ''
labels: ''
assignees: ''
---
Before asking, please check if your question has already been answered:
1. Check the documentation - https://micro.mu/docs/
2. Check the examples and plugins - https://github.com/micro/examples & https://github.com/micro/go-plugins
3. Search existing issues
---

28
.github/autoapprove.yml vendored Normal file
View File

@@ -0,0 +1,28 @@
name: "autoapprove"
on:
pull_request_target:
types: [assigned, opened, synchronize, reopened]
workflow_run:
workflows: ["prbuild"]
types:
- completed
permissions:
pull-requests: write
contents: write
jobs:
autoapprove:
runs-on: ubuntu-latest
steps:
- name: approve
run: [ "curl -o tea https://dl.gitea.com/tea/main/tea-main-linux-amd64",
"chmod +x ./tea",
"./tea login add --name unistack --token ${{ secrets.GITHUB_TOKEN }} --url https://git.unistack.org",
"./tea pr --repo ${{ github.event.repository.name }}"
]
if: github.actor == 'vtolstov'
id: approve
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -1,19 +0,0 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
# Maintain dependencies for Golang
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "daily"

View File

@@ -1,20 +0,0 @@
name: "autoapprove"
on:
pull_request_target:
types: [assigned, opened, synchronize, reopened]
permissions:
pull-requests: write
contents: write
jobs:
autoapprove:
runs-on: ubuntu-latest
steps:
- name: approve
uses: hmarr/auto-approve-action@v3
if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
id: approve
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -1,21 +0,0 @@
name: "automerge"
on:
pull_request_target:
types: [assigned, opened, synchronize, reopened]
permissions:
pull-requests: write
contents: write
jobs:
automerge:
runs-on: ubuntu-latest
if: github.actor == 'vtolstov'
steps:
- name: merge
id: merge
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.TOKEN}}

View File

@@ -1,47 +0,0 @@
name: build
on:
push:
branches:
- master
- v3
jobs:
test:
name: test
runs-on: ubuntu-latest
steps:
- name: setup
uses: actions/setup-go@v3
with:
go-version: 1.17
- name: checkout
uses: actions/checkout@v3
- name: cache
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: ${{ runner.os }}-go-
- name: deps
run: go get -v -t -d ./...
- name: test
env:
INTEGRATION_TESTS: yes
run: go test -mod readonly -v ./...
lint:
name: lint
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
- name: lint
uses: golangci/golangci-lint-action@v3.4.0
continue-on-error: true
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.30
# Optional: working directory, useful for monorepos
# working-directory: somedir
# Optional: golangci-lint command line arguments.
# args: --issues-exit-code=0
# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true

View File

@@ -1,78 +0,0 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "codeql"
on:
workflow_run:
workflows: ["prbuild"]
types:
- completed
push:
branches: [ master, v3 ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master, v3 ]
schedule:
- cron: '34 1 * * 0'
jobs:
analyze:
name: analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: [ 'go' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
steps:
- name: checkout
uses: actions/checkout@v3
- name: setup
uses: actions/setup-go@v3
with:
go-version: 1.17
# Initializes the CodeQL tools for scanning.
- name: init
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: autobuild
uses: github/codeql-action/autobuild@v2
# Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
#- run: |
# make bootstrap
# make release
- name: analyze
uses: github/codeql-action/analyze@v2

View File

@@ -1,27 +0,0 @@
name: "dependabot-automerge"
on:
pull_request_target:
types: [assigned, opened, synchronize, reopened]
permissions:
pull-requests: write
contents: write
jobs:
automerge:
runs-on: ubuntu-latest
if: github.actor == 'dependabot[bot]'
steps:
- name: metadata
id: metadata
uses: dependabot/fetch-metadata@v1.3.6
with:
github-token: "${{ secrets.TOKEN }}"
- name: merge
id: merge
if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.TOKEN}}

53
.github/workflows/job_coverage.yml vendored Normal file
View File

@@ -0,0 +1,53 @@
name: coverage
on:
push:
branches: [ main, v3, v4 ]
paths-ignore:
- '.github/**'
- '.gitea/**'
pull_request:
branches: [ main, v3, v4 ]
jobs:
build:
if: github.server_url != 'https://github.com'
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v4
with:
filter: 'blob:none'
- name: setup go
uses: actions/setup-go@v5
with:
cache-dependency-path: "**/*.sum"
go-version: 'stable'
- name: test coverage
run: |
go test -v -cover ./... -covermode=count -coverprofile coverage.out -coverpkg ./...
go tool cover -func coverage.out -o coverage.out
- name: coverage badge
uses: tj-actions/coverage-badge-go@v2
with:
green: 80
filename: coverage.out
- uses: stefanzweifel/git-auto-commit-action@v4
name: autocommit
with:
commit_message: Apply Code Coverage Badge
skip_fetch: false
skip_checkout: false
file_pattern: ./README.md
- name: push
if: steps.auto-commit-action.outputs.changes_detected == 'true'
uses: ad-m/github-push-action@master
with:
github_token: ${{ github.token }}
branch: ${{ github.ref }}

29
.github/workflows/job_lint.yml vendored Normal file
View File

@@ -0,0 +1,29 @@
name: lint
on:
pull_request:
types: [opened, reopened, synchronize]
branches: [ master, v3, v4 ]
paths-ignore:
- '.github/**'
- '.gitea/**'
jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v4
with:
filter: 'blob:none'
- name: setup go
uses: actions/setup-go@v5
with:
cache-dependency-path: "**/*.sum"
go-version: 'stable'
- name: setup deps
run: go get -v ./...
- name: run lint
uses: golangci/golangci-lint-action@v6
with:
version: 'latest'

52
.github/workflows/job_sync.yml vendored Normal file
View File

@@ -0,0 +1,52 @@
name: sync
on:
schedule:
- cron: '*/5 * * * *'
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
jobs:
sync:
if: github.server_url != 'https://github.com'
runs-on: ubuntu-latest
steps:
- name: init
run: |
git config --global user.email "vtolstov <vtolstov@users.noreply.github.com>"
git config --global user.name "github-actions[bot]"
echo "machine git.unistack.org login vtolstov password ${{ secrets.TOKEN_GITEA }}" >> /root/.netrc
echo "machine github.com login vtolstov password ${{ secrets.TOKEN_GITHUB }}" >> /root/.netrc
- name: sync master
run: |
git clone --filter=blob:none --filter=tree:0 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
cd repo
git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY}
git pull --rebase upstream master
git push upstream master --progress
git push origin master --progress
cd ../
rm -rf repo
- name: sync v3
run: |
git clone --filter=blob:none --filter=tree:0 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
cd repo
git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY}
git pull --rebase upstream v3
git push upstream v3 --progress
git push origin v3 --progress
cd ../
rm -rf repo
- name: sync v4
run: |
git clone --filter=blob:none --filter=tree:0 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
cd repo
git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY}
git pull --rebase upstream v4
git push upstream v4 --progress
git push origin v4 --progress
cd ../
rm -rf repo

31
.github/workflows/job_test.yml vendored Normal file
View File

@@ -0,0 +1,31 @@
name: test
on:
pull_request:
types: [opened, reopened, synchronize]
branches: [ master, v3, v4 ]
push:
branches: [ master, v3, v4 ]
paths-ignore:
- '.github/**'
- '.gitea/**'
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v4
with:
filter: 'blob:none'
- name: setup go
uses: actions/setup-go@v5
with:
cache-dependency-path: "**/*.sum"
go-version: 'stable'
- name: setup deps
run: go get -v ./...
- name: run test
env:
INTEGRATION_TESTS: yes
run: go test -mod readonly -v ./...

50
.github/workflows/job_tests.yml vendored Normal file
View File

@@ -0,0 +1,50 @@
name: test
on:
pull_request:
types: [opened, reopened, synchronize]
branches: [ master, v3, v4 ]
push:
branches: [ master, v3, v4 ]
paths-ignore:
- '.github/**'
- '.gitea/**'
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v4
with:
filter: 'blob:none'
- name: checkout tests
uses: actions/checkout@v4
with:
ref: master
filter: 'blob:none'
repository: unistack-org/micro-tests
path: micro-tests
- name: setup go
uses: actions/setup-go@v5
with:
cache-dependency-path: "**/*.sum"
go-version: 'stable'
- name: setup go work
env:
GOWORK: ${{ github.workspace }}/go.work
run: |
go work init
go work use .
go work use micro-tests
- name: setup deps
env:
GOWORK: ${{ github.workspace }}/go.work
run: go get -v ./...
- name: run tests
env:
INTEGRATION_TESTS: yes
GOWORK: ${{ github.workspace }}/go.work
run: |
cd micro-tests
go test -mod readonly -v ./... || true

View File

@@ -1,47 +0,0 @@
name: prbuild
on:
pull_request:
branches:
- master
- v3
jobs:
test:
name: test
runs-on: ubuntu-latest
steps:
- name: setup
uses: actions/setup-go@v3
with:
go-version: 1.17
- name: checkout
uses: actions/checkout@v3
- name: cache
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: ${{ runner.os }}-go-
- name: deps
run: go get -v -t -d ./...
- name: test
env:
INTEGRATION_TESTS: yes
run: go test -mod readonly -v ./...
lint:
name: lint
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
- name: lint
uses: golangci/golangci-lint-action@v3.4.0
continue-on-error: true
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.30
# Optional: working directory, useful for monorepos
# working-directory: somedir
# Optional: golangci-lint command line arguments.
# args: --issues-exit-code=0
# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true

5
.golangci.yml Normal file
View File

@@ -0,0 +1,5 @@
run:
concurrency: 8
timeout: 5m
issues-exit-code: 1
tests: true

177
env.go
View File

@@ -1,4 +1,4 @@
package env // import "go.unistack.org/micro-config-env/v3"
package env
import (
"context"
@@ -7,10 +7,11 @@ import (
"reflect"
"strconv"
"strings"
"time"
"github.com/imdario/mergo"
"go.unistack.org/micro/v3/config"
rutil "go.unistack.org/micro/v3/util/reflect"
"dario.cat/mergo"
"go.unistack.org/micro/v4/config"
rutil "go.unistack.org/micro/v4/util/reflect"
)
var DefaultStructTag = "env"
@@ -28,11 +29,11 @@ func (c *envConfig) Init(opts ...config.Option) error {
o(&c.opts)
}
if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil {
if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
if err := config.DefaultAfterInit(c.opts.Context, c); err != nil {
if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
@@ -40,12 +41,18 @@ func (c *envConfig) Init(opts ...config.Option) error {
}
func (c *envConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
if err := config.DefaultBeforeLoad(ctx, c); err != nil {
if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
return nil
}
if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
options := config.NewLoadOptions(opts...)
mopts := []func(*mergo.Config){mergo.WithTypeCheck}
tt := timeTransformer{override: options.Override}
mopts = append(mopts, mergo.WithTransformers(tt))
if options.Override {
mopts = append(mopts, mergo.WithOverride)
}
@@ -53,21 +60,23 @@ func (c *envConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
mopts = append(mopts, mergo.WithAppendSlice)
}
src, err := rutil.Zero(c.opts.Struct)
dst := c.opts.Struct
if options.Struct != nil {
dst = options.Struct
}
src, err := rutil.Zero(dst)
if err == nil {
if err = fillValues(ctx, reflect.ValueOf(src), c.opts.StructTag); err == nil {
err = mergo.Merge(c.opts.Struct, src, mopts...)
err = mergo.Merge(dst, src, mopts...)
}
}
if err != nil {
c.opts.Logger.Errorf(c.opts.Context, "env load err: %v", err)
if !c.opts.AllowFail {
return err
}
if err != nil && !c.opts.AllowFail {
return err
}
if err := config.DefaultAfterLoad(ctx, c); err != nil {
if err := config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
@@ -137,7 +146,7 @@ func fillValue(ctx context.Context, value reflect.Value, val string) error {
if err != nil {
return err
}
value.Set(reflect.ValueOf(v))
value.Set(reflect.ValueOf(int8(v)))
case reflect.Int16:
v, err := strconv.ParseInt(val, 10, 16)
if err != nil {
@@ -151,6 +160,14 @@ func fillValue(ctx context.Context, value reflect.Value, val string) error {
}
value.Set(reflect.ValueOf(int32(v)))
case reflect.Int64:
if value.Type() == reflect.TypeOf(time.Duration(0)) {
d, err := time.ParseDuration(val)
if err != nil {
return fmt.Errorf("cannot parse duration %q: %w", val, err)
}
value.SetInt(int64(d))
return nil
}
v, err := strconv.ParseInt(val, 10, 64)
if err != nil {
return err
@@ -211,7 +228,7 @@ func (c *envConfig) setValues(ctx context.Context, valueOf reflect.Value) error
if rutil.IsZero(value) {
continue
}
if len(field.PkgPath) != 0 {
if !field.IsExported() {
continue
}
switch value.Kind() {
@@ -242,6 +259,20 @@ func (c *envConfig) setValues(ctx context.Context, valueOf reflect.Value) error
return nil
}
func getEnvValue(field reflect.StructField, structTag string) (string, bool) {
tags, ok := field.Tag.Lookup(structTag)
if !ok {
return "", false
}
var val string
for _, tag := range strings.Split(tags, ",") {
if v, ok := os.LookupEnv(tag); ok {
val = v
}
}
return val, len(val) > 0
}
func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) error {
var values reflect.Value
@@ -259,21 +290,42 @@ func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) er
for idx := 0; idx < fields.NumField(); idx++ {
field := fields.Field(idx)
if !field.IsExported() {
continue
}
value := values.Field(idx)
if !value.CanSet() {
continue
}
if len(field.PkgPath) != 0 {
continue
}
switch value.Kind() {
case reflect.Struct:
if value.Type() == reflect.TypeOf(time.Time{}) {
if eval, ok := getEnvValue(field, structTag); ok {
parsed, err := time.Parse(time.RFC3339, eval)
if err != nil {
return fmt.Errorf("cannot parse time.Time %q: %w", eval, err)
}
value.Set(reflect.ValueOf(parsed))
}
continue
}
value.Set(reflect.Indirect(reflect.New(value.Type())))
if err := fillValues(ctx, value, structTag); err != nil {
return err
}
continue
case reflect.Ptr:
if value.Type().Elem() == reflect.TypeOf(time.Time{}) {
if eval, ok := getEnvValue(field, structTag); ok {
parsed, err := time.Parse(time.RFC3339, eval)
if err != nil {
return fmt.Errorf("cannot parse *time.Time %q: %w", eval, err)
}
value.Set(reflect.ValueOf(&parsed))
}
continue
}
if value.IsNil() {
if value.Type().Elem().Kind() != reflect.Struct {
// nil pointer to a non-struct: leave it alone
@@ -282,50 +334,42 @@ func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) er
// nil pointer to struct: create a zero instance
value.Set(reflect.New(value.Type().Elem()))
}
value = value.Elem()
if err := fillValues(ctx, value, structTag); err != nil {
if err := fillValues(ctx, value.Elem(), structTag); err != nil {
return err
}
continue
}
tags, ok := field.Tag.Lookup(structTag)
if !ok {
continue
}
var eval string
for _, tag := range strings.Split(tags, ",") {
if val, ok := os.LookupEnv(tag); !ok {
continue
} else {
eval = val
default:
if eval, ok := getEnvValue(field, structTag); ok {
if err := fillValue(ctx, value, eval); err != nil {
return err
}
}
}
if eval == "" {
continue
}
if err := fillValue(ctx, value, eval); err != nil {
return err
}
}
return nil
}
func (c *envConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
if err := config.DefaultBeforeSave(ctx, c); err != nil {
if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
return nil
}
options := config.NewSaveOptions(opts...)
if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
if err := c.setValues(ctx, reflect.ValueOf(c.opts.Struct)); err != nil {
c.opts.Logger.Errorf(c.opts.Context, "env save error: %v", err)
if !c.opts.AllowFail {
return err
}
dst := c.opts.Struct
if options.Struct != nil {
dst = options.Struct
}
if err := config.DefaultAfterSave(ctx, c); err != nil {
if err := c.setValues(ctx, reflect.ValueOf(dst)); err != nil && !c.opts.AllowFail {
return err
}
if err := config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
@@ -361,3 +405,38 @@ func NewConfig(opts ...config.Option) config.Config {
}
return &envConfig{opts: options}
}
type timeTransformer struct {
override bool
}
func (t timeTransformer) Transformer(typ reflect.Type) func(dst, src reflect.Value) error {
if typ == reflect.TypeOf(time.Time{}) {
return func(dst, src reflect.Value) error {
if !dst.CanSet() || src.IsZero() {
return nil
}
if !t.override && !dst.IsZero() {
return nil
}
dst.Set(src)
return nil
}
}
if typ == reflect.TypeOf((*time.Time)(nil)) {
return func(dst, src reflect.Value) error {
if !dst.CanSet() || src.IsNil() {
return nil
}
if src.Elem().IsZero() {
return nil
}
if !t.override && !dst.IsNil() && !dst.Elem().IsZero() {
return nil
}
dst.Set(src)
return nil
}
}
return nil
}

View File

@@ -6,8 +6,9 @@ import (
"testing"
"time"
"go.unistack.org/micro/v3/config"
rutil "go.unistack.org/micro/v3/util/reflect"
"github.com/stretchr/testify/require"
"go.unistack.org/micro/v4/config"
rutil "go.unistack.org/micro/v4/util/reflect"
)
type Config struct {
@@ -238,3 +239,336 @@ func TestLoadMultiple(t *testing.T) {
}
}
}
func TestEnv_SupportedTypes(t *testing.T) {
type Config struct {
IntValue int `env:"INT_VALUE"`
Int8Value int8 `env:"INT8_VALUE"`
Int16Value int16 `env:"INT16_VALUE"`
Int32Value int32 `env:"INT32_VALUE"`
Int64Value int64 `env:"INT64_VALUE"`
UintValue uint `env:"UINT_VALUE"`
Uint8Value uint8 `env:"UINT8_VALUE"`
Uint16Value uint16 `env:"UINT16_VALUE"`
Uint32Value uint32 `env:"UINT32_VALUE"`
Uint64Value uint64 `env:"UINT64_VALUE"`
Float32Value float32 `env:"FLOAT32_VALUE"`
Float64Value float64 `env:"FLOAT64_VALUE"`
BoolValue bool `env:"BOOL_VALUE"`
StringValue string `env:"STRING_VALUE"`
StringSlice []string `env:"STRING_SLICE"`
IntSlice []int `env:"INT_SLICE"`
MapStringValue map[string]string `env:"MAP_STRING"`
MapIntValue map[string]int `env:"MAP_INT"`
DurationValue time.Duration `env:"DURATION_VALUE"`
TimeValue time.Time `env:"TIME_VALUE"`
TimePtrValue *time.Time `env:"TIME_PTR_VALUE"`
}
tests := []struct {
name string
envVar string
envVal string
want func() *Config
}{
// integers
{
name: "int type",
envVar: "INT_VALUE",
envVal: "100",
want: func() *Config { return &Config{IntValue: 100} },
},
{
name: "int8 type",
envVar: "INT8_VALUE",
envVal: "127",
want: func() *Config { return &Config{Int8Value: 127} },
},
{
name: "int16 type",
envVar: "INT16_VALUE",
envVal: "32767",
want: func() *Config { return &Config{Int16Value: 32767} },
},
{
name: "int32 type",
envVar: "INT32_VALUE",
envVal: "2147483647",
want: func() *Config { return &Config{Int32Value: 2147483647} },
},
{
name: "int64 type",
envVar: "INT64_VALUE",
envVal: "9223372036854775807",
want: func() *Config { return &Config{Int64Value: 9223372036854775807} },
},
// unsigned integers
{
name: "uint type",
envVar: "UINT_VALUE",
envVal: "100",
want: func() *Config { return &Config{UintValue: 100} },
},
{
name: "uint8 type",
envVar: "UINT8_VALUE",
envVal: "255",
want: func() *Config { return &Config{Uint8Value: 255} },
},
{
name: "uint16 type",
envVar: "UINT16_VALUE",
envVal: "65535",
want: func() *Config { return &Config{Uint16Value: 65535} },
},
{
name: "uint32 type",
envVar: "UINT32_VALUE",
envVal: "4294967295",
want: func() *Config { return &Config{Uint32Value: 4294967295} },
},
{
name: "uint64 type",
envVar: "UINT64_VALUE",
envVal: "18446744073709551615",
want: func() *Config { return &Config{Uint64Value: 18446744073709551615} },
},
// floats
{
name: "float32 type",
envVar: "FLOAT32_VALUE",
envVal: "3.14159",
want: func() *Config { return &Config{Float32Value: 3.14159} },
},
{
name: "float64 type",
envVar: "FLOAT64_VALUE",
envVal: "3.141592653589793",
want: func() *Config { return &Config{Float64Value: 3.141592653589793} },
},
// bool
{
name: "bool true",
envVar: "BOOL_VALUE",
envVal: "true",
want: func() *Config { return &Config{BoolValue: true} },
},
{
name: "bool false",
envVar: "BOOL_VALUE",
envVal: "false",
want: func() *Config { return &Config{BoolValue: false} },
},
{
name: "bool 1",
envVar: "BOOL_VALUE",
envVal: "1",
want: func() *Config { return &Config{BoolValue: true} },
},
{
name: "bool 0",
envVar: "BOOL_VALUE",
envVal: "0",
want: func() *Config { return &Config{BoolValue: false} },
},
// string
{
name: "string type",
envVar: "STRING_VALUE",
envVal: "hello world",
want: func() *Config { return &Config{StringValue: "hello world"} },
},
// slices
{
name: "string slice comma separated",
envVar: "STRING_SLICE",
envVal: "val1,val2,val3",
want: func() *Config { return &Config{StringSlice: []string{"val1", "val2", "val3"}} },
},
{
name: "string slice semicolon separated",
envVar: "STRING_SLICE",
envVal: "val1;val2;val3",
want: func() *Config { return &Config{StringSlice: []string{"val1", "val2", "val3"}} },
},
{
name: "int slice comma separated",
envVar: "INT_SLICE",
envVal: "1,2,3,4,5",
want: func() *Config { return &Config{IntSlice: []int{1, 2, 3, 4, 5}} },
},
{
name: "int slice semicolon separated",
envVar: "INT_SLICE",
envVal: "1;2;3;4;5",
want: func() *Config { return &Config{IntSlice: []int{1, 2, 3, 4, 5}} },
},
// maps
{
name: "string map",
envVar: "MAP_STRING",
envVal: "key1=val1,key2=val2",
want: func() *Config {
return &Config{MapStringValue: map[string]string{"key1": "val1", "key2": "val2"}}
},
},
{
name: "int map",
envVar: "MAP_INT",
envVal: "key1=1,key2=2",
want: func() *Config {
return &Config{MapIntValue: map[string]int{"key1": 1, "key2": 2}}
},
},
// time && duration
{
name: "duration type",
envVar: "DURATION_VALUE",
envVal: "15m30s",
want: func() *Config { return &Config{DurationValue: 15*time.Minute + 30*time.Second} },
},
{
name: "time type RFC3339",
envVar: "TIME_VALUE",
envVal: "2025-08-28T15:04:05Z",
want: func() *Config {
return &Config{TimeValue: time.Date(2025, 8, 28, 15, 4, 5, 0, time.UTC)}
},
},
{
name: "time type RFC3339",
envVar: "TIME_PTR_VALUE",
envVal: "2025-08-28T15:04:05Z",
want: func() *Config {
timeValue := time.Date(2025, 8, 28, 15, 4, 5, 0, time.UTC)
return &Config{TimePtrValue: &timeValue}
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
require.NoError(t, os.Setenv(tt.envVar, tt.envVal))
defer os.Unsetenv(tt.envVar)
cfgData := &Config{}
cfg := NewConfig(config.Struct(cfgData))
require.NoError(t, cfg.Init())
require.NoError(t, cfg.Load(context.Background()))
require.Equal(t, tt.want(), cfgData)
})
}
}
func TestEnv_TimeType_Override(t *testing.T) {
type Config struct {
TimeValue time.Time `env:"TIME"`
}
tests := []struct {
name string
cfg *Config
envVar string
envVal string
want *Config
}{
{
name: "init value is empty",
cfg: &Config{},
envVar: "TIME",
envVal: "2025-08-28T15:04:05Z",
want: &Config{
TimeValue: time.Date(2025, 8, 28, 15, 4, 5, 0, time.UTC),
},
},
{
name: "init value is not empty",
cfg: &Config{
TimeValue: time.Date(2025, 5, 25, 15, 5, 5, 5, time.UTC),
},
envVar: "TIME",
envVal: "2025-08-28T15:04:05Z",
want: &Config{
TimeValue: time.Date(2025, 8, 28, 15, 4, 5, 0, time.UTC),
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
require.NoError(t, os.Setenv(tt.envVar, tt.envVal))
defer os.Unsetenv(tt.envVar)
cfg := NewConfig(config.Struct(tt.cfg))
require.NoError(t, cfg.Init())
require.NoError(t, cfg.Load(context.Background(), config.LoadOverride(true)))
require.Equal(t, tt.want, tt.cfg)
})
}
}
func TestEnv_TimePointerType_Override(t *testing.T) {
type Config struct {
TimeValue *time.Time `env:"TIME"`
}
tests := []struct {
name string
cfg func() *Config
envVar string
envVal string
want func() *Config
}{
{
name: "init value is empty",
cfg: func() *Config { return &Config{} },
envVar: "TIME",
envVal: "2025-08-28T15:04:05Z",
want: func() *Config {
timeValue := time.Date(2025, 8, 28, 15, 4, 5, 0, time.UTC)
return &Config{
TimeValue: &timeValue,
}
},
},
{
name: "init value is not empty",
cfg: func() *Config {
timeValue := time.Date(2025, 5, 25, 15, 5, 5, 5, time.UTC)
return &Config{
TimeValue: &timeValue,
}
},
envVar: "TIME",
envVal: "2025-08-28T15:04:05Z",
want: func() *Config {
timeValue := time.Date(2025, 8, 28, 15, 4, 5, 0, time.UTC)
return &Config{
TimeValue: &timeValue,
}
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
require.NoError(t, os.Setenv(tt.envVar, tt.envVal))
defer os.Unsetenv(tt.envVar)
cfgData := tt.cfg()
cfg := NewConfig(config.Struct(cfgData))
require.NoError(t, cfg.Init())
require.NoError(t, cfg.Load(context.Background(), config.LoadOverride(true)))
require.Equal(t, tt.want(), cfgData)
})
}
}

27
go.mod
View File

@@ -1,8 +1,27 @@
module go.unistack.org/micro-config-env/v3
module go.unistack.org/micro-config-env/v4
go 1.18
go 1.22.0
toolchain go1.24.1
require (
github.com/imdario/mergo v0.3.13
go.unistack.org/micro/v3 v3.10.15
dario.cat/mergo v1.0.1
go.unistack.org/micro/v4 v4.1.3
)
require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
)
require (
github.com/ash3in/uuidv8 v1.2.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/matoous/go-nanoid v1.5.1 // indirect
github.com/spf13/cast v1.7.1 // indirect
github.com/stretchr/testify v1.11.1
go.unistack.org/micro-proto/v4 v4.1.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

43
go.sum
View File

@@ -1,10 +1,39 @@
github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
go.unistack.org/micro/v3 v3.10.15 h1:vliCUhERMuDB08+XX5V6I+9YZl4jPUaBo3S+Jx1JLSo=
go.unistack.org/micro/v3 v3.10.15/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
github.com/ash3in/uuidv8 v1.2.0 h1:2oogGdtCPwaVtyvPPGin4TfZLtOGE5F+W++E880G6SI=
github.com/ash3in/uuidv8 v1.2.0/go.mod h1:BnU0wJBxnzdEKmVg4xckBkD+VZuecTFTUP3M0dWgyY4=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/matoous/go-nanoid v1.5.1 h1:aCjdvTyO9LLnTIi0fgdXhOPPvOHjpXN6Ik9DaNjIct4=
github.com/matoous/go-nanoid v1.5.1/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk=
go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
go.unistack.org/micro/v4 v4.1.3 h1:9QHiLHBTfPtfKyoY3HsLPNVSK0wlAAoMV+9saLz2iR4=
go.unistack.org/micro/v4 v4.1.3/go.mod h1:lr3oYED8Ay1vjK68QqRw30QOtdk/ffpZqMFDasOUhKw=
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

View File

@@ -3,9 +3,9 @@ package env
import (
"reflect"
"go.unistack.org/micro/v3/config"
"go.unistack.org/micro/v3/util/jitter"
rutil "go.unistack.org/micro/v3/util/reflect"
"go.unistack.org/micro/v4/config"
"go.unistack.org/micro/v4/util/jitter"
rutil "go.unistack.org/micro/v4/util/reflect"
)
type envWatcher struct {