diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fa4081e..b50aad2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -9,7 +9,7 @@ # the `language` matrix defined below to confirm you have the correct set of # supported CodeQL languages. # -name: "CodeQL" +name: "codeql" on: workflow_run: @@ -17,16 +17,16 @@ on: types: - completed push: - branches: [ master ] + branches: [ master, v3 ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ master, v3 ] schedule: - cron: '34 1 * * 0' jobs: analyze: - name: Analyze + name: analyze runs-on: ubuntu-latest permissions: actions: read @@ -42,11 +42,14 @@ jobs: # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed steps: - - name: Checkout repository + - name: checkout uses: actions/checkout@v2 - + - name: setup + uses: actions/setup-go@v2 + with: + go-version: 1.16 # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL + - name: init uses: github/codeql-action/init@v1 with: languages: ${{ matrix.language }} @@ -57,7 +60,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild + - name: autobuild uses: github/codeql-action/autobuild@v1 # ℹ️ Command-line programs to run using the OS shell. @@ -71,5 +74,5 @@ jobs: # make bootstrap # make release - - name: Perform CodeQL Analysis + - name: analyze uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml index dd6a62e..69e4c39 100644 --- a/.github/workflows/dependabot-automerge.yml +++ b/.github/workflows/dependabot-automerge.yml @@ -1,66 +1,31 @@ name: "prautomerge" on: - workflow_run: - workflows: ["prbuild"] - types: - - completed + pull_request_target: + types: [assigned, opened, synchronize, reopened] permissions: - contents: write pull-requests: write + contents: write jobs: - Dependabot-Automerge: + dependabot: runs-on: ubuntu-latest - # Contains workaround to execute if dependabot updates the PR by checking for the base branch in the linked PR - # The the github.event.workflow_run.event value is 'push' and not 'pull_request' - # dont work with multiple workflows when last returns success - if: >- - github.event.workflow_run.conclusion == 'success' - && github.actor == 'dependabot[bot]' - && github.event.sender.login == 'dependabot[bot]' - && github.event.sender.type == 'Bot' - && (github.event.workflow_run.event == 'pull_request' - || (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch )) + if: ${{ github.actor == 'dependabot[bot]' }} steps: - - name: Approve Changes and Merge changes if label 'dependencies' is set - uses: actions/github-script@v5 + - name: metadata + id: metadata + uses: dependabot/fetch-metadata@v1.1.1 with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - console.log(context.payload.workflow_run); - - var labelNames = await github.paginate( - github.issues.listLabelsOnIssue, - { - repo: context.repo.repo, - owner: context.repo.owner, - issue_number: context.payload.workflow_run.pull_requests[0].number, - }, - (response) => response.data.map( - (label) => label.name - ) - ); - - console.log(labelNames); - - if (labelNames.includes('dependencies')) { - console.log('Found label'); - - await github.pulls.createReview({ - repo: context.repo.repo, - owner: context.repo.owner, - pull_number: context.payload.workflow_run.pull_requests[0].number, - event: 'APPROVE' - }); - console.log('Approved PR'); - - await github.pulls.merge({ - repo: context.repo.repo, - owner: context.repo.owner, - pull_number: context.payload.workflow_run.pull_requests[0].number, - }); - - console.log('Merged PR'); - } + github-token: "${{ secrets.TOKEN }}" + - name: approve + run: gh pr review --approve "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.TOKEN}} + - name: merge + if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}} + run: gh pr merge --auto --merge "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.TOKEN}} diff --git a/consul.go b/consul.go index 0706aa6..33a5d19 100644 --- a/consul.go +++ b/consul.go @@ -82,15 +82,23 @@ func (c *consulConfig) Init(opts ...config.Option) error { } func (c *consulConfig) Load(ctx context.Context, opts ...config.LoadOption) error { + path := c.path + options := config.NewLoadOptions(opts...) + if options.Context != nil { + if v, ok := options.Context.Value(pathKey{}).(string); ok && v != "" { + path = v + } + } + if err := config.DefaultBeforeLoad(ctx, c); err != nil { return err } - pair, _, err := c.cli.KV().Get(c.path, nil) + pair, _, err := c.cli.KV().Get(path, nil) if err != nil { - err = fmt.Errorf("consul path %s load error: %w", c.path, err) + err = fmt.Errorf("consul path %s load error: %w", path, err) } else if pair == nil { - err = fmt.Errorf("consul path %s load error: not found", c.path) + err = fmt.Errorf("consul path %s load error: not found", path) } if err != nil { @@ -101,7 +109,6 @@ func (c *consulConfig) Load(ctx context.Context, opts ...config.LoadOption) erro return config.DefaultAfterLoad(ctx, c) } - options := config.NewLoadOptions(opts...) mopts := []func(*mergo.Config){mergo.WithTypeCheck} if options.Override { mopts = append(mopts, mergo.WithOverride) @@ -138,19 +145,27 @@ func (c *consulConfig) Load(ctx context.Context, opts ...config.LoadOption) erro } func (c *consulConfig) Save(ctx context.Context, opts ...config.SaveOption) error { + path := c.path + options := config.NewSaveOptions(opts...) + if options.Context != nil { + if v, ok := options.Context.Value(pathKey{}).(string); ok && v != "" { + path = v + } + } + if err := config.DefaultBeforeSave(ctx, c); err != nil { return err } buf, err := c.opts.Codec.Marshal(c.opts.Struct) if err == nil { - _, err = c.cli.KV().Put(&api.KVPair{Key: c.path, Value: buf}, nil) + _, err = c.cli.KV().Put(&api.KVPair{Key: path, Value: buf}, nil) } if err != nil { - c.opts.Logger.Errorf(c.opts.Context, "consul path %s save error: %v", c.path, err) + c.opts.Logger.Errorf(c.opts.Context, "consul path %s save error: %v", path, err) if !c.opts.AllowFail { - return fmt.Errorf("consul path %s save error: %v", c.path, err) + return fmt.Errorf("consul path %s save error: %v", path, err) } } @@ -170,9 +185,17 @@ func (c *consulConfig) Name() string { } func (c *consulConfig) Watch(ctx context.Context, opts ...config.WatchOption) (config.Watcher, error) { + path := c.path + options := config.NewWatchOptions(opts...) + if options.Context != nil { + if v, ok := options.Context.Value(pathKey{}).(string); ok && v != "" { + path = v + } + } + w := &consulWatcher{ cli: c.cli, - path: c.path, + path: path, opts: c.opts, wopts: config.NewWatchOptions(opts...), done: make(chan struct{}), diff --git a/go.mod b/go.mod index 18a2e42..742d3a1 100644 --- a/go.mod +++ b/go.mod @@ -16,5 +16,5 @@ require ( github.com/mitchellh/mapstructure v1.4.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/stretchr/testify v1.7.0 // indirect - go.unistack.org/micro/v3 v3.8.5 + go.unistack.org/micro/v3 v3.8.9 ) diff --git a/go.sum b/go.sum index a5918e2..c9312e6 100644 --- a/go.sum +++ b/go.sum @@ -164,8 +164,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA= go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8= -go.unistack.org/micro/v3 v3.8.5 h1:DIYWRsQF+NPhKZP45sCtNsUhaRw6u2+Ps7U+pKU7i3s= -go.unistack.org/micro/v3 v3.8.5/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= +go.unistack.org/micro/v3 v3.8.9 h1:F+HAQSHI86F8Xx5D6XKvvuN0TtOuVvJM+OBV8aYTg0Y= +go.unistack.org/micro/v3 v3.8.9/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/options.go b/options.go index f78cda7..1db4617 100644 --- a/options.go +++ b/options.go @@ -44,3 +44,15 @@ type timeoutKey struct{} func Timeout(td time.Duration) config.Option { return config.SetOption(timeoutKey{}, td) } + +func LoadPath(path string) config.LoadOption { + return config.SetLoadOption(pathKey{}, path) +} + +func SavePath(path string) config.SaveOption { + return config.SetSaveOption(pathKey{}, path) +} + +func WatchPath(path string) config.WatchOption { + return config.SetWatchOption(pathKey{}, path) +}