Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: heetch/confita
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.6.0
Choose a base ref
...
head repository: heetch/confita
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Sep 22, 2018

  1. some more toml cases in tests

    b0000000000000t committed Sep 22, 2018
    Copy the full SHA
    2666580 View commit details

Commits on Aug 21, 2019

  1. track fields that have been found in resolve

    so value from the first backend wins
    steamrolla committed Aug 21, 2019
    Copy the full SHA
    c3f1cb1 View commit details

Commits on Aug 22, 2019

  1. Merge pull request #65 from steamrolla/master

    set value only from first successful backend
    Yasss authored Aug 22, 2019
    Copy the full SHA
    20131ab View commit details
  2. Add optional parameter for file backend

    Yasss committed Aug 22, 2019
    Copy the full SHA
    51fcea2 View commit details
  3. Add logging when optional file is not found

    Yasss committed Aug 22, 2019
    Copy the full SHA
    a3c6fcb View commit details
  4. Fix test

    Yasss committed Aug 22, 2019
    Copy the full SHA
    8079db3 View commit details
  5. Add comment

    Yasss committed Aug 22, 2019
    Copy the full SHA
    c254518 View commit details

Commits on Aug 27, 2019

  1. Fix module name

    Yasss committed Aug 27, 2019
    Copy the full SHA
    5fa198b View commit details
  2. Copy the full SHA
    fc3f62e View commit details
  3. Copy the full SHA
    36e84cd View commit details
  4. Remove the logger

    Yasss committed Aug 27, 2019
    Copy the full SHA
    a36e153 View commit details
  5. Update go.sum

    Yasss committed Aug 27, 2019
    Copy the full SHA
    93b83c5 View commit details
  6. Merge pull request #59 from heetch/add-optional-parameter

    Add optional parameter for file backend
    Yasss authored Aug 27, 2019
    Copy the full SHA
    31dcf3b View commit details

Commits on Aug 31, 2019

  1. enable a short option for flags backend

      using flag.Var to enable parsing the flags from long or short flag
    steamrolla committed Aug 31, 2019
    Copy the full SHA
    7bebbcd View commit details

Commits on Sep 2, 2019

  1. Merge pull request #67 from steamrolla/master

    enable a short option for flags
    Geoffrey J. Teale authored Sep 2, 2019
    Copy the full SHA
    1fd65b7 View commit details

Commits on Sep 7, 2019

  1. Copy the full SHA
    ada95fc View commit details

Commits on Sep 18, 2019

  1. use consul v1.1.0

    The module boundary has changed, and this can cause ambiguous module
    imports when a requirement wants to use consul/api v1.1.0, which
    is ambiguous with respect to consul v1.0.7 which also has an api package.
    rogpeppe committed Sep 18, 2019
    Copy the full SHA
    42016a6 View commit details
  2. Merge pull request #72 from heetch/rog-002-consul-v1.1.0

    use consul v1.1.0
    rogpeppe authored Sep 18, 2019
    Copy the full SHA
    6aaa9fb View commit details

Commits on Sep 19, 2019

  1. Merge pull request #69 from steamrolla/floatuintshort

    support for float and uint short flags
    rogpeppe authored Sep 19, 2019
    Copy the full SHA
    a955922 View commit details
  2. set usage message from description tag (#70)

    set usage message in flags backend from description tag
    steamrolla authored and rogpeppe committed Sep 19, 2019
    Copy the full SHA
    63a14d4 View commit details
  3. Merge pull request #45 from eliastor/feature/toml

    some more toml cases in tests
    Geoffrey J. Teale authored Sep 19, 2019
    Copy the full SHA
    fd18d35 View commit details

Commits on Sep 20, 2019

  1. Copy the full SHA
    ab84900 View commit details

Commits on Sep 23, 2019

  1. Merge pull request #75 from steamrolla/travis-go1213

    only run go versions 1.12, 1.13 and tip. allows us to remove dep
    Geoffrey J. Teale authored Sep 23, 2019
    Copy the full SHA
    1982253 View commit details

Commits on Sep 26, 2019

  1. implement ssm backend (#71)

    This implements a backend that uses the Amazon AWS SSM parameter store for keys.
    steamrolla authored and rogpeppe committed Sep 26, 2019
    Copy the full SHA
    1833a32 View commit details

Commits on Oct 16, 2019

  1. backend/ssm: minor cleanups (#76)

    Avoid the opaque-looking generated mock code and apply some
    other minor cleanups.
    rogpeppe authored Oct 16, 2019
    Copy the full SHA
    86d03df View commit details

Commits on Nov 20, 2019

  1. backend/env: treat empty environment variables as not found (#78)

    It's very unusual to distinguish between an environment variable
    that's unset and one that's empty. When a value is required, looking
    for a non-empty environment variable feels more correct.
    
    As a recent example, the kafka-go config contained a "required" entry
    for `KAFKA_ADDRS` which was satisfied by an empty environment
    variable.
    rogpeppe authored Nov 20, 2019
    Copy the full SHA
    ec7d80e View commit details

Commits on Nov 28, 2019

  1. backend/flags: avoiding setting values that aren't specified

    In #67, the `isFlagSet` logic was changed so that it always returned
    true, so even unmentioned flags would override previously set values.
    
    This PR fixes that issue (fixes #79) and also changes the flag tests
    to be somewhat more flexible and test this specific issue.
    
    I haven't made any wider fixes because the concept of using command-line
    flags as a backend is fundamentally broken in a way that cannot be fixed
    (see #63), so will probably be removed in a future major version release
    of confita.
    rogpeppe committed Nov 28, 2019
    Copy the full SHA
    0782bac View commit details

Commits on May 6, 2020

  1. update vault module version (#83)

    By requiring the old version of vault, we were breaking dependency resolution because that version has an api package which conflicts with the later api module that has the same import path.
    
    Also fix the error message checking so that it copes with the latest Go tip.
    rogpeppe authored May 6, 2020
    Copy the full SHA
    c6edf60 View commit details

Commits on Jun 23, 2020

  1. Merge pull request #80 from heetch/rog-005-fix-flags

    backend/flags: avoiding setting values that aren't specified
    sixstone-qq authored Jun 23, 2020
    Copy the full SHA
    3cdb63e View commit details

Commits on Mar 24, 2021

  1. Add support for Vault KV secrets engine v2 (#86)

    * Fix vault couldn't get a value
    
    * Add support for Vault KV secrets engine v2
    
    * Allow simpler paths like the Vault CLI does
    
    * Fix Vault tests fail when run twice
    
    Due to data versioning the deferred deletion doesn't completely remove
    the secret - only the data.
    
    * Improve path change
    
    Co-authored-by: Jean-Philippe Moal <skateinmars@users.noreply.github.com>
    
    Co-authored-by: mopemope <yutaka.matsubara@gmail.com>
    Co-authored-by: Jean-Philippe Moal <skateinmars@users.noreply.github.com>
    3 people authored Mar 24, 2021
    Copy the full SHA
    a80b748 View commit details

Commits on Jun 22, 2021

  1. Copy the full SHA
    ecea6a0 View commit details

Commits on Jun 23, 2021

  1. Merge pull request #89 from heetch/chore/add-gh-ci

    Add CI tests using Github actions
    skateinmars authored Jun 23, 2021
    Copy the full SHA
    f4b02c5 View commit details
Showing with 877 additions and 755 deletions.
  1. +45 −0 .github/workflows/test.yml
  2. +10 −26 .travis.yml
  3. +0 −319 Gopkg.lock
  4. +0 −31 Gopkg.toml
  5. +8 −0 Makefile
  6. +19 −1 README.md
  7. +2 −7 backend/env/env.go
  8. +9 −1 backend/env/env_test.go
  9. +23 −2 backend/file/file.go
  10. +74 −14 backend/file/file_test.go
  11. +65 −30 backend/flags/flags.go
  12. +117 −90 backend/flags/flags_test.go
  13. +86 −0 backend/ssm/ssm.go
  14. +161 −0 backend/ssm/ssm_test.go
  15. +33 −2 backend/vault/vault.go
  16. +85 −4 backend/vault/vault_test.go
  17. +33 −7 config.go
  18. +18 −1 config_test.go
  19. +6 −60 go.mod
  20. +83 −160 go.sum
45 changes: 45 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
on: [push, pull_request]
name: Test
jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [1.15.x, 1.16.x]

services:
etc:
image: quay.io/coreos/etcd
ports:
- 2379:2379
env:
ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
consul:
image: consul
ports:
- 8500:8500
vault096:
image: vault:0.9.6
ports:
- 8200:8200
env:
VAULT_DEV_ROOT_TOKEN_ID: root
VAULT_DEV_LISTEN_ADDRESS: 0.0.0.0:8200
vault010:
image: vault:0.10.0
ports:
- 8222:8200
env:
VAULT_DEV_ROOT_TOKEN_ID: root
VAULT_DEV_LISTEN_ADDRESS: 0.0.0.0:8200

steps:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: ${{ matrix.go-version }}
- name: Checkout code
uses: actions/checkout@v2
- name: Test
run: make test
36 changes: 10 additions & 26 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -2,13 +2,17 @@ sudo: required

language: go

go:
- 1.12
- 1.13
- tip

services:
- docker

env:
global:
- VAULT_ADDR=http://127.0.0.1:8200
- DEP_VERSION="0.5.0"
- GO111MODULE=on

matrix:
@@ -18,33 +22,13 @@ matrix:
# Don't wait for tip tests to finish. Mark the test run green if the
# tests pass on the stable versions of Go.
fast_finish: true
include:
- go: 1.9.x
install: dep ensure -v -vendor-only
script: go test -v -race -cover -timeout=1m ./...
- go: 1.10.x
install: dep ensure -v -vendor-only
script: go test -v -race -cover -timeout=1m ./...
- go: 1.11.x
before_install: skip
install:
- go build ./...
- go mod vendor
script: go test -v -race -cover -timeout=1m -mod=vendor ./...
- go: tip
before_install: skip
install:
- go build ./...
- go mod vendor
script: go test -v -race -cover -timeout=1m -mod=vendor ./...

before_install:
- mkdir -p $GOPATH/bin
- wget -O $GOPATH/bin/dep "https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64"
- chmod +x $GOPATH/bin/dep
- export PATH="$GOPATH/bin:$PATH"
install:
- go build ./...
- go mod vendor
script: go test -v -race -cover -timeout=1m -mod=vendor ./...

before_script:
- docker run -d -p 2379:2379 quay.io/coreos/etcd /usr/local/bin/etcd -advertise-client-urls http://0.0.0.0:2379 -listen-client-urls http://0.0.0.0:2379
- docker run -d -p 8500:8500 --name consul consul
- docker run -d -p 8200:8200 --cap-add=IPC_LOCK -e 'VAULT_DEV_ROOT_TOKEN_ID=root' -e 'VAULT_DEV_LISTEN_ADDRESS=0.0.0.0:8200' vault:0.9.6
- docker run -d -p 8222:8200 --cap-add=IPC_LOCK -e 'VAULT_DEV_ROOT_TOKEN_ID=root' -e 'VAULT_DEV_LISTEN_ADDRESS=0.0.0.0:8200' vault:0.10.0
Loading