mirror of
https://github.com/spf13/viper.git
synced 2026-09-20 03:18:21 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Andrew Stuart
|
a8d2f21f14 |
@@ -1,21 +0,0 @@
|
|||||||
root = true
|
|
||||||
|
|
||||||
[*]
|
|
||||||
charset = utf-8
|
|
||||||
end_of_line = lf
|
|
||||||
indent_size = 4
|
|
||||||
indent_style = space
|
|
||||||
insert_final_newline = true
|
|
||||||
trim_trailing_whitespace = true
|
|
||||||
|
|
||||||
[*.go]
|
|
||||||
indent_style = tab
|
|
||||||
|
|
||||||
[{Makefile,*.mk}]
|
|
||||||
indent_style = tab
|
|
||||||
|
|
||||||
[*.nix]
|
|
||||||
indent_size = 2
|
|
||||||
|
|
||||||
[.golangci.yaml]
|
|
||||||
indent_size = 2
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
|
|
||||||
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
|
|
||||||
fi
|
|
||||||
use flake . --impure
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
[{*.yml,*.yaml}]
|
|
||||||
indent_size = 2
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
name: 🐛 Bug report
|
|
||||||
description: Report a bug to help us improve Viper
|
|
||||||
labels: [kind/bug]
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
Thank you for submitting a bug report!
|
|
||||||
|
|
||||||
Please fill out the template below to make it easier to debug your problem.
|
|
||||||
|
|
||||||
If you are not sure if it is a bug or not, you can contact us via the available [support channels](https://github.com/spf13/viper/issues/new/choose).
|
|
||||||
- type: checkboxes
|
|
||||||
attributes:
|
|
||||||
label: Preflight Checklist
|
|
||||||
description: Please ensure you've completed all of the following.
|
|
||||||
options:
|
|
||||||
- label: I have searched the [issue tracker](https://www.github.com/spf13/viper/issues) for an issue that matches the one I want to file, without success.
|
|
||||||
required: true
|
|
||||||
- label: I am not looking for support or already pursued the available [support channels](https://github.com/spf13/viper/issues/new/choose) without success.
|
|
||||||
required: true
|
|
||||||
- label: I have checked the [troubleshooting guide](https://github.com/spf13/viper/blob/master/TROUBLESHOOTING.md) for my problem, without success.
|
|
||||||
required: true
|
|
||||||
- type: input
|
|
||||||
attributes:
|
|
||||||
label: Viper Version
|
|
||||||
description: What version of Viper are you using?
|
|
||||||
placeholder: 1.8.1
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: input
|
|
||||||
attributes:
|
|
||||||
label: Go Version
|
|
||||||
description: What version of Go are you using?
|
|
||||||
placeholder: "1.16"
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: dropdown
|
|
||||||
attributes:
|
|
||||||
label: Config Source
|
|
||||||
description: What sources do you load configuration from?
|
|
||||||
options:
|
|
||||||
- Manual set
|
|
||||||
- Flags
|
|
||||||
- Environment variables
|
|
||||||
- Files
|
|
||||||
- Remove K/V stores
|
|
||||||
- Defaults
|
|
||||||
multiple: true
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: dropdown
|
|
||||||
attributes:
|
|
||||||
label: Format
|
|
||||||
description: Which file formats do you use?
|
|
||||||
options:
|
|
||||||
- JSON
|
|
||||||
- YAML
|
|
||||||
- TOML
|
|
||||||
- Dotenv
|
|
||||||
- HCL
|
|
||||||
- Java properties
|
|
||||||
- INI
|
|
||||||
- Other (specify below)
|
|
||||||
multiple: true
|
|
||||||
- type: input
|
|
||||||
attributes:
|
|
||||||
label: Repl.it link
|
|
||||||
description: Complete example on Repl.it reproducing the issue. [Here](https://repl.it/@sagikazarmark/Viper-example) is an example you can use.
|
|
||||||
placeholder: https://repl.it/@sagikazarmark/Viper-example
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Code reproducing the issue
|
|
||||||
description: Please provide a Repl.it link if possible.
|
|
||||||
render: go
|
|
||||||
placeholder: |
|
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/spf13/viper"
|
|
||||||
)
|
|
||||||
|
|
||||||
func main() {
|
|
||||||
v := viper.New()
|
|
||||||
|
|
||||||
// ...
|
|
||||||
|
|
||||||
var config Config
|
|
||||||
|
|
||||||
err = v.Unmarshal(&config)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Expected Behavior
|
|
||||||
description: A clear and concise description of what you expected to happen.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Actual Behavior
|
|
||||||
description: A clear description of what actually happens.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Steps To Reproduce
|
|
||||||
description: Steps to reproduce the behavior if it is not self-explanatory.
|
|
||||||
placeholder: |
|
|
||||||
1. In this environment...
|
|
||||||
2. With this config...
|
|
||||||
3. Run '...'
|
|
||||||
4. See error...
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Additional Information
|
|
||||||
description: Links? References? Anything that will give us more context about the issue that you are encountering!
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
blank_issues_enabled: false
|
|
||||||
contact_links:
|
|
||||||
- name: ❓ Ask a question
|
|
||||||
url: https://github.com/spf13/viper/discussions/new?category=q-a
|
|
||||||
about: Ask and discuss questions with other Viper community members
|
|
||||||
|
|
||||||
- name: 📓 Reference
|
|
||||||
url: https://pkg.go.dev/mod/github.com/spf13/viper
|
|
||||||
about: Check the Go code reference
|
|
||||||
|
|
||||||
- name: 💬 Slack channel
|
|
||||||
url: https://gophers.slack.com/messages/viper
|
|
||||||
about: Please ask and answer questions here
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
name: 🎉 Feature request
|
|
||||||
description: Suggest an idea for Viper
|
|
||||||
labels: [kind/enhancement]
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
Thank you for submitting a feature request!
|
|
||||||
|
|
||||||
Please describe what you would like to change/add and why in detail by filling out the template below.
|
|
||||||
|
|
||||||
If you are not sure if your request fits into Viper, you can contact us via the available [support channels](https://github.com/spf13/viper/issues/new/choose).
|
|
||||||
- type: checkboxes
|
|
||||||
attributes:
|
|
||||||
label: Preflight Checklist
|
|
||||||
description: Please ensure you've completed all of the following.
|
|
||||||
options:
|
|
||||||
- label: I have searched the [issue tracker](https://www.github.com/spf13/viper/issues) for an issue that matches the one I want to file, without success.
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Problem Description
|
|
||||||
description: A clear and concise description of the problem you are seeking to solve with this feature request.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Proposed Solution
|
|
||||||
description: A clear and concise description of what would you like to happen.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Alternatives Considered
|
|
||||||
description: A clear and concise description of any alternative solutions or features you've considered.
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Additional Information
|
|
||||||
description: Add any other context about the problem here.
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
<!--
|
|
||||||
Thank you for sending a pull request! Here some tips for contributors:
|
|
||||||
|
|
||||||
1. Fill the description template below.
|
|
||||||
2. Include appropriate tests (if necessary). Make sure that all CI checks passed.
|
|
||||||
3. If the Pull Request is a work in progress, make use of GitHub's "Draft PR" feature and mark it as such.
|
|
||||||
-->
|
|
||||||
|
|
||||||
**Overview**:
|
|
||||||
<!-- Describe your changes briefly here. -->
|
|
||||||
|
|
||||||
**What problem does it solve?**:
|
|
||||||
<!--
|
|
||||||
- Please state in detail why we need this PR and what it solves.
|
|
||||||
- If your PR closes some of the existing issues, please add links to them here.
|
|
||||||
Mentioned issues will be automatically closed.
|
|
||||||
Usage: "Closes #<issue number>", or "Closes (paste link of issue)"
|
|
||||||
-->
|
|
||||||
|
|
||||||
**Special notes for a reviewer**:
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
version: 2
|
|
||||||
|
|
||||||
updates:
|
|
||||||
- package-ecosystem: gomod
|
|
||||||
directory: /
|
|
||||||
labels:
|
|
||||||
- area/dependencies
|
|
||||||
schedule:
|
|
||||||
interval: daily
|
|
||||||
|
|
||||||
- package-ecosystem: github-actions
|
|
||||||
directory: /
|
|
||||||
labels:
|
|
||||||
- area/dependencies
|
|
||||||
schedule:
|
|
||||||
interval: daily
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB |
@@ -1,5 +0,0 @@
|
|||||||
permit(
|
|
||||||
principal in Role::"Collaborator",
|
|
||||||
action,
|
|
||||||
resource
|
|
||||||
);
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
permit(
|
|
||||||
principal in Role::"Triager",
|
|
||||||
action in [Action::"close", Action::"add-label", Action::"remove-label", Action::"self-assign", Action::"self-unassign"],
|
|
||||||
resource
|
|
||||||
);
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"uid": { "type": "User", "id": "1226384" },
|
|
||||||
"attrs": { "login": "sagikazarmark" },
|
|
||||||
"parents": [{ "type": "Role", "id": "Collaborator" }]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"uid": { "type": "User", "id": "805695" },
|
|
||||||
"attrs": { "login": "spacez320" },
|
|
||||||
"parents": [{ "type": "Role", "id": "Triager" }]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
changelog:
|
|
||||||
exclude:
|
|
||||||
labels:
|
|
||||||
- release-note/ignore
|
|
||||||
categories:
|
|
||||||
- title: Exciting New Features 🎉
|
|
||||||
labels:
|
|
||||||
- kind/feature
|
|
||||||
- release-note/new-feature
|
|
||||||
- title: Enhancements 🚀
|
|
||||||
labels:
|
|
||||||
- kind/enhancement
|
|
||||||
- release-note/enhancement
|
|
||||||
- title: Bug Fixes 🐛
|
|
||||||
labels:
|
|
||||||
- kind/bug
|
|
||||||
- release-note/bug-fix
|
|
||||||
- title: Breaking Changes 🛠
|
|
||||||
labels:
|
|
||||||
- release-note/breaking-change
|
|
||||||
- title: Deprecations ❌
|
|
||||||
labels:
|
|
||||||
- release-note/deprecation
|
|
||||||
- title: Dependency Updates ⬆️
|
|
||||||
labels:
|
|
||||||
- area/dependencies
|
|
||||||
- release-note/dependency-update
|
|
||||||
- title: Other Changes
|
|
||||||
labels:
|
|
||||||
- "*"
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
name: PR Checks
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
types: [opened, labeled, unlabeled, synchronize]
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
pull-requests: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release-label:
|
|
||||||
name: Release note label
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Check minimum labels
|
|
||||||
uses: mheap/github-action-required-labels@388fd6af37b34cdfe5a23b37060e763217e58b03 # v5.5
|
|
||||||
with:
|
|
||||||
mode: minimum
|
|
||||||
count: 1
|
|
||||||
labels: |
|
|
||||||
release-note/ignore
|
|
||||||
kind/feature
|
|
||||||
release-note/new-feature
|
|
||||||
kind/enhancement
|
|
||||||
release-note/enhancement
|
|
||||||
kind/bug
|
|
||||||
release-note/bug-fix
|
|
||||||
release-note/breaking-change
|
|
||||||
release-note/deprecation
|
|
||||||
area/dependencies
|
|
||||||
release-note/dependency-update
|
|
||||||
release-note/misc
|
|
||||||
@@ -1,118 +0,0 @@
|
|||||||
name: CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [master]
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
name: Build
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- goos: js
|
|
||||||
goarch: wasm
|
|
||||||
- goos: aix
|
|
||||||
goarch: ppc64
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
|
||||||
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
|
|
||||||
with:
|
|
||||||
go-version: "1.25"
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: go build .
|
|
||||||
env:
|
|
||||||
GOOS: ${{ matrix.goos }}
|
|
||||||
GOARCH: ${{ matrix.goarch }}
|
|
||||||
|
|
||||||
test:
|
|
||||||
name: Test
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
|
|
||||||
strategy:
|
|
||||||
# Fail fast is disabled because there are Go version specific features and tests
|
|
||||||
# that should be able to fail independently.
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
|
||||||
go: ["1.23", "1.24", "1.25"]
|
|
||||||
tags: ["", "viper_finder", "viper_bind_struct"]
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
|
||||||
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
|
|
||||||
with:
|
|
||||||
go-version: ${{ matrix.go }}
|
|
||||||
|
|
||||||
- name: Test
|
|
||||||
run: go test -race -v -tags '${{ matrix.tags }}' -shuffle=on ./...
|
|
||||||
if: runner.os != 'Windows'
|
|
||||||
|
|
||||||
- name: Test (without race detector)
|
|
||||||
run: go test -v -tags '${{ matrix.tags }}' -shuffle=on ./...
|
|
||||||
if: runner.os == 'Windows'
|
|
||||||
|
|
||||||
lint:
|
|
||||||
name: Lint
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
|
||||||
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
|
|
||||||
with:
|
|
||||||
go-version: "1.25"
|
|
||||||
|
|
||||||
- name: Lint
|
|
||||||
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
|
|
||||||
with:
|
|
||||||
version: v2.4.0
|
|
||||||
|
|
||||||
dev:
|
|
||||||
name: Developer environment
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
|
||||||
|
|
||||||
- name: Set up Nix
|
|
||||||
uses: cachix/install-nix-action@3715ab1a11cac9e991980d7b4a28d80c7ebdd8f9 # v27
|
|
||||||
with:
|
|
||||||
extra_nix_config: |
|
|
||||||
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Check
|
|
||||||
run: nix flake check --impure
|
|
||||||
|
|
||||||
- name: Dev shell
|
|
||||||
run: nix develop --impure
|
|
||||||
|
|
||||||
dependency-review:
|
|
||||||
name: Dependency review
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: github.event_name == 'pull_request'
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
|
||||||
|
|
||||||
- name: Dependency Review
|
|
||||||
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
name: Octoslash
|
|
||||||
|
|
||||||
on: issue_comment
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
issues: write
|
|
||||||
pull-requests: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
run:
|
|
||||||
name: Run
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
|
||||||
|
|
||||||
- name: Octoslash
|
|
||||||
uses: sagikazarmark/octoslash-action@v0
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
name: "Close stale issues"
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: "0 3 * * *"
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
actions: write
|
|
||||||
issues: write
|
|
||||||
# contents: write # only for delete-branch option
|
|
||||||
# pull-requests: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
stale:
|
|
||||||
name: Stale
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/stale@v9
|
|
||||||
with:
|
|
||||||
days-before-stale: 30
|
|
||||||
days-before-close: 5
|
|
||||||
days-before-pr-stale: -1 # Ignore all PRs
|
|
||||||
stale-issue-message: "Issues with no activity for 30 days are marked stale and subject to being closed."
|
|
||||||
close-issue-message: "This issue has been closed for inactivity. Please re-open if this was a mistake."
|
|
||||||
exempt-issue-labels: "lifecycle/keep"
|
|
||||||
stale-issue-label: "lifecycle/stale"
|
|
||||||
operations-per-run: 500 # Must respect GitHub API limits
|
|
||||||
debug-only: false # Set this to 'true' to disable stale issue management
|
|
||||||
+24
-8
@@ -1,8 +1,24 @@
|
|||||||
/.devenv/
|
# Compiled Object files, Static and Dynamic libs (Shared Objects)
|
||||||
/.direnv/
|
*.o
|
||||||
/.idea/
|
*.a
|
||||||
/.pre-commit-config.yaml
|
*.so
|
||||||
/bin/
|
|
||||||
/build/
|
# Folders
|
||||||
/var/
|
_obj
|
||||||
/vendor/
|
_test
|
||||||
|
|
||||||
|
# Architecture specific extensions/prefixes
|
||||||
|
*.[568vq]
|
||||||
|
[568vq].out
|
||||||
|
|
||||||
|
*.cgo1.go
|
||||||
|
*.cgo2.c
|
||||||
|
_cgo_defun.c
|
||||||
|
_cgo_gotypes.go
|
||||||
|
_cgo_export.*
|
||||||
|
|
||||||
|
_testmain.go
|
||||||
|
|
||||||
|
*.exe
|
||||||
|
*.test
|
||||||
|
*.bench
|
||||||
-149
@@ -1,149 +0,0 @@
|
|||||||
version: "2"
|
|
||||||
|
|
||||||
run:
|
|
||||||
timeout: 5m
|
|
||||||
|
|
||||||
linters:
|
|
||||||
enable:
|
|
||||||
- bodyclose
|
|
||||||
- dogsled
|
|
||||||
- dupl
|
|
||||||
- durationcheck
|
|
||||||
- exhaustive
|
|
||||||
- gocritic
|
|
||||||
- godot
|
|
||||||
- gomoddirectives
|
|
||||||
- goprintffuncname
|
|
||||||
- govet
|
|
||||||
- importas
|
|
||||||
- ineffassign
|
|
||||||
- makezero
|
|
||||||
- misspell
|
|
||||||
- nakedret
|
|
||||||
- nilerr
|
|
||||||
- noctx
|
|
||||||
- nolintlint
|
|
||||||
- prealloc
|
|
||||||
- predeclared
|
|
||||||
- revive
|
|
||||||
- rowserrcheck
|
|
||||||
- sqlclosecheck
|
|
||||||
- staticcheck
|
|
||||||
- tparallel
|
|
||||||
- unconvert
|
|
||||||
- unparam
|
|
||||||
- unused
|
|
||||||
- wastedassign
|
|
||||||
- whitespace
|
|
||||||
|
|
||||||
# fixme
|
|
||||||
# - cyclop
|
|
||||||
# - errcheck
|
|
||||||
# - errorlint
|
|
||||||
# - exhaustivestruct
|
|
||||||
# - forbidigo
|
|
||||||
# - forcetypeassert
|
|
||||||
# - gochecknoglobals
|
|
||||||
# - gochecknoinits
|
|
||||||
# - gocognit
|
|
||||||
# - goconst
|
|
||||||
# - gocyclo
|
|
||||||
# - gosec
|
|
||||||
# - gosimple
|
|
||||||
# - ifshort
|
|
||||||
# - lll
|
|
||||||
# - nlreturn
|
|
||||||
# - paralleltest
|
|
||||||
# - scopelint
|
|
||||||
# - thelper
|
|
||||||
# - wrapcheck
|
|
||||||
|
|
||||||
# unused
|
|
||||||
# - depguard
|
|
||||||
# - goheader
|
|
||||||
# - gomodguard
|
|
||||||
|
|
||||||
# don't enable:
|
|
||||||
# - asciicheck
|
|
||||||
# - funlen
|
|
||||||
# - godox
|
|
||||||
# - goerr113
|
|
||||||
# - gomnd
|
|
||||||
# - interfacer
|
|
||||||
# - maligned
|
|
||||||
# - nestif
|
|
||||||
# - testpackage
|
|
||||||
# - wsl
|
|
||||||
|
|
||||||
exclusions:
|
|
||||||
rules:
|
|
||||||
- linters:
|
|
||||||
- errcheck
|
|
||||||
- noctx
|
|
||||||
path: _test.go
|
|
||||||
presets:
|
|
||||||
- std-error-handling
|
|
||||||
|
|
||||||
settings:
|
|
||||||
revive:
|
|
||||||
rules:
|
|
||||||
- name: blank-imports
|
|
||||||
- name: context-as-argument
|
|
||||||
arguments:
|
|
||||||
- allowTypesBefore: "*testing.T"
|
|
||||||
- name: context-keys-type
|
|
||||||
- name: dot-imports
|
|
||||||
- name: empty-block
|
|
||||||
- name: error-naming
|
|
||||||
- name: error-return
|
|
||||||
- name: error-strings
|
|
||||||
- name: errorf
|
|
||||||
- name: exported
|
|
||||||
arguments:
|
|
||||||
- "sayRepetitiveInsteadOfStutters" # make error messages clearer
|
|
||||||
- name: increment-decrement
|
|
||||||
- name: indent-error-flow
|
|
||||||
- name: package-comments
|
|
||||||
disabled: true # disable package comments rule for now
|
|
||||||
- name: range
|
|
||||||
- name: redefines-builtin-id
|
|
||||||
- name: superfluous-else
|
|
||||||
- name: time-naming
|
|
||||||
- name: unexported-return
|
|
||||||
- name: unreachable-code
|
|
||||||
- name: unused-parameter
|
|
||||||
- name: var-declaration
|
|
||||||
- name: var-naming
|
|
||||||
|
|
||||||
# TODO: add more revive rules
|
|
||||||
|
|
||||||
misspell:
|
|
||||||
locale: US
|
|
||||||
nolintlint:
|
|
||||||
allow-unused: false # report any unused nolint directives
|
|
||||||
require-specific: false # don't require nolint directives to be specific about which linter is being skipped
|
|
||||||
gocritic:
|
|
||||||
# Enable multiple checks by tags. See "Tags" section in https://github.com/go-critic/go-critic#usage.
|
|
||||||
enabled-tags:
|
|
||||||
- diagnostic
|
|
||||||
- experimental
|
|
||||||
- opinionated
|
|
||||||
- style
|
|
||||||
disabled-checks:
|
|
||||||
- importShadow
|
|
||||||
- unnamedResult
|
|
||||||
|
|
||||||
formatters:
|
|
||||||
enable:
|
|
||||||
- gci
|
|
||||||
- gofmt
|
|
||||||
- gofumpt
|
|
||||||
- goimports
|
|
||||||
# - golines
|
|
||||||
|
|
||||||
settings:
|
|
||||||
gci:
|
|
||||||
sections:
|
|
||||||
- standard
|
|
||||||
- default
|
|
||||||
- localmodule
|
|
||||||
+27
@@ -0,0 +1,27 @@
|
|||||||
|
go_import_path: github.com/spf13/viper
|
||||||
|
|
||||||
|
language: go
|
||||||
|
go:
|
||||||
|
- 1.10.x
|
||||||
|
- 1.11.x
|
||||||
|
- tip
|
||||||
|
|
||||||
|
os:
|
||||||
|
- linux
|
||||||
|
- osx
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
allow_failures:
|
||||||
|
- go: tip
|
||||||
|
fast_finish: true
|
||||||
|
|
||||||
|
script:
|
||||||
|
- go install ./...
|
||||||
|
- diff -u <(echo -n) <(gofmt -d .)
|
||||||
|
- go test -v ./...
|
||||||
|
|
||||||
|
after_success:
|
||||||
|
- go get -u -d github.com/spf13/hugo
|
||||||
|
- cd $GOPATH/src/github.com/spf13/hugo && make && ./hugo -s docs && cd -
|
||||||
|
|
||||||
|
sudo: false
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# TODO: FIXME
|
|
||||||
/.github/
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
ignore-from-file: [.gitignore, .yamlignore]
|
|
||||||
|
|
||||||
extends: default
|
|
||||||
|
|
||||||
rules:
|
|
||||||
line-length: disable
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
# A Self-Documenting Makefile: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
|
|
||||||
|
|
||||||
OS = $(shell uname | tr A-Z a-z)
|
|
||||||
export PATH := $(abspath bin/):${PATH}
|
|
||||||
|
|
||||||
# Build variables
|
|
||||||
BUILD_DIR ?= build
|
|
||||||
export CGO_ENABLED ?= 0
|
|
||||||
export GOOS = $(shell go env GOOS)
|
|
||||||
ifeq (${VERBOSE}, 1)
|
|
||||||
ifeq ($(filter -v,${GOARGS}),)
|
|
||||||
GOARGS += -v
|
|
||||||
endif
|
|
||||||
TEST_FORMAT = short-verbose
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Dependency versions
|
|
||||||
GOTESTSUM_VERSION = 1.9.0
|
|
||||||
GOLANGCI_VERSION = 1.53.3
|
|
||||||
|
|
||||||
# Add the ability to override some variables
|
|
||||||
# Use with care
|
|
||||||
-include override.mk
|
|
||||||
|
|
||||||
.PHONY: clear
|
|
||||||
clear: ## Clear the working area and the project
|
|
||||||
rm -rf bin/
|
|
||||||
|
|
||||||
.PHONY: check
|
|
||||||
check: test lint ## Run tests and linters
|
|
||||||
|
|
||||||
|
|
||||||
TEST_PKGS ?= ./...
|
|
||||||
.PHONY: test
|
|
||||||
test: TEST_FORMAT ?= short
|
|
||||||
test: SHELL = /bin/bash
|
|
||||||
test: export CGO_ENABLED=1
|
|
||||||
test: bin/gotestsum ## Run tests
|
|
||||||
@mkdir -p ${BUILD_DIR}
|
|
||||||
bin/gotestsum --no-summary=skipped --junitfile ${BUILD_DIR}/coverage.xml --format ${TEST_FORMAT} -- -race -coverprofile=${BUILD_DIR}/coverage.txt -covermode=atomic $(filter-out -v,${GOARGS}) $(if ${TEST_PKGS},${TEST_PKGS},./...)
|
|
||||||
|
|
||||||
.PHONY: lint
|
|
||||||
lint: lint-go lint-yaml
|
|
||||||
lint: ## Run linters
|
|
||||||
|
|
||||||
.PHONY: lint-go
|
|
||||||
lint-go:
|
|
||||||
golangci-lint run $(if ${CI},--out-format github-actions,)
|
|
||||||
|
|
||||||
.PHONY: lint-yaml
|
|
||||||
lint-yaml:
|
|
||||||
yamllint $(if ${CI},-f github,) --no-warnings .
|
|
||||||
|
|
||||||
.PHONY: fmt
|
|
||||||
fmt: ## Format code
|
|
||||||
golangci-lint run --fix
|
|
||||||
|
|
||||||
deps: bin/golangci-lint bin/gotestsum yamllint
|
|
||||||
deps: ## Install dependencies
|
|
||||||
|
|
||||||
bin/gotestsum:
|
|
||||||
@mkdir -p bin
|
|
||||||
curl -L https://github.com/gotestyourself/gotestsum/releases/download/v${GOTESTSUM_VERSION}/gotestsum_${GOTESTSUM_VERSION}_${OS}_amd64.tar.gz | tar -zOxf - gotestsum > ./bin/gotestsum && chmod +x ./bin/gotestsum
|
|
||||||
|
|
||||||
bin/golangci-lint:
|
|
||||||
@mkdir -p bin
|
|
||||||
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- v${GOLANGCI_VERSION}
|
|
||||||
|
|
||||||
.PHONY: yamllint
|
|
||||||
yamllint:
|
|
||||||
pip3 install --user yamllint
|
|
||||||
|
|
||||||
# Add custom targets here
|
|
||||||
-include custom.mk
|
|
||||||
|
|
||||||
.PHONY: list
|
|
||||||
list: ## List all make targets
|
|
||||||
@${MAKE} -pRrn : -f $(MAKEFILE_LIST) 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | egrep -v -e '^[^[:alnum:]]' -e '^$@$$' | sort
|
|
||||||
|
|
||||||
.PHONY: help
|
|
||||||
.DEFAULT_GOAL := help
|
|
||||||
help:
|
|
||||||
@grep -h -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
|
|
||||||
|
|
||||||
# Variable outputting/exporting rules
|
|
||||||
var-%: ; @echo $($*)
|
|
||||||
varexport-%: ; @echo $*=$($*)
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
# Troubleshooting
|
|
||||||
|
|
||||||
## Unmarshaling doesn't work
|
|
||||||
|
|
||||||
The most common reason for this issue is improper use of struct tags (eg. `yaml` or `json`). Viper uses [github.com/mitchellh/mapstructure](https://github.com/mitchellh/mapstructure) under the hood for unmarshaling values which uses `mapstructure` tags by default. Please refer to the library's documentation for using other struct tags.
|
|
||||||
|
|
||||||
## Cannot find package
|
|
||||||
|
|
||||||
Viper installation seems to fail a lot lately with the following (or a similar) error:
|
|
||||||
|
|
||||||
```
|
|
||||||
cannot find package "github.com/hashicorp/hcl/tree/hcl1" in any of:
|
|
||||||
/usr/local/Cellar/go/1.15.7_1/libexec/src/github.com/hashicorp/hcl/tree/hcl1 (from $GOROOT)
|
|
||||||
/Users/user/go/src/github.com/hashicorp/hcl/tree/hcl1 (from $GOPATH)
|
|
||||||
```
|
|
||||||
|
|
||||||
As the error message suggests, Go tries to look up dependencies in `GOPATH` mode (as it's commonly called) from the `GOPATH`.
|
|
||||||
Viper opted to use [Go Modules](https://go.dev/wiki/Modules) to manage its dependencies. While in many cases the two methods are interchangeable, once a dependency releases new (major) versions, `GOPATH` mode is no longer able to decide which version to use, so it'll either use one that's already present or pick a version (usually the `master` branch).
|
|
||||||
|
|
||||||
The solution is easy: switch to using Go Modules.
|
|
||||||
Please refer to the [wiki](https://go.dev/wiki/Modules) on how to do that.
|
|
||||||
|
|
||||||
**tl;dr* `export GO111MODULE=on`
|
|
||||||
|
|
||||||
## Unquoted 'y' and 'n' characters get replaced with _true_ and _false_ when reading a YAML file
|
|
||||||
|
|
||||||
This is a YAML 1.1 feature according to [go-yaml/yaml#740](https://github.com/go-yaml/yaml/issues/740).
|
|
||||||
|
|
||||||
Potential solutions are:
|
|
||||||
|
|
||||||
1. Quoting values resolved as boolean
|
|
||||||
1. Upgrading to YAML v3 (for the time being this is possible by passing the `viper_yaml3` tag to your build)
|
|
||||||
-147
@@ -1,147 +0,0 @@
|
|||||||
# Update Log
|
|
||||||
|
|
||||||
**This document details any major updates required to use new features or improvements in Viper.**
|
|
||||||
|
|
||||||
## v1.20.x
|
|
||||||
|
|
||||||
### New file searching API
|
|
||||||
|
|
||||||
Viper now includes a new file searching API that allows users to customize how Viper looks for config files.
|
|
||||||
|
|
||||||
Viper accepts a custom [`Finder`](https://pkg.go.dev/github.com/spf13/viper#Finder) interface implementation:
|
|
||||||
|
|
||||||
```go
|
|
||||||
// Finder looks for files and directories in an [afero.Fs] filesystem.
|
|
||||||
type Finder interface {
|
|
||||||
Find(fsys afero.Fs) ([]string, error)
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
It is supposed to return a list of paths to config files.
|
|
||||||
|
|
||||||
The default implementation uses [github.com/sagikazarmark/locafero](https://github.com/sagikazarmark/locafero) under the hood.
|
|
||||||
|
|
||||||
You can supply your own implementation using `WithFinder`:
|
|
||||||
|
|
||||||
```go
|
|
||||||
v := viper.NewWithOptions(
|
|
||||||
viper.WithFinder(&MyFinder{}),
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
For more information, check out the [Finder examples](https://pkg.go.dev/github.com/spf13/viper#Finder)
|
|
||||||
and the [documentation](https://pkg.go.dev/github.com/sagikazarmark/locafero) for the locafero package.
|
|
||||||
|
|
||||||
### New encoding API
|
|
||||||
|
|
||||||
Viper now allows customizing the encoding layer by providing an API for encoding and decoding configuration data:
|
|
||||||
|
|
||||||
```go
|
|
||||||
// Encoder encodes Viper's internal data structures into a byte representation.
|
|
||||||
// It's primarily used for encoding a map[string]any into a file format.
|
|
||||||
type Encoder interface {
|
|
||||||
Encode(v map[string]any) ([]byte, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Decoder decodes the contents of a byte slice into Viper's internal data structures.
|
|
||||||
// It's primarily used for decoding contents of a file into a map[string]any.
|
|
||||||
type Decoder interface {
|
|
||||||
Decode(b []byte, v map[string]any) error
|
|
||||||
}
|
|
||||||
|
|
||||||
// Codec combines [Encoder] and [Decoder] interfaces.
|
|
||||||
type Codec interface {
|
|
||||||
Encoder
|
|
||||||
Decoder
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
By default, Viper includes the following codecs:
|
|
||||||
|
|
||||||
- JSON
|
|
||||||
- TOML
|
|
||||||
- YAML
|
|
||||||
- Dotenv
|
|
||||||
|
|
||||||
The rest of the codecs are moved to [github.com/go-viper/encoding](https://github.com/go-viper/encoding)
|
|
||||||
|
|
||||||
Customizing the encoding layer is possible by providing a custom registry of codecs:
|
|
||||||
|
|
||||||
- [Encoder](https://pkg.go.dev/github.com/spf13/viper#Encoder) -> [EncoderRegistry](https://pkg.go.dev/github.com/spf13/viper#EncoderRegistry)
|
|
||||||
- [Decoder](https://pkg.go.dev/github.com/spf13/viper#Decoder) -> [DecoderRegistry](https://pkg.go.dev/github.com/spf13/viper#DecoderRegistry)
|
|
||||||
- [Codec](https://pkg.go.dev/github.com/spf13/viper#Codec) -> [CodecRegistry](https://pkg.go.dev/github.com/spf13/viper#CodecRegistry)
|
|
||||||
|
|
||||||
You can supply the registry of codecs to Viper using the appropriate `With*Registry` function:
|
|
||||||
|
|
||||||
```go
|
|
||||||
codecRegistry := viper.NewCodecRegistry()
|
|
||||||
|
|
||||||
codecRegistry.RegisterCodec("myformat", &MyCodec{})
|
|
||||||
|
|
||||||
v := viper.NewWithOptions(
|
|
||||||
viper.WithCodecRegistry(codecRegistry),
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
### BREAKING: "github.com/mitchellh/mapstructure" depedency replaced
|
|
||||||
|
|
||||||
The original [mapstructure](https://github.com/mitchellh/mapstructure) has been [archived](https://github.com/mitchellh/mapstructure/issues/349) and was replaced with a [fork](https://github.com/go-viper/mapstructure) maintained by Viper ([#1723](https://github.com/spf13/viper/pull/1723)).
|
|
||||||
|
|
||||||
As a result, the package import path needs to be changed in cases where `mapstructure` is directly referenced in your code.
|
|
||||||
|
|
||||||
For example, when providing a custom decoder config:
|
|
||||||
|
|
||||||
```go
|
|
||||||
err := viper.Unmarshal(&appConfig, func(config *mapstructure.DecoderConfig) {
|
|
||||||
config.TagName = "yaml"
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
The change is fairly straightforward, just replace all occurrences of the import path `github.com/mitchellh/mapstructure` with `github.com/go-viper/mapstructure/v2`:
|
|
||||||
|
|
||||||
```diff
|
|
||||||
- import "github.com/mitchellh/mapstructure"
|
|
||||||
+ import "github.com/go-viper/mapstructure/v2"
|
|
||||||
```
|
|
||||||
|
|
||||||
### BREAKING: HCL, Java properties, INI removed from core
|
|
||||||
|
|
||||||
In order to reduce third-party dependencies, Viper dropped support for the following formats from the core:
|
|
||||||
|
|
||||||
- HCL
|
|
||||||
- Java properties
|
|
||||||
- INI
|
|
||||||
|
|
||||||
You can still use these formats though by importing them from [github.com/go-viper/encoding](https://github.com/go-viper/encoding):
|
|
||||||
|
|
||||||
```go
|
|
||||||
import (
|
|
||||||
"github.com/go-viper/encoding/hcl"
|
|
||||||
"github.com/go-viper/encoding/javaproperties"
|
|
||||||
"github.com/go-viper/encoding/ini"
|
|
||||||
)
|
|
||||||
|
|
||||||
codecRegistry := viper.NewCodecRegistry()
|
|
||||||
|
|
||||||
{
|
|
||||||
codec := hcl.Codec{}
|
|
||||||
|
|
||||||
codecRegistry.RegisterCodec("hcl", codec)
|
|
||||||
codecRegistry.RegisterCodec("tfvars", codec)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
codec := &javaproperties.Codec{}
|
|
||||||
|
|
||||||
codecRegistry.RegisterCodec("properties", codec)
|
|
||||||
codecRegistry.RegisterCodec("props", codec)
|
|
||||||
codecRegistry.RegisterCodec("prop", codec)
|
|
||||||
}
|
|
||||||
|
|
||||||
codecRegistry.RegisterCodec("ini", ini.Codec{})
|
|
||||||
|
|
||||||
v := viper.NewWithOptions(
|
|
||||||
viper.WithCodecRegistry(codecRegistry),
|
|
||||||
)
|
|
||||||
```
|
|
||||||
-181
@@ -1,181 +0,0 @@
|
|||||||
package viper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
"github.com/spf13/viper/internal/encoding/dotenv"
|
|
||||||
"github.com/spf13/viper/internal/encoding/json"
|
|
||||||
"github.com/spf13/viper/internal/encoding/toml"
|
|
||||||
"github.com/spf13/viper/internal/encoding/yaml"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Encoder encodes Viper's internal data structures into a byte representation.
|
|
||||||
// It's primarily used for encoding a map[string]any into a file format.
|
|
||||||
type Encoder interface {
|
|
||||||
Encode(v map[string]any) ([]byte, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Decoder decodes the contents of a byte slice into Viper's internal data structures.
|
|
||||||
// It's primarily used for decoding contents of a file into a map[string]any.
|
|
||||||
type Decoder interface {
|
|
||||||
Decode(b []byte, v map[string]any) error
|
|
||||||
}
|
|
||||||
|
|
||||||
// Codec combines [Encoder] and [Decoder] interfaces.
|
|
||||||
type Codec interface {
|
|
||||||
Encoder
|
|
||||||
Decoder
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: consider adding specific errors for not found scenarios
|
|
||||||
|
|
||||||
// EncoderRegistry returns an [Encoder] for a given format.
|
|
||||||
//
|
|
||||||
// Format is case-insensitive.
|
|
||||||
//
|
|
||||||
// [EncoderRegistry] returns an error if no [Encoder] is registered for the format.
|
|
||||||
type EncoderRegistry interface {
|
|
||||||
Encoder(format string) (Encoder, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// DecoderRegistry returns an [Decoder] for a given format.
|
|
||||||
//
|
|
||||||
// Format is case-insensitive.
|
|
||||||
//
|
|
||||||
// [DecoderRegistry] returns an error if no [Decoder] is registered for the format.
|
|
||||||
type DecoderRegistry interface {
|
|
||||||
Decoder(format string) (Decoder, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// CodecRegistry combines [EncoderRegistry] and [DecoderRegistry] interfaces.
|
|
||||||
type CodecRegistry interface {
|
|
||||||
EncoderRegistry
|
|
||||||
DecoderRegistry
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithEncoderRegistry sets a custom [EncoderRegistry].
|
|
||||||
func WithEncoderRegistry(r EncoderRegistry) Option {
|
|
||||||
return optionFunc(func(v *Viper) {
|
|
||||||
if r == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
v.encoderRegistry = r
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithDecoderRegistry sets a custom [DecoderRegistry].
|
|
||||||
func WithDecoderRegistry(r DecoderRegistry) Option {
|
|
||||||
return optionFunc(func(v *Viper) {
|
|
||||||
if r == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
v.decoderRegistry = r
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithCodecRegistry sets a custom [EncoderRegistry] and [DecoderRegistry].
|
|
||||||
func WithCodecRegistry(r CodecRegistry) Option {
|
|
||||||
return optionFunc(func(v *Viper) {
|
|
||||||
if r == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
v.encoderRegistry = r
|
|
||||||
v.decoderRegistry = r
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// DefaultCodecRegistry is a simple implementation of [CodecRegistry] that allows registering custom [Codec]s.
|
|
||||||
type DefaultCodecRegistry struct {
|
|
||||||
codecs map[string]Codec
|
|
||||||
|
|
||||||
mu sync.RWMutex
|
|
||||||
once sync.Once
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewCodecRegistry returns a new [CodecRegistry], ready to accept custom [Codec]s.
|
|
||||||
func NewCodecRegistry() *DefaultCodecRegistry {
|
|
||||||
r := &DefaultCodecRegistry{}
|
|
||||||
|
|
||||||
r.init()
|
|
||||||
|
|
||||||
return r
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *DefaultCodecRegistry) init() {
|
|
||||||
r.once.Do(func() {
|
|
||||||
r.codecs = map[string]Codec{}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// RegisterCodec registers a custom [Codec].
|
|
||||||
//
|
|
||||||
// Format is case-insensitive.
|
|
||||||
func (r *DefaultCodecRegistry) RegisterCodec(format string, codec Codec) error {
|
|
||||||
r.init()
|
|
||||||
|
|
||||||
r.mu.Lock()
|
|
||||||
defer r.mu.Unlock()
|
|
||||||
|
|
||||||
r.codecs[strings.ToLower(format)] = codec
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Encoder implements the [EncoderRegistry] interface.
|
|
||||||
//
|
|
||||||
// Format is case-insensitive.
|
|
||||||
func (r *DefaultCodecRegistry) Encoder(format string) (Encoder, error) {
|
|
||||||
encoder, ok := r.codec(format)
|
|
||||||
if !ok {
|
|
||||||
return nil, errors.New("encoder not found for this format")
|
|
||||||
}
|
|
||||||
|
|
||||||
return encoder, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Decoder implements the [DecoderRegistry] interface.
|
|
||||||
//
|
|
||||||
// Format is case-insensitive.
|
|
||||||
func (r *DefaultCodecRegistry) Decoder(format string) (Decoder, error) {
|
|
||||||
decoder, ok := r.codec(format)
|
|
||||||
if !ok {
|
|
||||||
return nil, errors.New("decoder not found for this format")
|
|
||||||
}
|
|
||||||
|
|
||||||
return decoder, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *DefaultCodecRegistry) codec(format string) (Codec, bool) {
|
|
||||||
r.mu.Lock()
|
|
||||||
defer r.mu.Unlock()
|
|
||||||
|
|
||||||
format = strings.ToLower(format)
|
|
||||||
|
|
||||||
if r.codecs != nil {
|
|
||||||
codec, ok := r.codecs[format]
|
|
||||||
if ok {
|
|
||||||
return codec, true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
switch format {
|
|
||||||
case "yaml", "yml":
|
|
||||||
return yaml.Codec{}, true
|
|
||||||
|
|
||||||
case "json":
|
|
||||||
return json.Codec{}, true
|
|
||||||
|
|
||||||
case "toml":
|
|
||||||
return toml.Codec{}, true
|
|
||||||
|
|
||||||
case "dotenv", "env":
|
|
||||||
return &dotenv.Codec{}, true
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil, false
|
|
||||||
}
|
|
||||||
@@ -1,105 +0,0 @@
|
|||||||
package viper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
type codec struct{}
|
|
||||||
|
|
||||||
func (codec) Encode(_ map[string]any) ([]byte, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (codec) Decode(_ []byte, _ map[string]any) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestDefaultCodecRegistry(t *testing.T) {
|
|
||||||
t.Run("OK", func(t *testing.T) {
|
|
||||||
registry := NewCodecRegistry()
|
|
||||||
|
|
||||||
c := codec{}
|
|
||||||
|
|
||||||
err := registry.RegisterCodec("myformat", c)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
encoder, err := registry.Encoder("myformat")
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, c, encoder)
|
|
||||||
|
|
||||||
decoder, err := registry.Decoder("myformat")
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, c, decoder)
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("CodecNotFound", func(t *testing.T) {
|
|
||||||
registry := NewCodecRegistry()
|
|
||||||
|
|
||||||
_, err := registry.Encoder("myformat")
|
|
||||||
require.Error(t, err)
|
|
||||||
|
|
||||||
_, err = registry.Decoder("myformat")
|
|
||||||
require.Error(t, err)
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("FormatIsCaseInsensitive", func(t *testing.T) {
|
|
||||||
registry := NewCodecRegistry()
|
|
||||||
|
|
||||||
c := codec{}
|
|
||||||
|
|
||||||
err := registry.RegisterCodec("MYFORMAT", c)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
{
|
|
||||||
encoder, err := registry.Encoder("myformat")
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, c, encoder)
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
encoder, err := registry.Encoder("MYFORMAT")
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, c, encoder)
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
decoder, err := registry.Decoder("myformat")
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, c, decoder)
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
decoder, err := registry.Decoder("MYFORMAT")
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, c, decoder)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("OverrideDefault", func(t *testing.T) {
|
|
||||||
registry := NewCodecRegistry()
|
|
||||||
|
|
||||||
c := codec{}
|
|
||||||
|
|
||||||
err := registry.RegisterCodec("yaml", c)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
encoder, err := registry.Encoder("yaml")
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, c, encoder)
|
|
||||||
|
|
||||||
decoder, err := registry.Decoder("yaml")
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, c, decoder)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
package viper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
)
|
|
||||||
|
|
||||||
// FileLookupError is returned when Viper cannot resolve a configuration file.
|
|
||||||
//
|
|
||||||
// This is meant to be a common interface for all file look-up errors, occurring either because a
|
|
||||||
// file does not exist or because it cannot find any file matching finder criteria.
|
|
||||||
type FileLookupError interface {
|
|
||||||
error
|
|
||||||
|
|
||||||
fileLookup()
|
|
||||||
}
|
|
||||||
|
|
||||||
// ConfigFileNotFoundError denotes failing to find a configuration file from a search.
|
|
||||||
//
|
|
||||||
// Deprecated: This is error wraps [FileNotFoundFromSearchError], which should be used instead.
|
|
||||||
type ConfigFileNotFoundError struct {
|
|
||||||
locations []string
|
|
||||||
name string
|
|
||||||
}
|
|
||||||
|
|
||||||
// Error returns the formatted error.
|
|
||||||
func (e ConfigFileNotFoundError) Error() string {
|
|
||||||
return e.Unwrap().Error()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unwraps to FileNotFoundFromSearchError.
|
|
||||||
func (e ConfigFileNotFoundError) Unwrap() error {
|
|
||||||
return FileNotFoundFromSearchError(e)
|
|
||||||
}
|
|
||||||
|
|
||||||
// FileNotFoundFromSearchError denotes failing to find a configuration file from a search.
|
|
||||||
// Wraps ConfigFileNotFoundError.
|
|
||||||
type FileNotFoundFromSearchError struct {
|
|
||||||
locations []string
|
|
||||||
name string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e FileNotFoundFromSearchError) fileLookup() {}
|
|
||||||
|
|
||||||
// Error returns the formatted error.
|
|
||||||
func (e FileNotFoundFromSearchError) Error() string {
|
|
||||||
message := fmt.Sprintf("File %q not found", e.name)
|
|
||||||
|
|
||||||
if len(e.locations) > 0 {
|
|
||||||
message += fmt.Sprintf(" in %v", e.locations)
|
|
||||||
}
|
|
||||||
|
|
||||||
return message
|
|
||||||
}
|
|
||||||
|
|
||||||
// FileNotFoundError denotes failing to find a specific configuration file.
|
|
||||||
type FileNotFoundError struct {
|
|
||||||
err error
|
|
||||||
path string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e FileNotFoundError) fileLookup() {}
|
|
||||||
|
|
||||||
// Error returns the formatted error.
|
|
||||||
func (e FileNotFoundError) Error() string {
|
|
||||||
return fmt.Sprintf("file not found: %s", e.path)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ConfigFileAlreadyExistsError denotes failure to write new configuration file.
|
|
||||||
type ConfigFileAlreadyExistsError string
|
|
||||||
|
|
||||||
// Error returns the formatted error when configuration already exists.
|
|
||||||
func (e ConfigFileAlreadyExistsError) Error() string {
|
|
||||||
return fmt.Sprintf("Config File %q Already Exists", string(e))
|
|
||||||
}
|
|
||||||
|
|
||||||
// ConfigMarshalError happens when failing to marshal the configuration.
|
|
||||||
type ConfigMarshalError struct {
|
|
||||||
err error
|
|
||||||
}
|
|
||||||
|
|
||||||
// Error returns the formatted configuration error.
|
|
||||||
func (e ConfigMarshalError) Error() string {
|
|
||||||
return fmt.Sprintf("While marshaling config: %s", e.err.Error())
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnsupportedConfigError denotes encountering an unsupported
|
|
||||||
// configuration filetype.
|
|
||||||
type UnsupportedConfigError string
|
|
||||||
|
|
||||||
// Error returns the formatted configuration error.
|
|
||||||
func (str UnsupportedConfigError) Error() string {
|
|
||||||
return fmt.Sprintf("Unsupported Config Type %q", string(str))
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
package viper
|
|
||||||
|
|
||||||
// ExperimentalBindStruct tells Viper to use the new bind struct feature.
|
|
||||||
func ExperimentalBindStruct() Option {
|
|
||||||
return optionFunc(func(v *Viper) {
|
|
||||||
v.experimentalBindStruct = true
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
package viper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
|
|
||||||
"github.com/sagikazarmark/locafero"
|
|
||||||
"github.com/spf13/afero"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ExperimentalFinder tells Viper to use the new Finder interface for finding configuration files.
|
|
||||||
func ExperimentalFinder() Option {
|
|
||||||
return optionFunc(func(v *Viper) {
|
|
||||||
v.experimentalFinder = true
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Search for a config file.
|
|
||||||
func (v *Viper) findConfigFile() (string, error) {
|
|
||||||
finder := v.finder
|
|
||||||
|
|
||||||
if finder == nil && v.experimentalFinder {
|
|
||||||
var names []string
|
|
||||||
|
|
||||||
if v.configType != "" {
|
|
||||||
names = locafero.NameWithOptionalExtensions(v.configName, SupportedExts...)
|
|
||||||
} else {
|
|
||||||
names = locafero.NameWithExtensions(v.configName, SupportedExts...)
|
|
||||||
}
|
|
||||||
|
|
||||||
finder = locafero.Finder{
|
|
||||||
Paths: v.configPaths,
|
|
||||||
Names: names,
|
|
||||||
Type: locafero.FileTypeFile,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if finder != nil {
|
|
||||||
return v.findConfigFileWithFinder(finder)
|
|
||||||
}
|
|
||||||
|
|
||||||
return v.findConfigFileOld()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (v *Viper) findConfigFileWithFinder(finder Finder) (string, error) {
|
|
||||||
results, err := finder.Find(v.fs)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(results) == 0 {
|
|
||||||
return "", ConfigFileNotFoundError{name: v.configName, locations: v.configPaths}
|
|
||||||
}
|
|
||||||
|
|
||||||
// We call clean on the final result to ensure that the path is in its canonical form.
|
|
||||||
// This is mostly for consistent path handling and to make sure tests pass.
|
|
||||||
return results[0], nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Search all configPaths for any config file.
|
|
||||||
// Returns the first path that exists (and is a config file).
|
|
||||||
func (v *Viper) findConfigFileOld() (string, error) {
|
|
||||||
v.logger.Info("searching for config in paths", "paths", v.configPaths)
|
|
||||||
|
|
||||||
for _, cp := range v.configPaths {
|
|
||||||
file := v.searchInPath(cp)
|
|
||||||
if file != "" {
|
|
||||||
return file, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "", ConfigFileNotFoundError{name: v.configName, locations: v.configPaths}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (v *Viper) searchInPath(in string) (filename string) {
|
|
||||||
v.logger.Debug("searching for config in path", "path", in)
|
|
||||||
for _, ext := range SupportedExts {
|
|
||||||
v.logger.Debug("checking if file exists", "file", filepath.Join(in, v.configName+"."+ext))
|
|
||||||
if b, _ := exists(v.fs, filepath.Join(in, v.configName+"."+ext)); b {
|
|
||||||
v.logger.Debug("found file", "file", filepath.Join(in, v.configName+"."+ext))
|
|
||||||
return filepath.Join(in, v.configName+"."+ext)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if v.configType != "" {
|
|
||||||
if b, _ := exists(v.fs, filepath.Join(in, v.configName)); b {
|
|
||||||
return filepath.Join(in, v.configName)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// exists checks if file exists.
|
|
||||||
func exists(fs afero.Fs, path string) (bool, error) {
|
|
||||||
stat, err := fs.Stat(path)
|
|
||||||
if err == nil {
|
|
||||||
return !stat.IsDir(), nil
|
|
||||||
}
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
package viper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
|
|
||||||
"github.com/spf13/afero"
|
|
||||||
)
|
|
||||||
|
|
||||||
// WithFinder sets a custom [Finder].
|
|
||||||
func WithFinder(f Finder) Option {
|
|
||||||
return optionFunc(func(v *Viper) {
|
|
||||||
if f == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
v.finder = f
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finder looks for files and directories in an [afero.Fs] filesystem.
|
|
||||||
type Finder interface {
|
|
||||||
Find(fsys afero.Fs) ([]string, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finders combines multiple finders into one.
|
|
||||||
func Finders(finders ...Finder) Finder {
|
|
||||||
return &combinedFinder{finders: finders}
|
|
||||||
}
|
|
||||||
|
|
||||||
// combinedFinder is a Finder that combines multiple finders.
|
|
||||||
type combinedFinder struct {
|
|
||||||
finders []Finder
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find implements the [Finder] interface.
|
|
||||||
func (c *combinedFinder) Find(fsys afero.Fs) ([]string, error) {
|
|
||||||
var results []string
|
|
||||||
var errs []error
|
|
||||||
|
|
||||||
for _, finder := range c.finders {
|
|
||||||
if finder == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
r, err := finder.Find(fsys)
|
|
||||||
if err != nil {
|
|
||||||
errs = append(errs, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
results = append(results, r...)
|
|
||||||
}
|
|
||||||
|
|
||||||
return results, errors.Join(errs...)
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
package viper_test
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/sagikazarmark/locafero"
|
|
||||||
"github.com/spf13/afero"
|
|
||||||
|
|
||||||
"github.com/spf13/viper"
|
|
||||||
)
|
|
||||||
|
|
||||||
func ExampleFinder() {
|
|
||||||
fs := afero.NewMemMapFs()
|
|
||||||
|
|
||||||
fs.Mkdir("/home/user", 0o777)
|
|
||||||
|
|
||||||
f, _ := fs.Create("/home/user/myapp.yaml")
|
|
||||||
f.WriteString("foo: bar")
|
|
||||||
f.Close()
|
|
||||||
|
|
||||||
// HCL will have a "lower" priority in the search order
|
|
||||||
fs.Create("/home/user/myapp.hcl")
|
|
||||||
|
|
||||||
finder := locafero.Finder{
|
|
||||||
Paths: []string{"/home/user"},
|
|
||||||
Names: locafero.NameWithExtensions("myapp", viper.SupportedExts...),
|
|
||||||
Type: locafero.FileTypeFile, // This is important!
|
|
||||||
}
|
|
||||||
|
|
||||||
v := viper.NewWithOptions(viper.WithFinder(finder))
|
|
||||||
v.SetFs(fs)
|
|
||||||
v.ReadInConfig()
|
|
||||||
|
|
||||||
fmt.Println(v.GetString("foo"))
|
|
||||||
|
|
||||||
// Output:
|
|
||||||
// bar
|
|
||||||
}
|
|
||||||
|
|
||||||
func ExampleFinders() {
|
|
||||||
fs := afero.NewMemMapFs()
|
|
||||||
|
|
||||||
fs.Mkdir("/home/user", 0o777)
|
|
||||||
f, _ := fs.Create("/home/user/myapp.yaml")
|
|
||||||
f.WriteString("foo: bar")
|
|
||||||
f.Close()
|
|
||||||
|
|
||||||
fs.Mkdir("/etc/myapp", 0o777)
|
|
||||||
fs.Create("/etc/myapp/config.yaml")
|
|
||||||
|
|
||||||
// Combine multiple finders to search for files in multiple locations with different criteria
|
|
||||||
finder := viper.Finders(
|
|
||||||
locafero.Finder{
|
|
||||||
Paths: []string{"/home/user"},
|
|
||||||
Names: locafero.NameWithExtensions("myapp", viper.SupportedExts...),
|
|
||||||
Type: locafero.FileTypeFile, // This is important!
|
|
||||||
},
|
|
||||||
locafero.Finder{
|
|
||||||
Paths: []string{"/etc/myapp"},
|
|
||||||
Names: []string{"config.yaml"}, // Only accept YAML files in the system config directory
|
|
||||||
Type: locafero.FileTypeFile, // This is important!
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
v := viper.NewWithOptions(viper.WithFinder(finder))
|
|
||||||
v.SetFs(fs)
|
|
||||||
v.ReadInConfig()
|
|
||||||
|
|
||||||
fmt.Println(v.GetString("foo"))
|
|
||||||
|
|
||||||
// Output:
|
|
||||||
// bar
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
package viper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/spf13/afero"
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
type finderStub struct {
|
|
||||||
results []string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f finderStub) Find(_ afero.Fs) ([]string, error) {
|
|
||||||
return f.results, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFinders(t *testing.T) {
|
|
||||||
finder := Finders(
|
|
||||||
finderStub{
|
|
||||||
results: []string{
|
|
||||||
"/home/user/.viper.yaml",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
finderStub{
|
|
||||||
results: []string{
|
|
||||||
"/etc/viper/config.yaml",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
results, err := finder.Find(afero.NewMemMapFs())
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
expected := []string{
|
|
||||||
"/home/user/.viper.yaml",
|
|
||||||
"/etc/viper/config.yaml",
|
|
||||||
}
|
|
||||||
|
|
||||||
assert.Equal(t, expected, results)
|
|
||||||
}
|
|
||||||
@@ -30,13 +30,13 @@ func (p pflagValueSet) VisitAll(fn func(flag FlagValue)) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// pflagValue is a wrapper around *pflag.flag
|
// pflagValue is a wrapper aroung *pflag.flag
|
||||||
// that implements FlagValue.
|
// that implements FlagValue
|
||||||
type pflagValue struct {
|
type pflagValue struct {
|
||||||
flag *pflag.Flag
|
flag *pflag.Flag
|
||||||
}
|
}
|
||||||
|
|
||||||
// HasChanged returns whether the flag has changes or not.
|
// HasChanges returns whether the flag has changes or not.
|
||||||
func (p pflagValue) HasChanged() bool {
|
func (p pflagValue) HasChanged() bool {
|
||||||
return p.flag.Changed
|
return p.flag.Changed
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-8
@@ -5,20 +5,18 @@ import (
|
|||||||
|
|
||||||
"github.com/spf13/pflag"
|
"github.com/spf13/pflag"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestBindFlagValueSet(t *testing.T) {
|
func TestBindFlagValueSet(t *testing.T) {
|
||||||
Reset()
|
|
||||||
flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
|
flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
|
||||||
|
|
||||||
testValues := map[string]*string{
|
var testValues = map[string]*string{
|
||||||
"host": nil,
|
"host": nil,
|
||||||
"port": nil,
|
"port": nil,
|
||||||
"endpoint": nil,
|
"endpoint": nil,
|
||||||
}
|
}
|
||||||
|
|
||||||
mutatedTestValues := map[string]string{
|
var mutatedTestValues = map[string]string{
|
||||||
"host": "localhost",
|
"host": "localhost",
|
||||||
"port": "6060",
|
"port": "6060",
|
||||||
"endpoint": "/public",
|
"endpoint": "/public",
|
||||||
@@ -31,7 +29,9 @@ func TestBindFlagValueSet(t *testing.T) {
|
|||||||
flagValueSet := pflagValueSet{flagSet}
|
flagValueSet := pflagValueSet{flagSet}
|
||||||
|
|
||||||
err := BindFlagValues(flagValueSet)
|
err := BindFlagValues(flagValueSet)
|
||||||
require.NoError(t, err, "error binding flag set")
|
if err != nil {
|
||||||
|
t.Fatalf("error binding flag set, %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
flagSet.VisitAll(func(flag *pflag.Flag) {
|
flagSet.VisitAll(func(flag *pflag.Flag) {
|
||||||
flag.Value.Set(mutatedTestValues[flag.Name])
|
flag.Value.Set(mutatedTestValues[flag.Name])
|
||||||
@@ -39,13 +39,13 @@ func TestBindFlagValueSet(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
for name, expected := range mutatedTestValues {
|
for name, expected := range mutatedTestValues {
|
||||||
assert.Equal(t, expected, Get(name))
|
assert.Equal(t, Get(name), expected)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestBindFlagValue(t *testing.T) {
|
func TestBindFlagValue(t *testing.T) {
|
||||||
testString := "testing"
|
var testString = "testing"
|
||||||
testValue := newStringValue(testString, &testString)
|
var testValue = newStringValue(testString, &testString)
|
||||||
|
|
||||||
flag := &pflag.Flag{
|
flag := &pflag.Flag{
|
||||||
Name: "testflag",
|
Name: "testflag",
|
||||||
|
|||||||
Generated
-255
@@ -1,255 +0,0 @@
|
|||||||
{
|
|
||||||
"nodes": {
|
|
||||||
"cachix": {
|
|
||||||
"inputs": {
|
|
||||||
"devenv": [
|
|
||||||
"devenv"
|
|
||||||
],
|
|
||||||
"flake-compat": [
|
|
||||||
"devenv"
|
|
||||||
],
|
|
||||||
"git-hooks": [
|
|
||||||
"devenv",
|
|
||||||
"git-hooks"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"devenv",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1748883665,
|
|
||||||
"narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "cachix",
|
|
||||||
"rev": "f707778d902af4d62d8dd92c269f8e70de09acbe",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"ref": "latest",
|
|
||||||
"repo": "cachix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"devenv": {
|
|
||||||
"inputs": {
|
|
||||||
"cachix": "cachix",
|
|
||||||
"flake-compat": "flake-compat",
|
|
||||||
"git-hooks": "git-hooks",
|
|
||||||
"nix": "nix",
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1755257397,
|
|
||||||
"narHash": "sha256-VU+OHexL2y6y7yrpEc6bZvYYwoQg6aZK1b4YxT0yZCk=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "devenv",
|
|
||||||
"rev": "6f9c3d4722aa253631644329f7bda60b1d3d1b97",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "devenv",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1747046372,
|
|
||||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-parts": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": [
|
|
||||||
"devenv",
|
|
||||||
"nix",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1733312601,
|
|
||||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-parts_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1754487366,
|
|
||||||
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"git-hooks": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": [
|
|
||||||
"devenv",
|
|
||||||
"flake-compat"
|
|
||||||
],
|
|
||||||
"gitignore": "gitignore",
|
|
||||||
"nixpkgs": [
|
|
||||||
"devenv",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1750779888,
|
|
||||||
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "git-hooks.nix",
|
|
||||||
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "git-hooks.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"gitignore": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"devenv",
|
|
||||||
"git-hooks",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1709087332,
|
|
||||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "gitignore.nix",
|
|
||||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "gitignore.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": [
|
|
||||||
"devenv",
|
|
||||||
"flake-compat"
|
|
||||||
],
|
|
||||||
"flake-parts": "flake-parts",
|
|
||||||
"git-hooks-nix": [
|
|
||||||
"devenv",
|
|
||||||
"git-hooks"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"devenv",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"nixpkgs-23-11": [
|
|
||||||
"devenv"
|
|
||||||
],
|
|
||||||
"nixpkgs-regression": [
|
|
||||||
"devenv"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1755029779,
|
|
||||||
"narHash": "sha256-3+GHIYGg4U9XKUN4rg473frIVNn8YD06bjwxKS1IPrU=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "nix",
|
|
||||||
"rev": "b0972b0eee6726081d10b1199f54de6d2917f861",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"ref": "devenv-2.30",
|
|
||||||
"repo": "nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1750441195,
|
|
||||||
"narHash": "sha256-yke+pm+MdgRb6c0dPt8MgDhv7fcBbdjmv1ZceNTyzKg=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "devenv-nixpkgs",
|
|
||||||
"rev": "0ceffe312871b443929ff3006960d29b120dc627",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"ref": "rolling",
|
|
||||||
"repo": "devenv-nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-lib": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1753579242,
|
|
||||||
"narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nixpkgs.lib",
|
|
||||||
"rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nixpkgs.lib",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1755268003,
|
|
||||||
"narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "32f313e49e42f715491e1ea7b306a87c16fe0388",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
|
||||||
"inputs": {
|
|
||||||
"devenv": "devenv",
|
|
||||||
"flake-parts": "flake-parts_2",
|
|
||||||
"nixpkgs": "nixpkgs_2"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "root",
|
|
||||||
"version": 7
|
|
||||||
}
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
{
|
|
||||||
description = "Viper";
|
|
||||||
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
|
||||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
|
||||||
devenv.url = "github:cachix/devenv";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs =
|
|
||||||
inputs@{ flake-parts, ... }:
|
|
||||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
|
||||||
imports = [
|
|
||||||
inputs.devenv.flakeModule
|
|
||||||
];
|
|
||||||
|
|
||||||
systems = [
|
|
||||||
"x86_64-linux"
|
|
||||||
"x86_64-darwin"
|
|
||||||
"aarch64-darwin"
|
|
||||||
];
|
|
||||||
|
|
||||||
perSystem =
|
|
||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
devenv.shells = {
|
|
||||||
default = {
|
|
||||||
languages = {
|
|
||||||
go.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
git-hooks.hooks = {
|
|
||||||
nixpkgs-fmt.enable = true;
|
|
||||||
yamllint.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
packages = with pkgs; [
|
|
||||||
gnumake
|
|
||||||
|
|
||||||
golangci-lint
|
|
||||||
yamllint
|
|
||||||
];
|
|
||||||
|
|
||||||
scripts = {
|
|
||||||
versions.exec = ''
|
|
||||||
go version
|
|
||||||
golangci-lint version
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
enterShell = ''
|
|
||||||
versions
|
|
||||||
'';
|
|
||||||
|
|
||||||
# https://github.com/cachix/devenv/issues/528#issuecomment-1556108767
|
|
||||||
containers = pkgs.lib.mkForce { };
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,26 +1,16 @@
|
|||||||
module github.com/spf13/viper
|
module github.com/spf13/viper
|
||||||
|
|
||||||
go 1.23.0
|
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/fsnotify/fsnotify v1.9.0
|
github.com/fsnotify/fsnotify v1.4.7
|
||||||
github.com/go-viper/mapstructure/v2 v2.4.0
|
github.com/hashicorp/hcl v1.0.0
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4
|
github.com/magiconair/properties v1.8.0
|
||||||
github.com/sagikazarmark/locafero v0.12.0
|
github.com/mitchellh/mapstructure v1.0.0
|
||||||
github.com/spf13/afero v1.15.0
|
github.com/pelletier/go-toml v1.2.0
|
||||||
github.com/spf13/cast v1.10.0
|
github.com/spf13/afero v1.1.2
|
||||||
github.com/spf13/pflag v1.0.10
|
github.com/spf13/cast v1.2.0
|
||||||
github.com/stretchr/testify v1.11.1
|
github.com/spf13/jwalterweatherman v1.0.0
|
||||||
github.com/subosito/gotenv v1.6.0
|
github.com/spf13/pflag v1.0.2
|
||||||
go.yaml.in/yaml/v3 v3.0.4
|
golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992 // indirect
|
||||||
)
|
golang.org/x/text v0.3.0 // indirect
|
||||||
|
gopkg.in/yaml.v2 v2.2.1
|
||||||
require (
|
|
||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
|
||||||
github.com/google/go-cmp v0.6.0 // indirect
|
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
|
||||||
golang.org/x/sys v0.29.0 // indirect
|
|
||||||
golang.org/x/text v0.28.0 // indirect
|
|
||||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
|
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,43 +1,26 @@
|
|||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
|
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
|
||||||
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
|
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||||
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
|
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
|
||||||
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
|
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
|
||||||
github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
|
github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
|
||||||
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
github.com/mitchellh/mapstructure v1.0.0 h1:vVpGvMXJPqSDh2VYHF7gsfQj8Ncx+Xw5Y1KHeTRY+7I=
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
||||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
|
||||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
|
||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
|
github.com/spf13/cast v1.2.0 h1:HHl1DSRbEQN2i8tJmtS6ViPyHx35+p51amrdsiTCrkg=
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
|
github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
|
||||||
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
github.com/spf13/pflag v1.0.2 h1:Fy0orTDgHdbnzHcsOgfCN4LtHf0ec3wwtiwJqwvf3Gc=
|
||||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||||
github.com/sagikazarmark/locafero v0.12.0 h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88eegjfxfHb4=
|
golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992 h1:BH3eQWeGbwRU2+wxxuuPOdFBmaiBH81O8BugSjHeTFg=
|
||||||
github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI=
|
golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
|
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
|
||||||
github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
|
|
||||||
github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
|
|
||||||
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
|
|
||||||
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
|
||||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
|
||||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
|
||||||
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
|
|
||||||
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
|
|
||||||
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
|
|
||||||
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
|
||||||
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
|
|
||||||
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
|
|
||||||
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
|
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
|
||||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
|
||||||
|
|||||||
@@ -1,63 +0,0 @@
|
|||||||
package dotenv
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"fmt"
|
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/subosito/gotenv"
|
|
||||||
)
|
|
||||||
|
|
||||||
const keyDelimiter = "_"
|
|
||||||
|
|
||||||
// Codec implements the encoding.Encoder and encoding.Decoder interfaces for encoding data containing environment variables
|
|
||||||
// (commonly called as dotenv format).
|
|
||||||
type Codec struct{}
|
|
||||||
|
|
||||||
// Encode encodes a map[string]any into a dotenv byte slice.
|
|
||||||
func (Codec) Encode(v map[string]any) ([]byte, error) {
|
|
||||||
flattened := map[string]any{}
|
|
||||||
|
|
||||||
flattened = flattenAndMergeMap(flattened, v, "", keyDelimiter)
|
|
||||||
|
|
||||||
keys := make([]string, 0, len(flattened))
|
|
||||||
|
|
||||||
for key := range flattened {
|
|
||||||
keys = append(keys, key)
|
|
||||||
}
|
|
||||||
|
|
||||||
sort.Strings(keys)
|
|
||||||
|
|
||||||
var buf bytes.Buffer
|
|
||||||
|
|
||||||
for _, key := range keys {
|
|
||||||
_, err := buf.WriteString(fmt.Sprintf("%v=%v\n", strings.ToUpper(key), flattened[key]))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return buf.Bytes(), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Decode decodes a dotenv byte slice into a map[string]any.
|
|
||||||
func (Codec) Decode(b []byte, v map[string]any) error {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
|
|
||||||
_, err := buf.Write(b)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
env, err := gotenv.StrictParse(&buf)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
for key, value := range env {
|
|
||||||
v[key] = value
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
package dotenv
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
// original form of the data.
|
|
||||||
const original = `# key-value pair
|
|
||||||
KEY=value
|
|
||||||
`
|
|
||||||
|
|
||||||
// encoded form of the data.
|
|
||||||
const encoded = `KEY=value
|
|
||||||
`
|
|
||||||
|
|
||||||
// data is Viper's internal representation.
|
|
||||||
var data = map[string]any{
|
|
||||||
"KEY": "value",
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCodec_Encode(t *testing.T) {
|
|
||||||
codec := Codec{}
|
|
||||||
|
|
||||||
b, err := codec.Encode(data)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, encoded, string(b))
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCodec_Decode(t *testing.T) {
|
|
||||||
t.Run("OK", func(t *testing.T) {
|
|
||||||
codec := Codec{}
|
|
||||||
|
|
||||||
v := map[string]any{}
|
|
||||||
|
|
||||||
err := codec.Decode([]byte(original), v)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, data, v)
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("InvalidData", func(t *testing.T) {
|
|
||||||
codec := Codec{}
|
|
||||||
|
|
||||||
v := map[string]any{}
|
|
||||||
|
|
||||||
err := codec.Decode([]byte(`invalid data`), v)
|
|
||||||
require.Error(t, err)
|
|
||||||
|
|
||||||
t.Logf("decoding failed as expected: %s", err)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
package dotenv
|
|
||||||
|
|
||||||
import (
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/spf13/cast"
|
|
||||||
)
|
|
||||||
|
|
||||||
// flattenAndMergeMap recursively flattens the given map into a new map
|
|
||||||
// Code is based on the function with the same name in the main package.
|
|
||||||
// TODO: move it to a common place.
|
|
||||||
func flattenAndMergeMap(shadow, m map[string]any, prefix, delimiter string) map[string]any {
|
|
||||||
if shadow != nil && prefix != "" && shadow[prefix] != nil {
|
|
||||||
// prefix is shadowed => nothing more to flatten
|
|
||||||
return shadow
|
|
||||||
}
|
|
||||||
if shadow == nil {
|
|
||||||
shadow = make(map[string]any)
|
|
||||||
}
|
|
||||||
|
|
||||||
var m2 map[string]any
|
|
||||||
if prefix != "" {
|
|
||||||
prefix += delimiter
|
|
||||||
}
|
|
||||||
for k, val := range m {
|
|
||||||
fullKey := prefix + k
|
|
||||||
switch val := val.(type) {
|
|
||||||
case map[string]any:
|
|
||||||
m2 = val
|
|
||||||
case map[any]any:
|
|
||||||
m2 = cast.ToStringMap(val)
|
|
||||||
default:
|
|
||||||
// immediate value
|
|
||||||
shadow[strings.ToLower(fullKey)] = val
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// recursively merge to shadow map
|
|
||||||
shadow = flattenAndMergeMap(shadow, m2, fullKey, delimiter)
|
|
||||||
}
|
|
||||||
return shadow
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
package json
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Codec implements the encoding.Encoder and encoding.Decoder interfaces for JSON encoding.
|
|
||||||
type Codec struct{}
|
|
||||||
|
|
||||||
// Encode encodes a map[string]any into a JSON byte slice.
|
|
||||||
func (Codec) Encode(v map[string]any) ([]byte, error) {
|
|
||||||
// TODO: expose prefix and indent in the Codec as setting?
|
|
||||||
return json.MarshalIndent(v, "", " ")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Decode decodes a JSON byte slice into a map[string]any.
|
|
||||||
func (Codec) Decode(b []byte, v map[string]any) error {
|
|
||||||
return json.Unmarshal(b, &v)
|
|
||||||
}
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
package json
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
// encoded form of the data.
|
|
||||||
const encoded = `{
|
|
||||||
"key": "value",
|
|
||||||
"list": [
|
|
||||||
"item1",
|
|
||||||
"item2",
|
|
||||||
"item3"
|
|
||||||
],
|
|
||||||
"map": {
|
|
||||||
"key": "value"
|
|
||||||
},
|
|
||||||
"nested_map": {
|
|
||||||
"map": {
|
|
||||||
"key": "value",
|
|
||||||
"list": [
|
|
||||||
"item1",
|
|
||||||
"item2",
|
|
||||||
"item3"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}`
|
|
||||||
|
|
||||||
// data is Viper's internal representation.
|
|
||||||
var data = map[string]any{
|
|
||||||
"key": "value",
|
|
||||||
"list": []any{
|
|
||||||
"item1",
|
|
||||||
"item2",
|
|
||||||
"item3",
|
|
||||||
},
|
|
||||||
"map": map[string]any{
|
|
||||||
"key": "value",
|
|
||||||
},
|
|
||||||
"nested_map": map[string]any{
|
|
||||||
"map": map[string]any{
|
|
||||||
"key": "value",
|
|
||||||
"list": []any{
|
|
||||||
"item1",
|
|
||||||
"item2",
|
|
||||||
"item3",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCodec_Encode(t *testing.T) {
|
|
||||||
codec := Codec{}
|
|
||||||
|
|
||||||
b, err := codec.Encode(data)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.JSONEq(t, encoded, string(b))
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCodec_Decode(t *testing.T) {
|
|
||||||
t.Run("OK", func(t *testing.T) {
|
|
||||||
codec := Codec{}
|
|
||||||
|
|
||||||
v := map[string]any{}
|
|
||||||
|
|
||||||
err := codec.Decode([]byte(encoded), v)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, data, v)
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("InvalidData", func(t *testing.T) {
|
|
||||||
codec := Codec{}
|
|
||||||
|
|
||||||
v := map[string]any{}
|
|
||||||
|
|
||||||
err := codec.Decode([]byte(`invalid data`), v)
|
|
||||||
require.Error(t, err)
|
|
||||||
|
|
||||||
t.Logf("decoding failed as expected: %s", err)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package toml
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/pelletier/go-toml/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Codec implements the encoding.Encoder and encoding.Decoder interfaces for TOML encoding.
|
|
||||||
type Codec struct{}
|
|
||||||
|
|
||||||
// Encode encodes a map[string]any into a TOML byte slice.
|
|
||||||
func (Codec) Encode(v map[string]any) ([]byte, error) {
|
|
||||||
return toml.Marshal(v)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Decode decodes a TOML byte slice into a map[string]any.
|
|
||||||
func (Codec) Decode(b []byte, v map[string]any) error {
|
|
||||||
return toml.Unmarshal(b, &v)
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
package toml
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
// original form of the data.
|
|
||||||
const original = `# key-value pair
|
|
||||||
key = "value"
|
|
||||||
list = ["item1", "item2", "item3"]
|
|
||||||
|
|
||||||
[map]
|
|
||||||
key = "value"
|
|
||||||
|
|
||||||
# nested
|
|
||||||
# map
|
|
||||||
[nested_map]
|
|
||||||
[nested_map.map]
|
|
||||||
key = "value"
|
|
||||||
list = [
|
|
||||||
"item1",
|
|
||||||
"item2",
|
|
||||||
"item3",
|
|
||||||
]
|
|
||||||
`
|
|
||||||
|
|
||||||
// encoded form of the data.
|
|
||||||
const encoded = `key = 'value'
|
|
||||||
list = ['item1', 'item2', 'item3']
|
|
||||||
|
|
||||||
[map]
|
|
||||||
key = 'value'
|
|
||||||
|
|
||||||
[nested_map]
|
|
||||||
[nested_map.map]
|
|
||||||
key = 'value'
|
|
||||||
list = ['item1', 'item2', 'item3']
|
|
||||||
`
|
|
||||||
|
|
||||||
// data is Viper's internal representation.
|
|
||||||
var data = map[string]any{
|
|
||||||
"key": "value",
|
|
||||||
"list": []any{
|
|
||||||
"item1",
|
|
||||||
"item2",
|
|
||||||
"item3",
|
|
||||||
},
|
|
||||||
"map": map[string]any{
|
|
||||||
"key": "value",
|
|
||||||
},
|
|
||||||
"nested_map": map[string]any{
|
|
||||||
"map": map[string]any{
|
|
||||||
"key": "value",
|
|
||||||
"list": []any{
|
|
||||||
"item1",
|
|
||||||
"item2",
|
|
||||||
"item3",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCodec_Encode(t *testing.T) {
|
|
||||||
codec := Codec{}
|
|
||||||
|
|
||||||
b, err := codec.Encode(data)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, encoded, string(b))
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCodec_Decode(t *testing.T) {
|
|
||||||
t.Run("OK", func(t *testing.T) {
|
|
||||||
codec := Codec{}
|
|
||||||
|
|
||||||
v := map[string]any{}
|
|
||||||
|
|
||||||
err := codec.Decode([]byte(original), v)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, data, v)
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("InvalidData", func(t *testing.T) {
|
|
||||||
codec := Codec{}
|
|
||||||
|
|
||||||
v := map[string]any{}
|
|
||||||
|
|
||||||
err := codec.Decode([]byte(`invalid data`), v)
|
|
||||||
require.Error(t, err)
|
|
||||||
|
|
||||||
t.Logf("decoding failed as expected: %s", err)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package yaml
|
|
||||||
|
|
||||||
import "go.yaml.in/yaml/v3"
|
|
||||||
|
|
||||||
// Codec implements the encoding.Encoder and encoding.Decoder interfaces for YAML encoding.
|
|
||||||
type Codec struct{}
|
|
||||||
|
|
||||||
// Encode encodes a map[string]any into a YAML byte slice.
|
|
||||||
func (Codec) Encode(v map[string]any) ([]byte, error) {
|
|
||||||
return yaml.Marshal(v)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Decode decodes a YAML byte slice into a map[string]any.
|
|
||||||
func (Codec) Decode(b []byte, v map[string]any) error {
|
|
||||||
return yaml.Unmarshal(b, &v)
|
|
||||||
}
|
|
||||||
@@ -1,128 +0,0 @@
|
|||||||
package yaml
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
// original form of the data.
|
|
||||||
const original = `# key-value pair
|
|
||||||
key: value
|
|
||||||
list:
|
|
||||||
- item1
|
|
||||||
- item2
|
|
||||||
- item3
|
|
||||||
map:
|
|
||||||
key: value
|
|
||||||
|
|
||||||
# nested
|
|
||||||
# map
|
|
||||||
nested_map:
|
|
||||||
map:
|
|
||||||
key: value
|
|
||||||
list:
|
|
||||||
- item1
|
|
||||||
- item2
|
|
||||||
- item3
|
|
||||||
`
|
|
||||||
|
|
||||||
// encoded form of the data.
|
|
||||||
const encoded = `key: value
|
|
||||||
list:
|
|
||||||
- item1
|
|
||||||
- item2
|
|
||||||
- item3
|
|
||||||
map:
|
|
||||||
key: value
|
|
||||||
nested_map:
|
|
||||||
map:
|
|
||||||
key: value
|
|
||||||
list:
|
|
||||||
- item1
|
|
||||||
- item2
|
|
||||||
- item3
|
|
||||||
`
|
|
||||||
|
|
||||||
// decoded form of the data.
|
|
||||||
//
|
|
||||||
// In case of YAML it's slightly different from Viper's internal representation
|
|
||||||
// (e.g. map is decoded into a map with interface key).
|
|
||||||
var decoded = map[string]any{
|
|
||||||
"key": "value",
|
|
||||||
"list": []any{
|
|
||||||
"item1",
|
|
||||||
"item2",
|
|
||||||
"item3",
|
|
||||||
},
|
|
||||||
"map": map[string]any{
|
|
||||||
"key": "value",
|
|
||||||
},
|
|
||||||
"nested_map": map[string]any{
|
|
||||||
"map": map[string]any{
|
|
||||||
"key": "value",
|
|
||||||
"list": []any{
|
|
||||||
"item1",
|
|
||||||
"item2",
|
|
||||||
"item3",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
// data is Viper's internal representation.
|
|
||||||
var data = map[string]any{
|
|
||||||
"key": "value",
|
|
||||||
"list": []any{
|
|
||||||
"item1",
|
|
||||||
"item2",
|
|
||||||
"item3",
|
|
||||||
},
|
|
||||||
"map": map[string]any{
|
|
||||||
"key": "value",
|
|
||||||
},
|
|
||||||
"nested_map": map[string]any{
|
|
||||||
"map": map[string]any{
|
|
||||||
"key": "value",
|
|
||||||
"list": []any{
|
|
||||||
"item1",
|
|
||||||
"item2",
|
|
||||||
"item3",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCodec_Encode(t *testing.T) {
|
|
||||||
codec := Codec{}
|
|
||||||
|
|
||||||
b, err := codec.Encode(data)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, encoded, string(b))
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCodec_Decode(t *testing.T) {
|
|
||||||
t.Run("OK", func(t *testing.T) {
|
|
||||||
codec := Codec{}
|
|
||||||
|
|
||||||
v := map[string]any{}
|
|
||||||
|
|
||||||
err := codec.Decode([]byte(original), v)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, decoded, v)
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("InvalidData", func(t *testing.T) {
|
|
||||||
codec := Codec{}
|
|
||||||
|
|
||||||
v := map[string]any{}
|
|
||||||
|
|
||||||
err := codec.Decode([]byte(`invalid data`), v)
|
|
||||||
require.Error(t, err)
|
|
||||||
|
|
||||||
t.Logf("decoding failed as expected: %s", err)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
//go:build viper_bind_struct
|
|
||||||
|
|
||||||
package features
|
|
||||||
|
|
||||||
// BindStruct is a feature flag for enabling/disabling the config binding to structs.
|
|
||||||
const BindStruct = true
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
//go:build !viper_bind_struct
|
|
||||||
|
|
||||||
package features
|
|
||||||
|
|
||||||
// BindStruct is a feature flag for enabling/disabling the config binding to structs.
|
|
||||||
const BindStruct = false
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
//go:build viper_finder
|
|
||||||
|
|
||||||
package features
|
|
||||||
|
|
||||||
// Finder is a feature flag for enabling/disabling the config finder.
|
|
||||||
const Finder = true
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
//go:build !viper_finder
|
|
||||||
|
|
||||||
package features
|
|
||||||
|
|
||||||
// Finder is a feature flag for enabling/disabling the config finder.
|
|
||||||
const Finder = false
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package testutil
|
|
||||||
|
|
||||||
import (
|
|
||||||
"path/filepath"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
// AbsFilePath calls filepath.Abs on path.
|
|
||||||
func AbsFilePath(t *testing.T, path string) string {
|
|
||||||
t.Helper()
|
|
||||||
|
|
||||||
s, err := filepath.Abs(path)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
package viper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"log/slog"
|
|
||||||
)
|
|
||||||
|
|
||||||
// WithLogger sets a custom logger.
|
|
||||||
func WithLogger(l *slog.Logger) Option {
|
|
||||||
return optionFunc(func(v *Viper) {
|
|
||||||
v.logger = l
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
type discardHandler struct{}
|
|
||||||
|
|
||||||
func (n *discardHandler) Enabled(_ context.Context, _ slog.Level) bool {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *discardHandler) Handle(_ context.Context, _ slog.Record) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *discardHandler) WithAttrs(_ []slog.Attr) slog.Handler {
|
|
||||||
return n
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *discardHandler) WithGroup(_ string) slog.Handler {
|
|
||||||
return n
|
|
||||||
}
|
|
||||||
+22
-19
@@ -1,6 +1,7 @@
|
|||||||
package viper
|
package viper
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
@@ -45,11 +46,11 @@ func TestNestedOverrides(t *testing.T) {
|
|||||||
deepCheckValue(assert, v, overrideLayer, []string{"tom", "size"}, 4)
|
deepCheckValue(assert, v, overrideLayer, []string{"tom", "size"}, 4)
|
||||||
|
|
||||||
// Case 4: key:value overridden by a map
|
// Case 4: key:value overridden by a map
|
||||||
v = overrideDefault(assert, "tom.size", 4, "tom", map[string]any{"age": 10}) // "tom.size" is first given "4" as default value, then "tom" is overridden by map{"age":10}
|
v = overrideDefault(assert, "tom.size", 4, "tom", map[string]interface{}{"age": 10}) // "tom.size" is first given "4" as default value, then "tom" is overridden by map{"age":10}
|
||||||
assert.Equal(4, v.Get("tom.size")) // "tom.size" should still be reachable
|
assert.Equal(4, v.Get("tom.size")) // "tom.size" should still be reachable
|
||||||
assert.Equal(10, v.Get("tom.age")) // new value should be there
|
assert.Equal(10, v.Get("tom.age")) // new value should be there
|
||||||
deepCheckValue(assert, v, overrideLayer, []string{"tom", "age"}, 10) // new value should be there
|
deepCheckValue(assert, v, overrideLayer, []string{"tom", "age"}, 10) // new value should be there
|
||||||
v = override(assert, "tom.size", 4, "tom", map[string]any{"age": 10})
|
v = override(assert, "tom.size", 4, "tom", map[string]interface{}{"age": 10})
|
||||||
assert.Nil(v.Get("tom.size"))
|
assert.Nil(v.Get("tom.size"))
|
||||||
assert.Equal(10, v.Get("tom.age"))
|
assert.Equal(10, v.Get("tom.age"))
|
||||||
deepCheckValue(assert, v, overrideLayer, []string{"tom", "age"}, 10)
|
deepCheckValue(assert, v, overrideLayer, []string{"tom", "age"}, 10)
|
||||||
@@ -74,11 +75,10 @@ func TestNestedOverrides(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func overrideDefault(assert *assert.Assertions, firstPath string, firstValue any, secondPath string, secondValue any) *Viper {
|
func overrideDefault(assert *assert.Assertions, firstPath string, firstValue interface{}, secondPath string, secondValue interface{}) *Viper {
|
||||||
return overrideFromLayer(defaultLayer, assert, firstPath, firstValue, secondPath, secondValue)
|
return overrideFromLayer(defaultLayer, assert, firstPath, firstValue, secondPath, secondValue)
|
||||||
}
|
}
|
||||||
|
func override(assert *assert.Assertions, firstPath string, firstValue interface{}, secondPath string, secondValue interface{}) *Viper {
|
||||||
func override(assert *assert.Assertions, firstPath string, firstValue any, secondPath string, secondValue any) *Viper {
|
|
||||||
return overrideFromLayer(overrideLayer, assert, firstPath, firstValue, secondPath, secondValue)
|
return overrideFromLayer(overrideLayer, assert, firstPath, firstValue, secondPath, secondValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,11 +93,11 @@ func override(assert *assert.Assertions, firstPath string, firstValue any, secon
|
|||||||
//
|
//
|
||||||
// After each assignment, the value is checked, retrieved both by its full path
|
// After each assignment, the value is checked, retrieved both by its full path
|
||||||
// and by its key sequence (successive maps).
|
// and by its key sequence (successive maps).
|
||||||
func overrideFromLayer(l layer, assert *assert.Assertions, firstPath string, firstValue any, secondPath string, secondValue any) *Viper {
|
func overrideFromLayer(l layer, assert *assert.Assertions, firstPath string, firstValue interface{}, secondPath string, secondValue interface{}) *Viper {
|
||||||
v := New()
|
v := New()
|
||||||
firstKeys := strings.Split(firstPath, v.keyDelim)
|
firstKeys := strings.Split(firstPath, v.keyDelim)
|
||||||
if assert == nil ||
|
if assert == nil ||
|
||||||
len(firstKeys) == 0 || firstKeys[0] == "" {
|
len(firstKeys) == 0 || len(firstKeys[0]) == 0 {
|
||||||
return v
|
return v
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -115,7 +115,7 @@ func overrideFromLayer(l layer, assert *assert.Assertions, firstPath string, fir
|
|||||||
|
|
||||||
// Override and check new value
|
// Override and check new value
|
||||||
secondKeys := strings.Split(secondPath, v.keyDelim)
|
secondKeys := strings.Split(secondPath, v.keyDelim)
|
||||||
if len(secondKeys) == 0 || secondKeys[0] == "" {
|
if len(secondKeys) == 0 || len(secondKeys[0]) == 0 {
|
||||||
return v
|
return v
|
||||||
}
|
}
|
||||||
v.Set(secondPath, secondValue)
|
v.Set(secondPath, secondValue)
|
||||||
@@ -126,15 +126,15 @@ func overrideFromLayer(l layer, assert *assert.Assertions, firstPath string, fir
|
|||||||
}
|
}
|
||||||
|
|
||||||
// deepCheckValue checks that all given keys correspond to a valid path in the
|
// deepCheckValue checks that all given keys correspond to a valid path in the
|
||||||
// configuration map of the given layer, and that the final value equals the one given.
|
// configuration map of the given layer, and that the final value equals the one given
|
||||||
func deepCheckValue(assert *assert.Assertions, v *Viper, l layer, keys []string, value any) {
|
func deepCheckValue(assert *assert.Assertions, v *Viper, l layer, keys []string, value interface{}) {
|
||||||
if assert == nil || v == nil ||
|
if assert == nil || v == nil ||
|
||||||
len(keys) == 0 || keys[0] == "" {
|
len(keys) == 0 || len(keys[0]) == 0 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// init
|
// init
|
||||||
var val any
|
var val interface{}
|
||||||
var ms string
|
var ms string
|
||||||
switch l {
|
switch l {
|
||||||
case defaultLayer:
|
case defaultLayer:
|
||||||
@@ -146,25 +146,28 @@ func deepCheckValue(assert *assert.Assertions, v *Viper, l layer, keys []string,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// loop through map
|
// loop through map
|
||||||
var m map[string]any
|
var m map[string]interface{}
|
||||||
|
err := false
|
||||||
for _, k := range keys {
|
for _, k := range keys {
|
||||||
if val == nil {
|
if val == nil {
|
||||||
assert.Failf("%s is not a map[string]any", ms)
|
assert.Fail(fmt.Sprintf("%s is not a map[string]interface{}", ms))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// deep scan of the map to get the final value
|
// deep scan of the map to get the final value
|
||||||
switch val := val.(type) {
|
switch val.(type) {
|
||||||
case map[any]any:
|
case map[interface{}]interface{}:
|
||||||
m = cast.ToStringMap(val)
|
m = cast.ToStringMap(val)
|
||||||
case map[string]any:
|
case map[string]interface{}:
|
||||||
m = val
|
m = val.(map[string]interface{})
|
||||||
default:
|
default:
|
||||||
assert.Failf("%s is not a map[string]any", ms)
|
assert.Fail(fmt.Sprintf("%s is not a map[string]interface{}", ms))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
ms = ms + "[\"" + k + "\"]"
|
ms = ms + "[\"" + k + "\"]"
|
||||||
val = m[k]
|
val = m[k]
|
||||||
}
|
}
|
||||||
|
if !err {
|
||||||
assert.Equal(value, val)
|
assert.Equal(value, val)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,284 +0,0 @@
|
|||||||
package viper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"reflect"
|
|
||||||
"slices"
|
|
||||||
)
|
|
||||||
|
|
||||||
// SupportedRemoteProviders are universally supported remote providers.
|
|
||||||
var SupportedRemoteProviders = []string{"etcd", "etcd3", "consul", "firestore", "nats"}
|
|
||||||
|
|
||||||
func resetRemote() {
|
|
||||||
SupportedRemoteProviders = []string{"etcd", "etcd3", "consul", "firestore", "nats"}
|
|
||||||
}
|
|
||||||
|
|
||||||
type remoteConfigFactory interface {
|
|
||||||
Get(rp RemoteProvider) (io.Reader, error)
|
|
||||||
Watch(rp RemoteProvider) (io.Reader, error)
|
|
||||||
WatchChannel(rp RemoteProvider) (<-chan *RemoteResponse, chan bool)
|
|
||||||
}
|
|
||||||
|
|
||||||
// RemoteResponse represents a response from a remote configuration provider.
|
|
||||||
type RemoteResponse struct {
|
|
||||||
Value []byte
|
|
||||||
Error error
|
|
||||||
}
|
|
||||||
|
|
||||||
// RemoteConfig is optional, see the remote package.
|
|
||||||
var RemoteConfig remoteConfigFactory
|
|
||||||
|
|
||||||
// UnsupportedRemoteProviderError denotes encountering an unsupported remote
|
|
||||||
// provider. Currently only etcd and Consul are supported.
|
|
||||||
type UnsupportedRemoteProviderError string
|
|
||||||
|
|
||||||
// Error returns the formatted remote provider error.
|
|
||||||
func (str UnsupportedRemoteProviderError) Error() string {
|
|
||||||
return fmt.Sprintf("Unsupported Remote Provider Type %q", string(str))
|
|
||||||
}
|
|
||||||
|
|
||||||
// RemoteConfigError denotes encountering an error while trying to
|
|
||||||
// pull the configuration from the remote provider.
|
|
||||||
type RemoteConfigError string
|
|
||||||
|
|
||||||
// Error returns the formatted remote provider error.
|
|
||||||
func (rce RemoteConfigError) Error() string {
|
|
||||||
return fmt.Sprintf("Remote Configurations Error: %s", string(rce))
|
|
||||||
}
|
|
||||||
|
|
||||||
type defaultRemoteProvider struct {
|
|
||||||
provider string
|
|
||||||
endpoint string
|
|
||||||
path string
|
|
||||||
secretKeyring string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (rp defaultRemoteProvider) Provider() string {
|
|
||||||
return rp.provider
|
|
||||||
}
|
|
||||||
|
|
||||||
func (rp defaultRemoteProvider) Endpoint() string {
|
|
||||||
return rp.endpoint
|
|
||||||
}
|
|
||||||
|
|
||||||
func (rp defaultRemoteProvider) Path() string {
|
|
||||||
return rp.path
|
|
||||||
}
|
|
||||||
|
|
||||||
func (rp defaultRemoteProvider) SecretKeyring() string {
|
|
||||||
return rp.secretKeyring
|
|
||||||
}
|
|
||||||
|
|
||||||
// RemoteProvider stores the configuration necessary
|
|
||||||
// to connect to a remote key/value store.
|
|
||||||
// Optional secretKeyring to unencrypt encrypted values
|
|
||||||
// can be provided.
|
|
||||||
type RemoteProvider interface {
|
|
||||||
Provider() string
|
|
||||||
Endpoint() string
|
|
||||||
Path() string
|
|
||||||
SecretKeyring() string
|
|
||||||
}
|
|
||||||
|
|
||||||
// AddRemoteProvider adds a remote configuration source.
|
|
||||||
// Remote Providers are searched in the order they are added.
|
|
||||||
// provider is a string value: "etcd", "etcd3", "consul", "firestore" or "nats" are currently supported.
|
|
||||||
// endpoint is the url. etcd requires http://ip:port, consul requires ip:port, nats requires nats://ip:port
|
|
||||||
// path is the path in the k/v store to retrieve configuration
|
|
||||||
// To retrieve a config file called myapp.json from /configs/myapp.json
|
|
||||||
// you should set path to /configs and set config name (SetConfigName()) to
|
|
||||||
// "myapp".
|
|
||||||
func AddRemoteProvider(provider, endpoint, path string) error {
|
|
||||||
return v.AddRemoteProvider(provider, endpoint, path)
|
|
||||||
}
|
|
||||||
|
|
||||||
// AddRemoteProvider adds a remote configuration source.
|
|
||||||
// Remote Providers are searched in the order they are added.
|
|
||||||
// provider is a string value: "etcd", "etcd3", "consul", "firestore" or "nats" are currently supported.
|
|
||||||
// endpoint is the url. etcd requires http://ip:port, consul requires ip:port, nats requires nats://ip:port
|
|
||||||
// path is the path in the k/v store to retrieve configuration
|
|
||||||
// To retrieve a config file called myapp.json from /configs/myapp.json
|
|
||||||
// you should set path to /configs and set config name (SetConfigName()) to
|
|
||||||
// "myapp".
|
|
||||||
func (v *Viper) AddRemoteProvider(provider, endpoint, path string) error {
|
|
||||||
if !slices.Contains(SupportedRemoteProviders, provider) {
|
|
||||||
return UnsupportedRemoteProviderError(provider)
|
|
||||||
}
|
|
||||||
if provider != "" && endpoint != "" {
|
|
||||||
v.logger.Info("adding remote provider", "provider", provider, "endpoint", endpoint)
|
|
||||||
|
|
||||||
rp := &defaultRemoteProvider{
|
|
||||||
endpoint: endpoint,
|
|
||||||
provider: provider,
|
|
||||||
path: path,
|
|
||||||
}
|
|
||||||
if !v.providerPathExists(rp) {
|
|
||||||
v.remoteProviders = append(v.remoteProviders, rp)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// AddSecureRemoteProvider adds a remote configuration source.
|
|
||||||
// Secure Remote Providers are searched in the order they are added.
|
|
||||||
// provider is a string value: "etcd", "etcd3", "consul", "firestore" or "nats" are currently supported.
|
|
||||||
// endpoint is the url. etcd requires http://ip:port consul requires ip:port
|
|
||||||
// secretkeyring is the filepath to your openpgp secret keyring. e.g. /etc/secrets/myring.gpg
|
|
||||||
// path is the path in the k/v store to retrieve configuration
|
|
||||||
// To retrieve a config file called myapp.json from /configs/myapp.json
|
|
||||||
// you should set path to /configs and set config name (SetConfigName()) to
|
|
||||||
// "myapp".
|
|
||||||
// Secure Remote Providers are implemented with github.com/sagikazarmark/crypt.
|
|
||||||
func AddSecureRemoteProvider(provider, endpoint, path, secretkeyring string) error {
|
|
||||||
return v.AddSecureRemoteProvider(provider, endpoint, path, secretkeyring)
|
|
||||||
}
|
|
||||||
|
|
||||||
// AddSecureRemoteProvider adds a remote configuration source.
|
|
||||||
// Secure Remote Providers are searched in the order they are added.
|
|
||||||
// provider is a string value: "etcd", "etcd3", "consul", "firestore" or "nats" are currently supported.
|
|
||||||
// endpoint is the url. etcd requires http://ip:port consul requires ip:port
|
|
||||||
// secretkeyring is the filepath to your openpgp secret keyring. e.g. /etc/secrets/myring.gpg
|
|
||||||
// path is the path in the k/v store to retrieve configuration
|
|
||||||
// To retrieve a config file called myapp.json from /configs/myapp.json
|
|
||||||
// you should set path to /configs and set config name (SetConfigName()) to
|
|
||||||
// "myapp".
|
|
||||||
// Secure Remote Providers are implemented with github.com/sagikazarmark/crypt.
|
|
||||||
func (v *Viper) AddSecureRemoteProvider(provider, endpoint, path, secretkeyring string) error {
|
|
||||||
if !slices.Contains(SupportedRemoteProviders, provider) {
|
|
||||||
return UnsupportedRemoteProviderError(provider)
|
|
||||||
}
|
|
||||||
if provider != "" && endpoint != "" {
|
|
||||||
v.logger.Info("adding remote provider", "provider", provider, "endpoint", endpoint)
|
|
||||||
|
|
||||||
rp := &defaultRemoteProvider{
|
|
||||||
endpoint: endpoint,
|
|
||||||
provider: provider,
|
|
||||||
path: path,
|
|
||||||
secretKeyring: secretkeyring,
|
|
||||||
}
|
|
||||||
if !v.providerPathExists(rp) {
|
|
||||||
v.remoteProviders = append(v.remoteProviders, rp)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (v *Viper) providerPathExists(p *defaultRemoteProvider) bool {
|
|
||||||
for _, y := range v.remoteProviders {
|
|
||||||
if reflect.DeepEqual(y, p) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// ReadRemoteConfig attempts to get configuration from a remote source
|
|
||||||
// and read it in the remote configuration registry.
|
|
||||||
func ReadRemoteConfig() error { return v.ReadRemoteConfig() }
|
|
||||||
|
|
||||||
// ReadRemoteConfig attempts to get configuration from a remote source
|
|
||||||
// and read it in the remote configuration registry.
|
|
||||||
func (v *Viper) ReadRemoteConfig() error {
|
|
||||||
return v.getKeyValueConfig()
|
|
||||||
}
|
|
||||||
|
|
||||||
// WatchRemoteConfig updates configuration from available remote providers.
|
|
||||||
func WatchRemoteConfig() error { return v.WatchRemoteConfig() }
|
|
||||||
|
|
||||||
// WatchRemoteConfig updates configuration from available remote providers.
|
|
||||||
func (v *Viper) WatchRemoteConfig() error {
|
|
||||||
return v.watchKeyValueConfig()
|
|
||||||
}
|
|
||||||
|
|
||||||
// WatchRemoteConfigOnChannel updates configuration from available remote providers.
|
|
||||||
func (v *Viper) WatchRemoteConfigOnChannel() error {
|
|
||||||
return v.watchKeyValueConfigOnChannel()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Retrieve the first found remote configuration.
|
|
||||||
func (v *Viper) getKeyValueConfig() error {
|
|
||||||
if RemoteConfig == nil {
|
|
||||||
return RemoteConfigError("Enable the remote features by doing a blank import of the viper/remote package: '_ github.com/spf13/viper/remote'")
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(v.remoteProviders) == 0 {
|
|
||||||
return RemoteConfigError("No Remote Providers")
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, rp := range v.remoteProviders {
|
|
||||||
val, err := v.getRemoteConfig(rp)
|
|
||||||
if err != nil {
|
|
||||||
v.logger.Error(fmt.Errorf("get remote config: %w", err).Error())
|
|
||||||
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
v.kvstore = val
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return RemoteConfigError("No Files Found")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (v *Viper) getRemoteConfig(provider RemoteProvider) (map[string]any, error) {
|
|
||||||
reader, err := RemoteConfig.Get(provider)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
err = v.unmarshalReader(reader, v.kvstore)
|
|
||||||
return v.kvstore, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Retrieve the first found remote configuration.
|
|
||||||
func (v *Viper) watchKeyValueConfigOnChannel() error {
|
|
||||||
if len(v.remoteProviders) == 0 {
|
|
||||||
return RemoteConfigError("No Remote Providers")
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, rp := range v.remoteProviders {
|
|
||||||
respc, _ := RemoteConfig.WatchChannel(rp)
|
|
||||||
// Todo: Add quit channel
|
|
||||||
go func(rc <-chan *RemoteResponse) {
|
|
||||||
for {
|
|
||||||
b := <-rc
|
|
||||||
reader := bytes.NewReader(b.Value)
|
|
||||||
err := v.unmarshalReader(reader, v.kvstore)
|
|
||||||
if err != nil {
|
|
||||||
v.logger.Error(fmt.Errorf("failed to unmarshal remote config: %w", err).Error())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}(respc)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return RemoteConfigError("No Files Found")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Retrieve the first found remote configuration.
|
|
||||||
func (v *Viper) watchKeyValueConfig() error {
|
|
||||||
if len(v.remoteProviders) == 0 {
|
|
||||||
return RemoteConfigError("No Remote Providers")
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, rp := range v.remoteProviders {
|
|
||||||
val, err := v.watchRemoteConfig(rp)
|
|
||||||
if err != nil {
|
|
||||||
v.logger.Error(fmt.Errorf("watch remote config: %w", err).Error())
|
|
||||||
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
v.kvstore = val
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return RemoteConfigError("No Files Found")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (v *Viper) watchRemoteConfig(provider RemoteProvider) (map[string]any, error) {
|
|
||||||
reader, err := RemoteConfig.Watch(provider)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
err = v.unmarshalReader(reader, v.kvstore)
|
|
||||||
return v.kvstore, err
|
|
||||||
}
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
module github.com/spf13/viper/remote
|
|
||||||
|
|
||||||
go 1.23.8
|
|
||||||
|
|
||||||
replace github.com/spf13/viper => ../
|
|
||||||
|
|
||||||
require (
|
|
||||||
github.com/sagikazarmark/crypt v0.31.0
|
|
||||||
github.com/spf13/viper v1.21.0
|
|
||||||
)
|
|
||||||
|
|
||||||
require (
|
|
||||||
cloud.google.com/go v0.120.0 // indirect
|
|
||||||
cloud.google.com/go/auth v0.16.5 // indirect
|
|
||||||
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
|
|
||||||
cloud.google.com/go/compute/metadata v0.8.0 // indirect
|
|
||||||
cloud.google.com/go/firestore v1.18.0 // indirect
|
|
||||||
cloud.google.com/go/longrunning v0.6.7 // indirect
|
|
||||||
github.com/armon/go-metrics v0.4.1 // indirect
|
|
||||||
github.com/coreos/go-semver v0.3.1 // indirect
|
|
||||||
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
|
|
||||||
github.com/fatih/color v1.16.0 // indirect
|
|
||||||
github.com/felixge/httpsnoop v1.0.4 // indirect
|
|
||||||
github.com/fsnotify/fsnotify v1.9.0 // indirect
|
|
||||||
github.com/go-logr/logr v1.4.3 // indirect
|
|
||||||
github.com/go-logr/stdr v1.2.2 // indirect
|
|
||||||
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
|
|
||||||
github.com/gogo/protobuf v1.3.2 // indirect
|
|
||||||
github.com/golang/protobuf v1.5.4 // indirect
|
|
||||||
github.com/google/s2a-go v0.1.9 // indirect
|
|
||||||
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
|
|
||||||
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
|
|
||||||
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
|
|
||||||
github.com/hashicorp/consul/api v1.32.1 // indirect
|
|
||||||
github.com/hashicorp/errwrap v1.1.0 // indirect
|
|
||||||
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
|
|
||||||
github.com/hashicorp/go-hclog v1.5.0 // indirect
|
|
||||||
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
|
|
||||||
github.com/hashicorp/go-multierror v1.1.1 // indirect
|
|
||||||
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
|
|
||||||
github.com/hashicorp/golang-lru v0.5.4 // indirect
|
|
||||||
github.com/hashicorp/serf v0.10.1 // indirect
|
|
||||||
github.com/json-iterator/go v1.1.12 // indirect
|
|
||||||
github.com/klauspost/compress v1.18.0 // indirect
|
|
||||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
|
||||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
|
||||||
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
|
||||||
github.com/mitchellh/mapstructure v1.5.0 // indirect
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
|
||||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
|
||||||
github.com/nats-io/nats.go v1.45.0 // indirect
|
|
||||||
github.com/nats-io/nkeys v0.4.11 // indirect
|
|
||||||
github.com/nats-io/nuid v1.0.1 // indirect
|
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
|
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
|
||||||
github.com/sagikazarmark/locafero v0.11.0 // indirect
|
|
||||||
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
|
|
||||||
github.com/spf13/afero v1.15.0 // indirect
|
|
||||||
github.com/spf13/cast v1.10.0 // indirect
|
|
||||||
github.com/spf13/pflag v1.0.10 // indirect
|
|
||||||
github.com/subosito/gotenv v1.6.0 // indirect
|
|
||||||
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
|
|
||||||
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
|
|
||||||
go.etcd.io/etcd/client/v2 v2.305.22 // indirect
|
|
||||||
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
|
|
||||||
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
|
|
||||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
|
|
||||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
|
|
||||||
go.opentelemetry.io/otel v1.37.0 // indirect
|
|
||||||
go.opentelemetry.io/otel/metric v1.37.0 // indirect
|
|
||||||
go.opentelemetry.io/otel/trace v1.37.0 // indirect
|
|
||||||
go.uber.org/multierr v1.11.0 // indirect
|
|
||||||
go.uber.org/zap v1.27.0 // indirect
|
|
||||||
go.yaml.in/yaml/v3 v3.0.4 // indirect
|
|
||||||
golang.org/x/crypto v0.41.0 // indirect
|
|
||||||
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
|
|
||||||
golang.org/x/net v0.43.0 // indirect
|
|
||||||
golang.org/x/oauth2 v0.30.0 // indirect
|
|
||||||
golang.org/x/sync v0.16.0 // indirect
|
|
||||||
golang.org/x/sys v0.35.0 // indirect
|
|
||||||
golang.org/x/text v0.28.0 // indirect
|
|
||||||
golang.org/x/time v0.12.0 // indirect
|
|
||||||
google.golang.org/api v0.248.0 // indirect
|
|
||||||
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
|
|
||||||
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
|
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
|
|
||||||
google.golang.org/grpc v1.75.0 // indirect
|
|
||||||
google.golang.org/protobuf v1.36.7 // indirect
|
|
||||||
)
|
|
||||||
-380
@@ -1,380 +0,0 @@
|
|||||||
cloud.google.com/go v0.120.0 h1:wc6bgG9DHyKqF5/vQvX1CiZrtHnxJjBlKUyF9nP6meA=
|
|
||||||
cloud.google.com/go v0.120.0/go.mod h1:/beW32s8/pGRuj4IILWQNd4uuebeT4dkOhKmkfit64Q=
|
|
||||||
cloud.google.com/go/auth v0.16.5 h1:mFWNQ2FEVWAliEQWpAdH80omXFokmrnbDhUS9cBywsI=
|
|
||||||
cloud.google.com/go/auth v0.16.5/go.mod h1:utzRfHMP+Vv0mpOkTRQoWD2q3BatTOoWbA7gCc2dUhQ=
|
|
||||||
cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
|
|
||||||
cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
|
|
||||||
cloud.google.com/go/compute/metadata v0.8.0 h1:HxMRIbao8w17ZX6wBnjhcDkW6lTFpgcaobyVfZWqRLA=
|
|
||||||
cloud.google.com/go/compute/metadata v0.8.0/go.mod h1:sYOGTp851OV9bOFJ9CH7elVvyzopvWQFNNghtDQ/Biw=
|
|
||||||
cloud.google.com/go/firestore v1.18.0 h1:cuydCaLS7Vl2SatAeivXyhbhDEIR8BDmtn4egDhIn2s=
|
|
||||||
cloud.google.com/go/firestore v1.18.0/go.mod h1:5ye0v48PhseZBdcl0qbl3uttu7FIEwEYVaWm0UIEOEU=
|
|
||||||
cloud.google.com/go/longrunning v0.6.7 h1:IGtfDWHhQCgCjwQjV9iiLnUta9LBCo8R9QmAFsS/PrE=
|
|
||||||
cloud.google.com/go/longrunning v0.6.7/go.mod h1:EAFV3IZAKmM56TyiE6VAP3VoTzhZzySwI/YI1s/nRsY=
|
|
||||||
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
|
|
||||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
|
||||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
|
||||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
|
||||||
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
|
||||||
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
|
|
||||||
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
|
|
||||||
github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
|
|
||||||
github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
|
|
||||||
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
|
|
||||||
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
|
|
||||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
|
|
||||||
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
|
|
||||||
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
|
||||||
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
|
|
||||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
|
||||||
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
|
|
||||||
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
|
|
||||||
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
|
|
||||||
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
|
|
||||||
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
|
|
||||||
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
|
||||||
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/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
|
|
||||||
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
|
|
||||||
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
|
|
||||||
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
|
|
||||||
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
|
|
||||||
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
|
|
||||||
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
|
|
||||||
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/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
|
|
||||||
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
|
|
||||||
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
|
||||||
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
|
||||||
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
|
|
||||||
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
|
|
||||||
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
|
||||||
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
|
|
||||||
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
|
||||||
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
|
|
||||||
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
|
|
||||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
|
||||||
github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
|
|
||||||
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
|
||||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
|
||||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
|
||||||
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
|
||||||
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
|
||||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
|
||||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
|
||||||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
|
||||||
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
|
||||||
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
|
||||||
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
|
||||||
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
|
|
||||||
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
|
|
||||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
|
||||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
|
||||||
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
|
||||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
|
||||||
github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
|
|
||||||
github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
|
|
||||||
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/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
|
|
||||||
github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
|
|
||||||
github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
|
|
||||||
github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
|
|
||||||
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
|
|
||||||
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
|
|
||||||
github.com/hashicorp/consul/api v1.32.1 h1:0+osr/3t/aZNAdJX558crU3PEjVrG4x6715aZHRgceE=
|
|
||||||
github.com/hashicorp/consul/api v1.32.1/go.mod h1:mXUWLnxftwTmDv4W3lzxYCPD199iNLLUyLfLGFJbtl4=
|
|
||||||
github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg=
|
|
||||||
github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWtHJcZ7Ea5tns0s=
|
|
||||||
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
|
|
||||||
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
|
|
||||||
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
|
|
||||||
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
|
|
||||||
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
|
|
||||||
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
|
|
||||||
github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
|
|
||||||
github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
|
|
||||||
github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
|
|
||||||
github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
|
|
||||||
github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
|
|
||||||
github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
|
|
||||||
github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
|
|
||||||
github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
|
|
||||||
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
|
|
||||||
github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
|
|
||||||
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
|
|
||||||
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
|
|
||||||
github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
|
|
||||||
github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
|
|
||||||
github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
|
|
||||||
github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
|
|
||||||
github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
|
|
||||||
github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
|
|
||||||
github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
|
|
||||||
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
|
|
||||||
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
|
|
||||||
github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
|
|
||||||
github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
|
|
||||||
github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
|
|
||||||
github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
|
||||||
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
|
||||||
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
|
|
||||||
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
|
|
||||||
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
|
|
||||||
github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
|
|
||||||
github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
|
|
||||||
github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
|
|
||||||
github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
|
|
||||||
github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
|
|
||||||
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
|
||||||
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
|
||||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
|
||||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
|
||||||
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
|
|
||||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
|
||||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
|
||||||
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
|
|
||||||
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
|
|
||||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
|
||||||
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
|
|
||||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
|
||||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
|
||||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
|
||||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
|
||||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
|
||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
|
||||||
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
|
|
||||||
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
|
|
||||||
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
|
|
||||||
github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
|
|
||||||
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
|
|
||||||
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
|
|
||||||
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
|
|
||||||
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
|
|
||||||
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
|
|
||||||
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
|
|
||||||
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
|
|
||||||
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
|
|
||||||
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
|
||||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
|
||||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
|
||||||
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
|
||||||
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
|
|
||||||
github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
|
|
||||||
github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
|
|
||||||
github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
|
|
||||||
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
|
|
||||||
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
|
||||||
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
|
||||||
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
|
|
||||||
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
|
||||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
|
||||||
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
|
||||||
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
|
||||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
|
||||||
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
|
||||||
github.com/nats-io/nats.go v1.45.0 h1:/wGPbnYXDM0pLKFjZTX+2JOw9TQPoIgTFrUaH97giwA=
|
|
||||||
github.com/nats-io/nats.go v1.45.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
|
|
||||||
github.com/nats-io/nkeys v0.4.11 h1:q44qGV008kYd9W1b1nEBkNzvnWxtRSQ7A8BoqRrcfa0=
|
|
||||||
github.com/nats-io/nkeys v0.4.11/go.mod h1:szDimtgmfOi9n25JpfIdGw12tZFYXqhGxjhVxsatHVE=
|
|
||||||
github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
|
|
||||||
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
|
|
||||||
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
|
|
||||||
github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
|
|
||||||
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
|
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
|
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
|
|
||||||
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
|
||||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
|
||||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
|
||||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
|
||||||
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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
|
|
||||||
github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
|
|
||||||
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
|
|
||||||
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
|
|
||||||
github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
|
|
||||||
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
|
|
||||||
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
|
||||||
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
|
||||||
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
|
|
||||||
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
|
|
||||||
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
|
||||||
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
|
|
||||||
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
|
|
||||||
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/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
|
|
||||||
github.com/sagikazarmark/crypt v0.31.0 h1:JJLrH7UojwA5KBkWuuk9x6UgHMzBaU2J2RHpEzUlpAc=
|
|
||||||
github.com/sagikazarmark/crypt v0.31.0/go.mod h1:X8SJJi7WiZU/Rgdr//EtoELirhl3vah7L7/fcBsO5Hk=
|
|
||||||
github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc=
|
|
||||||
github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik=
|
|
||||||
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
|
|
||||||
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
|
|
||||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
|
||||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
|
||||||
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw=
|
|
||||||
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U=
|
|
||||||
github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
|
|
||||||
github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
|
|
||||||
github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
|
|
||||||
github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
|
|
||||||
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
|
|
||||||
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
|
||||||
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
|
||||||
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
|
|
||||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
|
||||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
|
||||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
|
||||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
|
||||||
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
|
|
||||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
|
||||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
|
||||||
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
|
|
||||||
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
|
|
||||||
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
|
|
||||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
|
||||||
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
|
||||||
go.etcd.io/etcd/api/v3 v3.6.4 h1:7F6N7toCKcV72QmoUKa23yYLiiljMrT4xCeBL9BmXdo=
|
|
||||||
go.etcd.io/etcd/api/v3 v3.6.4/go.mod h1:eFhhvfR8Px1P6SEuLT600v+vrhdDTdcfMzmnxVXXSbk=
|
|
||||||
go.etcd.io/etcd/client/pkg/v3 v3.6.4 h1:9HBYrjppeOfFjBjaMTRxT3R7xT0GLK8EJMVC4xg6ok0=
|
|
||||||
go.etcd.io/etcd/client/pkg/v3 v3.6.4/go.mod h1:sbdzr2cl3HzVmxNw//PH7aLGVtY4QySjQFuaCgcRFAI=
|
|
||||||
go.etcd.io/etcd/client/v2 v2.305.22 h1:FedDsGxor5iE9muhXm1CgE/TiSVOtgyB5+NYCHPzA2Q=
|
|
||||||
go.etcd.io/etcd/client/v2 v2.305.22/go.mod h1:VP7+1hEKyfGPuRdDmtT8GjM2HcVCKVlGmxfv3NwmrII=
|
|
||||||
go.etcd.io/etcd/client/v3 v3.6.4 h1:YOMrCfMhRzY8NgtzUsHl8hC2EBSnuqbR3dh84Uryl7A=
|
|
||||||
go.etcd.io/etcd/client/v3 v3.6.4/go.mod h1:jaNNHCyg2FdALyKWnd7hxZXZxZANb0+KGY+YQaEMISo=
|
|
||||||
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
|
|
||||||
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
|
|
||||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 h1:q4XOmH/0opmeuJtPsbFNivyl7bCt7yRBbeEm2sC/XtQ=
|
|
||||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0/go.mod h1:snMWehoOh2wsEwnvvwtDyFCxVeDAODenXHtn5vzrKjo=
|
|
||||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
|
|
||||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
|
|
||||||
go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
|
|
||||||
go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
|
|
||||||
go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
|
|
||||||
go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
|
|
||||||
go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
|
|
||||||
go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
|
|
||||||
go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
|
|
||||||
go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
|
|
||||||
go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
|
|
||||||
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
|
|
||||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
|
||||||
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
|
||||||
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
|
||||||
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
|
|
||||||
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
|
|
||||||
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
|
|
||||||
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
|
|
||||||
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
|
||||||
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
|
||||||
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
|
|
||||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
|
||||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
|
||||||
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
|
|
||||||
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
|
|
||||||
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
|
|
||||||
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
|
|
||||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
|
||||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
|
||||||
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
||||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
|
||||||
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
|
||||||
golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
|
|
||||||
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
|
|
||||||
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
|
|
||||||
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
|
|
||||||
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
|
|
||||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
|
|
||||||
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
|
||||||
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
|
|
||||||
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|
||||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
|
||||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
|
||||||
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
|
|
||||||
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
|
|
||||||
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
|
|
||||||
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
|
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
||||||
golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
|
||||||
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
|
|
||||||
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
|
|
||||||
google.golang.org/api v0.248.0 h1:hUotakSkcwGdYUqzCRc5yGYsg4wXxpkKlW5ryVqvC1Y=
|
|
||||||
google.golang.org/api v0.248.0/go.mod h1:yAFUAF56Li7IuIQbTFoLwXTCI6XCFKueOlS7S9e4F9k=
|
|
||||||
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4=
|
|
||||||
google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s=
|
|
||||||
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 h1:FiusG7LWj+4byqhbvmB+Q93B/mOxJLN2DTozDuZm4EU=
|
|
||||||
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:kXqgZtrWaf6qS3jZOCnCH7WYfrvFjkC51bM8fz3RsCA=
|
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c h1:qXWI/sQtv5UKboZ/zUk7h+mrf/lXORyI+n9DKDAusdg=
|
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo=
|
|
||||||
google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4=
|
|
||||||
google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
|
|
||||||
google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
|
|
||||||
google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
|
|
||||||
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
|
||||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
|
||||||
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.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
|
||||||
+13
-29
@@ -10,11 +10,9 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
|
||||||
|
|
||||||
crypt "github.com/sagikazarmark/crypt/config"
|
|
||||||
|
|
||||||
"github.com/spf13/viper"
|
"github.com/spf13/viper"
|
||||||
|
crypt "github.com/xordataexchange/crypt/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
type remoteConfigProvider struct{}
|
type remoteConfigProvider struct{}
|
||||||
@@ -65,7 +63,9 @@ func (rc remoteConfigProvider) WatchChannel(rp viper.RemoteProvider) (<-chan *vi
|
|||||||
Error: resp.Error,
|
Error: resp.Error,
|
||||||
Value: resp.Value,
|
Value: resp.Value,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}(cryptoResponseCh, viperResponsCh, quitwc, quit)
|
}(cryptoResponseCh, viperResponsCh, quitwc, quit)
|
||||||
|
|
||||||
@@ -76,38 +76,22 @@ func getConfigManager(rp viper.RemoteProvider) (crypt.ConfigManager, error) {
|
|||||||
var cm crypt.ConfigManager
|
var cm crypt.ConfigManager
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
endpoints := strings.Split(rp.Endpoint(), ";")
|
|
||||||
if rp.SecretKeyring() != "" {
|
if rp.SecretKeyring() != "" {
|
||||||
var kr *os.File
|
kr, err := os.Open(rp.SecretKeyring())
|
||||||
kr, err = os.Open(rp.SecretKeyring())
|
defer kr.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer kr.Close()
|
if rp.Provider() == "etcd" {
|
||||||
switch rp.Provider() {
|
cm, err = crypt.NewEtcdConfigManager([]string{rp.Endpoint()}, kr)
|
||||||
case "etcd":
|
} else {
|
||||||
cm, err = crypt.NewEtcdConfigManager(endpoints, kr)
|
cm, err = crypt.NewConsulConfigManager([]string{rp.Endpoint()}, kr)
|
||||||
case "etcd3":
|
|
||||||
cm, err = crypt.NewEtcdV3ConfigManager(endpoints, kr)
|
|
||||||
case "firestore":
|
|
||||||
cm, err = crypt.NewFirestoreConfigManager(endpoints, kr)
|
|
||||||
case "nats":
|
|
||||||
cm, err = crypt.NewNatsConfigManager(endpoints, kr)
|
|
||||||
default:
|
|
||||||
cm, err = crypt.NewConsulConfigManager(endpoints, kr)
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
switch rp.Provider() {
|
if rp.Provider() == "etcd" {
|
||||||
case "etcd":
|
cm, err = crypt.NewStandardEtcdConfigManager([]string{rp.Endpoint()})
|
||||||
cm, err = crypt.NewStandardEtcdConfigManager(endpoints)
|
} else {
|
||||||
case "etcd3":
|
cm, err = crypt.NewStandardConsulConfigManager([]string{rp.Endpoint()})
|
||||||
cm, err = crypt.NewStandardEtcdV3ConfigManager(endpoints)
|
|
||||||
case "firestore":
|
|
||||||
cm, err = crypt.NewStandardFirestoreConfigManager(endpoints)
|
|
||||||
case "nats":
|
|
||||||
cm, err = crypt.NewStandardNatsConfigManager(endpoints)
|
|
||||||
default:
|
|
||||||
cm, err = crypt.NewStandardConsulConfigManager(endpoints)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -12,14 +12,15 @@ package viper
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
"unicode"
|
"unicode"
|
||||||
|
|
||||||
|
"github.com/spf13/afero"
|
||||||
"github.com/spf13/cast"
|
"github.com/spf13/cast"
|
||||||
|
jww "github.com/spf13/jwalterweatherman"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ConfigParseError denotes failing to parse configuration file.
|
// ConfigParseError denotes failing to parse configuration file.
|
||||||
@@ -32,18 +33,13 @@ func (pe ConfigParseError) Error() string {
|
|||||||
return fmt.Sprintf("While parsing config: %s", pe.err.Error())
|
return fmt.Sprintf("While parsing config: %s", pe.err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unwrap returns the wrapped error.
|
|
||||||
func (pe ConfigParseError) Unwrap() error {
|
|
||||||
return pe.err
|
|
||||||
}
|
|
||||||
|
|
||||||
// toCaseInsensitiveValue checks if the value is a map;
|
// toCaseInsensitiveValue checks if the value is a map;
|
||||||
// if so, create a copy and lower-case the keys recursively.
|
// if so, create a copy and lower-case the keys recursively.
|
||||||
func toCaseInsensitiveValue(value any) any {
|
func toCaseInsensitiveValue(value interface{}) interface{} {
|
||||||
switch v := value.(type) {
|
switch v := value.(type) {
|
||||||
case map[any]any:
|
case map[interface{}]interface{}:
|
||||||
value = copyAndInsensitiviseMap(cast.ToStringMap(v))
|
value = copyAndInsensitiviseMap(cast.ToStringMap(v))
|
||||||
case map[string]any:
|
case map[string]interface{}:
|
||||||
value = copyAndInsensitiviseMap(v)
|
value = copyAndInsensitiviseMap(v)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,15 +48,15 @@ func toCaseInsensitiveValue(value any) any {
|
|||||||
|
|
||||||
// copyAndInsensitiviseMap behaves like insensitiviseMap, but creates a copy of
|
// copyAndInsensitiviseMap behaves like insensitiviseMap, but creates a copy of
|
||||||
// any map it makes case insensitive.
|
// any map it makes case insensitive.
|
||||||
func copyAndInsensitiviseMap(m map[string]any) map[string]any {
|
func copyAndInsensitiviseMap(m map[string]interface{}) map[string]interface{} {
|
||||||
nm := make(map[string]any)
|
nm := make(map[string]interface{})
|
||||||
|
|
||||||
for key, val := range m {
|
for key, val := range m {
|
||||||
lkey := strings.ToLower(key)
|
lkey := strings.ToLower(key)
|
||||||
switch v := val.(type) {
|
switch v := val.(type) {
|
||||||
case map[any]any:
|
case map[interface{}]interface{}:
|
||||||
nm[lkey] = copyAndInsensitiviseMap(cast.ToStringMap(v))
|
nm[lkey] = copyAndInsensitiviseMap(cast.ToStringMap(v))
|
||||||
case map[string]any:
|
case map[string]interface{}:
|
||||||
nm[lkey] = copyAndInsensitiviseMap(v)
|
nm[lkey] = copyAndInsensitiviseMap(v)
|
||||||
default:
|
default:
|
||||||
nm[lkey] = v
|
nm[lkey] = v
|
||||||
@@ -70,25 +66,18 @@ func copyAndInsensitiviseMap(m map[string]any) map[string]any {
|
|||||||
return nm
|
return nm
|
||||||
}
|
}
|
||||||
|
|
||||||
func insensitiviseVal(val any) any {
|
func insensitiviseMap(m map[string]interface{}) {
|
||||||
switch v := val.(type) {
|
for key, val := range m {
|
||||||
case map[any]any:
|
switch val.(type) {
|
||||||
|
case map[interface{}]interface{}:
|
||||||
// nested map: cast and recursively insensitivise
|
// nested map: cast and recursively insensitivise
|
||||||
val = cast.ToStringMap(val)
|
val = cast.ToStringMap(val)
|
||||||
insensitiviseMap(val.(map[string]any))
|
insensitiviseMap(val.(map[string]interface{}))
|
||||||
case map[string]any:
|
case map[string]interface{}:
|
||||||
// nested map: recursively insensitivise
|
// nested map: recursively insensitivise
|
||||||
insensitiviseMap(v)
|
insensitiviseMap(val.(map[string]interface{}))
|
||||||
case []any:
|
|
||||||
// nested array: recursively insensitivise
|
|
||||||
insensitiveArray(v)
|
|
||||||
}
|
|
||||||
return val
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func insensitiviseMap(m map[string]any) {
|
|
||||||
for key, val := range m {
|
|
||||||
val = insensitiviseVal(val)
|
|
||||||
lower := strings.ToLower(key)
|
lower := strings.ToLower(key)
|
||||||
if key != lower {
|
if key != lower {
|
||||||
// remove old key (not lower-cased)
|
// remove old key (not lower-cased)
|
||||||
@@ -99,20 +88,17 @@ func insensitiviseMap(m map[string]any) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func insensitiveArray(a []any) {
|
func absPathify(inPath string) string {
|
||||||
for i, val := range a {
|
jww.INFO.Println("Trying to resolve absolute path to", inPath)
|
||||||
a[i] = insensitiviseVal(val)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func absPathify(logger *slog.Logger, inPath string) string {
|
if strings.HasPrefix(inPath, "$HOME") {
|
||||||
logger.Info("trying to resolve absolute path", "path", inPath)
|
|
||||||
|
|
||||||
if inPath == "$HOME" || strings.HasPrefix(inPath, "$HOME"+string(os.PathSeparator)) {
|
|
||||||
inPath = userHomeDir() + inPath[5:]
|
inPath = userHomeDir() + inPath[5:]
|
||||||
}
|
}
|
||||||
|
|
||||||
inPath = os.ExpandEnv(inPath)
|
if strings.HasPrefix(inPath, "$") {
|
||||||
|
end := strings.Index(inPath, string(os.PathSeparator))
|
||||||
|
inPath = os.Getenv(inPath[1:end]) + inPath[end:]
|
||||||
|
}
|
||||||
|
|
||||||
if filepath.IsAbs(inPath) {
|
if filepath.IsAbs(inPath) {
|
||||||
return filepath.Clean(inPath)
|
return filepath.Clean(inPath)
|
||||||
@@ -123,11 +109,32 @@ func absPathify(logger *slog.Logger, inPath string) string {
|
|||||||
return filepath.Clean(p)
|
return filepath.Clean(p)
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Error(fmt.Errorf("could not discover absolute path: %w", err).Error())
|
jww.ERROR.Println("Couldn't discover absolute path")
|
||||||
|
jww.ERROR.Println(err)
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check if File / Directory Exists
|
||||||
|
func exists(fs afero.Fs, path string) (bool, error) {
|
||||||
|
_, err := fs.Stat(path)
|
||||||
|
if err == nil {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func stringInSlice(a string, list []string) bool {
|
||||||
|
for _, b := range list {
|
||||||
|
if b == a {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
func userHomeDir() string {
|
func userHomeDir() string {
|
||||||
if runtime.GOOS == "windows" {
|
if runtime.GOOS == "windows" {
|
||||||
home := os.Getenv("HOMEDRIVE") + os.Getenv("HOMEPATH")
|
home := os.Getenv("HOMEDRIVE") + os.Getenv("HOMEPATH")
|
||||||
@@ -147,7 +154,7 @@ func safeMul(a, b uint) uint {
|
|||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
|
|
||||||
// parseSizeInBytes converts strings like 1GB or 12 mb into an unsigned integer number of bytes.
|
// parseSizeInBytes converts strings like 1GB or 12 mb into an unsigned integer number of bytes
|
||||||
func parseSizeInBytes(sizeStr string) uint {
|
func parseSizeInBytes(sizeStr string) uint {
|
||||||
sizeStr = strings.TrimSpace(sizeStr)
|
sizeStr = strings.TrimSpace(sizeStr)
|
||||||
lastChar := len(sizeStr) - 1
|
lastChar := len(sizeStr) - 1
|
||||||
@@ -174,7 +181,10 @@ func parseSizeInBytes(sizeStr string) uint {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
size := max(cast.ToInt(sizeStr), 0)
|
size := cast.ToInt(sizeStr)
|
||||||
|
if size < 0 {
|
||||||
|
size = 0
|
||||||
|
}
|
||||||
|
|
||||||
return safeMul(uint(size), multiplier)
|
return safeMul(uint(size), multiplier)
|
||||||
}
|
}
|
||||||
@@ -186,22 +196,22 @@ func parseSizeInBytes(sizeStr string) uint {
|
|||||||
// In case intermediate keys do not exist, or map to a non-map value,
|
// In case intermediate keys do not exist, or map to a non-map value,
|
||||||
// a new map is created and inserted, and the search continues from there:
|
// a new map is created and inserted, and the search continues from there:
|
||||||
// the initial map "m" may be modified!
|
// the initial map "m" may be modified!
|
||||||
func deepSearch(m map[string]any, path []string) map[string]any {
|
func deepSearch(m map[string]interface{}, path []string) map[string]interface{} {
|
||||||
for _, k := range path {
|
for _, k := range path {
|
||||||
m2, ok := m[k]
|
m2, ok := m[k]
|
||||||
if !ok {
|
if !ok {
|
||||||
// intermediate key does not exist
|
// intermediate key does not exist
|
||||||
// => create it and continue from there
|
// => create it and continue from there
|
||||||
m3 := make(map[string]any)
|
m3 := make(map[string]interface{})
|
||||||
m[k] = m3
|
m[k] = m3
|
||||||
m = m3
|
m = m3
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
m3, ok := m2.(map[string]any)
|
m3, ok := m2.(map[string]interface{})
|
||||||
if !ok {
|
if !ok {
|
||||||
// intermediate key is a value
|
// intermediate key is a value
|
||||||
// => replace with a new map
|
// => replace with a new map
|
||||||
m3 = make(map[string]any)
|
m3 = make(map[string]interface{})
|
||||||
m[k] = m3
|
m[k] = m3
|
||||||
}
|
}
|
||||||
// continue search from here
|
// continue search from here
|
||||||
|
|||||||
+20
-52
@@ -11,76 +11,44 @@
|
|||||||
package viper
|
package viper
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"log/slog"
|
"reflect"
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestCopyAndInsensitiviseMap(t *testing.T) {
|
func TestCopyAndInsensitiviseMap(t *testing.T) {
|
||||||
var (
|
var (
|
||||||
given = map[string]any{
|
given = map[string]interface{}{
|
||||||
"Foo": 32,
|
"Foo": 32,
|
||||||
"Bar": map[any]any{
|
"Bar": map[interface{}]interface {
|
||||||
|
}{
|
||||||
"ABc": "A",
|
"ABc": "A",
|
||||||
"cDE": "B",
|
"cDE": "B"},
|
||||||
},
|
|
||||||
}
|
}
|
||||||
expected = map[string]any{
|
expected = map[string]interface{}{
|
||||||
"foo": 32,
|
"foo": 32,
|
||||||
"bar": map[string]any{
|
"bar": map[string]interface {
|
||||||
|
}{
|
||||||
"abc": "A",
|
"abc": "A",
|
||||||
"cde": "B",
|
"cde": "B"},
|
||||||
},
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
got := copyAndInsensitiviseMap(given)
|
got := copyAndInsensitiviseMap(given)
|
||||||
|
|
||||||
assert.Equal(t, expected, got)
|
if !reflect.DeepEqual(got, expected) {
|
||||||
_, ok := given["foo"]
|
t.Fatalf("Got %q\nexpected\n%q", got, expected)
|
||||||
assert.False(t, ok)
|
|
||||||
_, ok = given["bar"]
|
|
||||||
assert.False(t, ok)
|
|
||||||
|
|
||||||
m := given["Bar"].(map[any]any)
|
|
||||||
_, ok = m["ABc"]
|
|
||||||
assert.True(t, ok)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestAbsPathify(t *testing.T) {
|
if _, ok := given["foo"]; ok {
|
||||||
skipWindows(t)
|
t.Fatal("Input map changed")
|
||||||
|
|
||||||
home := userHomeDir()
|
|
||||||
homer := filepath.Join(home, "homer")
|
|
||||||
wd, _ := os.Getwd()
|
|
||||||
|
|
||||||
t.Setenv("HOMER_ABSOLUTE_PATH", homer)
|
|
||||||
t.Setenv("VAR_WITH_RELATIVE_PATH", "relative")
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
input string
|
|
||||||
output string
|
|
||||||
}{
|
|
||||||
{"", wd},
|
|
||||||
{"sub", filepath.Join(wd, "sub")},
|
|
||||||
{"./", wd},
|
|
||||||
{"./sub", filepath.Join(wd, "sub")},
|
|
||||||
{"$HOME", home},
|
|
||||||
{"$HOME/", home},
|
|
||||||
{"$HOME/sub", filepath.Join(home, "sub")},
|
|
||||||
{"$HOMER_ABSOLUTE_PATH", homer},
|
|
||||||
{"$HOMER_ABSOLUTE_PATH/", homer},
|
|
||||||
{"$HOMER_ABSOLUTE_PATH/sub", filepath.Join(homer, "sub")},
|
|
||||||
{"$VAR_WITH_RELATIVE_PATH", filepath.Join(wd, "relative")},
|
|
||||||
{"$VAR_WITH_RELATIVE_PATH/", filepath.Join(wd, "relative")},
|
|
||||||
{"$VAR_WITH_RELATIVE_PATH/sub", filepath.Join(wd, "relative", "sub")},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, test := range tests {
|
if _, ok := given["bar"]; ok {
|
||||||
got := absPathify(slog.Default(), test.input)
|
t.Fatal("Input map changed")
|
||||||
assert.Equal(t, test.output, got)
|
}
|
||||||
|
|
||||||
|
m := given["Bar"].(map[interface{}]interface{})
|
||||||
|
if _, ok := m["ABc"]; !ok {
|
||||||
|
t.Fatal("Input map changed")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+665
-1941
File diff suppressed because it is too large
Load Diff
@@ -1,53 +0,0 @@
|
|||||||
package viper
|
|
||||||
|
|
||||||
var yamlExample = []byte(`Hacker: true
|
|
||||||
name: steve
|
|
||||||
hobbies:
|
|
||||||
- skateboarding
|
|
||||||
- snowboarding
|
|
||||||
- go
|
|
||||||
clothing:
|
|
||||||
jacket: leather
|
|
||||||
trousers: denim
|
|
||||||
pants:
|
|
||||||
size: large
|
|
||||||
age: 35
|
|
||||||
eyes : brown
|
|
||||||
beard: true
|
|
||||||
`)
|
|
||||||
|
|
||||||
var yamlWriteExpected = []byte(`age: 35
|
|
||||||
beard: true
|
|
||||||
clothing:
|
|
||||||
jacket: leather
|
|
||||||
pants:
|
|
||||||
size: large
|
|
||||||
trousers: denim
|
|
||||||
eyes: brown
|
|
||||||
hacker: true
|
|
||||||
hobbies:
|
|
||||||
- skateboarding
|
|
||||||
- snowboarding
|
|
||||||
- go
|
|
||||||
name: steve
|
|
||||||
`)
|
|
||||||
|
|
||||||
var yamlExampleWithDot = []byte(`Hacker: true
|
|
||||||
name: steve
|
|
||||||
hobbies:
|
|
||||||
- skateboarding
|
|
||||||
- snowboarding
|
|
||||||
- go
|
|
||||||
clothing:
|
|
||||||
jacket: leather
|
|
||||||
trousers: denim
|
|
||||||
pants:
|
|
||||||
size: large
|
|
||||||
age: 35
|
|
||||||
eyes : brown
|
|
||||||
beard: true
|
|
||||||
emails:
|
|
||||||
steve@hacker.com:
|
|
||||||
created: 01/02/03
|
|
||||||
active: true
|
|
||||||
`)
|
|
||||||
Reference in New Issue
Block a user