Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmd/configmanager/configmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/DevLabFoundry/configmanager/v3/internal/cmdutils"
"github.com/DevLabFoundry/configmanager/v3/internal/log"
"github.com/DevLabFoundry/configmanager/v3/internal/store"
"github.com/Ensono/eirctl/selfupdate"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -74,6 +75,8 @@ func addSubCmds(rootCmd *Root) {
newRetrieveCmd(rootCmd)
newInsertCmd(rootCmd)
newInitCmd(rootCmd)
uc := selfupdate.New("configmanager", "https://github.com/DevLabFoundry/configmanager/releases")
uc.AddToRootCommand(rootCmd.Cmd)
}

func (rc *Root) Execute(ctx context.Context) error {
Expand Down
3 changes: 1 addition & 2 deletions configmanager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"github.com/DevLabFoundry/configmanager/v3/config"
"github.com/DevLabFoundry/configmanager/v3/generator"
"github.com/DevLabFoundry/configmanager/v3/internal/testutils"
"github.com/go-test/deep"
"gopkg.in/yaml.v3"
)

Expand Down Expand Up @@ -381,7 +380,7 @@ func Test_Generator_Config_(t *testing.T) {
cm.Config.WithOutputPath(tt.outputPath)
}
got := cm.GeneratorConfig()
if diff := deep.Equal(got, &tt.expect); diff != nil {
if !reflect.DeepEqual(got, &tt.expect) {
t.Errorf(testutils.TestPhraseWithContext, "generator config", fmt.Sprintf("%v", got), fmt.Sprintf("%v", tt.expect))
}
})
Expand Down
14 changes: 11 additions & 3 deletions eirctl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pipelines:
PLUGIN: empty
- task: move:empty:provider
condition: if [ -z "$(ls -A tokenstore/provider/empty/.configmanager/plugins/empty/* 2>/dev/null)" ]; then exit 0; else exit 1; fi;
depends_on:
depends_on:
- build-empty-plugin
- pipeline: test:unit
depends_on: move:empty:provider
Expand Down Expand Up @@ -68,7 +68,7 @@ pipelines:
PLUGIN: empty

lint:
- task: go:lint
- task: golint:ci
- task: trivy:filesystem:scan
variables:
TrivyIgnoreFile: .trivyignore.yaml
Expand All @@ -77,6 +77,14 @@ pipelines:
- task: sonar:scanner:cli

tasks:
golint:ci:
description: Runs golangci-lint in CI mode
context: go1x
command:
- |
wget -O- -nv https://golangci-lint.run/install.sh | sh -s -- -b .eirctl v2.15.0
exec .eirctl/golangci-lint run {{ .Args }}

show_docs:
description: |
Opens a webview with godoc running
Expand All @@ -101,7 +109,7 @@ tasks:
go build -C ./tokenstore/provider/$PLUGIN -mod=readonly -buildvcs=false -ldflags="$ldflags" \
-o bin/$PLUGIN-$(go env GOOS)-$(go env GOARCH)${BUILD_SUFFIX} main.go
echo "---"
echo "Built: $PLUGIN-$(go env GOARCH)-$(go env GOARCH)${BUILD_SUFFIX}"
echo "Built: $PLUGIN-$(go env GOOS)-$(go env GOARCH)${BUILD_SUFFIX}"
required:
env:
- PLUGIN
Expand Down
22 changes: 11 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
module github.com/DevLabFoundry/configmanager/v3

go 1.27
go 1.27.0

toolchain go1.27.1
toolchain go1.27.3

require (
github.com/Ensono/eirctl v0.11.36
github.com/a8m/envsubst v1.4.3
github.com/go-test/deep v1.1.1
github.com/hashicorp/go-hclog v1.6.3
github.com/hashicorp/go-plugin v1.8.0
github.com/schollz/progressbar/v3 v3.19.1
github.com/spf13/cobra v1.10.2
github.com/spyzhov/ajson v0.9.6
google.golang.org/grpc v1.84.0
google.golang.org/grpc v1.85.0
google.golang.org/protobuf v1.36.12
gopkg.in/yaml.v3 v3.0.1
)
Expand All @@ -23,18 +23,18 @@ require (
github.com/hashicorp/yamux v0.1.2 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/mattn/go-colorable v0.1.15 // indirect
github.com/mattn/go-colorable v0.1.16 // indirect
github.com/mattn/go-isatty v0.0.24 // indirect
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
github.com/oklog/run v1.2.0 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rogpeppe/go-internal v1.14.1 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/spf13/pflag v1.1.0 // indirect
github.com/stretchr/testify v1.11.1 // indirect
golang.org/x/net v0.59.0 // indirect
golang.org/x/sys v0.48.0 // indirect
golang.org/x/term v0.46.0 // indirect
golang.org/x/text v0.42.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459 // indirect
golang.org/x/net v0.62.0 // indirect
golang.org/x/sys v0.50.0 // indirect
golang.org/x/term v0.48.0 // indirect
golang.org/x/text v0.44.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20261110000943-09e21b237f2c // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
)
Loading
Loading